From 046cb6b0314b297638a791d9b67ee9694f03bdf7 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 29 Dec 2020 19:31:33 +0200 Subject: [PATCH] Move images to public --- {src/assets => public}/img/SIK_RGB_W_side.png | Bin {src/assets => public}/img/add-icon.png | Bin {src/assets => public}/img/beer.jpeg | Bin {src/assets => public}/img/blank_profile.png | Bin .../img/corporate_logos/abb.png | Bin .../img/corporate_logos/capgemini.png | Bin .../img/corporate_logos/caruna.jpg | Bin .../img/corporate_logos/eaton.png | Bin .../img/corporate_logos/ensto.jpg | Bin .../img/corporate_logos/esett.png | Bin .../img/corporate_logos/fennovoima.png | Bin .../img/corporate_logos/fingrid.jpg | Bin .../img/corporate_logos/nrcgroup.png | Bin .../img/corporate_logos/okmetic.png | Bin .../img/corporate_logos/sogeti.jpg | Bin {src/assets => public}/img/facebook.svg | 0 {src/assets => public}/img/favicon.png | Bin {src/assets => public}/img/instagram.svg | 0 {src/assets => public}/img/linkedin.svg | 0 {src/assets => public}/img/react_logo.svg | 0 src/{assets/scss => }/_normalize.scss | 0 src/components/AddLink.tsx | 2 +- src/components/ContactCard.tsx | 2 +- src/components/HeaderLogo.tsx | 3 ++- .../SignupQuestionsWidget.tsx | 3 ++- src/views/FrontPage/FrontPageView.tsx | 22 +++++++++--------- 26 files changed, 17 insertions(+), 15 deletions(-) rename {src/assets => public}/img/SIK_RGB_W_side.png (100%) rename {src/assets => public}/img/add-icon.png (100%) rename {src/assets => public}/img/beer.jpeg (100%) rename {src/assets => public}/img/blank_profile.png (100%) rename {src/assets => public}/img/corporate_logos/abb.png (100%) rename {src/assets => public}/img/corporate_logos/capgemini.png (100%) rename {src/assets => public}/img/corporate_logos/caruna.jpg (100%) rename {src/assets => public}/img/corporate_logos/eaton.png (100%) rename {src/assets => public}/img/corporate_logos/ensto.jpg (100%) rename {src/assets => public}/img/corporate_logos/esett.png (100%) rename {src/assets => public}/img/corporate_logos/fennovoima.png (100%) rename {src/assets => public}/img/corporate_logos/fingrid.jpg (100%) rename {src/assets => public}/img/corporate_logos/nrcgroup.png (100%) rename {src/assets => public}/img/corporate_logos/okmetic.png (100%) rename {src/assets => public}/img/corporate_logos/sogeti.jpg (100%) rename {src/assets => public}/img/facebook.svg (100%) rename {src/assets => public}/img/favicon.png (100%) rename {src/assets => public}/img/instagram.svg (100%) rename {src/assets => public}/img/linkedin.svg (100%) rename {src/assets => public}/img/react_logo.svg (100%) rename src/{assets/scss => }/_normalize.scss (100%) diff --git a/src/assets/img/SIK_RGB_W_side.png b/public/img/SIK_RGB_W_side.png similarity index 100% rename from src/assets/img/SIK_RGB_W_side.png rename to public/img/SIK_RGB_W_side.png diff --git a/src/assets/img/add-icon.png b/public/img/add-icon.png similarity index 100% rename from src/assets/img/add-icon.png rename to public/img/add-icon.png diff --git a/src/assets/img/beer.jpeg b/public/img/beer.jpeg similarity index 100% rename from src/assets/img/beer.jpeg rename to public/img/beer.jpeg diff --git a/src/assets/img/blank_profile.png b/public/img/blank_profile.png similarity index 100% rename from src/assets/img/blank_profile.png rename to public/img/blank_profile.png diff --git a/src/assets/img/corporate_logos/abb.png b/public/img/corporate_logos/abb.png similarity index 100% rename from src/assets/img/corporate_logos/abb.png rename to public/img/corporate_logos/abb.png diff --git a/src/assets/img/corporate_logos/capgemini.png b/public/img/corporate_logos/capgemini.png similarity index 100% rename from src/assets/img/corporate_logos/capgemini.png rename to public/img/corporate_logos/capgemini.png diff --git a/src/assets/img/corporate_logos/caruna.jpg b/public/img/corporate_logos/caruna.jpg similarity index 100% rename from src/assets/img/corporate_logos/caruna.jpg rename to public/img/corporate_logos/caruna.jpg diff --git a/src/assets/img/corporate_logos/eaton.png b/public/img/corporate_logos/eaton.png similarity index 100% rename from src/assets/img/corporate_logos/eaton.png rename to public/img/corporate_logos/eaton.png diff --git a/src/assets/img/corporate_logos/ensto.jpg b/public/img/corporate_logos/ensto.jpg similarity index 100% rename from src/assets/img/corporate_logos/ensto.jpg rename to public/img/corporate_logos/ensto.jpg diff --git a/src/assets/img/corporate_logos/esett.png b/public/img/corporate_logos/esett.png similarity index 100% rename from src/assets/img/corporate_logos/esett.png rename to public/img/corporate_logos/esett.png diff --git a/src/assets/img/corporate_logos/fennovoima.png b/public/img/corporate_logos/fennovoima.png similarity index 100% rename from src/assets/img/corporate_logos/fennovoima.png rename to public/img/corporate_logos/fennovoima.png diff --git a/src/assets/img/corporate_logos/fingrid.jpg b/public/img/corporate_logos/fingrid.jpg similarity index 100% rename from src/assets/img/corporate_logos/fingrid.jpg rename to public/img/corporate_logos/fingrid.jpg diff --git a/src/assets/img/corporate_logos/nrcgroup.png b/public/img/corporate_logos/nrcgroup.png similarity index 100% rename from src/assets/img/corporate_logos/nrcgroup.png rename to public/img/corporate_logos/nrcgroup.png diff --git a/src/assets/img/corporate_logos/okmetic.png b/public/img/corporate_logos/okmetic.png similarity index 100% rename from src/assets/img/corporate_logos/okmetic.png rename to public/img/corporate_logos/okmetic.png diff --git a/src/assets/img/corporate_logos/sogeti.jpg b/public/img/corporate_logos/sogeti.jpg similarity index 100% rename from src/assets/img/corporate_logos/sogeti.jpg rename to public/img/corporate_logos/sogeti.jpg diff --git a/src/assets/img/facebook.svg b/public/img/facebook.svg similarity index 100% rename from src/assets/img/facebook.svg rename to public/img/facebook.svg diff --git a/src/assets/img/favicon.png b/public/img/favicon.png similarity index 100% rename from src/assets/img/favicon.png rename to public/img/favicon.png diff --git a/src/assets/img/instagram.svg b/public/img/instagram.svg similarity index 100% rename from src/assets/img/instagram.svg rename to public/img/instagram.svg diff --git a/src/assets/img/linkedin.svg b/public/img/linkedin.svg similarity index 100% rename from src/assets/img/linkedin.svg rename to public/img/linkedin.svg diff --git a/src/assets/img/react_logo.svg b/public/img/react_logo.svg similarity index 100% rename from src/assets/img/react_logo.svg rename to public/img/react_logo.svg diff --git a/src/assets/scss/_normalize.scss b/src/_normalize.scss similarity index 100% rename from src/assets/scss/_normalize.scss rename to src/_normalize.scss diff --git a/src/components/AddLink.tsx b/src/components/AddLink.tsx index bf998ab..6e3a0cc 100644 --- a/src/components/AddLink.tsx +++ b/src/components/AddLink.tsx @@ -2,7 +2,7 @@ import React, { ComponentProps } from "react"; import styled from "styled-components"; import { colors }from "@theme/colors"; import { Link } from "@components/index"; -import AddIcon from "@assets/img/add-icon.png"; +const AddIcon = "/img/add-icon.png"; const StyledLink = styled(Link)` display: flex; diff --git a/src/components/ContactCard.tsx b/src/components/ContactCard.tsx index d4c8c14..0955957 100644 --- a/src/components/ContactCard.tsx +++ b/src/components/ContactCard.tsx @@ -1,8 +1,8 @@ import React from "react"; import styled from "styled-components"; -import blank_profile from "@assets/img/blank_profile.png"; import { Role } from "@models/Contacts"; import { colors } from "@theme/colors"; +const blank_profile = "/img/blank_profile.png"; const Card = styled.article` display: flex; diff --git a/src/components/HeaderLogo.tsx b/src/components/HeaderLogo.tsx index b09496f..7c58985 100644 --- a/src/components/HeaderLogo.tsx +++ b/src/components/HeaderLogo.tsx @@ -1,9 +1,10 @@ import React from "react"; import styled from "styled-components"; import { Link } from "@components/index"; -import TitleImage from "@assets/img/SIK_RGB_W_side.png"; import breakpoints from "@theme/breakpoints"; +const TitleImage = "/img/SIK_RGB_W_side.png"; + // TODO: Responsive size const Logo = styled.img` max-width: 300px; diff --git a/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx b/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx index e850309..ed700e0 100644 --- a/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx +++ b/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx @@ -3,10 +3,11 @@ import styled from "styled-components"; import shortid from "shortid"; import { DragDropContext, Droppable } from "react-beautiful-dnd"; import { Question } from "." -import AddIcon from "@assets/img/add-icon.png"; import colors from "@theme/colors"; import QuestionList from "./QuestionList"; +const AddIcon = "/img/add-icon.png"; + const Widget = styled.div` & > button { display: flex; diff --git a/src/views/FrontPage/FrontPageView.tsx b/src/views/FrontPage/FrontPageView.tsx index e951da1..4c0dc79 100644 --- a/src/views/FrontPage/FrontPageView.tsx +++ b/src/views/FrontPage/FrontPageView.tsx @@ -10,17 +10,17 @@ import FullWidthSection from "@components/Sections/FullWidthSection"; import noop from "@utils/noop"; // Corporate logos import -import ABB from "@assets/img/corporate_logos/abb.png"; -import Capgemini from "@assets/img/corporate_logos/capgemini.png"; -import Caruna from "@assets/img/corporate_logos/caruna.jpg"; -import Eaton from "@assets/img/corporate_logos/eaton.png"; -import Ensto from "@assets/img/corporate_logos/ensto.jpg"; -import eSett from "@assets/img/corporate_logos/esett.png"; -import Fennovoima from "@assets/img/corporate_logos/fennovoima.png"; -import Fingrid from "@assets/img/corporate_logos/fingrid.jpg"; -import NRCGroup from "@assets/img/corporate_logos/nrcgroup.png"; -import Okmetic from "@assets/img/corporate_logos/okmetic.png"; -import Sogeti from "@assets/img/corporate_logos/sogeti.jpg"; +const ABB = "/img/corporate_logos/abb.png"; +const Capgemini = "/img/corporate_logos/capgemini.png"; +const Caruna = "/img/corporate_logos/caruna.jpg"; +const Eaton = "/img/corporate_logos/eaton.png"; +const Ensto = "/img/corporate_logos/ensto.jpg"; +const eSett = "/img/corporate_logos/esett.png"; +const Fennovoima = "/img/corporate_logos/fennovoima.png"; +const Fingrid = "/img/corporate_logos/fingrid.jpg"; +const NRCGroup = "/img/corporate_logos/nrcgroup.png"; +const Okmetic = "/img/corporate_logos/okmetic.png"; +const Sogeti = "/img/corporate_logos/sogeti.jpg"; interface FrontPageViewProps {