diff --git a/web/Dockerfile.production b/web/Dockerfile.production index 8791577..1ea005e 100644 --- a/web/Dockerfile.production +++ b/web/Dockerfile.production @@ -44,8 +44,8 @@ COPY --from=build /app/dist /usr/share/nginx/html COPY --link _redirects /usr/share/nginx/html/_redirects COPY nginx.conf /etc/nginx/nginx.conf -# Serve the assets folder -COPY --link src/assets /usr/share/nginx/html/assets +# Serve the public folder +COPY --link public /usr/share/nginx/html/public # Start the server by default, this can be overwritten at runtime EXPOSE 80 diff --git a/web/src/assets/Volunteers-logo-footer.jpg b/web/public/assets/Volunteers-logo-footer.jpg similarity index 100% rename from web/src/assets/Volunteers-logo-footer.jpg rename to web/public/assets/Volunteers-logo-footer.jpg diff --git a/web/src/assets/club-logo.svg b/web/public/assets/club-logo.svg similarity index 100% rename from web/src/assets/club-logo.svg rename to web/public/assets/club-logo.svg diff --git a/web/src/assets/gallery/events/sample1.png b/web/public/assets/gallery/events/sample1.png similarity index 100% rename from web/src/assets/gallery/events/sample1.png rename to web/public/assets/gallery/events/sample1.png diff --git a/web/src/assets/gallery/events/sample2.png b/web/public/assets/gallery/events/sample2.png similarity index 100% rename from web/src/assets/gallery/events/sample2.png rename to web/public/assets/gallery/events/sample2.png diff --git a/web/src/assets/gallery/events/sample3.png b/web/public/assets/gallery/events/sample3.png similarity index 100% rename from web/src/assets/gallery/events/sample3.png rename to web/public/assets/gallery/events/sample3.png diff --git a/web/src/assets/gallery/events/sample4.png b/web/public/assets/gallery/events/sample4.png similarity index 100% rename from web/src/assets/gallery/events/sample4.png rename to web/public/assets/gallery/events/sample4.png diff --git a/web/src/assets/gallery/sponsors/bw/kompass-logo-bw.png b/web/public/assets/gallery/sponsors/bw/kompass-logo-bw.png similarity index 100% rename from web/src/assets/gallery/sponsors/bw/kompass-logo-bw.png rename to web/public/assets/gallery/sponsors/bw/kompass-logo-bw.png diff --git a/web/src/assets/gallery/sponsors/bw/sals-logo-bw.png b/web/public/assets/gallery/sponsors/bw/sals-logo-bw.png similarity index 100% rename from web/src/assets/gallery/sponsors/bw/sals-logo-bw.png rename to web/public/assets/gallery/sponsors/bw/sals-logo-bw.png diff --git a/web/src/assets/gallery/sponsors/bw/shelf-logo-bw.png b/web/public/assets/gallery/sponsors/bw/shelf-logo-bw.png similarity index 100% rename from web/src/assets/gallery/sponsors/bw/shelf-logo-bw.png rename to web/public/assets/gallery/sponsors/bw/shelf-logo-bw.png diff --git a/web/src/assets/gallery/sponsors/colour/kompass-logo-colour.png b/web/public/assets/gallery/sponsors/colour/kompass-logo-colour.png similarity index 100% rename from web/src/assets/gallery/sponsors/colour/kompass-logo-colour.png rename to web/public/assets/gallery/sponsors/colour/kompass-logo-colour.png diff --git a/web/src/assets/gallery/sponsors/colour/sals-logo-colour.png b/web/public/assets/gallery/sponsors/colour/sals-logo-colour.png similarity index 100% rename from web/src/assets/gallery/sponsors/colour/sals-logo-colour.png rename to web/public/assets/gallery/sponsors/colour/sals-logo-colour.png diff --git a/web/src/assets/gallery/sponsors/colour/shelf-logo-colour.png b/web/public/assets/gallery/sponsors/colour/shelf-logo-colour.png similarity index 100% rename from web/src/assets/gallery/sponsors/colour/shelf-logo-colour.png rename to web/public/assets/gallery/sponsors/colour/shelf-logo-colour.png diff --git a/web/src/assets/header-logo.svg b/web/public/assets/header-logo.svg similarity index 100% rename from web/src/assets/header-logo.svg rename to web/public/assets/header-logo.svg diff --git a/web/src/assets/react.svg b/web/public/assets/react.svg similarity index 100% rename from web/src/assets/react.svg rename to web/public/assets/react.svg diff --git a/web/src/assets/sidebar/dashboard-icon.svg b/web/public/assets/sidebar/dashboard-icon.svg similarity index 100% rename from web/src/assets/sidebar/dashboard-icon.svg rename to web/public/assets/sidebar/dashboard-icon.svg diff --git a/web/src/assets/sidebar/discover-icon.svg b/web/public/assets/sidebar/discover-icon.svg similarity index 100% rename from web/src/assets/sidebar/discover-icon.svg rename to web/public/assets/sidebar/discover-icon.svg diff --git a/web/src/assets/sidebar/link-tab-mask.svg b/web/public/assets/sidebar/link-tab-mask.svg similarity index 100% rename from web/src/assets/sidebar/link-tab-mask.svg rename to web/public/assets/sidebar/link-tab-mask.svg diff --git a/web/src/assets/sidebar/logout-icon.svg b/web/public/assets/sidebar/logout-icon.svg similarity index 100% rename from web/src/assets/sidebar/logout-icon.svg rename to web/public/assets/sidebar/logout-icon.svg diff --git a/web/src/assets/sidebar/profile-icon.svg b/web/public/assets/sidebar/profile-icon.svg similarity index 100% rename from web/src/assets/sidebar/profile-icon.svg rename to web/public/assets/sidebar/profile-icon.svg diff --git a/web/src/assets/sidebar/settings-icon.svg b/web/public/assets/sidebar/settings-icon.svg similarity index 100% rename from web/src/assets/sidebar/settings-icon.svg rename to web/public/assets/sidebar/settings-icon.svg diff --git a/web/src/assets/sidebar/social-icon.svg b/web/public/assets/sidebar/social-icon.svg similarity index 100% rename from web/src/assets/sidebar/social-icon.svg rename to web/public/assets/sidebar/social-icon.svg diff --git a/web/src/components/Header.tsx b/web/src/components/Header.tsx index ad29e56..6fbac16 100644 --- a/web/src/components/Header.tsx +++ b/web/src/components/Header.tsx @@ -7,7 +7,7 @@ function Header() {
- Volunteers Club Logo + Volunteers Club Logo
diff --git a/web/src/data/MainGalleryEvents.json b/web/src/data/MainGalleryEvents.json index c74be70..942f614 100644 --- a/web/src/data/MainGalleryEvents.json +++ b/web/src/data/MainGalleryEvents.json @@ -2,7 +2,7 @@ "events": [ { "id": 1, - "imageSrc": "src/assets/gallery/events/sample1.png", + "imageSrc": "/public/assets/gallery/events/sample1.png", "title": "Pink Ribbon Breakfast", "description": "Qwoijhdoiasjiodoqwidihqoiasdqwdq", "alt": "Event 1" @@ -10,7 +10,7 @@ { "id": 2, - "imageSrc": "src/assets/gallery/events/sample2.png", + "imageSrc": "/public/assets/gallery/events/sample2.png", "title": "Dbink RDibbon BDreakfast", "description": "Description 2 ascas q2wq dwq qwd", "alt": "Event 2" @@ -18,7 +18,7 @@ { "id": 3, - "imageSrc": "src/assets/gallery/events/sample3.png", + "imageSrc": "/public/assets/gallery/events/sample3.png", "title": "Qwbink RDibboqwen BDreakfeqast", "description": "Descriptiwqeq112on 3", "alt": "Event 3" @@ -26,7 +26,7 @@ { "id": 4, - "imageSrc": "src/assets/gallery/events/sample4.png", + "imageSrc": "/public/assets/gallery/events/sample4.png", "title": "QwdwdwdwdRDibboqwen BDreakfeqast", "description": "Descriptiwqeq112on 3scriptiwqeq112on 3scriptiw qeq112on 3scriptiw qeq112on 3scr iptiwq eq112on 3scripti wqeq112on 3script iwqeq1 12on 3", "alt": "Event 4" diff --git a/web/src/data/SponsorList.json b/web/src/data/SponsorList.json index b21c70b..c3e4069 100644 --- a/web/src/data/SponsorList.json +++ b/web/src/data/SponsorList.json @@ -2,19 +2,19 @@ "sponsors": [ { "id": 1, - "imageSrcColour": "../src/assets/gallery/sponsors/colour/kompass-logo-colour.png", + "imageSrcColour": "/public/assets/gallery/sponsors/colour/kompass-logo-colour.png", "imageSrcBw": "../src/assets/gallery/sponsors/bw/kompass-logo-bw.png", "alt": "Kompass Coffee" }, { "id": 2, - "imageSrcColour": "../src/assets/gallery/sponsors/colour/shelf-logo-colour.png", + "imageSrcColour": "/public/assets/gallery/sponsors/colour/shelf-logo-colour.png", "imageSrcBw": "../src/assets/gallery/sponsors/bw/shelf-logo-bw.png", "alt": "The Shelf Cafe" }, { "id": 3, - "imageSrcColour": "../src/assets/gallery/sponsors/colour/sals-logo-colour.png", + "imageSrcColour": "/public/assets/gallery/sponsors/colour/sals-logo-colour.png", "imageSrcBw": "../src/assets/gallery/sponsors/bw/sals-logo-bw.png", "alt": "Sal's Pizza" } @@ -22,17 +22,17 @@ "discounts": [ { "id": 1, - "discount": "../src/assets/gallery/sponsors/colour/kompass-logo-colour.png", + "discount": "/public/assets/gallery/sponsors/colour/kompass-logo-colour.png", "alt": "Kompass Coffee" }, { "id": 2, - "discount": "../src/assets/gallery/sponsors/colour/shelf-logo-colour.png", + "discount": "/public/assets/gallery/sponsors/colour/shelf-logo-colour.png", "alt": "The Shelf Cafe" }, { "id": 3, - "discount": "../src/assets/gallery/sponsors/colour/sals-logo-colour.png", + "discount": "/public/assets/gallery/sponsors/colour/sals-logo-colour.png", "alt": "Sal's Pizza" } ]