Merge branch 'develop' into feature/switchSidebarPosition

Author: tomaspalma

.env.example

@@ -1,14 +1,17 @@
 VITE_APP_PROD=0
+VITE_APP_STAGING=0
 VITE_APP_RELEASE_DATE=2023-01-27
 PORT=3100
 VITE_APP_PLAUSIBLE_DOMAIN=
 VITE_APP_PLAUSIBLE_HOST=
 VITE_APP_SEMESTER=
 VITE_APP_SITE_TITLE=
 VITE_APP_BACKEND_URL=
+VITE_APP_T_CLASS_CONFLICTS=0  # Specify whether theoretical classes should generate conflicts
 
 VITE_APP_SENTRY_DSN=https://01f0882e6aa029a125426e4ad32e6c18@o553498.ingest.us.sentry.io/4507775325437952
 VITE_APP_SENTRY_TRACING=0
 
+
 # To upload source maps to Sentry (Optional)
-APP_SENTRY_AUTH_TOKEN=
+APP_SENTRY_AUTH_TOKEN=«

dev.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e # abort script if any command fails
 
-docker compose up $1 tts-frontend
+docker compose up $1 tts-frontend

docker-compose.yaml

@@ -25,3 +25,7 @@ services:
       - ./public:/usr/src/tts-fe/public
     ports:
       - 3100:80
+
+networks:
+  default:
+    name: tts-docker-network

package-lock.json

@@ -6,20 +6,25 @@
   "dependencies": {
     "@headlessui/react": "^1.7.17",
     "@heroicons/react": "^2.1.1",
+    "@hookform/resolvers": "3.10.0",
     "@radix-ui/react-alert-dialog": "^1.0.5",
-    "@radix-ui/react-checkbox": "^1.0.4",
+    "@radix-ui/react-avatar": "1.1.0",
+    "@radix-ui/react-checkbox": "1.0.4",
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
-    "@radix-ui/react-label": "^2.0.2",
+    "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-scroll-area": "^1.0.5",
     "@radix-ui/react-separator": "^1.0.3",
-    "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-tabs": "^1.0.4",
     "@radix-ui/react-toast": "^1.1.5",
     "@radix-ui/react-toggle": "^1.0.3",
     "@radix-ui/react-toggle-group": "^1.0.4",
     "@radix-ui/react-tooltip": "^1.0.7",
+    "@radix-ui/react-hover-card": "1.1.4",
+    "@radix-ui/react-select": "2.1.1",
+    "@radix-ui/react-switch": "1.1.0",
     "@sentry/react": "^8.33.1",
     "@sentry/vite-plugin": "^2.22.1",
     "@testing-library/jest-dom": "^5.16.4",
@@ -35,26 +40,33 @@
     "classnames": "^2.3.1",
     "clsx": "^2.1.0",
     "cmdk": "^0.2.1",
+    "date-fns": "^3.6.0",
     "emoji-picker-react": "^4.6.4",
     "html-to-image": "^1.11.11",
+    "js-cookie": "^3.0.5",
     "lucide-react": "^0.307.0",
     "node-fetch": "^3.2.8",
     "plausible-tracker": "^0.3.9",
     "react": "^18.2.0",
+    "react-day-picker": "^9.5.1",
     "react-dom": "^18.1.0",
+    "react-hook-form": "^7.54.2",
     "react-router-dom": "^6.3.0",
     "react-sortablejs": "^6.1.4",
+    "react-spinners": "^0.14.1",
     "react-toastify": "^9.1.1",
     "socket.io-client": "^4.8.0",
     "sortablejs": "^1.15.2",
     "swr": "^2.2.5",
     "tailwind-merge": "^2.2.0",
     "tailwindcss-animate": "^1.0.7",
     "typescript": "^4.6.4",
+    "unique-names-generator": "^4.7.1",
     "usehooks-ts": "^2.6.0",
-    "vite": "^5.4.6",
+    "vite": "^5.4.14",
     "vite-tsconfig-paths": "^4.3.2",
-    "web-vitals": "^2.1.4"
+    "web-vitals": "^2.1.4",
+    "zod": "^3.24.1"
   },
   "scripts": {
     "dev": "vite --host",

package.json

@@ -1,3 +1,5 @@
+import { DirectExchangePendingMotive } from "../utils/exchange"
+
 enum lesson_type {
   T = "T",    // Ensino teórico
   TP = "TP",  // Ensino teórico-prático
@@ -22,6 +24,7 @@ export type Major = {
 
 export type CourseInfo = {
   id: number,
+  course: number,
   course_unit_year: number,
   course_unit_id: number,
   ects: number,
@@ -94,12 +97,136 @@ export type ImportedCourses = {
   [key: string]: string
 }
 
+/* Exchange data types */
+
+export type ExchangeOption = {
+  course_info: CourseInfo,
+  course_unit_id: number,
+  class_issuer_goes_from: ClassInfo,
+  class_issuer_goes_to: ClassInfo,
+  other_student?: number // The current student will be determined by the backend depending on session data
+}
+
+export type CreateRequestCardMetadata = {
+  courseUnitName: string,
+  courseUnitAcronym: string,
+  requesterClassName: string,
+  availableClasses: Array<string> // Classes from the course unit
+}
+
+export type CreateRequestData = {
+  courseUnitId: number,
+  courseUnitName: string,
+  classNameRequesterGoesFrom: string,
+  classNameRequesterGoesTo: string,
+  other_student?: Student
+}
+
+export type MarketplaceRequest = {
+  id: number,
+  type: string,
+  issuer_name: string,
+  issuer_nmec: string,
+  date: string,
+  options?: Array<ExchangeOption>,
+  classes?: Array<ClassInfo>,
+  pending_motive?: DirectExchangePendingMotive,
+  accepted: boolean,
+  admin_state: string,
+  canceled: boolean
+}
+
+export type DirectExchangeRequest = {
+  id: number,
+  type: string,
+  issuer_name: string,
+  issuer_nmec: string,
+  accepted: boolean,
+  canceled: boolean,
+  pending_motive?: DirectExchangePendingMotive,
+  admin_state: string,
+  options: DirectExchangeParticipant[],
+  date: string
+}
+
+export type DirectExchangeParticipant = {
+  id: number,
+  course_info: CourseInfo,
+  participant_name: string,
+  participant_nmec: string,
+  class_participant_goes_from: ClassInfo,
+  class_participant_goes_to: ClassInfo,
+  schedule: Array<ClassDescriptor>,
+  course_unit: string,
+  course_unit_id: string,
+  accepted: boolean
+  date: string
+}
+
+export type UrgentRequest = {
+  id: number,
+  user_nmec: string,
+  date: string,
+  message: string,
+  accepted: boolean,
+  admin_state: string,
+  options: Array<UrgentRequestOption>
+  schedule: Array<ClassDescriptor>
+}
+
+export type UrgentRequestOption = {
+  course_unit: CourseInfo,
+  class_user_goes_from: ClassInfo,
+  class_user_goes_to: ClassInfo,
+}
+
+export type CourseUnitEnrollment = {
+  id: number,
+  date: string,
+  user_nmec: string,
+  admin_state: string,
+  accepted: boolean,
+  schedule: Array<ClassDescriptor>,
+  options: Array<CourseUnitEnrollmentOption>
+}
+
+export type CourseUnitEnrollmentOption = {
+  course_unit: CourseInfo,
+  course: Major,
+  enrolling: boolean,
+  class_user_goes_to: ClassInfo,
+}
+
+export enum AdminRequestType {
+  DIRECT_EXCHANGE = "direct_exchange",
+  URGENT_EXCHANGE = "urgent_exchange",
+  ENROLLMENT = "enrollment"
+}
+
+export type StudentCourseMetadata = {
+  nmec: string, 
+  fest_id: number,
+  course: CourseInfo
+}
+
+export type Student = {
+  name: string,
+  mecNumber: number,
+  classInfo?: ClassInfo
+}
+
+export type Participant = {
+  client_id: string
+  name: string
+}
+
+// TODO(Process-ing): Maybe join Student and Participant into a single type
+
 export type CollabSession = {
-  id: number
+  id: string
   name: string
-  lastEdited: string
-  lifeSpan: number
-  currentUser: string
-  link : string
-  participants: Array<string>
-}
+  lastEdited: number
+  expirationTime: number
+  link: string
+  participants: Array<Participant>
+}

src/@types/index.d.ts

@@ -3,9 +3,12 @@ import { Toaster } from './components/ui/toaster'
 import { BrowserRouter, Routes, Route, Navigate, useLocation, useNavigationType, createRoutesFromChildren, matchRoutes } from 'react-router-dom'
 import './app.css'
 import CombinedProvider from './contexts/CombinedProvider'
-import { AboutPage, TimeTableSelectorPage, FaqsPage, NotFoundPage } from './pages'
+import { AboutPage, TimeTableSelectorPage, FaqsPage, NotFoundPage, PrivacyPolicyPage, ExchangeVerifyPage, AdminPage } from './pages'
 import { getPath, config, dev_config, plausible } from './utils'
 import Layout from './components/layout'
+import Exchange from './pages/Exchange'
+import { useEffect } from 'react'
+import api from './api/backend'
 import * as Sentry from "@sentry/react";
 
 const configToUse = Number(import.meta.env.VITE_APP_PROD) ? config : dev_config
@@ -16,6 +19,8 @@ const pages = [
   { path: getPath(configToUse.paths.planner), location: 'Horários', element: TimeTableSelectorPage, liquid: true },
   { path: getPath(configToUse.paths.faqs), location: 'FAQs', element: FaqsPage, liquid: true },
   { path: getPath(configToUse.paths.notfound), location: 'NotFound', element: NotFoundPage, liquid: true },
+  { path: getPath(config.paths.exchange), location: 'Turmas', element: Exchange, liquid: true },
+  { path: getPath(config.paths.privacypolicy), location: 'Privacidade', element: PrivacyPolicyPage, liquid: true },
 ]
 
 const redirects = [
@@ -33,6 +38,11 @@ const App = () => {
   const { enableAutoPageviews } = plausible
   enableAutoPageviews()
 
+  useEffect(() => {
+    fetch(`${api.BACKEND_URL}/csrf/`, { credentials: "include" }).then(() => {
+    }).catch((e) => console.error(e));
+  });
+  
   // Enable Error Tracking, Performance Monitoring and Session Replay
   Sentry.init({
     environment: Number(import.meta.env.VITE_APP_PROD) ? "production" : "development",
@@ -77,13 +87,39 @@ const App = () => {
               }
             />
           ))}
+          <Route 
+            path="/exchange/verify/:token" 
+            key="exchange-verify-page"
+            element={
+              <Layout location="Exchange" title="Exchange" liquid={true}>
+                <div>
+                  <ExchangeVerifyPage />
+                  <Toaster />
+                </div>
+              </Layout>
+            }
+          />
           {redirects.map((redirect, redirectIdx) => (
             <Route
               path={redirect.from}
               key={`redirect-${redirectIdx}`}
               element={<Navigate replace to={redirect.to} />}
             />
           ))}
+          <Route
+            path="admin"
+            key="page-admin"
+            element={
+              <AdminPage page="pedidos"/>
+            }
+          />
+          <Route
+            path="admin/settings"
+            key="page-admin-settings"
+            element={
+              <AdminPage page="settings"/>
+            }
+          />
         </SentryRoutes>
       </CombinedProvider>
     </BrowserRouter>

src/App.tsx

@@ -1,9 +1,12 @@
 import { Major, CourseInfo } from "../@types"
 import { dev_config, getSemester, config } from "../utils"
+import Cookies from 'js-cookie'
 
 const prod_val = import.meta.env.VITE_APP_PROD
 const BE_CONFIG = Number(prod_val) ? config : dev_config
 const BACKEND_URL = import.meta.env.VITE_APP_BACKEND_URL || `${BE_CONFIG.api.protocol}://${BE_CONFIG.api.host}:${BE_CONFIG.api.port}${BE_CONFIG.api.pathPrefix}`
+const OIDC_LOGIN_URL = `${BACKEND_URL}/oidc-auth/authenticate/`
+const OIDC_LOGOUT_URL = `${BACKEND_URL}/oidc-auth/logout/`
 const SEMESTER = import.meta.env.VITE_APP_SEMESTER || getSemester()
 
 // If we are in september 2024 we use 2024, if we are january 2025 we use 2024 because the first year of the academic year (2024/2025)
@@ -120,7 +123,13 @@ const getCourseUnitHashes = async (ids: number[]) => {
   }
 };
 
+const getCSRFToken = () => {
+  return Cookies.get('csrftoken');
+}
 
+const csrfTokenName = (): string => {
+  return "X-CSRFToken";
+}
 
 const api = {
   getMajors,
@@ -131,7 +140,11 @@ const api = {
   getCourseUnit,
   getInfo,
   getCourseUnitHashes,
-  BACKEND_URL
+  getCSRFToken,
+  csrfTokenName,
+  BACKEND_URL,
+  OIDC_LOGIN_URL,
+  OIDC_LOGOUT_URL
 }
 
 export default api

src/api/backend.ts

@@ -0,0 +1,21 @@
+import api from "../backend";
+
+const logout = async (token, setSignedIn, setLoggingOut) => {
+   fetch(`${api.OIDC_LOGOUT_URL}/`, {
+      method: "POST", credentials: "include", headers: {
+        "X-CSRFToken": api.getCSRFToken()
+      }
+    }).then(() => {
+      setSignedIn(false);
+      setLoggingOut(false);
+    }).catch((e) => {
+      console.error(e);
+    });
+
+}
+
+const authService = {
+  logout
+};
+
+export default authService;