Merge branch 'master' into makefile-tests

3 files changed, 1 insertions, 41 deletions

diff --git a/web-ui/app/js/account_recovery.js b/web-ui/app/js/account_recovery.js
deleted file mode 100644
index 441a8936..00000000
--- a/web-ui/app/js/account_recovery.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react'
-import { render } from 'react-dom'
-import Page from 'js/account_recovery/page'
-import a11y from 'react-a11y'
-
-import 'font-awesome/scss/font-awesome.scss'
-
-if(process.env.NODE_ENV === 'development') a11y(React);
-
-render(
-  <Page/>,
-  document.getElementById('root')
-);
diff --git a/web-ui/app/js/account_recovery/page.js b/web-ui/app/js/account_recovery/page.js
deleted file mode 100644
index 5d4f2c36..00000000
--- a/web-ui/app/js/account_recovery/page.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react'
-
-import 'scss/account_recovery/page.scss'
-
-const Page = () => (
-  <div className='container'>
-    <img src='assets/images/forgot-my-password.svg' alt="Esqueci minha senha!"/>
-    <form>
-      <h1>E se você esquecer sua senha?</h1>
-      <p>Informe outro e-mail que você usa regularmente. Esse será o seu e-mail de recuperação.</p>
-      <p>Instruções para recuperar sua senha serão enviadas para esse e-mail, guarde com carinho.</p>
-      <div className="field-group">
-        <input type="text" name="email" className="email" required/>
-        <label className="animated-label" htmlFor="email">Digite seu e-mail de recuperação</label>
-      </div>
-      <button>Adicionar e-mail</button>
-      <div>
-        <a href="/">
-          <i className="fa fa-angle-left" aria-hidden="true"></i>
-          <span>Voltar</span>
-        </a>
-      </div>
-    </form>
-  </div>
-);
-
-export default Page
diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js
index ecaedfd8..541bb4b7 100644
--- a/web-ui/app/js/page/default.js
+++ b/web-ui/app/js/page/default.js
@@ -96,7 +96,7 @@ define(
 
     'use strict';
     function initialize(path) {
-      viewI18n.init(path + '/assets/');
+      viewI18n.init(path + '/public/');
       viewI18n.loaded(function() {
         paneContractExpand.attachTo(document);