Bunk Meter fix and more

Codebotics · Jun 11, 2020 · 3a4c1de · 3a4c1de
1 parent 2c7fc4a
commit 3a4c1de
Show file tree

Hide file tree

Showing 9 changed files with 175 additions and 64 deletions.
diff --git a/VITask Desktop/.gitignore b/VITask Desktop/.gitignore
@@ -1,3 +1,4 @@
 .vscode/
 node_modules/
 dashboard/userdata/
+release-builds/
diff --git a/VITask Desktop/build.js b/VITask Desktop/build.js
@@ -3,13 +3,15 @@ var electronInstaller = require('electron-winstaller');
 // In this case, we can use relative paths
 var settings = {
     // Specify the folder where the built app is located
-    appDirectory: './release-builds/VITask-win32-ia32',
+    appDirectory: './release-builds/VITask-win32-x64',
     // Specify the existing folder where 
     outputDirectory: './installer',
     // The name of the Author of the app (the name of your company)
     authors: 'VITask',
     // The name of the executable of your built
-    exe: './VITask.exe'
+    exe: './VITask.exe',
+    // Setup loading gif
+    loadingGif: './preview.gif'
 };
 
 resultPromise = electronInstaller.createWindowsInstaller(settings);

diff --git a/VITask Desktop/dashboard.html b/VITask Desktop/dashboard.html
diff --git a/VITask Desktop/electron-packager.txt b/VITask Desktop/electron-packager.txt
@@ -0,0 +1 @@
+electron-packager "C:\Users\aprat\Desktop\Github\VITask\VITask Desktop" --platform=win32 --arch=x64 --icon="./icons/win/icon.ico" --overwrite VITask
diff --git a/VITask Desktop/index.html b/VITask Desktop/index.html
@@ -212,7 +212,7 @@ <h4 class="card-title"><img src="assets/img/icon.png" style="height: 100%; width
                         console.log('error:', err);
                       } else {
                         let result = body;
-                        if(result.Error){
+                        if(result.error){
                             $("#loading").fadeOut();
                             $("#content").fadeIn(); 
                             alert("Wrong Password.");
@@ -224,23 +224,19 @@ <h4 class="card-title"><img src="assets/img/icon.png" style="height: 100%; width
 
                         data.insert(result, function(err, doc) {
                         console.log('Inserted', doc.Name);
-                        });
-
-                        data.findOne({ profile: 'user-profile' }, function(err, doc) {
-
-
                             timetable(doc.APItoken, function() {
-                                acadhistory(doc.APItoken, function(){
-                                    marks(doc.APItoken, function(){
-                                        attendance(doc.APItoken, function(){
-                                            ipcRenderer.send('login:new','loggedin');
-                                            done(doc.APItoken);
+                                    acadhistory(doc.APItoken, function(){
+                                        marks(doc.APItoken, function(){
+                                            attendance(doc.APItoken, function(){
+                                                ipcRenderer.send('login:new','loggedin');
+                                                done(doc.APItoken);
+                                            });
                                         });
                                     });
                                 });
-                            });
-
                         });
+
+
                         }
                     } 
                 });

diff --git a/VITask Desktop/main.js b/VITask Desktop/main.js
@@ -254,7 +254,6 @@ if(process.platform=="darwin"){
 }
 
 
-
 function handleSquirrelEvent(application) {
     if (process.argv.length === 1) {
         return false;

diff --git a/VITask Desktop/package-lock.json b/VITask Desktop/package-lock.json
diff --git a/VITask Desktop/package.json b/VITask Desktop/package.json
@@ -1,13 +1,13 @@
 {
   "name": "VITask",
   "productName": "VITask",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "The most powerful VTOP API server!",
   "main": "main.js",
   "scripts": {
     "start": "electron ."
   },
-  "author": "Apratim Shukla",
+  "author": "VITask Team",
   "license": "MIT",
   "dependencies": {
     "electron": "^7.1.10",

diff --git a/VITask Desktop/preview.gif b/VITask Desktop/preview.gif