Shingie

app.js

@@ -9,8 +9,8 @@ var livereload = require("livereload");
 var connectLiveReload = require("connect-livereload");
 var connectDB = require('./db.js');
 
-var indexRouter = require('./routes/index');
-var usersRouter = require('./routes/users');
+
+const routes = require('./routes/users.js')
 
 const liveReloadServer = livereload.createServer();
 liveReloadServer.server.once("connection", () => {
@@ -26,19 +26,20 @@ var app = express();
 app.use(connectLiveReload());
 
 // view engine setup
+
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
-
 app.use(logger('dev'));
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
+const indexRouter = require('./index');
 app.use('/', indexRouter);
-app.use('/api/users', usersRouter);
 
-// catch 404 and forward to error handler
+
+
 app.use(function(req, res, next) {
     next(createError(404));
 });
@@ -53,4 +54,15 @@ app.use(function(err, req, res, next) {
     res.render('error');
 });
 
+
+//Using the router in main application
+
+
+
+app.listen(process.env.PORT, () => {
+    console.log(`Server listening at http://localhost:${process.env.PORT}`);
+});
+
+
+
 module.exports = app;

db.js

@@ -1,26 +1,18 @@
 require('dotenv').config();
+const { MongoClient } = require('mongodb');
+
 var db_url = process.env.DATABASE_URL;
 var mongoose = require('mongoose');
-
-const connectDB = () => {
 
-    const url = db_url + "/" + process.env.DATABASE_TABLE;
-    try {
-        console.log("Connecting to database...");
-        mongoose.connect(url);
-    } catch (err) {
-        console.error(err.message);
-        process.exit(1);
-    }
-    const dbConnection = mongoose.connection;
-    dbConnection.once("open", (_) => {
-        console.log(`Database connected: ${url}`);
-    });
-
-    dbConnection.on("error", (err) => {
-        console.error(`connection error: ${err}`);
-    });
-    return;
+
+
+async function getDatabase() {
+    const client = new MongoClient(process.env.DATABASE_URL);
+    await client.connect();
+    const db = client.db('users');
+    console.log("Database connected");
+
+    return db; // Return the client object
 }
 
-module.exports = connectDB;
+module.exports = getDatabase;

index.js

@@ -0,0 +1,30 @@
+require('dotenv').config()
+const express = require('express');
+const app = express()
+var router = express.Router();
+
+
+
+router.get('/', (req, res) => {
+    res.send(console.log('Hello World'));
+}
+);
+
+
+const usersRouter = require('./routes/users');
+const groupsRouter = require('./routes/tabGroups');
+const  tasksRouter = require('./routes/tasks');
+
+app.use(express.json());
+app.use('/users', usersRouter);
+app.use('/tabs', groupsRouter);
+app.use('/tasks', tasksRouter);
+
+
+
+app.listen(process.env.PORT, () => {
+    console.log(`Server listening at http://localhost:${process.env.PORT}`);
+});
+
+
+module.exports = router;