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

Merge dev to staging #590

Open
wants to merge 195 commits into
base: staging-1
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
195 commits
Select commit Hold shift + click to select a range
348cfed
feat: paystack package install
Uzo-Felix Aug 8, 2024
2e4e7a9
feat: added new env variable for paystack
Uzo-Felix Aug 8, 2024
cdd5cd3
feat: paystack payment service
Uzo-Felix Aug 8, 2024
21c68a3
feat: payment controller
Uzo-Felix Aug 8, 2024
a6b0c69
feat: payment routes
Uzo-Felix Aug 8, 2024
b5fbb3d
feat: payment using paystack
Uzo-Felix Aug 8, 2024
1f07864
test: test for payment using paystack
Uzo-Felix Aug 8, 2024
ca227de
feat: documentation for payment with paystack
Uzo-Felix Aug 8, 2024
f495c13
feat: get job by id
bammietop03 Aug 8, 2024
76cb85d
Merge remote-tracking branch 'upstream/dev' into feat/create-org-roles
Konan69 Aug 8, 2024
08c52a6
fix: resolve conflicts
LivingHopeDev Aug 8, 2024
d5f3b7f
Merge branch 'dev' into feat/update-blog
LivingHopeDev Aug 8, 2024
91ae314
feat: added feature to add roles in an organization
Konan69 Aug 8, 2024
57262dc
feat: added feature to add roles to an organisation
Konan69 Aug 8, 2024
8aedf05
Merge remote-tracking branch 'upstream/dev' into feat/create-org-roles
Konan69 Aug 8, 2024
1f49a56
fix: resolved merge conflict
Konan69 Aug 8, 2024
d6f6e32
feat: update blog
LivingHopeDev Aug 8, 2024
65a234f
Merge branch 'dev' into feat/update-blog
LivingHopeDev Aug 8, 2024
fe88fe6
feat(job): get all jobs
thectogeneral Aug 8, 2024
fe18cf0
Update job.ts
thectogeneral Aug 8, 2024
ff834f4
feat: get billing plans
kingdavidHub Aug 8, 2024
7250a68
Merge remote-tracking branch 'upstream/dev' into feat/billing-plans
kingdavidHub Aug 8, 2024
89602cc
fix: modified payment payload
Uzo-Felix Aug 8, 2024
36e2230
chore: resolve merge conflicts
Uzo-Felix Aug 8, 2024
5a6005f
feat: add get user notification endpoint
SamixYasuke Aug 8, 2024
961f26c
test: modified test for payment
Uzo-Felix Aug 8, 2024
cf7fd2d
Merge remote-tracking branch 'upstream/dev' into feat/create-org-roles
Konan69 Aug 8, 2024
226b15c
Merge remote-tracking branch 'upstream/dev' into feat/billing-plans
kingdavidHub Aug 8, 2024
cf7d84f
fix: resolved conflicts
Konan69 Aug 8, 2024
ab738d5
feat: add get user notification endpoint
SamixYasuke Aug 8, 2024
59e50ed
Merge branch 'dev' into feat/get-all-jobs
thectogeneral Aug 8, 2024
d8ccde7
feat: verify 2fa
AdeGneus Aug 8, 2024
3f68333
Merge pull request #522 from kingdavidHub/feat/billing-plans
PreciousIfeaka Aug 8, 2024
2e1e578
Update jobController.ts
thectogeneral Aug 8, 2024
0db33a6
Update job.service.ts
thectogeneral Aug 8, 2024
57ef91d
Merge pull request #525 from AdeGneus/feat/verify-2fa
Khingz Aug 8, 2024
c60539f
Merge pull request #524 from Konan69/feat/create-org-roles
Khingz Aug 8, 2024
93e03a7
feat: add get user notification endpoint
SamixYasuke Aug 8, 2024
4d27797
fix: resolve conflict
LivingHopeDev Aug 8, 2024
2ee4e39
Merge pull request #527 from SamixYasuke/dev
PreciousIfeaka Aug 8, 2024
5d1d50c
Merge pull request #520 from thectogeneral/feat/get-all-jobs
PreciousIfeaka Aug 8, 2024
469a6b0
fix: payment test
Uzo-Felix Aug 8, 2024
9036105
Merge branch 'dev' into feat/payment-using-paystack
Uzo-Felix Aug 8, 2024
cd67acb
Merge pull request #485 from Uzo-Felix/feat/payment-using-paystack
AdeGneus Aug 8, 2024
9787053
Merge pull request #519 from LivingHopeDev/feat/update-blog
PreciousIfeaka Aug 8, 2024
1ba14a8
use ubuntu latest runner dev.yml
Rob-in-son Aug 8, 2024
2596cab
Merge pull request #529 from hngprojects/Rob-in-son-runner-update
incredible-phoenix246 Aug 8, 2024
5485bd7
fix(job): wrote test for get all jobs
thectogeneral Aug 8, 2024
4d365d4
Update runner dev.yml
Rob-in-son Aug 8, 2024
617c136
Merge pull request #530 from thectogeneral/fix/write-test-for-get-all…
AdeGneus Aug 8, 2024
3881394
Merge pull request #531 from hngprojects/Rob-in-son-runner
ThePrimeJnr Aug 8, 2024
b9650d9
feat: delete comment endpoint
Octagon-simon Aug 8, 2024
feba3e9
fix(conflicts): resolved merge conflicts
Octagon-simon Aug 8, 2024
d9701dc
feat: update squeeze page
PreciousIfeaka Aug 8, 2024
409318b
Merge branch 'dev' into feat/update-squeeze
PreciousIfeaka Aug 8, 2024
c9a46a5
feat: update squeeze page
PreciousIfeaka Aug 8, 2024
6298165
Merge pull request #533 from Octagon-simon/feat/delete-comment
AdeGneus Aug 8, 2024
e8bec72
Merge pull request #534 from PreciousIfeaka/feat/update-squeeze
AdeGneus Aug 8, 2024
02bcef4
feat: fixing conflits
bammietop03 Aug 8, 2024
47f2b88
Merge pull request #536 from bammietop03/bamiwo-job
incredible-phoenix246 Aug 8, 2024
7d768ab
Create pr-deploy.yml
Lanky-23 Aug 8, 2024
bdb379e
Update dev.yml with docker commands
Rob-in-son Aug 8, 2024
49a806e
Update pr-deploy.yml
Lanky-23 Aug 8, 2024
0a52af5
Update pr-deploy.yml
Lanky-23 Aug 8, 2024
f425d83
Merge pull request #539 from hngprojects/Lanky-23-patch-1
Rob-in-son Aug 8, 2024
6300d39
Merge pull request #542 from hngprojects/Rob-in-son-workflows
Lanky-23 Aug 9, 2024
d6af324
Update pr-deploy.yml
Lanky-23 Aug 9, 2024
8102144
Replace scp action with script dev.yml
Rob-in-son Aug 9, 2024
b17549b
Merge pull request #543 from hngprojects/Lanky-23-patch-1
Rob-in-son Aug 9, 2024
2cb5d2b
Update pr-deploy.yml
Lanky-23 Aug 9, 2024
4b161cd
Merge pull request #544 from hngprojects/Rob-in-son-workflows
Lanky-23 Aug 9, 2024
25b5694
Update pr-deploy.yml
Lanky-23 Aug 9, 2024
1dfeebe
Update var names in dev.yml
Rob-in-son Aug 9, 2024
ee1056f
Merge pull request #547 from hngprojects/Rob-in-son-workflow-patch-2
Lanky-23 Aug 9, 2024
5b19914
Update ssh login method dev.yml
Rob-in-son Aug 9, 2024
0d0c17f
Merge pull request #548 from hngprojects/Rob-in-son-workflow-patch-3
Lanky-23 Aug 9, 2024
c3f92a0
Update destination filename dev.yml
Rob-in-son Aug 9, 2024
39a5df6
Merge pull request #549 from hngprojects/Rob-in-son-workflow-patch-4
Lanky-23 Aug 9, 2024
da4e844
switch from /opt to /tmp dev.yml
Rob-in-son Aug 9, 2024
2d40a75
Merge pull request #550 from hngprojects/Rob-in-son-workflow-patch-5
codak77 Aug 9, 2024
e7c67e4
pull git repo dev.yml
Rob-in-son Aug 9, 2024
60ea787
Merge pull request #551 from hngprojects/Rob-in-son-workflow-patch-6
codak77 Aug 9, 2024
a82cdc5
correct syntax error dev.yml
Rob-in-son Aug 9, 2024
841d16b
Merge pull request #552 from hngprojects/Rob-in-son-workflow-patch-7
codak77 Aug 9, 2024
f85596e
Update dev.yml
Rob-in-son Aug 9, 2024
91b2410
Merge pull request #553 from hngprojects/Rob-in-son-workflow-patch-7-1
codak77 Aug 9, 2024
41f527c
Update docker-compose.yml
Rob-in-son Aug 9, 2024
347f32e
Merge pull request #554 from hngprojects/Rob-in-son-compose-1
Lanky-23 Aug 9, 2024
bc5255f
Update dev.yml- compose
Rob-in-son Aug 9, 2024
826651a
Merge pull request #555 from hngprojects/Rob-in-son-patch
Lanky-23 Aug 9, 2024
96fd5b3
Update pr-deploy.yml
Lanky-23 Aug 9, 2024
0bc0680
Merge pull request #546 from hngprojects/Lanky-23-patch-2
Rob-in-son Aug 9, 2024
e1ba8dd
create images for all services
Rob-in-son Aug 9, 2024
5315805
Merge pull request #556 from hngprojects/Rob-in-son-patch1
Lanky-23 Aug 9, 2024
54330b6
Update pr-deploy.yml
Lanky-23 Aug 9, 2024
5dfc639
Merge pull request #557 from hngprojects/Lanky-23-patch-2
Rob-in-son Aug 9, 2024
ce4744c
Update pr-deploy.yml
Lanky-23 Aug 9, 2024
5eae712
Update dev.yml
Rob-in-son Aug 9, 2024
0757d22
Merge pull request #558 from hngprojects/Lanky-23-patch-2-1
Rob-in-son Aug 9, 2024
df725ab
Merge pull request #559 from hngprojects/Rob-in-son-patch-0
Lanky-23 Aug 9, 2024
56d3924
Update dev.yml
Rob-in-son Aug 9, 2024
07a130d
Merge pull request #560 from hngprojects/Rob-in-son-patch-2
Lanky-23 Aug 9, 2024
56c1911
Update dev.yml
Rob-in-son Aug 9, 2024
2a176f0
Merge pull request #561 from hngprojects/Rob-in-son-patch-11
codak77 Aug 9, 2024
cbc11d4
Update dev.yml
Rob-in-son Aug 9, 2024
85a87d8
Merge pull request #562 from hngprojects/Rob-in-son-patch-3
codak77 Aug 9, 2024
c0bd7d1
fetch .env from server for compose up
Rob-in-son Aug 9, 2024
7217de1
Merge pull request #564 from hngprojects/Rob-in-son-dev.yml1
Lanky-23 Aug 9, 2024
ddce402
Update staging.yml
Rob-in-son Aug 9, 2024
2565a32
Update prod.yml
Rob-in-son Aug 9, 2024
b908517
Update dev.yml
Rob-in-son Aug 9, 2024
3de0541
Update prod.yml
Rob-in-son Aug 9, 2024
0c1f3b8
Update staging.yml
Rob-in-son Aug 9, 2024
e8f5c19
Update dev.yml
Rob-in-son Aug 9, 2024
187b0f4
Merge pull request #565 from hngprojects/Rob-in-son-dev.yml1
Lanky-23 Aug 9, 2024
9feb21b
Update .env path in docker-compose.yml
Rob-in-son Aug 9, 2024
5966e22
Update .env path in docker-compose.staging.yml
Rob-in-son Aug 9, 2024
f96e264
Update .env path in docker-compose.production.yml
Rob-in-son Aug 9, 2024
82179da
Update dev.yml
Rob-in-son Aug 9, 2024
3c3abbf
Update prod.yml
Rob-in-son Aug 9, 2024
df14e73
Update staging.yml
Rob-in-son Aug 9, 2024
41f37ae
Update CI.yml
Rob-in-son Aug 9, 2024
ffce86a
Update dev.yml
Rob-in-son Aug 9, 2024
de40e9a
Update prod.yml
Rob-in-son Aug 9, 2024
076de18
Update staging.yml
Rob-in-son Aug 9, 2024
b16153a
chore: user table
incredible-phoenix246 Aug 10, 2024
9bc4d4f
chore: user table
incredible-phoenix246 Aug 10, 2024
ab4a4ff
Merge pull request #572 from hngprojects/feat-user-table
incredible-phoenix246 Aug 10, 2024
b09641c
Merge pull request #568 from hngprojects/fix-workflows
Lanky-23 Aug 10, 2024
d645927
Update dev workflow
Rob-in-son Aug 10, 2024
d2f64a8
Merge pull request #583 from hngprojects/fix-workflows
Lanky-23 Aug 10, 2024
9cd70b3
Copy env file to .env
Rob-in-son Aug 10, 2024
b2d60bf
Merge pull request #585 from hngprojects/fix-workflows
Lanky-23 Aug 10, 2024
659af2d
change scp .env step
Rob-in-son Aug 10, 2024
82c5ce0
Merge pull request #586 from hngprojects/fix-workflows
Rob-in-son Aug 10, 2024
948f27a
change docker save
Rob-in-son Aug 10, 2024
570c02b
Merge pull request #587 from hngprojects/fix-workflows
Lanky-23 Aug 10, 2024
8c43195
Updated deployment dir
Rob-in-son Aug 10, 2024
6f72293
Merge pull request #588 from hngprojects/fix-workflows
Lanky-23 Aug 10, 2024
53cca85
updated dockercompose files and workflows
Rob-in-son Aug 10, 2024
975e89a
Merge pull request #589 from hngprojects/fix-workflows
Lanky-23 Aug 10, 2024
31a8bd7
cd: update dev.yml
Rob-in-son Aug 13, 2024
6805142
Merge pull request #597 from hngprojects/Rob-in-son-cd-patch
Lanky-23 Aug 13, 2024
c57d9f4
Update pr-deploy.yml
Lanky-23 Aug 13, 2024
289c967
Update pr-deploy.yml
Lanky-23 Aug 13, 2024
50bd2e6
cd: Update staging.yml
Rob-in-son Aug 13, 2024
b7d4468
Merge pull request #599 from hngprojects/update-workflows
Lanky-23 Aug 13, 2024
e53d24c
Merge pull request #598 from hngprojects/Lanky-23-patch-2
Lanky-23 Aug 14, 2024
3017815
Merge branch 'dev' into Lanky-23-patch-1
Lanky-23 Aug 14, 2024
fbb3788
Merge pull request #545 from hngprojects/Lanky-23-patch-1
Rob-in-son Aug 14, 2024
c7a593b
cd: updated working-dir
Rob-in-son Aug 15, 2024
ed2212b
cd: update deploy todev withh no docker
Rob-in-son Aug 15, 2024
fc907c6
Merge pull request #600 from hngprojects/Rob-in-son-no-docker
Lanky-23 Aug 15, 2024
5df5457
cd: update working dir
Rob-in-son Aug 15, 2024
53ed8d7
cd: pull step
Rob-in-son Aug 15, 2024
b913de5
Merge pull request #602 from hngprojects/Rob-in-son-no-docker
Lanky-23 Aug 15, 2024
12a5818
Update startappdev.sh
Rob-in-son Aug 15, 2024
7e3ff76
Update aihomeworkdev.service
Rob-in-son Aug 15, 2024
7968633
Merge pull request #603 from hngprojects/Rob-in-son-no-docker
Lanky-23 Aug 15, 2024
75e778c
Update dev.yml
Rob-in-son Aug 15, 2024
16761cf
Merge pull request #604 from hngprojects/Rob-in-son-no-docker
Lanky-23 Aug 15, 2024
39dee99
feat: Implement API Endpoints for Managing User Plans
deolla Aug 15, 2024
b4f8fbc
Merge pull request #605 from deolla/feat/get-products
incredible-phoenix246 Aug 15, 2024
7c72519
cd: update runner and clone
Rob-in-son Aug 15, 2024
f58c15a
Merge pull request #606 from hngprojects/Rob-in-son-patch0
Lanky-23 Aug 15, 2024
c67b083
cd: update working dir
Rob-in-son Aug 15, 2024
ac24036
Merge pull request #607 from hngprojects/Rob-in-son-patch0
Lanky-23 Aug 15, 2024
0299d6f
Update dev.yml
Rob-in-son Aug 15, 2024
c871991
Merge pull request #608 from hngprojects/Rob-in-son-patch0
Lanky-23 Aug 15, 2024
de7b045
Update dev.yml
Rob-in-son Aug 15, 2024
64f7bc2
Merge pull request #609 from hngprojects/Rob-in-son-patch0
Lanky-23 Aug 15, 2024
7251904
fix: update documentation
deolla Aug 15, 2024
3e46fb3
Merge pull request #610 from deolla/feat/get-products
incredible-phoenix246 Aug 16, 2024
190f570
feat: add json link to docs
masterchief-Dave Aug 21, 2024
b08aa55
Update dev.yml
Lanky-23 Aug 21, 2024
264bc92
Update prod.yml
Lanky-23 Aug 21, 2024
ea251ab
Update prod.yml
Lanky-23 Aug 21, 2024
fd5f164
Update staging.yml
Lanky-23 Aug 21, 2024
03d90e6
Update aihomeworkprod.service
Lanky-23 Aug 21, 2024
b2c706e
Update aihomeworkstaging.service
Lanky-23 Aug 21, 2024
376a4d6
Update startappprod.sh
Lanky-23 Aug 21, 2024
d8f1a26
Update startappstaging.sh
Lanky-23 Aug 21, 2024
25b2efc
Update startappstaging.sh
Lanky-23 Aug 21, 2024
8bfac95
Merge pull request #614 from hngprojects/Lanky-23-patch-2
Rob-in-son Aug 21, 2024
dc41264
Update dev.yml
Lanky-23 Aug 23, 2024
bd01931
Merge pull request #618 from hngprojects/dev-1
Data-Bishop Aug 23, 2024
31d4161
Update dev.yml
Lanky-23 Aug 23, 2024
e1c52ae
Merge pull request #619 from hngprojects/dev-1
Data-Bishop Aug 23, 2024
aa306e5
Update startappdev.sh
Lanky-23 Aug 23, 2024
aa3fb91
Merge pull request #620 from hngprojects/Lanky-23-patch-1
Data-Bishop Aug 23, 2024
290c1b2
Merge pull request #613 from masterchief-Dave/feat/api-docs
AdeGneus Aug 24, 2024
28f0f86
feat: api status updates
AdeGneus Aug 24, 2024
392fe97
Merge pull request #621 from hngprojects/feat/api-status
PreciousIfeaka Aug 24, 2024
8fa41b9
feat: get api status
masterchief-Dave Aug 24, 2024
bf0f8db
Merge pull request #622 from masterchief-Dave/feat/api-get-status
AdeGneus Aug 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
16 changes: 9 additions & 7 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
YAML
name: Build, Test, and Deploy for Dev Branch

on:
@@ -34,13 +35,14 @@ jobs:
- name: Deploy and start on remote server
run: |
sshpass -p ${{ secrets.PASSWORD }} ssh -o StrictHostKeyChecking=no ${{ secrets.USERNAME }}@${{ secrets.HOST }} "
cd /var/www/aihomework/dev
git stash
git pull origin dev
docker load -i /tmp/docker-images.tar.gz
docker compose down
docker compose up -d
rm /tmp/docker-images.tar.gz
gunzip /tmp/docker-images.tar.gz
docker load < /tmp/docker-images.tar.gz
cd /var/www/aihomework/dev
git stash
git pull origin dev
docker compose down
docker compose up -d
rm /tmp/docker-images.tar.gz
"
env:
SSH_HOST: ${{ secrets.HOST }}