Merge pull request #4 from makon57/finishings

Finishings
makon57 · Jul 2, 2021 · 1d28a43 · 1d28a43
2 parents 27b9bfd + fbc07d1
commit 1d28a43
Show file tree

Hide file tree

Showing 102 changed files with 6,576 additions and 96 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.env
+node_modules/
diff --git a/.sequelizerc b/.sequelizerc
@@ -0,0 +1,8 @@
+const path = require('path');
+
+module.exports = {
+  'config': path.resolve('config', 'database.js'),
+  'models-path': path.resolve('db', 'models'),
+  'seeders-path': path.resolve('db', 'seeders'),
+  'migrations-path': path.resolve('db', 'migrations')
+};
diff --git a/app.js b/app.js
@@ -8,6 +8,12 @@ const session = require('express-session');
 const SequelizeStore = require('connect-session-sequelize')(session.Store);
 const indexRouter = require('./routes/index');
 const usersRouter = require('./routes/users');
+const loginRouter = require('./routes/login');
+// const { asyncHandler } = require('./utils');
+const signupRouter = require('./routes/signup');
+const { restoreUser } = require('./auth')
+// const trailsRouter = require('./routes/trails');
+
 
 const app = express();
 
@@ -35,8 +41,13 @@ app.use(
 // create Session table if it doesn't already exist
 store.sync();
 
+app.use(express.static('images'));
+app.use(restoreUser);
 app.use('/', indexRouter);
 app.use('/users', usersRouter);
+app.use('/login', loginRouter);
+app.use('/signup', signupRouter);
+// app.use('/trails', trailsRouter);
 
 // catch 404 and forward to error handler
 app.use(function (req, res, next) {
@@ -48,6 +59,7 @@ app.use(function (err, req, res, next) {
   // set locals, only providing error in development
   res.locals.message = err.message;
   res.locals.error = req.app.get('env') === 'development' ? err : {};
+  console.log(res.locals.message)
 
   // render the error page
   res.status(err.status || 500);

diff --git a/auth.js b/auth.js
@@ -0,0 +1,53 @@
+
+const db = require('./db/models');
+
+const loginUser = (req, res, user) => {
+  req.session.auth = {
+    userId: user.id,
+  };
+};
+
+const logoutUser = (req, res) => {
+  delete req.session.auth;
+};
+
+const requireAuth = (req, res, next) => {
+  if (!res.locals.authenticated) {
+    return res.redirect('/login');
+  }
+  return next();
+};
+
+const restoreUser = async (req, res, next) => {
+  // Log the session object to the console
+  // to assist with debugging.
+  console.log(req.session);
+
+  if (req.session.auth) {
+    const { userId } = req.session.auth;
+
+    try {
+      const user = await db.User.findByPk(userId);
+
+      if (user) {
+        res.locals.authenticated = true;
+        res.locals.user = user;
+        // console.log(res.locals.user)
+        next();
+      }
+    } catch (err) {
+      res.locals.authenticated = false;
+      next(err);
+    }
+  } else {
+    res.locals.authenticated = false;
+    next();
+  }
+};
+
+module.exports = {
+  loginUser,
+  logoutUser,
+  requireAuth,
+  restoreUser,
+};
diff --git a/config/database.js b/config/database.js
@@ -11,4 +11,15 @@ module.exports = {
     dialect: 'postgres',
     seederStorage: 'sequelize',
   },
+  production: {
+    use_env_variable: 'DATABASE_URL',
+    dialect: 'postgres',
+    seederStorage: 'sequelize',
+    dialectOptions: {
+      ssl: {
+        require: true,
+        rejectUnauthorized: false,
+      },
+    },
+  },
 };
diff --git a/db/.DS_Store b/db/.DS_Store
diff --git a/db/migrations/20210628202037-create-users.js b/db/migrations/20210628202037-create-users.js
@@ -0,0 +1,38 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('Users', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      username: {
+        unique: true,
+        allowNull: false,
+        type: Sequelize.STRING(50)
+      },
+      email: {
+        unique: true,
+        allowNull: false,
+        type: Sequelize.STRING(255)
+      },
+      password: {
+        allowNull: false,
+        type: Sequelize.STRING
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('Users');
+  }
+};
diff --git a/db/migrations/20210628202553-create-trail-list.js b/db/migrations/20210628202553-create-trail-list.js
@@ -0,0 +1,34 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('TrailLists', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      name: {
+        unique: true,
+        allowNull: false,
+       type: Sequelize.STRING(255)
+      },
+      userId: {
+      references: { model: "Users" },
+      allowNull: false,
+       type: Sequelize.INTEGER
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('TrailLists');
+  }
+};
diff --git a/db/migrations/20210628202553-create-trailList.js b/db/migrations/20210628202553-create-trailList.js
@@ -0,0 +1,34 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('TrailLists', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      name: {
+        unique: true,
+        allowNull: false,
+       type: Sequelize.STRING(255)
+      },
+      userId: {
+      references: { model: "Users" },
+      allowNull: false,
+       type: Sequelize.INTEGER
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('TrailLists');
+  }
+};
diff --git a/db/migrations/20210628202815-create-trail.js b/db/migrations/20210628202815-create-trail.js
@@ -0,0 +1,38 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('Trails', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      name: {
+        unique:true,
+        allowNull: false,
+
+        type: Sequelize.STRING(50)
+      },
+      description: {
+        allowNull: false,
+        type: Sequelize.TEXT
+      },
+      state: {
+         allowNull: false,
+        type: Sequelize.STRING(50)
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('Trails');
+  }
+};
diff --git a/db/migrations/20210628202816-create-joins.js b/db/migrations/20210628202816-create-joins.js
@@ -0,0 +1,40 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('Joins', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      trailId: {
+       allowNull: false,
+       references: { model: "Trails" },
+        type: Sequelize.INTEGER
+      },
+      trailListId: {
+      allowNull: false,
+      references: { model: "TrailLists" },
+        type: Sequelize.INTEGER
+      },
+      hasVisited: {
+        type: Sequelize.BOOLEAN
+      },
+      wantToVisit: {
+        type: Sequelize.BOOLEAN
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('Joins');
+  }
+};
diff --git a/db/migrations/20210628203040-create-review.js b/db/migrations/20210628203040-create-review.js
@@ -0,0 +1,42 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('Reviews', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      trailId: {
+        allowNull: false,
+        references: { model: "Trails" },
+        type: Sequelize.INTEGER
+      },
+      userId: {
+        references: { model: "Users" },
+        allowNull: false,
+        type: Sequelize.INTEGER
+      },
+      rating: {
+        allowNull: false,
+        type: Sequelize.INTEGER
+      },
+      text: {
+        allowNull: false,
+        type: Sequelize.TEXT
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('Reviews');
+  }
+};
diff --git a/db/models/join.js b/db/models/join.js
@@ -0,0 +1,14 @@
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const Join = sequelize.define('Join', {
+    trailId: DataTypes.INTEGER,
+    trailShelfId: DataTypes.INTEGER,
+    hasVisited: DataTypes.BOOLEAN,
+    wantToVisit: DataTypes.BOOLEAN
+  }, {});
+  Join.associate = function(models) {
+    // Join.belongsTo(models.TrailList, {foreignKey: 'trailListId'})
+    // Join.hasMany(models.Trail, {foreignKey:'trailId'})
+  };
+  return Join;
+};
diff --git a/db/models/review.js b/db/models/review.js
@@ -0,0 +1,14 @@
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const Review = sequelize.define('Review', {
+    trailId: DataTypes.INTEGER,
+    userId: DataTypes.INTEGER,
+    rating: DataTypes.INTEGER,
+    text: DataTypes.TEXT
+  }, {});
+  Review.associate = function(models) {
+    Review.belongsTo(models.User,{foreignKey:'userId'})
+    Review.belongsTo(models.Trail, {foreignKey: 'trailId'})
+  };
+  return Review;
+};