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.

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

get all animals and all users #20

Open
wants to merge 79 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
a0d90ba
Edited Something
DanielChee Nov 10, 2023
51cd32c
added api endpoints
DanielChee Nov 10, 2023
d96bc6a
Merge pull request #1 from DanielChee/api-endpoints
amrithaP3 Nov 10, 2023
26502ec
Adding action & model files
DanielChee Nov 16, 2023
b94b4ce
Animal and Training models created
DanielChee Nov 16, 2023
5f22766
Models finalized
DanielChee Nov 16, 2023
833e9f2
Update README.md
DanielChee Nov 16, 2023
4aec84c
Merge pull request #2 from BoG-Dev-Bootcamp-F23/server-models
DanielChee Nov 16, 2023
5d925a5
ConnectDB updated
DanielChee Nov 16, 2023
95b023a
create endpoints made
DanielChee Nov 17, 2023
be964c4
add actions
shanmathig Nov 17, 2023
eb44362
add anim
shanmathig Nov 17, 2023
be1b2aa
did readUsers
DanielChee Nov 17, 2023
594aa96
add verify.js
shanmathig Nov 17, 2023
a06d19c
add verify
shanmathig Nov 17, 2023
a61ec1c
get request for user info
AMoinian2004 Nov 17, 2023
b233f69
Merge branch 'server-actions' of https://github.com/DanielChee/projec…
AMoinian2004 Nov 17, 2023
2a8277c
add GET requests for animals and training
AMoinian2004 Nov 17, 2023
19128ad
Merge pull request #3 from nathangong/server-actions
DanielChee Nov 17, 2023
490804a
change typo in training get request
AMoinian2004 Nov 17, 2023
efd499b
fix import statement
AMoinian2004 Nov 17, 2023
2b30481
Add animal GET
AMoinian2004 Nov 17, 2023
1a0f5ca
Endpoints finalized
DanielChee Nov 17, 2023
a17f25c
Update README.md
DanielChee Nov 18, 2023
5fa0eab
add
shanmathig Nov 22, 2023
3695b78
Merge branch 'main' of https://github.com/BoG-Dev-Bootcamp-F23/projec…
shanmathig Nov 22, 2023
5cbcba4
add email/password form (basic)
shanmathig Nov 22, 2023
20b1c60
passwords don't match
shanmathig Nov 22, 2023
5d4db5c
add create account page and admin check
shanmathig Nov 22, 2023
b86c978
add login page
shanmathig Nov 22, 2023
219aaa7
add traininglogs page
shanmathig Nov 23, 2023
438b6c2
already has/doesnt have sign up
shanmathig Nov 23, 2023
881d9f7
finalize login & add new server file (verifyLogin)
DanielChee Nov 28, 2023
a1f2c9d
useAuth, traininglogs page, and login functional
DanielChee Nov 28, 2023
6ecbe85
debugging
DanielChee Nov 28, 2023
c8a7ca3
added boilerplate for admin pages
DanielChee Nov 29, 2023
e6e8911
more boilerplate
DanielChee Nov 29, 2023
e5a16ca
get rid of login.js
shanmathig Nov 29, 2023
7aac855
Merge branch 'main' of https://github.com/BoG-Dev-Bootcamp-F23/projec…
shanmathig Nov 29, 2023
350851e
added traininnglogs
amrithaP3 Nov 29, 2023
181b888
shan
shanmathig Nov 29, 2023
0cb8f72
animal card component
DanielChee Nov 29, 2023
38f09a0
fixing bugs
DanielChee Nov 29, 2023
cc441cc
d
DanielChee Nov 29, 2023
31d46cc
animal id key
DanielChee Nov 29, 2023
4f6dbf9
create training log form done
DanielChee Nov 29, 2023
a86a86a
Merge branch 'main' into create-log-shanmathi
DanielChee Nov 29, 2023
95549b9
Merge pull request #4 from nathangong/create-log-shanmathi
DanielChee Nov 29, 2023
2c60f2a
merge conflicts
DanielChee Nov 29, 2023
7397cd6
header component
DanielChee Nov 29, 2023
19e7a2c
header adjustments
DanielChee Nov 29, 2023
9d0bc7d
animal form and dashboard!
DanielChee Nov 29, 2023
723e4c9
create acc
shanmathig Nov 29, 2023
8825b1f
create acc
shanmathig Nov 29, 2023
2fe631f
add error msgs
shanmathig Nov 29, 2023
e4b4889
sidebar and createAccount
DanielChee Nov 29, 2023
2e04a49
sidebar getting better
DanielChee Nov 30, 2023
82975f7
commented
DanielChee Nov 30, 2023
6fd36f1
sidebar changes
DanielChee Nov 30, 2023
e21475f
create account success message
DanielChee Nov 30, 2023
5c8e616
sidebar align elements
shanmathig Nov 30, 2023
3301a27
create account done
DanielChee Nov 30, 2023
c7f44f5
align sidebar elements
shanmathig Nov 30, 2023
0824efc
sidebar
shanmathig Nov 30, 2023
5962668
animal creation form CSS
DanielChee Nov 30, 2023
ed9301d
training log component almost done!
amrithaP3 Nov 30, 2023
7b920e2
add toggle by color for sidebar
shanmathig Nov 30, 2023
eaf5d39
add toggle feature
shanmathig Nov 30, 2023
52d923a
Update package-lock.json
DanielChee Nov 30, 2023
6bc4666
Update package.json
DanielChee Nov 30, 2023
549a4c1
bcrypt auth
DanielChee Nov 30, 2023
06b4603
Merge branch 'main' of https://github.com/DanielChee/project2-f23-Tea…
DanielChee Nov 30, 2023
142e6e9
debugging package.json
DanielChee Nov 30, 2023
d563cb9
update sidebar
shanmathig Nov 30, 2023
ab5571d
remove password restriction
DanielChee Nov 30, 2023
550bcdf
clean up
shanmathig Nov 30, 2023
babe983
sde
shanmathig Nov 30, 2023
b0c0229
add all animals
AMoinian2004 Nov 30, 2023
3701e4e
add all users
AMoinian2004 Nov 30, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
.pnp.js
.yarn/install-state.gz

.env

# testing
/coverage

Expand Down
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080",
"webRoot": "${workspaceFolder}"
}
]
}
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Project 2 - Animal Training App

## Description
Welcome to the final project of this year's dev bootcamp! For this project, you will create a full-stack animal training management app (this is a mini version of an app that BoG developed for Healing4Heroes). Your job is to develop a frontend and backend that interact with each other for deployment functionality to manage different users, animals, and training logs. Schemas for these data models can be found in `Schemas.md`.

Expand Down
Loading