Fix wrong env naming

Add log for cases when s3 cred dont entered fully Fix displaying img problem
openworld-community · Nov 13, 2024 · 9ea053c · 9ea053c
1 parent c764a52
commit 9ea053c
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 4 deletions.
diff --git a/backend/src/config/storage.ts b/backend/src/config/storage.ts
@@ -8,6 +8,11 @@ export const isStorageSetupFull =
 	vars.s3.secrets.secretAccessKey !== '' &&
 	vars.s3.secrets.accessKeyId !== '';
 
+if (!isStorageSetupFull) {
+	// eslint-disable-next-line no-console
+	console.log('S3 credentials not entered correctly');
+}
+
 export const s3Client = new S3Client({
 	region: vars.s3.region,
 	endpoint: vars.s3.endpoint,

diff --git a/docker-compose.demo.new.yml b/docker-compose.demo.new.yml
@@ -80,7 +80,7 @@ services:
             - GA_API_SECRET
             - GA_MEASUREMENT_ID
             - S3_ACCESS_KEY_ID
-            - S3_ACCESS_SECRET_KEY
+            - S3_SECRET_ACCESS_KEY
             - S3_REGION
             - S3_BUCKET
             - S3_ENDPOINT

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -47,6 +47,11 @@ services:
             - FRONTEND_URL=http://127.0.0.1
             - MONGO_URI=mongodb://mongo:27017/dev
             - NUXT_PUBLIC_GOOGLE_SIGN_IN_CLIENT_ID
+            - S3_ACCESS_KEY_ID
+            - S3_SECRET_ACCESS_KEY
+            - S3_REGION
+            - S3_BUCKET
+            - S3_ENDPOINT
         ports:
             - '7080:7080'
         volumes:

diff --git a/docker-compose.prod.new.yml b/docker-compose.prod.new.yml
@@ -80,7 +80,7 @@ services:
             - GA_API_SECRET
             - GA_MEASUREMENT_ID
             - S3_ACCESS_KEY_ID
-            - S3_ACCESS_SECRET_KEY
+            - S3_SECRET_ACCESS_KEY
             - S3_REGION
             - S3_BUCKET
             - S3_ENDPOINT

diff --git a/docker-compose.test.new.yml b/docker-compose.test.new.yml
@@ -80,7 +80,7 @@ services:
             - GA_API_SECRET
             - GA_MEASUREMENT_ID
             - S3_ACCESS_KEY_ID
-            - S3_ACCESS_SECRET_KEY
+            - S3_SECRET_ACCESS_KEY
             - S3_REGION
             - S3_BUCKET
             - S3_ENDPOINT

diff --git a/docker-compose.win.yml b/docker-compose.win.yml
@@ -53,6 +53,11 @@ services:
         environment:
             - FRONTEND_URL=http://127.0.0.1
             - MONGO_URI=mongodb://mongo:27017/dev
+            - S3_ACCESS_KEY_ID
+            - S3_SECRET_ACCESS_KEY
+            - S3_REGION
+            - S3_BUCKET
+            - S3_ENDPOINT
         ports:
             - '7080:7080'
         develop:

diff --git a/frontend/components/common/ImageLoader.vue b/frontend/components/common/ImageLoader.vue
@@ -14,7 +14,11 @@ const emit = defineEmits(['update:model-value']);
 const input = ref<HTMLInputElement>();
 const errorLoad = ref('');
 const imageSrc = computed(() =>
-	props.externalImage ? `${config.public.baseUrl}${props.externalImage}` : ''
+	props.externalImage
+		? props.externalImage.includes('http')
+			? props.externalImage
+			: `${config.public.baseUrl}${props.externalImage}`
+		: ''
 );
 
 const loadImage = async (event: Event) => {