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

Fix navbar #96

Open
wants to merge 127 commits into
base: main
Choose a base branch
from
Open

Fix navbar #96

wants to merge 127 commits into from

Conversation

allynmm
Copy link

@allynmm allynmm commented May 26, 2024

No description provided.

cody-daigle and others added 30 commits May 20, 2024 16:41
@cody-daigle
Install / Dependencies & changed npm start to use nodemon
85fc955
@cody-daigle
Changed DB name in connection to string
822f932
@mikesamm
change details to Team CRAMD
2cb0c8b
@mikesamm
change details to Team CRAMD complete
e97b864
@mikesamm
fix eslint issue
66c8d85
@cody-daigle
Connected to server / authenticated
ff3764e
@cody-daigle
Merge pull request cramd-greenfield#1 from cody-daigle/setup
cd7be28 
Startup / auth OK
@mikesamm
update upstream
5b62110
@cody-daigle
Add / localhost link to listener
3052dff
@mikesamm
add 'words' key to dogSchema
48e498f
@mikesamm
create wordRoutes.js and configure routerHandler to use word routes w…
5eaf818 
…ith '/words'
@allynmm
Merge pull request cramd-greenfield#2 from mikesamm/main
4559c29 
feat / WOTD database addition
@mikesamm
commit before upstream update
a0fc0ca
@mikesamm
Merge branch 'main' of https://github.com/cramd-greenfield/Dogagatchi …
eca4766 
…into word-routes
@cody-daigle
Merge branch 'main' of https://github.com/cramd-greenfield/Dogagatchi
93993df
@cody-daigle
Add / Groom shop component
18911e0
@cody-daigle
Add / Groom routes to index.js
92c2d86
@cody-daigle
Add / Groom route file for groom request handling
313e793
added activities prop to dog schema
5643113
@cody-daigle
Add / Groom to dogs model
7c926aa
@cody-daigle
Update / reworking request handling to deal with current data
fc651e0
create route to api + activity component
ce9a496
@mikesamm
adjust word key in dog schema to fit needs
a7f8935
@mikesamm
add POST /:dogId route to add a word and definitions to a
3ec602f 
specific dog
@mikesamm
add random word api key from environment variables
1a6b620
@mikesamm
abstract random word key for security
7776b42
@cody-daigle
Merge pull request cramd-greenfield#4 from mikesamm/word-routes
c5e51cc 
feat / WOTD fetch and add word to dog
@cody-daigle
Merge branch 'main' into groom
74bc099
@cody-daigle
Feat / Get request handling for all dogs with valid Groom subscription
cc3a378
@cody-daigle
Merge branch 'main' of https://github.com/cramd-greenfield/Dogagatchi …
d73e24b 
…into groom
cody-daigle and others added 30 commits May 24, 2024 23:17
@cody-daigle
Merge branch 'main' of https://github.com/cramd-greenfield/Dogagatchi …
9bc0c6d 
…into groom
@cody-daigle
Merge at some point removed some routes
0773308
@cody-daigle
Corrected conflicts before merge
4211054
timer correctly fixed
e4aab9f
@cody-daigle
Added Activity and Wellness center routes back
99586fb
@mikesamm
Merge pull request cramd-greenfield#11 from mikesamm/word-routes
5753e2f 
feat / WOTD change word schema
@cody-daigle
Merge branch 'main' into groom
ca3a5fc
@DariusC16
Merge pull request cramd-greenfield#12 from cody-daigle/groom
ab5b29d 
Upgraded grooming cards / Request handling / Removed shop
Health bar successfully rendering with motion
4f6759e
Retrieve user medicines success
d19a3cc
@mikesamm
remove console.logs, fix react map key error
1eaaec9
Merge branch 'medicine' of https://github.com/cougarred1/Dogagatchi i…
a58a75f 
…nto medicine
successfully able to pull
9bf6b18
@cougarred1
Merge branch 'main' into medicine
22c9edb
@DariusC16
Merge pull request cramd-greenfield#13 from cougarred1/medicine
a9b9f8c 
Health Bar successfully renders with motion
render user's activities, save new activity, delete activity
946a49f
@mikesamm
add dog's dogtionary button to dog card
3a70a8f
@mikesamm
add new GET route to retrieve random word and definition
fa77a38
Merge branch 'main' of https://github.com/cramd-greenfield/Dogagatchi …
9585df6 
…into db-setup

render component, save activity, delete activity
@mikesamm
Merge pull request cramd-greenfield#14 from allynmm/db-setup
c96ca76 
render activities, save new activity, delete activity
@mikesamm
modify POST route to add word to words collection
c128e25
@mikesamm
add word to dogtionary / db
21e9dbd
update coins, toast for coins render
7e706b5
@mikesamm
show dogtionary component with all dog's words when button clicked
2cd66b2
@mikesamm
add remove button for each word in dogtionary, handle deletion from db
6deecc0
@mikesamm
add favorite button, handle change favorite to true
84019f7
@mikesamm
remove console.log
99c3f6e
@mikesamm
Merge pull request cramd-greenfield#15 from allynmm/progress-bar-toast
0c58f73 
update coins, toast for coins render
@mikesamm
Merge pull request cramd-greenfield#16 from mikesamm/dogtionary
dc4bd03 
feat / WOTD dogtionary rendering
fix navbar
d4b459c
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.
5 participants
@allynmm @cody-daigle @mikesamm @DariusC16 @cougarred1