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

Fix local -> Develop #336

Merged
merged 42 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f4c3668
Bump shell-quote and react-scripts in /client-course-schedulizer
dependabot[bot] Nov 18, 2022
fcb49ac
addressing non-teaching bug in #250
rpruim Nov 25, 2022
a1c9cef
infer non-teaching status for new courses as well as for new sections.
rpruim Nov 25, 2022
ae76720
Fixed half semester conflict by adding semesterLength value
se-624 Nov 17, 2022
663b78d
implement a fix for part-semester conflict checking --
rpruim Nov 21, 2022
b24247c
refactor term overlap a bit; add tests
rpruim Nov 22, 2022
7e762f4
Update deploy.yml to use Node v14
charkour Nov 26, 2022
9d655dd
Add DeliveryMode column. Similar to InstrutionalMethod.
rpruim Nov 25, 2022
7d34a88
update readme to reflect the new/optional columns
rpruim Nov 25, 2022
8130578
add comments describing what functions do and why
rpruim Nov 26, 2022
e325cb2
remove instructional method where not needed;
rpruim Nov 26, 2022
058d500
implement standard time check; clean up some warnings
rpruim Nov 26, 2022
de2c740
update legal times list.
rpruim Nov 27, 2022
e4f9c3d
add excel meeting patterns data from registrar
rpruim Nov 27, 2022
f4edf95
implement stricter meeting pattern check
rpruim Nov 27, 2022
7bfb2fe
Addressing #300. Loser check for standard times.
rpruim Nov 28, 2022
9cc4f4e
fix data error in meeting-patterns.csv
rpruim Nov 29, 2022
2a3c0f5
add json version of meeting patterns and R code
rpruim Nov 29, 2022
c893ebc
add toggle for semester part
rpruim Dec 9, 2022
42a4974
remove (disabled) search; restyle toolbar a bit;
rpruim Dec 9, 2022
5c3591e
reset default semester length (aka semester part) in filterEventsByTe…
rpruim Dec 9, 2022
ca57d26
implement color by group
rpruim Dec 10, 2022
dfd961c
add selectedSemesterPart dependency to useMemo()
rpruim Dec 12, 2022
9ea7d9e
start 8:00 -> 8:20 for 3 x 120 labs
rpruim Jan 4, 2023
7f8958b
Merge pull request #324 from senior-knights/feature/update-meeting-pa…
VelSharon Jan 20, 2023
8327f05
Merge pull request #262 from senior-knights/dependabot/npm_and_yarn/c…
FitsumMaru Jan 20, 2023
d888d1a
get app running locally
charkour Jun 4, 2023
6d1ceff
bump full calendar v6
charkour Jun 4, 2023
171c65b
remove export
charkour Jun 4, 2023
b2526fc
add engines
charkour Jun 5, 2023
e23fa6e
update to run with pnpm
SophiaSun18 Oct 19, 2023
9511a28
update node version to fit the testing workflow
SophiaSun18 Oct 19, 2023
c05e45c
Update ci.yml to use pnpm commands
SophiaSun18 Oct 19, 2023
18df081
update ci.yml for pnpm
SophiaSun18 Oct 19, 2023
97940d4
update cache dependency path
SophiaSun18 Oct 19, 2023
f85bc59
comment out cache for test purpose
SophiaSun18 Oct 19, 2023
d30361d
update with new install command
SophiaSun18 Oct 19, 2023
3265e55
Update ci.yml
SophiaSun18 Oct 26, 2023
8735bac
Adding content to the help page
NycoCC1993 Nov 1, 2023
6e5da3f
update team2023 info
SophiaSun18 Nov 1, 2023
ff23118
Merge branch 'fix-local' of https://github.com/senior-knights/course-…
SophiaSun18 Nov 1, 2023
349fee4
Improving help page
NycoCC1993 Nov 1, 2023
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
19 changes: 11 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,21 @@ jobs:
env:
working-directory: ./client-course-schedulizer
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
node-version: '14'
- name: update-npm-version
version: 8
- uses: actions/setup-node@v3
with:
node-version: '20'
- name: update-pnpm-version
run: |
npm install -g npm@latest
- name: Install npm dependencies
pnpm install -g pnpm@latest
- name: Install pnpm dependencies
run: |
npm ci
pnpm install
working-directory: ${{env.working-directory}}
- name: Run tests
run: |
npm test
pnpm test
working-directory: ${{env.working-directory}}
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
working-directory: ./client-course-schedulizer
strategy:
matrix:
node-version: [12.x]
node-version: [14.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
39 changes: 20 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,44 +26,45 @@ For more information, please visit the [About Page](https://senior-knights.githu

## How to use

Detailed information can be found on our [Help Page](https://senior-knights.github.io/course-schedulizer/#/help) (once we make it). Access our production website and upload a CSV following the prescribed specifications:
Detailed information can be found on our [Help Page](https://senior-knights.github.io/course-schedulizer/#/help) (once we make it). Access our production website and upload a CSV following the prescribed specifications (items marked with * are optional and ignored, but were required in older versions of the app)

- Department: string (like `Mathematics`)
- Term: [0-9][0-9]/(FA | SP | IN) (like `21/SP` for Spring 2021)
- *Term: [0-9][0-9]/(FA | SP | IN) (like `21/SP` for Spring 2021)
- TermStart: mm/dd/yyyy (like `3/29/2021` or `12/1/2022`)
- AcademicYear: yyyy (like `2021`)
- SectionName: SubjectCode-CourseNum-SectionCode (like `MATH-252-B`)
- *AcademicYear: yyyy (like `2021`)
- *SectionName: SubjectCode-CourseNum-SectionCode (like `MATH-252-B`)
- SubjectCode: string (like `MATH`)
- CourseNum: string (like `252` or `252L` for a lab)
- SectionCode: string (like `B`)
- CourseLevelCode: pos num (like `200` for a 200 level course)
- MinimumCredits: pos num (like `3` or `3.5`)
- FacultyLoad: pos num (like `4` or `4.5`)
- Used: pos num (like `20`)
- Day10Used: pos num (like `22`)
- LocalMax: pos num (like `25`)
- GlobalMax: pos num (like `30`)
- RoomCapacity: pos num (like `32`)
- *Used: pos num (like `20`)
- *Day10Used: pos num (like `22`)
- *LocalMax: pos num (like `25`)
- *GlobalMax: pos num (like `30`)
- *RoomCapacity: pos num (like `32`)
- BuildingAndRoom: string (like `HH 345`)
- MeetingDays: M?T?W?(TH)?F? (like `MWTHF`)
- MeetingTime: xx:xx(AM | PM) - xx:xx(AM | PM) (like `9:00AM - 9:50AM`)
- SectionStartDate: mm/dd/yyyy (like `3/29/2021` or `12/1/2022`)
- SectionEndDate: mm/dd/yyyy (like `3/29/2021` or `12/1/2022`)
- Building: string (like `HH`)
- RoomNumber: string (like `345`)
- *Building: string (like `HH`)
- *RoomNumber: string (like `345`)
- MeetingStart: xx:xx(AM | PM) (like `2:30PM`)
- MeetingStartInternal: xx:xx:xx 24-hour (like `14:30:00`)
- *MeetingStartInternal: xx:xx:xx 24-hour (like `14:30:00`)
- MeetingEnd: xx:xx(AM | PM) (like `3:20PM`)
- MeetingEndInternal: xx:xx:xx 24-hour (like `13:20:00`)
- Monday: `M` or empty
- Tuesday: `T` or empty
- Wednesday: `W` or empty
- Thursday: `TH` or empty
- Friday: `F` or empty
- *MeetingEndInternal: xx:xx:xx 24-hour (like `13:20:00`)
- *Monday: `M` or empty
- *Tuesday: `T` or empty
- *Wednesday: `W` or empty
- *Thursday: `TH` or empty
- *Friday: `F` or empty
- ShortTitle: string (like `Number Theory`)
- Faculty: string (first and last) (like `Paul Erdos`)
- SectionStatus: string (like `Active`)
- *SectionStatus: string (like `Active`)
- InstructionalMethod: `LEC`, `CPI`, `IND`, `TUT`, or `SEM`
- DeliveryMode: `In-person`, `Online (synchronous)`, `Online (asynchronous)`, `Hybrid`

## Development

Expand Down
92 changes: 46 additions & 46 deletions client-course-schedulizer/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ module.exports = {
},
extends: [
"react-app",
"airbnb",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
// "airbnb",
// "plugin:@typescript-eslint/recommended",
// "plugin:react/recommended",
"prettier",
"prettier/@typescript-eslint",
"prettier/react",
Expand All @@ -27,12 +27,12 @@ module.exports = {
sourceType: "module",
},
plugins: [
"react",
"@typescript-eslint",
// "react",
// "@typescript-eslint",
"typescript-sort-keys",
"react-hooks",
// "react-hooks",
"sort-keys-fix",
"import",
// "import",
],
rules: {
// Disable some AirBnB rules.
Expand All @@ -44,38 +44,38 @@ module.exports = {
camelcase: "off",

// API might not have camelcase
"@typescript-eslint/camelcase": ["off"],
// "@typescript-eslint/camelcase": ["off"],

// JSX can be in either jsx or tsx files
"react/jsx-filename-extension": [1, { extensions: [".tsx", ".jsx"] }],

// Turn off rules related to Prettier. These are auto fixed.
"max-len": "off",
"@typescript-eslint/quotes": "off",
// "@typescript-eslint/quotes": "off",
"arrow-parens": "off",
"@typescript-eslint/semi": "off",
// "@typescript-eslint/semi": "off",
"react/jsx-closing-bracket-location": "off",
"@typescript-eslint/indent": "off", // Conflicts with Prettier settings
// "@typescript-eslint/indent": "off", // Conflicts with Prettier settings
// Make comma-dangle error bc it needs to be in version control
// or else it is confusing. See: https://eslint.org/docs/rules/comma-dangle
"comma-dangle": ["error", "always-multiline"],

// Don't prefer default exports
"import/no-default-export": "error",
"import/prefer-default-export": "off",

// Don't require extensions for the follow files
"import/extensions": [
"error",
"ignorePackages",
{
js: "never",
jsx: "never",
ts: "never",
tsx: "never",
},
],
"import/no-unresolved": "off",
// // Don't prefer default exports
// "import/no-default-export": "error",
// "import/prefer-default-export": "off",

// // Don't require extensions for the follow files
// "import/extensions": [
// "error",
// "ignorePackages",
// {
// js: "never",
// jsx: "never",
// ts: "never",
// tsx: "never",
// },
// ],
// "import/no-unresolved": "off",

// Rules related to function definitions
"func-style": ["error", "expression"],
Expand All @@ -89,15 +89,15 @@ module.exports = {
"sort-keys-fix/sort-keys-fix": "error",

// More typescript specific rules
"@typescript-eslint/array-type": "error",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-explicit-any": "error",
"@typescript-eslint/type-annotation-spacing": "error",
// "@typescript-eslint/array-type": "error",
// "@typescript-eslint/explicit-module-boundary-types": "off",
// "@typescript-eslint/explicit-function-return-type": "off",
// "@typescript-eslint/no-explicit-any": "error",
// "@typescript-eslint/type-annotation-spacing": "error",

// Works with v2 typescript-eslint but not v3.
// Enforces no anti pattern with interfaces I
"@typescript-eslint/interface-name-prefix": ["error", "never"],
// "@typescript-eslint/interface-name-prefix": ["error", "never"],

// React Hooks
"react-hooks/rules-of-hooks": "error",
Expand All @@ -123,18 +123,18 @@ module.exports = {
},
settings: {
// Imports with these extensions can be resolved with relative path
"import/resolver": {
node: {
extensions: [".js", ".jsx", ".ts", ".tsx"],
},
},
// "import/resolver": {
// node: {
// extensions: [".js", ".jsx", ".ts", ".tsx"],
// },
// },
},
overrides: [
{
files: ["**/*.test.tsx"],
env: {
jest: true,
},
},
],
// overrides: [
// {
// files: ["**/*.test.tsx"],
// env: {
// jest: true,
// },
// },
// ],
};
Loading