Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #12 : Added routes and calendar screen #33

Merged
merged 5 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"cSpell.words": [
"Roadmap"
]
}
18 changes: 13 additions & 5 deletions apps/frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,24 @@ import React from 'react';
import './App.css';
import { APPS_NAME } from '@team8/constants/apps';
import MainScreen from './Screens/MainScreen';
import Calendar from "./Screens/Calendar";
import AddDropCourses from './Screens/AddDropCourses';
import CoursesLookUp from './Screens/CoursesLookUp';
import Roadmap from './Screens/Roadmap';
import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
import Navbar from "./Components/Navbar";

const App = () => {
return (
<>
<Router>
<Routes>
<Route index={true} path="/" element={<MainScreen />} />
</Routes>
</Router>
<Navbar />
<Routes>
<Route path="/" element={<MainScreen />}/>
<Route path='/courses-look-up' element={<CoursesLookUp />}/>
<Route path='/add-drop-courses' element={<AddDropCourses />}/>
<Route path='/calendar' element={<Calendar />}/>
<Route path='/roadmap' element={<Roadmap />}/>
</Routes>
</>
);
};
Expand Down
31 changes: 26 additions & 5 deletions apps/frontend/src/Components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import AutoStoriesIcon from '@mui/icons-material/AutoStories';
import { amber } from '@mui/material/colors';
import { styled } from '@mui/material/styles';
import { brown } from '@mui/material/colors';
import { Link } from "react-router-dom";

const pages = ['Products', 'Pricing', 'Blog'];
const settings = ['Profile', 'Account', 'Dashboard', 'Logout'];
Expand Down Expand Up @@ -114,11 +115,31 @@ const Navbar = () => {
</Toolbar>
<Divider sx={{bgcolor:"black"}}></Divider>
<Toolbar sx={{justifyContent:"space-between"}}>
<ColorButton variant="contained">Home</ColorButton>
<ColorButton variant="contained">Courses Look Up</ColorButton>
<ColorButton variant="contained">Add/Drop Courses</ColorButton>
<ColorButton variant="contained">Calendar</ColorButton>
<ColorButton variant="contained">Roadmap</ColorButton>
<Link to="/">
<ColorButton variant="contained">
Home
</ColorButton>
</Link>
<Link to="/courses-look-up">
<ColorButton variant="contained">
Courses Look Up
</ColorButton>
</Link>
<Link to="/add-drop-courses">
<ColorButton variant="contained">
Add/Drop Courses
</ColorButton>
</Link>
<Link to="/calendar">
<ColorButton variant="contained">
Calendar
</ColorButton>
</Link>
<Link to="/roadmap">
<ColorButton variant="contained">
Roadmap
</ColorButton>
</Link>
</Toolbar>
</Stack>
</Container>
Expand Down
11 changes: 11 additions & 0 deletions apps/frontend/src/Screens/AddDropCourses.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react";

const AddDropCourses = () => {
return (
<h1>
AddDropCourses
</h1>
);
}

export default AddDropCourses;
27 changes: 27 additions & 0 deletions apps/frontend/src/Screens/Calendar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React, { useState } from "react";
import Container from '@mui/material/Container';
// @ts-ignore
import { DayPilotCalendar } from "@daypilot/daypilot-lite-react";
const Calendar = () => {
const [config, setConfig] = useState({
viewType: "WorkWeek",
headerDateFormat: "dddd",
businessBeginsHour: 8,
businessEndsHour: 17,
timeRangeSelectedHandling: "Disabled",
eventMoveHandling: "Disabled",
eventResizeHandling: "Disabled",
eventClickHandling: "Disabled",
});

return(
<Container maxWidth = "lg">
<h2>
Weekly Schedule
</h2>
<DayPilotCalendar {...config} />
</Container>
);
}

export default Calendar;
11 changes: 11 additions & 0 deletions apps/frontend/src/Screens/CoursesLookUp.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react";

const CoursesLookUp = () => {
return(
<h1>
CoursesLookUp
</h1>
)
}

export default CoursesLookUp;
2 changes: 1 addition & 1 deletion apps/frontend/src/Screens/MainScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const MainScreen = () => {
}, []);
return(
<>
<Navbar/>
{/*<Navbar/>*/}
arsh331 marked this conversation as resolved.
Show resolved Hide resolved
<Container maxWidth="lg" sx={{mt: 2}}>
<Grid container>
<Grid item xs={8} sx={{boxShadow:"none", backgroundColor:"#FAD37D", borderTopLeftRadius:10, borderBottomLeftRadius:10}}>
Expand Down
11 changes: 11 additions & 0 deletions apps/frontend/src/Screens/Roadmap.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react";

const Roadmap = () => {
return(
<h1>
Roadmap
</h1>
)
}

export default Roadmap;
Empty file.
6 changes: 4 additions & 2 deletions apps/frontend/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ import ReactDOM from 'react-dom/client';
import './index.css';
import App from './App';
import reportWebVitals from './reportWebVitals';

import {BrowserRouter} from "react-router-dom";
const root = ReactDOM.createRoot(
document.getElementById('root') as HTMLElement,
);
root.render(
<React.StrictMode>
<App />
<BrowserRouter>
<App />
</BrowserRouter>
</React.StrictMode>,
);

Expand Down
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,23 @@
]
},
"devDependencies": {
"@types/jest": "^29.5.2",
"@types/node": "^20.3.1",
"@typescript-eslint/eslint-plugin": "^5.59.11",
"@typescript-eslint/parser": "^5.59.11",
"eslint": "^8.42.0",
"eslint-config-prettier": "^8.8.0",
"eslint-config-team8": "*",
"eslint-plugin-prettier": "^4.2.1",
"jest": "^29.5.0",
"prettier": "^2.8.8",
"ts-jest": "^29.1.0",
"ts-loader": "^9.4.3",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.1.3",
"eslint-config-team8": "*",
"jest": "^29.5.0",
"ts-jest": "^29.1.0",
"@types/node": "^20.3.1",
"@types/jest": "^29.5.2"
"typescript": "^5.1.3"
},
"dependencies": {
"@daypilot/daypilot-lite-react": "^3.20.1"
}
}
Loading