Darian routers

.gitignore

@@ -1 +1,2 @@
-/node_modules
+/node_modules
+.env

config/config.json → config/config.js

@@ -1,6 +1,8 @@
-{
+require("dotenv").config()
+
+module.exports = {
   "development": {
-    "url": "YOUR_ELEPHANTSQL_URL_HERE",
+    "url": process.env.DATABASE_URL_DEV,
     "dialect": "postgres",
     "operatorsAliases": "0"
   },

config/constants.js

@@ -1,4 +1,4 @@
 module.exports = {
   SALT_ROUNDS: 10,
-  PORT: process.env.PORT || 4000
+  PORT: process.env.PORT || 4000,
 };

index.js

@@ -1,9 +1,13 @@
+require("dotenv").config()
+
 const express = require("express");
 const loggerMiddleWare = require("morgan");
 const corsMiddleWare = require("cors");
 const { PORT } = require("./config/constants");
 const authRouter = require("./routers/auth");
 const authMiddleWare = require("./auth/middleware");
+const exercises = require("./routers/exercisesRouter")
+const profile = require("./routers/ProfileRouter")
 
 const app = express();
 
@@ -113,11 +117,8 @@ if (process.env.DELAY) {
  *
  */
 
-/**
- * Routes
- *
- * Define your routes here (now that middlewares are configured)
- */
+app.use("/exercises", exercises)
+app.use("/profile", profile)
 
 // GET endpoint for testing purposes, can be removed
 app.get("/", (req, res) => {

migrations/20200318210344-create-user.js → migrations/0-create-user.js

@@ -8,7 +8,11 @@ module.exports = {
         primaryKey: true,
         type: Sequelize.INTEGER,
       },
-      name: {
+      fullName: {
+        type: Sequelize.STRING,
+        allowNull: false,
+      },
+      image : {
         type: Sequelize.STRING,
         allowNull: false,
       },
@@ -21,6 +25,10 @@ module.exports = {
         type: Sequelize.STRING,
         allowNull: false,
       },
+      ranking: {
+        type: Sequelize.STRING,
+        allowNull: false,
+      },
       createdAt: {
         allowNull: false,
         type: Sequelize.DATE,

migrations/1-create-exercise.js

@@ -0,0 +1,32 @@
+'use strict';
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable('exercises', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      name: {
+        type: Sequelize.STRING,
+        allowNull: false,
+      },
+      content: {
+        type: Sequelize.TEXT,
+        allowNull: false,
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.dropTable('exercises');
+  }
+};

migrations/2-create-completed-exercise.js

@@ -0,0 +1,52 @@
+'use strict';
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable('completedExercises', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      userId: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: {
+          model: "users",
+          key: "id",
+        },
+        onUpdate: "CASCADE",
+        onDelete: "CASCADE",
+      },
+      exerciseId: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+      references: {
+        model: "exercises",
+        key: "id",
+      },
+      onUpdate: "CASCADE",
+      onDelete: "CASCADE",
+      },
+      timeTaken: {
+        type: Sequelize.TIME,
+        allowNull: false,
+      },
+      exp: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.dropTable('completedExercises');
+  }
+};

models/completedexercise.js

@@ -0,0 +1,50 @@
+'use strict';
+const {
+  Model
+} = require('sequelize');
+module.exports = (sequelize, DataTypes) => {
+  class completedExercise extends Model {
+    /**
+     * Helper method for defining associations.
+     * This method is not a part of Sequelize lifecycle.
+     * The `models/index` file will call this method automatically.
+     */
+    static associate(models) {
+      // define association here
+    }
+  };
+  completedExercise.init({
+    userId: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      references: {
+        model: "users",
+        key: "id",
+      },
+      onUpdate: "CASCADE",
+      onDelete: "CASCADE",
+    },
+    exerciseId: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      references: {
+        model: "exercises",
+        key: "id",
+      },
+      onUpdate: "CASCADE",
+      onDelete: "CASCADE",
+    },
+    timeTaken: {
+      type: DataTypes.TIME,
+      allowNull: false,
+    },
+    exp: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+    }
+  }, {
+    sequelize,
+    modelName: 'completedExercise',
+  });
+  return completedExercise;
+};

models/exercise.js

@@ -0,0 +1,33 @@
+'use strict';
+const {
+  Model
+} = require('sequelize');
+module.exports = (sequelize, DataTypes) => {
+  class exercise extends Model {
+    /**
+     * Helper method for defining associations.
+     * This method is not a part of Sequelize lifecycle.
+     * The `models/index` file will call this method automatically.
+     */
+    static associate(models) {
+      exercise.belongsToMany(models.user, {
+        through: "completedExercises",
+        key: "exerciseId",
+      })
+    }
+  };
+  exercise.init({
+    name: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+    content: {
+      type: DataTypes.TEXT,
+      allowNull: false,
+    }
+  }, {
+    sequelize,
+    modelName: 'exercise',
+  });
+  return exercise;
+};

models/index.js

@@ -5,7 +5,7 @@ const path = require("path");
 const Sequelize = require("sequelize");
 const basename = path.basename(__filename);
 const env = process.env.NODE_ENV || "development";
-const config = require(__dirname + "/../config/config.json")[env];
+const config = require(__dirname + "/../config/config.js")[env];
 const db = {};
 
 let sequelize;

models/user.js

@@ -9,12 +9,19 @@ module.exports = (sequelize, DataTypes) => {
      * The `models/index` file will call this method automatically.
      */
     static associate(models) {
-      // define association here
+      user.belongsToMany(models.exercise, {
+        through: "completedExercises",
+        key: "userId",
+      })
     }
   }
   user.init(
     {
-      name: {
+      fullName: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
+      image: {
         type: DataTypes.STRING,
         allowNull: false,
       },
@@ -27,6 +34,10 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.STRING,
         allowNull: false,
       },
+      ranking: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      }
     },
     {
       sequelize,

package.json

@@ -23,6 +23,7 @@
   "dependencies": {
     "bcrypt": "^5.0.0",
     "cors": "^2.8.5",
+    "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "jsonwebtoken": "^8.5.1",
     "morgan": "^1.9.1",