Revert "Revert "Add User""

This reverts commit ad1b3e4.

Author: Raezl

app.js

@@ -4,13 +4,16 @@ const mongoose = require('mongoose');
 require('dotenv/config');
 
 //Routes
-const playlistRoute = require('./routes/Playlist');
-const spotifyRoute = require('./routes/spotify');
+const playlistRoute = require('./routes/playlistRoute');
+const spotifyRoute = require('./routes/spotifyRoute');
+const userRoute = require('./routes/userRoute');
+
 
 //Middleware
 app.use(express.json());
 app.use('/playlist', playlistRoute);
 app.use('/spotify', spotifyRoute);
+app.use('/user', userRoute);
 
 
 app.listen(3000);

controllers/playlistController.js

@@ -1,11 +1,13 @@
-const PLAYLIST =require('../models/Playlist');
-
+const PLAYLIST =require('../models/playlistModel');
 
 
+//View user created playlists
 exports.view_playlist = function(req, res){
     res.send('working');
 };
 
+
+//Add new user playlist 
 exports.add_playlist = function(req, res){
     const playlist = new PLAYLIST({
         userId: req.body.userId,

controllers/spotifyController.js

@@ -1,10 +1,7 @@
 
 require('dotenv').config();
-const { rejects } = require('assert');
 const { default: axios } = require('axios');
 const crypto = require('crypto');
-const { request } = require('http');
-const { resolve } = require('path');
 const client_id = process.env.SCLIENT_ID;
 const client_secret = process.env.SCLIENT_SECRET;
 const redirect_uri = process.env.S_REDIRECT;

controllers/userController.js

@@ -0,0 +1,22 @@
+const USER = require('../models/usersModel');
+
+//Find username
+exports.login = function (req, res){
+    res.status(200).send('log in');
+};
+
+//Add new user 
+exports.register = function (req, res){
+    const user = new USER({
+        email: req.body.email,
+        password: req.body.password
+    });
+    user.save()
+    .then(
+        res.status(200).send('User Registered')
+    )
+    .catch(err => {
+        res.status(400).send(err);
+    });
+};
+

models/Playlist.js models/playlistModel.jsmodels/Playlist.js renamed to models/playlistModel.js

@@ -5,21 +5,22 @@ mongoose.connect(process.env.DB_CONNECTION, () =>
     console.log('DB connected')
 );
 
-const SONG = mongoose.Schema({
+
+const song = mongoose.Schema({
     source: String,
     url: String
 });
 
 
 
-const PLAYLIST_SCHEMA =  mongoose.Schema({
+const playlist_schema =  mongoose.Schema({
     userId:{
         type: String,
         required: true
     },
     name: String,
     desc: String,
-    songs:[SONG]   
+    songs:[song]   
 });
 
-module.exports = mongoose.model('Playlist', PLAYLIST_SCHEMA);
+module.exports = mongoose.model('Playlist', playlist_schema);

models/usersModel.js

@@ -0,0 +1,20 @@
+const mongoose = require('mongoose');
+
+
+const user_schema = mongoose.Schema({
+    email: {
+        type: String,
+        required: true
+    },
+    password:{
+        type: String,
+        required: true
+    },
+    sources:[{
+        source: String,
+        token: String,
+    }]
+})
+
+
+module.exports = mongoose.model('Users', user_schema); 

routes/Playlist.js routes/playlistRoute.jsroutes/Playlist.js renamed to routes/playlistRoute.js

@@ -0,0 +1,11 @@
+const express = require('express');
+const spotifyController = require('../controllers/spotifyController');
+const router = express.Router();
+
+//GET routes 
+router.get('/oauth', spotifyController.spotify_oauth);
+router.get('/oauth/authorise', spotifyController.spotify_authorise);
+
+
+
+module.exports = router;

routes/spotify.js

@@ -0,0 +1,12 @@
+const express = require('express');
+const userController = require('../controllers/userController');
+const { route } = require('./playlistRoute');
+const router = express.Router();
+
+//GET route
+router.get('/login', userController.login);
+
+//POST Routes
+router.post('/register', userController.register);
+
+module.exports = router;