From 28fd78a373d5ce9f0624edb22d952dc38a4a98ae Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 24 Feb 2021 16:22:36 -0800 Subject: [PATCH] Adjust directory structure --- packages/webapp/{src => }/images/logo-icon.png | Bin packages/webapp/{src => }/images/logo-icon.svg | 0 .../webapp/{src => }/images/logo-medium.svg | 0 .../{src/images/aux => images}/logo-old.png | Bin .../images/aux => images}/logo-text-black.svg | 0 .../{src/images/aux => images}/logo-text.svg | 0 .../{src/images/aux => images}/pwrdby-black.svg | 0 .../{src/images/aux => images}/pwrdby-white.svg | 0 .../src/components/layout/footer/index.tsx | 2 +- .../layout/footer}/pwrdby-white.svg | 0 .../src/components/layout/header/index.tsx | 2 +- .../layout/header}/logo-small.svg | 0 .../webapp/src/components/maps-page/index.tsx | 4 ++-- .../src/components/maps-page/logo-small.svg | 16 ++++++++++++++++ .../src/components/maps-page/pwrdby-white.svg | 5 +++++ 15 files changed, 25 insertions(+), 4 deletions(-) rename packages/webapp/{src => }/images/logo-icon.png (100%) rename packages/webapp/{src => }/images/logo-icon.svg (100%) rename packages/webapp/{src => }/images/logo-medium.svg (100%) rename packages/webapp/{src/images/aux => images}/logo-old.png (100%) rename packages/webapp/{src/images/aux => images}/logo-text-black.svg (100%) rename packages/webapp/{src/images/aux => images}/logo-text.svg (100%) rename packages/webapp/{src/images/aux => images}/pwrdby-black.svg (100%) rename packages/webapp/{src/images/aux => images}/pwrdby-white.svg (100%) rename packages/webapp/src/{images => components/layout/footer}/pwrdby-white.svg (100%) rename packages/webapp/src/{images => components/layout/header}/logo-small.svg (100%) create mode 100644 packages/webapp/src/components/maps-page/logo-small.svg create mode 100644 packages/webapp/src/components/maps-page/pwrdby-white.svg diff --git a/packages/webapp/src/images/logo-icon.png b/packages/webapp/images/logo-icon.png similarity index 100% rename from packages/webapp/src/images/logo-icon.png rename to packages/webapp/images/logo-icon.png diff --git a/packages/webapp/src/images/logo-icon.svg b/packages/webapp/images/logo-icon.svg similarity index 100% rename from packages/webapp/src/images/logo-icon.svg rename to packages/webapp/images/logo-icon.svg diff --git a/packages/webapp/src/images/logo-medium.svg b/packages/webapp/images/logo-medium.svg similarity index 100% rename from packages/webapp/src/images/logo-medium.svg rename to packages/webapp/images/logo-medium.svg diff --git a/packages/webapp/src/images/aux/logo-old.png b/packages/webapp/images/logo-old.png similarity index 100% rename from packages/webapp/src/images/aux/logo-old.png rename to packages/webapp/images/logo-old.png diff --git a/packages/webapp/src/images/aux/logo-text-black.svg b/packages/webapp/images/logo-text-black.svg similarity index 100% rename from packages/webapp/src/images/aux/logo-text-black.svg rename to packages/webapp/images/logo-text-black.svg diff --git a/packages/webapp/src/images/aux/logo-text.svg b/packages/webapp/images/logo-text.svg similarity index 100% rename from packages/webapp/src/images/aux/logo-text.svg rename to packages/webapp/images/logo-text.svg diff --git a/packages/webapp/src/images/aux/pwrdby-black.svg b/packages/webapp/images/pwrdby-black.svg similarity index 100% rename from packages/webapp/src/images/aux/pwrdby-black.svg rename to packages/webapp/images/pwrdby-black.svg diff --git a/packages/webapp/src/images/aux/pwrdby-white.svg b/packages/webapp/images/pwrdby-white.svg similarity index 100% rename from packages/webapp/src/images/aux/pwrdby-white.svg rename to packages/webapp/images/pwrdby-white.svg diff --git a/packages/webapp/src/components/layout/footer/index.tsx b/packages/webapp/src/components/layout/footer/index.tsx index fdbf0a3b..d080675e 100644 --- a/packages/webapp/src/components/layout/footer/index.tsx +++ b/packages/webapp/src/components/layout/footer/index.tsx @@ -4,7 +4,7 @@ import { StyledFooter } from './styled'; // FIXME: use SVG loader // eslint-disable-next-line -const poweredByIcon = require('../../../images/pwrdby-white.svg'); +const poweredByIcon = require('./pwrdby-white.svg'); const Footer = (): React.ReactElement => { return ( diff --git a/packages/webapp/src/images/pwrdby-white.svg b/packages/webapp/src/components/layout/footer/pwrdby-white.svg similarity index 100% rename from packages/webapp/src/images/pwrdby-white.svg rename to packages/webapp/src/components/layout/footer/pwrdby-white.svg diff --git a/packages/webapp/src/components/layout/header/index.tsx b/packages/webapp/src/components/layout/header/index.tsx index 80221abb..37572fbf 100644 --- a/packages/webapp/src/components/layout/header/index.tsx +++ b/packages/webapp/src/components/layout/header/index.tsx @@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router-dom'; import Button from '@material-ui/core/Button'; -import logo from '../../../images/logo-small.svg'; +import logo from './logo-small.svg'; interface HeaderProps { type: 'only-signup' | 'only-signin' | 'none'; diff --git a/packages/webapp/src/images/logo-small.svg b/packages/webapp/src/components/layout/header/logo-small.svg similarity index 100% rename from packages/webapp/src/images/logo-small.svg rename to packages/webapp/src/components/layout/header/logo-small.svg diff --git a/packages/webapp/src/components/maps-page/index.tsx b/packages/webapp/src/components/maps-page/index.tsx index fe44cf19..37382d5c 100644 --- a/packages/webapp/src/components/maps-page/index.tsx +++ b/packages/webapp/src/components/maps-page/index.tsx @@ -38,8 +38,8 @@ import Link from '@material-ui/core/Link'; import ListItemText from '@material-ui/core/ListItemText'; import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction'; -import logoIcon from '../../images/logo-small.svg'; -import poweredByIcon from '../../images/pwrdby-white.svg'; +import logoIcon from './logo-small.svg'; +import poweredByIcon from './pwrdby-white.svg'; export type Filter = GenericFilter | LabelFilter; diff --git a/packages/webapp/src/components/maps-page/logo-small.svg b/packages/webapp/src/components/maps-page/logo-small.svg new file mode 100644 index 00000000..fae99531 --- /dev/null +++ b/packages/webapp/src/components/maps-page/logo-small.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/webapp/src/components/maps-page/pwrdby-white.svg b/packages/webapp/src/components/maps-page/pwrdby-white.svg new file mode 100644 index 00000000..cf8d9c3a --- /dev/null +++ b/packages/webapp/src/components/maps-page/pwrdby-white.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file