From d569e7fb3d2a7fcd1982df65e84f28ede0e61a54 Mon Sep 17 00:00:00 2001
From: ThomasMoraine-R <118221547+splice-7@users.noreply.github.com>
Date: Fri, 17 Feb 2023 13:36:45 +0000
Subject: [PATCH 1/2] Added admin tab and announcement banner

---
 .replit                     | 77 +++++++++++++++++++++++++++++++++++++
 data.json                   |  8 ++++
 package-lock.json           | 11 ++++++
 package.json                |  1 +
 public/adminTab.html        | 46 ++++++++++++++++++++++
 public/css/home.css         | 12 ++++++
 public/home.html            | 11 +++++-
 public/js/extraFunctions.js | 25 ++++++++++++
 replit.nix                  |  8 ++++
 serve.js                    | 44 ++++++++++++++++++++-
 10 files changed, 240 insertions(+), 3 deletions(-)
 create mode 100644 .replit
 create mode 100644 data.json
 create mode 100644 public/adminTab.html
 create mode 100644 replit.nix

diff --git a/.replit b/.replit
new file mode 100644
index 00000000..95b1e626
--- /dev/null
+++ b/.replit
@@ -0,0 +1,77 @@
+
+hidden = [".config", ".editorconfig", ".gitattributes", ".gitignore", ".gitnore", ".github"]
+run = "npm run start"
+
+[[hints]]
+regex = "Error \\[ERR_REQUIRE_ESM\\]"
+message = "We see that you are using require(...) inside your code. We currently do not support this syntax. Please use 'import' instead when using external modules. (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import)"
+
+[nix]
+channel = "stable-22_05"
+
+[env]
+XDG_CONFIG_HOME = "/home/runner/.config"
+PATH = "/home/runner/$REPL_SLUG/.config/npm/node_global/bin:/home/runner/$REPL_SLUG/node_modules/.bin"
+npm_config_prefix = "/home/runner/$REPL_SLUG/.config/npm/node_global"
+
+[gitHubImport]
+requiredFiles = [".replit", "replit.nix", ".config"]
+
+[packager]
+language = "nodejs"
+
+  [packager.features]
+  packageSearch = true
+  guessImports = true
+  enabledForHosting = false
+
+[unitTest]
+language = "nodejs"
+
+[debugger]
+support = true
+
+  [debugger.interactive]
+  transport = "localhost:0"
+  startCommand = [ "dap-node" ]
+
+    [debugger.interactive.initializeMessage]
+    command = "initialize"
+    type = "request"
+
+      [debugger.interactive.initializeMessage.arguments]
+      clientID = "replit"
+      clientName = "replit.com"
+      columnsStartAt1 = true
+      linesStartAt1 = true
+      locale = "en-us"
+      pathFormat = "path"
+      supportsInvalidatedEvent = true
+      supportsProgressReporting = true
+      supportsRunInTerminalRequest = true
+      supportsVariablePaging = true
+      supportsVariableType = true
+
+    [debugger.interactive.launchMessage]
+    command = "launch"
+    type = "request"
+    
+      [debugger.interactive.launchMessage.arguments]  
+      args = []
+      console = "externalTerminal"
+      cwd = "."
+      environment = []
+      pauseForSourceMap = false
+      program = "./index.js"
+      request = "launch"
+      sourceMaps = true
+      stopOnEntry = false
+      type = "pwa-node"
+
+[languages]
+
+[languages.javascript]
+pattern = "**/{*.js,*.jsx,*.ts,*.tsx}"
+
+[languages.javascript.languageServer]
+start = "typescript-language-server --stdio"
diff --git a/data.json b/data.json
new file mode 100644
index 00000000..3b40e16b
--- /dev/null
+++ b/data.json
@@ -0,0 +1,8 @@
+{
+	"announcement": {
+		"content": "Hey, lookat that! It's a new Aspine update! You probably don't care, but for the two people that <i>do</i> care, you can check out the change logs by scrolling down in the <a onclick='openTab(\"information\");'>info tab</a>. These announcements will show up every once in a while, informing you of any upcoming events, school news, or anything else.<br>- The Aspine Devs<span style=\"float: right; font-size: 10px; margin-top: 15px;\">P.S. Admins, to edit the announcement, go to the super secret admin tab</span>",
+		"content-type": "html",
+		"shown": true
+	},
+	"note for dev team": "this system is expandable, feel free to use this file for additional features"
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index eb1246dd..588da8e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,7 @@
         "express-session": "^1.17.1",
         "file-saver": "^2.0.5",
         "fs-extra": "^9.1.0",
+        "fullcalendar": "^5.11.3",
         "jquery": "^3.6.0",
         "jsdom": "^16.5.2",
         "marked": "^4.0.10",
@@ -775,6 +776,11 @@
         "node": ">=10"
       }
     },
+    "node_modules/fullcalendar": {
+      "version": "5.11.3",
+      "resolved": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-5.11.3.tgz",
+      "integrity": "sha512-SgqiMEA+lWLyEd2jEwtIxdfx41j2CZr4KK00D2Gepj1MnGOjaEi13athnU6xvqMQXXjgJNj+vmlUP69QiuGncQ=="
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.9",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
@@ -2181,6 +2187,11 @@
         "universalify": "^2.0.0"
       }
     },
+    "fullcalendar": {
+      "version": "5.11.3",
+      "resolved": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-5.11.3.tgz",
+      "integrity": "sha512-SgqiMEA+lWLyEd2jEwtIxdfx41j2CZr4KK00D2Gepj1MnGOjaEi13athnU6xvqMQXXjgJNj+vmlUP69QiuGncQ=="
+    },
     "graceful-fs": {
       "version": "4.2.9",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
diff --git a/package.json b/package.json
index 3e625ad3..b1c559e6 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "express-session": "^1.17.1",
     "file-saver": "^2.0.5",
     "fs-extra": "^9.1.0",
+    "fullcalendar": "^5.11.3",
     "jquery": "^3.6.0",
     "jsdom": "^16.5.2",
     "marked": "^4.0.10",
diff --git a/public/adminTab.html b/public/adminTab.html
new file mode 100644
index 00000000..aedabfd2
--- /dev/null
+++ b/public/adminTab.html
@@ -0,0 +1,46 @@
+<div id="admin" class="tabcontent">
+	<details>
+		<summary>Server Data</summary>
+		<textarea id="data-input" style="width: 100%; height: 300px;">unable to get server data</textarea>
+		<div style="border-style: outset; color: var(--black); cursor: pointer; width: 200px;" id="data-update-button">Save to Server</div>
+	</details>
+	<p>
+		idk what else to put here so here's a picture of a cat:<br>
+		<img style="width: 128px;" src="https://thiscatdoesnotexist.com"/>
+	</p>
+	
+	<!-- tremble before my bad code -->
+	<script>
+
+async function getData() {
+	let response = await fetch('serverdata');
+	return response.json();
+}
+
+getData().then((data) => {
+	document.getElementById('data-input').value = JSON.stringify(data, null, 2);
+});
+		
+// post function
+async function postData(data) {
+	var response = await fetch(location.origin + '/serverdata', {
+		method: 'POST',
+		headers: {'Content-Type': 'application/json'},
+		body: JSON.stringify(data)
+	});
+	return response.json(); // parses JSON response into native JavaScript objects
+}
+
+document.getElementById('data-update-button').addEventListener('click', () => {
+	try {
+		jsonToPost = JSON.parse(document.getElementById('data-input').value);
+		if (window.confirm("Are you sure you want to change this? This cannot be undone.")) {
+			postData(jsonToPost);
+			location.reload();
+		}
+	} catch(err) {
+		window.alert(err.stack);
+	}
+});
+	</script>
+</div>
\ No newline at end of file
diff --git a/public/css/home.css b/public/css/home.css
index 5c37f227..514d4f61 100644
--- a/public/css/home.css
+++ b/public/css/home.css
@@ -1404,3 +1404,15 @@ hr {
   font-size: 16px;
   font-family: 'Poppins-Regular';
 }
+
+#announcement-banner {
+	display: inline-block;
+	text-align: left;
+	width: 98%;
+	padding: 1em;
+	margin-bottom: 0.5em;
+	border-radius: 16px;
+	color: var(--black);
+	background: var(--white);
+	border: 2px solid var(--green);
+}
\ No newline at end of file
diff --git a/public/home.html b/public/home.html
index 7805ede5..ae61a1da 100644
--- a/public/home.html
+++ b/public/home.html
@@ -77,6 +77,12 @@ <h4 id="title" onclick="openTab('grades')">Aspine</h4>
     </label>
   </div>
 
+	<div id="announcement-banner" style="display: none;">
+		<h3>ANNOUNCEMENT
+			<span class="close" title="go away" onclick="this.parentElement.parentElement.style.display = 'none';">&times;</span>
+		</h3>
+	</div>
+
   <!-- SIDENAV STUFF -->
   <div id="sidenav">
     <!-- switch-exempt makes the switch out of navbar pass over this -->
@@ -85,7 +91,7 @@ <h4 id="title" onclick="openTab('grades')">Aspine</h4>
     </button>
     <hr/>
   </div>
-
+	
   <div class="tab">
     <button class="tablinks hide switch-exempt" onclick="openSideNav()" id="hamburger_button"><i class="fa fa-bars"></i></button>
     <button class="tablinks active" onclick="openTab('grades'); closeSideNav()" id="grades_open">Grades</button>
@@ -120,7 +126,7 @@ <h4 id="title" onclick="openTab('grades')">Aspine</h4>
       </select>
     </div>
   </div>
-
+	
   <!--
   <div id="loader" class="modal" style="background-color: rgba(0,0,0,0.0); padding-top: 300px; display: inline-block;">
     <div id="loader_modal_content" class="model-content" style=" width: 500px; height: 150px; margin: auto;">
@@ -491,6 +497,7 @@ <h2 class="info-header">GPA Type and Switching Quarters</h2>
       </p>
     </div>
   </div>
+	<!-- hidden tab -->
   <p>Aspine version: <span id="version">(loading&hellip;)</span></p>
   <script>
     window.addEventListener('DOMContentLoaded', () => {
diff --git a/public/js/extraFunctions.js b/public/js/extraFunctions.js
index 809d6801..980265fc 100755
--- a/public/js/extraFunctions.js
+++ b/public/js/extraFunctions.js
@@ -806,3 +806,28 @@ let isAccessible = function(term, includedTerms) {
     reason: reason
   };
 }
+
+
+window.getData = async function() {
+	let response = await fetch('serverdata');
+	return response.json();
+}
+
+getData().then((data) => {
+	let announcement = data.announcement;
+	
+	let banner = document.getElementById("announcement-banner");
+	banner.json = JSON.parse(JSON.stringify(announcement));
+	// check if announcement exists
+	if ((announcement.content != null) && announcement.shown) {
+		// show announcement banner
+		banner.style.display = 'inline-block';
+		if (announcement.contentType == 'text') {
+			for (let textPart of announcement.content.split("\n")) {
+				banner.appendChild(document.createTextNode(textPart));
+			}
+		} else {
+			banner.innerHTML += announcement.content;
+		}
+	}
+});
\ No newline at end of file
diff --git a/replit.nix b/replit.nix
new file mode 100644
index 00000000..9d433375
--- /dev/null
+++ b/replit.nix
@@ -0,0 +1,8 @@
+{ pkgs }: {
+	deps = [
+		pkgs.nodejs-16_x
+        pkgs.nodePackages.typescript-language-server
+        pkgs.yarn
+        pkgs.replitPackages.jest
+	];
+}
\ No newline at end of file
diff --git a/serve.js b/serve.js
index f21290c2..a58fc39d 100644
--- a/serve.js
+++ b/serve.js
@@ -25,6 +25,10 @@ const changelog = marked(
 const schedule = TOML.parse(
     fs.readFileSync(__dirname + '/public/schedule.toml')
 );
+// environment variable, someone deal with this
+const admins = JSON.parse(process.env['admins']).map(function (username) {
+  return username.toString();
+});
 
 program
     .version(version)
@@ -195,7 +199,19 @@ app.post('/pdf', async (req, res) => {
 
 app.get('/', async (req, res) => {
     if (req.session.username || req.session.nologin) {
-        res.sendFile(__dirname + '/public/home.html');
+				if (admins.includes(req.session.username)) {
+					// edited home page for admins
+					let adminTab = fs.readFileSync(__dirname + '/public/adminTab.html', "utf8");
+					let homeHTML = fs.readFileSync(__dirname + '/public/home.html', "utf8");
+
+					// fear my bad code
+					homeHTML = homeHTML.replace("<!-- hidden tab -->", adminTab);
+					homeHTML = homeHTML.replace("Info</button>", 'Info</button>\n<button class="tablinks" onclick="openTab(\'admin\'); closeSideNav()" id="admin_open">Admin</button>');
+					res.end(homeHTML);
+				} else {
+        	res.sendFile(__dirname + '/public/home.html');	
+				}
+				
     } else {
         res.redirect('/login');
     }
@@ -227,6 +243,32 @@ app.get('/logout', async (req, res) => {
         res.redirect('/login');
 });
 
+app.get('/serverdata', async (req, res) => {
+	let serverData = JSON.parse(fs.readFileSync(__dirname + '/data.json'));
+	let responseData = {};
+	// maybe modify data before sending it
+	responseData = serverData;
+	res.status(200).send(responseData);
+});
+
+app.post('/serverdata', async (req, res) => {
+	if (admins.includes(req.session.username)) {
+		console.log("server data updated by " + req.session.username);
+		fs.writeFileSync(__dirname + '/data.json', JSON.stringify(req.body, null, "\t"));
+		res.sendStatus(200);
+	} else {
+		console.log(`attepmted server data update by ${req.session.username}, denied`);
+		res.sendStatus(403);
+	}
+});
+
+app.get('/admin', async (req, res) => {
+	if (admins.includes(req.session.username)) {
+		res.sendFile(__dirname + '/public/adminTab.html');
+	} else {
+		res.status(403).send("haha lol you arent admin L bozo<br>..or you're just not <a href=\"login\">logged in</a>");
+	}
+});
 
 app.use((req, res) => {
     res.status(404);

From d65767398b15fb1b56f54226f2914fe57b69f0b9 Mon Sep 17 00:00:00 2001
From: ThomasMoraine-R <9262305-ThomasMoraine-R@users.noreply.replit.com>
Date: Mon, 6 Mar 2023 13:13:14 +0000
Subject: [PATCH 2/2] removed cats

---
 public/adminTab.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/public/adminTab.html b/public/adminTab.html
index aedabfd2..1f0ec7f8 100644
--- a/public/adminTab.html
+++ b/public/adminTab.html
@@ -4,10 +4,6 @@
 		<textarea id="data-input" style="width: 100%; height: 300px;">unable to get server data</textarea>
 		<div style="border-style: outset; color: var(--black); cursor: pointer; width: 200px;" id="data-update-button">Save to Server</div>
 	</details>
-	<p>
-		idk what else to put here so here's a picture of a cat:<br>
-		<img style="width: 128px;" src="https://thiscatdoesnotexist.com"/>
-	</p>
 	
 	<!-- tremble before my bad code -->
 	<script>