Updates to file structure

docker-compose.yaml

@@ -16,8 +16,8 @@ services:
     ports:
       - '5432:5432'
     volumes:
-      - group-project:/var/lib/postgresql/data
+      - users-database:/var/lib/postgresql/data
-      - ./init_data:/docker-entrypoint-initdb.d
+      - ./public/init_data:/docker-entrypoint-initdb.d
   web:
     container_name: node-web-interface
     image: node:lts
@@ -35,4 +35,4 @@ services:
       - ./node_modules:/home/node/app/node_modules  # Mount node_modules directory
     command: 'npm run start'
 volumes:
-  group-project:
+  users-database:

index.js

@@ -21,8 +21,8 @@ const moment = require('moment'); // To extract current time data
 // create `ExpressHandlebars` instance and configure the layouts and partials dir.
 const hbs = handlebars.create({
   extname: 'hbs',
-  layoutsDir: __dirname + '/client/src/views/layouts',
+  layoutsDir: __dirname + '/src/views/layouts',
-  partialsDir: __dirname + '/client/src/views/partials',
+  partialsDir: __dirname + '/src/views/partials',
 });
 
 // database configuration
@@ -53,7 +53,7 @@ db.connect()
 // Register `hbs` as our view engine using its bound `engine()` function.
 app.engine('hbs', hbs.engine);
 app.set('view engine', 'hbs');
-app.set('views', path.join(__dirname, '/client/src/views'));
+app.set('views', path.join(__dirname, '/src/views'));
 app.use(bodyParser.json()); // specify the usage of JSON for parsing request body.
 
 // initialize session variables
@@ -88,26 +88,26 @@ app.use(async function(req, res, next) {
 });
 
 // Serve static files from the 'public' directory
-app.use(express.static(path.join(__dirname, '/client/src/assets')));
+app.use(express.static(path.join(__dirname, '/src/assets')));
 
 // *****************************************************
 // <!-- Section 4 : Middleware -->
 // *****************************************************
 
 // Middleware to automatically update live scoreboard
-const fetchMatchesData = require('./client/src/assets/middleware/navigation-bar/current-match-information');
+const fetchMatchesData = require('./src/assets/middleware/navigation-bar/current-match-information');
 app.use(fetchMatchesData);
 
 //Middleware to automatically update in-game time abbreviations
 
-const convert_time = require('./client/src/assets/middleware/navigation-bar/convert-time');
+const convert_time = require('./src/assets/middleware/navigation-bar/convert-time');
 app.use(convert_time);
 
 
 // Leagues Page Middleware
 
-const fetchLeaguesData = require('./client/src/assets/middleware/leagues-page/get-current-league-information');
+const fetchLeaguesData = require('./src/assets/middleware/leagues-page/get-current-league-information');
-const fetchLeagueScorerData = require('./client/src/assets/middleware/leagues-page/get-current-league-top-scorers');
+const fetchLeagueScorerData = require('./src/assets/middleware/leagues-page/get-current-league-top-scorers');
 
 app.get('/league/:leagueID', [fetchLeaguesData, fetchLeagueScorerData], (req, res) => {
     // Render the Handlebars view with league data
@@ -120,7 +120,7 @@ app.get('/league/:leagueID', [fetchLeaguesData, fetchLeagueScorerData], (req, re
 
 // Clubs Page Middleware
 
-const fetchClubsData = require('./client/src/assets/middleware/clubs-page/get-current-club-information');
+const fetchClubsData = require('./src/assets/middleware/clubs-page/get-current-club-information');
 
 app.get('/club/:clubID', [fetchClubsData], (req, res) => {
     // Render the Handlebars view with league data
@@ -264,7 +264,7 @@ app.get('/logout', (req, res) => {
 *************************/
 
 // Import and call generateLeagueRoutes function
-const generateLeagueRoutes = require('./client/src/assets/routes/league-pages/generate-league-routes');
+const generateLeagueRoutes = require('./src/assets/routes/league-pages/generate-league-routes');
 generateLeagueRoutes(app);
 
 /************************ 
@@ -272,7 +272,7 @@ generateLeagueRoutes(app);
 *************************/
 
 // Import and call generateLeagueRoutes function
-const generateClubRoutes = require('./client/src/assets/routes/club-pages/generate-club-routes');
+const generateClubRoutes = require('./src/assets/routes/club-pages/generate-club-routes');
 generateClubRoutes(app);
 
 /************************