build(client): reorganise assets and implement dynamic import for ass…

…et variants BREAKING CHANGE: ESLint breaks when it attempts to resolve paths with aliases
opengovsg · Mar 11, 2021 · 52e8eb6 · 52e8eb6
1 parent 4195f5f
commit 52e8eb6
Show file tree

Hide file tree

Showing 139 changed files with 794 additions and 57 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -44,6 +44,7 @@ services:
       - CSP_ONLY_REPORT_VIOLATIONS=true
       - SAFE_BROWSING_KEY=
       - CLOUDMERSIVE_KEY=
+      - ASSET_VARIANT=
     volumes:
       - ./public:/usr/src/gogovsg/public
       - ./src:/usr/src/gogovsg/src

diff --git a/...ents/BaseLayout/assets/directory-icon.svg → ...onents/app/base-layout/directory-icon.svg b/...ents/BaseLayout/assets/directory-icon.svg → ...onents/app/base-layout/directory-icon.svg
diff --git a/...nents/BaseLayout/assets/feedback-icon.svg → ...ponents/app/base-layout/feedback-icon.svg b/...nents/BaseLayout/assets/feedback-icon.svg → ...ponents/app/base-layout/feedback-icon.svg
diff --git a/...ponents/BaseLayout/assets/github-icon.svg → ...omponents/app/base-layout/github-icon.svg b/...ponents/BaseLayout/assets/github-icon.svg → ...omponents/app/base-layout/github-icon.svg
diff --git a/...s/BaseLayout/assets/ie-banner-caution.svg → ...nts/app/base-layout/ie-banner-caution.svg b/...s/BaseLayout/assets/ie-banner-caution.svg → ...nts/app/base-layout/ie-banner-caution.svg
diff --git a/src/client/app/assets/lion-head-symbol.svg → ...ents/app/base-layout/lion-head-symbol.svg b/src/client/app/assets/lion-head-symbol.svg → ...ents/app/base-layout/lion-head-symbol.svg
diff --git a/...ponents/BaseLayout/assets/logout-icon.svg → ...omponents/app/base-layout/logout-icon.svg b/...ponents/BaseLayout/assets/logout-icon.svg → ...omponents/app/base-layout/logout-icon.svg
diff --git a/...s/BaseLayout/assets/logout-white-icon.svg → ...nts/app/base-layout/logout-white-icon.svg b/...s/BaseLayout/assets/logout-white-icon.svg → ...nts/app/base-layout/logout-white-icon.svg
diff --git a/...ponents/BaseLayout/assets/signin-icon.svg → ...omponents/app/base-layout/signin-icon.svg b/...ponents/BaseLayout/assets/signin-icon.svg → ...omponents/app/base-layout/signin-icon.svg
diff --git a/src/client/directory/assets/arrow.svg → ...ents/directory/directory-header/arrow.svg b/src/client/directory/assets/arrow.svg → ...ents/directory/directory-header/arrow.svg
diff --git a/...ient/directory/assets/copy-email-icon.svg → ...ory/directory-results/copy-email-icon.svg b/...ient/directory/assets/copy-email-icon.svg → ...ory/directory-results/copy-email-icon.svg
diff --git a/src/client/directory/assets/person-icon.svg → ...rectory/directory-results/person-icon.svg b/src/client/directory/assets/person-icon.svg → ...rectory/directory-results/person-icon.svg
diff --git a/...client/directory/assets/empty-graphic.svg → ...ry/empty-search-graphic/empty-graphic.svg b/...client/directory/assets/empty-graphic.svg → ...ry/empty-search-graphic/empty-graphic.svg
diff --git a/...assets/icons/home-page-analytics-icon.svg → ...-list-sliver/home-page-analytics-icon.svg b/...assets/icons/home-page-analytics-icon.svg → ...-list-sliver/home-page-analytics-icon.svg
diff --git a/...ts/icons/home-page-anti-phishing-icon.svg → ...t-sliver/home-page-anti-phishing-icon.svg b/...ts/icons/home-page-anti-phishing-icon.svg → ...t-sliver/home-page-anti-phishing-icon.svg
diff --git a/...ssets/icons/home-page-customised-icon.svg → ...list-sliver/home-page-customised-icon.svg b/...ssets/icons/home-page-customised-icon.svg → ...list-sliver/home-page-customised-icon.svg
diff --git a/...ets/icons/home-page-file-sharing-icon.svg → ...st-sliver/home-page-file-sharing-icon.svg b/...ets/icons/home-page-file-sharing-icon.svg → ...st-sliver/home-page-file-sharing-icon.svg
diff --git a/...ts/landing-page-graphics/landing-main.svg → ...e/rotating-links-graphic/landing-main.svg b/...ts/landing-page-graphics/landing-main.svg → ...e/rotating-links-graphic/landing-main.svg
diff --git a/...s/landing-page-graphics/stats-graphic.svg → ...home/statistics-graphic/stats-graphic.svg b/...s/landing-page-graphics/stats-graphic.svg → ...home/statistics-graphic/stats-graphic.svg
diff --git a/src/client/app/assets/trusted-by-logos/1.png → ...u/components/home/trusted-by-sliver/1.png b/src/client/app/assets/trusted-by-logos/1.png → ...u/components/home/trusted-by-sliver/1.png
diff --git a/src/client/app/assets/trusted-by-logos/2.png → ...u/components/home/trusted-by-sliver/2.png b/src/client/app/assets/trusted-by-logos/2.png → ...u/components/home/trusted-by-sliver/2.png
diff --git a/src/client/app/assets/trusted-by-logos/3.png → ...u/components/home/trusted-by-sliver/3.png b/src/client/app/assets/trusted-by-logos/3.png → ...u/components/home/trusted-by-sliver/3.png
diff --git a/src/client/app/assets/trusted-by-logos/4.png → ...u/components/home/trusted-by-sliver/4.png b/src/client/app/assets/trusted-by-logos/4.png → ...u/components/home/trusted-by-sliver/4.png
diff --git a/src/client/app/assets/trusted-by-logos/5.png → ...u/components/home/trusted-by-sliver/5.png b/src/client/app/assets/trusted-by-logos/5.png → ...u/components/home/trusted-by-sliver/5.png
diff --git a/src/client/app/assets/trusted-by-logos/6.png → ...u/components/home/trusted-by-sliver/6.png b/src/client/app/assets/trusted-by-logos/6.png → ...u/components/home/trusted-by-sliver/6.png
diff --git a/src/client/app/assets/trusted-by-logos/7.png → ...u/components/home/trusted-by-sliver/7.png b/src/client/app/assets/trusted-by-logos/7.png → ...u/components/home/trusted-by-sliver/7.png
diff --git a/src/client/app/assets/trusted-by-logos/8.png → ...u/components/home/trusted-by-sliver/8.png b/src/client/app/assets/trusted-by-logos/8.png → ...u/components/home/trusted-by-sliver/8.png
diff --git a/...assets/user-page-graphics/empty-state.svg → ...mponents/user/empty-state/empty-state.svg b/...assets/user-page-graphics/empty-state.svg → ...mponents/user/empty-state/empty-state.svg
diff --git a/...UserLinkTable/assets/click-count-icon.svg → ...user/user-link-table/click-count-icon.svg b/...UserLinkTable/assets/click-count-icon.svg → ...user/user-link-table/click-count-icon.svg
diff --git a/src/client/app/assets/icons/file-icon.svg → ...onents/user/user-link-table/file-icon.svg b/src/client/app/assets/icons/file-icon.svg → ...onents/user/user-link-table/file-icon.svg
diff --git a/src/client/app/assets/icons/link-icon.svg → ...onents/user/user-link-table/link-icon.svg b/src/client/app/assets/icons/link-icon.svg → ...onents/user/user-link-table/link-icon.svg
diff --git a/...UserLinkTable/ToolBar/assets/add-icon.svg → ...user/user-link-table/toolbar/add-icon.svg b/...UserLinkTable/ToolBar/assets/add-icon.svg → ...user/user-link-table/toolbar/add-icon.svg
diff --git a/...kTable/ToolBar/assets/filtersort-icon.svg → ...er-link-table/toolbar/filtersort-icon.svg b/...kTable/ToolBar/assets/filtersort-icon.svg → ...er-link-table/toolbar/filtersort-icon.svg
diff --git a/...assets/favicon/android-chrome-192x192.png → ...ts/edu/favicon/android-chrome-192x192.png b/...assets/favicon/android-chrome-192x192.png → ...ts/edu/favicon/android-chrome-192x192.png
diff --git a/...assets/favicon/android-chrome-512x512.png → ...ts/edu/favicon/android-chrome-512x512.png b/...assets/favicon/android-chrome-512x512.png → ...ts/edu/favicon/android-chrome-512x512.png
diff --git a/...t/app/assets/favicon/apple-touch-icon.png → ...p/assets/edu/favicon/apple-touch-icon.png b/...t/app/assets/favicon/apple-touch-icon.png → ...p/assets/edu/favicon/apple-touch-icon.png
diff --git a/...ient/app/assets/favicon/favicon-16x16.png → .../app/assets/edu/favicon/favicon-16x16.png b/...ient/app/assets/favicon/favicon-16x16.png → .../app/assets/edu/favicon/favicon-16x16.png
diff --git a/...ient/app/assets/favicon/favicon-32x32.png → .../app/assets/edu/favicon/favicon-32x32.png b/...ient/app/assets/favicon/favicon-32x32.png → .../app/assets/edu/favicon/favicon-32x32.png
diff --git a/src/client/app/assets/favicon/favicon.ico → ...client/app/assets/edu/favicon/favicon.ico b/src/client/app/assets/favicon/favicon.ico → ...client/app/assets/edu/favicon/favicon.ico
diff --git a/...s/go-logo-graphics/go-main-logo-light.svg → ...u/go-logo-graphics/go-main-logo-light.svg b/...s/go-logo-graphics/go-main-logo-light.svg → ...u/go-logo-graphics/go-main-logo-light.svg
diff --git a/...logo-graphics/go-main-logo-mini-light.svg → ...logo-graphics/go-main-logo-mini-light.svg b/...logo-graphics/go-main-logo-mini-light.svg → ...logo-graphics/go-main-logo-mini-light.svg
diff --git a/...ts/go-logo-graphics/go-main-logo-mini.svg → ...du/go-logo-graphics/go-main-logo-mini.svg b/...ts/go-logo-graphics/go-main-logo-mini.svg → ...du/go-logo-graphics/go-main-logo-mini.svg
diff --git a/.../assets/go-logo-graphics/go-main-logo.svg → ...ets/edu/go-logo-graphics/go-main-logo.svg b/.../assets/go-logo-graphics/go-main-logo.svg → ...ets/edu/go-logo-graphics/go-main-logo.svg
diff --git a/...pp/assets/go-logo-graphics/go-qr-logo.png → ...ssets/edu/go-logo-graphics/go-qr-logo.png b/...pp/assets/go-logo-graphics/go-qr-logo.png → ...ssets/edu/go-logo-graphics/go-qr-logo.png
diff --git a/...gin-page-graphics/login-page-graphics.svg → ...gin-page-graphics/login-page-graphics.svg b/...gin-page-graphics/login-page-graphics.svg → ...gin-page-graphics/login-page-graphics.svg
diff --git a/src/client/app/assets/help-icon.svg → ...lient/app/assets/edu/shared/help-icon.svg b/src/client/app/assets/help-icon.svg → ...lient/app/assets/edu/shared/help-icon.svg
diff --git a/src/client/app/assets/built-by.svg → ...client/app/assets/edu/unused/built-by.svg b/src/client/app/assets/built-by.svg → ...client/app/assets/edu/unused/built-by.svg
diff --git a/...ts/Drawer/ControlPanel/assets/go-logo.png → src/client/app/assets/edu/unused/go-logo.png b/...ts/Drawer/ControlPanel/assets/go-logo.png → src/client/app/assets/edu/unused/go-logo.png
diff --git a/...page-graphics/integrated-landing-main.svg → ...ts/edu/unused/integrated-landing-main.svg b/...page-graphics/integrated-landing-main.svg → ...ts/edu/unused/integrated-landing-main.svg
diff --git a/src/client/directory/assets/mail-icon.svg → ...lient/app/assets/edu/unused/mail-icon.svg b/src/client/directory/assets/mail-icon.svg → ...lient/app/assets/edu/unused/mail-icon.svg
diff --git a/...ient/app/assets/icons/arrow-left-icon.svg → ...ssets/edu/widgets/app/arrow-left-icon.svg b/...ient/app/assets/icons/arrow-left-icon.svg → ...ssets/edu/widgets/app/arrow-left-icon.svg
diff --git a/...ent/app/assets/icons/arrow-right-icon.svg → ...sets/edu/widgets/app/arrow-right-icon.svg b/...ent/app/assets/icons/arrow-right-icon.svg → ...sets/edu/widgets/app/arrow-right-icon.svg
diff --git a/src/client/app/assets/built-by-light.svg → ...assets/edu/widgets/app/built-by-light.svg b/src/client/app/assets/built-by-light.svg → ...assets/edu/widgets/app/built-by-light.svg
diff --git a/...nents/BaseLayout/assets/facebook-icon.svg → .../assets/edu/widgets/app/facebook-icon.svg b/...nents/BaseLayout/assets/facebook-icon.svg → .../assets/edu/widgets/app/facebook-icon.svg
diff --git a/...nents/BaseLayout/assets/linkedin-icon.svg → .../assets/edu/widgets/app/linkedin-icon.svg b/...nents/BaseLayout/assets/linkedin-icon.svg → .../assets/edu/widgets/app/linkedin-icon.svg
diff --git a/...components/BaseLayout/assets/ogp-icon.svg → ...t/app/assets/edu/widgets/app/ogp-icon.svg b/...components/BaseLayout/assets/ogp-icon.svg → ...t/app/assets/edu/widgets/app/ogp-icon.svg
diff --git a/src/client/user/assets/copy-icon.svg → ...app/assets/edu/widgets/user/copy-icon.svg b/src/client/user/assets/copy-icon.svg → ...app/assets/edu/widgets/user/copy-icon.svg
diff --git a/src/client/app/assets/gov/components/app/base-layout/directory-icon.svg b/src/client/app/assets/gov/components/app/base-layout/directory-icon.svg
diff --git a/src/client/app/assets/gov/components/app/base-layout/feedback-icon.svg b/src/client/app/assets/gov/components/app/base-layout/feedback-icon.svg
diff --git a/src/client/app/assets/gov/components/app/base-layout/github-icon.svg b/src/client/app/assets/gov/components/app/base-layout/github-icon.svg
diff --git a/src/client/app/assets/gov/components/app/base-layout/ie-banner-caution.svg b/src/client/app/assets/gov/components/app/base-layout/ie-banner-caution.svg
diff --git a/src/client/app/assets/gov/components/app/base-layout/lion-head-symbol.svg b/src/client/app/assets/gov/components/app/base-layout/lion-head-symbol.svg
diff --git a/src/client/app/assets/gov/components/app/base-layout/logout-icon.svg b/src/client/app/assets/gov/components/app/base-layout/logout-icon.svg
diff --git a/src/client/app/assets/gov/components/app/base-layout/logout-white-icon.svg b/src/client/app/assets/gov/components/app/base-layout/logout-white-icon.svg
diff --git a/src/client/app/assets/gov/components/app/base-layout/signin-icon.svg b/src/client/app/assets/gov/components/app/base-layout/signin-icon.svg
diff --git a/src/client/app/assets/gov/components/directory/directory-header/arrow.svg b/src/client/app/assets/gov/components/directory/directory-header/arrow.svg
diff --git a/...lient/app/assets/gov/components/directory/directory-results/copy-email-icon.svg b/...lient/app/assets/gov/components/directory/directory-results/copy-email-icon.svg
diff --git a/src/client/app/assets/gov/components/directory/directory-results/person-icon.svg b/src/client/app/assets/gov/components/directory/directory-results/person-icon.svg
diff --git a/...ient/app/assets/gov/components/directory/empty-search-graphic/empty-graphic.svg b/...ient/app/assets/gov/components/directory/empty-search-graphic/empty-graphic.svg
diff --git a/...app/assets/gov/components/home/feature-list-sliver/home-page-analytics-icon.svg b/...app/assets/gov/components/home/feature-list-sliver/home-page-analytics-icon.svg
diff --git a/...assets/gov/components/home/feature-list-sliver/home-page-anti-phishing-icon.svg b/...assets/gov/components/home/feature-list-sliver/home-page-anti-phishing-icon.svg
diff --git a/...pp/assets/gov/components/home/feature-list-sliver/home-page-customised-icon.svg b/...pp/assets/gov/components/home/feature-list-sliver/home-page-customised-icon.svg