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

Fixed bug to be able to clear date input #2180

Open
wants to merge 158 commits into
base: senior-project
Choose a base branch
from
Open

Fixed bug to be able to clear date input #2180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
b66fd42
completed initial add roommate
Oct 9, 2023
67ce383
First draft of the preferred hall box
ahwnsals1234 Oct 20, 2023
2d07c59
Added a submit button to the Demo
ahwnsals1234 Oct 21, 2023
7c9d682
add route for preferred hall
Oct 22, 2023
41c9003
Add Senior Project branch to ci.yml
bennettforkner Oct 24, 2023
f96a2c2
Update ci.yml
bennettforkner Oct 24, 2023
7682940
Set API URL to 360apisp
bennettforkner Oct 24, 2023
fbddf1d
Point API to 360APISP
bennettforkner Oct 24, 2023
0ef1648
rename add hall and preferred hall
Nov 1, 2023
33a0716
figuring out adding any number of halls
Nov 3, 2023
d33b8cf
add halls with the correct rank
Nov 4, 2023
f9668f9
enable updating preferred hall
Nov 4, 2023
20ffd79
Added add participant and Information Box
ahwnsals1234 Nov 6, 2023
a90439a
styling for preferred hall box
Nov 13, 2023
d5b6c2a
styling for preferred hall box
Nov 13, 2023
6fe775a
keep student from selecting same hall
Nov 13, 2023
f9c4ece
Merge commit 'd5b6c2a' into hl-add-hall
Nov 13, 2023
a79b6bf
make submit button float to right
Nov 13, 2023
94a2216
change default menu item from all to none
Nov 13, 2023
fe3d6ca
completed initial add roommate
Oct 9, 2023
dd8f48d
Merge pull request #2141 from gordon-cs/to-test-vm
ArabellaJi Nov 13, 2023
0a0a05f
Added Agreement form on top of current progress
ahwnsals1234 Nov 13, 2023
a755e7a
create survey box for sleepying type
Nov 19, 2023
7f65afd
Add one survery question -by Jay Bae
Nov 19, 2023
8c69a69
quick fix for question choice share one selectOption
Nov 19, 2023
a522bcc
Merge branch 'hl-prefer-box' of https://github.com/gorstdon-cs/gordon…
JayBae9903 Nov 20, 2023
4d0de96
Put survey questions into the box- by Jay Bae
JayBae9903 Nov 20, 2023
826789f
Branch to be used for Agreements, so changes made
ahwnsals1234 Nov 20, 2023
ea60a9f
adding delete button
Nov 20, 2023
c058327
Styled Preferred Halls box as necessary.
ahwnsals1234 Nov 20, 2023
9a30208
Update .env.development
andrew-wzj Nov 20, 2023
f40b9e1
Update .env.production
andrew-wzj Nov 20, 2023
3b991ee
Update HousingLottery.module.scss
andrew-wzj Nov 20, 2023
2fb1d92
Update HousingLottery.module.scss
andrew-wzj Nov 20, 2023
2aec825
Merge branch 'senior-project' into hl-add-hall
ArabellaJi Nov 22, 2023
6cf36fb
clear button almost finished, figuring out how to use two setState cl…
Nov 23, 2023
f560f4f
Merge commit 'c058327d495dd08ddaca7f7bf2d488637f0d92db' into hl-add-hall
Nov 23, 2023
e0cd68a
Merge commit '2aec8257a0ae9c95a23ed081e1edeb6a8a3ffdaf' into hl-add-hall
Nov 23, 2023
8de96ee
remove unneeded lines and update bad naming
Nov 23, 2023
19dc70b
completed clear button
Nov 25, 2023
8f25161
working on set perferred hall data when deleting and adding a hall
Nov 25, 2023
1dcd322
initial add hall conpleted, hall number fixed
Nov 25, 2023
535bae1
Merge branch 'develop' into hl-add-hall
Nov 25, 2023
d92f256
Merge pull request #2140 from gordon-cs/hl-add-hall
ArabellaJi Nov 25, 2023
ec8607f
Merge branch 'senior-project' into hl-prefer-box
andrew-wzj Nov 26, 2023
cb5a0fd
Update HousingLottery.module.scss
andrew-wzj Nov 26, 2023
fdbab8d
Update HousingLottery.jsx
andrew-wzj Nov 26, 2023
55d5289
Update HousingLottery.jsx
andrew-wzj Nov 26, 2023
82c7ca5
Update index.jsx
andrew-wzj Nov 26, 2023
3f8d27b
store preferences as array
Nov 26, 2023
1e473ef
store preference as array
Nov 26, 2023
95482e5
Update index.jsx
andrew-wzj Nov 26, 2023
e872d22
console log to check preference storage
Nov 26, 2023
6a2d659
use console log to view preference array
Nov 27, 2023
085941a
fix the selection radio and use console log to check the stored prefe…
Nov 27, 2023
eee4afc
remove unused file
Nov 27, 2023
8b491f7
First draft of textField needed to add participant
ahwnsals1234 Nov 27, 2023
b116682
All Required Remove Files
Nov 27, 2023
ea6146e
matching the structure for senior-project
Nov 27, 2023
798b607
Added applicantFields as number of max roommate
ahwnsals1234 Nov 28, 2023
68c8cd0
Added another ApplicantField
ahwnsals1234 Nov 28, 2023
405daac
Email is saved as array and added submit button
ahwnsals1234 Nov 28, 2023
f22b046
create button function only use by preference box
Nov 28, 2023
9ef990d
push for file structure consistent
Nov 28, 2023
3b78cda
Merge pull request #2145 from gordon-cs/hl-prefer-box
andrew-wzj Nov 28, 2023
1b1818b
Fixed bugs and made 4 separate input fields
ahwnsals1234 Nov 29, 2023
c74da9e
Fixes according to Arabella's Feedback
ahwnsals1234 Nov 29, 2023
09a522b
Merge branch 'senior-project' into hl-add-participant
ahwnsals1234 Nov 30, 2023
fdd5a97
Merge pull request #2147 from gordon-cs/hl-add-participant
ahwnsals1234 Nov 30, 2023
9d6d460
Student Applicants header styling
ahwnsals1234 Nov 30, 2023
130753e
submit data using one submit button
Dec 2, 2023
504993a
store preference as list
Dec 2, 2023
7f3640f
fix preference button display
Dec 3, 2023
cb8cd53
Merge branch 'senior-project' into hl-agreements
ahwnsals1234 Dec 3, 2023
6b15312
Merge pull request #2149 from gordon-cs/hl-agreements
ahwnsals1234 Dec 3, 2023
514e289
Fixes regarding Agreements
ahwnsals1234 Dec 3, 2023
c480f7b
minor fixes regarding agreements
ahwnsals1234 Dec 3, 2023
f26ddf8
Merge pull request #2150 from gordon-cs/hl-agreements-fix
ahwnsals1234 Dec 3, 2023
119fbdd
Added instructionsCard
JayBae9903 Dec 3, 2023
5073727
display preference as array of size 2,to update the content of prefer…
Dec 3, 2023
84b7e95
Merge branch 'senior-project' into student-UI-update
andrew-wzj Dec 3, 2023
abdd45c
Merge pull request #2148 from gordon-cs/student-UI-update
andrew-wzj Dec 3, 2023
74d98a3
have applicantion id
Dec 3, 2023
e9e5673
Merge branch 'senior-project' into hl-connect-front-back
Dec 3, 2023
9f2e67d
Changed minor things
JayBae9903 Dec 3, 2023
8400704
receive json array
Dec 3, 2023
750d87c
warn the user if the application is not submitted successfully
Dec 3, 2023
d5f4f7a
preference console report fix and header sharing with applicant card
Dec 4, 2023
c620f8a
Merge branch 'senior-project' into hl-instructions
JayBae9903 Dec 4, 2023
4b65aab
Merge pull request #2152 from gordon-cs/hl-instructions
JayBae9903 Dec 4, 2023
c4e0c87
Merge branch 'senior-project' into preferences
andrew-wzj Dec 4, 2023
0f1f1ed
Adjusted the layout of boxes in the student UI
JayBae9903 Dec 4, 2023
47d9e3d
Merge branch 'senior-project' into hl-connect-front-back
Dec 4, 2023
8edc6e3
Merge pull request #2154 from gordon-cs/hl-connect-front-back
ArabellaJi Dec 4, 2023
92f884e
Added feature distinguishing user
ahwnsals1234 Dec 4, 2023
5b3d31b
Merge branch 'senior-project' into hl-sort-user
ahwnsals1234 Dec 4, 2023
4cb83e6
when the page refresh, the selected radio button should be cleared, a…
Dec 4, 2023
44ebb52
Merge branch 'senior-project' into preferences
andrew-wzj Dec 4, 2023
8f48a97
Merge pull request #2158 from gordon-cs/hl-sort-user
ahwnsals1234 Dec 4, 2023
3e93696
Merge branch 'senior-project' into preferences
andrew-wzj Dec 4, 2023
d9ed485
Merge pull request #2157 from gordon-cs/preferences
andrew-wzj Dec 4, 2023
cc47bc0
revert the changes on databse connection
Dec 4, 2023
fe2f078
revert changes on local host link
Dec 4, 2023
ec5c5ca
Merge branch 'senior-project' into hl-revert-database-connect
ArabellaJi Dec 4, 2023
0d5786b
Merge pull request #2160 from gordon-cs/hl-revert-database-connect
ArabellaJi Dec 4, 2023
878d399
scratch table for adminView
Dec 4, 2023
0139548
edit the columns for preferred halls and applicant's email
Dec 5, 2023
ed640c3
Merge branch 'senior-project' into adminView
andrew-wzj Dec 5, 2023
71403ef
adjusted boxes again
JayBae9903 Dec 5, 2023
2435f42
Merge branch 'senior-project' into hl-studentUI-layout
JayBae9903 Dec 5, 2023
e5664cd
Adjusted boxes again after merging
JayBae9903 Dec 5, 2023
b19b6ea
set limit for applicant to 4 and preferred hall to 3
Dec 7, 2023
6629679
set limit of applicant to 4 and preferred hall to 3
Dec 7, 2023
fbe8066
package update by using npm install @esbuild/darwin-x64 , and make th…
Dec 7, 2023
fc2d9db
revert the change in json package
Dec 7, 2023
b84adbd
Merge branch 'adminView' of https://github.com/gordon-cs/gordon-360-u…
Dec 7, 2023
89b6254
resolve the depedency error and made card header and button for gener…
Dec 7, 2023
c4f6f92
fix dependency error
Dec 7, 2023
4061632
Updated package.json
JayBae9903 Dec 7, 2023
d0a9bb7
Updated package-lock.json
JayBae9903 Dec 7, 2023
87d16f5
Updated .env.development
JayBae9903 Dec 9, 2023
48f565c
Fixed loading problem and adjusted the layout again
JayBae9903 Dec 9, 2023
d6da51d
add new column standing as applicant's class standing
Dec 9, 2023
ab5a9fb
Deleted the button in preferences box
JayBae9903 Dec 9, 2023
e4b805a
simple but necessary styling add
ahwnsals1234 Dec 9, 2023
700c5a5
Merge pull request #2159 from gordon-cs/hl-studentUI-layout
ahwnsals1234 Dec 9, 2023
d928de0
Fixed StudentView to return data when submitted
ahwnsals1234 Dec 10, 2023
947b81a
Fixes to load preference data
ahwnsals1234 Dec 10, 2023
78a3833
Deleted commented code
ahwnsals1234 Dec 10, 2023
2fdd765
Fixed Agreements checkbox error and added feature
ahwnsals1234 Dec 10, 2023
b8d9a49
Fixed data to save in array
ahwnsals1234 Dec 11, 2023
a3e4cdb
fix preference list
Dec 11, 2023
b12e7a7
Merge pull request #2162 from gordon-cs/hl-premvp-fix
ahwnsals1234 Dec 11, 2023
31a519b
Very Minor fix, adding for MVP presentation
ahwnsals1234 Dec 11, 2023
eb1cabd
Merge pull request #2163 from gordon-cs/hl-header-fix
ahwnsals1234 Dec 11, 2023
3f1d379
Merge branch 'senior-project' into adminView
Dec 11, 2023
8a2a0ff
Merge branch 'senior-project' into adminView
andrew-wzj Dec 11, 2023
6c40282
Update .env.production
andrew-wzj Dec 11, 2023
fef450e
Update .env.development
andrew-wzj Dec 11, 2023
26213a2
Merge pull request #2161 from gordon-cs/adminView
andrew-wzj Dec 11, 2023
78225a1
update Json array
Jan 18, 2024
79ff2b3
Made the log-in user's information to fill into the application autom…
JayBae9903 Jan 22, 2024
34c4c46
Removed unnecessary lines
JayBae9903 Jan 23, 2024
ad21310
use gpt to give hint to normalization data for combining JSON files, …
Jan 28, 2024
3aa53ec
fix the preferredHall and preferrence
Jan 28, 2024
c4096f4
Corrected Housing Lottery number labeled
ahwnsals1234 Jan 29, 2024
b47b003
fix the issue of csv file to place the loaded table data, the main pr…
Jan 29, 2024
d06b481
Merge branch 'senior-project' into hl-applicant-autofill
ahwnsals1234 Jan 29, 2024
1f5824a
add email for initail user
Jan 29, 2024
974de9d
Merge pull request #2170 from gordon-cs/hl-applicant-autofill
JayBae9903 Jan 29, 2024
a948554
set and get due date
Feb 4, 2024
a4faf0b
Fixed date input formatting
ahwnsals1234 Feb 5, 2024
573a454
update time for due date
Feb 9, 2024
add0758
Merge pull request #2172 from gordon-cs/hl-time-stamp
ArabellaJi Feb 9, 2024
0d0c896
fix the redundant row in the csv file and improve the code quaility
Feb 10, 2024
3d84d32
Merge branch 'senior-project' into hl-tablejson
andrew-wzj Feb 10, 2024
9657b16
Merge pull request #2171 from gordon-cs/hl-tablejson
andrew-wzj Feb 11, 2024
36532c1
Fixed bug to be able to clear date input
ahwnsals1234 Feb 19, 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
2 changes: 1 addition & 1 deletion .env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# VITE_API_URL=https://360Api.gordon.edu/

# @TRAIN
VITE_API_URL=https://360ApiTrain.gordon.edu/
VITE_API_URL=https://360ApiSP.gordon.edu/

# @LOCALHOST
# VITE_API_URL=http://localhost:51626/
2 changes: 1 addition & 1 deletion .env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
VITE_ANALYTICS_ID=G-2FE78G0CBN

# @TRAIN
VITE_API_URL=https://360ApiTrain.gordon.edu/
VITE_API_URL=https://360ApiSP.gordon.edu/
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
branches:
- develop
- master
- senior-project

jobs:
build:
Expand Down Expand Up @@ -59,3 +60,10 @@ jobs:
with:
name: build-prod
path: dist

- name: Upload senior-project build artifacts for deployment
if: ${{ github.ref == 'refs/heads/senior-project' }}
uses: actions/upload-artifact@v3
with:
name: build-senior-project
path: dist
Loading
Loading