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

Close Professor-page-search-bar issues #844

Open
wants to merge 9 commits into
base: 840-professor-page-search-bar-redesign
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 20 additions & 20 deletions .github/workflows/prod-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,36 @@ jobs:
API_WORKERS: 8

steps:
# - name: Wait for tests to succeed
# uses: lewagon/wait-on-check-action@v1.0.0
# with:
# ref: ${{ github.ref }}
# repo-token: ${{ secrets.GITHUB_TOKEN }}
# check-name: pytest

# - name: Wait for lighthouse tests to succeed
# uses: lewagon/wait-on-check-action@v1.0.0
# with:
# ref: ${{ github.ref }}
# repo-token: ${{ secrets.GITHUB_TOKEN }}
# check-name: 'Lighthouse CI'
# - name: Wait for tests to succeed
# uses: lewagon/wait-on-check-action@v1.0.0
# with:
# ref: ${{ github.ref }}
# repo-token: ${{ secrets.GITHUB_TOKEN }}
# check-name: pytest

# - name: Wait for lighthouse tests to succeed
# uses: lewagon/wait-on-check-action@v1.0.0
# with:
# ref: ${{ github.ref }}
# repo-token: ${{ secrets.GITHUB_TOKEN }}
# check-name: 'Lighthouse CI'

- uses: actions/checkout@v2
with:
ref: master

- name: Build images
run: |
docker-compose -f docker-compose.yml -f docker-compose.production.yml build yacs_api yacs_web
docker compose -f docker-compose.yml -f docker-compose.production.yml build yacs_api yacs_web

- name: Update yacs_api
run: |
docker-compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_api &&
docker-compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_api &&
docker-compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_api
docker compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_api &&
docker compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_api &&
docker compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_api

- name: Update yacs_web
run: |
docker-compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_web &&
docker-compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_web &&
docker-compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_web
docker compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_web &&
docker compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_web &&
docker compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_web
14 changes: 7 additions & 7 deletions .github/workflows/staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:

- name: Build images
run: |
docker-compose -f docker-compose.yml -f docker-compose.production.yml build yacs_api yacs_web
docker compose -f docker-compose.yml -f docker-compose.production.yml build yacs_api yacs_web

- name: Update yacs_api
run: |
docker-compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_api &&
docker-compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_api &&
docker-compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_api
docker compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_api &&
docker compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_api &&
docker compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_api

- name: Update yacs_web
run: |
docker-compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_web &&
docker-compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_web &&
docker-compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_web
docker compose -f docker-compose.yml -f docker-compose.production.yml stop yacs_web &&
docker compose -f docker-compose.yml -f docker-compose.production.yml rm -f yacs_web &&
docker compose -f docker-compose.yml -f docker-compose.production.yml up -d yacs_web
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ node_modules/
.vscode
.DS_Store
.python-version
*.ipynb*
courses20.xml
.coverage
compose-dev.yaml
Expand Down
29 changes: 29 additions & 0 deletions rpi_data/Degree_Tamplates/major-template-data-info.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Things to put at the top of the page:
- If you plan to skip classes via transfer credits, make sure you confirm with an advisor, as there are many classes that you are not able to transfer in.

Unless specified, every student must take an INQR course freshman year. This counts towards their HASS core requirement.

If "school": "Engineering" or "Architecture" then the Engineering HASS core is applied:
5 (or 20 credits) total HASS classes, including a completed pathway and one communication intensive class.

If "school": "Science" or "HASS" or "Management" then the School of Science HASS core is applied:
6 (or 24 credits) total HASS classes, including 12 credits above the 1000 level, one completed pathway, at least one 4000-level course

"year" is both the year the student enters RPI and the year in the RPI catalog the major template can be found.

*FACT CHECK THIS* An RPI degree requires a minimum of 124 credits, while most majors require more. 64 credits must be at RPI if you are a transfer student and 92 if you are not (because incoming freshmen can transfer in a max of 32 credits).

When a class is just listed as the subject code and then a single digit, that represents the need to take any class within that subject code at that thousand-level or higher. i.e. : "MANE-4" would signify that the student must take a MANE class at the 4000 level or higher. There may be more information about the specifics of this elective, so students are encouraged to check with their advisor or the catalog.

Currently, Architecture is not included because it takes five years and is such a hassle.

For the 'pick-multiple', the "pick" refers to how many of the following "classes" are required to fulfill that listed elective.

Majors that need the most personalization (usually they have some kind of specialization or focus track that needs to be planned with and approved by an advisor): Applied Physics, Building Sciences

****** Building sciences is unfinished because it looks like it is getting discontiued?******

******* Find the science core requirements for Lally *****

Science core for HASS majors:
- 8 credits of Math, 16 credits of Math or Science. Some named courses may be included in the required courses for each major.
Loading
Loading