Merge branch 'master' of https://github.com/SCK-SEAL-TEAM-One/shoppin…

…g-cart

Dockerfile.nginx

@@ -0,0 +1,3 @@
+FROM nginx:1.16-alpine
+
+COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf

atdd/ui/shopping_cart_success.robot

@@ -37,6 +37,8 @@ ${notify}    วันเวลาที่ชำระเงิน  1/3/2563 13
     ตรวจสอบสรุปรายการสั่งซื้อ
     ตรวจสอบตะกร้าสินค้า
     ยืนยันคำสั่งซื้อ
+    ชำระค่าสินค้า
+    ได้รับการแจ้งเตือน
 
 *** Keywords ***
 ตรวจสอบข้อมูลสินค้า 

deploy/store-service-deployment.yml

@@ -0,0 +1,13 @@
+apiVersion: extentions/v1beta1
+kind: Deployment
+metadata: 
+  name: store-service
+spec: 
+  replicas: 1
+  template:
+    metadata: 
+      labels: 
+        app: store-service
+    spec:
+      restartPolicy: Always
+

deploy/store-service-service.yml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: store-service
+spec: 
+  selector:
+    app: store-service
+  port: 
+    - protocal: TCP
+      port: 8000
+      targetPort: 8000

deploy/store-web-deployment.yml

@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: store-web
+  labels:
+    app: store-web
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: store-web
+  template:
+    metadata:
+      labels:
+        app: store-web
+    spec:
+      containers:
+      - name: store-web
+        image: sckseal/shoppingcart-web:latest
+        ports:
+        - containerPort: 3000

docker-compose.yml

@@ -3,6 +3,7 @@ version: "3.5"
 services:
   store-service:
     image: toy-store-service:0.0.1
+    container_name: store-service
     build:
       context: store-service
     ports:
@@ -13,6 +14,7 @@ services:
 
   store-database:
     image: mysql:5.7
+    container_name: store-database
     environment:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_USER=sealteam
@@ -21,4 +23,25 @@ services:
     volumes:
       - ./tearup/:/docker-entrypoint-initdb.d/
     ports:
-      - "3306:3306"
+      - "3306:3306"
+
+  store-ui:
+    image:  toy-store-ui:0.0.1
+    container_name: store-ui
+    build:
+      context: store-web
+    ports:
+      - "3000:3000"
+
+  store-nginx:
+    image: toy-store-nginx:0.0.1
+    container_name: store-nginx
+    restart: always
+    build:
+      context: .
+      dockerfile: Dockerfile.nginx
+    depends_on:
+      - store-service
+      - store-ui
+    ports:
+      - "80:80"

nginx/nginx.conf

@@ -0,0 +1,56 @@
+#https://steveholgado.com/nginx-for-nextjs/#nginx
+proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=STATIC:10m inactive=7d use_temp_path=off;
+
+upstream store-service {
+  server store-service:8000;
+}
+
+upstream store-ui {
+  server store-ui:3000;
+}
+
+server {
+  listen 80 default_server;
+
+  server_name _;
+
+  server_tokens off;
+
+  gzip on;
+  gzip_proxied any;
+  gzip_comp_level 4;
+  gzip_types text/css application/javascript image/svg+xml;
+
+  proxy_http_version 1.1;
+  proxy_set_header Upgrade $http_upgrade;
+  proxy_set_header Connection 'upgrade';
+  proxy_set_header Host $host;
+  proxy_cache_bypass $http_upgrade;
+
+  location /_next/static {
+    proxy_cache STATIC;
+    proxy_pass http://store-ui;
+
+    # For testing cache - remove before deploying to production
+    add_header X-Cache-Status $upstream_cache_status;
+  }
+
+  location /static {
+    proxy_cache STATIC;
+    proxy_ignore_headers Cache-Control;
+    proxy_cache_valid 60m;
+    proxy_pass http://store-ui;
+
+    # For testing cache - remove before deploying to production
+    add_header X-Cache-Status $upstream_cache_status;
+  }
+
+    location /api {
+      proxy_pass http://store-service;
+    }
+
+
+  location / {
+     proxy_pass http://store-ui;
+  }
+}

store-service/cmd/main.go

@@ -9,7 +9,7 @@ import (
 )
 
 func main() {
-	connection, err := sqlx.Connect("mysql", "sealteam:sckshuhari@(store-tearup:3306)/toy")
+	connection, err := sqlx.Connect("mysql", "sealteam:sckshuhari@(store-database:3306)/toy")
 	if err != nil {
 		log.Fatalln("cannot connect to tearup", err)
 	}

store-web/package.json

@@ -13,10 +13,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "isomorphic-unfetch": "^3.0.0",
     "jest-cli": "^25.1.0",
     "next": "^9.2.2",
     "react": "^16.13.0",
-    "react-dom": "^16.13.0"
+    "react-dom": "^16.13.0",
+    "swr": "^0.1.18"
   },
   "devDependencies": {
     "eslint": "^6.8.0",

store-web/pages/healthcheck.js

@@ -0,0 +1,19 @@
+
+import fetch from 'isomorphic-unfetch'
+import useSWR from 'swr'
+
+const API_URL = '/api/v1/health'
+async function fetcher() {
+    const res = await fetch(API_URL)
+    const json = await res.json()
+    return json
+}
+
+function HealthCheck(){
+    const { data, error } = useSWR('/repos/zeit/next.js', fetcher)
+    if (error) return <div>failed to load</div>
+    if (!data) return <div>loading...</div>
+    return <div>Next stars: {data.message.Name}</div>
+}
+
+export default HealthCheck