Skip to content

🎨 [Frontend] Second app on Sim4Life.lite #7807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 4, 2025
Merged

🎨 [Frontend] Second app on Sim4Life.lite #7807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b4e3e79
add new service to default config
odeimaiz Jun 4, 2025
e43a2d8
add html and markdown links
odeimaiz Jun 4, 2025
8f66b2e
minor
odeimaiz Jun 4, 2025
ca3f910
Merge branch 'master' into enh/second-app-for-s4l-lite
mergify[bot] Jun 4, 2025
c445bb8
Merge branch 'master' into enh/second-app-for-s4l-lite
mergify[bot] Jun 4, 2025
5378874
refactor
odeimaiz Jun 4, 2025
fc36a49
Merge branch 'enh/second-app-for-s4l-lite' of github.com:odeimaiz/osp…
odeimaiz Jun 4, 2025
e21ab23
Merge branch 'master' into enh/second-app-for-s4l-lite
mergify[bot] Jun 4, 2025
d462aaf
Merge branch 'master' into enh/second-app-for-s4l-lite
odeimaiz Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion services/static-webserver/client/source/class/osparc/editor/HtmlEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ qx.Class.define("osparc.editor.HtmlEditor", {

this.getChildControl("preview-html");
this.getChildControl("subtitle").set({
value: this.tr("Supports HTML")
value: this.tr("Supports HTML"),
url: "https://en.wikipedia.org/wiki/HTML",
});
},

Expand Down
3 changes: 2 additions & 1 deletion services/static-webserver/client/source/class/osparc/editor/MarkdownEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ qx.Class.define("osparc.editor.MarkdownEditor", {

this.getChildControl("preview-markdown");
this.getChildControl("subtitle").set({
value: this.tr("Markdown supported")
value: this.tr("Markdown supported"),
url: "https://en.wikipedia.org/wiki/Markdown",
});
},

Expand Down
6 changes: 2 additions & 4 deletions services/static-webserver/client/source/class/osparc/editor/TextEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,13 @@ qx.Class.define("osparc.editor.TextEditor", {
writePage.add(control, {
flex: 1
});
const subtitle = this.getChildControl("subtitle").set({
value: this.tr("Supports HTML")
});
const subtitle = this.getChildControl("subtitle");
writePage.add(subtitle);
tabs.add(writePage);
break;
}
case "subtitle":
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.LinkLabel().set({
font: "text-12"
});
this._add(control);
Expand Down
9 changes: 7 additions & 2 deletions services/static-webserver/client/source/class/osparc/info/CommentUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,8 @@ qx.Class.define("osparc.info.CommentUI", {

__buildLayout: function() {
const thumbnail = this.getChildControl("thumbnail");
thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail("", "", 32));

const userName = this.getChildControl("user-name");
userName.setValue("Unknown");

const date = new Date(this.__comment["modified"]);
const date2 = osparc.utils.Utils.formatDateAndTime(date);
Expand All @@ -131,7 +129,14 @@ qx.Class.define("osparc.info.CommentUI", {
if (user) {
thumbnail.setSource(user.getThumbnail());
userName.setValue(user.getLabel());
} else {
thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail());
userName.setValue("Unknown user");
}
})
.catch(() => {
thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail());
userName.setValue("Unknown user");
});

this.getChildControl("spacer");
Expand Down
7 changes: 1 addition & 6 deletions services/static-webserver/client/source/class/osparc/utils/Avatar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,7 @@ qx.Class.define("osparc.utils.Avatar", {
type: "static",

statics: {
emailToThumbnail: function(email, username) {
return this.__getUrl(email, username, 32);
},

__getUrl: function(email, username, size = 100) {
email = email || "";
emailToThumbnail: function(email = "", username = "??", size = 32) {
// MD5 (Message-Digest Algorithm) by WebToolkit
const MD5 = function(s) {
function L(k, d) {
Expand Down
5 changes: 5 additions & 0 deletions services/static-webserver/client/source/resource/osparc/ui_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@
"title": "${replace_me_product_name}",
"newStudyLabel": "New Project",
"idToWidget": "startS4LButton"
}, {
"resourceType": "service",
"expectedKey": "simcore/services/dynamic/s4l-ui-framework",
"title": "Sim4Life.framework",
"newStudyLabel": "Sim4Life.framework"
}]
}
},
Expand Down
Loading