Skip to content
Open

Dev #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
46b6bc9
shift to client folder
Kushagra-0801 Apr 22, 2020
da66902
probably not working
Kushagra-0801 Apr 22, 2020
ac6ac4e
make a dedicated folder for server
Kushagra-0801 Apr 22, 2020
337b1c5
Initial setup
VikramjeetD Apr 24, 2020
3d70580
Add login info to dashboard
VikramjeetD Apr 24, 2020
13fb93f
Add time period selection to login data
VikramjeetD Apr 24, 2020
9a816b3
Remove package-lock from vcs
VikramjeetD Apr 24, 2020
4475acd
Merge pull request #1 from VikramjeetD/dev
AetherPrior May 4, 2020
9496632
problems with routes
AetherPrior May 7, 2020
f4a3867
issue with actions
AetherPrior May 7, 2020
54591e9
Fix to changes
AetherPrior May 7, 2020
6d32bae
Add logout feature
AetherPrior Jun 4, 2020
7678ca3
Merge pull request #2 from AetherPrior/dev
VikramjeetD Jun 4, 2020
f0df78e
Move auth to the dash
AetherPrior Jun 6, 2020
862cd9c
Auth redirects and final fix
AetherPrior Jun 8, 2020
4191bdc
Update Schemas
Aviral14 Jun 8, 2020
1715302
Add api for fetching course stats
Aviral14 Jun 8, 2020
92e5a88
Add timetable file
Aviral14 Jun 8, 2020
222019f
Add course stats page with basic search feature
Aviral14 Jun 8, 2020
c702993
Add circular indicator
Aviral14 Jun 9, 2020
280def1
Merge pull request #4 from Aviral14/stats
VikramjeetD Jun 9, 2020
00a702f
Add reset sem button to dashboard
VikramjeetD Jun 9, 2020
48c4235
Add auto year update for odd semesters
VikramjeetD Jun 9, 2020
41b341a
Remove unneeded imports
VikramjeetD Jun 9, 2020
bfe21b8
Return promise from action
VikramjeetD Jun 9, 2020
690fb0a
Merge pull request #5 from VikramjeetD/resetsem
Aviral14 Jun 9, 2020
bc032b9
Fix issue with progress bar
Aviral14 Jun 9, 2020
34c7764
Merge pull request #6 from Aviral14/fix
VikramjeetD Jun 9, 2020
7eb3e00
Modify schema
AetherPrior Jun 9, 2020
ee247cb
npm audit fix on ./client/
hvj7 Jun 10, 2020
27265d0
Installed react-search
hvj7 Jun 10, 2020
1f961be
Modified Search Components
hvj7 Jun 10, 2020
e03db55
Replaced Search with select for course-stats
hvj7 Jun 10, 2020
ab3d922
Changed Dashboard Layout
hvj7 Jun 10, 2020
afb1d0f
Strip away unnecessary features
hvj7 Jun 11, 2020
220fd05
Merge pull request #8 from HarshvardhanJha1/final-touches
VikramjeetD Jun 11, 2020
9772f97
Add timetable stats
VikramjeetD Jun 11, 2020
25205e2
Minor stuff
VikramjeetD Jun 11, 2020
f1e16bc
Merge pull request #9 from VikramjeetD/ttdata
Aviral14 Jun 11, 2020
c4a356c
Admin access
AetherPrior Jun 12, 2020
63c1479
Merge pull request #10 from AetherPrior/dev
VikramjeetD Jun 12, 2020
f1d8aca
Fix createacc
AetherPrior Jun 12, 2020
b822437
Merge pull request #11 from AetherPrior/dev
VikramjeetD Jun 12, 2020
31287fd
Fix dot colors
VikramjeetD Jun 12, 2020
6818715
Merge pull request #12 from VikramjeetD/color-fix
AetherPrior Jun 12, 2020
0076e87
Title change
VikramjeetD Jun 12, 2020
1a59859
Merge pull request #13 from VikramjeetD/dev
VikramjeetD Jun 12, 2020
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
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
**/node_modules
/.pnp
.pnp.js
.idea/
Expand All @@ -14,11 +14,17 @@

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
.env.production.local

.directory

npm-debug.log*
yarn-debug.log*
yarn-error.log*

package-lock.json
client/package-lock.json
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:3001",
"webRoot": "${workspaceFolder}"
}
]
}
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License

Copyright (c) 2019 Flatlogic LLC.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
63 changes: 63 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"name": "react-material-admin",
"version": "1.1.0",
"private": true,
"dependencies": {
"@chakra-ui/core": "^0.8.0",
"@material-ui/core": "^4.3.0",
"@material-ui/icons": "^4.2.1",
"@material-ui/lab": "^4.0.0-alpha.55",
"@material-ui/styles": "^4.3.0",
"apexcharts": "^3.8.3",
"axios": "^0.19.2",
"axios-react": "^1.1.4",
"classnames": "^2.2.6",
"font-awesome": "^4.7.0",
"js-cookie": "^2.2.1",
"moment": "^2.24.0",
"mui-datatables": "^2.6.4",
"react": "^16.8.6",
"react-apexcharts": "^1.3.3",
"react-circular-progressbar": "^2.0.3",
"react-dom": "^16.8.6",
"react-google-maps": "^9.4.5",
"react-redux": "^7.2.0",
"react-router-dom": "^5.0.1",
"react-scripts": "^3.4.1",
"react-search": "^2.1.1",
"react-select": "^3.1.0",
"react-syntax-highlighter": "^11.0.2",
"react-toastify": "^5.3.2",
"recharts": "^1.6.2",
"redux": "^4.0.5",
"redux-devtools-extension": "^2.13.8",
"redux-thunk": "^2.3.0",
"tinycolor2": "^1.4.1",
"use-axios-react": "^0.2.3"
},
"scripts": {
"start": "PORT=3001 react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"prettier": "^1.19.1"
},
"proxy": "http://localhost:5001"
}
File renamed without changes.
14 changes: 10 additions & 4 deletions public/index.html → client/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,16 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React Material Admin</title>
<meta name="description" content="React Material Admin is a React Template built with Material-UI">
<meta name="keywords" content="react material, material ui admin, react template, react material admin, react material dashboard">
<meta name="author" content="Flatlogic LLC.">
<title>ChronoFactorem Dashboard</title>
<meta
name="description"
content="React Material Admin is a React Template built with Material-UI"
/>
<meta
name="keywords"
content="react material, material ui admin, react template, react material admin, react material dashboard"
/>
<meta name="author" content="Flatlogic LLC." />
</head>
<body style="font-family: 'Roboto', sans-serif;">
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
File renamed without changes.
11 changes: 11 additions & 0 deletions client/src/Professor.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class Professor{
constructor(username,name,department,email,isAdmin)
{
this.username = username;
this.name = name;
this.department = department;
this.email = email;
this.isAdmin = isAdmin;
}
}
export default Professor;
Loading