From c9424a0da68313abce5e97111c09b3db71a6bdb6 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Fri, 10 Aug 2018 11:39:53 +0300
Subject: [PATCH] Move images to client dir
---
src/client/components/TopBar.js | 2 +-
src/client/containers/MapApp.js | 10 +++++-----
.../logos}/aalto-logo-white-no-background-small.png | Bin
.../img => client/img/logos}/heldig-logo-small.png | Bin
.../kotus-logo-white-no-backgrounds-small.png | Bin
.../public/img => client/img/logos}/namesampo.png | Bin
.../logos}/seco-logo-white-no-background-small.png | Bin
...y-of-helsinki-logo-white-no-background-small.png | Bin
8 files changed, 6 insertions(+), 6 deletions(-)
rename src/{server/public/img => client/img/logos}/aalto-logo-white-no-background-small.png (100%)
rename src/{server/public/img => client/img/logos}/heldig-logo-small.png (100%)
rename src/{server/public/img => client/img/logos}/kotus-logo-white-no-backgrounds-small.png (100%)
rename src/{server/public/img => client/img/logos}/namesampo.png (100%)
rename src/{server/public/img => client/img/logos}/seco-logo-white-no-background-small.png (100%)
rename src/{server/public/img => client/img/logos}/university-of-helsinki-logo-white-no-background-small.png (100%)
diff --git a/src/client/components/TopBar.js b/src/client/components/TopBar.js
index 838822e7..0c1943b7 100644
--- a/src/client/components/TopBar.js
+++ b/src/client/components/TopBar.js
@@ -103,7 +103,7 @@ class TopBar extends React.Component {
</MenuItem>
</MenuList>
</Menu>
- <img className={classes.namesampoLogo} src='http://localhost:3001/img/namesampo.png' alt='NameSampo logo'/>
+ <img className={classes.namesampoLogo} src='img/logos/namesampo.png' alt='NameSampo logo'/>
{this.props.oneColumnView &&
<div className={classes.navTabs}>
<NavTabs />
diff --git a/src/client/containers/MapApp.js b/src/client/containers/MapApp.js
index b12f0b37..d95358d2 100644
--- a/src/client/containers/MapApp.js
+++ b/src/client/containers/MapApp.js
@@ -180,11 +180,11 @@ let MapApp = (props) => {
}
</div>
<Paper className={classes.footer}>
- {/* <img className={classes.aaltoLogo} src='http://localhost:3001/img/aalto-logo-white-no-background-small.png' alt='Aalto University logo'/> */}
- <img className={classes.uhLogo} src='http://localhost:3001/img/university-of-helsinki-logo-white-no-background-small.png' alt='University of Helsinki logo'/>
- {/* <img className={classes.secoLogo} src='http://localhost:3001/img/seco-logo-white-no-background-small.png' alt='SeCo logo'/> */}
- <img className={classes.heldigLogo} src='http://localhost:3001/img/heldig-logo-small.png' alt='HELDIG logo'/>
- <img className={classes.kotusLogo} src='http://localhost:3001/img/kotus-logo-white-no-backgrounds-small.png' alt='Kotus logo'/>
+ {/* <img className={classes.aaltoLogo} src='img/logos/aalto-logo-white-no-background-small.png' alt='Aalto University logo'/> */}
+ <img className={classes.uhLogo} src='img/logos/university-of-helsinki-logo-white-no-background-small.png' alt='University of Helsinki logo'/>
+ {/* <img className={classes.secoLogo} src='img/logos/seco-logo-white-no-background-small.png' alt='SeCo logo'/> */}
+ <img className={classes.heldigLogo} src='img/logos/heldig-logo-small.png' alt='HELDIG logo'/>
+ <img className={classes.kotusLogo} src='img/logos/kotus-logo-white-no-backgrounds-small.png' alt='Kotus logo'/>
</Paper>
</div>
</div>
diff --git a/src/server/public/img/aalto-logo-white-no-background-small.png b/src/client/img/logos/aalto-logo-white-no-background-small.png
similarity index 100%
rename from src/server/public/img/aalto-logo-white-no-background-small.png
rename to src/client/img/logos/aalto-logo-white-no-background-small.png
diff --git a/src/server/public/img/heldig-logo-small.png b/src/client/img/logos/heldig-logo-small.png
similarity index 100%
rename from src/server/public/img/heldig-logo-small.png
rename to src/client/img/logos/heldig-logo-small.png
diff --git a/src/server/public/img/kotus-logo-white-no-backgrounds-small.png b/src/client/img/logos/kotus-logo-white-no-backgrounds-small.png
similarity index 100%
rename from src/server/public/img/kotus-logo-white-no-backgrounds-small.png
rename to src/client/img/logos/kotus-logo-white-no-backgrounds-small.png
diff --git a/src/server/public/img/namesampo.png b/src/client/img/logos/namesampo.png
similarity index 100%
rename from src/server/public/img/namesampo.png
rename to src/client/img/logos/namesampo.png
diff --git a/src/server/public/img/seco-logo-white-no-background-small.png b/src/client/img/logos/seco-logo-white-no-background-small.png
similarity index 100%
rename from src/server/public/img/seco-logo-white-no-background-small.png
rename to src/client/img/logos/seco-logo-white-no-background-small.png
diff --git a/src/server/public/img/university-of-helsinki-logo-white-no-background-small.png b/src/client/img/logos/university-of-helsinki-logo-white-no-background-small.png
similarity index 100%
rename from src/server/public/img/university-of-helsinki-logo-white-no-background-small.png
rename to src/client/img/logos/university-of-helsinki-logo-white-no-background-small.png
--
GitLab