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

WIP: Implement frontend for all modals to add, delete and edit plans. #830

Open
wants to merge 46 commits into
base: multiple-plans
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
3715017
Refactor Teleport Modal to use Composition API (#791)
zachary-kent Mar 9, 2023
41bc380
courses + meta data script (#796)
rohanmaheshwari430 Mar 10, 2023
9cb2f74
Bump webpack from 5.74.0 to 5.76.1 (#800)
dependabot[bot] Mar 15, 2023
ccc4dcf
Analytics User Properties (#803)
zachary-kent Mar 25, 2023
81639e1
Course retrieval function and New course interface (#805)
rohanmaheshwari430 Mar 28, 2023
2bd5df9
Add ansc minor (#793)
PabloRaigoza Mar 31, 2023
9627394
Course color and credits dropdown (#808)
KaylinChan Apr 11, 2023
3a1beb8
Changing Courses Retrieval Method in BottomBar component (#804)
rohanmaheshwari430 Apr 22, 2023
0af9154
Parsed Other Yes List (#801)
mirandayu131 Apr 26, 2023
42692af
Update package.json (#823)
rohanmaheshwari430 Apr 28, 2023
caca879
Removed commented code (#824)
zachary-kent Apr 29, 2023
a87d12d
Populate Firestore with specific roster's courses (#820)
rohanmaheshwari430 May 2, 2023
5f0a73a
Fetch Approved Liberal Studies Courses (#811)
mirandayu131 May 2, 2023
8096cef
Modify Liberal Studies Checker (#818)
mirandayu131 May 3, 2023
0afd370
Implemented Clean Function (#828)
zachary-kent May 3, 2023
567dcd5
Implement frontend for all modals to add, delete and edit plans.
elizabeth-tang May 6, 2023
7deb805
Run npm format
elizabeth-tang May 6, 2023
c4f5916
All Spring 2023 Contributors (#831)
noschiff May 9, 2023
bbbab0a
Bypass CI Check for Release Branch (#835)
noschiff May 9, 2023
1904eae
Update BottomBarCourseInfo.vue (#834)
rohanmaheshwari430 May 9, 2023
b1db95d
Bump vite from 2.9.13 to 2.9.16 (#836)
dependabot[bot] Aug 21, 2023
b943798
Bump semver from 5.7.1 to 5.7.2 (#837)
dependabot[bot] Aug 21, 2023
43c1dd5
Bump word-wrap from 1.2.3 to 1.2.4 (#838)
dependabot[bot] Aug 21, 2023
3fa0e19
Correct Nooroo's last name (#841)
zachary-kent Aug 22, 2023
967b515
Rebranch DTI as 'Digital Tech & Innovation' (#842)
zachary-kent Aug 27, 2023
9da5a8f
Relicense CoursePlan under MIT (#844)
zachary-kent Sep 6, 2023
9dd0e76
Modify workflows to reference 'main' as default branch (#845)
zachary-kent Sep 6, 2023
e2aee0c
Implement a 'serve:prod' script (#843)
zachary-kent Sep 13, 2023
3f20e0e
call firestore functions for add blank plan
elizabeth-tang Sep 18, 2023
89e0e76
Fix type issue in teleport modal
elizabeth-tang Sep 18, 2023
c23eeac
fix issue with adding 2nd new plan
elizabeth-tang Sep 18, 2023
090bd4c
Run Courses Script for FA23 (#856)
zachary-kent Oct 1, 2023
916cc5c
refactor whole codebase to plans instead of semesters
elizabeth-tang Oct 1, 2023
e75d159
add functions that disappeared after merge
elizabeth-tang Oct 1, 2023
93add3e
add plan type
elizabeth-tang Oct 1, 2023
ca88f91
test (#854)
andxu282 Oct 3, 2023
f137a96
Python CI + Black Pre-commit Hook (#849)
andxu282 Oct 4, 2023
26ed4fc
Updated README with newbies + new roles (#855)
nidhi-mylavarapu Oct 14, 2023
00e6606
add getter for current plan's semesters
elizabeth-tang Oct 22, 2023
64e721d
missed one use of getter
elizabeth-tang Oct 22, 2023
c00446a
Merge branch 'refactor-sems' into plans-add-modal
elizabeth-tang Oct 22, 2023
d51cd00
delete duplicate functions
elizabeth-tang Oct 22, 2023
e266607
multiple plans is multiple planning??
elizabeth-tang Oct 22, 2023
7294b94
Spring 2024 courses script (#864)
zachary-kent Oct 23, 2023
0bd622a
Merge branch 'plans-add-modal' of https://github.com/cornell-dti/cour…
elizabeth-tang Nov 12, 2023
693edca
confirmation modal when plans are added/deleted/edited
elizabeth-tang Nov 13, 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
2 changes: 1 addition & 1 deletion .github/workflows/cd-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Deploy to Staging
on:
push:
branches:
- master
- main

jobs:
deploy:
Expand Down
29 changes: 28 additions & 1 deletion .github/workflows/ci-check.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: CI Check
on:
on:
push:
workflow_dispatch:

Expand Down Expand Up @@ -45,3 +45,30 @@ jobs:
with:
name: recorded-videos
path: cypress/videos/
python-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: '3.11'
- name: Install pip
run: |
export RUN_LANGCHAIN_TESTS=false
python -m pip install --upgrade pip setuptools wheel
- name: Install pipenv, black, and pytest
run: |
pip install pipenv
- name: Pipenv Install
working-directory: python
run: pipenv install
- name: Check that pipenv is up to date
run: |
exit $(git status --porcelain | wc -l)
- name: Run black linting
working-directory: python
run: pipenv run black . --check
- name: Run black and tests
working-directory: python
run: pipenv run pytest
6 changes: 3 additions & 3 deletions .github/workflows/ci-policies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
run: |
echo "Your head ref is ${{ github.head_ref }}."
echo "Your base ref is ${{ github.base_ref }}."
- name: Fail if try to push release from non-master branch
if: (github.base_ref == 'beta-release' || github.base_ref == 'release') && github.head_ref != 'master'
- name: Fail if try to push release from non-main branch
if: ((github.base_ref == 'beta-release' || github.base_ref == 'release') && github.head_ref != 'main')
run: |
echo "Head ref must be master for release. Everything should go through staging first!"
echo "Head ref must be main for release. Everything should go through staging first!"
exit 1
warn-big-diff:
runs-on: ubuntu-latest
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,9 @@ serviceAccountProd.json

# App-specific output files that should be ignored
scripts/out

# Secret API key
python/secret_api_keys.py

# Pytest
python/__pycache__
11 changes: 11 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
repos:
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.2.1
hooks:
- id: prettier
exclude: 'src/requirements/decorated-requirements.json'
- repo: https://github.com/ambv/black
rev: 23.9.1
hooks:
- id: black
language_version: python3.11
682 changes: 21 additions & 661 deletions LICENSE

Large diffs are not rendered by default.

17 changes: 15 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Access CoursePlan at [courseplan.io](https://courseplan.io)!

CoursePlan is a four-year academic planner for Cornell undergraduates developed by the Design & Tech Initiative. CoursePlan helps undergraduates track their courses and their requirements automatically depending on their college, major, and minor. It aims to allow students view the big picture of their time at Cornell.
CoursePlan is a four-year academic planner for Cornell undergraduates developed by the Digital Tech & Innovation. CoursePlan helps undergraduates track their courses and their requirements automatically depending on their college, major, and minor. It aims to allow students view the big picture of their time at Cornell.

View documentation in our [wiki](https://github.com/cornell-dti/course-plan/wiki).

Expand All @@ -22,15 +22,28 @@ Then access http://localhost:8080/

## Contributors

### FA23
- **Nidhi Mylavarapu** - Developer
- **Jerry Wang** - Developer
- **Miranda Yu** - Developer
- **Elizabeth Tang** - Developer
- **Pablo Raigoza** - Developer
- **Michelle Dai** - Designer
- **Joanna Chen** - Designer
- **Jonathan Mak** - PMM
- **Kaylin Chan** - PM
- **Zak Kent** - TPM

### SP23

- **Jerry Wang** - Developer
- **Miranda Yu** - Developer
- **Rohan Maheshwari** - Developer
- **Elizabeth Tang** - Developer
- **Pablo Raigoza** - Developer
- **Noorejehan Umarn** - Designer
- **Noorejehan Umar** - Designer
- **Michelle Dai** - Designer
- **Larrisa Chen** - Designer
- **Jonathan Mak** - PMM
- **Kaylin Chan** - APM
- **Zak Kent** - TPM
Expand Down
2 changes: 2 additions & 0 deletions cypress/integration/accessibility-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ it('Check accessibility of the bottom bar', () => {
// open the bottom bar
cy.get('[data-cyId=semester-course]').eq(0).click();

// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(5000);
cy.checkA11y('[data-cyId=bottombar]', null, null, true); // only check accessibility within the bottom bar
});

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/test.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ it('Add a course with the new add modal (CS 1110)', () => {

// confirm that the results of the add modal are expected
cy.get('[data-cyId=newCourse-selectedCourse]').contains(
'CS 1110: Introduction to Computing Using Python'
'CS 1110: Introduction to Computing: A Design and Development Perspective'
);
cy.get('[data-cyId=newCourse-requirements]').contains('Introductory Programming');

Expand Down
Loading
Loading