Merge branch 'dev' into feature/billing-plan-pagination

.env.example

@@ -1,41 +1,33 @@
-NODE_ENV=development
 PROFILE=local
-PORT=5000
-HOST=
-REDIS_PORT= 6379
-DB_SSL=true
+NODE_ENV=development
+
+PORT=3008
 
 JWT_SECRET=someSecrets
 JWT_EXPIRY_TIMEFRAME=3600
+
+
 REDIS_HOST=localhost
 REDIS_PORT=6379
-DB_TYPE=
+
+DB_TYPE=postgres
 DB_USERNAME=
 DB_PASSWORD=
-DB_HOST=
-DB_NAME=hng
+DB_HOST=localhost
+DB_DATABASE=
 DB_ENTITIES=dist/src/modules/**/entities/**/*.entity{.ts,.js}
 DB_MIGRATIONS=dist/db/migrations/*{.ts,.js}
-POSGRES_USER=$DB_USERNAME
-POST
-JWT_SECRET=gsgs
-JWT_EXPIRY_TIMEFRAME=1500000
-DB_SSL=false
-JWT_REFRESH_SECRET=bbp
-JWT_REFRESH_EXPIRY_TIMEFRAME=15
-GOOGLE_REDIRECT_URI=
+
+JWT_SECRET=someSecrets
+JWT_EXPIRY_TIMEFRAME=3600
+
+ADMIN_SECRET_KEY=sometext
+
 GOOGLE_CLIENT_SECRET=
 GOOGLE_CLIENT_ID=
-OAUTH_LOGIN_REDIRECT=
-SMTP_HOST=
+
+SMTP_HOST=sandbox.smtp.mailtrap.io
 SMTP_PORT=587
-SERVER_NAME=Boilerplate
+SERVER_NAME=api
 SMTP_USER=
-SMTP_PASSWORD=
-FRONTEND_URL=
-ADMIN_SECRET=
-SUPPORT_EMAIL=
-AUTH_PASSWORD=
-BASE_URL=
-FLUTTERWAVE_SECRET_KEY=
-FLUTTERWAVE_BASE_URL=
+SMTP_PASSWORD=

.env.local

@@ -31,7 +31,7 @@ NODE_ENV=development
 PORT=3000
 
 DB_USERNAME=username
-DB_PASSWORD=password
+DB_PASSWORD=password123
 DB_TYPE=postgres
 DB_NAME=database
 DB_HOST=localhost

.gitignore

@@ -55,6 +55,11 @@ fabric.properties
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
+
+# DB
+data/db/
+
+docker-compose.yml
 # User-specific files
 *.suo
 *.user
@@ -386,10 +391,9 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-=======
 # Local
-dist
-/.env
+dist/
+.env
 /.env.*
 *._local.ts
 
@@ -404,8 +408,32 @@ dist
 
 # User specific ignores 
 todo.txt
+/.vscode/
 .vscode/
 
+# Docker compose
+docker-compose.yml
+data/
+data/
+docker-compose.yml
+package-lock.json
+.dev.env
+
+
+package-lock.json
+docker-compose.yml
+data/
+.dev.env
+
+/compose/compose.yaml
+compose/compose.yaml
+
+data/
+docker-compose.yml
+package-lock.json/
+package-lock.json
+.dev.env
+
 
 package-lock.json
 docker-compose.yml

.vscode/settings.json

@@ -33,6 +33,6 @@
     "source.fixAll": "explicit"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    "editor.defaultFormatter": "vscode.typescript-language-features"
   }
 }

config/s3.config.ts

@@ -0,0 +1,8 @@
+import { registerAs } from '@nestjs/config';
+
+export default registerAs('s3', () => ({
+  accessKey: process.env.AWS_ACCESS_KEY || '',
+  secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY || '',
+  region: process.env.AWS_REGION || 'us-east-2',
+  bucketName: process.env.AWS_S3_BUCKET_NAME || '',
+}));

local repo

@@ -0,0 +1,6 @@
+gerge branch 'dev' into feat/s3-resume-upload
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.