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

Jump to bottom

Iteration 2: Dev -> Main #78

Closed
wants to merge 262 commits into from
Closed

Iteration 2: Dev -> Main #78

wants to merge 262 commits into from

Conversation

amanda-yee
Copy link

No description provided.

kenlight-bu and others added 30 commits September 26, 2024 10:55
@kenlight-bu
Made two more relative path changes
9572f07
@kenlight-bu
A few more relative path changes
d966fe7
@kenlight-bu
Another relative path change
d9f5367
@abbiekuma
Merge pull request #23 from BUMETCS673/ayee_nav_bar_styling
379ac6c 
Apply MUI styling and create side nav bar
@kenlight-bu
Had to chnage the instructions in the servers Dockerfile.production f…
d8a6424 
…ile.
@kenlight-bu
Had to change the version to latest to match the build tag
d1c808f
@kenlight-bu
Cleaned up some of the commented code
b75eff2
@kenlight-bu
Added a horoku file
d425670
@kenlight-bu
Added instructions to copy the heroku.yml file to the root folder
9d2bbf8
@kenlight-bu
Changed to path in the Heroku file
f993954
@kenlight-bu
Copying heroku file to root of server folder
85499c4
@kenlight-bu
Copying the heroku file in all folders to see if it runs
42d0629
@kenlight-bu
Only copying the heroku.yml file to the root
f039e88
@kenlight-bu
PassingNODE_ENV as an argument to the Dockerfile.production file so i…
6363514 
…ts reads the right .env file
@kenlight-bu
Trying to copy the heroku.yml file to the root directory in heroku
f4b61cf
@kenlight-bu
Removed the heroku.yml file and changeed the deploy.yml file to use t…
4f76860 
…he docker-compose file to build the image
@kenlight-bu
Added a step to install docker compose
2def62f
@kenlight-bu
Changed my docker-compose file
a13a654
@kenlight-bu
I made a bunch of changes to get docker working
6777608
@kenlight-bu
Removed the name
fc79dfc
@kenlight-bu
Antoher change to get docker working
88854ab
@kenlight-bu
Needed to tag the images
6c86184
@kenlight-bu
I had a typo in the name
7a8f6b8
@kenlight-bu
added the heroku.yml file to the root
439be22
@kenlight-bu
Trying a prebuilt workflow
157214d
@kenlight-bu
Lets try this again
97434a5
@kenlight-bu
Trying again
d00aaca
@kenlight-bu
and again
478135e
@kenlight-bu
Need to see where I am relative to the docker compose file
617bdc3
@kenlight-bu
And again
254eca8
amanda-yee and others added 29 commits October 6, 2024 15:54
@amanda-yee
validate manage profile form
71beb82
@kenlight-bu
Adding goals changed,. Needed to update goals testing
faf9378
@amanda-yee
add message for valid form
9beb08b
@amanda-yee
print out specific error msg for create goal
3d86c73
@amanda-yee
merge dev
f7c76c2
@amanda-yee
Merge pull request #63 from BUMETCS673/AddServerTestsToPipeline
202f10f 
Add server tests to pipeline
@amanda-yee
merge dev
93130a5
@amanda-yee
update initdb to include userId for goals, remove progress field
07687dd
@amanda-yee
remove goals field from User model
248f030
@amanda-yee
Merge pull request #62 from BUMETCS673/hw27_manage_profile_form_valid…
6068a76 
…ation

validate manage profile form
@amanda-yee
Merge pull request #65 from BUMETCS673/update_initdb_defaults
6a6302d 
Update initdb to include userId for goals, remove progress field in goals, remove goals field in user
@ccerav-bu
associate daily data with logged in user
def72f7 
this is necessary for the view daily data functionality.  I have only created a draft page called "Manage Daily Data" and will update today as a next step.
@kenlight-bu
Merge pull request #66 from BUMETCS673/HW_104_View_Submitted_Health_Data
e6f22ce 
associate daily data with logged in user
@ZihaoQian
Update logout
022a327 
Logout button will redirect to login page
@ccerav-bu
can view and delete data and can only make one entry per day
4bee7b2 
Currently, to edit data, we need to resubmit data for a given day.  This can be improved.
@kenlight-bu
Merge pull request #68 from BUMETCS673/HW_104_View_Submitted_Health_Data
9847dca 
can view and delete data and can only make one entry per day
@amanda-yee
add success and error msgs to daily data page
0d39864
@ccerav-bu
Merge pull request #69 from BUMETCS673/hw105_add_messages
4f67fe1 
add success and error msgs to daily data page
@ccerav-bu
Merge branch 'dev' into Hw-175-logout
ea943a0
@ZihaoQian
Logout component
4c65b8b 
Put logout component in sperate file to keep clean
@ccerav-bu
Merge pull request #70 from BUMETCS673/Hw-175-logout
0dd05cc 
logout component
@amanda-yee
form validation for daily data page
dadb474
@amanda-yee
update message
c1e97a6
@ccerav-bu
fix daily data submission
79ad834 
there was an error in deployment where daily data submission was being saved as a day earlier than entered.  This had something to do with difference in time zones between browser (EST) and Heroku (UTC).  This should be fixed now.
@eddie27lee
Merge pull request #72 from BUMETCS673/fix_daily_data_submission
54d21f2 
fix daily data submission
@eddie27lee
Merge pull request #71 from BUMETCS673/hw182_daily_data_form_validation
5d62c0d 
form validation for daily data page
@abbiekuma
update UI of CreateGoal ManageProfile, and SideBar
3ffb32c
@abbiekuma
update sign up page
1d980db
@eddie27lee
Merge pull request #76 from BUMETCS673/updateUI
75dba8b 
update UI of CreateGoal ManageProfile, and SideBar
@eddie27lee eddie27lee closed this Oct 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@amanda-yee @eddie27lee @kenlight-bu @abbiekuma @ccerav-bu @ZihaoQian