Producters · froy001 · Sep 12, 2017 · Sep 12, 2017 · Sep 12, 2017 · Sep 12, 2017
diff --git a/.env b/.env
@@ -1,4 +1,6 @@
 NODE_ENV=development
 NODE_ENV_PROD=production
-POSTGRES_USER=appuser
-POSTGRES_DB=appdb
+MYSQL_ROOT_PASSWORD=root
+MYSQL_USER=appuser
+MYSQL_PASSWORD=appuser
+MYSQL_DATABASE=appdb
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/backend/.babelrc b/backend/.babelrc
diff --git a/backend/.dockerignore b/backend/.dockerignore
diff --git a/backend/.sequelizerc b/backend/.sequelizerc
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,5 +1,5 @@
 # production dockerfile
-FROM node:5.10
+FROM mhart/alpine-node:latest
 
 # add code
 COPY . /backend
@@ -14,4 +14,4 @@ RUN npm i -q && \
 
 #migrate & run
 CMD ./node_modules/.bin/sequelize db:migrate && \
-    npm run serve
+    npm run serve
diff --git a/backend/config/default.json b/backend/config/default.json
@@ -8,10 +8,10 @@
     "database": {
         "username": "appuser",
         "database": "appdb",
-        "password": null,
+        "password": "appuser",
         "host": "db",
-        "port": 5432,
-        "dialect": "postgres"
+        "port": 3306,
+        "dialect": "mysql"
     },
 
     "loggers": {
@@ -34,4 +34,4 @@
             }
         ]
     }
-}
+}
diff --git a/backend/config/development.json b/backend/config/development.json
diff --git a/backend/config/production.json b/backend/config/production.json
diff --git a/backend/config/test.json b/backend/config/test.json
@@ -7,6 +7,6 @@
         "password": null,
         "host": "dbtest",
         "port": 5432,
-        "dialect": "postgres"
+        "dialect": "mysql"
     }
-}
+}
diff --git a/backend/lib/api/index.js b/backend/lib/api/index.js
@@ -1,6 +1,8 @@
 import express from 'express';
 import notes from './notes';
+import users from './users';
 
 const router = express.Router();
 router.use(notes);
-export default router;
+router.use(users);
+export default router;
diff --git a/backend/lib/api/notes.js b/backend/lib/api/notes.js
@@ -50,4 +50,4 @@ router.post('/notes/', function(req, res) {
     });
 })
 
-export default router;
+export default router;
diff --git a/backend/lib/api/users.js b/backend/lib/api/users.js
@@ -0,0 +1,33 @@
+'use strict';
+
+import express from 'express';
+import models from '../models';
+import logger from '../logger';
+
+const router = express.Router();
+
+// list
+router.get('/users/', function(req, res){
+  models.users.findAll()
+    .then(function(users){
+      res.json(users.map(user => user.toJSON()));
+    }).catch(function(e){
+      logger.error('error fetching users', e);
+      res.status(500).json({});
+    });
+});
+// create
+router.post('/users/', function(req, res){
+  logger.info('creating user', JSON.stringify(req.body));
+
+  models.users.create(req.body)
+    .then(function(user){
+      res.status(201).json(user.toJSON());
+    }).catch(function(e){
+      logger.error('error creating user', e);
+      res.status(500).json();
+    });
+});
+// delete
+
+export default router;
diff --git a/backend/lib/app.js b/backend/lib/app.js
diff --git a/backend/lib/conf.js b/backend/lib/conf.js
diff --git a/backend/lib/index.js b/backend/lib/index.js
diff --git a/backend/lib/logger.js b/backend/lib/logger.js
diff --git a/backend/lib/migrations/20160425105021-create-note.js b/backend/lib/migrations/20160425105021-create-note.js
diff --git a/backend/lib/migrations/20170912140434-create-user.js b/backend/lib/migrations/20170912140434-create-user.js
@@ -0,0 +1,33 @@
+'use strict';
+module.exports = {
+  up: function(queryInterface, Sequelize) {
+    return queryInterface.createTable('users', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      first_name: {
+        type: Sequelize.STRING
+      },
+      last_name: {
+        type: Sequelize.STRING
+      },
+      email: {
+        type: Sequelize.STRING
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: function(queryInterface, Sequelize) {
+    return queryInterface.dropTable('users');
+  }
+};
diff --git a/backend/lib/models/Note.js b/backend/lib/models/Note.js
diff --git a/backend/lib/models/User.js b/backend/lib/models/User.js
@@ -0,0 +1,16 @@
+'use strict';
+module.exports = function(sequelize, DataTypes) {
+  var Users = sequelize.define('users', {
+    first_name: DataTypes.STRING,
+    last_name: DataTypes.STRING,
+    email: DataTypes.STRING
+  }, {
+    classMethods: {
+      associate: function(models) {
+        // associations can be defined here
+      }
+    }
+  });
+
+  return Users;
+};
diff --git a/backend/lib/models/index.js b/backend/lib/models/index.js
diff --git a/backend/nightwatch.json b/backend/nightwatch.json
diff --git a/backend/package.json b/backend/package.json
@@ -14,11 +14,12 @@
     "body-parser": "^1.17.1",
     "express": "^4.15.2",
     "fs-extra": "^2.1.2",
+    "minimatch": "^3.0.4",
+    "mysql2": "^1.4.2",
     "nconf": "^0.8.4",
-    "pg": "^6.1.4",
     "pug": "^2.0.0-beta11",
-    "sequelize": "^3.30.2",
-    "sequelize-cli": "^2.6.0",
+    "sequelize": "^4.8.3",
+    "sequelize-cli": "^2.8.0",
     "winston": "^2.3.1"
   },
   "devDependencies": {

diff --git a/backend/tests/globals.js b/backend/tests/globals.js
diff --git a/backend/tests/specs/notes.js b/backend/tests/specs/notes.js
diff --git a/backend/views/index.pug b/backend/views/index.pug
diff --git a/backend/views/loader.html b/backend/views/loader.html
diff --git a/backups/.gitkeep b/backups/.gitkeep
diff --git a/bin/backup.sh b/bin/backup.sh
@@ -4,5 +4,5 @@
 source bin/env.sh
 
 BACKUP_FILE=django$1_$(date +'%Y_%m_%dT%H_%M_%S').bak
-dcprod -f docker-compose.db.yml run --rm dbclient bash -c 'pg_dump -Fc -h db -U $POSTGRES_USER -d $POSTGRES_DB -f /backups/'"$BACKUP_FILE"
-echo "backup $BACKUP_FILE created"
+dcprod -f docker-compose.db.yml run --rm dbclient bash -c 'pg_dump -Fc -h db -U $MYSQL_USER -d $MYSQL_DATABASE -f /backups/'"$BACKUP_FILE"
+echo "backup $BACKUP_FILE created"
diff --git a/bin/init_db.sh b/bin/init_db.sh
@@ -10,9 +10,9 @@ if  [ $(docker-compose -f docker-compose.yml -f $DOCKER_INIT_DB_CONFIG ps | grep
     echo "initializing database"
     docker-compose -f docker-compose.yml -f $DOCKER_INIT_DB_CONFIG up -d db
     DB_CONTAINER_ID=$(docker-compose -f docker-compose.yml -f $DOCKER_INIT_DB_CONFIG ps -q db)
-    for i in {30..0}; do
-        echo "waiting for postgres to finish initializing..."
-        if [ $(docker logs $DB_CONTAINER_ID 2>&1 | grep "database system is ready to accept connections" | wc -l) == 1 ]; then
+    for i in {45..0}; do
+        echo "waiting for mysql to finish initializing..."
+        if [ $(docker logs $DB_CONTAINER_ID 2>&1 | grep "ready for connections" | wc -l) == 1 ]; then
             docker-compose -f docker-compose.yml -f $DOCKER_INIT_DB_CONFIG stop db
             echo "db initialized"
             exit 0

diff --git a/bin/mysql.sh b/bin/mysql.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# open mysql session to production db
+
+source bin/env.sh
+
+dcprod -f docker-compose.db.yml run --rm dbclient bash -c 'mysql --user $MYSQL_USER --password $MYSQL_PASSWORD $MYSQL_DATABASE'
diff --git a/bin/psql.sh b/bin/psql.sh
diff --git a/bin/restore.sh b/bin/restore.sh
@@ -21,5 +21,5 @@ if [ $(docker-compose -f docker-compose.yml -f $DOCKER_CONFIG_PROD -f docker-com
 fi
 
 echo "restoring database..."
-dcprod -f docker-compose.db.yml run --rm dbclient bash -c 'dropdb -h db -U $POSTGRES_USER $POSTGRES_DB && createdb -h db -U $POSTGRES_USER -O $POSTGRES_USER $POSTGRES_DB && pg_restore -Fc -h db -U $POSTGRES_USER -d $POSTGRES_DB '"$BACKUP_FILE"
-echo "restore complete"
+dcprod -f docker-compose.db.yml run --rm dbclient bash -c 'dropdb -h db -U $MYSQL_USER $MYSQL_DATABASE && createdb -h db -U $MYSQL_USER -O $MYSQL_USER $MYSQL_DATABASE && pg_restore -Fc -h db -U $MYSQL_USER -d $MYSQL_DATABASE '"$BACKUP_FILE"
+echo "restore complete"
diff --git a/bin/sequelize_prod.sh b/bin/sequelize_prod.sh
diff --git a/docker-compose.db.yml b/docker-compose.db.yml
@@ -1,11 +1,13 @@
 version: '2'
 services:
-    dbclient:
-        image: postgres:9.6
-        depends_on:
-            - db
-        environment:
-            POSTGRES_DB: ${POSTGRES_DB}
-            POSTGRES_USER: ${POSTGRES_USER}
-        volumes:
-            - "./backups:/backups"
+  dbclient:
+    image: mysql:5.7.19
+    depends_on:
+      - db
+    environment:
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+    volumes:
+      - "./backups:/backups"
diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -1,26 +1,26 @@
 version: '2'
 services:
-    db:
-        ports:
-            - "9432:5432" 
-    frontend:
-        image: node:7.7
-        working_dir: /frontend
-        command: npm run develop
-        volumes:
-            - ./frontend:/frontend
-        ports:
-            - "3000:3000"
-    backend:
-        image: node:7.7
-        working_dir: /backend
-        command: npm run develop
-        volumes:
-            - ./backend:/backend
-            - ./backend/media:/media
-        ports:
-            - "8000:8000"
-        environment:
-            NODE_ENV: ${NODE_ENV}
-        depends_on:
-            - db
+  db:
+    ports:
+      - "3306:3306" 
+  frontend:
+    image: mhart/alpine-node:latest
+    working_dir: /frontend
+    command: npm run develop
+    volumes:
+      - ./frontend:/frontend
+    ports:
+      - "3000:3000"
+  backend:
+    image: mhart/alpine-node:latest
+    working_dir: /backend
+    command: npm run develop
+    volumes:
+      - ./backend:/backend
+      - ./backend/media:/media
+    ports:
+      - "8000:8000"
+    environment:
+      NODE_ENV: ${NODE_ENV}
+    depends_on:
+      - db
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -3,8 +3,8 @@ services:
     dbtest:
         image: postgres:9.5
         environment:
-            POSTGRES_DB: testdb
-            POSTGRES_USER: testuser
+            MYSQL_DATABASE: testdb
+            MYSQL_USER: testuser
     selenium:
         image: selenium/standalone-chrome-debug:2.53.0
         ports: 
@@ -21,4 +21,4 @@ services:
             NODE_ENV: test
         depends_on:
             - dbtest
-            - selenium
+            - selenium
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,13 +1,17 @@
 version: '2'
 services:
-    dbdata:
-        image: postgres:9.6
-        command: "true"
-
-    db:
-        image: postgres:9.6
-        environment:
-            POSTGRES_DB: ${POSTGRES_DB}
-            POSTGRES_USER: ${POSTGRES_USER}
-        volumes_from:
-            - dbdata
+  dbdata:
+    image: mysql:5.7.19
+    command: "true"
+    volumes:
+      - /media/data/db_data/mysql:/var/lib/mysql
+  db:
+    image: mysql:5.7.19
+    environment:
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+    volumes_from:
+      - dbdata
+
diff --git a/frontend/.babelrc b/frontend/.babelrc
diff --git a/frontend/.eslintrc b/frontend/.eslintrc
diff --git a/frontend/dist/.gitkeep b/frontend/dist/.gitkeep
diff --git a/frontend/package.json b/frontend/package.json
diff --git a/frontend/src/images/hamster.jpg b/frontend/src/images/hamster.jpg
diff --git a/frontend/src/js/actions/notes.js b/frontend/src/js/actions/notes.js
diff --git a/frontend/src/js/actions/types.js b/frontend/src/js/actions/types.js
diff --git a/frontend/src/js/components/notes/list.js b/frontend/src/js/components/notes/list.js
diff --git a/frontend/src/js/containers/app-container.js b/frontend/src/js/containers/app-container.js
diff --git a/frontend/src/js/containers/home-container.js b/frontend/src/js/containers/home-container.js
diff --git a/frontend/src/js/containers/notes-container.js b/frontend/src/js/containers/notes-container.js
diff --git a/frontend/src/js/index.js b/frontend/src/js/index.js
diff --git a/frontend/src/js/reducers/index.js b/frontend/src/js/reducers/index.js
diff --git a/frontend/src/js/reducers/notes.js b/frontend/src/js/reducers/notes.js
diff --git a/frontend/src/js/store.js b/frontend/src/js/store.js
diff --git a/frontend/src/style/index.styl b/frontend/src/style/index.styl
diff --git a/frontend/src/style/notes.styl b/frontend/src/style/notes.styl
diff --git a/frontend/webpack/dev-server.js b/frontend/webpack/dev-server.js
diff --git a/frontend/webpack/webpack.config.base.js b/frontend/webpack/webpack.config.base.js
diff --git a/frontend/webpack/webpack.config.development.js b/frontend/webpack/webpack.config.development.js
diff --git a/frontend/webpack/webpack.config.production.js b/frontend/webpack/webpack.config.production.js
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
diff --git a/nginx/nginx_nossl.conf b/nginx/nginx_nossl.conf
diff --git a/nginx/nginx_ssl.conf b/nginx/nginx_ssl.conf
diff --git a/nginx/ssl/.gitkeep b/nginx/ssl/.gitkeep
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,4 +50,4 @@ router.post('/notes/', function(req, res) { @@
         });
     })
-    export default router;
+    export default router;