mirrors/mue
1
0
Fork 0
mirror of https://github.com/mue/mue.git synced 2026-07-18 14:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: language cleanup and css fix

Browse Source 
Co-authored-by: Alex Sparkes <turbomarshmello@gmail.com>
This commit is contained in:
David Ralph
2021-03-19 22:30:29 +00:00
parent 025303a01a
commit 70756befa2
23 changed files with 158 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/App.jsx
View File

@@ -8,7 +8,6 @@ import Navbar from './components/widgets/navbar/Navbar';
import SettingsFunctions from './modules/helpers/settings';
import { ToastContainer } from 'react-toastify';
import Modal from 'react-modal';
import merge from './modules/helpers/merge';
// Modals are lazy loaded as the user won't use them every time they open a tab
const Main = React.lazy(() => import('./components/modals/Main'));
@@ -80,30 +79,25 @@ export default class App extends React.PureComponent {
}
const overlayClassList = (localStorage.getItem('animations') === 'true') ? 'Overlay modal-animation' : 'Overlay';
/// language
const languagecode = localStorage.getItem('language') || 'en-GB';
const language = merge(require('./translations/en-GB.json'), require(`./translations/${languagecode}.json`));
const toastDisplayTime = localStorage.getItem('toastDisplayTime') || 2500;
return (
<React.Fragment>
<Background/>
<ToastContainer position='bottom-right' autoClose={toastDisplayTime} newestOnTop={true} closeOnClick pauseOnFocusLoss />
<ToastContainer position='bottom-right' autoClose={toastDisplayTime} newestOnTop={true} closeOnClick pauseOnFocusLoss/>
<div id='center'>
<Navbar openModal={(modal) => this.setState({ [modal]: true })} language={language} />
<Widgets language={language} languagecode={languagecode} />
<PhotoInformation language={language.widgets.background} className={tooltipClassList} />
<Navbar openModal={(modal) => this.setState({ [modal]: true })}/>
<Widgets/>
<PhotoInformation className={tooltipClassList}/>
<React.Suspense fallback={renderLoader()}>
<Modal closeTimeoutMS={300} id={'modal'} onRequestClose={() => this.setState({ mainModal: false })} isOpen={this.state.mainModal} className={modalClassList} overlayClassName={overlayClassList} ariaHideApp={false}>
<Main language={language} modalClose={() => this.setState({ mainModal: false })} />
<Main modalClose={() => this.setState({ mainModal: false })} />
</Modal>
<Modal onRequestClose={() => this.setState({ updateModal: false })} isOpen={this.state.updateModal} className={modalClassList} overlayClassName={overlayClassList} ariaHideApp={false}>
<Update language={language.update} modalClose={() => this.setState({ updateModal: false })} />
<Update modalClose={() => this.setState({ updateModal: false })} />
</Modal>
<Modal onRequestClose={() => this.closeWelcome()} isOpen={this.state.welcomeModal} className={modalClassList} overlayClassName={overlayClassList} ariaHideApp={false}>
<Welcome modalClose={() => this.closeWelcome()} language={language.modals.welcome} />
<Welcome modalClose={() => this.closeWelcome()} />
</Modal>
{/* <Modal onRequestClose={() => this.setState({ feedbackModal: false })} isOpen={this.state.feedbackModal} className={modalClassList} overlayClassName={overlayClassList} ariaHideApp={false}>
<Feedback modalClose={() => this.setState({ feedbackModal: false })} />