Merge branch 'kimpen' into jiwon

c7bb7d9a · Jiwon Yoon · c3feb732 · 4a618c01 · c7bb7d9a · c7bb7d9a
Commit c7bb7d9a authored Jul 14, 2021 by Jiwon Yoon
--- a/.env.development
+++ b/.env.development
@@ -2,3 +2,4 @@ PG_DATABASE=butterDB
 PG_USER=butter
 PG_PASSWORD=butter
 TMDB_APP_KEY=1477348488076cafd4dcf973a314957d
+REACT_APP_KAKAO_KEY=a04f2d1d1722f5fbadd556e742465d9f
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -24,7 +24,7 @@
      work correctly both with client-side routing and a non-root public URL.
      Learn how to configure a non-root public URL by running `npm run build`.
    -->
-    <script type="text/javascript" src="//dapi.kakao.com/v2/maps/sdk.js?appkey=a04f2d1d1722f5fbadd556e742465d9f&libraries=services"></script>
+    <script type="text/javascript" src="//dapi.kakao.com/v2/maps/sdk.js?appkey=process.env.REACT_APP_KAKAO_KEY&libraries=services"></script>
    <title>Butter Studio</title>
  </head>
  <body>

--- a/server/db/index.js
+++ b/server/db/index.js
 import { Sequelize } from "sequelize";
+// import UserModel from "../models/user.model.js";
+import MovieModel from "../models/movie.model.js";
 import dbConfig from "../config/db.config.js";

 const sequelize = new Sequelize(
@@ -17,6 +19,11 @@ const sequelize = new Sequelize(
    }
 );

+// const User = UserModel(sequelize)
+const Movie = MovieModel(sequelize)
+
 export {
    sequelize,
+    // User,
+    Movie
 }
\ No newline at end of file
--- a/server/models/movie.model.js
+++ b/server/models/movie.model.js
+import Sequelize from "sequelize";
+
+const { DataTypes } = Sequelize;
+
+const MovieModel = (sequelize) => {
+    const Movie = sequelize.define(
+        "movie",
+        {
+            id: {
+                type: DataTypes.INTEGER,
+                primaryKey: true,
+                autoIncrement: true,
+            },
+            movieId: {
+                type: DataTypes.INTEGER
+            }
+        },
+        {
+            timestamps: true,
+            freezeTableName: true,
+            tableName: "movies"
+        }
+    );
+    return Movie;
+};
+
+export default MovieModel;
\ No newline at end of file