From 1554f67a16dc2c15e9427f9f3b747f96a5370d8d Mon Sep 17 00:00:00 2001 From: Lucas Patenaude Date: Tue, 30 Apr 2024 18:27:03 -0600 Subject: [PATCH] More fixes to file structure --- client/docker-compose.yaml | 4 ++-- .../club-pages/club-page-layouts.css | 0 .../club-pages/club-page-styling.css | 0 .../css/generated-pages/generated-pages-styling.css | 0 .../generated-pages/league-pages/league-page.css | 0 .../generated-pages/league-pages/league-table.css | 0 .../league-pages/league-top-scorers.css | 0 .../{resources => 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 .../css/login-and-registration/registration.css | 0 .../css/navigation-bar/account-screen.css | 0 .../css/navigation-bar/navigation-bar.css | 0 .../navigation-bar/scoreboard-header/game-card.css | 0 .../navigation-bar/scoreboard-header/scoreboard.css | 0 .../fonts/Scottsdale-Italic.ttf | Bin .../img/club-page/cant-favorite.png | Bin .../img/club-page/favorited.png | Bin .../img/club-page/unfavorited.png | Bin .../img/homepage/brasileirao/icon.png | Bin .../img/homepage/brasileirao/title.png | Bin .../img/homepage/bundesliga/icon.png | Bin .../img/homepage/bundesliga/title.png | Bin .../img/homepage/la-liga/icon.png | Bin .../img/homepage/la-liga/title.png | Bin .../img/homepage/ligue-1/icon.png | Bin .../img/homepage/ligue-1/title.png | Bin .../img/homepage/premier-league/icon.png | Bin .../img/homepage/premier-league/title.png | Bin .../img/homepage/serie-a/icon.png | Bin .../img/homepage/serie-a/title.png | Bin client/src/{resources => assets}/img/logo.png | Bin .../img/navigation-bar/logo.png | Bin .../user-menu/account-pane/delete-club-hover.png | Bin .../user-menu/account-pane/delete-club.png | Bin .../img/navigation-bar/user-menu/user-button.png | Bin .../js/club-page/favorite-button.js | 0 .../js/club-page/player-card-hover.js | 0 .../js/league-page/change-goal-difference-color.js | 0 .../js/navigation-bar/navigation-bar-follow.js | 0 .../user/delete-account-favorite-club.js | 0 .../user/login-and-register-page-linking.js | 0 .../clubs-page/get-current-club-information.js | 0 .../leagues-page/get-current-league-information.js | 0 .../leagues-page/get-current-league-top-scorers.js | 0 .../middleware/navigation-bar/convert-time.js | 0 .../navigation-bar/current-match-information.js | 0 .../routes/club-pages/generate-club-routes.js | 0 .../routes/club-pages/redirect-to-club-url.js | 0 .../routes/league-pages/generate-league-routes.js | 0 .../league-pages/get-team-names-for-registry.js | 0 .../routes/league-pages/redirect-to-league-url.js | 0 {client/test => test}/server.spec.js | 2 +- 54 files changed, 3 insertions(+), 3 deletions(-) rename client/src/{resources => assets}/css/generated-pages/club-pages/club-page-layouts.css (100%) rename client/src/{resources => assets}/css/generated-pages/club-pages/club-page-styling.css (100%) rename client/src/{resources => assets}/css/generated-pages/generated-pages-styling.css (100%) rename client/src/{resources => assets}/css/generated-pages/league-pages/league-page.css (100%) rename client/src/{resources => assets}/css/generated-pages/league-pages/league-table.css (100%) rename client/src/{resources => assets}/css/generated-pages/league-pages/league-top-scorers.css (100%) rename client/src/{resources => assets}/css/homepage/homepage.css (100%) rename client/src/{resources => assets}/css/login-and-registration/account.css (100%) rename client/src/{resources => assets}/css/login-and-registration/login.css (100%) rename client/src/{resources => assets}/css/login-and-registration/login_and_registration.css (100%) rename client/src/{resources => assets}/css/login-and-registration/registration.css (100%) rename client/src/{resources => assets}/css/navigation-bar/account-screen.css (100%) rename client/src/{resources => assets}/css/navigation-bar/navigation-bar.css (100%) rename client/src/{resources => assets}/css/navigation-bar/scoreboard-header/game-card.css (100%) rename client/src/{resources => assets}/css/navigation-bar/scoreboard-header/scoreboard.css (100%) rename client/src/{resources => assets}/fonts/Scottsdale-Italic.ttf (100%) rename client/src/{resources => assets}/img/club-page/cant-favorite.png (100%) rename client/src/{resources => assets}/img/club-page/favorited.png (100%) rename client/src/{resources => assets}/img/club-page/unfavorited.png (100%) rename client/src/{resources => assets}/img/homepage/brasileirao/icon.png (100%) rename client/src/{resources => assets}/img/homepage/brasileirao/title.png (100%) rename client/src/{resources => assets}/img/homepage/bundesliga/icon.png (100%) rename client/src/{resources => assets}/img/homepage/bundesliga/title.png (100%) rename client/src/{resources => assets}/img/homepage/la-liga/icon.png (100%) rename client/src/{resources => assets}/img/homepage/la-liga/title.png (100%) rename client/src/{resources => assets}/img/homepage/ligue-1/icon.png (100%) rename client/src/{resources => assets}/img/homepage/ligue-1/title.png (100%) rename client/src/{resources => assets}/img/homepage/premier-league/icon.png (100%) rename client/src/{resources => assets}/img/homepage/premier-league/title.png (100%) rename client/src/{resources => assets}/img/homepage/serie-a/icon.png (100%) rename client/src/{resources => assets}/img/homepage/serie-a/title.png (100%) rename client/src/{resources => assets}/img/logo.png (100%) rename client/src/{resources => assets}/img/navigation-bar/logo.png (100%) rename client/src/{resources => assets}/img/navigation-bar/user-menu/account-pane/delete-club-hover.png (100%) rename client/src/{resources => assets}/img/navigation-bar/user-menu/account-pane/delete-club.png (100%) rename client/src/{resources => assets}/img/navigation-bar/user-menu/user-button.png (100%) rename client/src/{resources => assets}/js/club-page/favorite-button.js (100%) rename client/src/{resources => assets}/js/club-page/player-card-hover.js (100%) rename client/src/{resources => assets}/js/league-page/change-goal-difference-color.js (100%) rename client/src/{resources => assets}/js/navigation-bar/navigation-bar-follow.js (100%) rename client/src/{resources => assets}/js/navigation-bar/user/delete-account-favorite-club.js (100%) rename client/src/{resources => assets}/js/navigation-bar/user/login-and-register-page-linking.js (100%) rename client/src/{resources => assets}/middleware/clubs-page/get-current-club-information.js (100%) rename client/src/{resources => assets}/middleware/leagues-page/get-current-league-information.js (100%) rename client/src/{resources => assets}/middleware/leagues-page/get-current-league-top-scorers.js (100%) rename client/src/{resources => assets}/middleware/navigation-bar/convert-time.js (100%) rename client/src/{resources => assets}/middleware/navigation-bar/current-match-information.js (100%) rename client/src/{resources => assets}/routes/club-pages/generate-club-routes.js (100%) rename client/src/{resources => assets}/routes/club-pages/redirect-to-club-url.js (100%) rename client/src/{resources => assets}/routes/league-pages/generate-league-routes.js (100%) rename client/src/{resources => assets}/routes/league-pages/get-team-names-for-registry.js (100%) rename client/src/{resources => assets}/routes/league-pages/redirect-to-league-url.js (100%) rename {client/test => test}/server.spec.js (96%) diff --git a/client/docker-compose.yaml b/client/docker-compose.yaml index ba88fc4..8958c80 100644 --- a/client/docker-compose.yaml +++ b/client/docker-compose.yaml @@ -31,8 +31,8 @@ services: ports: - '3000:3000' volumes: - - ../ProjectSourceCode:/home/node/app # Mount ProjectSourceCode directory - - ../ProjectSourceCode/node_modules:/home/node/app/node_modules # Mount node_modules directory + - ../client:/home/node/app # Mount ProjectSourceCode directory + - ../client/node_modules:/home/node/app/node_modules # Mount node_modules directory command: 'npm run start' volumes: group-project: \ No newline at end of file diff --git a/client/src/resources/css/generated-pages/club-pages/club-page-layouts.css b/client/src/assets/css/generated-pages/club-pages/club-page-layouts.css similarity index 100% rename from client/src/resources/css/generated-pages/club-pages/club-page-layouts.css rename to client/src/assets/css/generated-pages/club-pages/club-page-layouts.css diff --git a/client/src/resources/css/generated-pages/club-pages/club-page-styling.css b/client/src/assets/css/generated-pages/club-pages/club-page-styling.css similarity index 100% rename from client/src/resources/css/generated-pages/club-pages/club-page-styling.css rename to client/src/assets/css/generated-pages/club-pages/club-page-styling.css diff --git a/client/src/resources/css/generated-pages/generated-pages-styling.css b/client/src/assets/css/generated-pages/generated-pages-styling.css similarity index 100% rename from client/src/resources/css/generated-pages/generated-pages-styling.css rename to client/src/assets/css/generated-pages/generated-pages-styling.css diff --git a/client/src/resources/css/generated-pages/league-pages/league-page.css b/client/src/assets/css/generated-pages/league-pages/league-page.css similarity index 100% rename from client/src/resources/css/generated-pages/league-pages/league-page.css rename to client/src/assets/css/generated-pages/league-pages/league-page.css diff --git a/client/src/resources/css/generated-pages/league-pages/league-table.css b/client/src/assets/css/generated-pages/league-pages/league-table.css similarity index 100% rename from client/src/resources/css/generated-pages/league-pages/league-table.css rename to client/src/assets/css/generated-pages/league-pages/league-table.css diff --git a/client/src/resources/css/generated-pages/league-pages/league-top-scorers.css b/client/src/assets/css/generated-pages/league-pages/league-top-scorers.css similarity index 100% rename from client/src/resources/css/generated-pages/league-pages/league-top-scorers.css rename to client/src/assets/css/generated-pages/league-pages/league-top-scorers.css diff --git a/client/src/resources/css/homepage/homepage.css b/client/src/assets/css/homepage/homepage.css similarity index 100% rename from client/src/resources/css/homepage/homepage.css rename to client/src/assets/css/homepage/homepage.css diff --git a/client/src/resources/css/login-and-registration/account.css b/client/src/assets/css/login-and-registration/account.css similarity index 100% rename from client/src/resources/css/login-and-registration/account.css rename to client/src/assets/css/login-and-registration/account.css diff --git a/client/src/resources/css/login-and-registration/login.css b/client/src/assets/css/login-and-registration/login.css similarity index 100% rename from client/src/resources/css/login-and-registration/login.css rename to client/src/assets/css/login-and-registration/login.css diff --git a/client/src/resources/css/login-and-registration/login_and_registration.css b/client/src/assets/css/login-and-registration/login_and_registration.css similarity index 100% rename from client/src/resources/css/login-and-registration/login_and_registration.css rename to client/src/assets/css/login-and-registration/login_and_registration.css diff --git a/client/src/resources/css/login-and-registration/registration.css b/client/src/assets/css/login-and-registration/registration.css similarity index 100% rename from client/src/resources/css/login-and-registration/registration.css rename to client/src/assets/css/login-and-registration/registration.css diff --git a/client/src/resources/css/navigation-bar/account-screen.css b/client/src/assets/css/navigation-bar/account-screen.css similarity index 100% rename from client/src/resources/css/navigation-bar/account-screen.css rename to client/src/assets/css/navigation-bar/account-screen.css diff --git a/client/src/resources/css/navigation-bar/navigation-bar.css b/client/src/assets/css/navigation-bar/navigation-bar.css similarity index 100% rename from client/src/resources/css/navigation-bar/navigation-bar.css rename to client/src/assets/css/navigation-bar/navigation-bar.css diff --git a/client/src/resources/css/navigation-bar/scoreboard-header/game-card.css b/client/src/assets/css/navigation-bar/scoreboard-header/game-card.css similarity index 100% rename from client/src/resources/css/navigation-bar/scoreboard-header/game-card.css rename to client/src/assets/css/navigation-bar/scoreboard-header/game-card.css diff --git a/client/src/resources/css/navigation-bar/scoreboard-header/scoreboard.css b/client/src/assets/css/navigation-bar/scoreboard-header/scoreboard.css similarity index 100% rename from client/src/resources/css/navigation-bar/scoreboard-header/scoreboard.css rename to client/src/assets/css/navigation-bar/scoreboard-header/scoreboard.css diff --git a/client/src/resources/fonts/Scottsdale-Italic.ttf b/client/src/assets/fonts/Scottsdale-Italic.ttf similarity index 100% rename from client/src/resources/fonts/Scottsdale-Italic.ttf rename to client/src/assets/fonts/Scottsdale-Italic.ttf diff --git a/client/src/resources/img/club-page/cant-favorite.png b/client/src/assets/img/club-page/cant-favorite.png similarity index 100% rename from client/src/resources/img/club-page/cant-favorite.png rename to client/src/assets/img/club-page/cant-favorite.png diff --git a/client/src/resources/img/club-page/favorited.png b/client/src/assets/img/club-page/favorited.png similarity index 100% rename from client/src/resources/img/club-page/favorited.png rename to client/src/assets/img/club-page/favorited.png diff --git a/client/src/resources/img/club-page/unfavorited.png b/client/src/assets/img/club-page/unfavorited.png similarity index 100% rename from client/src/resources/img/club-page/unfavorited.png rename to client/src/assets/img/club-page/unfavorited.png diff --git a/client/src/resources/img/homepage/brasileirao/icon.png b/client/src/assets/img/homepage/brasileirao/icon.png similarity index 100% rename from client/src/resources/img/homepage/brasileirao/icon.png rename to client/src/assets/img/homepage/brasileirao/icon.png diff --git a/client/src/resources/img/homepage/brasileirao/title.png b/client/src/assets/img/homepage/brasileirao/title.png similarity index 100% rename from client/src/resources/img/homepage/brasileirao/title.png rename to client/src/assets/img/homepage/brasileirao/title.png diff --git a/client/src/resources/img/homepage/bundesliga/icon.png b/client/src/assets/img/homepage/bundesliga/icon.png similarity index 100% rename from client/src/resources/img/homepage/bundesliga/icon.png rename to client/src/assets/img/homepage/bundesliga/icon.png diff --git a/client/src/resources/img/homepage/bundesliga/title.png b/client/src/assets/img/homepage/bundesliga/title.png similarity index 100% rename from client/src/resources/img/homepage/bundesliga/title.png rename to client/src/assets/img/homepage/bundesliga/title.png diff --git a/client/src/resources/img/homepage/la-liga/icon.png b/client/src/assets/img/homepage/la-liga/icon.png similarity index 100% rename from client/src/resources/img/homepage/la-liga/icon.png rename to client/src/assets/img/homepage/la-liga/icon.png diff --git a/client/src/resources/img/homepage/la-liga/title.png b/client/src/assets/img/homepage/la-liga/title.png similarity index 100% rename from client/src/resources/img/homepage/la-liga/title.png rename to client/src/assets/img/homepage/la-liga/title.png diff --git a/client/src/resources/img/homepage/ligue-1/icon.png b/client/src/assets/img/homepage/ligue-1/icon.png similarity index 100% rename from client/src/resources/img/homepage/ligue-1/icon.png rename to client/src/assets/img/homepage/ligue-1/icon.png diff --git a/client/src/resources/img/homepage/ligue-1/title.png b/client/src/assets/img/homepage/ligue-1/title.png similarity index 100% rename from client/src/resources/img/homepage/ligue-1/title.png rename to client/src/assets/img/homepage/ligue-1/title.png diff --git a/client/src/resources/img/homepage/premier-league/icon.png b/client/src/assets/img/homepage/premier-league/icon.png similarity index 100% rename from client/src/resources/img/homepage/premier-league/icon.png rename to client/src/assets/img/homepage/premier-league/icon.png diff --git a/client/src/resources/img/homepage/premier-league/title.png b/client/src/assets/img/homepage/premier-league/title.png similarity index 100% rename from client/src/resources/img/homepage/premier-league/title.png rename to client/src/assets/img/homepage/premier-league/title.png diff --git a/client/src/resources/img/homepage/serie-a/icon.png b/client/src/assets/img/homepage/serie-a/icon.png similarity index 100% rename from client/src/resources/img/homepage/serie-a/icon.png rename to client/src/assets/img/homepage/serie-a/icon.png diff --git a/client/src/resources/img/homepage/serie-a/title.png b/client/src/assets/img/homepage/serie-a/title.png similarity index 100% rename from client/src/resources/img/homepage/serie-a/title.png rename to client/src/assets/img/homepage/serie-a/title.png diff --git a/client/src/resources/img/logo.png b/client/src/assets/img/logo.png similarity index 100% rename from client/src/resources/img/logo.png rename to client/src/assets/img/logo.png diff --git a/client/src/resources/img/navigation-bar/logo.png b/client/src/assets/img/navigation-bar/logo.png similarity index 100% rename from client/src/resources/img/navigation-bar/logo.png rename to client/src/assets/img/navigation-bar/logo.png diff --git a/client/src/resources/img/navigation-bar/user-menu/account-pane/delete-club-hover.png b/client/src/assets/img/navigation-bar/user-menu/account-pane/delete-club-hover.png similarity index 100% rename from client/src/resources/img/navigation-bar/user-menu/account-pane/delete-club-hover.png rename to client/src/assets/img/navigation-bar/user-menu/account-pane/delete-club-hover.png diff --git a/client/src/resources/img/navigation-bar/user-menu/account-pane/delete-club.png b/client/src/assets/img/navigation-bar/user-menu/account-pane/delete-club.png similarity index 100% rename from client/src/resources/img/navigation-bar/user-menu/account-pane/delete-club.png rename to client/src/assets/img/navigation-bar/user-menu/account-pane/delete-club.png diff --git a/client/src/resources/img/navigation-bar/user-menu/user-button.png b/client/src/assets/img/navigation-bar/user-menu/user-button.png similarity index 100% rename from client/src/resources/img/navigation-bar/user-menu/user-button.png rename to client/src/assets/img/navigation-bar/user-menu/user-button.png diff --git a/client/src/resources/js/club-page/favorite-button.js b/client/src/assets/js/club-page/favorite-button.js similarity index 100% rename from client/src/resources/js/club-page/favorite-button.js rename to client/src/assets/js/club-page/favorite-button.js diff --git a/client/src/resources/js/club-page/player-card-hover.js b/client/src/assets/js/club-page/player-card-hover.js similarity index 100% rename from client/src/resources/js/club-page/player-card-hover.js rename to client/src/assets/js/club-page/player-card-hover.js diff --git a/client/src/resources/js/league-page/change-goal-difference-color.js b/client/src/assets/js/league-page/change-goal-difference-color.js similarity index 100% rename from client/src/resources/js/league-page/change-goal-difference-color.js rename to client/src/assets/js/league-page/change-goal-difference-color.js diff --git a/client/src/resources/js/navigation-bar/navigation-bar-follow.js b/client/src/assets/js/navigation-bar/navigation-bar-follow.js similarity index 100% rename from client/src/resources/js/navigation-bar/navigation-bar-follow.js rename to client/src/assets/js/navigation-bar/navigation-bar-follow.js diff --git a/client/src/resources/js/navigation-bar/user/delete-account-favorite-club.js b/client/src/assets/js/navigation-bar/user/delete-account-favorite-club.js similarity index 100% rename from client/src/resources/js/navigation-bar/user/delete-account-favorite-club.js rename to client/src/assets/js/navigation-bar/user/delete-account-favorite-club.js diff --git a/client/src/resources/js/navigation-bar/user/login-and-register-page-linking.js b/client/src/assets/js/navigation-bar/user/login-and-register-page-linking.js similarity index 100% rename from client/src/resources/js/navigation-bar/user/login-and-register-page-linking.js rename to client/src/assets/js/navigation-bar/user/login-and-register-page-linking.js diff --git a/client/src/resources/middleware/clubs-page/get-current-club-information.js b/client/src/assets/middleware/clubs-page/get-current-club-information.js similarity index 100% rename from client/src/resources/middleware/clubs-page/get-current-club-information.js rename to client/src/assets/middleware/clubs-page/get-current-club-information.js diff --git a/client/src/resources/middleware/leagues-page/get-current-league-information.js b/client/src/assets/middleware/leagues-page/get-current-league-information.js similarity index 100% rename from client/src/resources/middleware/leagues-page/get-current-league-information.js rename to client/src/assets/middleware/leagues-page/get-current-league-information.js diff --git a/client/src/resources/middleware/leagues-page/get-current-league-top-scorers.js b/client/src/assets/middleware/leagues-page/get-current-league-top-scorers.js similarity index 100% rename from client/src/resources/middleware/leagues-page/get-current-league-top-scorers.js rename to client/src/assets/middleware/leagues-page/get-current-league-top-scorers.js diff --git a/client/src/resources/middleware/navigation-bar/convert-time.js b/client/src/assets/middleware/navigation-bar/convert-time.js similarity index 100% rename from client/src/resources/middleware/navigation-bar/convert-time.js rename to client/src/assets/middleware/navigation-bar/convert-time.js diff --git a/client/src/resources/middleware/navigation-bar/current-match-information.js b/client/src/assets/middleware/navigation-bar/current-match-information.js similarity index 100% rename from client/src/resources/middleware/navigation-bar/current-match-information.js rename to client/src/assets/middleware/navigation-bar/current-match-information.js diff --git a/client/src/resources/routes/club-pages/generate-club-routes.js b/client/src/assets/routes/club-pages/generate-club-routes.js similarity index 100% rename from client/src/resources/routes/club-pages/generate-club-routes.js rename to client/src/assets/routes/club-pages/generate-club-routes.js diff --git a/client/src/resources/routes/club-pages/redirect-to-club-url.js b/client/src/assets/routes/club-pages/redirect-to-club-url.js similarity index 100% rename from client/src/resources/routes/club-pages/redirect-to-club-url.js rename to client/src/assets/routes/club-pages/redirect-to-club-url.js diff --git a/client/src/resources/routes/league-pages/generate-league-routes.js b/client/src/assets/routes/league-pages/generate-league-routes.js similarity index 100% rename from client/src/resources/routes/league-pages/generate-league-routes.js rename to client/src/assets/routes/league-pages/generate-league-routes.js diff --git a/client/src/resources/routes/league-pages/get-team-names-for-registry.js b/client/src/assets/routes/league-pages/get-team-names-for-registry.js similarity index 100% rename from client/src/resources/routes/league-pages/get-team-names-for-registry.js rename to client/src/assets/routes/league-pages/get-team-names-for-registry.js diff --git a/client/src/resources/routes/league-pages/redirect-to-league-url.js b/client/src/assets/routes/league-pages/redirect-to-league-url.js similarity index 100% rename from client/src/resources/routes/league-pages/redirect-to-league-url.js rename to client/src/assets/routes/league-pages/redirect-to-league-url.js diff --git a/client/test/server.spec.js b/test/server.spec.js similarity index 96% rename from client/test/server.spec.js rename to test/server.spec.js index a082ba1..32df53b 100644 --- a/client/test/server.spec.js +++ b/test/server.spec.js @@ -1,7 +1,7 @@ // ********************** Initialize server ********************************** -const server = require('../src/index.js'); //TODO: Make sure the path to your index.js is correctly added +const server = require('../client/src/index.js'); //TODO: Make sure the path to your index.js is correctly added // ********************** Import Libraries ***********************************