diff --git a/src/main.js b/src/main.js index 48c5a49..51b4242 100644 --- a/src/main.js +++ b/src/main.js @@ -9,7 +9,6 @@ const electronLocalshortcut = require('electron-localshortcut'); require('electron-reload')(process.cwd()) - // create a new todo store name "Todos Main" const todosData = new DataStore({ name: 'Todos Main' }) @@ -73,8 +72,8 @@ function main () { }) // Disable menu bar - newServerDialog.setMenu(null) - newServerDialog.setAutoHideMenuBar(true) + // newServerDialog.setMenu(null) + // newServerDialog.setAutoHideMenuBar(true) // cleanup newServerDialog.on('closed', () => { diff --git a/src/renderer/new_server/advanceduser.css b/src/renderer/new_server/advanceduser.css new file mode 100644 index 0000000..e69de29 diff --git a/src/renderer/new_server/advanceduser.html b/src/renderer/new_server/advanceduser.html new file mode 100644 index 0000000..7ca0338 --- /dev/null +++ b/src/renderer/new_server/advanceduser.html @@ -0,0 +1,57 @@ + + + + + Create new server + + + + + +
+
+ +

Advanced configuration

+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ +
+ Need help? +
+ + + + + + + + + + diff --git a/src/renderer/new_server/advanceduser.js b/src/renderer/new_server/advanceduser.js new file mode 100644 index 0000000..0b31196 --- /dev/null +++ b/src/renderer/new_server/advanceduser.js @@ -0,0 +1,17 @@ +'use strict' + +const { ipcRenderer } = require('electron') +const electron = require('electron') +const path = require('path') +const remote = electron.remote + +document.getElementById('backBtn').addEventListener('click', (evt) => { + var window = remote.getCurrentWindow(); + window.webContents.goBack() +}) + +document.getElementById('cancelBtn').addEventListener('click', (evt) => { + var window = remote.getCurrentWindow(); + window.close() +}) + \ No newline at end of file diff --git a/src/renderer/new_server/newserver.css b/src/renderer/new_server/newserver.css index 092c7ec..5a9dd5d 100644 --- a/src/renderer/new_server/newserver.css +++ b/src/renderer/new_server/newserver.css @@ -3,6 +3,7 @@ body { } .need-help-link { + font-size: small; text-align: right; position:absolute; bottom:0; @@ -18,9 +19,37 @@ body { .large-header { padding-top: 10%; + padding-bottom: 8%; + padding-left: 0; +} + +.back-btn { + padding-right: 3%; +} + +.advanced-config-btn-grp { + margin-top: 7%; +} + +.form-inline-link-div { + width: 15%; + display: flex; + justify-content: center; +} + +.form-inline-link { + margin-bottom: 0; + padding-bottom: 0; +} + +#advanced-config-header { padding-bottom: 10%; } +.no-top-padding { + padding-top: 0%; +} + .vertical-center { background-color: #fffbf6 !important; min-height: 100%; /* Fallback for browsers do NOT support vh unit */ @@ -34,31 +63,21 @@ body { margin-right:0%; padding-right: 0%; padding-left: 1%; - opacity: 0.8; } .text-col { padding-left: 2.5%; - opacity: 0.8; -} - -.icon-col:hover { - opacity: 1; -} - -.text-col:hover { - opacity: 1; } .descriptive-option { + opacity: 0.8; padding-top: 2%; padding-bottom: 2%; - /* margin-top: 5%; */ height: 20%; - /* table-layout: fixed; */ } .descriptive-option:hover { + opacity: 1; background: #f8f2eb; cursor: pointer; } \ No newline at end of file diff --git a/src/renderer/new_server/newserver.html b/src/renderer/new_server/newserver.html index 827e65d..c7190bb 100644 --- a/src/renderer/new_server/newserver.html +++ b/src/renderer/new_server/newserver.html @@ -9,7 +9,7 @@
-
+

Create new server

Choose an option to proceed @@ -17,10 +17,10 @@

Create new server

- +
-

Beginner

+

Beginner

I just need local JupyterLab running
@@ -28,10 +28,10 @@

Beginner

- +
-

Advanced user

+

Advanced user

I want to make sure everything is right
diff --git a/src/renderer/new_server/newserver.js b/src/renderer/new_server/newserver.js index 084e89d..c3fe6e6 100644 --- a/src/renderer/new_server/newserver.js +++ b/src/renderer/new_server/newserver.js @@ -3,9 +3,11 @@ const { ipcRenderer } = require('electron') const electron = require('electron') const path = require('path') +const url = require('url') const remote = electron.remote -document.getElementById('close-btn').addEventListener('click', (evt) => { - var window = remote.getCurrentWindow(); - window.close(); +document.getElementById('advancedUser').addEventListener('click', (evt) => { + var filePath = path.join('renderer', 'new_server', 'advanceduser.html'); + console.log(filePath); + remote.getCurrentWindow().loadFile(filePath); })