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.

Sign up for GitHub

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

Front end integration #752

Merged
merged 110 commits into from
Oct 13, 2023
Merged

Front end integration #752

Show file tree
Hide file tree
Changes from 57 commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
b6a12ba
Created Professor, club/organziation, and pathway entities(draft)
jonha1 Feb 14, 2023
536174b
Changed SQLalchemy version to 1.4.1
jonha1 Feb 15, 2023
26ce4c7
Adding professors
jonha1 Mar 3, 2023
6a3b525
started professor page
Mar 3, 2023
093c296
Remove webex form professor
jonha1 Mar 3, 2023
3163306
Professor Name
jonha1 Mar 13, 2023
a710317
Get professor name by email
jonha1 Mar 16, 2023
b26dbbc
Removing professor from database
jonha1 Mar 17, 2023
00417f2
Fix finding professor name by eamil
jonha1 Mar 17, 2023
3063b75
FIxed functions for professor
jonha1 Mar 17, 2023
b3b6c38
Implement more professor functions
jonha1 Mar 21, 2023
fdb6c20
starting professor explore page
Mar 22, 2023
f4a26d7
Added Professor functions
jonha1 Mar 24, 2023
1c4abff
Professor functions
jonha1 Mar 24, 2023
3fa1ce8
worked on professor functions
Mar 29, 2023
8c0b108
Add Professor
jonha1 Mar 31, 2023
cb99e73
got alphabet-sorted professor page working
Mar 31, 2023
7c38a97
created department view
Mar 31, 2023
80b8538
fixed spacing, buttons, and alphabetization
Apr 4, 2023
4499c46
created professor pop-up
Apr 4, 2023
8b91877
added professors header button
Apr 4, 2023
a31d776
Debugging API calls
jonha1 Apr 4, 2023
13c8f72
Debbuging continued
jonha1 Apr 4, 2023
b97256f
Debugging continued
jonha1 Apr 5, 2023
db7d6f2
possible patch to fix
DarknessUnder Apr 5, 2023
558b9b9
change to get method
DarknessUnder Apr 5, 2023
9ffcbd8
Update YacsService.js
DarknessUnder Apr 5, 2023
d9260ce
API fix
jonha1 Apr 5, 2023
1ff32e7
Error with professor test case
jonha1 Apr 6, 2023
d9a5eab
IT WORKS
jonha1 Apr 6, 2023
ae2f219
Finished debugging on localhost
jonha1 Apr 7, 2023
890328c
move professor api calls to frontend service and created a editProfes…
DarknessUnder Apr 7, 2023
ea2f31d
Merge branch 'master' into prof-page
Apr 7, 2023
1966aef
Admin API calls
jonha1 Apr 7, 2023
94d4bca
made professor profile page
Apr 7, 2023
a983a56
debuggign remove professor
jonha1 Apr 8, 2023
b511c60
remove professor
jonha1 Apr 8, 2023
294cd01
Bulk upload
jonha1 Apr 10, 2023
2d52a38
Merge branch 'master' into front_end_integration
jonha1 Apr 10, 2023
8d372fd
Improved Admin Page and Maintanence
jonha1 Apr 11, 2023
af13edd
Bulk upload and clear cache
jonha1 Apr 11, 2023
cf0bd23
Modified Professor Page and add professor
jonha1 Apr 11, 2023
e5e2397
Add professor is delayed
jonha1 Apr 12, 2023
168c06e
professor header button icon
Apr 14, 2023
fa2ee55
fix add professor
jonha1 Apr 14, 2023
2b19886
removed professor phone number
Apr 16, 2023
c9726bb
add bulk professor
jonha1 Apr 21, 2023
0ea16ad
fixed heading alignment
Apr 21, 2023
6dbe15a
clean up
jonha1 Apr 25, 2023
464464f
Merge branch 'master' into front_end_integration
jonha1 May 8, 2023
3a84235
Fix duplicate Professor
jonha1 May 8, 2023
a3ed562
added button on admin page
jonha1 May 8, 2023
6e6b492
starting json from frontend to backend
jonha1 May 9, 2023
49041b7
working on json upload
jonha1 May 11, 2023
fd6e02f
fix issues on the UI of professor bulk insert
DarknessUnder May 11, 2023
32650cb
needs testing
jonha1 May 11, 2023
abc42e6
Merge branch 'front_end_integration' of https://github.com/YACS-RCOS/…
jonha1 May 12, 2023
fab218c
slight modifications to taking in professor json file
jonha1 May 12, 2023
fff2718
cleaned up code
jonha1 Jun 13, 2023
a7d7157
Debug import json file
jonha1 Jun 17, 2023
49380b6
fixed merge conflict
Jun 20, 2023
7a48c73
Merge branch 'master' into prof-page
ragar3 Jun 20, 2023
b77a3e5
Fixing professor json
jonha1 Jun 23, 2023
982649c
Professor commenting and debugging
jonha1 Jun 27, 2023
4e524f1
cleane up
jonha1 Jul 14, 2023
c0a5095
tesitng
jonha1 Jul 14, 2023
b62c2f4
code factoring error fixing
jonha1 Jul 14, 2023
c072df1
put professor into database
Acewvrs Jul 14, 2023
ec76130
reveal what to do for testing
jonha1 Jul 14, 2023
d783bf1
Merge branch 'front_end_integration' of https://github.com/YACS-RCOS/…
Acewvrs Jul 14, 2023
7e25f34
located error
jonha1 Jul 15, 2023
9bbe106
debugging database table creation
Acewvrs Jul 21, 2023
390f4fb
fixed skipping database initalization
jonha1 Jul 21, 2023
3f30428
Merge branch 'front_end_integration' of https://github.com/YACS-RCOS/…
jonha1 Jul 21, 2023
9d9c6d8
professor database
jonha1 Jul 21, 2023
b956713
fixed attribute name issue
Acewvrs Jul 21, 2023
056b5be
Improved security
jonha1 Jul 25, 2023
c1b72b7
clean up and improved secuirty
jonha1 Jul 25, 2023
9cb1bd9
updated Department
jonha1 Jul 25, 2023
7584430
fixed warning
Acewvrs Jul 25, 2023
0e6e652
fix warning
Acewvrs Jul 25, 2023
04a031b
fix warning
Acewvrs Jul 25, 2023
e69f886
Update professor.py
Acewvrs Jul 25, 2023
8be2db5
removed unnecessary functions
Acewvrs Jul 25, 2023
5d49ae8
warning fix
Acewvrs Jul 25, 2023
5ee103a
attempt at fixing warning
Acewvrs Jul 28, 2023
2200854
attempt at fixing warning
Acewvrs Jul 28, 2023
2c302e5
fix warning
Acewvrs Jul 28, 2023
fbc40d1
fix warning
Acewvrs Jul 28, 2023
9f09f99
Update professor.py
Acewvrs Jul 28, 2023
f3abea1
fixing security error with SQL
jonha1 Aug 3, 2023
3b90562
fixing SQL errors
jonha1 Aug 3, 2023
6147df3
fixing
jonha1 Aug 3, 2023
416debb
cleaning up function
jonha1 Aug 3, 2023
89e5fda
trying to get sql injeciton errors
jonha1 Aug 3, 2023
d2fe3ed
try again :(
jonha1 Aug 3, 2023
27c81d5
does this fix it
EggyRepublic Aug 3, 2023
5de6ffb
few more changes
EggyRepublic Aug 3, 2023
31ebb8c
get professor buttons work
Acewvrs Aug 4, 2023
bf4ae2e
clean up
jonha1 Aug 6, 2023
364809b
Merge branch 'front_end_integration' of https://github.com/YACS-RCOS/…
jonha1 Aug 6, 2023
9dfe7dc
testing
jonha1 Aug 6, 2023
53698a3
revert
jonha1 Aug 6, 2023
cf6fbf4
clean up
jonha1 Aug 8, 2023
c8b8d5c
clean up
jonha1 Aug 8, 2023
aec6cc0
Create ProfExplorer.vue
jonha1 Sep 22, 2023
a92955b
Merge branch 'prof-page' into front_end_integration
jonha1 Sep 22, 2023
bde6351
Switched order of prof and final
jonha1 Sep 22, 2023
579274e
working on fixing professor schema
jonha1 Sep 29, 2023
571cec5
fixed backend
jonha1 Oct 2, 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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ node_modules/
*.ipynb*
courses20.xml
.coverage
compose-dev.yaml
rpi_data/get-summer-2023-2.sh
rpi_data/summer-20232.csv
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ services:
restart: unless-stopped
container_name: yacs_db
image: postgres:12-alpine

Loading