[#907] Bundles login static files separately

Due to conflicts with public and protected urls, login and interstitial files have to be on a different public url from inbox and resources that require login. Therefore, here, we delegate that logic to webpack. Now we have a '/public' url and a '/assets' url for those static assets.
author: Anike Arni <aarni@thoughtworks.com> 2017-02-16 18:51:26 -0200
committer: Anike Arni <aarni@thoughtworks.com> 2017-02-16 18:51:26 -0200
commit: 957599ae01687d6b3d02a3c34fdbe2ac6bd920f9 (patch)
tree: 7612fa7cfd33bd9657bce0eb9e8db47b076cedcc /web-ui/src
parent: 64780114ae90bb890d3ffa0a9aebe4686c6b74d3 (diff)
8 files changed, 15 insertions, 15 deletions
diff --git a/web-ui/src/backup_account/backup_account.html b/web-ui/src/backup_account/backup_account.html
index fa026e7a..55881444 100644
--- a/web-ui/src/backup_account/backup_account.html
+++ b/web-ui/src/backup_account/backup_account.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="icon" type="image/png" href="assets/images/Favicon.png" />
+    <link rel="icon" type="image/png" href="public/images/Favicon.png" />
     <meta charset="utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"/>
diff --git a/web-ui/src/backup_account/page.js b/web-ui/src/backup_account/page.js
index c39394e2..cc93a560 100644
--- a/web-ui/src/backup_account/page.js
+++ b/web-ui/src/backup_account/page.js
@@ -34,7 +34,7 @@ export const Page = ({ t }) => (
         <div className='container'>
           <img
             className='backup-account-image'
-            src='assets/images/forgot-my-password.svg'
+            src='/public/images/forgot-my-password.svg'
             alt={t('backup-account.image-description')}
           />
           <form>
diff --git a/web-ui/src/common/footer/footer.js b/web-ui/src/common/footer/footer.js
index 254a19f7..c2138c21 100644
--- a/web-ui/src/common/footer/footer.js
+++ b/web-ui/src/common/footer/footer.js
@@ -22,7 +22,7 @@ import './footer.scss';
 export const Footer = ({ t }) => (
   <footer className='footer-wrapper'>
     <div className='footer-content'>
-      <img className='footer-image' src='/assets/images/lab.svg' alt='' />
+      <img className='footer-image' src='/public/images/lab.svg' alt='' />
       <div>
         {t('footer-text')}
         <a className='footer-link' href='mailto:team@pixelated-project.org'>
diff --git a/web-ui/src/common/header/header.js b/web-ui/src/common/header/header.js
index 9e5f6bc7..50c863b5 100644
--- a/web-ui/src/common/header/header.js
+++ b/web-ui/src/common/header/header.js
@@ -25,7 +25,7 @@ export const Header = ({ t }) => (
       <a href='/'>
         <img
           className='header-logo'
-          src='/startup-assets/pixelated-logo-orange.svg'
+          src='/public/images/logo-orange.svg'
           alt='Pixelated'
         />
       </a>
diff --git a/web-ui/src/i18n.js b/web-ui/src/i18n.js
index bbbe2dcd..64c7b8a1 100644
--- a/web-ui/src/i18n.js
+++ b/web-ui/src/i18n.js
@@ -32,7 +32,7 @@ i18n
   .init({
     fallbackLng: 'en_US',
     backend: {
-      loadPath: 'assets/locales/{{lng}}/{{ns}}.json'
+      loadPath: 'public/locales/{{lng}}/{{ns}}.json'
     }
   });
 
diff --git a/web-ui/src/interstitial/interstitial.html b/web-ui/src/interstitial/interstitial.html
index ac9ab291..727883fe 100644
--- a/web-ui/src/interstitial/interstitial.html
+++ b/web-ui/src/interstitial/interstitial.html
@@ -4,15 +4,15 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <script src="/assets/snap.svg-min.js"></script>
-    <script src="/assets/jquery-2.1.3.min.js"></script>
+    <script src="/public/snap.svg-min.js"></script>
+    <script src="/public/jquery-2.1.3.min.js"></script>
   </head>
 
   <body style="border: 0px; padding: 0px; margin: 0px;background-color: #808181">
     <section id="hive-section" style="background-color: #808181;" name="hive-section">
       <svg id="hive" style="width: 100%; height: 100%;"></svg>
     </section>
-    <script src="/assets/interstitial.js"></script>
+    <script src="/public/interstitial.js"></script>
   </body>
 
 </html>
diff --git a/web-ui/src/login/login.css b/web-ui/src/login/login.css
index f1b54071..51ab2046 100644
--- a/web-ui/src/login/login.css
+++ b/web-ui/src/login/login.css
@@ -21,7 +21,7 @@ body {
     height: 100vh;
     color: #3E3A37;
 
-    background-image: url("/assets/images/hive-bg.png");
+    background-image: url("/public/images/hive-bg.png");
     background-repeat: repeat;
 }
 
diff --git a/web-ui/src/login/login.html b/web-ui/src/login/login.html
index 88d74556..b8c45180 100644
--- a/web-ui/src/login/login.html
+++ b/web-ui/src/login/login.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <html xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1">
   <head>
-    <link rel="icon" type="image/png" href="/assets/images/Favicon.png" />
+    <link rel="icon" type="image/png" href="/public/images/Favicon.png" />
     <meta charset="utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"/>
     <title>Pixelated - Login</title>
-    <link rel="stylesheet" type="text/css" href="/assets/normalize.min.css" />
-    <link rel="stylesheet" type="text/css" href="/assets/login.css" />
-    <link rel="stylesheet" type="text/css" href="/assets/opensans.css" />
+    <link rel="stylesheet" type="text/css" href="/public/normalize.min.css" />
+    <link rel="stylesheet" type="text/css" href="/public/login.css" />
+    <link rel="stylesheet" type="text/css" href="/public/opensans.css" />
   </head>
   <body>
     <div class="content">
       <div class="login">
-        <img class="logo" src="/assets/images/logo-orange.svg" alt="Pixelated logo"/>
+        <img class="logo" src="/public/images/logo-orange.svg" alt="Pixelated logo"/>
         <p t:render="error_msg" class="error"></p>
         <div id="root"/>
       </div>
@@ -21,6 +21,6 @@
         <div t:render="disclaimer"></div>
       </div>
     </div>
-    <script type="text/javascript" src="/assets/login.js"></script>
+    <script type="text/javascript" src="/public/login.js"></script>
   </body>
 </html>
author	Anike Arni <aarni@thoughtworks.com>	2017-02-16 18:51:26 -0200
committer	Anike Arni <aarni@thoughtworks.com>	2017-02-16 18:51:26 -0200
commit	957599ae01687d6b3d02a3c34fdbe2ac6bd920f9 (patch)
tree	7612fa7cfd33bd9657bce0eb9e8db47b076cedcc /web-ui/src
parent	64780114ae90bb890d3ffa0a9aebe4686c6b74d3 (diff)