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

Staging #244

Open
wants to merge 284 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
284 commits
Select commit Hold shift + click to select a range
e0a3aab
Update package.json
wxy1203 Sep 27, 2024
0da6afb
Update package.json
wxy1203 Sep 27, 2024
eb59a20
Add Assessment and Question Independent of Google
Nephelite Sep 27, 2024
bbdf033
Implement Sprint 3 Leftovers
Nephelite Oct 2, 2024
db3e650
Add Assessment Taking UI
Nephelite Oct 4, 2024
22cb0df
controller, routes, service for code analysis
rjkoh Oct 4, 2024
1fe3fa7
add tests for code analysis, fix github service test
rjkoh Oct 4, 2024
4bc8a13
Add Submission and Answer Schema
Nephelite Oct 5, 2024
9cc01e5
add basic UI and backend for TA permission
rjkoh Oct 9, 2024
7f2bec5
style fixing
rjkoh Oct 9, 2024
8d21e75
remove code analysis frontend redundancies
rjkoh Oct 9, 2024
aa86d52
frontend: group code analyses by team number and time
rjkoh Oct 9, 2024
fc0eb1d
fix: environment change
wxy1203 Oct 9, 2024
00f35c1
Add Student Selection Question and Submission Viewing
Nephelite Oct 9, 2024
6b4305e
feat: add class overview in nav bar
wxy1203 Oct 9, 2024
82bde4c
feat: data visualization in class overview
wxy1203 Oct 9, 2024
99b8866
feat: class overview data viz (2 charts)
wxy1203 Oct 9, 2024
a1cf009
Fix Submission Edit Permission Bugs
Nephelite Oct 10, 2024
5b584cf
Add Delete Draft Button
Nephelite Oct 10, 2024
8f0ca2e
feat: nav bar icon
wxy1203 Oct 10, 2024
d89fe7b
fix: scroll bar for course
wxy1203 Oct 10, 2024
3040d6f
fix: eslint
wxy1203 Oct 10, 2024
24f1bae
fix: eslint
wxy1203 Oct 10, 2024
771af98
fix: eslint
wxy1203 Oct 10, 2024
a2538d3
fix: eslint
wxy1203 Oct 10, 2024
4a08301
fix: eslint
wxy1203 Oct 10, 2024
6346123
fix: remove node modules
wxy1203 Oct 10, 2024
9cc788e
Merge pull request #227 from NUS-CRISP/staging
wxy1203 Oct 10, 2024
5fbf534
fix: delete env file
wxy1203 Oct 10, 2024
51f5d30
fix: delete env files
wxy1203 Oct 10, 2024
6c67f7d
Update .gitignore
wxy1203 Oct 10, 2024
f539019
Implement Student Searching in Student Selection Question
Nephelite Oct 12, 2024
4e20898
Merge branch 'staging' into non-github-orgs
dexter-sim Oct 12, 2024
a491645
Add functionality to delete repository
dexter-sim Oct 12, 2024
4e436ed
Merge branch 'NUS-CRISP:main' into main
Nephelite Oct 13, 2024
a2c8956
Add functionality to edit repository links
dexter-sim Oct 13, 2024
e766b74
Merge branch 'staging' into non-github-orgs
dexter-sim Oct 13, 2024
e94f150
Merge branch 'NUS-CRISP:main' into main
Nephelite Oct 14, 2024
0343d6f
add overview for code analysis frontend
rjkoh Oct 15, 2024
013375b
fix scroll overflow on codeanalysis
rjkoh Oct 15, 2024
0e42442
add timeline view
rjkoh Oct 15, 2024
9193332
add prettier
rjkoh Oct 15, 2024
beb64a6
style fixes
rjkoh Oct 15, 2024
05b9b0e
style fixes
rjkoh Oct 15, 2024
6a7ba60
style
rjkoh Oct 15, 2024
2157f83
Merge branch 'staging' into non-github-orgs
dexter-sim Oct 15, 2024
de502c9
Create fetch job for public GitHub repositories
dexter-sim Oct 15, 2024
9f9d4c0
Add Scoring Element to Questions
Nephelite Oct 17, 2024
4551959
Add unit test for getRepositories in course controller
dexter-sim Oct 17, 2024
b18f25b
Add unit tests for add, edit, and remove repository for course contro…
dexter-sim Oct 17, 2024
3f5ab7b
mkdir before clone
rjkoh Oct 18, 2024
18895b5
style
rjkoh Oct 18, 2024
beb20ad
handle private repos
rjkoh Oct 18, 2024
4eac941
style
rjkoh Oct 18, 2024
22a5d65
Merge branch 'staging' into code-analysis-backend
rjkoh Oct 18, 2024
2de0b15
follow RUN_JOB_NOW
rjkoh Oct 18, 2024
f7885c8
style
rjkoh Oct 18, 2024
0dfcd02
fix backend imports
rjkoh Oct 18, 2024
a8796c1
Add unit tests for GitHub repositories API for course service
dexter-sim Oct 18, 2024
6d2f12e
Fix formatting
dexter-sim Oct 18, 2024
11a91a0
Remove repeated attempts for code frequency stats
dexter-sim Oct 19, 2024
8008e84
feat: filter the team by teamset
wxy1203 Oct 21, 2024
54f5ae9
update
wxy1203 Oct 21, 2024
0d81b08
update
wxy1203 Oct 21, 2024
bd4ee58
Merge branch 'staging' into non-github-orgs
dexter-sim Oct 21, 2024
649996f
Add Submission Score Viewing
Nephelite Oct 21, 2024
ee3df79
Add TA Team Assignment UI
Nephelite Oct 21, 2024
79be9a1
feat: class_overview and team_review
wxy1203 Oct 22, 2024
850815e
Add Backend for Custom Team Assignments
Nephelite Oct 22, 2024
0e9159c
feat: team review - milestone and issue tracker
wxy1203 Oct 22, 2024
16a13d7
Update jira.png
wxy1203 Oct 23, 2024
3dbaba7
feat: class overview
wxy1203 Oct 23, 2024
b08a94c
feat: weekly addition and deletion
wxy1203 Oct 23, 2024
07869b7
feat: team review-individual
wxy1203 Oct 23, 2024
8e1570e
fix: eslint
wxy1203 Oct 23, 2024
0a423e1
fix: eslint
wxy1203 Oct 23, 2024
a87929c
fix: eslint
wxy1203 Oct 23, 2024
050edcf
fix: eslint
wxy1203 Oct 23, 2024
5bc43e3
feat: eslint
wxy1203 Oct 23, 2024
17f34c5
Add Result Viewing and Custom Team Assignment
Nephelite Oct 24, 2024
90da3a5
Fix Questions not Saving and Improper AssignmentSet Fetching
Nephelite Oct 24, 2024
8a3c86f
Fix Crashing on NaN
Nephelite Oct 24, 2024
0fc65d7
Add .csv Downloading
Nephelite Oct 24, 2024
21e5c80
Update Navbar.tsx
wxy1203 Oct 25, 2024
ce73b4b
Update cron job for non github orgs repositories
dexter-sim Oct 26, 2024
1615ac1
Use generic Octokit for non GitHub App installed owners
dexter-sim Oct 26, 2024
2f20a41
Remove gradedBy Field in InternalAssessments
Nephelite Oct 29, 2024
d40446a
Merge branch 'NUS-CRISP:main' into main
Nephelite Oct 30, 2024
268aa32
Add Missing Submission Status For Results
Nephelite Oct 30, 2024
6f8cfff
Fix Improper Hook Usage
Nephelite Oct 31, 2024
9fe027e
Run Prettier
Nephelite Oct 31, 2024
f1c47b7
Add Missing Field to getTableUser
Nephelite Oct 31, 2024
8f94910
Disable EsLint for SubmissionCard
Nephelite Oct 31, 2024
1bb8e76
Add Preliminary Test Files
Nephelite Oct 31, 2024
3f00651
Remove Deprecated Information
Nephelite Oct 31, 2024
c997987
Fix Type Issues with Frontend Build
Nephelite Oct 31, 2024
e2e0a40
Fix Improper Routing of Imports
Nephelite Oct 31, 2024
bd2a531
Fix Compilation Issues and Conflicting Discriminator Keys
Nephelite Nov 1, 2024
7812845
Fix Various Test Cases
Nephelite Nov 2, 2024
cdfab27
Fix Team Related Test Issues
Nephelite Nov 3, 2024
c100d3d
Merge pull request #225 from rjkoh/code-analysis-backend
rjkoh Nov 11, 2024
b8401fc
Add Randomizer Exclusion to Grader Assignment
Nephelite Nov 12, 2024
1fdbc59
Fix Submission, Results Viewing Bugs
Nephelite Nov 14, 2024
584bda7
Fix Marking Filters
Nephelite Nov 15, 2024
411f1cd
Ensure Graders can only Submit for Unmarked Assignments
Nephelite Nov 15, 2024
baf400e
Fix Style Issue
Nephelite Nov 16, 2024
e0cb45d
Add Question Type Grouping in Dropdown Selection Based on Auto-Gradin…
Nephelite Nov 17, 2024
b61db60
Merge pull request #211 from NUS-CRISP/non-github-orgs
dexter-sim Nov 18, 2024
c1f5ed5
Merge branch 'staging' into data-viz
wxy1203 Nov 18, 2024
6b61dfc
Merge pull request #220 from NUS-CRISP/data-viz
wxy1203 Nov 18, 2024
cbce2e0
Remove Check Marking Route
Nephelite Nov 21, 2024
857b731
Fix Typo
Nephelite Nov 21, 2024
a6ad022
Fix Internal Assessment Service Test
Nephelite Nov 21, 2024
b706c71
Fixed Incorrect Loading of Team Id in Submission Edit
Nephelite Nov 21, 2024
3e551a2
Fix Submission Test Issues and Remove Async For Loop in Submission Se…
Nephelite Nov 21, 2024
db3f9c0
Merge branch 'staging' into main
Nephelite Nov 21, 2024
738a6d9
Run Prettierrc
Nephelite Nov 21, 2024
316ce76
Merge branch 'main' of https://github.com/Nephelite/CRISP
Nephelite Nov 21, 2024
6e8e7c6
Fix Incorrect Type Cast (string | null Cannot be Cast)
Nephelite Nov 21, 2024
b5030cf
Fix Submission Controller Test File
Nephelite Nov 21, 2024
4a7b913
Run Prettierrc
Nephelite Nov 22, 2024
e41383a
fix: bugs
wxy1203 Nov 23, 2024
2278a82
fix: eslint
wxy1203 Nov 23, 2024
36933eb
fix: eslint
wxy1203 Nov 23, 2024
25d0d72
Merge pull request #243 from NUS-CRISP/data-viz
wxy1203 Nov 23, 2024
162e9b8
Break up AssessmentMakeQuestionCard into Smaller Files
Nephelite Nov 23, 2024
283e30d
Merge branch 'staging' into main
Nephelite Nov 23, 2024
70c27bf
Break up TakeAssessmentCard into Smaller Files
Nephelite Nov 23, 2024
032ab25
Adjust Submission Card Display
Nephelite Dec 7, 2024
c3635ae
Add More MRQ Customization
Nephelite Dec 7, 2024
472ef11
Fix Incorrect Wrong Answer Checkbox Display Logic
Nephelite Dec 10, 2024
04ee877
Fix Style Issues (Missing Padding)
Nephelite Dec 10, 2024
3ce4469
Add Check for Grading Completion in Assessment Overview
Nephelite Dec 10, 2024
6364a7a
Add Initial Random Assignments to Unassigned Teams in the TeamSet
Nephelite Dec 10, 2024
328ceb2
Balanced Randomization Function in TA Assignments and Added Validatio…
Nephelite Dec 10, 2024
b39237d
Refactor out TA Assignment Modal
Nephelite Dec 10, 2024
f9ffef9
Fix Bug Involving Missing TeamSet Creating Phantom Assessments
Nephelite Dec 10, 2024
bea7f59
Require Max Marks for Assessments
Nephelite Dec 10, 2024
8f18e91
Add Score Scaling
Nephelite Dec 10, 2024
26b1b22
Fix Formatting
Nephelite Dec 10, 2024
cdbbf22
Fix Test Files
Nephelite Dec 10, 2024
041757a
Remove Console Logs
Nephelite Dec 10, 2024
ea9de23
improve testing for code analysis service and controller
rjkoh Dec 18, 2024
6d146b1
Merge pull request #245 from rjkoh/code-analysis-test
rjkoh Dec 18, 2024
84bf7e7
Add CSV Uploading of Questions
Nephelite Dec 23, 2024
455f7ec
Add CSV Upload to Assessment Creation
Nephelite Dec 23, 2024
53f703e
Implement CSV Uploading of Team/Student and TA Assignments
Nephelite Dec 23, 2024
019ac09
Add Documentation to AssessmentAssignmentSetController
Nephelite Dec 26, 2024
295e3d6
Add Documentation to AssessmentAssignmentSetService
Nephelite Dec 26, 2024
2c91798
Add Documentation to InternalAssessmentController and InternalAssessm…
Nephelite Dec 26, 2024
78e49b7
Style changes
Nephelite Dec 26, 2024
4ba1942
Add Documentation to submissionController and submissionService
Nephelite Dec 26, 2024
964fc95
Adjust style of documentation
Nephelite Dec 26, 2024
b1b9693
Add documentation for assessmentResultController and Service
Nephelite Dec 26, 2024
fc291c1
Add status codes for return documentation
Nephelite Dec 26, 2024
54c0103
Merge branch 'staging' into main
Nephelite Dec 27, 2024
9a17dc0
Fix style issues
Nephelite Dec 27, 2024
891fea1
Fix error feedback expectation difference
Nephelite Dec 27, 2024
aee5130
Use correct AssessmentResult import
Nephelite Dec 27, 2024
8b3f2f4
Add Regrading of Submissions on Release
Nephelite Dec 27, 2024
6ccb564
Add Optional Score Scaling
Nephelite Dec 27, 2024
d1e7556
Disable Changing of Question After Saving
Nephelite Dec 27, 2024
e50acd9
Fix Style Issues
Nephelite Dec 27, 2024
d0dad38
Add Bulk Soft Deletion of Submissions on Recall of Assessment
Nephelite Dec 28, 2024
df68ef5
Add Lazy Loading to Results View
Nephelite Dec 29, 2024
e56d1ac
Add Lazy Loading to Grader Assignment Modal
Nephelite Dec 29, 2024
1d28d03
Remove Comments
Nephelite Dec 30, 2024
114119b
Fix Regrading on Re-Release
Nephelite Dec 30, 2024
2bc1bb3
Remove Console Logs
Nephelite Dec 30, 2024
28e1250
Fix Incorrect Guard Check and Remove Unnecessary .toObject that Cause…
Nephelite Dec 30, 2024
3fd99f5
Add Adaptive View/Edit Button to Submission Card
Nephelite Dec 30, 2024
cf1a800
Run Prettier-Format
Nephelite Dec 30, 2024
bde0f60
Fix Delete Submission Tests
Nephelite Jan 1, 2025
875874c
Add Question Reordering
Nephelite Jan 1, 2025
e708fd5
added popup explanations for code analysis metrics
rjkoh Jan 2, 2025
62960cf
style fix
rjkoh Jan 2, 2025
b354a6e
style
rjkoh Jan 2, 2025
036f895
more style
rjkoh Jan 2, 2025
4d514f0
add type for explanations
rjkoh Jan 2, 2025
2d20d5e
Fix Tests
Nephelite Jan 3, 2025
5567fff
Complete Assessment Assignment Set Controller Test Files
Nephelite Jan 4, 2025
dffc3eb
Complete Assessment Result Controller Test
Nephelite Jan 4, 2025
3be0f71
Fix Incorrect Handling of Async in Bulk Add Question
Nephelite Jan 5, 2025
f11e33b
Complete Internal Assessment Controller Test File
Nephelite Jan 5, 2025
b5c57ba
Remove Comments
Nephelite Jan 5, 2025
ea7bebc
Add TA Access to Get All Submissions
Nephelite Jan 5, 2025
b4db7cf
Complete Submission Controller Test File
Nephelite Jan 5, 2025
3aef383
Add Internal Assessment Tests to Course Controller Test File
Nephelite Jan 5, 2025
fde75a4
Add Missing Tests for Newer Functions
Nephelite Jan 5, 2025
04e4365
Add Tests for New Function
Nephelite Jan 5, 2025
9837d14
Complete Question Model Test File
Nephelite Jan 5, 2025
3b2ed41
Fix Race Condition Allowing Set 2 to Pass
Nephelite Jan 5, 2025
7509ca1
Add Back in the Removed Release Form and CSV Buttons
Nephelite Jan 6, 2025
2ce9db5
Fix Response Placeholder
Nephelite Jan 6, 2025
98ab568
Complete AsseignmentSetService Test File
Nephelite Jan 6, 2025
fc350fb
Fix Formatting
Nephelite Jan 6, 2025
8dd8423
Add Test for getUserByAccountId
Nephelite Jan 6, 2025
af5b3f7
Complete Assessment Result Service Test File
Nephelite Jan 6, 2025
890ab5b
Add Test Functions to Internal Assessment Service Test File
Nephelite Jan 7, 2025
aafb4c2
Add Guards to Update Question Function
Nephelite Jan 7, 2025
55729be
Complete Internal Service Test File
Nephelite Jan 7, 2025
499d751
Fix Formatting
Nephelite Jan 7, 2025
bc8eab3
Fix Regrading of Results not Triggering
Nephelite Jan 9, 2025
59e5b4b
Update Submission Service Tests
Nephelite Jan 9, 2025
8236cef
Improve Submission Service Tests
Nephelite Jan 9, 2025
493f54d
Remove Redundant Code
Nephelite Jan 11, 2025
1f74fc2
Complete Submission Service Tests
Nephelite Jan 11, 2025
6c0fd4c
Add Test for getTeamsByTAIdAndCourseId
Nephelite Jan 11, 2025
88de706
Add getInternalAssessmentsFromCourse Test
Nephelite Jan 11, 2025
496021a
Formatting
Nephelite Jan 11, 2025
6ef79c7
Formatting
Nephelite Jan 11, 2025
083ff8c
Add Disabling of Editing Grader Assignments when Assessment is Release
Nephelite Jan 13, 2025
a4f8a5e
Add Tooltips to Checkboxes in Question Editing Components
Nephelite Jan 13, 2025
97b197e
fix docker unable to scan bug
rjkoh Jan 15, 2025
5d1aa1e
gitignore sonar-scanner
rjkoh Jan 15, 2025
988d467
dockerfile linux-x64 for servers
rjkoh Jan 15, 2025
3f20f26
add mean and median to code analysis job
rjkoh Jan 16, 2025
f725cd2
add mean and median to overview
rjkoh Jan 16, 2025
2d571be
style
rjkoh Jan 16, 2025
3786c65
add mean and median in tooltip for timeline
rjkoh Jan 17, 2025
fe91013
add icons for code analysis and repositories
rjkoh Jan 17, 2025
42f3351
Fix Missing Order Field in CSV Upload
Nephelite Jan 19, 2025
02c6b4f
Remove Reorder Model but Maintain Functionality
Nephelite Jan 19, 2025
fc81a6a
Merge pull request #246 from rjkoh/code-analysis-explanations
rjkoh Jan 20, 2025
d037746
Merge pull request #219 from Nephelite/main
rjkoh Jan 20, 2025
47e1381
fix import errors
rjkoh Jan 20, 2025
bad1583
Merge pull request #254 from rjkoh/fix-staging-errors
rjkoh Jan 20, 2025
d9eeed4
Fix Incorrect Type of Answer in Saving Submission as Draft
Nephelite Jan 22, 2025
521a547
Fix Potentially Non-String Values of Row Causing Error when Downloadi…
Nephelite Jan 22, 2025
7801d02
Cap Submission Card Score Displays
Nephelite Jan 22, 2025
0a0f4ae
Fix Formatting
Nephelite Jan 22, 2025
6eff6a5
Merge pull request #255 from Nephelite/main
Nephelite Jan 22, 2025
394bf70
Lock order after releasing
Nephelite Jan 22, 2025
ecdbdd6
Skip regrading of submission if soft deleted instead of throwing error
Nephelite Jan 22, 2025
c4a2316
Fix test
Nephelite Jan 22, 2025
e92b6fe
Merge pull request #256 from Nephelite/main
Nephelite Jan 22, 2025
bae7a3a
Disable Draft Feature
Nephelite Jan 22, 2025
966febb
Improve Release Form Prompt
Nephelite Jan 22, 2025
b65cab0
Merge pull request #257 from Nephelite/main
Nephelite Jan 22, 2025
c802011
Move onAssessmentUpdated Calls to Finally Block
Nephelite Jan 25, 2025
f356c41
Merge pull request #258 from Nephelite/main
Nephelite Jan 25, 2025
197f6ce
Change Recall and Release Request Types to PATCH
Nephelite Jan 25, 2025
212cf13
Merge pull request #259 from Nephelite/main
Nephelite Jan 25, 2025
ef20edb
Add await to .save call
Nephelite Jan 25, 2025
764d0c7
Merge pull request #260 from Nephelite/main
Nephelite Jan 25, 2025
4e7e78b
Disable Caching of Assessment Details
Nephelite Jan 25, 2025
dc5b3f5
Merge pull request #261 from Nephelite/main
Nephelite Jan 25, 2025
9c75a7b
Fix Scale Label Formatting and Add Alerts in Error Handling
Nephelite Jan 25, 2025
4719e67
Fix test
Nephelite Jan 25, 2025
540e5f0
Merge pull request #262 from Nephelite/main
Nephelite Jan 25, 2025
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
Prev Previous commit
Next Next commit
feat: filter the team by teamset
  • Loading branch information
wxy1203 committed Oct 21, 2024
commit 8008e8430c305562e4e1654f0c8942e5f95427eb
3 changes: 1 addition & 2 deletions multi-git-dashboard/src/components/views/ClassReview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ const ClassReview: React.FC<OverviewProps> = ({ courseId }) => {

return (
<ScrollArea
m="md"
style={{
height: '97vh',
height: '100vh',
paddingRight: '20px',
overflowY: 'auto',
scrollbarWidth: 'thin',
Expand Down
23 changes: 19 additions & 4 deletions multi-git-dashboard/src/components/views/Overview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
Container,
Loader,
ScrollArea,
Tabs,
} from '@mantine/core';
import { Profile } from '@shared/types/Profile';
import { Team as SharedTeam } from '@shared/types/Team';
Expand All @@ -14,10 +15,12 @@ import { useEffect, useState } from 'react';
import OverviewAccordionItem from '../overview/OverviewAccordionItem';
import { useTutorialContext } from '../tutorial/TutorialContext';
import TutorialPopover from '../tutorial/TutorialPopover';
import { TeamSet } from '@shared/types/TeamSet';

interface OverviewProps {
courseId: string;
dateUtils: DateUtils;
teamSets: TeamSet[];
}

export interface Team extends Omit<SharedTeam, 'teamData'> {
Expand All @@ -26,7 +29,7 @@ export interface Team extends Omit<SharedTeam, 'teamData'> {

export type ProfileGetter = (gitHandle: string) => Promise<Profile>;

const Overview: React.FC<OverviewProps> = ({ courseId, dateUtils }) => {
const Overview: React.FC<OverviewProps> = ({ courseId, dateUtils, teamSets, }) => {
const { curTutorialStage } = useTutorialContext();

const [teams, setTeams] = useState<Team[]>([]);
Expand Down Expand Up @@ -94,10 +97,10 @@ const Overview: React.FC<OverviewProps> = ({ courseId, dateUtils }) => {
if (!teams.length || !teamDatas.length)
return <Center>No teams found.</Center>;

return (
<ScrollArea.Autosize mt={20}>
const renderOverviewAccordion = (teamSet: TeamSet) => {
return (
<Accordion
defaultValue={[teamDatas[0]._id]}
defaultValue={teamDatas.length > 0 ? [teamDatas[0]._id] : []}
multiple
variant="separated"
mx={20}
Expand All @@ -121,8 +124,20 @@ const Overview: React.FC<OverviewProps> = ({ courseId, dateUtils }) => {
</TutorialPopover>
))}
</Accordion>
);
};

return (
<ScrollArea.Autosize mt={20}>
{teamSets.map(teamSet => (
<Tabs.Panel key={teamSet._id} value={teamSet.name}>
{renderOverviewAccordion(teamSet)}
</Tabs.Panel>
))}
</ScrollArea.Autosize>
);


};

export default Overview;
3 changes: 1 addition & 2 deletions multi-git-dashboard/src/components/views/PeopleInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,8 @@ const PeopleInfo: React.FC<PeopleInfoProps> = ({

return (
<ScrollArea
m="md"
style={{
height: '97vh',
height: '100vh',
paddingRight: '20px',
overflowY: 'auto',
scrollbarWidth: 'thin',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const ProjectManagementInfo: React.FC<ProjectManagementProps> = ({
return (
<Container
style={{
height: 'calc(100dvh - 2 * 20px)',
height: '100vh',
display: 'flex',
flexDirection: 'column',
}}
Expand Down
3 changes: 1 addition & 2 deletions multi-git-dashboard/src/components/views/TeamsInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,8 @@ const TeamsInfo: React.FC<TeamsInfoProps> = ({

return (
<ScrollArea
m="md"
style={{
height: '97vh',
height: '100vh',
paddingRight: '20px',
overflowY: 'auto',
scrollbarWidth: 'thin',
Expand Down
5 changes: 3 additions & 2 deletions multi-git-dashboard/src/pages/admin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,11 @@ const AdminPage: React.FC = () => {
));

return (
<ScrollArea m="md" style={{ height: '100vh' }}>
<ScrollArea style={{ height: '100vh' }}>
<TextInput
placeholder="Search by any field"
mb="md"
style = {{ margin: '20px' }}
leftSection={
<IconSearch
style={{ width: rem(16), height: rem(16) }}
Expand Down Expand Up @@ -280,7 +281,7 @@ const AdminPage: React.FC = () => {
)}
</Table.Tbody>
</Table>
<Group justify="flex-end">
<Group justify="flex-end" mb="md" mr='lg'>
<Button
onClick={() => handleApprove(selectedRows)}
disabled={selectedRows.length === 0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const CourseViewPage: React.FC = () => {
return (
<Container
style={{
height: 'calc(100dvh - 20px)',
height: '100vh',
display: 'flex',
flexDirection: 'column',
}}
Expand Down
15 changes: 11 additions & 4 deletions multi-git-dashboard/src/pages/courses/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useTutorialContext } from '@/components/tutorial/TutorialContext';
import TutorialPopover from '@/components/tutorial/TutorialPopover';
import WelcomeMessage from '@/components/views/WelcomeMessage';
import { hasFacultyPermission } from '@/lib/auth/utils';
import { Box, Button, Modal } from '@mantine/core';
import { Box, Button, Modal, ScrollArea } from '@mantine/core';
import { useDisclosure } from '@mantine/hooks';
import { Course } from '@shared/types/Course';
import { signOut } from 'next-auth/react';
Expand Down Expand Up @@ -66,7 +66,14 @@ const CourseListPage: React.FC = () => {
};

return (
<div>
<ScrollArea
style={{
height: '100vh',
paddingRight: '20px',
overflowY: 'auto',
scrollbarWidth: 'thin',
}}
>
<Modal opened={opened} onClose={close} title="Course Creation">
<CreateCourseForm />
</Modal>
Expand Down Expand Up @@ -101,7 +108,7 @@ const CourseListPage: React.FC = () => {
)}
{hasFacultyPermission() && (
<div>
<Button onClick={open} mt={16}>
<Button onClick={open} mt={16} mb={20}>
Create Course
</Button>
</div>
Expand All @@ -110,7 +117,7 @@ const CourseListPage: React.FC = () => {
<WelcomeMessage opened={curTutorialStage === 0} />
)}
</Box>
</div>
</ScrollArea>
);
};

Expand Down
Loading