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

update: production #298

Merged
merged 281 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
281 commits
Select commit Hold shift + click to select a range
2d5eec1
created models and controllers for blog post updated
StarmannRassy Jul 23, 2024
f250e02
[FEAT] Implement GET All User Endpoint Products with Pagination (Page…
deolla Jul 23, 2024
0e4110c
created models and controllers for blog post updated
StarmannRassy Jul 23, 2024
77a551e
feat:Implimented Soft Delete
CollinDex Jul 23, 2024
7e6383a
Merge branch 'dev' into allow-user-create-blog_post
StarmannRassy Jul 23, 2024
574a0a7
Merge branch 'allow-user-create-blog_post' of https://github.com/Star…
StarmannRassy Jul 23, 2024
09a8a68
Merge branch 'dev' into feat/128-User_Soft_Delete
CollinDex Jul 23, 2024
f596b02
Merge pull request #2 from CollinDex/feat/128-User_Soft_Delete
CollinDex Jul 23, 2024
7e840a5
Added a mock unit file for the endpoint /api/v1/users/me
SamixYasuke Jul 23, 2024
3b86485
feat: implement docs for product routes
masterchief-Dave Jul 23, 2024
3dacbc7
get all the organisations created by a user, protected
Mongopark Jul 23, 2024
6c59d88
fix: Handled Merge Conflicts and Ts Errors
CollinDex Jul 23, 2024
f9da5b9
[feat]:setup messaging queue using bull and redis server
fktona Jul 23, 2024
189c897
Merge pull request #1 from hngprojects/dev
thectogeneral Jul 23, 2024
3ddeb29
[feat]:setup messaging queue using bull and redis server
fktona Jul 23, 2024
2a2fb7e
[feat]:setup messaging queue using bull and redis server
fktona Jul 23, 2024
070d571
[feat]:setup messaging queue using bull and redis server
fktona Jul 23, 2024
a7c11e6
fix: Fixed Route Errors
CollinDex Jul 23, 2024
2783cfd
[feat]:setup messaging queue using bull and redis server
fktona Jul 23, 2024
f4301e4
Merge branch 'hngprojects:dev' into feature/api-product-docs
masterchief-Dave Jul 23, 2024
609090d
edits
Konan69 Jul 23, 2024
f905f65
setting up the project
mwangiii Jul 23, 2024
76e9b4c
edits
Konan69 Jul 23, 2024
d781989
Merge branch 'hngprojects:dev' into feat/14-Remove_Member_From_Organi…
Konan69 Jul 23, 2024
846b597
Merge remote-tracking branch 'upstream/dev' into feat/14-Remove_Membe…
Konan69 Jul 23, 2024
c50b90d
Merge branch 'feat/14-Remove_Member_From_Organization' of https://git…
Konan69 Jul 23, 2024
fa8c856
Feat: super admin set roles
holabayor Jul 23, 2024
e402f8f
Merge pull request #192 from CollinDex/dev
incredible-phoenix246 Jul 23, 2024
a21b7a9
Merge pull request #177 from StarmannRassy/allow-user-create-blog_post
incredible-phoenix246 Jul 23, 2024
ef0be09
working
Konan69 Jul 23, 2024
4fee018
Merge pull request #180 from kingdavidHub/125-single-org-endpoint
incredible-phoenix246 Jul 23, 2024
5de294b
Merge pull request #184 from SamixYasuke/feat/#2-Deactivate-Invitatio…
incredible-phoenix246 Jul 23, 2024
4fb7eb3
Revert "Feat/#120 Implements API endpoint for retrieving the profile …
incredible-phoenix246 Jul 23, 2024
6f01ca4
Merge pull request #202 from hngprojects/revert-184-feat/#2-Deactivat…
incredible-phoenix246 Jul 23, 2024
ff8f12d
Merge remote-tracking branch 'upstream/dev' into feat/14-Remove_Membe…
Konan69 Jul 23, 2024
3894045
commit
Konan69 Jul 23, 2024
c886db6
Merge remote-tracking branch 'upstream/dev' into feat/14-Remove_Membe…
Konan69 Jul 23, 2024
c561168
renamed the service file and added tests
Mongopark Jul 23, 2024
e0c5395
Merge branch 'dev' into mongopark-organization-branch
Mongopark Jul 23, 2024
75ac567
resolved bot issues
Shabzynana Jul 24, 2024
26b237a
fix: resolve merge conflicts
masterchief-Dave Jul 24, 2024
d8d9f6d
fix: resolve merge conflic
masterchief-Dave Jul 24, 2024
fa33cba
[feat]:setup messaging queue using bull and redis server
fktona Jul 24, 2024
019e097
[feat]:setup messaging queue using bull and redis server
fktona Jul 24, 2024
d900172
[feat]:setup messaging queue using bull and redis server
fktona Jul 24, 2024
0055860
Feat(Blog): Fetch all blog posts
udofia2 Jul 24, 2024
9317312
feat(Blog): Fetch all blog post with pagination completed
udofia2 Jul 24, 2024
a1d2e44
Feat: Implement google oauth20
Khingz Jul 24, 2024
2dee8ae
feat: payment model
Uzo-Felix Jul 24, 2024
7791b37
feat: payment relations with user and organization
Uzo-Felix Jul 24, 2024
65ed141
feat/149
max-out-oluwadara Jul 24, 2024
d030dd0
Merge pull request #196 from davieoba/feature/api-product-docs
incredible-phoenix246 Jul 24, 2024
e3c5fa7
feat/149
max-out-oluwadara Jul 24, 2024
c2874e1
Merge pull request #207 from Shabzynana/feat/132-update_organisaion_s…
incredible-phoenix246 Jul 24, 2024
eaab35f
Merge pull request #206 from Uzo-Felix/feat/payment-schema
incredible-phoenix246 Jul 24, 2024
32c2588
renamed the file
Mongopark Jul 24, 2024
5b97d0f
Merge pull request #204 from udofia2/getAllBlogPosts
incredible-phoenix246 Jul 24, 2024
9fdaa58
Resolved-comment
oderahub Jul 24, 2024
efa8117
chore:set-up for pre-commit and commit message standarf
incredible-phoenix246 Jul 24, 2024
34cf3d7
foo: this will fail
incredible-phoenix246 Jul 24, 2024
3bbbc93
foo: this will fail
incredible-phoenix246 Jul 24, 2024
e54a71d
foo: this will fail
incredible-phoenix246 Jul 24, 2024
046652f
Allows super admins to update the details of a single user.Includes n…
max-out-oluwadara Jul 24, 2024
d735125
feat: commit message setup
incredible-phoenix246 Jul 24, 2024
6066a59
Merge pull request #2 from hngprojects/dev
thectogeneral Jul 24, 2024
316249d
feat: husky setup
incredible-phoenix246 Jul 24, 2024
008539f
Merge branch 'dev' into feat/super-admin-set-roles
holabayor Jul 24, 2024
3b62ca7
feat: feat husky
incredible-phoenix246 Jul 24, 2024
5fb152a
Merge branch 'dev' into feat/149-User(SuperAmin)_Update_user
max-out-oluwadara Jul 24, 2024
7ae9a3d
Merge pull request #213 from hngprojects/chore/husky-setup
Idimmusix Jul 24, 2024
a4868f7
fixed imports from renaming
Mongopark Jul 24, 2024
212d60d
Added swagger doc for notification settings
lauCodx Jul 24, 2024
59885bf
Allows super admins to update the details of a single user. Include v…
max-out-oluwadara Jul 24, 2024
c55d45b
Merge branch 'dev' into laucodx
lauCodx Jul 24, 2024
85150cb
merged
Mongopark Jul 24, 2024
7bce296
[feat]:setup messaging queue using bull and redis server
fktona Jul 24, 2024
1b0797a
another conflict fixed
Mongopark Jul 24, 2024
af618fb
chore: code refactoring
Khingz Jul 24, 2024
dfe190e
added routes
Mongopark Jul 24, 2024
1897ddd
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
81e1ae9
Merge remote-tracking branch 'upstream/dev' into feat/14-Remove_Membe…
Konan69 Jul 24, 2024
7a19046
Merge branch 'dev' of https://github.com/Khingz/hng_boilerplate_expre…
Khingz Jul 24, 2024
850ce69
feat/added route protection and validation to route "/organizations/…
Konan69 Jul 24, 2024
cfa77be
docs: add API documentation for removeUser endpoint
Konan69 Jul 24, 2024
3c15215
feat: update organisation details
oderahub Jul 24, 2024
a1f31b2
payment with stripe returning status 200 and all fields are validated…
mwangiii Jul 24, 2024
f495f4f
Adding paystack on the api route:If error indicate in comments
mwangiii Jul 24, 2024
a890899
Merge branch 'dev' into paymentStripe
mwangiii Jul 24, 2024
4a2d76d
Merge pull request #216 from lauCodx/laucodx
Idimmusix Jul 24, 2024
f078138
Merge branch 'dev' into feature/get-user-org
Mongopark Jul 24, 2024
ed90bab
feat: delete-blog-post
thectogeneral Jul 24, 2024
de1c1da
feat: delete-blog-post
thectogeneral Jul 24, 2024
56a3f59
feat: delete-blog-post
thectogeneral Jul 24, 2024
09be7bf
Merge pull request #218 from Mongopark/feature/get-user-org
Idimmusix Jul 24, 2024
c3246c6
Merge branch 'dev' into dev
incredible-phoenix246 Jul 24, 2024
ecccdbf
Merge pull request #220 from oderahub/dev
Idimmusix Jul 24, 2024
d8abeb4
feat: get blall blog posts with pagination
Nainah23 Jul 24, 2024
e99fa43
Merge branch 'dev' into feat/133-delete_blog_post
incredible-phoenix246 Jul 24, 2024
d7d9c23
Merge pull request #223 from thectogeneral/feat/133-delete_blog_post
Idimmusix Jul 24, 2024
f74101b
Adding paystack on the api route:If error indicate in comments
mwangiii Jul 24, 2024
8d8dcee
rebasing the repo
mwangiii Jul 24, 2024
9518ae5
Resolved merge conflicts in .gitignore and yarn.lock
mwangiii Jul 24, 2024
1c7dbc3
Resolved merge conflicts in .gitignore and yarn.lock
mwangiii Jul 24, 2024
2b61828
Merge pull request #213 from hngprojects/chore/husky-setup
Idimmusix Jul 24, 2024
abdafb4
feat: Implement GET All User Products Endoint with Pagination (Page,…
deolla Jul 24, 2024
4e553ba
Merge branch 'paymentStripe' of https://github.com/mwangiii/hng_boile…
mwangiii Jul 24, 2024
d34ded8
Update prod.yml
Idimmusix Jul 23, 2024
ff767bc
Merge branch 'feat/#2-Deactivate-Invitation-Link' of https://github.c…
SamixYasuke Jul 24, 2024
fa106b1
fixing conflicts
mwangiii Jul 24, 2024
e351803
feat(users): add unit tests for retrieving profile information for au…
SamixYasuke Jul 24, 2024
1d1171a
Merge branch 'dev' into feat/14-Remove_Member_From_Organization
incredible-phoenix246 Jul 24, 2024
bb7f520
feat(users): add unit tests for retrieving profile information for au…
SamixYasuke Jul 24, 2024
83c22fd
Merge pull request #203 from Konan69/feat/14-Remove_Member_From_Organ…
Idimmusix Jul 24, 2024
d9c25cf
Merge branch 'feat/#120-retrieve-authenticated-user-profile' of https…
SamixYasuke Jul 24, 2024
3992eb1
Merge branch 'dev' into paymentStripe
mwangiii Jul 24, 2024
bd12824
fix: rate limiter on all route
incredible-phoenix246 Jul 24, 2024
d87778b
fix: rate limiter on all route
incredible-phoenix246 Jul 24, 2024
8b57c82
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
9032020
Merge pull request #234 from hngprojects/chore/husky-setup
incredible-phoenix246 Jul 24, 2024
9fb381d
Merge branch 'dev' into feat/149-User(SuperAmin)_Update_user
max-out-oluwadara Jul 24, 2024
b025721
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
99483c8
Merge pull request #208 from max-out-oluwadara/feat/149-User(SuperAmi…
incredible-phoenix246 Jul 24, 2024
02aebca
fix: Resolve merge conflicts and integrate changes from both branches
Nainah23 Jul 24, 2024
0531053
feat(users): add unit tests for retrieving profile information for au…
SamixYasuke Jul 24, 2024
8b48777
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
39b1e75
Merge branch 'hngprojects:dev' into feat/#120-retrieve-authenticated-…
SamixYasuke Jul 24, 2024
8079e50
Merge branch 'dev' into paymentStripe
mwangiii Jul 24, 2024
cb4bf0f
Merge branch 'dev' into product_pagination
deolla Jul 24, 2024
2e97b50
feat: implement test for google auth feature
Khingz Jul 24, 2024
f335ec0
feat: export-user-data
Ibrahim4Grace Jul 24, 2024
e77c406
feat(users): add unit tests for retrieving profile information for au…
SamixYasuke Jul 24, 2024
e3c9a64
fix: resolve merge conflict - index.ts
Khingz Jul 24, 2024
d006edf
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
dfef60e
fix: format code
Ibrahim4Grace Jul 24, 2024
965b0b3
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
37d112c
Merge pull request #209 from fktona/feat/seting-up-messaging-queue
incredible-phoenix246 Jul 24, 2024
c6ea311
Merge branch 'dev' into feat/export-user-data
incredible-phoenix246 Jul 24, 2024
e38eb55
Merge pull request #239 from Ibrahim4Grace/feat/export-user-data
incredible-phoenix246 Jul 24, 2024
f2dd55d
Merge branch 'dev' into feat/127-Allow_User_To_Get_Own_Blog_Posts
Nainah23 Jul 24, 2024
29b2d36
Merge branch 'dev' into feat/#120-retrieve-authenticated-user-profile
incredible-phoenix246 Jul 24, 2024
0ff3485
refactor: move error handler middleware to the bottom of the middlewa…
Khingz Jul 24, 2024
dc4e16b
Merge pull request #231 from Nainah23/feat/127-Allow_User_To_Get_Own_…
incredible-phoenix246 Jul 24, 2024
feaca79
Merge branch 'hngprojects:dev' into feat/#120-retrieve-authenticated-…
SamixYasuke Jul 24, 2024
4d00d40
Merge branch 'dev' into feat/get-product
deolla Jul 24, 2024
d249c72
Merge branch 'dev' of https://github.com/Khingz/hng_boilerplate_expre…
Khingz Jul 24, 2024
e3199f9
feat: installed cloudinary and multer dependencies
aniebietafia Jul 24, 2024
f58f391
feat: cloudinary and multer configurations
aniebietafia Jul 24, 2024
47049c7
chore: deleted/removed auth.google test file
Khingz Jul 24, 2024
ee9ee80
feat: cloudinary template
aniebietafia Jul 24, 2024
a59222f
feat: update single user profile endpoint
aniebietafia Jul 24, 2024
13959cd
refactor: updated types directory to include email interface
Khingz Jul 24, 2024
2a56ca2
feat: update user test case
aniebietafia Jul 24, 2024
5ff4a5e
test cases
aniebietafia Jul 24, 2024
ba12924
fix: remove redundant double initializer in imdes.ts for Limiter mid…
Khingz Jul 24, 2024
e8d8e68
test
aniebietafia Jul 24, 2024
7e7c5d7
refactor: add google auth callback url to env
Khingz Jul 24, 2024
1850252
refactor: updated env-example to include google auth call back url
Khingz Jul 24, 2024
2e695cb
feat(users): add unit tests for retrieving profile information for au…
SamixYasuke Jul 24, 2024
7b05e38
feat(users): add unit tests for retrieving profile information for au…
SamixYasuke Jul 24, 2024
d3d8425
feat: Implement GET All User Products Endoint with Pagination (Page, …
deolla Jul 24, 2024
675091f
feat: Implement GET All User Products Endoint with Pagination (Page, …
deolla Jul 24, 2024
f625070
feat: API Endpoint for Editing a Blog Post by Id
CMI-James Jul 24, 2024
fe4aedd
test for update organisation
Shabzynana Jul 24, 2024
ffb61ca
chore: removed package-lock.json file and install packages with yarn
Khingz Jul 24, 2024
593c056
Merge pull request #240 from deolla/feat/get-product
incredible-phoenix246 Jul 24, 2024
243f483
Merge branch 'dev' into feat/super-admin-set-roles
incredible-phoenix246 Jul 24, 2024
d78d819
fix: updated running logs
incredible-phoenix246 Jul 24, 2024
859f3dc
Merge pull request #198 from holabayor/feat/super-admin-set-roles
incredible-phoenix246 Jul 24, 2024
c416c32
fix: merge conflict resolution
Khingz Jul 24, 2024
97a9370
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
6267762
Merge branch 'dev' of github.com:fktona/hng_boilerplate_expressjs int…
fktona Jul 24, 2024
c2df9b7
Merge pull request #242 from Khingz/FEAT-Google-auth
incredible-phoenix246 Jul 24, 2024
44d5a89
feat: fix conflicts
Shabzynana Jul 24, 2024
6447ec9
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
e3b134a
Merge branch 'dev' of github.com:fktona/hng_boilerplate_expressjs int…
fktona Jul 24, 2024
227286a
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
282d447
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
e8de162
feat: organisation endpoint documentation
tochiezeamama Jul 24, 2024
56d1047
Merge branch 'dev' into edit-blog-post
CMI-James Jul 24, 2024
b3d95db
feat: add forgot and reset password
AdeGneus Jul 24, 2024
466b501
feat: Added Api Doc for Admin Routes
CollinDex Jul 24, 2024
1f0feb2
Merge pull request #255 from AdeGneus/feat/forgot-reset-password
incredible-phoenix246 Jul 24, 2024
1660b8d
Merge branch 'dev' of github.com:fktona/hng_boilerplate_expressjs int…
fktona Jul 24, 2024
87f0912
fix: updated limiter to run before all route
incredible-phoenix246 Jul 24, 2024
557e676
Merge pull request #256 from hngprojects/fix-auth-limiter
incredible-phoenix246 Jul 24, 2024
7cc4436
feat: setup messaging queue using bull and redis server
fktona Jul 24, 2024
a172c7a
Merge pull request #254 from tochiezeamama/create-organisation
incredible-phoenix246 Jul 24, 2024
f0fbd3d
Merge branch 'dev' of github.com:fktona/hng_boilerplate_expressjs int…
fktona Jul 24, 2024
aa47993
chore: update yarn.lock file
mwangiii Jul 24, 2024
7dcdff0
feat: get product by Id
Kvngstar Jul 24, 2024
ea6f40e
Merge pull request #251 from fktona/feat/seting-up-messaging-queue
incredible-phoenix246 Jul 24, 2024
2b6d042
chore: update yarn.lock file
mwangiii Jul 24, 2024
c42023c
Merge pull request #250 from ChibuikemMichaelIlonze/edit-blog-post
incredible-phoenix246 Jul 24, 2024
91295db
feat(users): add unit tests for retrieving profile information for au…
SamixYasuke Jul 24, 2024
d7d90ab
Merge branch 'dev' into feat/136-update_single_user
aniebietafia Jul 24, 2024
61aa4fc
feat(users): add unit tests for retrieving profile information for au…
SamixYasuke Jul 24, 2024
8ac0367
feat: get product by Id
Kvngstar Jul 24, 2024
b35cd76
fixed test issue
aniebietafia Jul 24, 2024
8af1e3b
Merge branch 'hngprojects:dev' into dev
CollinDex Jul 24, 2024
20596ea
Merge pull request #250 from ChibuikemMichaelIlonze/edit-blog-post
incredible-phoenix246 Jul 24, 2024
8bd3f70
Merge pull request #244 from aniebietafia/feat/136-update_single_user
incredible-phoenix246 Jul 24, 2024
c1d2d03
Merge pull request #266 from CollinDex/feat/249-Admin_Route_Documenta…
incredible-phoenix246 Jul 24, 2024
8297fc5
docs(auth): add API documentation for forget and reset password
bammietop03 Jul 24, 2024
e461adc
Merge branch 'feat/get-product-by-id' of github.com:Kvngstar/hng_boil…
Kvngstar Jul 24, 2024
81b5263
feat: super admin gets logs of activities
AshadeSamson Jul 24, 2024
a65fcc5
feat(users): add unit tests for retrieving profile information for au…
SamixYasuke Jul 24, 2024
058e4d4
feat: get product by Id
Kvngstar Jul 24, 2024
17a5eed
Merge pull request #267 from bammietop03/bamiwo-API-Doc
incredible-phoenix246 Jul 24, 2024
634ae44
chore: update .env
mwangiii Jul 24, 2024
b83a49e
Merge pull request #272 from SamixYasuke/feat/#120-retrieve-authentic…
incredible-phoenix246 Jul 24, 2024
da063f7
Merge branch 'hngprojects:dev' into feat/get-product-by-id
Kvngstar Jul 24, 2024
673b573
Merge pull request #273 from Kvngstar/feat/get-product-by-id
incredible-phoenix246 Jul 24, 2024
189617f
docs(auth): updated API documentation for forget and reset password
bammietop03 Jul 24, 2024
7c35be5
Merge branch 'bamiwo-API-Doc' of https://github.com/bammietop03/hng_b…
bammietop03 Jul 24, 2024
e40c5cf
Merge pull request #278 from bammietop03/bamiwo-API-Doc
incredible-phoenix246 Jul 24, 2024
17c55d8
feat: add test for getting all users
Shabzynana Jul 24, 2024
242eed4
Merge pull request #271 from AshadeSamson/feat/admin-get-activities-log
incredible-phoenix246 Jul 24, 2024
2158734
feat: add new pull request feature
mwangiii Jul 24, 2024
428c323
fix: conflicts
Shabzynana Jul 24, 2024
f50381c
fix: conflicts
Shabzynana Jul 24, 2024
dc41041
Merge branch 'dev' into feature/stripe-payment-integration
mwangiii Jul 24, 2024
bd3369e
fix: fixed asynchronous operations while runing test
incredible-phoenix246 Jul 24, 2024
a4f73b2
Merge pull request #285 from hngprojects/fix/fixed-test-error
incredible-phoenix246 Jul 24, 2024
003d230
feat: allow user get a specific product
staq001 Jul 24, 2024
2488d11
feat: change authenticated user password
incredible-phoenix246 Jul 24, 2024
2480eb8
feat: update organisation details
oderahub Jul 24, 2024
b3fbe4b
chore: test for change password
incredible-phoenix246 Jul 24, 2024
dbdf6ae
Merge remote-tracking branch 'origin/dev' into feature-organisation
oderahub Jul 24, 2024
6f5412c
Merge pull request #287 from hngprojects/feat-authentication/update-u…
incredible-phoenix246 Jul 24, 2024
8338614
feat: super admin gets log of activities
AshadeSamson Jul 24, 2024
00ff402
Merge branch 'hngprojects:dev' into feat-get-specific-product
staq001 Jul 24, 2024
2b14a4b
chore: switched routes to carmel case
incredible-phoenix246 Jul 24, 2024
97b46bc
Merge branch 'feature-organisation' into dev
oderahub Jul 24, 2024
1790097
Merge pull request #289 from hngprojects/feat-authentication/update-u…
incredible-phoenix246 Jul 24, 2024
971be25
Merge pull request #290 from oderahub/dev
incredible-phoenix246 Jul 24, 2024
fbcc5d0
Merge branch 'hngprojects:dev' into feat-get-specific-product
staq001 Jul 24, 2024
5106890
Merge pull request #286 from staq001/feat-get-specific-product
incredible-phoenix246 Jul 24, 2024
febf29a
fix: conflicts
Shabzynana Jul 24, 2024
897445d
Merge pull request #292 from AshadeSamson/feat/admin-get-activities-log
incredible-phoenix246 Jul 24, 2024
fe3d9d1
Merge branch 'dev' into feature/stripe-payment-integration
mwangiii Jul 24, 2024
1ae3a71
Merge branch 'feat/132-update_organisaion_superAdmin' of https://gith…
Shabzynana Jul 24, 2024
7bd5121
Merge branch 'hngprojects:dev' into feat/132-update_organisaion_super…
Shabzynana Jul 24, 2024
2f62077
chore: updated .env.example
incredible-phoenix246 Jul 24, 2024
aac020e
Merge pull request #296 from Shabzynana/feat/132-update_organisaion_s…
incredible-phoenix246 Jul 24, 2024
a30ba07
Update .env.example
incredible-phoenix246 Jul 24, 2024
4e2c520
chore:Update BlogController.ts
mwangiii Jul 24, 2024
be552f4
chore:Update sms.ts
mwangiii Jul 24, 2024
597c06c
Merge pull request #297 from hngprojects/feat-authentication/update-u…
incredible-phoenix246 Jul 24, 2024
5ea48a5
Merge branch 'dev' into feature/stripe-payment-integration
mwangiii Jul 24, 2024
afdcd40
Merge pull request #281 from mwangiii/feature/stripe-payment-integration
incredible-phoenix246 Jul 24, 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
40 changes: 26 additions & 14 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
PORT=8000
AUTH_SECRET=
DB_USER=
DB_PORT=
DB_HOST=
DB_PASSWORD=
DB_NAME=
NODE_ENV=development
SMTP_USER=
SMTP_PASSWORD=
SMTP_HOST=
SMTP_SERVICE=
TWILIO_ACCOUNT_SID=
TWILIO_AUTH_TOKEN=
PORT=8000,
"api-prefix": "api/v1",
DB_USER=,
DB_HOST=,
DB_PASSWORD=,
DB_PORT=,
DB_NAME=,
TOKEN_SECRET=
SMTP_USER=,
SMTP_PASSWORD=,
SMTP_HOST=,
SMTP_SERVICE=,
SMTP_PORT=,
REDIS_PASSWORD=,
REDIS_HOST=,
REDIS_PORT=,
NODE_ENV=,
TWILIO_SID=
TWILIO_AUTH_TOKEN=
TWILIO_PHONE_NUMBER=
GOOGLE_CLIENT_ID=:
GOOGLE_CLIENT_SECRET=
GOOGLE_AUTH_CALLBACK_URL=
CLOUDINARY_CLOUD_NAME=
CLOUDINARY_API_KEY=
CLOUDINARY_API_SECRET=
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@ temp/
.env
env
src/entity
src/ormconfig.ts
src/ormconfig.ts
build
issueformat.md
requests.rest
package-lock.json
1 change: 1 addition & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarn commitlint ${1}
7 changes: 7 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
yarn

yarn lint-staged

yarn test

yarn build
33 changes: 33 additions & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
module.exports = {
parserPreset: "conventional-changelog-conventionalcommits",
extends: ["@commitlint/config-conventional"],
rules: {
"body-leading-blank": [1, "always"],
"body-max-line-length": [2, "always", 100],
"footer-leading-blank": [1, "always"],
"footer-max-line-length": [2, "always", 100],
"header-max-length": [2, "always", 100],
"subject-case": [2, "never", ["start-case", "pascal-case"]],
"subject-empty": [2, "never"],
"subject-full-stop": [2, "never", "."],
"type-case": [2, "always", "lower-case"],
"type-empty": [2, "never"],
"type-enum": [
2,
"always",
[
"build",
"chore",
"ci",
"docs",
"feat",
"fix",
"perf",
"refactor",
"revert",
"style",
"test",
],
],
},
};
3 changes: 3 additions & 0 deletions contributors.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- [Nainah23](https://github.com/Nainah23)
- Erasmus Tayviah (StarmannRassy)
- [Adekolu Samuel Samixx](https://github.com/samixYasuke)
127 changes: 127 additions & 0 deletions db/migrations/1721742344691-migration.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Blog1721742344691 implements MigrationInterface {
name = "Blog1721742344691";

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`CREATE TYPE "public"."user_organization_role_enum" AS ENUM('super_admin', 'admin', 'user')`,
);
await queryRunner.query(
`CREATE TABLE "user_organization" ("userId" uuid NOT NULL, "organizationId" uuid NOT NULL, "role" "public"."user_organization_role_enum" NOT NULL, CONSTRAINT "PK_6e6630567770ae6f0a76d05ce33" PRIMARY KEY ("userId", "organizationId"))`,
);
await queryRunner.query(
`CREATE TABLE "organization" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "slug" character varying NOT NULL, "name" character varying NOT NULL, "email" character varying, "industry" character varying, "type" character varying, "country" character varying, "address" character varying, "state" character varying, "description" text, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "updated_at" TIMESTAMP NOT NULL DEFAULT now(), "owner_id" uuid NOT NULL, CONSTRAINT "UQ_a08804baa7c5d5427067c49a31f" UNIQUE ("slug"), CONSTRAINT "PK_472c1f99a32def1b0abb219cd67" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE TABLE "profile" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "first_name" character varying NOT NULL, "last_name" character varying NOT NULL, "phone" character varying NOT NULL, "avatarUrl" character varying NOT NULL, CONSTRAINT "PK_3dd8bfc97e4a77c70971591bdcb" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE TABLE "product" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "name" character varying NOT NULL, "description" character varying NOT NULL, "price" integer NOT NULL, "category" character varying NOT NULL, "userId" uuid, CONSTRAINT "PK_bebc9158e480b949565b4dc7a82" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE TABLE "help_center_topic" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying NOT NULL, "content" character varying NOT NULL, "author" character varying NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_f1fd49531d0c8c8ecf09fca6e84" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE TABLE "notification_setting" ("id" SERIAL NOT NULL, "user_id" character varying NOT NULL, "email_notifications" boolean NOT NULL, "push_notifications" boolean NOT NULL, "sms_notifications" boolean NOT NULL, CONSTRAINT "UQ_d210b9143572b7e8179c15f5f2a" UNIQUE ("user_id"), CONSTRAINT "PK_af85fd153b97ee9eacb505453fe" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE TABLE "sms" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "phone_number" character varying NOT NULL, "message" character varying NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "senderId" uuid, CONSTRAINT "PK_60793c2f16aafe0513f8817eae8" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE TABLE "blog" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying NOT NULL, "content" character varying NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "authorId" uuid, CONSTRAINT "PK_85c6532ad065a448e9de7638571" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE TABLE "job" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying NOT NULL, "user_id" character varying NOT NULL, "description" character varying NOT NULL, "location" character varying NOT NULL, "salary" character varying NOT NULL, "job_type" character varying NOT NULL, "company_name" character varying NOT NULL, CONSTRAINT "PK_98ab1c14ff8d1cf80d18703b92f" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE TYPE "public"."user_role_enum" AS ENUM('super_admin', 'admin', 'user')`,
);
await queryRunner.query(
`CREATE TABLE "user" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "name" character varying NOT NULL, "email" character varying NOT NULL, "password" character varying NOT NULL, "isverified" boolean NOT NULL DEFAULT false, "role" "public"."user_role_enum" NOT NULL DEFAULT 'user', "otp" integer NOT NULL, "otp_expires_at" TIMESTAMP NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "profileId" uuid, CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"), CONSTRAINT "REL_9466682df91534dd95e4dbaa61" UNIQUE ("profileId"), CONSTRAINT "PK_cace4a159ff9f2512dd42373760" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE TABLE "testimonial" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "user_id" character varying NOT NULL, "client_name" character varying NOT NULL, "client_position" character varying NOT NULL, "testimonial" character varying NOT NULL, CONSTRAINT "PK_e1aee1c726db2d336480c69f7cb" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE TABLE "user_organizations_organization" ("userId" uuid NOT NULL, "organizationId" uuid NOT NULL, CONSTRAINT "PK_d89fbba617c90c71e2fc0bee26f" PRIMARY KEY ("userId", "organizationId"))`,
);
await queryRunner.query(
`CREATE INDEX "IDX_7ad3d8541fbdb5a3d137c50fb4" ON "user_organizations_organization" ("userId") `,
);
await queryRunner.query(
`CREATE INDEX "IDX_8d7c566d5a234be0a646101326" ON "user_organizations_organization" ("organizationId") `,
);
await queryRunner.query(
`ALTER TABLE "user_organization" ADD CONSTRAINT "FK_29c3c8cc3ea9db22e4a347f4b5a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
);
await queryRunner.query(
`ALTER TABLE "user_organization" ADD CONSTRAINT "FK_7143f31467178a6164a42426c15" FOREIGN KEY ("organizationId") REFERENCES "organization"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
);
await queryRunner.query(
`ALTER TABLE "product" ADD CONSTRAINT "FK_329b8ae12068b23da547d3b4798" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
);
await queryRunner.query(
`ALTER TABLE "sms" ADD CONSTRAINT "FK_5e4a3ebde193729147d95e0822c" FOREIGN KEY ("senderId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
);
await queryRunner.query(
`ALTER TABLE "blog" ADD CONSTRAINT "FK_a001483d5ba65dad16557cd6ddb" FOREIGN KEY ("authorId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
);
await queryRunner.query(
`ALTER TABLE "user" ADD CONSTRAINT "FK_9466682df91534dd95e4dbaa616" FOREIGN KEY ("profileId") REFERENCES "profile"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
);
await queryRunner.query(
`ALTER TABLE "user_organizations_organization" ADD CONSTRAINT "FK_7ad3d8541fbdb5a3d137c50fb40" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
);
await queryRunner.query(
`ALTER TABLE "user_organizations_organization" ADD CONSTRAINT "FK_8d7c566d5a234be0a6461013269" FOREIGN KEY ("organizationId") REFERENCES "organization"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "user_organizations_organization" DROP CONSTRAINT "FK_8d7c566d5a234be0a6461013269"`,
);
await queryRunner.query(
`ALTER TABLE "user_organizations_organization" DROP CONSTRAINT "FK_7ad3d8541fbdb5a3d137c50fb40"`,
);
await queryRunner.query(
`ALTER TABLE "user" DROP CONSTRAINT "FK_9466682df91534dd95e4dbaa616"`,
);
await queryRunner.query(
`ALTER TABLE "blog" DROP CONSTRAINT "FK_a001483d5ba65dad16557cd6ddb"`,
);
await queryRunner.query(
`ALTER TABLE "sms" DROP CONSTRAINT "FK_5e4a3ebde193729147d95e0822c"`,
);
await queryRunner.query(
`ALTER TABLE "product" DROP CONSTRAINT "FK_329b8ae12068b23da547d3b4798"`,
);
await queryRunner.query(
`ALTER TABLE "user_organization" DROP CONSTRAINT "FK_7143f31467178a6164a42426c15"`,
);
await queryRunner.query(
`ALTER TABLE "user_organization" DROP CONSTRAINT "FK_29c3c8cc3ea9db22e4a347f4b5a"`,
);
await queryRunner.query(
`DROP INDEX "public"."IDX_8d7c566d5a234be0a646101326"`,
);
await queryRunner.query(
`DROP INDEX "public"."IDX_7ad3d8541fbdb5a3d137c50fb4"`,
);
await queryRunner.query(`DROP TABLE "user_organizations_organization"`);
await queryRunner.query(`DROP TABLE "testimonial"`);
await queryRunner.query(`DROP TABLE "user"`);
await queryRunner.query(`DROP TYPE "public"."user_role_enum"`);
await queryRunner.query(`DROP TABLE "job"`);
await queryRunner.query(`DROP TABLE "blog"`);
await queryRunner.query(`DROP TABLE "sms"`);
await queryRunner.query(`DROP TABLE "notification_setting"`);
await queryRunner.query(`DROP TABLE "help_center_topic"`);
await queryRunner.query(`DROP TABLE "product"`);
await queryRunner.query(`DROP TABLE "profile"`);
await queryRunner.query(`DROP TABLE "organization"`);
await queryRunner.query(`DROP TABLE "user_organization"`);
await queryRunner.query(`DROP TYPE "public"."user_organization_role_enum"`);
}
}
Loading