Skip to content

Commit 94871fd

Browse files
change to scss and various other edits
Co-authored-by: Cooperzilla <[email protected]>
1 parent c3df03f commit 94871fd

32 files changed

+122
-61
lines changed

frontend/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"eslint-plugin-react-refresh": "^0.4.7",
4949
"gh-pages": "^6.1.1",
5050
"postcss": "^8.4.38",
51+
"sass": "^1.77.6",
5152
"tailwindcss": "^3.4.4",
5253
"vite": "^5.3.2"
5354
},

frontend/pnpm-lock.yaml

+30-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/src/components/ApplyButton.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import useModal from '../hooks/useModal';
33
import Modal from './Modal';
4-
import '../styles/Button.css';
4+
import '../styles/Button.scss';
55

66
const ApplyButton = () => {
77
const { isOpen, openModal, closeModal } = useModal();

frontend/src/components/DynamicGradient.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useEffect, useState } from 'react';
2-
import '../styles/Gradient.css';
2+
import '../styles/Gradient.scss';
33

44
function MovingGradient() {
55
const [gradient, setGradient] = useState('');

frontend/src/components/ExploreAI.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import '../styles/ExploreAI.css';
2-
import '../styles/App.css';
1+
import '../styles/ExploreAI.scss';
2+
import '../styles/App.scss';
33
import PropTypes from 'prop-types';
44

55
// Background Component

frontend/src/components/Header/Header.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import "../../styles/App.css";
2-
import "./Header.css";
1+
import "../../styles/App.scss";
2+
import "./Header.scss";
33
import getMode from "../../utils/getMode";
44
import { Link } from "@tanstack/react-router";
55

frontend/src/components/Modal.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useEffect, useState } from 'react';
2-
import '../styles/Button.css';
2+
import '../styles/Button.scss';
33

44
const Modal = ({modalType = 'Confirm',
55
isOpen, onClose,

frontend/src/components/Popup.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343

4444
import { useState, useEffect } from 'react';
45-
import '../styles/Popup.css';
45+
import '../styles/Popup.scss';
4646

4747
const Popup = () => {
4848
const [isVisible, setIsVisible] = useState(false);

frontend/src/components/ToastNotif.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { toast } from 'sonner';
2-
import '../styles/ToastNotif.css'; // Include any additional styles here
2+
import '../styles/ToastNotif.scss'; // Include any additional styles here
33
import getMode from '../utils/getMode';
44

55
// Function to show toast notification

frontend/src/main.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import React, { StrictMode } from 'react'
22
import ReactDOM from 'react-dom/client'
33
import { RouterProvider, createRouter } from '@tanstack/react-router'
44
import { routeTree } from './routeTree.gen'
5-
import './styles/tailwind.css';
6-
import './styles/App.css';
5+
import './styles/tailwind.scss';
6+
import './styles/App.scss';
77
import { HelmetProvider } from 'react-helmet-async';
88
import { AuthContextProvider } from './context/AuthContext';
99

frontend/src/routeTree.gen.ts

+18
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { Route as SyllabusImport } from './routes/Syllabus'
1515
import { Route as StaffImport } from './routes/Staff'
1616
import { Route as LoginImport } from './routes/Login'
1717
import { Route as InquiryImport } from './routes/Inquiry'
18+
import { Route as DashboardImport } from './routes/Dashboard'
1819
import { Route as IndexImport } from './routes/index'
1920

2021
// Create/Update Routes
@@ -39,6 +40,11 @@ const InquiryRoute = InquiryImport.update({
3940
getParentRoute: () => rootRoute,
4041
} as any)
4142

43+
const DashboardRoute = DashboardImport.update({
44+
path: '/Dashboard',
45+
getParentRoute: () => rootRoute,
46+
} as any)
47+
4248
const IndexRoute = IndexImport.update({
4349
path: '/',
4450
getParentRoute: () => rootRoute,
@@ -55,6 +61,13 @@ declare module '@tanstack/react-router' {
5561
preLoaderRoute: typeof IndexImport
5662
parentRoute: typeof rootRoute
5763
}
64+
'/Dashboard': {
65+
id: '/Dashboard'
66+
path: '/Dashboard'
67+
fullPath: '/Dashboard'
68+
preLoaderRoute: typeof DashboardImport
69+
parentRoute: typeof rootRoute
70+
}
5871
'/Inquiry': {
5972
id: '/Inquiry'
6073
path: '/Inquiry'
@@ -90,6 +103,7 @@ declare module '@tanstack/react-router' {
90103

91104
export const routeTree = rootRoute.addChildren({
92105
IndexRoute,
106+
DashboardRoute,
93107
InquiryRoute,
94108
LoginRoute,
95109
StaffRoute,
@@ -105,6 +119,7 @@ export const routeTree = rootRoute.addChildren({
105119
"filePath": "__root.jsx",
106120
"children": [
107121
"/",
122+
"/Dashboard",
108123
"/Inquiry",
109124
"/Login",
110125
"/Staff",
@@ -114,6 +129,9 @@ export const routeTree = rootRoute.addChildren({
114129
"/": {
115130
"filePath": "index.jsx"
116131
},
132+
"/Dashboard": {
133+
"filePath": "Dashboard.jsx"
134+
},
117135
"/Inquiry": {
118136
"filePath": "Inquiry.jsx"
119137
},

frontend/src/routes/Dashboard.jsx

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { createFileRoute } from '@tanstack/react-router'
2+
3+
export const Route = createFileRoute('/Dashboard')({
4+
component: () => <div>Hello /Dashboard!</div>
5+
})

frontend/src/routes/Login.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createFileRoute } from '@tanstack/react-router';
22
import SignIn from '../components/Login/SignIn'
33
import { GoogleButton } from 'react-google-button'
44
import { UserAuth } from '../context/AuthContext';
5-
import '../styles/Login.css';
5+
import '../styles/Login.scss';
66

77
export const Route = createFileRoute('/Login')({
88
component: Login,

0 commit comments

Comments
 (0)