Frontend refactor: typescript added, updated packages, directory structure and functional components

first-year-scraper/generate_schedule.py

@@ -15,9 +15,9 @@ def format_cell(original_value):
     return [x for sub in original_value.split("\n") for j in sub.split(" ") for x in j.split(",") if x]
 
 def generate_schedule(valid_sheets, workbook, subjects_dict):
-    with open("../frontend/src/schedule.json", "r") as json_data:
+    with open("../frontend/src/data/schedule.json", "r") as json_data:
         schedule_dict = json.load(json_data)
-    with open("../frontend/src/empty_schedule.json", "r") as json_data:
+    with open("../frontend/src/data/empty_schedule.json", "r") as json_data:
         empty_schedule_dict = json.load(json_data)
 
     for sheet in valid_sheets:
@@ -42,10 +42,10 @@ def generate_schedule(valid_sheets, workbook, subjects_dict):
                         if(room in empty_schedule_dict[i][j]):
                             empty_schedule_dict[i][j].remove(room)
 
-    with open("../frontend/src/schedule.json", "w") as outfile:
+    with open("../frontend/src/data/schedule.json", "w") as outfile:
         json.dump(schedule_dict, outfile, indent=2)
 
-    with open("../frontend/src/empty_schedule.json", "w") as outfile:
+    with open("../frontend/src/data/empty_schedule.json", "w") as outfile:
         json.dump(empty_schedule_dict, outfile, indent=2)
 
 

first-year-scraper/generate_subjectDetails.py

@@ -30,13 +30,13 @@ def generate_subjectDetails():
                     get_cell_value(5, i+4).upper()+" TUTORIAL",
                 ]
 
-    with open("../frontend/src/subjectDetails.json", "r") as json_data:
+    with open("../frontend/src/data/subjectDetails.json", "r") as json_data:
         subject_details = json.load(json_data)
 
     for key in subjects_dict.keys():
         subject_details[subjects_dict[key][0]] = subjects_dict[key][1]
 
-    with open("../frontend/src/subjectDetails.json", "w") as outfile:
+    with open("../frontend/src/data/subjectDetails.json", "w") as outfile:
         json.dump(subject_details, outfile, indent=2)
 
     return subjects_dict

frontend/src/App.js

@@ -1,11 +1,11 @@
-import React, { Component, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import "./App.css";
-import CustomTable from "./CustomTable.js";
+import CustomTable from "./components/CustomTable/CustomTable.js";
 import PropTypes from "prop-types";
-import EmptyRoomsTable from "./EmptyRoomsTable.js";
-import TwoSlotDisplay from "./TwoSlotDisplay.js";
+import EmptyRoomsTable from "./components/EmptyRoomTable/EmptyRoomsTable.js";
+import TwoSlotDisplay from "./components/TwoSlotDisplay.js";
 import Logo from "./navbar-icon.svg";
-import { isInsideCampusNetwork } from "./Utilities.js";
+import { isInsideCampusNetwork } from "./util/utilities.js";
 
 function App({ schedule, empty_schedule }) {
   const [loading, setLoading] = useState(true);
@@ -23,14 +23,20 @@ function App({ schedule, empty_schedule }) {
   if (loading)
     return (
       <div className="message-banner">
-        <iframe src="https://lottie.host/?file=ca9a3787-e6db-4878-a0d3-d10dde95b225/MjnHw4B5gw.json"></iframe>
+        <iframe
+          src="https://lottie.host/?file=ca9a3787-e6db-4878-a0d3-d10dde95b225/MjnHw4B5gw.json"
+          title="Loader"
+        ></iframe>
         <div className="message">Chillzone is loading</div>
       </div>
     );
   else if (!show)
     return (
       <div className="message-banner">
-        <iframe src="https://lottie.host/?file=46b58d32-043e-4268-94cd-4d7817565000/xNnhIYFoYA.json"></iframe>
+        <iframe
+          src="https://lottie.host/?file=46b58d32-043e-4268-94cd-4d7817565000/xNnhIYFoYA.json"
+          title="Campus Network Error"
+        ></iframe>
         <div className="message">
           Please connect to IIT Kharagpur campus network to access this site!
         </div>
@@ -44,7 +50,7 @@ function App({ schedule, empty_schedule }) {
         <h3>Find a place to chill, NOW!</h3>
       </header>
 
-      <TwoSlotDisplay date={new Date()} schedule={empty_schedule} />
+      <TwoSlotDisplay schedule={empty_schedule} />
 
       <EmptyRoomsTable schedule={empty_schedule} />
       {Object.keys(schedule).map((key) => {