Reorganise files and update libraries

- Files reorganised into directories. - Firebase libraries updated. Others are up to date already.
shraiysh · Dec 12, 2019 · 0f83f34 · 0f83f34
1 parent 9b5ad9c
commit 0f83f34
Show file tree

Hide file tree

Showing 25 changed files with 22 additions and 27 deletions.
diff --git a/firebase-app.js b/firebase-app.js
diff --git a/firebase-auth.js b/firebase-auth.js
diff --git a/firebase-firestore.js b/firebase-firestore.js
diff --git a/ADAM.otf → fonts/ADAM.otf b/ADAM.otf → fonts/ADAM.otf
diff --git a/OpenSans-Light.ttf → fonts/OpenSans-Light.ttf b/OpenSans-Light.ttf → fonts/OpenSans-Light.ttf
diff --git a/Roboto-Regular.ttf → fonts/Roboto-Regular.ttf b/Roboto-Regular.ttf → fonts/Roboto-Regular.ttf
diff --git a/google.txt b/google.txt
diff --git a/js/firebase-app.js b/js/firebase-app.js
diff --git a/js/firebase-auth.js b/js/firebase-auth.js
diff --git a/js/firebase-firestore.js b/js/firebase-firestore.js
diff --git a/html2pdf.bundle.min.js → js/html2pdf.bundle.min.js b/html2pdf.bundle.min.js → js/html2pdf.bundle.min.js
diff --git a/jquery-3.4.1.min.js → js/jquery-3.4.1.min.js b/jquery-3.4.1.min.js → js/jquery-3.4.1.min.js
diff --git a/manifest.json b/manifest.json
@@ -3,11 +3,11 @@
     "name": "AIMS-Helper",
     "version": "0.1",
     "background": {
-      "scripts": ["background.js"],
+      "scripts": ["/src/bg/background.js"],
       "persistent":false
     },
     "page_action": {
-      "default_popup":"popup.html "
+      "default_popup":"/src/popup/popup.html"
     },
     "content_security_policy":"script-src 'self' https://www.gstatic.com/ https://*.firebaseio.com https://www.googleapis.com https://apis.google.com; object-src 'self'",
     "permissions": ["declarativeContent", "storage", "tabs", "<all_urls>","http://*/","https://*/", "identity"],

diff --git a/spinner.gif → res/spinner.gif b/spinner.gif → res/spinner.gif
diff --git a/slotInfo.json b/slotInfo.json
diff --git a/background.js → src/bg/background.js b/background.js → src/bg/background.js
@@ -14,6 +14,6 @@
     function(request, sender)
     {
       if (request.action == "LaunchTimetableFile")
-        chrome.tabs.create({ url: chrome.runtime.getURL("table.html") });
+        chrome.tabs.create({ url: chrome.runtime.getURL("/src/timetable/table.html") });
     } 
   );
diff --git a/activateGPA.js → src/gpa/activateGPA.js b/activateGPA.js → src/gpa/activateGPA.js
diff --git a/gpa_report.html → src/gpa/gpa_report.html b/gpa_report.html → src/gpa/gpa_report.html
@@ -5,7 +5,7 @@
     <style type="text/css">
       @font-face {
       font-family: Roboto;
-      src: url('Roboto-Regular.ttf');
+      src: url('/fonts/Roboto-Regular.ttf');
     }
       body{
         text-align: center;
@@ -122,7 +122,7 @@ <h1>Selected Courses</h1>
     </div>
     <br/>
     <button class="download-pdf">Download PDF</button>
-    <script src="html2pdf.bundle.min.js"></script>
+    <script src="/js/html2pdf.bundle.min.js"></script>
     <script src="gpa_report.js"></script>
   </body>
 </html>
diff --git a/gpa_report.js → src/gpa/gpa_report.js b/gpa_report.js → src/gpa/gpa_report.js
diff --git a/popup.html → src/popup/popup.html b/popup.html → src/popup/popup.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
     <head>
-      <script src="jquery.js"></script>
         <style>
           body {
             box-sizing: border-box;
@@ -67,7 +66,7 @@
         <button class="generate-timetable-button">Generate Timetable</button>
         <button class="calculate-gpa-button">Calculate GPA</button>
         </div>
-        <img src="spinner.gif" id="loading-image"/>
+        <img src="/res/spinner.gif" id="loading-image"/>
         <script src="popup.js"></script>
     </body>
 </html>
diff --git a/popup.js → src/popup/popup.js b/popup.js → src/popup/popup.js
@@ -27,7 +27,7 @@ chrome.runtime.onMessage.addListener(function(request, sender) {
 
 function onWindowLoad() {
 	chrome.tabs.executeScript(null, {
-    file: "getSource.js"
+    file: "/src/timetable/getSource.js"
   }, function() {
     if (chrome.runtime.lastError) {
       console.log(chrome.runtime.lastError.message);
@@ -48,7 +48,7 @@ function removeLoading() {
 function injectTimetable() {
     showLoading();
 	chrome.tabs.executeScript(null, {
-		file: "activateTimetable.js"
+		file: "/src/timetable/activateTimetable.js"
 	}, function() {
 		if (chrome.runtime.lastError)	console.log(chrome.runtime.lastError.message);
 	});
@@ -57,10 +57,10 @@ function injectTimetable() {
 function injectGPA() {
     showLoading();
     chrome.tabs.executeScript(null, {
-        file: "jquery-3.4.1.min.js"
+        file: "/js/jquery-3.4.1.min.js"
     }, function(result){
         chrome.tabs.executeScript(null, {
-            file: "activateGPA.js"
+            file: "/src/gpa/activateGPA.js"
         }, function() {
             if(chrome.runtime.lastError) console.log(chrome.runtime.lastError.message);
         });
@@ -75,7 +75,7 @@ chrome.runtime.onMessage.addListener(function(request, sender){
         //TODO: use the courses and GPA to display in another tab.
 
         localStorage.setItem("courseGPA", JSON.stringify(request.data));
-        chrome.tabs.create({ url: chrome.runtime.getURL("gpa_report.html")});
+        chrome.tabs.create({ url: chrome.runtime.getURL("/src/gpa/gpa_report.html")});
     }
 });
 document.getElementsByClassName("generate-timetable-button")[0].onclick = function() {

diff --git a/activateTimetable.js → src/timetable/activateTimetable.js b/activateTimetable.js → src/timetable/activateTimetable.js
diff --git a/getSource.js → src/timetable/getSource.js b/getSource.js → src/timetable/getSource.js
diff --git a/table.html → src/timetable/table.html b/table.html → src/timetable/table.html
@@ -5,7 +5,7 @@
 	<style type="text/css">
 		@font-face {
 			font-family: Title;
-			src: url('OpenSans-Light.ttf');
+			src: url('/fonts/OpenSans-Light.ttf');
 		}
 		html {
 			background-color: #1F2739;
@@ -263,10 +263,10 @@
 	<button class="download-pdf">Download PDF</button>&nbsp;&nbsp;&nbsp;
 	<button class="send-to-db">Upload timetable</button>
 	</div>
-	<script src="firebase-app.js"></script>
-	<script src="firebase-auth.js"></script>
-	<script src="firebase-firestore.js"></script>	
-	<script src="html2pdf.bundle.min.js"></script>
+	<script src="/js/firebase-app.js"></script>
+	<script src="/js/firebase-auth.js"></script>
+	<script src="/js/firebase-firestore.js"></script>	
+	<script src="/js/html2pdf.bundle.min.js"></script>
 	<script src="table.js"></script>
 </body>
 </html>
diff --git a/table.js → src/timetable/table.js b/table.js → src/timetable/table.js