format

gudchalmers · Mar 18, 2024 · 643e38c · 643e38c
1 parent ea5d71e
commit 643e38c
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 59 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,19 +1,18 @@
 FROM node:20
-WORKDIR /app/frontend
 
+WORKDIR /app/frontend
 COPY frontend/package*.json ./
 RUN npm install
 
-COPY frontend/ ./
-RUN npm run build
-
-ENV NODE_ENV=production
 WORKDIR /app/backend
-
 COPY backend/package*.json ./
 RUN npm install --production
-
 COPY backend/ ./
 
+WORKDIR /app/frontend
+COPY frontend/ ./
+RUN npm run build
+
+WORKDIR /app/backend
 EXPOSE 3000
 CMD ["node", "index.js"]
diff --git a/backend/index.js b/backend/index.js
@@ -189,12 +189,13 @@ app.get("/confirm/:token", async (req, res) => {
 		conn = await pool.getConnection();
 		let sql = "SELECT user_id FROM confirmations WHERE token = ?";
 		const rows = await conn.query(sql, [token]);
-		if (rows.length) {
+		if (rows.length > 0) {
 			// If the token exists, delete it from the database and set the user to active
 			sql = "DELETE FROM confirmations WHERE token = ?";
 			await conn.query(sql, [token]);
 			sql = "UPDATE users SET active = 1 WHERE id = ?";
 			await conn.query(sql, [rows[0].user_id]);
+      console.log(`Token: ${token} has been used to activate an account`)
 			res.send(`Your account has been activated. Redirecting to the home page...
       <script>
         setTimeout(() => {

diff --git a/frontend/app.js b/frontend/app.js
@@ -3,7 +3,11 @@ import { Converter } from "@gorymoon/minecraft-text";
 import tippy from "tippy.js";
 
 import { faMap } from "@fortawesome/free-regular-svg-icons";
-import { faEnvelope, faUser, faSpinner } from "@fortawesome/free-solid-svg-icons";
+import {
+	faEnvelope,
+	faUser,
+	faSpinner,
+} from "@fortawesome/free-solid-svg-icons";
 import { library, dom } from "@fortawesome/fontawesome-svg-core";
 
 library.add(faMap, faEnvelope, faUser, faSpinner);
@@ -20,49 +24,49 @@ const navbarMenu = document.getElementById("navbarMenu");
 
 const navbarBurger = document.getElementById("navbar-burger");
 navbarBurger.addEventListener("click", () => {
-  navbarBurger.classList.toggle("is-active");
-  navbarMenu.classList.toggle("is-active");
+	navbarBurger.classList.toggle("is-active");
+	navbarMenu.classList.toggle("is-active");
 });
 
 document.body.addEventListener("click", (e) => {
-  if (e.target.classList.contains("chs-modal-close")) {
-    const modal = e.target.getAttribute("data-modal");
-    document.getElementById(modal).classList.remove("is-active");
-  }
+	if (e.target.classList.contains("chs-modal-close")) {
+		const modal = e.target.getAttribute("data-modal");
+		document.getElementById(modal).classList.remove("is-active");
+	}
 
-  if (e.target.classList.contains("chs-modal-open")) {
-    const modal = e.target.getAttribute("data-modal");
-    document.getElementById(modal).classList.add("is-active");
-  }
+	if (e.target.classList.contains("chs-modal-open")) {
+		const modal = e.target.getAttribute("data-modal");
+		document.getElementById(modal).classList.add("is-active");
+	}
 
-  if (e.target.classList.contains("modal-background")) {
-    e.target.parentElement.classList.remove("is-active");
-  }
+	if (e.target.classList.contains("modal-background")) {
+		e.target.parentElement.classList.remove("is-active");
+	}
 });
 
 const statusElem = document.getElementById("status");
 async function updateMOTD() {
-  try {
-    const response = await fetch("/ping");
-    const data = await response.json();
-    if (data.error) {
-      throw new Error(data.error);
-    }
-    const rendered = mustache.render(
-      document.getElementById("motd-template-success").innerHTML,
-      {
-        current: data.players.online,
-        max: data.players.max,
-        motd: converter.toHTML(converter.parse(data.description)),
-      }
-    );
-    statusElem.innerHTML = rendered;
-  } catch (error) {
-    console.error(error);
-    statusElem.innerHTML = mustache.render(
-      document.getElementById("motd-template-error").innerHTML
-    );
-  }
+	try {
+		const response = await fetch("/ping");
+		const data = await response.json();
+		if (data.error) {
+			throw new Error(data.error);
+		}
+		const rendered = mustache.render(
+			document.getElementById("motd-template-success").innerHTML,
+			{
+				current: data.players.online,
+				max: data.players.max,
+				motd: converter.toHTML(converter.parse(data.description)),
+			},
+		);
+		statusElem.innerHTML = rendered;
+	} catch (error) {
+		console.error(error);
+		statusElem.innerHTML = mustache.render(
+			document.getElementById("motd-template-error").innerHTML,
+		);
+	}
 }
 
 updateMOTD();

diff --git a/frontend/app.scss b/frontend/app.scss
@@ -3,28 +3,28 @@
 
 html,
 body {
-    font-family: "Open Sans", Arial, Helvetica, sans-serif;
-    background-color: #00acff;
-    overflow-y: auto;
+  font-family: "Open Sans", Arial, Helvetica, sans-serif;
+  background-color: #00acff;
+  overflow-y: auto;
 }
 
 .bg {
-    background-image: url("/images/spawn.png");
-    background-position: center;
-    background-repeat: no-repeat;
-    background-size: cover;
+  background-image: url("/images/spawn.png");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: cover;
 }
 
 #status {
-    color: #ffffff;
-    background-color: #46413F;
-    border-radius: 0.3rem;
-    width: fit-content;
-    margin: 0 auto;
-    margin-bottom: 0.5rem;
-    padding: 1rem;
+  color: #ffffff;
+  background-color: #46413f;
+  border-radius: 0.3rem;
+  width: fit-content;
+  margin: 0 auto;
+  margin-bottom: 0.5rem;
+  padding: 1rem;
 }
 
 #players {
-    cursor: pointer;
-}
+  cursor: pointer;
+}