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

Reedbyford #32

Open
wants to merge 116 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
80d9062
added the client and server folders which contain separate README.md …
therealdeek Jul 6, 2023
f4d744a
Merge pull request #1 from therealdeek/davidkea
therealdeek Jul 6, 2023
7f7ef68
init backend
eolculnamo2 Jul 9, 2023
607fe7a
ignore .DS_Store
eolculnamo2 Jul 9, 2023
833a0d4
Merge pull request #2 from eolculnamo2/init-backend
therealdeek Jul 9, 2023
3641954
setup frontend
eolculnamo2 Jul 10, 2023
eef5eb1
Merge pull request #3 from eolculnamo2/init-frontend
therealdeek Jul 10, 2023
2725192
reset styles, add navbar, add footer, add packages, set maxw in dashb…
KurtisIvey Jul 21, 2023
4ad1558
Merge pull request #4 from therealdeek/Kurtis_branch
therealdeek Jul 22, 2023
9d1b2fe
Merge pull request #5 from therealdeek/Kurtis_branch
therealdeek Jul 22, 2023
1bfed75
add styling and structure to Navbar, add chakra theme, integrate chak…
KurtisIvey Jul 22, 2023
39da0b6
Merge branch 'development' of github.com:therealdeek/2023-Cohort-Proj…
KurtisIvey Jul 22, 2023
a5cb390
remote unnecessary social icons, add GOAT, add github href to repo
KurtisIvey Jul 23, 2023
83eeda6
remove unused
KurtisIvey Jul 23, 2023
b0d460e
add register user
eolculnamo2 Jul 23, 2023
b41b03b
Merge pull request #6 from therealdeek/Kurtis_branch
therealdeek Jul 24, 2023
652794e
Merge main into development
therealdeek Jul 24, 2023
40e2ba7
add app to docker
eolculnamo2 Jul 25, 2023
526bcc5
add gradle build to Dockerfile
eolculnamo2 Jul 25, 2023
9616d6d
Merge branch 'development' into add-register
eolculnamo2 Jul 25, 2023
8f084eb
add carousel, add eventCardContainer & get grid working, add skeleton…
KurtisIvey Jul 25, 2023
30703e3
finish rough eventCard, add interface for EventCard types
KurtisIvey Jul 25, 2023
9847032
Merge pull request #8 from eolculnamo2/add-register
eolculnamo2 Jul 26, 2023
4d5e6a1
Created User Login & Created Event Entity/Dao
reedbyford Jul 26, 2023
d692619
Merge branch 'development' into Kurtis_branch
KurtisIvey Jul 26, 2023
ec842c5
Merge pull request #11 from therealdeek/Kurtis_branch
therealdeek Jul 26, 2023
ce13767
resolve merge conflicts
reedbyford Jul 26, 2023
ee152bc
Redux dep changes
Damianpad Jul 26, 2023
5b18788
merge conflict res
Damianpad Jul 26, 2023
66f502f
Merge pull request #12 from therealdeek/damianpadilla
therealdeek Jul 26, 2023
f4de8b2
update
Damianpad Jul 26, 2023
24b6298
Merge pull request #13 from therealdeek/damianpadilla
therealdeek Jul 26, 2023
df345f7
make dockerfile work for projects without existing build dir
eolculnamo2 Jul 26, 2023
a1c5939
Merge branch 'development' into fix-first-time-build-docker
eolculnamo2 Jul 26, 2023
dbd7e85
fix responsiveness of event cards to encompass container & be even
KurtisIvey Jul 26, 2023
2299fda
Merge branch 'development' into Kurtis_branch
KurtisIvey Jul 26, 2023
63738d6
update home page event cards
KurtisIvey Jul 26, 2023
6834de0
move data time into flex container with title
KurtisIvey Jul 26, 2023
04e0857
Merge branch 'Kurtis_branch' of github.com:therealdeek/2023-Cohort-Pr…
KurtisIvey Jul 26, 2023
db6297c
update navbar with colorScheme teal styling
KurtisIvey Jul 26, 2023
aa56447
update navbar
KurtisIvey Jul 26, 2023
ef47795
update navbar colors
KurtisIvey Jul 26, 2023
846251b
add vitest to client
KurtisIvey Jul 26, 2023
54982f2
update .eslintrc.cjs for itself and tests/setup.js
KurtisIvey Jul 26, 2023
578796c
move Event interface into types folder
KurtisIvey Jul 26, 2023
dfc0934
prepare EventCardContainer for later data
KurtisIvey Jul 26, 2023
0937e5d
add helpers, integrate helpers into EventCard.tsx
KurtisIvey Jul 27, 2023
d79a81a
Merge pull request #14 from eolculnamo2/fix-first-time-build-docker
therealdeek Jul 27, 2023
5f73397
Merge pull request #15 from therealdeek/Kurtis_branch
therealdeek Jul 27, 2023
58e757d
Merge pull request #18 from therealdeek/reedbyford
therealdeek Jul 27, 2023
c3fb498
create rough sign up page
KurtisIvey Jul 27, 2023
783280f
Update: updated persist gate and redux provider in main
Damianpad Jul 27, 2023
b27b257
Merge branch 'development' of https://github.com/therealdeek/2023-Coh…
Damianpad Jul 27, 2023
10104d8
update signUp.tsx
KurtisIvey Jul 28, 2023
f356767
Merge branch 'development' of github.com:therealdeek/2023-Cohort-Proj…
KurtisIvey Jul 28, 2023
e2edd91
add login page skeleton
KurtisIvey Jul 28, 2023
9b77b3b
update for text consistency
KurtisIvey Jul 28, 2023
e3166fa
update SignUp.tsx with react-hook-form
KurtisIvey Jul 28, 2023
531c1ef
change login component export name
KurtisIvey Jul 28, 2023
d335880
update login with react-hook-form
KurtisIvey Jul 28, 2023
3c0f7fc
Merge branch 'development' into damianpadilla
KurtisIvey Jul 28, 2023
79f585f
Merge pull request #20 from therealdeek/damianpadilla
therealdeek Jul 28, 2023
37b029e
Merge pull request #21 from therealdeek/Kurtis_branch
therealdeek Jul 28, 2023
0784fc4
create thunk-aroni-and-cheese for user login
KurtisIvey Jul 28, 2023
d7b0197
add registerUserAsync for thunk
KurtisIvey Jul 28, 2023
af305aa
add registerUserAsyncThunk
KurtisIvey Jul 28, 2023
0843c78
remove comments to clean up code
KurtisIvey Jul 28, 2023
949e238
javascript > java
KurtisIvey Jul 28, 2023
99acc64
Merge branch 'development' of github.com:therealdeek/2023-Cohort-Proj…
KurtisIvey Jul 28, 2023
9425c4e
merge
KurtisIvey Jul 28, 2023
4b99720
resolve merge conflict . p.s. sorry David lol
KurtisIvey Jul 28, 2023
16ce8d1
Merge branch 'Kurtis_branch' of github.com:therealdeek/2023-Cohort-Pr…
KurtisIvey Jul 28, 2023
78ed446
integrate register thunk into signup.tsx, add AlertBar.tsx
KurtisIvey Jul 29, 2023
2022e5e
add useEffect to reset UserCreated to redirect to homepage
KurtisIvey Jul 29, 2023
eda430c
Setup JWT token to include uuid
reedbyford Jul 29, 2023
8dac77e
Merge pull request #23 from therealdeek/reedbyford
therealdeek Jul 29, 2023
58944f8
Merge pull request #22 from therealdeek/Kurtis_branch
therealdeek Jul 29, 2023
a70c838
correct margins, move eventCard and eventCardContainer into component…
KurtisIvey Jul 29, 2023
85a55e7
add loginUserAsyncThunk to login.tsx, add jwt decode & js cookies to …
KurtisIvey Jul 29, 2023
bd44e40
add comment
KurtisIvey Jul 29, 2023
db4f3b3
add createEvent, add createEvent route
KurtisIvey Jul 29, 2023
02975d0
finish rough create event form page
KurtisIvey Jul 29, 2023
bb0ddc3
update onChange function set
KurtisIvey Jul 29, 2023
5b0693a
added event reducer to store file and added the eventReducer file
Jesse-06 Jul 31, 2023
cc57995
Merge branch 'development' of https://github.com/therealdeek/2023-Coh…
Damianpad Jul 31, 2023
649a47c
Create Event mapper and DTO
reedbyford Jul 31, 2023
9be8f82
Change id to uuid
reedbyford Jul 31, 2023
2fe8895
Create custom LoginResponse for frontend including token/uuid/username
reedbyford Aug 1, 2023
d9287b0
Added GET/POST functionality for Events
reedbyford Aug 1, 2023
811ad9a
Merge pull request #24 from therealdeek/Kurtis_branch
therealdeek Aug 1, 2023
62c93f6
Merge branch 'development' into JSoto
therealdeek Aug 1, 2023
2597702
Merge pull request #25 from therealdeek/JSoto
therealdeek Aug 1, 2023
60639fc
Merge branch 'development' into reedbyford
therealdeek Aug 1, 2023
2607d14
Merge pull request #26 from therealdeek/reedbyford
therealdeek Aug 1, 2023
e2c3c21
bandaid fix on error state from state.user.error, caused crashing, ad…
KurtisIvey Aug 2, 2023
9efd20c
fix events reducer and integrate into persistedReducer
KurtisIvey Aug 2, 2023
15883b3
feat: Added Events Attending Page
Damianpad Aug 2, 2023
09c8e2d
Created Events Attending Page
Damianpad Aug 2, 2023
385d375
Merge pull request #27 from therealdeek/Kurtis_branch
therealdeek Aug 2, 2023
4bee4d7
Created Events Attending Page
Damianpad Aug 2, 2023
691cb8f
Merge branch 'development' of https://github.com/therealdeek/2023-Coh…
Damianpad Aug 2, 2023
54af550
set up msw
eolculnamo2 Aug 3, 2023
0554e44
Created Events Attending Page
Damianpad Aug 3, 2023
f922995
Merge pull request #30 from eolculnamo2/setup-msw
therealdeek Aug 3, 2023
9afe9b7
Created Events Attending Page
Damianpad Aug 3, 2023
34e2dc5
Added endpoints for viewing events user is attending and viewing upco…
reedbyford Aug 4, 2023
6510736
setup error handling in login.tsx and configure loginUserAsyncThunk
KurtisIvey Aug 4, 2023
5a8dec7
update error to draw from redux state not persist
KurtisIvey Aug 4, 2023
d77156e
Merge pull request #31 from therealdeek/damianpadilla
therealdeek Aug 4, 2023
5d0fd37
Merge pull request #32 from therealdeek/reedbyford
therealdeek Aug 4, 2023
6f11747
update SignUp.tsx to work with msw
KurtisIvey Aug 5, 2023
a7d99aa
Merge branch 'development' into Kurtis_branch
KurtisIvey Aug 5, 2023
533aab9
update navbar styling for logged out, update main.tsx to have setup f…
KurtisIvey Aug 5, 2023
07ef9d7
Merge pull request #35 from therealdeek/Kurtis_branch
therealdeek Aug 6, 2023
e5b0e87
Changed endpoints to match frontend
reedbyford Aug 8, 2023
e162b4f
Add CORS configuration to allow cross-origin requests
reedbyford Aug 8, 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
Binary file removed .DS_Store
Binary file not shown.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Created by https://www.toptal.com/developers/gitignore/api/node
# Edit at https://www.toptal.com/developers/gitignore?templates=node

.DS_STORE
### Node ###
# Logs
logs
Expand Down Expand Up @@ -142,3 +143,12 @@ dist
.svelte-kit

# End of https://www.toptal.com/developers/gitignore/api/node
Cohort1/Medlista/.gradle/7.4/gc.properties
Cohort1/Medlista/.gradle/7.4/checksums/checksums.lock
Cohort1/Medlista/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock
Cohort1/Medlista/.gradle/7.4/dependencies-accessors/gc.properties
Cohort1/Medlista/.gradle/7.4/fileChanges/last-build.bin
Cohort1/Medlista/.gradle/7.4/fileHashes/fileHashes.lock
Cohort1/Medlista/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Cohort1/Medlista/.gradle/buildOutputCleanup/cache.properties
Cohort1/Medlista/.gradle/vcs-1/gc.properties
12 changes: 12 additions & 0 deletions .idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/sqldialects.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion 2023-Cohort-Projects
Submodule 2023-Cohort-Projects deleted from 218143
29 changes: 29 additions & 0 deletions Cohort2/team6/client/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* eslint-env node */

module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:react-hooks/recommended",
],
ignorePatterns: ["**/vitest.config.ts", "setup.js", ".eslintrc.cjs"],
parser: "@typescript-eslint/parser",
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
project: true,
tsconfigRootDir: __dirname,
},
plugins: ["react-refresh"],
rules: {
"react-refresh/only-export-components": [
"warn",
{ allowConstantExport: true },
],
"@typescript-eslint/no-misused-promises": "off",
"@typescript-eslint/no-non-null-assertion": "off",
},
};
24 changes: 24 additions & 0 deletions Cohort2/team6/client/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
6 changes: 6 additions & 0 deletions Cohort2/team6/client/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Client

### Getting Started
* install dependences with npm i
* start project with npm run dev
* go to http://localhost:5173 for dev server
13 changes: 13 additions & 0 deletions Cohort2/team6/client/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
Loading