This is an automated email from the ASF dual-hosted git repository.
smarru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-sandbox.git
commit 74b501053d845a23c8659ff43002aab9c12b03d6
Author: BECOB257_Aishwarya Sinhasane <avsin...@iu.edu>
AuthorDate: Tue Jul 26 14:34:13 2022 -0400
JSME Editor added
---
gsoc2022/seagrid-rich-client/JSME-webpack-example | 1 +
gsoc2022/seagrid-rich-client/main.js | 18 +++++++++++++++---
gsoc2022/seagrid-rich-client/ngl | 1 -
gsoc2022/seagrid-rich-client/package-lock.json | 14 +++++++-------
gsoc2022/seagrid-rich-client/package.json | 2 +-
5 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/gsoc2022/seagrid-rich-client/JSME-webpack-example
b/gsoc2022/seagrid-rich-client/JSME-webpack-example
new file mode 160000
index 00000000..07b3a035
--- /dev/null
+++ b/gsoc2022/seagrid-rich-client/JSME-webpack-example
@@ -0,0 +1 @@
+Subproject commit 07b3a035775fc3f5b6cb7b2dc0288e68d123e1c9
diff --git a/gsoc2022/seagrid-rich-client/main.js
b/gsoc2022/seagrid-rich-client/main.js
index b9f64f71..c0dad527 100644
--- a/gsoc2022/seagrid-rich-client/main.js
+++ b/gsoc2022/seagrid-rich-client/main.js
@@ -54,6 +54,18 @@ function createJSMolWindow () {
JSMolWindow.loadFile("C:\\Users\\aishw\\gsoc\\airavata-gsoc2022\\airavata-sandbox\\gsoc2022\\seagrid-rich-client\\ui\\samplemol.html")
//editorWindow.loadURL("http://nglviewer.org/ngl/?script=showcase/ferredoxin";)
}
+function createJSMEWindow(){
+ const JSMEWindow = new BrowserWindow({
+ width: 800,
+ height: 600,
+ webPreferences: {
+ preload: path.join(__dirname, 'preload.js')
+ }
+ })
+
+ // and load the login page for app
+
JSMEWindow.loadFile("C:\\Users\\aishw\\gsoc\\airavata-gsoc2022\\airavata-sandbox\\gsoc2022\\seagrid-rich-client\\JSME-webpack-example\\dist\\index.html")
+}
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs.
@@ -87,12 +99,12 @@ app.whenReady().then(() => {
]
});
menu.splice(2,0,{
- label: 'Applicaion Editor',
+ label: 'Molecule Editor',
submenu: [
{
- label: 'G09',
+ label: 'JSME Editor',
click: (item, focusedWindow) => {
- dialog.showMessageBox({message: 'Do something', buttons: ['OK'] });
+ createJSMEWindow()
}
}
]
diff --git a/gsoc2022/seagrid-rich-client/ngl b/gsoc2022/seagrid-rich-client/ngl
deleted file mode 160000
index bd4a31c7..00000000
--- a/gsoc2022/seagrid-rich-client/ngl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bd4a31c72e007d170b6bae298a5f7c976070e173
diff --git a/gsoc2022/seagrid-rich-client/package-lock.json
b/gsoc2022/seagrid-rich-client/package-lock.json
index 5c554ad9..23fdf74a 100644
--- a/gsoc2022/seagrid-rich-client/package-lock.json
+++ b/gsoc2022/seagrid-rich-client/package-lock.json
@@ -13,7 +13,7 @@
"ngl": "^0.10.4"
},
"devDependencies": {
- "electron": "^19.0.4"
+ "electron": "^19.0.9"
}
},
"node_modules/@electron/get": {
@@ -251,9 +251,9 @@
"dev": true
},
"node_modules/electron": {
- "version": "19.0.4",
- "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.4.tgz";,
- "integrity":
"sha512-roRYr1VNAWIhjD9n8qZdmhROtrzsFpuZEXrjWAw+GqPbZlrUInmvFCviRDC2Lt+VBsTNRpTfPpfzXSlLL4reEw==",
+ "version": "19.0.9",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.9.tgz";,
+ "integrity":
"sha512-ooEwrv8Y7NSzdhKcl6kPCYecnzcg5nFWuS5ryG+VFH3MMBR8zXh9nW2wLsZrBz6OGUxXrcc5BKBC7dA8C6RhGQ==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
@@ -1184,9 +1184,9 @@
"dev": true
},
"electron": {
- "version": "19.0.4",
- "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.4.tgz";,
- "integrity":
"sha512-roRYr1VNAWIhjD9n8qZdmhROtrzsFpuZEXrjWAw+GqPbZlrUInmvFCviRDC2Lt+VBsTNRpTfPpfzXSlLL4reEw==",
+ "version": "19.0.9",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.9.tgz";,
+ "integrity":
"sha512-ooEwrv8Y7NSzdhKcl6kPCYecnzcg5nFWuS5ryG+VFH3MMBR8zXh9nW2wLsZrBz6OGUxXrcc5BKBC7dA8C6RhGQ==",
"dev": true,
"requires": {
"@electron/get": "^1.14.1",
diff --git a/gsoc2022/seagrid-rich-client/package.json
b/gsoc2022/seagrid-rich-client/package.json
index 85007893..f8a00601 100644
--- a/gsoc2022/seagrid-rich-client/package.json
+++ b/gsoc2022/seagrid-rich-client/package.json
@@ -16,7 +16,7 @@
"author": "Aishwarya",
"license": "CC0-1.0",
"devDependencies": {
- "electron": "^19.0.4"
+ "electron": "^19.0.9"
},
"dependencies": {
"electron-default-menu": "^1.0.2",
