Skip to content
This repository has been archived by the owner on Jun 7, 2023. It is now read-only.

Commit

Permalink
add shared folder usage to desktop project
Browse files Browse the repository at this point in the history
  • Loading branch information
vinnymac committed Dec 3, 2017
1 parent 4949636 commit 48ea13b
Show file tree
Hide file tree
Showing 15 changed files with 46 additions and 56 deletions.
1 change: 1 addition & 0 deletions .tool-versions
@@ -0,0 +1 @@
nodejs 8.9.1
2 changes: 1 addition & 1 deletion src/desktop/src/components/App.css
Expand Up @@ -49,7 +49,7 @@ body {
}

body {
background-image: url(../../../shared/images/bg-green.jpg);
background-image: url(images/bg-green.svg);
background-repeat: no-repeat;
background-size: 100% 100%;
background-attachment: fixed;
Expand Down
2 changes: 1 addition & 1 deletion src/desktop/src/components/App.js
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { persistStore } from 'redux-persist';
import { withRouter } from 'react-router-dom';
import store from '../store';
import store from 'store';
import i18next from 'libs/i18next';
import Loading from 'components/Layout/Loading';
import Onboarding from 'components/Layout/Onboarding';
Expand Down
4 changes: 2 additions & 2 deletions src/desktop/src/components/Layout/Onboarding.css
Expand Up @@ -58,13 +58,13 @@
}

.body-home {
background-image: url(../../../../shared/images/hello-back.png), url(../../../../shared/images/bg-green.jpg);
background-image: url(images/hello-back.png), url(images/bg-green.svg);
background-size: contain, 100% 100%;
background-position: center;
}

.body-done {
background-image: url(../../../../shared/images/balloons.png), url(../../../../shared/images/bg-green.jpg);
background-image: url(images/balloons.png), url(images/bg-green.svg);
background-size: contain, 100% 100%;
background-position: center;
}
Expand Down
4 changes: 2 additions & 2 deletions src/desktop/src/components/Onboarding/GenerateSeed.js
Expand Up @@ -5,8 +5,8 @@ import { translate } from 'react-i18next';
import { addAndSelectSeed, clearSeeds } from 'actions/seeds';
import { showError } from 'actions/notifications';
import { getSelectedSeed } from 'selectors/seeds';
import { isValidSeed } from '../../../../shared/libs/util';
import { createRandomSeed } from 'libs/util';
import { isValidSeed } from 'libs/util';
import { createRandomSeed } from 'libs/seedUtil';
import Template, { Main, Footer } from './Template';
import Button from '../UI/Button';
import SeedGenerator from '../UI/SeedGenerator';
Expand Down
2 changes: 1 addition & 1 deletion src/desktop/src/components/Onboarding/SecurityEnter.js
Expand Up @@ -6,7 +6,7 @@ import { addAndSelectSeed } from 'actions/seeds';
import { setOnboardingCompletionStatus } from 'actions/app';
import { showError } from 'actions/notifications';
// import { getSelectedSeed } from 'selectors/seeds';
import { isValidPassword } from '../../../../shared/libs/util';
import { isValidPassword } from 'libs/util';
import Template, { Main, Footer } from './Template';
import Button from '../UI/Button';
import Infobox from '../UI/Infobox';
Expand Down
2 changes: 1 addition & 1 deletion src/desktop/src/components/Onboarding/SeedEnter.js
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import QrReader from 'react-qr-reader';
import { connect } from 'react-redux';
import { translate } from 'react-i18next';
import { isValidSeed } from '../../../../shared/libs/util';
import { isValidSeed } from 'libs/util';
import { showError } from 'actions/notifications';
import { addAndSelectSeed, clearSeeds } from 'actions/seeds';
import { getSelectedSeed } from 'selectors/seeds';
Expand Down
4 changes: 2 additions & 2 deletions src/desktop/src/components/UI/BoxedSeed.css
Expand Up @@ -2,7 +2,7 @@
border-radius: 7px;
padding: 10px 8px;
&:before {
background-image: url(../../../../shared/images/arrow-white.png);
background-image: url(images/arrow-white.png);
background-size: contain;
background-repeat: no-repeat;
background-position: center;
Expand All @@ -16,7 +16,7 @@
color: #000000;
}
&.color--black:before {
background-image: url(../../../../shared/images/arrow-black.png);
background-image: url(images/arrow-black.png);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/desktop/src/components/UI/Infobox.css
Expand Up @@ -15,7 +15,7 @@
}

.icon {
background: url(../../../../shared/images/info.png) no-repeat;
background: url(images/info.png) no-repeat;
background-size: contain;
display: inline-block;
width: 32px;
Expand Down
2 changes: 1 addition & 1 deletion src/desktop/src/components/UI/LanguageSelect.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import i18next from 'libs/i18next';
import { setLocale } from '../../../../shared/actions/settings';
import { setLocale } from 'actions/settings';

class LanguageSelect extends React.PureComponent {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/desktop/src/components/UI/Logo.js
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import LogoGlow from '../../../../shared/images/iota-glow.png';
import LogoGlow from 'images/iota-glow.png';

export default class Logo extends React.PureComponent {
static propTypes = {
Expand Down
58 changes: 29 additions & 29 deletions src/desktop/src/libs/i18next.js
Expand Up @@ -9,34 +9,34 @@ export default i18next.init({
fallbackNS: 'Common',
parseMissingKeyHandler: missing => `NOT TRANSLATED: ${missing}`,
resources: {
ar: require('../../../shared/locales/ar/translation.json'),
da: require('../../../shared/locales/da/translation.json'),
de: require('../../../shared/locales/de/translation.json'),
el: require('../../../shared/locales/el/translation.json'),
en: require('../../../shared/locales/en/translation.json'),
es_ES: require('../../../shared/locales/es-ES/translation.json'),
es_LA: require('../../../shared/locales/es-LA/translation.json'),
fi: require('../../../shared/locales/fi/translation.json'),
fr: require('../../../shared/locales/fr/translation.json'),
he: require('../../../shared/locales/he/translation.json'),
hi: require('../../../shared/locales/hi/translation.json'),
id: require('../../../shared/locales/id/translation.json'),
it: require('../../../shared/locales/it/translation.json'),
ja: require('../../../shared/locales/ja/translation.json'),
ko: require('../../../shared/locales/ko/translation.json'),
lv: require('../../../shared/locales/lv/translation.json'),
nl: require('../../../shared/locales/nl/translation.json'),
no: require('../../../shared/locales/no/translation.json'),
pl: require('../../../shared/locales/pl/translation.json'),
pt_BR: require('../../../shared/locales/pt-BR/translation.json'),
pt_PT: require('../../../shared/locales/pt-PT/translation.json'),
ro: require('../../../shared/locales/ro/translation.json'),
ru: require('../../../shared/locales/ru/translation.json'),
sl: require('../../../shared/locales/sl/translation.json'),
sv_SE: require('../../../shared/locales/sv-SE/translation.json'),
tr: require('../../../shared/locales/tr/translation.json'),
ur: require('../../../shared/locales/ur/translation.json'),
zh_CN: require('../../../shared/locales/zh-CN/translation.json'),
zh_TW: require('../../../shared/locales/zh-TW/translation.json'),
ar: require('locales/ar/translation.json'),
da: require('locales/da/translation.json'),
de: require('locales/de/translation.json'),
el: require('locales/el/translation.json'),
en: require('locales/en/translation.json'),
es_ES: require('locales/es-ES/translation.json'),
es_LA: require('locales/es-LA/translation.json'),
fi: require('locales/fi/translation.json'),
fr: require('locales/fr/translation.json'),
he: require('locales/he/translation.json'),
hi: require('locales/hi/translation.json'),
id: require('locales/id/translation.json'),
it: require('locales/it/translation.json'),
ja: require('locales/ja/translation.json'),
ko: require('locales/ko/translation.json'),
lv: require('locales/lv/translation.json'),
nl: require('locales/nl/translation.json'),
no: require('locales/no/translation.json'),
pl: require('locales/pl/translation.json'),
pt_BR: require('locales/pt-BR/translation.json'),
pt_PT: require('locales/pt-PT/translation.json'),
ro: require('locales/ro/translation.json'),
ru: require('locales/ru/translation.json'),
sl: require('locales/sl/translation.json'),
sv_SE: require('locales/sv-SE/translation.json'),
tr: require('locales/tr/translation.json'),
ur: require('locales/ur/translation.json'),
zh_CN: require('locales/zh-CN/translation.json'),
zh_TW: require('locales/zh-TW/translation.json'),
},
});
@@ -1,5 +1,4 @@
import { createRandomSeed as createRandomSeedWrapped } from '../../../shared/libs/util';
import { MAX_SEED_LENGTH } from 'libs/util';
import { MAX_SEED_LENGTH, createRandomSeed as createRandomSeedWrapped } from 'libs/util';
import randomBytes from 'randombytes';

export const createRandomSeed = (length = MAX_SEED_LENGTH) => {
Expand Down
8 changes: 0 additions & 8 deletions src/desktop/src/store.js

This file was deleted.

6 changes: 2 additions & 4 deletions src/shared/store.js
Expand Up @@ -10,6 +10,7 @@ import seeds from './reducers/seeds';
import notifications from './reducers/notifications';
import alerts from './reducers/alerts';
import home from './reducers/home';
import { ActionTypes } from './actions/app';

const reducers = combineReducers({
alerts,
Expand All @@ -24,10 +25,7 @@ const reducers = combineReducers({
});

const rootReducer = (state, action) => {
/* eslint-disable no-param-reassign */
// FIXME: For some reason cannot resolve path to shared/actions/app/ActionTypes

if (action.type === 'IOTA/APP/WALLET/RESET') {
if (ActionTypes.WALLET_RESET) {
state = undefined;
}
/* eslint-enable no-param-reassign */
Expand Down

0 comments on commit 48ea13b

Please sign in to comment.