updated dependencies and server locations

Author: ConnerWithAnE

server/package.json

@@ -13,7 +13,9 @@
   "license": "ISC",
   "description": "",
   "devDependencies": {
+    "@types/axios": "^0.14.4",
     "@types/jest": "^29.5.14",
+    "@types/jsonwebtoken": "^9.0.7",
     "@types/node": "^22.7.6",
     "@types/sqlite3": "^3.1.11",
     "jest": "^29.7.0",
@@ -26,10 +28,12 @@
     "@types/body-parser": "^1.19.5",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
+    "axios": "^1.7.8",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",
+    "jsonwebtoken": "^9.0.2",
     "openai": "^4.67.3",
     "sqlite": "^5.1.1",
     "sqlite3": "^5.1.7"

web/src/auth/CASCallback.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 
-const BACKEND_URL = 'https://localhost:3000'; // Replace with your backend URL
+const BACKEND_URL = 'https://starr-lab-server.usask.ca/api'; // Replace with your backend URL
 
 const CASCallback: React.FC = () => {
     useEffect(() => {

web/src/auth/ProtectedRoute.tsx

@@ -1,22 +1,24 @@
 function redirectToCAS() {
-  const CAS_SERVER = 'https://cas.usask.ca/cas'; 
-  const FRONTEND_URL = 'https://localhost:5173/'; 
-  const serviceURL = `${FRONTEND_URL}/cas-callback`;
-  
-  window.location.href = `${CAS_SERVER}/login?service=${encodeURIComponent(serviceURL)}`;
-}
+    const CAS_SERVER = "https://cas.usask.ca/cas";
+    const FRONTEND_URL = "https://starr-lab-server.usask.ca:5173/";
+    const serviceURL = `${FRONTEND_URL}/cas-callback`;
 
+    window.location.href = `${CAS_SERVER}/login?service=${encodeURIComponent(
+        serviceURL
+    )}`;
+}
 
-export default function ProtectedRoute({ children }: { children: JSX.Element}) {
-    const token = localStorage.getItem('jwt');
+export default function ProtectedRoute({
+    children,
+}: {
+    children: JSX.Element;
+}) {
+    const token = localStorage.getItem("jwt");
 
     if (!token) {
         redirectToCAS(); // Redirect to CAS login if no JWT
         return null; // Optional: Display a loading spinner while redirecting
     }
 
     return children;
-};
-
-
-
+}

web/vite.config.ts

@@ -4,4 +4,10 @@ import react from '@vitejs/plugin-react'
 // https://vite.dev/config/
 export default defineConfig({
   plugins: [react()],
+  server: {
+    port: 5173,
+    proxy: {
+
+    }
+  }
 })