p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #384 from answerdev/feat/1.1.0/ui 

Feat/1.1.0/UI
This commit is contained in:
haitao.jarvis 2023-06-02 18:30:37 +08:00 committed by GitHub
parent b18f3893a9 92d06b8078
commit 16d2715d54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/index.scss
View File

@ -18,6 +18,10 @@
}
}
:root {
scroll-behavior: auto;
}
html,
body {
padding: 0;

40
ui/src/pages/Legal/index.tsx
View File

@ -1,31 +1,29 @@
import { FC } from 'react';
import { Container, Row, Col, Nav } from 'react-bootstrap';
import { Row, Col, Nav } from 'react-bootstrap';
import { Outlet, NavLink } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
const Index: FC = () => {
const { t } = useTranslation('translation', { keyPrefix: 'nav_menus' });
return (
<Container className="pt-4 mt-2 mb-5">
<Row className="justify-content-center">
<Col xxl={10}>
<Nav
className="mb-4 flex-nowrap"
variant="pills"
style={{ overflow: 'auto' }}>
<NavLink to="/tos" key="tos" className="nav-link">
{t('tos')}
</NavLink>
<NavLink to="/privacy" key="privacy" className="nav-link">
{t('privacy')}
</NavLink>
</Nav>
</Col>
<Col xxl={10}>
<Outlet />
</Col>
</Row>
</Container>
<Row className="pt-4 mb-5">
<Col xxl={12}>
<Nav
className="mb-4 flex-nowrap"
variant="pills"
style={{ overflow: 'auto' }}>
<NavLink to="/tos" key="tos" className="nav-link">
{t('tos')}
</NavLink>
<NavLink to="/privacy" key="privacy" className="nav-link">
{t('privacy')}
</NavLink>
</Nav>
</Col>
<Col xxl={12}>
<Outlet />
</Col>
</Row>
);
};

24
ui/src/router/routes.ts
View File

@ -41,7 +41,6 @@ const routes: RouteNode[] = [
// question and answer
{
// side nav layout
path: '/',
page: 'pages/SideNavLayout',
children: [
{
@ -400,17 +399,26 @@ const routes: RouteNode[] = [
{
path: '/',
page: 'pages/Layout',
loader: async () => {
await guard.setupApp();
return null;
},
children: [
{
page: 'pages/Legal',
page: 'pages/SideNavLayout',
children: [
{
path: 'tos',
page: 'pages/Legal/Tos',
},
{
path: 'privacy',
page: 'pages/Legal/Privacy',
page: 'pages/Legal',
children: [
{
path: 'tos',
page: 'pages/Legal/Tos',
},
{
path: 'privacy',
page: 'pages/Legal/Privacy',
},
],
},
],
},