Skip to content

Paul frontend#40

Open
bbrockbrown wants to merge 238 commits intodisc-template:mainfrom
ita-disc-inventory:paul_frontend
Open

Paul frontend#40
bbrockbrown wants to merge 238 commits intodisc-template:mainfrom
ita-disc-inventory:paul_frontend

Conversation

@bbrockbrown
Copy link
Copy Markdown

@bbrockbrown bbrockbrown commented Apr 14, 2025

Type of change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • Any dependent changes have been merged and published

andrewcyuan and others added 30 commits February 19, 2025 20:41
@andrewcyuan
changes to packages
c19cfe0
@jskpaul
removed PORT=3001, added my account
0963f6b
@Andy2887
modified package.json
d2b46b8
@bbrockbrown
first commit for brock_frontend
92d218b
@Andy2887
Merge pull request #2 from ita-disc-inventory/paul_frontend
dfeafc8 
removed PORT=3001, added my account
@bbrockbrown
Merge pull request #1 from ita-disc-inventory/Liheng
392500a 
modified package.json
@andrewcyuan
you need port 3001
e0ec0d5
@ita-disc-inventory
Merge pull request #3 from ita-disc-inventory/Andrew-Frontend
8eb6990 
you need port 3001 for auth to work
@bbrockbrown
added new files for yes/no popup and form popup
ad78bc5
@bbrockbrown
before revert
a0007c4
@bbrockbrown
Revert "added new files for yes/no popup and form popup"
64b37b3 
This reverts commit ad78bc5.
@bbrockbrown
re-add both pop-up files
ece01c4
@andrewcyuan
deleted prettier
3acd090
@ita-disc-inventory
Merge pull request #5 from ita-disc-inventory/Andrew-Frontend
88adc1f 
deleted prettier
navbar
3c6b558
@bbrockbrown
first iteration of new order form popup
57b76be
@bbrockbrown
done with new order form, need to input dropdowns
cab6d88
@bbrockbrown
done with password change form + logic (template does logic for us)
02a7df5
@bbrockbrown
comment out to-be-used components
cde5273
@bbrockbrown
before recert
5f49265
@bbrockbrown
fix 'cancel' button on password form and edit exit button at top righ…
f1d0f6b 
…t of forms
@bbrockbrown
add YNPopup and allow customization of formpopups
776ca15
@bbrockbrown
add comments
a16900d
@bbrockbrown
remove built components from Login.jsx
5b15b00
@andrewcyuan
added routing
3dbd534
@bbrockbrown
Merge pull request #8 from ita-disc-inventory/Andrew-Frontend
3ea9f70 
added routing
update the styling of font and navbar
b002c14
Updated NavBar styling
d8146d9
@jskpaul
Merge branch 'main' into brock_frontend
3fc8529
@jskpaul
Merge pull request #7 from ita-disc-inventory/brock_frontend
8a706ef 
Added Popup components
jskpaul and others added 30 commits May 18, 2025 15:02
@jskpaul
add settingspage, therapistmodals styles js files
a072040
@bbrockbrown
before merge
3a3161b
@bbrockbrown
Merge branch 'paul_frontend' of https://github.com/ita-disc-inventory…
181ae60 
…/frontend into paul_frontend
@bbrockbrown
update styling for /form /navigation and /templates
55dc8c2
@bbrockbrown
updated styles
80895c3
@andrewcyuan
Merge branch 'main' of https://github.com/ita-disc-inventory/frontend …
832327b 
…into paul_frontend
@andrewcyuan
Merge branch 'paul_frontend' of https://github.com/ita-disc-inventory…
8a1b100 
…/frontend into paul_frontend
@andrewcyuan
Merge pull request #50 from ita-disc-inventory/paul_frontend
c09d6fe 
Paul frontend
@Wjiahui22
styles for newadmin
d78920e
@Wjiahui22
style changes for admin modals and table pop ups
f0246c1
@Andy2887
add css styling for new order button
cc3427f
@jskpaul
Merge branch 'paul_frontend' of https://github.com/ita-disc-inventory…
3056e33 
…/frontend into paul_frontend
@jskpaul
frontend rls (add auth token to every call
6e856a3
@jskpaul
Merge pull request #53 from ita-disc-inventory/Liheng
2b9b5be 
created styling for new order button
@jskpaul
REVERT PACKAGE JSON FOR THE 50 MILLIONTH TIME
5589847
@andrewcyuan
Merge pull request #52 from ita-disc-inventory/paul_frontend
cbc35cf 
Complete style changes, add on rls
@jskpaul
fix add admin typo
ef31135
@Andy2887
new styles for cancel button
ea05200
@jskpaul
Merge pull request #54 from ita-disc-inventory/Liheng
dd639c8 
new styles for cancel button
@jskpaul
Merge branch 'main' of https://github.com/ita-disc-inventory/frontend …
6b24c35 
…into paul_frontend
@jskpaul
fix hyperlink
de6729a
@jskpaul
windows moment
aed32b7
@andrewcyuan
Change title to ITA Order Portal
9d46792
@andrewcyuan
fix hyperlinks
2671fe0 
Paul frontend
@jskpaul
reset password fix
071184c
@jskpaul
Merge branch 'main' of https://github.com/ita-disc-inventory/frontend …
4a28950 
…into paul_frontend
@jskpaul
revert package.json
f540b8c
@jskpaul
fix adding new admin
c488382
@jskpaul
3 retries for orders table admin side
cc722b4
@jskpaul
tweak in retry logic
12fe0bf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@amyzliao amyzliao Awaiting requested review from amyzliao amyzliao is a code owner

@aanandp123 aanandp123 Awaiting requested review from aanandp123 aanandp123 is a code owner

At least 0 approving reviews are required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@bbrockbrown @andrewcyuan @jskpaul @Andy2887 @ita-disc-inventory @Wjiahui22