Skip to content

Commit 93aeb12

Browse files
[GV-46] Remove Page Headers (#9)
* feat: remove page headers * style: clean up styling
1 parent 518acdd commit 93aeb12

10 files changed

+23
-23
lines changed

api/v2/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Router } from 'express';
22

33
import BinsRouter from './Routes/bins/index.js';
4-
import StudentsRouter from './Routes/students/index.js';
4+
import StudentsRouter from './Routes/students/index.js';
55
import VerifyAccessRouter from './Routes/verifyaccess/index.js';
66
import IsAdminRouter from './Routes/isadmin/index.js';
77
import LoginRouter from "./Routes/login/index.js";

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ services:
5151
- concept_map_integration
5252
ports:
5353
- 8080:${PROGRESS_REPORT_PORT}
54-
restart: unless-stopped
54+
restart: unless-stopped
5555
redis:
5656
image: redis:latest
5757
networks:

website/server/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ app.use('/api', proxy);
1717
app.use(limit(10));
1818

1919
// Serve static files from the React app
20-
app.get('/*', (req, res) => {
20+
app.get('/*', (_, res) => {
2121
res.sendFile(path.join(__dirname, 'build', 'index.html'));
2222
});
2323

website/server/middleware.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ exports.proxy = createProxyMiddleware({ target: process.env.REACT_APP_PROXY_SERV
88

99
/**
1010
* Use to exclude a route from being verified with middleware.
11-
* @param {String} path
12-
* @param {Function} middleware
11+
* @param {String} path
12+
* @param {Function} middleware
1313
* @returns Function
1414
*/
1515
exports.unless = (path, middleware) => {
@@ -25,7 +25,7 @@ exports.unless = (path, middleware) => {
2525

2626
/**
2727
* Use to limit the number of requests made per minute.
28-
* @param {int} requests
28+
* @param {int} requests
2929
* @returns {RateLimit} rate limiter middleware
3030
*/
3131
exports.limit = (requests) => {

website/src/components/GradeAccordion.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export default function GradeAccordion({ category, assignments }) {
2323

2424
/**
2525
* Returns the formatting for the font-weight.
26-
* @param {Float} student
27-
* @param {Float} max
26+
* @param {Float} student
27+
* @param {Float} max
2828
* @returns {String} 'bold' or 'normal'
2929
*/
3030
function isBold(student, max) {

website/src/components/GradeTable.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export default function GradeTable({ assignments, headerLeft, headerRight }) {
55

66
/**
77
* Gets the formatting for the font-weight.
8-
* @param {Float} student
9-
* @param {Float} max
8+
* @param {Float} student
9+
* @param {Float} max
1010
* @returns {String} 'bold' or 'normal'
1111
*/
1212
function isBold(student, max) {

website/src/components/NavBar.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ import {
1212
MenuItem,
1313
IconButton,
1414
useMediaQuery,
15-
FormControl, InputLabel, Select
15+
FormControl,
16+
InputLabel,
17+
Select,
1618
} from '@mui/material'
1719
import {
1820
LoginOutlined,
1921
StorageOutlined,
2022
AccountCircleOutlined,
2123
AccountTree,
22-
Logout
24+
Logout,
2325
} from '@mui/icons-material';
2426
import MenuIcon from '@mui/icons-material/Menu';
2527
import apiv2 from '../utils/apiv2';

website/src/setupProxy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ module.exports = function(app) {
66
createProxyMiddleware({
77
target: process.env.REACT_APP_PROXY_SERVER || 'http://localhost:8000',
88
changeOrigin: true,
9-
})
9+
}),
1010
);
11-
};
11+
};

website/src/views/buckets.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useEffect, useState } from 'react'
2-
import { Box, Typography, useMediaQuery } from '@mui/material';
2+
import { Box, useMediaQuery } from '@mui/material';
33
import apiv2 from '../utils/apiv2';
44
import BinTable from '../components/BinTable';
55
import Loader from '../components/Loader';
@@ -52,7 +52,6 @@ export default function Buckets() {
5252
<>
5353
{loadCount > 0 ? (<Loader />) : (
5454
<>
55-
<Typography variant='h5' component='div' sx={{ m: 2, fontWeight: 500 }}>Buckets</Typography>
5655
<Box sx={minMedia ?
5756
{ mt: 4, display: 'flex', flexBasis: 'min-content', justifyContent: 'center', gap: '10%' } :
5857
{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 4 }

website/src/views/conceptMap.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22
import { useCallback, useContext, useEffect, useRef, useState } from 'react';
33
import Loader from '../components/Loader';
4-
import PageHeader from '../components/PageHeader';
54
import './css/conceptMap.css';
65
import jwtDecode from 'jwt-decode';
76
import { StudentSelectionContext } from "../components/StudentSelectionWrapper";
@@ -15,7 +14,7 @@ import apiv2 from "../utils/apiv2";
1514
* and displays the concept map within an iframe.
1615
* 2. The concept map iframe src takes in a string of numbers to display a concept map,
1716
* a. This makes an API call to the Python Flask application to create the concept map.
18-
* b. Each number represents a student's mastery level for a particular concept.
17+
* b. Each number represents a student's mastery level for a particular concept.
1918
* 3. The concept nodes are arranged vertically from top to bottom.
2019
* 4. The list of numerical strings associated with each node is sorted horizontally from left to right.
2120
* a. This numerical string is calculated through the Google Sheets data in the JavaScript API call.
@@ -26,8 +25,8 @@ export default function ConceptMap() {
2625
const [loading, setLoading] = useState(false);
2726
const [studentMastery, setStudentMastery] = useState('000000');
2827

29-
/** The iframeRef is initially set to null. Once the HTML webpage is loaded
30-
* for the concept map, the iframeRef is dynamically set to the fetched
28+
/** The iframeRef is initially set to null. Once the HTML webpage is loaded
29+
* for the concept map, the iframeRef is dynamically set to the fetched
3130
* progress report query string iframe for the selected student.
3231
*/
3332
const iframeRef = useRef(null);
@@ -46,7 +45,7 @@ export default function ConceptMap() {
4645

4746
/**
4847
* Fetch the logged-in student's mastery data on component mount (student view).
49-
* This effect fetches data based on the JWT token stored
48+
* This effect fetches data based on the JWT token stored
5049
* in localStorage and updates the component's state.
5150
*/
5251
useEffect(() => {
@@ -89,12 +88,12 @@ export default function ConceptMap() {
8988

9089
/**
9190
* Render the concept map iframe with the fetched mastery data.
92-
* This iframe src takes in a string of numbers
91+
* This iframe src takes in a string of numbers
9392
* (progressQueryString) to display a concept map.
9493
*/
9594
return (
9695
<>
97-
<PageHeader>Concept Map</PageHeader>
96+
{/* <PageHeader>Concept Map</PageHeader> */}
9897
<div style={{ textAlign: 'center', height:"100%" }} overflow="hidden">
9998
<iframe
10099
ref={iframeRef}

0 commit comments

Comments
 (0)