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

Ali, Ibi, Daniil and George #129

Closed
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
45e53ec
Cleaned up CICD, removed fly, removed husky
dogezen Oct 21, 2024
f121283
Merged from upstream
dogezen Oct 24, 2024
573b4e1
Merge remote-tracking branch 'upstream/main'
dogezen Oct 24, 2024
bb55a66
Merge remote-tracking branch 'upstream/main'
dogezen Oct 24, 2024
f60740c
fixed package json merge conflict artifacts
dogezen Oct 24, 2024
b18ffb1
Super big contribution to the project
dogezen Oct 25, 2024
cee11c3
Merge pull request #2 from boolean-uk/1-user-registration-authregiste…
dogezen Oct 25, 2024
96fc9d1
Update prisma
gremble0 Oct 25, 2024
db1ebd9
Re-add .env.example
gremble0 Oct 25, 2024
775df4f
Merge pull request #4 from boolean-uk/3-gremble0-1-update_prisma
gremble0 Oct 25, 2024
6b3e7bb
Add some fields to database
gremble0 Oct 28, 2024
b553930
Added domain model for Post and edited getAll posts function to fetch…
Oct 28, 2024
2b2d4cb
Fix patch endpoint for /users
gremble0 Oct 28, 2024
9322b48
Use sendMessageRequest for errors
gremble0 Oct 28, 2024
8ca1979
Add /users delete endpoint
gremble0 Oct 28, 2024
51c62aa
Get all posts still under development, but working code, added an exa…
Oct 28, 2024
aeb75e0
editted the code slightly so it looks better
Oct 28, 2024
6636847
create method creates post now in db, there is connection between dat…
Oct 28, 2024
65108fe
Add delete to docs, add routing for delete users
gremble0 Oct 29, 2024
fb713ac
Add cascading deletes for delete users
gremble0 Oct 29, 2024
3cd4ecd
Add verification for delete users, update docs
gremble0 Oct 29, 2024
42a4965
Fix error handling for delete /users
gremble0 Oct 29, 2024
52031f9
Parse object to and from db for delete /users
gremble0 Oct 29, 2024
e283e2e
create and get works, refined code sligtly
Oct 29, 2024
216f231
Rename CreatedUser -> User in openapi docs
gremble0 Oct 29, 2024
810a9f8
Merge pull request #14 from boolean-uk/gremble0-#9-users_endpoints
gremble0 Oct 29, 2024
a90fc38
added search functionality for getAll, where one can pass a name as a…
Oct 29, 2024
379be80
removed console.log(s)
Oct 29, 2024
3514d01
Merge pull request #24 from boolean-uk/thomaafl-20-api-user-table-get…
thomaafl Oct 29, 2024
258a139
Add dates to user model
gremble0 Oct 29, 2024
dc06f33
Merge branch 'main' into gremble0-#23-separate_behavior_for_teachers_…
gremble0 Oct 29, 2024
abb90cb
githubUrl -> githubUsername
gremble0 Oct 29, 2024
3803587
Merge remote-tracking branch 'origin/panfi98&IbbiSecka-issue_13-GET&P…
alinjo Oct 29, 2024
89d42df
Only teachers can change user roles and cohorts
gremble0 Oct 29, 2024
5569b3e
Edited on response wgen getting all posts
Oct 29, 2024
c673620
Add jobTitle to model
gremble0 Oct 29, 2024
c9707d8
Work
Oct 29, 2024
6a572bc
Added functionality to delete post by ID
alinjo Oct 29, 2024
8060548
Merge pull request #26 from boolean-uk/gremble0-#23-separate_behavior…
gremble0 Oct 29, 2024
9d09997
Merge pull request #25 from boolean-uk/panfi98&IbbiSecka-issue_13-GET…
thomaafl Oct 29, 2024
b6860ba
Merge branch 'main' into 16-api-post-table---delete-post
Oct 29, 2024
b2f48ed
Merge pull request #27 from boolean-uk/16-api-post-table---delete-post
thomaafl Oct 29, 2024
2849887
added get post by ID functionality
alinjo Oct 30, 2024
33ebb68
Add another student to seed
gremble0 Oct 30, 2024
9f098aa
Merge pull request #32 from boolean-uk/alinjo-30-get-post-by-id
thomaafl Oct 30, 2024
6977dc0
Add user validation to /users patch
gremble0 Oct 30, 2024
19ceb3f
Updated schema file to include comments linked to each post from a si…
George-Alexander-S Oct 30, 2024
9ca1934
Merge branch 'main' into 29-api-add-comment-table-to-store-comments-f…
George-Alexander-S Oct 30, 2024
79de442
Add /cohorts/{id} endpoint with docs
gremble0 Oct 30, 2024
7045471
Not working, pushing to repo for team debugging. Implemented controll…
George-Alexander-S Oct 30, 2024
fb7fd78
Comment endpoint successfully implemented
George-Alexander-S Oct 30, 2024
61d2152
updated yml file to use userId instead of AuthorId
George-Alexander-S Oct 30, 2024
c4e70ff
Filter users by cohortId in db instead of backend
gremble0 Oct 31, 2024
db5b5db
Merge pull request #33 from boolean-uk/gremble0-#31-get_users_by_coho…
gremble0 Oct 31, 2024
4f79ba0
merged main into here
alihaiderkhannn Oct 31, 2024
1e056fd
Update User type in docs
gremble0 Oct 31, 2024
3ae4ac9
Add username to User model
gremble0 Oct 31, 2024
b56988a
Make userRes and User model in api docs
gremble0 Oct 31, 2024
15bb994
Merge pull request #35 from boolean-uk/gremble0-#28-add_password_and_…
gremble0 Oct 31, 2024
323596c
Formatting in openapi docs
gremble0 Oct 31, 2024
86c1620
search is no longer case sensitive, also update the yml description f…
Oct 31, 2024
ec97228
Merge pull request #39 from boolean-uk/thomaafl-38-update-get-all-use…
thomaafl Oct 31, 2024
d28d653
Remove duplicate posts/{id} in api docs
gremble0 Oct 31, 2024
8b678a6
More consistent api for /users, /cohorts endpoints
gremble0 Oct 31, 2024
af8d416
added more users for seeder
Oct 31, 2024
c892fa0
added more users 2 seeder for frontend to use
Oct 31, 2024
e52d242
Merge pull request #42 from boolean-uk/sneaky_seeder
gremble0 Oct 31, 2024
cdf1da4
Merge pull request #40 from boolean-uk/thomaafl-34-update-user-model-…
gremble0 Oct 31, 2024
e089cca
merging this branch into main
alihaiderkhannn Oct 31, 2024
27abba8
Merge pull request #36 from boolean-uk/29-api-add-comment-table-to-st…
alihaiderkhannn Oct 31, 2024
5a169c8
Add default null values to post /users
gremble0 Oct 31, 2024
4da7617
Merge pull request #43 from boolean-uk/sneaky-post-users
gremble0 Oct 31, 2024
7a5d87c
inprogress
alihaiderkhannn Oct 31, 2024
1de9fd7
Updated .yml file so that testing for getting all comments by postid …
Oct 31, 2024
1450114
Merge branch '37-api-get-comments-for-posts' of https://github.com/bo…
Oct 31, 2024
56fe28b
implemented getCommentByPostId
George-Alexander-S Oct 31, 2024
115adc7
Merge branch 'main' into 37-api-get-comments-for-posts
George-Alexander-S Oct 31, 2024
4a87fee
Merge pull request #45 from boolean-uk/37-api-get-comments-for-posts
thomaafl Oct 31, 2024
1a388d7
Added a check for existing posts - Now correctly returns error if pos…
George-Alexander-S Oct 31, 2024
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
4 changes: 0 additions & 4 deletions .dockerignore

This file was deleted.

2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ PORT=4000
DATABASE_URL="<your_database_url>?schema=prisma"
SHADOW_DATABASE_URL="<your_shadow_database_url>?schema=shadow"
JWT_SECRET="somesecurestring"
JWT_EXPIRY="24h"
JWT_EXPIRY="24h"
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: CI
on: [push, pull_request]
env:
DATABASE_URL: ${{ secrets.DATABASE_URL }}
JWT_TOKEN: ${{ secrets.JWT_TOKEN }}
JWT_EXPIRY: ${{ secrets.JWT_EXPIRY }}
jobs:
test:
runs-on: ubuntu-latest
Expand All @@ -14,4 +10,3 @@ jobs:
node-version: 'lts/*'
- run: npm ci
- run: npx eslint src
- run: npx prisma migrate reset --force --skip-seed
21 changes: 0 additions & 21 deletions .github/workflows/deploy.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .husky/pre-commit

This file was deleted.

36 changes: 0 additions & 36 deletions Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ The users that are seeded can be used to test the API endpoints and to log into

[todo]: <Update this with your ERD>

TODO
TODO - still not done
Loading
Loading