Merge branch 'master' of http://khuhub.khu.ac.kr/2020-1-capstone-design1/Triz_Project1

+*.xlsx
+.env
\ No newline at end of file

+.env
+
+node_modules
\ No newline at end of file

 # node_modules
 # node_modules
 node_modules
 node_modules
 
 
-# lock files
-yarn.lock
-package-lock.json
-
 .env
 .env
 
 
 note.txt
 note.txt
\ No newline at end of file

+FROM node:12.16.2
+RUN npm i -g @prisma/cli
+
+RUN mkdir /app
+WORKDIR /app
+
+COPY package*.json ./ 
+COPY prisma ./prisma/
+
+RUN npm install && npx prisma generate
+
+CMD ["npm","run","dev"]

 {
 {
-  "name": "capstone2",
+  "name": "capstone-back",
   "version": "1.0.0",
   "version": "1.0.0",
   "description": "1st semester capstone design project",
   "description": "1st semester capstone design project",
   "scripts": {
   "scripts": {

+FROM node:12.16.2
+RUN npm i -g @prisma/cli
+
+RUN mkdir /app
+WORKDIR /app
+
+COPY ./ ./prisma/
+
+CMD ["prisma", "admin"]
\ No newline at end of file

+type Query {
+  TestQL(text: String!): String!
+}

+export default {
+  Query: {
+    TestQL: async (_, args) => {
+      const { text } = args;
+      return text;
+    },
+  },
+};

+version: "3.7"
+services:
+  mysql:
+    container_name: mysql
+    ports:
+      - 3306:3306
+    image: mysql:8.0.19
+    restart: always
+    environment:
+      MYSQL_DATABASE: $${MYSQL_DATABASE}
+      MYSQL_ROOT_PASSWORD: $${MYSQL_ROOT_PASSWORD}
+    volumes:
+      - /var/lib/mysql
+  prisma:
+    links:
+      - mysql
+    depends_on:
+      - mysql
+    container_name: prisma
+    ports:
+      - "5555:5555"
+    build:
+      context: back/prisma
+      dockerfile: Dockerfile
+    environment:
+      MYSQL_URL: $${MYSQL_URL}
+    volumes:
+      - /app/prisma
+  backend:
+    links:
+      - mysql
+    depends_on:
+      - mysql
+      - prisma
+    container_name: backend
+    ports:
+      - "4000:4000"
+    build:
+      context: back
+      dockerfile: Dockerfile
+    environment:
+      MYSQL_URL: $${MYSQL_URL}
+      FRONTEND_URL: $${FRONTEND_URL}
+    volumes:
+      - ./back:/app
+      - ./back/node_modules:/app/node_modules
+      - ./back/prisma:/app/prisma
+  frontend:
+    container_name: frontend
+    ports:
+      - "3000:3000"
+    build:
+      context: front
+      dockerfile: Dockerfile
+    environment:
+      BACKEND_URL: $${BACKEND_URL}
+    volumes:
+      - ./front:/app
+      - ./front/node_modules:/app/node_modules

+node_modules
\ No newline at end of file

@@ -21,6 +21,3 @@
 npm-debug.log*
 npm-debug.log*
 yarn-debug.log*
 yarn-debug.log*
 yarn-error.log*
 yarn-error.log*
-
-# yarn.lock
-yarn.lock
\ No newline at end of file

+FROM node:12.16.2
+
+RUN mkdir /app
+WORKDIR /app
+RUN npx create-react-app .
+
+COPY package*.json ./
+RUN npm install
+
+CMD ["npm", "start"]
\ No newline at end of file

 {
 {
-  "name": "front",
+  "name": "capstone-front",
   "version": "0.1.0",
   "version": "0.1.0",
   "private": true,
   "private": true,
   "dependencies": {
   "dependencies": {
@@ -7,6 +7,7 @@
     "@testing-library/react": "^9.3.2",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",
     "@testing-library/user-event": "^7.1.2",
     "apollo-boost": "^0.4.7",
     "apollo-boost": "^0.4.7",
+    "core-js": "^3.6.5",
     "graphql": "^15.0.0",
     "graphql": "^15.0.0",
     "react": "^16.13.1",
     "react": "^16.13.1",
     "react-apollo-hooks": "^0.5.0",
     "react-apollo-hooks": "^0.5.0",
@@ -17,7 +18,7 @@
     "react-scripts": "3.4.1",
     "react-scripts": "3.4.1",
     "react-toastify": "^5.5.0",
     "react-toastify": "^5.5.0",
     "styled-components": "^5.1.0",
     "styled-components": "^5.1.0",
-    "styled-reset": "^4.1.2"
+    "styled-reset": "^4.1.3"
   },
   },
   "scripts": {
   "scripts": {
     "start": "react-scripts start",
     "start": "react-scripts start",

+{
+  "name": "capstone",
+  "version": "1.0.0",
+  "description": "",
+  "scripts": {
+    "start": "docker-compose up",
+    "build": "docker-compose build",
+    "stop": "docker-compose down",
+    "clean": "docker system prune -af",
+    "clean:volumes": "docker volume prune -f",
+    "seed": "docker exec -it prisma npm run seed"
+  },
+  "author": {
+    "name": "sdy, kms",
+    "email": "vel1024@khu.ac.kr"
+  },
+  "license": "ISC"
+}