Merge branch 'dev' into fix/invite-transaction

.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
@@ -387,8 +392,8 @@ Temporary Items
 .apdisk
 
 # Local
-dist
-/.env
+dist/
+.env
 /.env.*
 *._local.ts
 
@@ -400,6 +405,7 @@ dist
 *.dev
 *.prod
 
+
 # User specific ignores 
 todo.txt
 /.vscode/
@@ -432,4 +438,5 @@ package-lock.json
 package-lock.json
 docker-compose.yml
 data/
-.dev.env
+.dev.env
+

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.