This commit is contained in:
2020-08-22 22:50:34 +02:00
parent de3570e0f1
commit 9c03b8e92f
3 changed files with 60 additions and 43 deletions

View File

@@ -1,25 +1,26 @@
import React from 'react'; import React from 'react';
import { hot } from 'react-hot-loader/root'; import { hot } from 'react-hot-loader/root';
import { Layout, Menu } from 'antd'; import { Layout } from 'antd';
import { HashRouter as Router } from 'react-router-dom';
import { GithubProvider } from './contexts/Github'; import { GithubProvider } from './contexts/Github';
import { EncryptionProvider } from './contexts/Encryption'; import { EncryptionProvider } from './contexts/Encryption';
import { DecryptionProvider } from './contexts/Decryption'; import { DecryptionProvider } from './contexts/Decryption';
import AppRouter from './Router'; import AppRouter from './Router';
const App: React.FC = () => ( const App: React.FC = () => {
return (
<GithubProvider> <GithubProvider>
<EncryptionProvider> <EncryptionProvider>
<DecryptionProvider> <DecryptionProvider>
<Layout style={{minHeight:"100vh"}}> <Layout style={{minHeight:"100vh"}}>
<Layout.Header> <Router>
</Layout.Header>
<Layout.Content style={{ padding: '25px', maxWidth: '800px', width: '100%', margin: 'auto' }}>
<AppRouter/> <AppRouter/>
</Layout.Content> </Router>
</Layout> </Layout>
</DecryptionProvider> </DecryptionProvider>
</EncryptionProvider> </EncryptionProvider>
</GithubProvider> </GithubProvider>
); );
};
export default hot(App); export default hot(App);

View File

@@ -1,9 +1,11 @@
import React from 'react'; import React from 'react';
import { import {
HashRouter as Router,
Switch, Switch,
Route, Route,
useHistory,
} from 'react-router-dom'; } from 'react-router-dom';
import { HomeFilled } from '@ant-design/icons';
import { Layout, Button, Space } from 'antd';
import Intro from './screens/Intro'; import Intro from './screens/Intro';
import Encrypt from './screens/Encrypt'; import Encrypt from './screens/Encrypt';
@@ -12,8 +14,21 @@ import SetupKey from './screens/SetupKey';
import Welcome from './screens/Welcome'; import Welcome from './screens/Welcome';
import Debug from './screens/Debug'; import Debug from './screens/Debug';
const AppRouter: React.FC = () => ( const AppRouter: React.FC = () => {
<Router> const history = useHistory();
return (
<>
<Layout style={{ textAlign: 'center' }}>
<Space>
<Button
onClick={() => history.push('/')}
icon={<HomeFilled />}
>
Home
</Button>
</Space>
</Layout>
<Layout.Content style={{ padding: '25px', maxWidth: '800px', width: '100%', margin: 'auto' }}>
<Switch> <Switch>
<Route path="/debug"> <Route path="/debug">
<Debug /> <Debug />
@@ -34,7 +49,9 @@ const AppRouter: React.FC = () => (
<Intro /> <Intro />
</Route> </Route>
</Switch> </Switch>
</Router> </Layout.Content>
); </>
);
}
export default AppRouter; export default AppRouter;

View File

@@ -21,9 +21,8 @@ const Thumb: React.FC = ({
return ( return (
<Button <Button
size="large" size="large"
shape="round"
type="link"
icon={<Icon />} icon={<Icon />}
type="link"
onClick={() => history.push(link)} onClick={() => history.push(link)}
> >
{title} {title}