Skip to content

Commit d1da92e

Browse files
odeimaizodeimaiz
authored
🎨 Feature: Tour de S4L (#4737)
1 parent 7015005 commit d1da92e

Some content is hidden

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

49 files changed

+924
-621
lines changed

‎services/static-webserver/client/source/class/osparc/Application.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ qx.Class.define("osparc.Application", {
478478
if (this.__mainPage) {
479479
this.__mainPage.closeEditor();
480480
}
481-
osparc.panddy.Panddy.getInstance().stop();
482481
osparc.utils.Utils.closeHangingWindows();
483482
osparc.store.Store.getInstance().dispose();
484483
this.__restart();

‎services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,9 @@ qx.Class.define("osparc.dashboard.Dashboard", {
3838
construct: function() {
3939
this.base(arguments);
4040

41+
osparc.utils.Utils.setIdToWidget(this.getChildControl("bar"), "dashboardTabs");
4142
osparc.utils.Utils.setIdToWidget(this, "dashboard");
4243

43-
if (osparc.product.panddy.Utils.hasPanddy()) {
44-
const panddy = osparc.panddy.Panddy.getInstance();
45-
const root = qx.core.Init.getApplication().getRoot();
46-
root.add(panddy, {
47-
bottom: 10,
48-
right: 10
49-
});
50-
setTimeout(() => panddy.start(), 2000);
51-
}
52-
5344
this.set({
5445
contentPaddingTop: 15,
5546
contentPaddingLeft: 0,

‎services/static-webserver/client/source/class/osparc/dashboard/GridButtonItem.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
6565
visibility: "excluded",
6666
alignY: "bottom"
6767
});
68+
osparc.utils.Utils.setIdToWidget(control, "updateStudyBtn");
6869
this._mainLayout.add(control, osparc.dashboard.GridButtonBase.POS.UPDATES);
6970
break;
7071
case "hits-service":
@@ -221,6 +222,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
221222
const menuButton = this.getChildControl("menu-button");
222223
if (value) {
223224
menuButton.setMenu(value);
225+
osparc.utils.Utils.setIdToWidget(value, "studyItemMenuMenu");
224226
}
225227
menuButton.setVisibility(value ? "visible" : "excluded");
226228
}

‎services/static-webserver/client/source/class/osparc/dashboard/ListButtonItem.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
133133
source: "@MaterialIcons/update/18",
134134
visibility: "excluded"
135135
});
136+
osparc.utils.Utils.setIdToWidget(control, "updateStudyBtn");
136137
this._add(control, {
137138
row: 0,
138139
column: osparc.dashboard.ListButtonBase.POS.UPDATES
@@ -251,6 +252,7 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
251252
const menuButton = this.getChildControl("menu-button");
252253
if (value) {
253254
menuButton.setMenu(value);
255+
osparc.utils.Utils.setIdToWidget(value, "studyItemMenuMenu");
254256
}
255257
menuButton.setVisibility(value ? "visible" : "excluded");
256258
}

‎services/static-webserver/client/source/class/osparc/dashboard/ResourceMoreOptions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
109109
const title = new qx.ui.basic.Label(resourceData.name).set({
110110
font: "text-16",
111111
alignY: "middle",
112-
maxWidth: 300,
112+
maxWidth: this.self().WIDTH-100,
113113
rich: true,
114114
wrap: true
115115
});

‎services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,14 +212,14 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
212212
}
213213

214214
// Show Quick Start if studies.length === 0
215-
const tutorial = osparc.product.tutorial.Utils.getTutorial();
216-
if (tutorial) {
217-
const dontShow = osparc.utils.Utils.localCache.getLocalStorageItem(tutorial.localStorageStr);
215+
const quickStart = osparc.product.quickStart.Utils.getQuickStart();
216+
if (quickStart) {
217+
const dontShow = osparc.utils.Utils.localCache.getLocalStorageItem(quickStart.localStorageStr);
218218
if (dontShow === "true") {
219219
return;
220220
}
221221
if (nStudies === 0) {
222-
const tutorialWindow = tutorial.tutorial();
222+
const tutorialWindow = quickStart.tutorial();
223223
tutorialWindow.center();
224224
tutorialWindow.open();
225225
}

‎services/static-webserver/client/source/class/osparc/desktop/MainPage.js‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,10 @@ qx.Class.define("osparc.desktop.MainPage", {
6161
osparc.desktop.credits.Utils.areWalletsEnabled()
6262
.then(walletsEnabled => {
6363
if (walletsEnabled) {
64-
const creditsWindow = osparc.desktop.credits.CreditsWindow.openWindow(true);
64+
const creditsWindow = osparc.desktop.credits.UserCenterWindow.openWindow(walletsEnabled);
6565
creditsWindow.openOverview();
6666
}
6767
});
68-
// setTimeout(() => osparc.desktop.MainPageHandler.getInstance().showUserCenter(), 1000);
6968
}
7069
const preferenceSettings = osparc.Preferences.getInstance();
7170
const preferenceWalletId = preferenceSettings.getPreferredWalletId();
@@ -98,7 +97,6 @@ qx.Class.define("osparc.desktop.MainPage", {
9897
__navBar: null,
9998
__dashboard: null,
10099
__dashboardLayout: null,
101-
__userCenter: null,
102100
__loadingPage: null,
103101
__studyEditor: null,
104102

@@ -203,9 +201,6 @@ qx.Class.define("osparc.desktop.MainPage", {
203201
const dashboardLayout = this.__dashboardLayout = this.__createDashboardStack();
204202
mainPageHandler.addDashboard(dashboardLayout);
205203

206-
const userCenterLayout = this.__createUserCenter();
207-
mainPageHandler.addUserCenter(userCenterLayout);
208-
209204
const loadingPage = this.__loadingPage = new osparc.ui.message.Loading();
210205
mainPageHandler.addLoadingPage(loadingPage);
211206

@@ -249,20 +244,6 @@ qx.Class.define("osparc.desktop.MainPage", {
249244
return dashboardLayout;
250245
},
251246

252-
__createUserCenter: function() {
253-
const userCenter = this.__userCenter = new osparc.desktop.credits.UserCenter(true);
254-
255-
const userCenterLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
256-
userCenterLayout.add(new qx.ui.core.Widget(), {
257-
flex: 1
258-
});
259-
userCenterLayout.add(userCenter);
260-
userCenterLayout.add(new qx.ui.core.Widget(), {
261-
flex: 1
262-
});
263-
return userCenterLayout;
264-
},
265-
266247
__attachHandlers: function() {
267248
const studyBrowser = this.__dashboard.getStudyBrowser();
268249
studyBrowser.addListener("publishTemplate", e => this.__publishTemplate(e.getData()));

‎services/static-webserver/client/source/class/osparc/desktop/MainPageHandler.js‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ qx.Class.define("osparc.desktop.MainPageHandler", {
2727
__stack: null,
2828
__loadingPage: null,
2929
__dashboard: null,
30-
__userCenter: null,
3130
__studyEditor: null,
3231

3332
setStack: function(stack) {
@@ -44,11 +43,6 @@ qx.Class.define("osparc.desktop.MainPageHandler", {
4443
this.__stack.add(dashboard);
4544
},
4645

47-
addUserCenter: function(userCenter) {
48-
this.__userCenter = userCenter;
49-
this.__stack.add(userCenter);
50-
},
51-
5246
addStudyEditor: function(studyEditor) {
5347
this.__studyEditor = studyEditor;
5448
this.__stack.add(studyEditor);
@@ -62,10 +56,6 @@ qx.Class.define("osparc.desktop.MainPageHandler", {
6256
this.__stack.setSelection([this.__dashboard]);
6357
},
6458

65-
showUserCenter: function() {
66-
this.__stack.setSelection([this.__userCenter]);
67-
},
68-
6959
showStudyEditor: function() {
7060
this.__stack.setSelection([this.__studyEditor]);
7161
},

‎services/static-webserver/client/source/class/osparc/desktop/credits/CreditsIndicator.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ qx.Class.define("osparc.desktop.credits.CreditsIndicator", {
5252
this.addListener("tap", () => {
5353
osparc.desktop.credits.Utils.areWalletsEnabled()
5454
.then(walletsEnabled => {
55-
const creditsWindow = osparc.desktop.credits.CreditsWindow.openWindow(walletsEnabled);
55+
const creditsWindow = osparc.desktop.credits.UserCenterWindow.openWindow(walletsEnabled);
5656
creditsWindow.openWallets();
5757
});
5858
}, this);

services/static-webserver/client/source/class/osparc/desktop/credits/CreditsWindow.js renamed to services/static-webserver/client/source/class/osparc/desktop/credits/UserCenterWindow.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
************************************************************************ */
1717

18-
qx.Class.define("osparc.desktop.credits.CreditsWindow", {
18+
qx.Class.define("osparc.desktop.credits.UserCenterWindow", {
1919
extend: osparc.ui.window.SingletonWindow,
2020

2121
construct: function(walletsEnabled = false) {
@@ -41,7 +41,7 @@ qx.Class.define("osparc.desktop.credits.CreditsWindow", {
4141

4242
statics: {
4343
openWindow: function(walletsEnabled = false) {
44-
const accountWindow = new osparc.desktop.credits.CreditsWindow(walletsEnabled);
44+
const accountWindow = new osparc.desktop.credits.UserCenterWindow(walletsEnabled);
4545
accountWindow.center();
4646
accountWindow.open();
4747
return accountWindow;

0 commit comments

Comments
 (0)