Skip to content

Commit d41dbbd

Browse files
odeimaizodeimaiz
committed
Merge branch 'fix/one-radius' of github.com:odeimaiz/osparc-simcore into fix/one-radius
2 parents ef526b7 + dd51ef4 commit d41dbbd

File tree

95 files changed

+417
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+417
-226
lines changed

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"scripts": {
3-
"linter": "npx eslint ./services/*/client/source/class/*/"
3+
"linter": "npx eslint ./services/*/client/source/class/*/",
4+
"linter-fix": "npx eslint ./services/*/client/source/class/*/ --fix"
45
},
56
"devDependencies": {
67
"babel-eslint": "^10.1.0",

‎services/static-webserver/client/compile.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"class": "osparc.Application",
137137
"theme": "osparc.theme.products.tis.ThemeDark",
138138
"name": "tis",
139-
"title": "TI Plan - IT'IS",
139+
"title": "TIP V3.0 - IT'IS",
140140
"include": [
141141
"iconfont.material.Load",
142142
"iconfont.fontawesome5.Load",
@@ -152,7 +152,7 @@
152152
"class": "osparc.Application",
153153
"theme": "osparc.theme.products.tis.ThemeDark",
154154
"name": "tiplite",
155-
"title": "TI Plan lite - IT'IS",
155+
"title": "TIP.lite - IT'IS",
156156
"include": [
157157
"iconfont.material.Load",
158158
"iconfont.fontawesome5.Load",

‎services/static-webserver/client/scripts/apps_metadata.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,89 @@
33
{
44
"application": "osparc",
55
"replacements": {
6+
"replace_me_favicon_uri": "/resource/osparc/osparc/icons/favicon-32x32.png",
7+
"replace_me_manifest_uri": "/resource/osparc/osparc/manifest.json",
8+
"replace_me_browserconfig_uri": "/resource/osparc/osparc/browserconfig.xml",
69
"replace_me_og_title": "oSPARC",
710
"replace_me_og_description": "open online simulations for Stimulating Peripheral Activity to Relieve Conditions",
811
"replace_me_og_image": "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/master/services/static-webserver/client/source/resource/osparc/favicon-osparc.png"
912
}
1013
}, {
1114
"application": "s4l",
1215
"replacements": {
16+
"replace_me_favicon_uri": "/resource/osparc/s4l/icons/favicon-32x32.png",
17+
"replace_me_manifest_uri": "/resource/osparc/s4l/manifest.json",
18+
"replace_me_browserconfig_uri": "/resource/osparc/s4l/browserconfig.xml",
1319
"replace_me_og_title": "Sim4Life",
1420
"replace_me_og_description": "Computational life sciences platform that combines computable human phantoms, powerful physics solvers and advanced tissue models.",
1521
"replace_me_og_image": "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/full/background-images/S4L/Sim4Life-head-default.png"
1622
}
1723
}, {
1824
"application": "s4lacad",
1925
"replacements": {
26+
"replace_me_favicon_uri": "/resource/osparc/s4l/icons/favicon-32x32.png",
27+
"replace_me_manifest_uri": "/resource/osparc/s4l/manifest.json",
28+
"replace_me_browserconfig_uri": "/resource/osparc/s4l/browserconfig.xml",
2029
"replace_me_og_title": "Sim4Life Science",
2130
"replace_me_og_description": "Sim4Life for Science - Computational life sciences platform that combines computable human phantoms, powerful physics solvers and advanced tissue models.",
2231
"replace_me_og_image": "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/full/background-images/S4L/Sim4Life-head-academy.png"
2332
}
2433
}, {
2534
"application": "s4lengine",
2635
"replacements": {
36+
"replace_me_favicon_uri": "/resource/osparc/s4l/icons/favicon-32x32.png",
37+
"replace_me_manifest_uri": "/resource/osparc/s4l/manifest.json",
38+
"replace_me_browserconfig_uri": "/resource/osparc/s4l/browserconfig.xml",
2739
"replace_me_og_title": "Sim4Life Engineering",
2840
"replace_me_og_description": "Sim4Life for Engineers - Computational life sciences platform that combines computable human phantoms, powerful physics solvers and advanced tissue models.",
2941
"replace_me_og_image": "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/full/background-images/S4L/Sim4Life-head-default.png"
3042
}
3143
}, {
3244
"application": "s4ldesktop",
3345
"replacements": {
46+
"replace_me_favicon_uri": "/resource/osparc/s4l/icons/favicon-32x32.png",
47+
"replace_me_manifest_uri": "/resource/osparc/s4l/manifest.json",
48+
"replace_me_browserconfig_uri": "/resource/osparc/s4l/browserconfig.xml",
3449
"replace_me_og_title": "Sim4Life (Desktop)",
3550
"replace_me_og_description": "Computational life sciences platform that combines computable human phantoms, powerful physics solvers and advanced tissue models.",
3651
"replace_me_og_image": "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/full/background-images/S4L/Sim4Life-head-default.png"
3752
}
3853
}, {
3954
"application": "s4ldesktopacad",
4055
"replacements": {
56+
"replace_me_favicon_uri": "/resource/osparc/s4l/icons/favicon-32x32.png",
57+
"replace_me_manifest_uri": "/resource/osparc/s4l/manifest.json",
58+
"replace_me_browserconfig_uri": "/resource/osparc/s4l/browserconfig.xml",
4159
"replace_me_og_title": "Sim4Life Science (Desktop)",
4260
"replace_me_og_description": "Sim4Life for Science - Computational life sciences platform that combines computable human phantoms, powerful physics solvers and advanced tissue models.",
4361
"replace_me_og_image": "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/full/background-images/S4L/Sim4Life-head-academy.png"
4462
}
4563
}, {
4664
"application": "s4llite",
4765
"replacements": {
66+
"replace_me_favicon_uri": "/resource/osparc/s4l/icons/favicon-32x32.png",
67+
"replace_me_manifest_uri": "/resource/osparc/s4l/manifest.json",
68+
"replace_me_browserconfig_uri": "/resource/osparc/s4l/browserconfig.xml",
4869
"replace_me_og_title": "S4L Lite",
4970
"replace_me_og_description": "Sim4Life for Students - Computational life sciences platform that combines computable human phantoms, powerful physics solvers and advanced tissue models.",
5071
"replace_me_og_image": "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/full/background-images/S4L/Sim4Life-head-lite.png"
5172
}
5273
}, {
5374
"application": "tis",
5475
"replacements": {
76+
"replace_me_favicon_uri": "/resource/osparc/tis/icons/favicon-32x32.png",
77+
"replace_me_manifest_uri": "/resource/osparc/tis/manifest.json",
78+
"replace_me_browserconfig_uri": "/resource/osparc/tis/browserconfig.xml",
5579
"replace_me_og_title": "TI Plan - IT'IS",
5680
"replace_me_og_description": "A tool powered by o²S²PARC technology that reduces optimization of targeted neurostimulation protocols.",
5781
"replace_me_og_image": "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/master/services/static-webserver/client/source/resource/osparc/tip_splitimage.png"
5882
}
5983
}, {
6084
"application": "tiplite",
6185
"replacements": {
86+
"replace_me_favicon_uri": "/resource/osparc/tis/icons/favicon-32x32.png",
87+
"replace_me_manifest_uri": "/resource/osparc/tis/manifest.json",
88+
"replace_me_browserconfig_uri": "/resource/osparc/tis/browserconfig.xml",
6289
"replace_me_og_title": "TI Plan lite - IT'IS",
6390
"replace_me_og_description": "A tool powered by o²S²PARC technology that reduces optimization of targeted neurostimulation protocols.",
6491
"replace_me_og_image": "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/master/services/static-webserver/client/source/resource/osparc/tip_splitimage.png"

‎services/static-webserver/client/scripts/post-compile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def update_apps_metadata():
3131
replacements = i.get("replacements")
3232
for key in replacements:
3333
replace_text = replacements[key]
34-
data = data.replace(key, replace_text)
34+
data = data.replace("${"+key+"}", replace_text)
3535
with open(filename, "w") as file:
3636
print(f"Updating app metadata: {filename}")
3737
file.write(data)

‎services/static-webserver/client/source/boot/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@
2424
<meta name="format-detection" content="telephone=no"/>
2525

2626
<!-- Shortcut icon setup -->
27-
<link rel="shortcut icon" type="image/png" href="${resourcePath}osparc/favicon-osparc.png"/>
27+
<link rel="icon" type="image/png" href="${replace_me_favicon_uri}">
2828

2929
<!-- Manifest -->
30-
<!-- <link rel="manifest" href="/manifest.json"> - dynamically added -->
30+
<link rel="manifest" href="${replace_me_manifest_uri}">
3131

3232
<!-- Safari Pinned Tab Icons -->
3333
<link rel="mask-icon" href="" color="">
3434

3535
<!-- Microsoft Application Icons -->
3636
<meta name="msapplication-TileColor" content="">
3737
<meta name="msapplication-TileImage" content="">
38-
<!-- <meta name="msapplication-config" content="/browserconfig.xml"> - dynamically added -->
38+
<meta name="msapplication-config" content="${replace_me_browserconfig_uri}">
3939

4040
<!-- Theme Color -->
4141
<meta name="theme-color" content="">
4242

4343
<!-- Open Graph metadata -->
44-
<meta property="og:title" content="replace_me_og_title" />
45-
<meta property="og:description" content="replace_me_og_description" />
46-
<meta property="og:image" content="replace_me_og_image" />
44+
<meta property="og:title" content="${replace_me_og_title}" />
45+
<meta property="og:description" content="${replace_me_og_description}" />
46+
<meta property="og:image" content="${replace_me_og_image}" />
4747
<meta property="og:type" content="website" />
4848

4949
<style>
@@ -59,7 +59,7 @@
5959
</style>
6060

6161
<title>${appTitle}</title>
62-
<meta name="description" content="replace_me_og_description" />
62+
<meta name="description" content="${replace_me_og_description}" />
6363

6464
<noscript>
6565
<meta http-equiv="refresh" content="0; url=nojs.html"/>

0 commit comments

Comments
 (0)