Code

Merge dev to staging#590

Code

Open

Rob-in-son wants to merge 195 commits intostaging-1hngprojects/hng_boilerplate_expressjs:staging-1from devhngprojects/hng_boilerplate_expressjs:devCopy head branch name to clipboard

+3,320-497

Commits

Commits on Aug 8, 2024

• feat: paystack package install

  Uzo-Felix

  committed
  348cfed

• feat: added new env variable for paystack

  Uzo-Felix

  committed
  2e4e7a9

• feat: paystack payment service

  Uzo-Felix

  committed
  cdd5cd3

• feat: payment controller

  Uzo-Felix

  committed
  21c68a3

• feat: payment routes

  Uzo-Felix

  committed
  a6b0c69

• feat: payment using paystack

  Uzo-Felix

  committed
  b5fbb3d

• test: test for payment using paystack

  Uzo-Felix

  committed
  1f07864

• feat: documentation for payment with paystack

  Uzo-Felix

  committed
  ca227de

• feat: get job by id

  bammietop03

  committed
  f495c13

• Merge remote-tracking branch 'upstream/dev' into feat/create-org-roles

  Konan69

  committed
  76cb85d

• fix: resolve conflicts

  LivingHopeDev

  committed
  08c52a6

• Merge branch 'dev' into feat/update-blog

  LivingHopeDev

  committed
  d5f3b7f

• feat: added feature to add roles in an organization

  Konan69

  committed
  91ae314

• feat: added feature to add roles to an organisation

  Konan69

  committed
  57262dc

• Merge remote-tracking branch 'upstream/dev' into feat/create-org-roles

  Konan69

  committed
  8aedf05

• fix: resolved merge conflict

  Konan69

  committed
  1f49a56

• feat: update blog

  LivingHopeDev

  committed
  d6f6e32

• Merge branch 'dev' into feat/update-blog

  LivingHopeDev

  committed
  65a234f

• feat(job): get all jobs

  thectogeneral

  committed
  fe88fe6

• Update job.ts

  thectogeneral

  authored
  fe18cf0

• feat: get billing plans

  kingdavidHub

  committed
  ff834f4

• Merge remote-tracking branch 'upstream/dev' into feat/billing-plans

  kingdavidHub

  committed
  7250a68

• fix: modified payment payload

  Uzo-Felix

  committed
  89602cc

• chore: resolve merge conflicts

  Uzo-Felix

  committed
  36e2230

• feat: add get user notification endpoint

  SamixYasuke

  committed
  5a6005f

• test: modified test for payment

  Uzo-Felix

  committed
  961f26c

• Merge remote-tracking branch 'upstream/dev' into feat/create-org-roles

  Konan69

  committed
  cf7fd2d

• Merge remote-tracking branch 'upstream/dev' into feat/billing-plans

  kingdavidHub

  committed
  226b15c

• fix: resolved conflicts

  Konan69

  committed
  cf7d84f

• feat: add get user notification endpoint

  SamixYasuke

  committed
  ab738d5

• Merge branch 'dev' into feat/get-all-jobs

  thectogeneral

  authored
  59e50ed

• feat: verify 2fa

  AdeGneus

  committed
  d8ccde7

• Merge pull request #522 from kingdavidHub/feat/billing-plans

  Show description for 3f68333
  PreciousIfeaka

  authored
  3f68333

• Update jobController.ts

  thectogeneral

  authored
  2e1e578

• Update job.service.ts

  thectogeneral

  authored
  0db33a6

• Merge pull request #525 from AdeGneus/feat/verify-2fa

  Show description for 57ef91d
  Khingz

  authored
  57ef91d

• Merge pull request #524 from Konan69/feat/create-org-roles

  Show description for c60539f
  Khingz

  authored
  c60539f

• feat: add get user notification endpoint

  SamixYasuke

  committed
  93e03a7

• fix: resolve conflict

  LivingHopeDev

  committed
  4d27797

• Merge pull request #527 from SamixYasuke/dev

  Show description for 2ee4e39
  PreciousIfeaka

  authored
  2ee4e39

• Merge pull request #520 from thectogeneral/feat/get-all-jobs

  Show description for 5d1d50c
  PreciousIfeaka

  authored
  5d1d50c

• fix: payment test

  Uzo-Felix

  committed
  469a6b0

• Merge branch 'dev' into feat/payment-using-paystack

  Uzo-Felix

  authored
  9036105

• Merge pull request #485 from Uzo-Felix/feat/payment-using-paystack

  Show description for cd67acb
  AdeGneus

  authored
  cd67acb

• Merge pull request #519 from LivingHopeDev/feat/update-blog

  Show description for 9787053
  PreciousIfeaka

  authored
  9787053

• use ubuntu latest runner dev.yml

  Rob-in-son

  authored
  1ba14a8

• Merge pull request #529 from hngprojects/Rob-in-son-runner-update

  Show description for 2596cab
  incredible-phoenix246

  authored
  2596cab

• fix(job): wrote test for get all jobs

  thectogeneral

  committed
  5485bd7

• Update runner dev.yml

  Rob-in-son

  authored
  4d365d4

• Merge pull request #530 from thectogeneral/fix/write-test-for-get-all-blogs

  Show description for 617c136
  AdeGneus

  authored
  617c136

• Merge pull request #531 from hngprojects/Rob-in-son-runner

  Show description for 3881394
  ThePrimeJnr

  authored
  3881394

• feat: delete comment endpoint

  Octagon-simon

  committed
  b9650d9

• fix(conflicts): resolved merge conflicts

  Octagon-simon

  committed
  feba3e9

• feat: update squeeze page

  PreciousIfeaka

  committed
  d9701dc

• Merge branch 'dev' into feat/update-squeeze

  PreciousIfeaka

  committed
  409318b

• feat: update squeeze page

  PreciousIfeaka

  committed
  c9a46a5

• Merge pull request #533 from Octagon-simon/feat/delete-comment

  Show description for 6298165
  AdeGneus

  authored
  6298165

• Merge pull request #534 from PreciousIfeaka/feat/update-squeeze

  Show description for e8bec72
  AdeGneus

  authored
  e8bec72

• feat: fixing conflits

  bammietop03

  committed
  02bcef4

• Merge pull request #536 from bammietop03/bamiwo-job

  Show description for 47f2b88
  incredible-phoenix246

  authored
  47f2b88

• Create pr-deploy.yml

  Lanky-23

  authored
  7d768ab

• Update dev.yml with docker commands

  Rob-in-son

  authored
  bdb379e

• Update pr-deploy.yml

  Lanky-23

  authored
  49a806e

• Update pr-deploy.yml

  Lanky-23

  authored
  0a52af5

• Merge pull request #539 from hngprojects/Lanky-23-patch-1

  Show description for f425d83
  Rob-in-son

  authored
  f425d83

Commits on Aug 9, 2024

• Merge pull request #542 from hngprojects/Rob-in-son-workflows

  Show description for 6300d39
  Lanky-23

  authored
  6300d39

• Update pr-deploy.yml

  Lanky-23

  authored
  d6af324

• Replace scp action with script dev.yml

  Rob-in-son

  authored
  8102144

• Merge pull request #543 from hngprojects/Lanky-23-patch-1

  Show description for b17549b
  Rob-in-son

  authored
  b17549b

• Update pr-deploy.yml

  Lanky-23

  authored
  2cb5d2b

• Merge pull request #544 from hngprojects/Rob-in-son-workflows

  Show description for 4b161cd
  Lanky-23

  authored
  4b161cd

• Update pr-deploy.yml

  Lanky-23

  authored
  25b5694

• Update var names in dev.yml

  Rob-in-son

  authored
  1dfeebe

• Merge pull request #547 from hngprojects/Rob-in-son-workflow-patch-2

  Show description for ee1056f
  Lanky-23

  authored
  ee1056f

• Update ssh login method dev.yml

  Rob-in-son

  authored
  5b19914

• Merge pull request #548 from hngprojects/Rob-in-son-workflow-patch-3

  Show description for 0d0c17f
  Lanky-23

  authored
  0d0c17f

• Update destination filename dev.yml

  Rob-in-son

  authored
  c3f92a0

• Merge pull request #549 from hngprojects/Rob-in-son-workflow-patch-4

  Show description for 39a5df6
  Lanky-23

  authored
  39a5df6

• switch from /opt to /tmp dev.yml

  Rob-in-son

  authored
  da4e844

• Merge pull request #550 from hngprojects/Rob-in-son-workflow-patch-5

  Show description for 2d40a75
  codak77

  authored
  2d40a75

• pull git repo dev.yml

  Rob-in-son

  authored
  e7c67e4

• Merge pull request #551 from hngprojects/Rob-in-son-workflow-patch-6

  Show description for 60ea787
  codak77

  authored
  60ea787

• correct syntax error dev.yml

  Rob-in-son

  authored
  a82cdc5

• Merge pull request #552 from hngprojects/Rob-in-son-workflow-patch-7

  Show description for 841d16b
  codak77

  authored
  841d16b

• Update dev.yml

  Rob-in-son

  authored
  f85596e

• Merge pull request #553 from hngprojects/Rob-in-son-workflow-patch-7-1

  Show description for 91b2410
  codak77

  authored
  91b2410

• Update docker-compose.yml

  Rob-in-son

  authored
  41f527c

• Merge pull request #554 from hngprojects/Rob-in-son-compose-1

  Show description for 347f32e
  Lanky-23

  authored
  347f32e

• Update dev.yml- compose

  Rob-in-son

  authored
  bc5255f

• Merge pull request #555 from hngprojects/Rob-in-son-patch

  Show description for 826651a
  Lanky-23

  authored
  826651a

• Update pr-deploy.yml

  Lanky-23

  authored
  96fd5b3

• Merge pull request #546 from hngprojects/Lanky-23-patch-2

  Show description for 0bc0680
  Rob-in-son

  authored
  0bc0680

• create images for all services

  Rob-in-son

  authored
  e1ba8dd

• Merge pull request #556 from hngprojects/Rob-in-son-patch1

  Show description for 5315805
  Lanky-23

  authored
  5315805

• Update pr-deploy.yml

  Lanky-23

  authored
  54330b6

• Merge pull request #557 from hngprojects/Lanky-23-patch-2

  Show description for 5dfc639
  Rob-in-son

  authored
  5dfc639

• Update pr-deploy.yml

  Lanky-23

  authored
  ce4744c

• Update dev.yml

  Rob-in-son

  authored
  5eae712

• Merge pull request #558 from hngprojects/Lanky-23-patch-2-1

  Show description for 0757d22
  Rob-in-son

  authored
  0757d22

• Merge pull request #559 from hngprojects/Rob-in-son-patch-0

  Show description for df725ab
  Lanky-23

  authored
  df725ab

• Update dev.yml

  Rob-in-son

  authored
  56d3924

• Merge pull request #560 from hngprojects/Rob-in-son-patch-2

  Show description for 07a130d
  Lanky-23

  authored
  07a130d

• Update dev.yml

  Rob-in-son

  authored
  56c1911

• Merge pull request #561 from hngprojects/Rob-in-son-patch-11

  Show description for 2a176f0
  codak77

  authored
  2a176f0

• Update dev.yml

  Rob-in-son

  authored
  cbc11d4

• Merge pull request #562 from hngprojects/Rob-in-son-patch-3

  Show description for 85a87d8
  codak77

  authored
  85a87d8

• fetch .env from server for compose up

  Rob-in-son

  authored
  c0bd7d1

• Merge pull request #564 from hngprojects/Rob-in-son-dev.yml1

  Show description for 7217de1
  Lanky-23

  authored
  7217de1

• Update staging.yml

  Rob-in-son

  authored
  ddce402

• Update prod.yml

  Rob-in-son

  authored
  2565a32

• Update dev.yml

  Rob-in-son

  authored
  b908517

• Update prod.yml

  Rob-in-son

  authored
  3de0541

• Update staging.yml

  Rob-in-son

  authored
  0c1f3b8

• Update dev.yml

  Rob-in-son

  authored
  e8f5c19

• Merge pull request #565 from hngprojects/Rob-in-son-dev.yml1

  Show description for 187b0f4
  Lanky-23

  authored
  187b0f4

• Update .env path in docker-compose.yml

  Rob-in-son

  authored
  9feb21b

• Update .env path in docker-compose.staging.yml

  Rob-in-son

  authored
  5966e22

• Update .env path in docker-compose.production.yml

  Rob-in-son

  authored
  f96e264

• Update dev.yml

  Rob-in-son

  authored
  82179da

• Update prod.yml

  Rob-in-son

  authored
  3c3abbf

• Update staging.yml

  Show description for df14e73
  Rob-in-son

  authored
  df14e73

• Update CI.yml

  Show description for 41f37ae
  Rob-in-son

  authored
  41f37ae

• Update dev.yml

  Show description for ffce86a
  Rob-in-son

  authored
  ffce86a

• Update prod.yml

  Show description for de40e9a
  Rob-in-son

  authored
  de40e9a

• Update staging.yml

  Show description for 076de18
  Rob-in-son

  authored
  076de18

Commits on Aug 10, 2024

• chore: user table

  incredible-phoenix246

  committed
  b16153a

• chore: user table

  incredible-phoenix246

  committed
  9bc4d4f

• Merge pull request #572 from hngprojects/feat-user-table

  Show description for ab4a4ff
  incredible-phoenix246

  authored
  ab4a4ff

• Merge pull request #568 from hngprojects/fix-workflows

  Show description for b09641c
  Lanky-23

  authored
  b09641c

• Update dev workflow

  Rob-in-son

  committed
  d645927

• Merge pull request #583 from hngprojects/fix-workflows

  Show description for d2f64a8
  Lanky-23

  authored
  d2f64a8

• Copy env file to .env

  Rob-in-son

  committed
  9cd70b3

• Merge pull request #585 from hngprojects/fix-workflows

  Show description for b2d60bf
  Lanky-23

  authored
  b2d60bf

• change scp .env step

  Rob-in-son

  committed
  659af2d

• Merge pull request #586 from hngprojects/fix-workflows

  Show description for 82c5ce0
  Rob-in-son

  authored
  82c5ce0

• change docker save

  Rob-in-son

  committed
  948f27a

• Merge pull request #587 from hngprojects/fix-workflows

  Show description for 570c02b
  Lanky-23

  authored
  570c02b

• Updated deployment dir

  Rob-in-son

  committed
  8c43195

• Merge pull request #588 from hngprojects/fix-workflows

  Show description for 6f72293
  Lanky-23

  authored
  6f72293

• updated dockercompose files and workflows

  Rob-in-son

  committed
  53cca85

• Merge pull request #589 from hngprojects/fix-workflows

  Show description for 975e89a
  Lanky-23

  authored
  975e89a

Commits on Aug 13, 2024

• cd: update dev.yml

  Rob-in-son

  authored
  31a8bd7

• Merge pull request #597 from hngprojects/Rob-in-son-cd-patch

  Show description for 6805142
  Lanky-23

  authored
  6805142

• Update pr-deploy.yml

  Lanky-23

  authored
  c57d9f4

• Update pr-deploy.yml

  Lanky-23

  authored
  289c967

• cd: Update staging.yml

  Rob-in-son

  authored
  50bd2e6

• Merge pull request #599 from hngprojects/update-workflows

  Show description for b7d4468
  Lanky-23

  authored
  b7d4468

Commits on Aug 14, 2024

• Merge pull request #598 from hngprojects/Lanky-23-patch-2

  Show description for e53d24c
  Lanky-23

  authored
  e53d24c

• Merge branch 'dev' into Lanky-23-patch-1

  Lanky-23

  authored
  3017815

• Merge pull request #545 from hngprojects/Lanky-23-patch-1

  Show description for fbb3788
  Rob-in-son

  authored
  fbb3788

Commits on Aug 15, 2024

• cd: updated working-dir

  Rob-in-son

  authored
  c7a593b

• cd: update deploy todev withh no docker

  Rob-in-son

  authored
  ed2212b

• Merge pull request #600 from hngprojects/Rob-in-son-no-docker

  Show description for fc907c6
  Lanky-23

  authored
  fc907c6

• cd: update working dir

  Rob-in-son

  authored
  5df5457

• cd: pull step

  Rob-in-son

  authored
  53ed8d7

• Merge pull request #602 from hngprojects/Rob-in-son-no-docker

  Show description for b913de5
  Lanky-23

  authored
  b913de5

• Update startappdev.sh

  Rob-in-son

  authored
  12a5818

• Update aihomeworkdev.service

  Rob-in-son

  authored
  7e3ff76

• Merge pull request #603 from hngprojects/Rob-in-son-no-docker

  Show description for 7968633
  Lanky-23

  authored
  7968633

• Update dev.yml

  Rob-in-son

  authored
  75e778c

• Merge pull request #604 from hngprojects/Rob-in-son-no-docker

  Show description for 16761cf
  Lanky-23

  authored
  16761cf

• feat: Implement API Endpoints for Managing User Plans

  deolla

  committed
  39dee99

• Merge pull request #605 from deolla/feat/get-products

  Show description for b4f8fbc
  incredible-phoenix246

  authored
  b4f8fbc

• cd: update runner and clone

  Rob-in-son

  authored
  7c72519

• Merge pull request #606 from hngprojects/Rob-in-son-patch0

  Show description for f58c15a
  Lanky-23

  authored
  f58c15a

• cd: update working dir

  Rob-in-son

  authored
  c67b083

• Merge pull request #607 from hngprojects/Rob-in-son-patch0

  Show description for ac24036
  Lanky-23

  authored
  ac24036

• Update dev.yml

  Rob-in-son

  authored
  0299d6f

• Merge pull request #608 from hngprojects/Rob-in-son-patch0

  Show description for c871991
  Lanky-23

  authored
  c871991

• Update dev.yml

  Rob-in-son

  authored
  de7b045

• Merge pull request #609 from hngprojects/Rob-in-son-patch0

  Show description for 64f7bc2
  Lanky-23

  authored
  64f7bc2

• fix: update documentation

  deolla

  committed
  7251904

Commits on Aug 16, 2024

• Merge pull request #610 from deolla/feat/get-products

  Show description for 3e46fb3
  incredible-phoenix246

  authored
  3e46fb3

Commits on Aug 21, 2024

• feat: add json link to docs

  masterchief-Dave

  committed
  190f570

• Update dev.yml

  Lanky-23

  authored
  b08aa55

• Update prod.yml

  Lanky-23

  authored
  264bc92

• Update prod.yml

  Lanky-23

  authored
  ea251ab

• Update staging.yml

  Lanky-23

  authored
  fd5f164

• Update aihomeworkprod.service

  Lanky-23

  authored
  03d90e6

• Update aihomeworkstaging.service

  Lanky-23

  authored
  b2c706e

• Update startappprod.sh

  Lanky-23

  authored
  376a4d6

• Update startappstaging.sh

  Lanky-23

  authored
  d8f1a26

• Update startappstaging.sh

  Lanky-23

  authored
  25b2efc

• Merge pull request #614 from hngprojects/Lanky-23-patch-2

  Show description for 8bfac95
  Rob-in-son

  authored
  8bfac95

Commits on Aug 23, 2024

• Update dev.yml

  Lanky-23

  authored
  dc41264

• Merge pull request #618 from hngprojects/dev-1

  Show description for bd01931
  Data-Bishop

  authored
  bd01931

• Update dev.yml

  Lanky-23

  authored
  31d4161

• Merge pull request #619 from hngprojects/dev-1

  Show description for e1c52ae
  Data-Bishop

  authored
  e1c52ae

• Update startappdev.sh

  Lanky-23

  authored
  aa306e5

• Merge pull request #620 from hngprojects/Lanky-23-patch-1

  Show description for aa3fb91
  Data-Bishop

  authored
  aa3fb91

Commits on Aug 24, 2024

• Merge pull request #613 from masterchief-Dave/feat/api-docs

  Show description for 290c1b2
  AdeGneus

  authored
  290c1b2

• feat: api status updates

  AdeGneus

  committed
  28f0f86

• Merge pull request #621 from hngprojects/feat/api-status

  Show description for 392fe97
  PreciousIfeaka

  authored
  392fe97

• feat: get api status

  masterchief-Dave

  committed
  8fa41b9

• Merge pull request #622 from masterchief-Dave/feat/api-get-status

  Show description for bf0f8db
  AdeGneus

  authored
  bf0f8db