chore: Move favicons to /public folder, remove unused settings for bu…

…ild process (#1287)
aragon · Mar 21, 2024 · 1ef2fe7 · 1ef2fe7
1 parent db2fb94
commit 1ef2fe7
Show file tree

Hide file tree

Showing 51 changed files with 149 additions and 231 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -35,7 +35,6 @@ jobs:
           VITE_GATEWAY_RPC_API_KEY: ${{secrets.VITE_GATEWAY_RPC_API_KEY}}
           VITE_WALLET_CONNECT_PROJECT_ID: ${{secrets.VITE_WALLET_CONNECT_PROJECT_ID}}
           VITE_COVALENT_API_KEY: ${{secrets.VITE_COVALENT_API_KEY}}
-          NODE_OPTIONS: '--max-old-space-size=6656'
 
       - name: Run E2E Tests
         run: yarn e2e

diff --git a/.github/workflows/pull_request_webapp_preview.yml b/.github/workflows/pull_request_webapp_preview.yml
@@ -51,7 +51,6 @@ jobs:
           VITE_WALLET_CONNECT_PROJECT_ID: ${{secrets.VITE_WALLET_CONNECT_PROJECT_ID}}
           VITE_COVALENT_API_KEY: ${{secrets.VITE_COVALENT_API_KEY}}
           VITE_SENTRY_DNS: ${{secrets.VITE_SENTRY_DNS}}
-          NODE_OPTIONS: '--max-old-space-size=6656'
       - name: Sentry sourcemap
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

diff --git a/.github/workflows/webapp-deploy.yml b/.github/workflows/webapp-deploy.yml
@@ -52,7 +52,6 @@ jobs:
           VITE_GATEWAY_RPC_API_KEY: ${{secrets.VITE_GATEWAY_RPC_API_KEY}}
           VITE_COVALENT_API_KEY: ${{secrets.VITE_COVALENT_API_KEY}}
           VITE_SENTRY_DNS: ${{secrets.VITE_SENTRY_DNS}}
-          NODE_OPTIONS: '--max-old-space-size=6656'
 
       - name: Sentry sourcemap
         env:

diff --git a/.github/workflows/webapp-test.yml b/.github/workflows/webapp-test.yml
@@ -32,7 +32,6 @@ jobs:
           VITE_REACT_APP_ANALYTICS_KEY: ${{ secrets.VITE_REACT_APP_ANALYTICS_KEY }}
           VITE_GATEWAY_IPFS_API_KEY: ${{secrets.VITE_GATEWAY_IPFS_API_KEY}}
           VITE_ETHERSCAN_API_KEY: ${{secrets.VITE_ETHERSCAN_API_KEY}}
-          NODE_OPTIONS: '--max-old-space-size=6656'
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
         with:

diff --git a/.gitignore b/.gitignore
@@ -6,13 +6,9 @@ coverage
 
 # production
 build
-build.txt
 dist
-dist-ssr
 *.local
 .cache
-storybook-static
-typechain
 
 # misc
 .vscode
@@ -29,21 +25,12 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
 .env
-docker.env
-docker-compose.yml
-
-# deployments
-deployments
 
 # generated
-generated
-subgraph.yaml
 .bin
+stats.html
 
+# e2e tests
 tests/e2e/videos/*
 test.http
diff --git a/i18n.config.ts b/i18n.config.ts
@@ -1,6 +1,6 @@
 import i18n from 'i18next';
 import {initReactI18next} from 'react-i18next';
-import commonEn from './src/locales/en/common.json';
+import commonEn from './src/assets/locales/en/common.json';
 
 i18n.use(initReactI18next).init({
   lng: 'en',

diff --git a/index.html b/index.html
@@ -2,69 +2,44 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link
-      rel="apple-touch-icon"
-      sizes="180x180"
-      href="/src/public/apple-touch-icon.png"
-    />
+
+    <link rel="icon" href="./favicon.ico" sizes="32x32" />
     <link
       rel="icon"
       type="image/png"
-      sizes="32x32"
-      href="/src/public/favicon-32x32.png"
+      sizes="16x16"
+      href="./favicon-16x16.png"
     />
     <link
       rel="icon"
       type="image/png"
-      sizes="16x16"
-      href="/src/public/favicon-16x16.png"
-    />
-    <link rel="manifest" href="/src/public/site.webmanifest" />
-    <link
-      rel="mask-icon"
-      href="/src/public/safari-pinned-tab.svg"
-      color="#3164fa"
+      sizes="32x32"
+      href="./favicon-32x32.png"
     />
-    <meta name="msapplication-TileColor" content="#3164fa" />
+    <link rel="apple-touch-icon" href="./assets/apple-touch-icon.png" />
+    <link rel="mask-icon" href="./safari-pinned-tab.svg" color="#3164fa" />
+
+    <link rel="manifest" href="./site.webmanifest" />
+
     <meta name="theme-color" content="#ffffff" />
+    <meta name="msapplication-TileColor" content="#3164fa" />
+
     <meta name="app-version" content="%VITE_REACT_APP_DEPLOY_VERSION%" />
 
+    <link href="./styles.css" rel="stylesheet" />
     <link
       href="https://fonts.googleapis.com/css2?family=Syne:wght@700&display=swap"
       rel="stylesheet"
     />
 
-    <style>
-      * {
-        font-weight: 500;
-      }
-
-      body {
-        background-color: #f5f7fa;
-      }
-
-      /* Web3Modal comes with a default setting of z-index: 2. This conflicts with
-other parts of the application. Namely the navbars, which have a z-index of 10
-(tailwind class z-10). Fixin the global css od the modal seems to be the
-recommended solution:
-https://github.com/Web3Modal/web3modal/issues/165#issuecomment-938666905 */
-      .web3modal-modal-lightbox {
-        z-index: 20 !important;
-      }
-
-      #fullscreen-editor {
-        position: absolute;
-        z-index: 10;
-      }
-    </style>
-
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
     <title>Aragon App</title>
     <meta name="description" content="Aragon App" />
   </head>
 
   <body>
     <div id="root"></div>
-    <script type="module" src="/src/index.tsx"></script>
+    <script type="module" src="./src/index.tsx"></script>
   </body>
 </html>
diff --git a/ipfs-404.html b/ipfs-404.html
diff --git a/package.json b/package.json
@@ -4,14 +4,13 @@
   "version": "0.1.0",
   "private": true,
   "author": "Aragon Association",
+  "homepage": ".",
   "license": "GPL-3.0",
   "scripts": {
     "dev": "vite --host",
     "dev:watch": "cross-env WATCH=true vite --host",
-    "build": "tsc && cross-env NODE_ENV=production node --max_old_space_size=16384 ./node_modules/vite/bin/vite.js build --sourcemap true > build.txt",
-    "serve": "vite preview",
-    "prepbrotli": "brotli-cli compress --glob \"dist/assets/*.*\"",
-    "servebrotli": "caddy run",
+    "build": "cross-env NODE_ENV=production vite build",
+    "build:analyze": "cross-env ANALYZE=true vite build",
     "test": "jest --coverage=false",
     "lint": "eslint src --max-warnings=0 && yarn check-types",
     "lint:fix": "eslint src --fix",
@@ -110,7 +109,7 @@
     "jest-environment-jsdom": "^29.7.0",
     "postcss": "^8.4.31",
     "prettier": "^3.0.3",
-    "rollup-plugin-analyzer": "^4.0.0",
+    "rollup-plugin-visualizer": "^5.12.0",
     "tailwindcss": "3.4.0",
     "tailwindcss-fluid-type": "^2.0.3",
     "typescript": "^5.1.3",

diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
diff --git a/src/public/apple-touch-icon.png → public/apple-touch-icon.png b/src/public/apple-touch-icon.png → public/apple-touch-icon.png
diff --git a/src/public/favicon-16x16.png → public/favicon-16x16.png b/src/public/favicon-16x16.png → public/favicon-16x16.png
diff --git a/src/public/favicon-32x32.png → public/favicon-32x32.png b/src/public/favicon-32x32.png → public/favicon-32x32.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/ipfs-404.html b/public/ipfs-404.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="refresh" content="0; url=./#/not-found" />
+
+    <link rel="icon" href="./favicon.ico" sizes="32x32" />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="16x16"
+      href="./favicon-16x16.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="32x32"
+      href="./favicon-32x32.png"
+    />
+    <link rel="apple-touch-icon" href="./assets/apple-touch-icon.png" />
+    <link rel="mask-icon" href="./safari-pinned-tab.svg" color="#3164fa" />
+
+    <link rel="manifest" href="./site.webmanifest" />
+
+    <meta name="theme-color" content="#ffffff" />
+    <meta name="msapplication-TileColor" content="#3164fa" />
+
+    <meta name="app-version" content="%VITE_REACT_APP_DEPLOY_VERSION%" />
+
+    <link href="./styles.css" rel="stylesheet" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Syne:wght@700&display=swap"
+      rel="stylesheet"
+    />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+    <title>Aragon App</title>
+    <meta name="description" content="Aragon App" />
+  </head>
+</html>
diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg
diff --git a/public/site.webmanifest b/public/site.webmanifest
@@ -0,0 +1,19 @@
+{
+  "name": "Aragon App",
+  "short_name": "Aragon App",
+  "icons": [
+    {
+      "src": "/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}
diff --git a/public/styles.css b/public/styles.css
@@ -0,0 +1,21 @@
+* {
+  font-weight: 500;
+}
+
+body {
+  background-color: #f5f7fa;
+}
+
+/* Web3Modal comes with a default setting of z-index: 2. This conflicts with
+other parts of the application. Namely the navbars, which have a z-index of 10
+(tailwind class z-10). Fixin the global css od the modal seems to be the
+recommended solution:
+https://github.com/Web3Modal/web3modal/issues/165#issuecomment-938666905 */
+.web3modal-modal-lightbox {
+  z-index: 20 !important;
+}
+
+#fullscreen-editor {
+  position: absolute;
+  z-index: 10;
+}
diff --git a/src/public/buildFaster.svg → src/assets/images/buildFaster.svg b/src/public/buildFaster.svg → src/assets/images/buildFaster.svg
diff --git a/src/public/circleGreenGradient.svg → src/assets/images/circleGreenGradient.svg b/src/public/circleGreenGradient.svg → src/assets/images/circleGreenGradient.svg
diff --git a/src/public/coloredLogo.svg → src/assets/images/coloredLogo.svg b/src/public/coloredLogo.svg → src/assets/images/coloredLogo.svg
diff --git a/src/public/createDao.svg → src/assets/images/createDao.svg b/src/public/createDao.svg → src/assets/images/createDao.svg
diff --git a/src/public/goLive.svg → src/assets/images/goLive.svg b/src/public/goLive.svg → src/assets/images/goLive.svg
diff --git a/src/public/greenGradient.svg → src/assets/images/greenGradient.svg b/src/public/greenGradient.svg → src/assets/images/greenGradient.svg
diff --git a/src/public/iconLogo.svg → src/assets/images/iconLogo.svg b/src/public/iconLogo.svg → src/assets/images/iconLogo.svg
diff --git a/src/public/iconLogoBlue.svg → src/assets/images/iconLogoBlue.svg b/src/public/iconLogoBlue.svg → src/assets/images/iconLogoBlue.svg
diff --git a/src/public/illu-custom.svg → src/assets/images/illu-custom.svg b/src/public/illu-custom.svg → src/assets/images/illu-custom.svg
diff --git a/src/public/learnDao.svg → src/assets/images/learnDao.svg b/src/public/learnDao.svg → src/assets/images/learnDao.svg
diff --git a/src/public/logo.svg → src/assets/images/logo.svg b/src/public/logo.svg → src/assets/images/logo.svg
diff --git a/src/public/logoBlue.svg → src/assets/images/logoBlue.svg b/src/public/logoBlue.svg → src/assets/images/logoBlue.svg
diff --git a/src/public/noProposals.svg → src/assets/images/noProposals.svg b/src/public/noProposals.svg → src/assets/images/noProposals.svg
diff --git a/src/public/purpleGradient.svg → src/assets/images/purpleGradient.svg b/src/public/purpleGradient.svg → src/assets/images/purpleGradient.svg
diff --git a/src/public/wallet.svg → src/assets/images/wallet.svg b/src/public/wallet.svg → src/assets/images/wallet.svg
diff --git a/src/public/walletConnect.svg → src/assets/images/walletConnect.svg b/src/public/walletConnect.svg → src/assets/images/walletConnect.svg
diff --git a/src/locales/en/common.json → src/assets/locales/en/common.json b/src/locales/en/common.json → src/assets/locales/en/common.json
diff --git a/src/components/ctaCard/data.ts b/src/components/ctaCard/data.ts
@@ -1,8 +1,8 @@
 import {CreateDAO} from 'utils/paths';
 
-import learnImg from '../../public/learnDao.svg';
-import buildFaster from '../../public/buildFaster.svg';
-import createDaoImg from '../../public/createDao.svg';
+import learnImg from '../../assets/images/learnDao.svg';
+import buildFaster from '../../assets/images/buildFaster.svg';
+import createDaoImg from '../../assets/images/createDao.svg';
 import {i18n} from '../../../i18n.config';
 
 // temporary for review

diff --git a/src/containers/cannotDelegateModal/index.tsx b/src/containers/cannotDelegateModal/index.tsx
@@ -10,7 +10,7 @@ import {
   WarningTitle,
 } from 'containers/networkErrorMenu';
 import {useGlobalModalContext} from 'context/globalModals';
-import WalletIcon from 'public/wallet.svg';
+import WalletIcon from 'assets/images/wallet.svg';
 import {useDaoDetailsQuery} from 'hooks/useDaoDetails';
 import {useDaoToken} from 'hooks/useDaoToken';
 import {Button} from '@aragon/ods';

diff --git a/src/containers/exploreFooter/index.tsx b/src/containers/exploreFooter/index.tsx
@@ -5,9 +5,9 @@ import {Icon, IconType} from '@aragon/ods';
 import {GridLayout} from 'components/layout';
 import {StyledLink} from 'components/styledLink';
 import useScreen from 'hooks/useScreen';
-import Green from 'public/greenGradient.svg';
-import IconLogo from 'public/iconLogo.svg';
-import Purple from 'public/purpleGradient.svg';
+import Green from 'assets/images/greenGradient.svg';
+import IconLogo from 'assets/images/iconLogo.svg';
+import Purple from 'assets/images/purpleGradient.svg';
 import {EXPLORE_NAV_LINKS, PRIVACY_NAV_LINKS} from 'utils/constants';
 
 const Footer: React.FC = () => {

diff --git a/src/containers/footer/index.tsx b/src/containers/footer/index.tsx
@@ -5,7 +5,7 @@ import {Icon, IconType} from '@aragon/ods';
 
 import {GridLayout} from 'components/layout';
 import useScreen from 'hooks/useScreen';
-import IconLogoBlue from 'public/iconLogoBlue.svg';
+import IconLogoBlue from 'assets/images/iconLogoBlue.svg';
 import {EXPLORE_NAV_LINKS, PRIVACY_NAV_LINKS} from 'utils/constants';
 import {useWallet} from 'hooks/useWallet';
 

diff --git a/src/containers/goLive/index.tsx b/src/containers/goLive/index.tsx
@@ -13,7 +13,7 @@ import Blockchain from './blockchain';
 import DaoMetadata from './daoMetadata';
 import Community from './community';
 import Governance from './governance';
-import goLive from 'public/goLive.svg';
+import goLive from 'assets/images/goLive.svg';
 import {Landing} from 'utils/paths';
 import {useCreateDaoContext} from 'context/createDao';
 import {useWallet} from 'hooks/useWallet';

diff --git a/src/containers/hero/index.tsx b/src/containers/hero/index.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import styled from 'styled-components';
-import Logo from 'public/coloredLogo.svg';
-import Green from 'public/circleGreenGradient.svg';
-import Purple from 'public/purpleGradient.svg';
+import Logo from 'assets/images/coloredLogo.svg';
+import Green from 'assets/images/circleGreenGradient.svg';
+import Purple from 'assets/images/purpleGradient.svg';
 import {useTranslation} from 'react-i18next';
 import {GridLayout} from 'components/layout';
 

diff --git a/src/containers/navbar/exploreNav.tsx b/src/containers/navbar/exploreNav.tsx
@@ -5,7 +5,7 @@ import {Button, IconType} from '@aragon/ods';
 import {useTranslation} from 'react-i18next';
 
 import {useWallet} from 'hooks/useWallet';
-import Logo from 'public/logo.svg';
+import Logo from 'assets/images/logo.svg';
 import {useGlobalModalContext} from 'context/globalModals';
 import {Container, GridLayout} from 'components/layout';
 import {FEEDBACK_FORM} from 'utils/constants';

diff --git a/src/containers/networkErrorMenu/index.tsx b/src/containers/networkErrorMenu/index.tsx
@@ -11,7 +11,7 @@ import {useNetwork} from 'context/network';
 import useScreen from 'hooks/useScreen';
 import {useSwitchNetwork} from 'hooks/useSwitchNetwork';
 import {useWallet} from 'hooks/useWallet';
-import WalletIcon from 'public/wallet.svg';
+import WalletIcon from 'assets/images/wallet.svg';
 import {CHAIN_METADATA} from 'utils/constants';
 import {handleClipboardActions, shortenAddress} from 'utils/library';