Nginx側にもCORS部分が必要, (#39)

* Nginx側にもCORS部分が必要,
個人的利用のため*

* cors調整、nginxとechoでいい感じにする必要があった

* latestにする

docker/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       depends_on: 
         - app
   app:
-    image: danish9966/todo-app
+    image: danish9966/todo-app:latest
     environment: 
       - POSTGRES_HOST=db
       # - ELASTIC_APM_SERVER_URL=http://x.x.x.x:8200
@@ -27,4 +27,4 @@ services:
     ports:
         - 5432:5432
     volumes: 
-        - ./sql:/docker-entrypoint-initdb.d
+        - ./sql:/docker-entrypoint-initdb.d

docker/nginx/defalut.conf

@@ -14,7 +14,6 @@ server {
     location /api/ {
         proxy_pass http://app:1323/;
 
-        add_header Access-Control-Allow-Origin *;
         add_header Access-Control-Allow-Methods "POST, GET, OPTIONS";
         add_header Access-Control-Allow-Headers "Origin, Authorization, Accept";
         add_header Access-Control-Allow-Credentials true;

docker/sql/1_data.sql

@@ -1,3 +1,3 @@
 \c sample
-INSERT INTO task(user_id, type_id, title, detail, deadline) VALUES (1,1,'JUnitを学習','テストの仕方を学習する','2020-07-07 15:00:00',true);
-INSERT INTO task(user_id, type_id, title, detail, deadline) VALUES (1,3,'サービスの自作','マイクロサービス を作ってみる','2020-09-13 17:00:0', false);
+INSERT INTO task(user_id, type_id, title, detail, deadline, done) VALUES (1,1,'JUnitを学習','テストの仕方を学習する','2020-07-07 15:00:00',true);
+INSERT INTO task(user_id, type_id, title, detail, deadline, done) VALUES (1,3,'サービスの自作','マイクロサービス を作ってみる','2020-09-13 17:00:0', false);

model/task.go

@@ -13,7 +13,7 @@ type Task struct {
 
 	Detail string `json:"detail,omitempty"`
 
-	Deadline time.Time `json:"deadline"`
+	Deadline time.Time `json:"deadline,omitempty"`
 
 	Done bool `json:"done"`
 }

router/route.go

@@ -15,9 +15,9 @@ func getRouter() *echo.Echo {
 	e := echo.New()
 
 	//middleware
-	e.Use(middleware.CORS())
 	e.Use(middleware.Logger())
 	e.Use(middleware.Recover())
+	e.Use(middleware.CORS())
 	e.Use(apmecho.Middleware())
 
 	handler := api.Handler{DB: db.Init()}