From bd79a6ccc33192bf257140471b7da43a7226a602 Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 30 Apr 2024 22:12:59 -0600 Subject: [PATCH] Updates to file structure --- docker-compose.yaml | 6 ++--- index.js | 22 +++++++++--------- {init_data => public/init_data}/create.sql | 0 .../club-pages/club-page-layouts.css | 0 .../club-pages/club-page-styling.css | 0 .../generated-pages-styling.css | 0 .../league-pages/league-page.css | 0 .../league-pages/league-table.css | 0 .../league-pages/league-top-scorers.css | 0 .../assets/css/homepage/homepage.css | 0 .../css/login-and-registration/account.css | 0 .../css/login-and-registration/login.css | 0 .../login_and_registration.css | 0 .../login-and-registration/registration.css | 0 .../css/navigation-bar/account-screen.css | 0 .../css/navigation-bar/navigation-bar.css | 0 .../scoreboard-header/game-card.css | 0 .../scoreboard-header/scoreboard.css | 0 .../assets/fonts/Scottsdale-Italic.ttf | Bin .../assets/img/club-page/cant-favorite.png | Bin .../assets/img/club-page/favorited.png | Bin .../assets/img/club-page/unfavorited.png | Bin .../assets/img/homepage/brasileirao/icon.png | Bin .../assets/img/homepage/brasileirao/title.png | Bin .../assets/img/homepage/bundesliga/icon.png | Bin .../assets/img/homepage/bundesliga/title.png | Bin .../assets/img/homepage/la-liga/icon.png | Bin .../assets/img/homepage/la-liga/title.png | Bin .../assets/img/homepage/ligue-1/icon.png | Bin .../assets/img/homepage/ligue-1/title.png | Bin .../img/homepage/premier-league/icon.png | Bin .../img/homepage/premier-league/title.png | Bin .../assets/img/homepage/serie-a/icon.png | Bin .../assets/img/homepage/serie-a/title.png | Bin {client/src => src}/assets/img/logo.png | Bin .../assets/img/navigation-bar/logo.png | Bin .../account-pane/delete-club-hover.png | Bin .../user-menu/account-pane/delete-club.png | Bin .../navigation-bar/user-menu/user-button.png | Bin .../assets/js/club-page/favorite-button.js | 0 .../assets/js/club-page/player-card-hover.js | 0 .../change-goal-difference-color.js | 0 .../navigation-bar/navigation-bar-follow.js | 0 .../user/delete-account-favorite-club.js | 0 .../user/login-and-register-page-linking.js | 0 .../get-current-club-information.js | 0 .../get-current-league-information.js | 0 .../get-current-league-top-scorers.js | 0 .../middleware/navigation-bar/convert-time.js | 0 .../current-match-information.js | 0 .../routes/club-pages/generate-club-routes.js | 0 .../routes/club-pages/redirect-to-club-url.js | 0 .../league-pages/generate-league-routes.js | 0 .../get-team-names-for-registry.js | 0 .../league-pages/redirect-to-league-url.js | 0 {client/src => src}/views/layouts/main.hbs | 0 .../src => src}/views/pages/clubs-page.hbs | 0 {client/src => src}/views/pages/home.hbs | 0 .../src => src}/views/pages/leagues-page.hbs | 0 .../views/partials/club-page/player-card.hbs | 0 .../views/partials/club-page/player-hover.hbs | 0 {client/src => src}/views/partials/footer.hbs | 0 {client/src => src}/views/partials/head.hbs | 0 .../views/partials/homepage/league-card.hbs | 0 .../src => src}/views/partials/message.hbs | 0 .../views/partials/navigation-bar/nav.hbs | 0 .../scoreboard-header/game-card.hbs | 0 .../scoreboard-header/scoreboard-header.hbs | 0 .../user-menu/account-screen.hbs | 0 .../navigation-bar/user-menu/login.hbs | 0 .../navigation-bar/user-menu/register.hbs | 0 71 files changed, 14 insertions(+), 14 deletions(-) rename {init_data => public/init_data}/create.sql (100%) rename {client/src => src}/assets/css/generated-pages/club-pages/club-page-layouts.css (100%) rename {client/src => src}/assets/css/generated-pages/club-pages/club-page-styling.css (100%) rename {client/src => src}/assets/css/generated-pages/generated-pages-styling.css (100%) rename {client/src => src}/assets/css/generated-pages/league-pages/league-page.css (100%) rename {client/src => src}/assets/css/generated-pages/league-pages/league-table.css (100%) rename {client/src => src}/assets/css/generated-pages/league-pages/league-top-scorers.css (100%) rename {client/src => src}/assets/css/homepage/homepage.css (100%) rename {client/src => src}/assets/css/login-and-registration/account.css (100%) rename {client/src => src}/assets/css/login-and-registration/login.css (100%) rename {client/src => src}/assets/css/login-and-registration/login_and_registration.css (100%) rename {client/src => src}/assets/css/login-and-registration/registration.css (100%) rename {client/src => src}/assets/css/navigation-bar/account-screen.css (100%) rename {client/src => src}/assets/css/navigation-bar/navigation-bar.css (100%) rename {client/src => src}/assets/css/navigation-bar/scoreboard-header/game-card.css (100%) rename {client/src => src}/assets/css/navigation-bar/scoreboard-header/scoreboard.css (100%) rename {client/src => src}/assets/fonts/Scottsdale-Italic.ttf (100%) rename {client/src => src}/assets/img/club-page/cant-favorite.png (100%) rename {client/src => src}/assets/img/club-page/favorited.png (100%) rename {client/src => src}/assets/img/club-page/unfavorited.png (100%) rename {client/src => src}/assets/img/homepage/brasileirao/icon.png (100%) rename {client/src => src}/assets/img/homepage/brasileirao/title.png (100%) rename {client/src => src}/assets/img/homepage/bundesliga/icon.png (100%) rename {client/src => src}/assets/img/homepage/bundesliga/title.png (100%) rename {client/src => src}/assets/img/homepage/la-liga/icon.png (100%) rename {client/src => src}/assets/img/homepage/la-liga/title.png (100%) rename {client/src => src}/assets/img/homepage/ligue-1/icon.png (100%) rename {client/src => src}/assets/img/homepage/ligue-1/title.png (100%) rename {client/src => src}/assets/img/homepage/premier-league/icon.png (100%) rename {client/src => src}/assets/img/homepage/premier-league/title.png (100%) rename {client/src => src}/assets/img/homepage/serie-a/icon.png (100%) rename {client/src => src}/assets/img/homepage/serie-a/title.png (100%) rename {client/src => src}/assets/img/logo.png (100%) rename {client/src => src}/assets/img/navigation-bar/logo.png (100%) rename {client/src => src}/assets/img/navigation-bar/user-menu/account-pane/delete-club-hover.png (100%) rename {client/src => src}/assets/img/navigation-bar/user-menu/account-pane/delete-club.png (100%) rename {client/src => src}/assets/img/navigation-bar/user-menu/user-button.png (100%) rename {client/src => src}/assets/js/club-page/favorite-button.js (100%) rename {client/src => src}/assets/js/club-page/player-card-hover.js (100%) rename {client/src => src}/assets/js/league-page/change-goal-difference-color.js (100%) rename {client/src => src}/assets/js/navigation-bar/navigation-bar-follow.js (100%) rename {client/src => src}/assets/js/navigation-bar/user/delete-account-favorite-club.js (100%) rename {client/src => src}/assets/js/navigation-bar/user/login-and-register-page-linking.js (100%) rename {client/src => src}/assets/middleware/clubs-page/get-current-club-information.js (100%) rename {client/src => src}/assets/middleware/leagues-page/get-current-league-information.js (100%) rename {client/src => src}/assets/middleware/leagues-page/get-current-league-top-scorers.js (100%) rename {client/src => src}/assets/middleware/navigation-bar/convert-time.js (100%) rename {client/src => src}/assets/middleware/navigation-bar/current-match-information.js (100%) rename {client/src => src}/assets/routes/club-pages/generate-club-routes.js (100%) rename {client/src => src}/assets/routes/club-pages/redirect-to-club-url.js (100%) rename {client/src => src}/assets/routes/league-pages/generate-league-routes.js (100%) rename {client/src => src}/assets/routes/league-pages/get-team-names-for-registry.js (100%) rename {client/src => src}/assets/routes/league-pages/redirect-to-league-url.js (100%) rename {client/src => src}/views/layouts/main.hbs (100%) rename {client/src => src}/views/pages/clubs-page.hbs (100%) rename {client/src => src}/views/pages/home.hbs (100%) rename {client/src => src}/views/pages/leagues-page.hbs (100%) rename {client/src => src}/views/partials/club-page/player-card.hbs (100%) rename {client/src => src}/views/partials/club-page/player-hover.hbs (100%) rename {client/src => src}/views/partials/footer.hbs (100%) rename {client/src => src}/views/partials/head.hbs (100%) rename {client/src => src}/views/partials/homepage/league-card.hbs (100%) rename {client/src => src}/views/partials/message.hbs (100%) rename {client/src => src}/views/partials/navigation-bar/nav.hbs (100%) rename {client/src => src}/views/partials/navigation-bar/scoreboard-header/game-card.hbs (100%) rename {client/src => src}/views/partials/navigation-bar/scoreboard-header/scoreboard-header.hbs (100%) rename {client/src => src}/views/partials/navigation-bar/user-menu/account-screen.hbs (100%) rename {client/src => src}/views/partials/navigation-bar/user-menu/login.hbs (100%) rename {client/src => src}/views/partials/navigation-bar/user-menu/register.hbs (100%) diff --git a/docker-compose.yaml b/docker-compose.yaml index f9e23a8..c6fa798 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,8 +16,8 @@ services: ports: - '5432:5432' volumes: - - group-project:/var/lib/postgresql/data - - ./init_data:/docker-entrypoint-initdb.d + - users-database:/var/lib/postgresql/data + - ./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: \ No newline at end of file + users-database: \ No newline at end of file diff --git a/index.js b/index.js index 0d95387..0d2eb38 100644 --- a/index.js +++ b/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', - partialsDir: __dirname + '/client/src/views/partials', + layoutsDir: __dirname + '/src/views/layouts', + 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'))); // ***************************************************** // // ***************************************************** // 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 fetchLeagueScorerData = require('./client/src/assets/middleware/leagues-page/get-current-league-top-scorers'); +const fetchLeaguesData = require('./src/assets/middleware/leagues-page/get-current-league-information'); +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); /************************ diff --git a/init_data/create.sql b/public/init_data/create.sql similarity index 100% rename from init_data/create.sql rename to public/init_data/create.sql diff --git a/client/src/assets/css/generated-pages/club-pages/club-page-layouts.css b/src/assets/css/generated-pages/club-pages/club-page-layouts.css similarity index 100% rename from client/src/assets/css/generated-pages/club-pages/club-page-layouts.css rename to src/assets/css/generated-pages/club-pages/club-page-layouts.css diff --git a/client/src/assets/css/generated-pages/club-pages/club-page-styling.css b/src/assets/css/generated-pages/club-pages/club-page-styling.css similarity index 100% rename from client/src/assets/css/generated-pages/club-pages/club-page-styling.css rename to src/assets/css/generated-pages/club-pages/club-page-styling.css diff --git a/client/src/assets/css/generated-pages/generated-pages-styling.css b/src/assets/css/generated-pages/generated-pages-styling.css similarity index 100% rename from client/src/assets/css/generated-pages/generated-pages-styling.css rename to src/assets/css/generated-pages/generated-pages-styling.css diff --git a/client/src/assets/css/generated-pages/league-pages/league-page.css b/src/assets/css/generated-pages/league-pages/league-page.css similarity index 100% rename from client/src/assets/css/generated-pages/league-pages/league-page.css rename to src/assets/css/generated-pages/league-pages/league-page.css diff --git a/client/src/assets/css/generated-pages/league-pages/league-table.css b/src/assets/css/generated-pages/league-pages/league-table.css similarity index 100% rename from client/src/assets/css/generated-pages/league-pages/league-table.css rename to src/assets/css/generated-pages/league-pages/league-table.css diff --git a/client/src/assets/css/generated-pages/league-pages/league-top-scorers.css b/src/assets/css/generated-pages/league-pages/league-top-scorers.css similarity index 100% rename from client/src/assets/css/generated-pages/league-pages/league-top-scorers.css rename to src/assets/css/generated-pages/league-pages/league-top-scorers.css diff --git a/client/src/assets/css/homepage/homepage.css b/src/assets/css/homepage/homepage.css similarity index 100% rename from client/src/assets/css/homepage/homepage.css rename to src/assets/css/homepage/homepage.css diff --git a/client/src/assets/css/login-and-registration/account.css b/src/assets/css/login-and-registration/account.css similarity index 100% rename from client/src/assets/css/login-and-registration/account.css rename to src/assets/css/login-and-registration/account.css diff --git a/client/src/assets/css/login-and-registration/login.css b/src/assets/css/login-and-registration/login.css similarity index 100% rename from client/src/assets/css/login-and-registration/login.css rename to src/assets/css/login-and-registration/login.css diff --git a/client/src/assets/css/login-and-registration/login_and_registration.css b/src/assets/css/login-and-registration/login_and_registration.css similarity index 100% rename from client/src/assets/css/login-and-registration/login_and_registration.css rename to src/assets/css/login-and-registration/login_and_registration.css diff --git a/client/src/assets/css/login-and-registration/registration.css b/src/assets/css/login-and-registration/registration.css similarity index 100% rename from client/src/assets/css/login-and-registration/registration.css rename to src/assets/css/login-and-registration/registration.css diff --git a/client/src/assets/css/navigation-bar/account-screen.css b/src/assets/css/navigation-bar/account-screen.css similarity index 100% rename from client/src/assets/css/navigation-bar/account-screen.css rename to src/assets/css/navigation-bar/account-screen.css diff --git a/client/src/assets/css/navigation-bar/navigation-bar.css b/src/assets/css/navigation-bar/navigation-bar.css similarity index 100% rename from client/src/assets/css/navigation-bar/navigation-bar.css rename to src/assets/css/navigation-bar/navigation-bar.css diff --git a/client/src/assets/css/navigation-bar/scoreboard-header/game-card.css b/src/assets/css/navigation-bar/scoreboard-header/game-card.css similarity index 100% rename from client/src/assets/css/navigation-bar/scoreboard-header/game-card.css rename to src/assets/css/navigation-bar/scoreboard-header/game-card.css diff --git a/client/src/assets/css/navigation-bar/scoreboard-header/scoreboard.css b/src/assets/css/navigation-bar/scoreboard-header/scoreboard.css similarity index 100% rename from client/src/assets/css/navigation-bar/scoreboard-header/scoreboard.css rename to src/assets/css/navigation-bar/scoreboard-header/scoreboard.css diff --git a/client/src/assets/fonts/Scottsdale-Italic.ttf b/src/assets/fonts/Scottsdale-Italic.ttf similarity index 100% rename from client/src/assets/fonts/Scottsdale-Italic.ttf rename to src/assets/fonts/Scottsdale-Italic.ttf diff --git a/client/src/assets/img/club-page/cant-favorite.png b/src/assets/img/club-page/cant-favorite.png similarity index 100% rename from client/src/assets/img/club-page/cant-favorite.png rename to src/assets/img/club-page/cant-favorite.png diff --git a/client/src/assets/img/club-page/favorited.png b/src/assets/img/club-page/favorited.png similarity index 100% rename from client/src/assets/img/club-page/favorited.png rename to src/assets/img/club-page/favorited.png diff --git a/client/src/assets/img/club-page/unfavorited.png b/src/assets/img/club-page/unfavorited.png similarity index 100% rename from client/src/assets/img/club-page/unfavorited.png rename to src/assets/img/club-page/unfavorited.png diff --git a/client/src/assets/img/homepage/brasileirao/icon.png b/src/assets/img/homepage/brasileirao/icon.png similarity index 100% rename from client/src/assets/img/homepage/brasileirao/icon.png rename to src/assets/img/homepage/brasileirao/icon.png diff --git a/client/src/assets/img/homepage/brasileirao/title.png b/src/assets/img/homepage/brasileirao/title.png similarity index 100% rename from client/src/assets/img/homepage/brasileirao/title.png rename to src/assets/img/homepage/brasileirao/title.png diff --git a/client/src/assets/img/homepage/bundesliga/icon.png b/src/assets/img/homepage/bundesliga/icon.png similarity index 100% rename from client/src/assets/img/homepage/bundesliga/icon.png rename to src/assets/img/homepage/bundesliga/icon.png diff --git a/client/src/assets/img/homepage/bundesliga/title.png b/src/assets/img/homepage/bundesliga/title.png similarity index 100% rename from client/src/assets/img/homepage/bundesliga/title.png rename to src/assets/img/homepage/bundesliga/title.png diff --git a/client/src/assets/img/homepage/la-liga/icon.png b/src/assets/img/homepage/la-liga/icon.png similarity index 100% rename from client/src/assets/img/homepage/la-liga/icon.png rename to src/assets/img/homepage/la-liga/icon.png diff --git a/client/src/assets/img/homepage/la-liga/title.png b/src/assets/img/homepage/la-liga/title.png similarity index 100% rename from client/src/assets/img/homepage/la-liga/title.png rename to src/assets/img/homepage/la-liga/title.png diff --git a/client/src/assets/img/homepage/ligue-1/icon.png b/src/assets/img/homepage/ligue-1/icon.png similarity index 100% rename from client/src/assets/img/homepage/ligue-1/icon.png rename to src/assets/img/homepage/ligue-1/icon.png diff --git a/client/src/assets/img/homepage/ligue-1/title.png b/src/assets/img/homepage/ligue-1/title.png similarity index 100% rename from client/src/assets/img/homepage/ligue-1/title.png rename to src/assets/img/homepage/ligue-1/title.png diff --git a/client/src/assets/img/homepage/premier-league/icon.png b/src/assets/img/homepage/premier-league/icon.png similarity index 100% rename from client/src/assets/img/homepage/premier-league/icon.png rename to src/assets/img/homepage/premier-league/icon.png diff --git a/client/src/assets/img/homepage/premier-league/title.png b/src/assets/img/homepage/premier-league/title.png similarity index 100% rename from client/src/assets/img/homepage/premier-league/title.png rename to src/assets/img/homepage/premier-league/title.png diff --git a/client/src/assets/img/homepage/serie-a/icon.png b/src/assets/img/homepage/serie-a/icon.png similarity index 100% rename from client/src/assets/img/homepage/serie-a/icon.png rename to src/assets/img/homepage/serie-a/icon.png diff --git a/client/src/assets/img/homepage/serie-a/title.png b/src/assets/img/homepage/serie-a/title.png similarity index 100% rename from client/src/assets/img/homepage/serie-a/title.png rename to src/assets/img/homepage/serie-a/title.png diff --git a/client/src/assets/img/logo.png b/src/assets/img/logo.png similarity index 100% rename from client/src/assets/img/logo.png rename to src/assets/img/logo.png diff --git a/client/src/assets/img/navigation-bar/logo.png b/src/assets/img/navigation-bar/logo.png similarity index 100% rename from client/src/assets/img/navigation-bar/logo.png rename to src/assets/img/navigation-bar/logo.png diff --git a/client/src/assets/img/navigation-bar/user-menu/account-pane/delete-club-hover.png b/src/assets/img/navigation-bar/user-menu/account-pane/delete-club-hover.png similarity index 100% rename from client/src/assets/img/navigation-bar/user-menu/account-pane/delete-club-hover.png rename to src/assets/img/navigation-bar/user-menu/account-pane/delete-club-hover.png diff --git a/client/src/assets/img/navigation-bar/user-menu/account-pane/delete-club.png b/src/assets/img/navigation-bar/user-menu/account-pane/delete-club.png similarity index 100% rename from client/src/assets/img/navigation-bar/user-menu/account-pane/delete-club.png rename to src/assets/img/navigation-bar/user-menu/account-pane/delete-club.png diff --git a/client/src/assets/img/navigation-bar/user-menu/user-button.png b/src/assets/img/navigation-bar/user-menu/user-button.png similarity index 100% rename from client/src/assets/img/navigation-bar/user-menu/user-button.png rename to src/assets/img/navigation-bar/user-menu/user-button.png diff --git a/client/src/assets/js/club-page/favorite-button.js b/src/assets/js/club-page/favorite-button.js similarity index 100% rename from client/src/assets/js/club-page/favorite-button.js rename to src/assets/js/club-page/favorite-button.js diff --git a/client/src/assets/js/club-page/player-card-hover.js b/src/assets/js/club-page/player-card-hover.js similarity index 100% rename from client/src/assets/js/club-page/player-card-hover.js rename to src/assets/js/club-page/player-card-hover.js diff --git a/client/src/assets/js/league-page/change-goal-difference-color.js b/src/assets/js/league-page/change-goal-difference-color.js similarity index 100% rename from client/src/assets/js/league-page/change-goal-difference-color.js rename to src/assets/js/league-page/change-goal-difference-color.js diff --git a/client/src/assets/js/navigation-bar/navigation-bar-follow.js b/src/assets/js/navigation-bar/navigation-bar-follow.js similarity index 100% rename from client/src/assets/js/navigation-bar/navigation-bar-follow.js rename to src/assets/js/navigation-bar/navigation-bar-follow.js diff --git a/client/src/assets/js/navigation-bar/user/delete-account-favorite-club.js b/src/assets/js/navigation-bar/user/delete-account-favorite-club.js similarity index 100% rename from client/src/assets/js/navigation-bar/user/delete-account-favorite-club.js rename to src/assets/js/navigation-bar/user/delete-account-favorite-club.js diff --git a/client/src/assets/js/navigation-bar/user/login-and-register-page-linking.js b/src/assets/js/navigation-bar/user/login-and-register-page-linking.js similarity index 100% rename from client/src/assets/js/navigation-bar/user/login-and-register-page-linking.js rename to src/assets/js/navigation-bar/user/login-and-register-page-linking.js diff --git a/client/src/assets/middleware/clubs-page/get-current-club-information.js b/src/assets/middleware/clubs-page/get-current-club-information.js similarity index 100% rename from client/src/assets/middleware/clubs-page/get-current-club-information.js rename to src/assets/middleware/clubs-page/get-current-club-information.js diff --git a/client/src/assets/middleware/leagues-page/get-current-league-information.js b/src/assets/middleware/leagues-page/get-current-league-information.js similarity index 100% rename from client/src/assets/middleware/leagues-page/get-current-league-information.js rename to src/assets/middleware/leagues-page/get-current-league-information.js diff --git a/client/src/assets/middleware/leagues-page/get-current-league-top-scorers.js b/src/assets/middleware/leagues-page/get-current-league-top-scorers.js similarity index 100% rename from client/src/assets/middleware/leagues-page/get-current-league-top-scorers.js rename to src/assets/middleware/leagues-page/get-current-league-top-scorers.js diff --git a/client/src/assets/middleware/navigation-bar/convert-time.js b/src/assets/middleware/navigation-bar/convert-time.js similarity index 100% rename from client/src/assets/middleware/navigation-bar/convert-time.js rename to src/assets/middleware/navigation-bar/convert-time.js diff --git a/client/src/assets/middleware/navigation-bar/current-match-information.js b/src/assets/middleware/navigation-bar/current-match-information.js similarity index 100% rename from client/src/assets/middleware/navigation-bar/current-match-information.js rename to src/assets/middleware/navigation-bar/current-match-information.js diff --git a/client/src/assets/routes/club-pages/generate-club-routes.js b/src/assets/routes/club-pages/generate-club-routes.js similarity index 100% rename from client/src/assets/routes/club-pages/generate-club-routes.js rename to src/assets/routes/club-pages/generate-club-routes.js diff --git a/client/src/assets/routes/club-pages/redirect-to-club-url.js b/src/assets/routes/club-pages/redirect-to-club-url.js similarity index 100% rename from client/src/assets/routes/club-pages/redirect-to-club-url.js rename to src/assets/routes/club-pages/redirect-to-club-url.js diff --git a/client/src/assets/routes/league-pages/generate-league-routes.js b/src/assets/routes/league-pages/generate-league-routes.js similarity index 100% rename from client/src/assets/routes/league-pages/generate-league-routes.js rename to src/assets/routes/league-pages/generate-league-routes.js diff --git a/client/src/assets/routes/league-pages/get-team-names-for-registry.js b/src/assets/routes/league-pages/get-team-names-for-registry.js similarity index 100% rename from client/src/assets/routes/league-pages/get-team-names-for-registry.js rename to src/assets/routes/league-pages/get-team-names-for-registry.js diff --git a/client/src/assets/routes/league-pages/redirect-to-league-url.js b/src/assets/routes/league-pages/redirect-to-league-url.js similarity index 100% rename from client/src/assets/routes/league-pages/redirect-to-league-url.js rename to src/assets/routes/league-pages/redirect-to-league-url.js diff --git a/client/src/views/layouts/main.hbs b/src/views/layouts/main.hbs similarity index 100% rename from client/src/views/layouts/main.hbs rename to src/views/layouts/main.hbs diff --git a/client/src/views/pages/clubs-page.hbs b/src/views/pages/clubs-page.hbs similarity index 100% rename from client/src/views/pages/clubs-page.hbs rename to src/views/pages/clubs-page.hbs diff --git a/client/src/views/pages/home.hbs b/src/views/pages/home.hbs similarity index 100% rename from client/src/views/pages/home.hbs rename to src/views/pages/home.hbs diff --git a/client/src/views/pages/leagues-page.hbs b/src/views/pages/leagues-page.hbs similarity index 100% rename from client/src/views/pages/leagues-page.hbs rename to src/views/pages/leagues-page.hbs diff --git a/client/src/views/partials/club-page/player-card.hbs b/src/views/partials/club-page/player-card.hbs similarity index 100% rename from client/src/views/partials/club-page/player-card.hbs rename to src/views/partials/club-page/player-card.hbs diff --git a/client/src/views/partials/club-page/player-hover.hbs b/src/views/partials/club-page/player-hover.hbs similarity index 100% rename from client/src/views/partials/club-page/player-hover.hbs rename to src/views/partials/club-page/player-hover.hbs diff --git a/client/src/views/partials/footer.hbs b/src/views/partials/footer.hbs similarity index 100% rename from client/src/views/partials/footer.hbs rename to src/views/partials/footer.hbs diff --git a/client/src/views/partials/head.hbs b/src/views/partials/head.hbs similarity index 100% rename from client/src/views/partials/head.hbs rename to src/views/partials/head.hbs diff --git a/client/src/views/partials/homepage/league-card.hbs b/src/views/partials/homepage/league-card.hbs similarity index 100% rename from client/src/views/partials/homepage/league-card.hbs rename to src/views/partials/homepage/league-card.hbs diff --git a/client/src/views/partials/message.hbs b/src/views/partials/message.hbs similarity index 100% rename from client/src/views/partials/message.hbs rename to src/views/partials/message.hbs diff --git a/client/src/views/partials/navigation-bar/nav.hbs b/src/views/partials/navigation-bar/nav.hbs similarity index 100% rename from client/src/views/partials/navigation-bar/nav.hbs rename to src/views/partials/navigation-bar/nav.hbs diff --git a/client/src/views/partials/navigation-bar/scoreboard-header/game-card.hbs b/src/views/partials/navigation-bar/scoreboard-header/game-card.hbs similarity index 100% rename from client/src/views/partials/navigation-bar/scoreboard-header/game-card.hbs rename to src/views/partials/navigation-bar/scoreboard-header/game-card.hbs diff --git a/client/src/views/partials/navigation-bar/scoreboard-header/scoreboard-header.hbs b/src/views/partials/navigation-bar/scoreboard-header/scoreboard-header.hbs similarity index 100% rename from client/src/views/partials/navigation-bar/scoreboard-header/scoreboard-header.hbs rename to src/views/partials/navigation-bar/scoreboard-header/scoreboard-header.hbs diff --git a/client/src/views/partials/navigation-bar/user-menu/account-screen.hbs b/src/views/partials/navigation-bar/user-menu/account-screen.hbs similarity index 100% rename from client/src/views/partials/navigation-bar/user-menu/account-screen.hbs rename to src/views/partials/navigation-bar/user-menu/account-screen.hbs diff --git a/client/src/views/partials/navigation-bar/user-menu/login.hbs b/src/views/partials/navigation-bar/user-menu/login.hbs similarity index 100% rename from client/src/views/partials/navigation-bar/user-menu/login.hbs rename to src/views/partials/navigation-bar/user-menu/login.hbs diff --git a/client/src/views/partials/navigation-bar/user-menu/register.hbs b/src/views/partials/navigation-bar/user-menu/register.hbs similarity index 100% rename from client/src/views/partials/navigation-bar/user-menu/register.hbs rename to src/views/partials/navigation-bar/user-menu/register.hbs