From bd2369ff9117a278a8bae9cc3894efe9cb8dad1a Mon Sep 17 00:00:00 2001
From: Wayne <wwayne.hsu@gmail.com>
Date: Fri, 3 May 2024 08:59:08 +0800
Subject: [PATCH] bug fix

---
 .gitignore                                    |  2 +-
 ...mpose-dev.yaml => docker-compose-prod.yaml | 52 +++++++++----------
 web/app.vue                                   |  7 ++-
 web/layouts/default.vue                       |  3 +-
 web/locales/cn.js                             |  5 +-
 web/locales/en.js                             |  3 ++
 web/locales/tw.js                             |  3 ++
 7 files changed, 41 insertions(+), 34 deletions(-)
 rename docker-compose-dev.yaml => docker-compose-prod.yaml (62%)

diff --git a/.gitignore b/.gitignore
index 37b7df4..605dca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 data/
 app/public/storage/*
 nuxt/
-web.bak/
+prod/
diff --git a/docker-compose-dev.yaml b/docker-compose-prod.yaml
similarity index 62%
rename from docker-compose-dev.yaml
rename to docker-compose-prod.yaml
index 6cdd103..a5e01f6 100644
--- a/docker-compose-dev.yaml
+++ b/docker-compose-prod.yaml
@@ -6,6 +6,10 @@ services:
     container_name: "prodio-nginx"
     ports:
       - "6060:80"
+    depends_on:
+      - web
+      - api
+    restart: always      
     volumes:
       - ./nginx/html:/usr/share/nginx/html
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf
@@ -13,25 +17,28 @@ services:
       - ./data/nginx/logs:/var/log/nginx
     networks:
       - internal
-  # web:
-  #   build:
-  #     context: .
-  #     dockerfile: ./nuxt/Dockerfile
-  #   container_name: "prodio-web"
-  #   ports:
-  #     - "6061:3000"
-  #   volumes:
-  #     - ./nuxt/app:/app
-  #   networks:
-  #     - internal
-  api:
-    # image: krisss/docker-webman:8.2-cli-alpine
+  web:
     build:
       context: .
-      dockerfile: ./webman/Dockerfile
+      dockerfile: ./web/Dockerfile
+    container_name: "prodio-web"
+    ports:
+      - "6061:3000"
+    depends_on:
+      - api
+    restart: always      
+    volumes:
+      - ./web/app:/app
+    networks:
+      - internal
+  api:
+    image: krisss/docker-webman:8.2-cli-alpine
     container_name: "prodio-api"
     ports:
       - "6065:8787"
+    depends_on:
+      - mysql
+    restart: always      
     volumes:
       - ./app:/app
     networks:
@@ -41,25 +48,14 @@ services:
       context: .
       dockerfile: ./mysql/Dockerfile
     container_name: "prodio-mysql"
-    networks:
-      - internal
+    restart: always      
     volumes:
       - ./data/mysql/data:/var/lib/mysql
       - ./data/mysql/init:/docker-entrypoint-initdb.d
     environment:
       MYSQL_ROOT_PASSWORD: 1qazvfr4  
-  # redis:
-  #   image: redis
-  #   container_name: "prodio-redis"
-  #   networks:
-  #     - internal
-  mail:
-    image: boky/postfix
-    container_name: "prodio-mail"
-    environment:
-      - ALLOWED_SENDER_DOMAINS=prodio.com.tw
-      - POSTFIX_always_add_missing_headers=yes
-      - HOSTNAME=mail.prodio.com.tw # set to the hostname of the server
+    networks:
+      - internal
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
     container_name: "prodio-myadmin"
diff --git a/web/app.vue b/web/app.vue
index 33f516f..a4b371a 100644
--- a/web/app.vue
+++ b/web/app.vue
@@ -1,12 +1,15 @@
 <script setup>
 import Cookies from 'js-cookie';
 
+const { t } = useI18n();
+
 useHead({
-  title: '普達國際',
+  title: t('title'),
   viewport: 'width=device-width, initial-scale=1, maximum-scale=1',
   charset: 'utf-8',
   meta: [
-    { name: 'description', content: '普達國際,化工材料買賣' }
+    { name: 'description', content: t('description') },
+    { name: 'keywords', content: t('keywords') }
   ],
   bodyAttrs: {
     
diff --git a/web/layouts/default.vue b/web/layouts/default.vue
index 24fca46..ae56e70 100644
--- a/web/layouts/default.vue
+++ b/web/layouts/default.vue
@@ -154,8 +154,7 @@ watch(locale, (nVal,oVal) => {
             <div class="col-12 col-lg">
               <div class="fTitle">Company</div>
               <div class="info_link">
-                <a target="_blank" :href="'https://www.google.com.tw/maps/place/' + config[locale].address"
-                  v-if="config[locale].address">
+                <a href="javascript:void(0);">
                   <i class="fa-solid fa-map-location-dot"></i>
                   <div class="text">{{ config[locale].address }}</div>
                 </a>
diff --git a/web/locales/cn.js b/web/locales/cn.js
index 4b7862a..629fae0 100644
--- a/web/locales/cn.js
+++ b/web/locales/cn.js
@@ -1,8 +1,11 @@
 export default {
+    title: '普达国际',
+    description: '普达国际企业有限公司为多家知名化工及电子材料厂商代理暨分销商。主要服务行业包括:涂料、胶粘剂、高分子聚合、电子陶瓷、电子材料、电子化学品、复合材料、表面处理及新能源材料等。',
+    keywords: '乳化剂,分散剂,抗冻剂,环氧树脂,固化剂,铜箔基板,阻燃剂,PVA 表面活性剂',
     aboutus: '关于我们',
     products: '产品应用资讯',
     news: '最新消息',
-    contact: '联络我们',
+    contact: '联络我们', 
     branch: '公司据点',
     productandservice: '产品与服务',
     development: '企业永续发展',
diff --git a/web/locales/en.js b/web/locales/en.js
index 36df1c5..4d12153 100644
--- a/web/locales/en.js
+++ b/web/locales/en.js
@@ -1,4 +1,7 @@
 export default {
+    title: 'Prodio International',
+    description: 'Prodio operate as a distributor for many well-established chemical and electronic materials. Our primary services include coatings, adhesives, polymers, polymerization, electronic plating, electronic materials, electronic chemicals, composite materials, surface treatment, and renewable materials, etc.',
+    keywords: 'Emulsifier, Dispersing Agents, Antifreeze, Epoxy, Curing Agent, CCL, Flame Retardant, PVA, Surfactants',
     aboutus: 'ABOUT US',
     products: 'PRODUCTS',
     news: 'NEWS',
diff --git a/web/locales/tw.js b/web/locales/tw.js
index 458f8e2..ad663f2 100644
--- a/web/locales/tw.js
+++ b/web/locales/tw.js
@@ -1,4 +1,7 @@
 export default {
+    title: '普達國際',
+    description: '普達國際企業有限公司為多家知名化工及電子材料廠商代理暨分銷商。主要服務行業包括:塗料、膠粘劑、高分子聚合、電子陶瓷、電子材料、電子化學品、複合材料、表面處理及新能源材料等。',
+    keywords: '乳化劑,分散劑,抗凍劑,環氧樹脂,固化劑,銅箔基板,阻燃劑,PVA 表面活性劑',
     aboutus: '關於我們',
     products: '產品應用資訊',
     news: '最新消息',