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

Grey holidays out and change add rides errors #548

Open
wants to merge 52 commits into
base: dka36/Holidays
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
efb0a8a
dka36/Reassign Button Fix
Dwain-Anderson Oct 6, 2024
678b68a
dka36/Reassign Task, left in debug prints.
Dwain-Anderson Oct 6, 2024
8f7ec00
WIP of implementing new landing page
raissaji Oct 14, 2024
bc6e246
Search&Filter
Atikpui007 Oct 17, 2024
37e797c
Prettier
Atikpui007 Oct 17, 2024
6b7043d
Merge branch 'master' of https://github.com/cornell-dti/carriage-web …
raissaji Oct 18, 2024
4a11d84
Pull master and fix landing page resizing
raissaji Oct 19, 2024
ded32d6
Add new elements to landing page - resizing is kinda iffy still
raissaji Oct 19, 2024
36b7fc3
WIP: Implement Employee Card Pagination
selenaliu1 Oct 26, 2024
2bf987d
Implement new designs:
raissaji Oct 27, 2024
dafdb66
Ran prettier
raissaji Oct 27, 2024
420637b
installing necesary deps
Atikpui007 Oct 27, 2024
f98c985
Update styling and fix pagination component
selenaliu1 Oct 27, 2024
4fd9197
remove comments
selenaliu1 Oct 27, 2024
c24d452
Make website responsive
raissaji Oct 27, 2024
217afe1
Add documentation and ran prettier
raissaji Oct 28, 2024
4ea5afc
Merge branch 'master' of https://github.com/cornell-dti/carriage-web …
raissaji Oct 28, 2024
11b5e40
Merge pull request #545 from cornell-dti/sl2663/employeeCardPagination
Atikpui007 Oct 28, 2024
886a8a1
Ran prettier
raissaji Oct 28, 2024
0f97a74
Merge branch 'master' of https://github.com/cornell-dti/carriage-web …
raissaji Oct 28, 2024
aac043d
React version update
raissaji Oct 30, 2024
abb61fa
Split large links for prettier
raissaji Oct 30, 2024
96f55e4
Grey out holidays on minical
selenaliu1 Oct 30, 2024
b0ed065
Prettier Test Fix
Atikpui007 Nov 6, 2024
8d18575
Checking double quotes
Atikpui007 Nov 6, 2024
ec05942
Trying one more before moving all to new branch
Atikpui007 Nov 7, 2024
5c7d3ce
Merge branch 'master' of github.com:cornell-dti/carriage-web into sl2…
selenaliu1 Nov 7, 2024
d6a89c2
remove comments and console.logs
selenaliu1 Nov 7, 2024
faaf5d2
Checking CI/CD workflow
Atikpui007 Nov 7, 2024
6592175
run prettier
selenaliu1 Nov 7, 2024
297f5de
Updated Search and Filter with added StatsBox
Atikpui007 Nov 11, 2024
aa885d2
Prettier Fix
Atikpui007 Nov 11, 2024
2304324
Merged changes with Master
Atikpui007 Nov 11, 2024
43fd596
Prettier Fix
Atikpui007 Nov 11, 2024
59a2445
Added proper icons for stats box
Atikpui007 Nov 11, 2024
a1bf070
Merge pull request #538 from cornell-dti/rj353/landing_page
Atikpui007 Nov 11, 2024
99ca987
Bump cookie and express in /frontend
dependabot[bot] Nov 11, 2024
07149d0
Merge pull request #536 from Dwain-Anderson/updateREADME
Atikpui007 Nov 11, 2024
4656dd2
Merge pull request #549 from cornell-dti/dependabot/npm_and_yarn/fron…
Atikpui007 Nov 11, 2024
698056e
Update README.md
Atikpui007 Nov 11, 2024
bdcf697
Merge pull request #541 from cornell-dti/SearchAndFilter
Atikpui007 Nov 11, 2024
67e40c7
Prettier Fix
Atikpui007 Nov 11, 2024
12081db
Merge branch 'master' of https://github.com/cornell-dti/carriage-web …
Atikpui007 Nov 11, 2024
5cb51c9
Navigation Fix
Atikpui007 Nov 11, 2024
772fc32
Merge pull request #550 from cornell-dti/dka34/readme_update
Atikpui007 Nov 11, 2024
b835bc1
Merge pull request #551 from cornell-dti/dka34/link_fix
Atikpui007 Nov 11, 2024
67f6604
restrict holidays for ride times and specify error messages
selenaliu1 Nov 14, 2024
ea8fa96
run prettier
selenaliu1 Nov 14, 2024
9cceb74
delete console.log
selenaliu1 Nov 14, 2024
844c568
Integration of React-Select into Add Student, proper styling and cust…
Atikpui007 Nov 15, 2024
17eb2fb
Merge pull request #554 from cornell-dti/dka34/student_modal
Atikpui007 Nov 16, 2024
fb4e4d5
Merge branch 'master' of github.com:cornell-dti/carriage-web into sl2…
selenaliu1 Nov 20, 2024
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
25 changes: 19 additions & 6 deletions .github/workflows/ci-check.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: CI Check
on: push

jobs:
check:
runs-on: ubuntu-latest
Expand All @@ -10,11 +9,25 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: '20.x'
- name: Install Dependencies
run: npm install
- name: Clean Install
run: |
rm -rf node_modules
rm -rf package-lock.json
npm cache clean --force
npm install
echo "Prettier version:"
npx prettier --version
- name: Debug Prettier
run: |
echo "Files to be checked:"
npx prettier --list-different "**/*.{ts,js,tsx,jsx,css}"
echo "Checking specific file:"
npx prettier --check "frontend/src/pages/Landing/Landing.tsx"
echo "Running full check:"
ls -la frontend/src/pages/Landing/
cat frontend/src/pages/Landing/Landing.tsx | od -c
npm run format:check
- name: Run Linter
run: npm run lint
- name: Run Prettier
run: npm run format:check
- name: Run Type Check
run: npm run type-check
run: npm run type-check
116 changes: 69 additions & 47 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,50 +26,72 @@ The **Rider App** branch can be found [here](https://github.com/cornell-dti/carr

## Contributors:

**Current Contributors**

- Harrison Chin - Software Developer
- Andrew Choi - Product Manager
- Rohit Valiveti - Software Developer
- Pratyush Sudhakar - Technical Project Manager
- Enoch Chen - Software Developer
- Desmond Atikpui - Software Developer
- Stuti Gupta - Software Developer
- Kevin Lin - Software Developer
- Colin Wu - Software Developer
- Raissa Ji - Software Developer
- Nam Anh Dang - Software Developer
- Selena Liu - Software Developer
- Dwain Anderson - Software Developer

**Past Contributors**

- Daniel Wei - Technical Project Manager
- Bryan Graeser - Product Manager
- Nina Xie - Product Manager
- Matthew Guo - Technical Project Manager
- Aaron Kang - Software Developer
- Zack Ashen - Software Developer
- Tucker Stanley - Software Developer
- Justin Kang - Software Developer
- Michael Torku - Technical Project Manager
- Austin Wu - Software Developer
- Li Fengyu - Software Developer
- Sam Steinberg - Product Manager
- Laura Sizemore - Technical Project Manager, Software Developer
- Christopher Hansen - Technical Project Manager
- Jessica Chen - Software Developer
- Bryan Graeser - Software Developer
- Matthew Guo - Software Developer
- Ishika Jain - Software Developer
- Lucy Wang - Software Developer
- Michael Ye - Software Developer
- Becky Hu - Software Developer
- Laura Sizemore - Software Developer
- Pinxuan Huang - Software Developer
- Jay Joo - Software Developer
- Simran Puri - Software Developer
- Aiden Kim - Designer
- Yisu Zheng - Designer
- Chelsea Wang - Designer
- Joanne Lee - Designer
## Contributors

### Current Contributors

#### Product Manager
- Matthias Choi

#### Technical Project Manager
- Desmond Atikpui

#### Software Developers
- Dwain Anderson
- Nam Anh Dang
- Raissa Ji
- Selena Liu

---

### Past Contributors

#### Product Managers
- Andrew Choi
- Bryan Graeser
- Nina Xie
- Sam Steinberg
- Stephy Chen

#### Technical Project Managers
- Christopher Hansen
- Daniel Wei
- Laura Sizemore
- Matthew Guo
- Michael Torku
- Pratyush Sudhakar

#### Software Developers
- Aaron Kang
- Aiden Kim
- Andrew Choi
- Becky Hu
- Bryan Graeser
- Chelsea Wang
- Colin Wu
- Enoch Chen
- Harrison Chin
- Ishika Jain
- Jay Joo
- Jessica Chen
- Joanne Lee
- Justin Kang
- Kevin Lin
- Laura Sizemore
- Li Fengyu
- Lucy Wang
- Matthew Guo
- Michael Ye
- Pinxuan Huang
- Rohit Valiveti
- Simran Puri
- Stuti Gupta
- Tucker Stanley
- Zack Ashen

#### Designers
- Aiden Kim
- Chelsea Wang
- Joanne Lee
- Yisu Zheng

Loading
Loading