forked from M3-Academy/desafio-react-e-typescript
Merge pull request 'feat(routes): created routes for initial page' (#4) from feature/router into develop
Reviewed-on: #4
This commit is contained in:
commit
74ab177c2d
17
src/App.tsx
17
src/App.tsx
@ -1,19 +1,12 @@
|
||||
import { Footer } from './template/Footer'
|
||||
import { Header } from './template/Header'
|
||||
import { Introduction } from './pages/Introduction'
|
||||
import { BrowserRouter } from 'react-router-dom'
|
||||
import { Router } from './settings/routes'
|
||||
|
||||
import './settings/styles/index.scss'
|
||||
|
||||
export function App() {
|
||||
return (
|
||||
<>
|
||||
<Header />
|
||||
|
||||
<main>
|
||||
<Introduction />
|
||||
</main>
|
||||
|
||||
<Footer />
|
||||
</>
|
||||
<BrowserRouter>
|
||||
<Router />
|
||||
</BrowserRouter>
|
||||
)
|
||||
}
|
||||
|
@ -1,33 +1 @@
|
||||
@use '../../settings/styles/utils/helpers/functions' as function;
|
||||
|
||||
.introduction {
|
||||
margin-top: 29px;
|
||||
|
||||
@media screen and (min-width: 2500px) {
|
||||
margin-top: 31px;
|
||||
}
|
||||
}
|
||||
|
||||
.container {
|
||||
width: 100%;
|
||||
padding: 0 16px;
|
||||
|
||||
@media screen and (min-width: 1025px) {
|
||||
width: function.fluid(1080px, 1280px);
|
||||
margin: 0 auto;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
@media screen and (min-width: 2500px) {
|
||||
width: function.fluid(2299.68px, 2500px);
|
||||
}
|
||||
}
|
||||
|
||||
.breadcrumb {
|
||||
a {
|
||||
font-size: var(--txt-xs);
|
||||
line-height: 14.06px;
|
||||
|
||||
text-transform: uppercase;
|
||||
}
|
||||
}
|
||||
|
@ -1,16 +1,9 @@
|
||||
import { useMemo } from 'react'
|
||||
import { Breadcrumb } from '../../components/Breadcrumb'
|
||||
|
||||
import css from './index.module.scss'
|
||||
|
||||
export function Introduction() {
|
||||
let listBreadcrumb = useMemo(() => [{ name: 'Introduction', href: '/' }], [])
|
||||
|
||||
return (
|
||||
<section className={css.introduction}>
|
||||
<div className={css.container}>
|
||||
<Breadcrumb className={css.breadcrumb} list={listBreadcrumb} />
|
||||
</div>
|
||||
<div className={css.container}></div>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
|
40
src/settings/routes/index.module.scss
Normal file
40
src/settings/routes/index.module.scss
Normal file
@ -0,0 +1,40 @@
|
||||
@use '../../settings/styles/utils/helpers/functions' as function;
|
||||
|
||||
main :global {
|
||||
.main-container {
|
||||
width: 100%;
|
||||
|
||||
@media screen and (min-width: 1025px) {
|
||||
width: function.fluid(748px, 1080px);
|
||||
}
|
||||
|
||||
@media screen and (min-width: 2500px) {
|
||||
width: function.fluid(1680px, 2299.68px);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.breadcrumb :global {
|
||||
a {
|
||||
font-size: var(--txt-xs);
|
||||
line-height: 14.06px;
|
||||
|
||||
text-transform: uppercase;
|
||||
}
|
||||
}
|
||||
|
||||
.breadcrumb-container {
|
||||
width: 100%;
|
||||
padding: 0 16px;
|
||||
margin-top: 29px;
|
||||
|
||||
@media screen and (min-width: 1025px) {
|
||||
width: function.fluid(1080px, 1280px);
|
||||
margin: 29px auto 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
@media screen and (min-width: 2500px) {
|
||||
width: function.fluid(2299.68px, 2500px);
|
||||
}
|
||||
}
|
59
src/settings/routes/index.tsx
Normal file
59
src/settings/routes/index.tsx
Normal file
@ -0,0 +1,59 @@
|
||||
import { useMemo } from 'react'
|
||||
import { Outlet, Route, Routes } from 'react-router-dom'
|
||||
import { Breadcrumb } from '../../components/Breadcrumb'
|
||||
import { Footer } from '../../template/Footer'
|
||||
import { Header } from '../../template/Header'
|
||||
import { Sidebar } from '../../template/Sidebar'
|
||||
|
||||
import css from './index.module.scss'
|
||||
|
||||
export function Router() {
|
||||
let listBreadcrumb = useMemo(() => [{ name: 'Introduction', href: '/' }], [])
|
||||
|
||||
return (
|
||||
<Routes>
|
||||
<Route
|
||||
path="/"
|
||||
element={
|
||||
<>
|
||||
<Header />
|
||||
<div className={css['breadcrumb-container']}>
|
||||
<Breadcrumb className={css.breadcrumb} list={listBreadcrumb} />
|
||||
</div>
|
||||
<div className="window-content">
|
||||
<Outlet />
|
||||
</div>
|
||||
<Footer />
|
||||
</>
|
||||
}
|
||||
>
|
||||
<Route
|
||||
path="/"
|
||||
element={
|
||||
<>
|
||||
<div>
|
||||
<h1>Institutional</h1>
|
||||
<Sidebar />
|
||||
<main>
|
||||
<div className="main-container">
|
||||
<Outlet />
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<Route
|
||||
index
|
||||
element={
|
||||
<>
|
||||
<h2>Sobre</h2>
|
||||
</>
|
||||
}
|
||||
/>
|
||||
<Route path="/signup" element={<h2>Preencha o formulário</h2>} />
|
||||
</Route>
|
||||
</Route>
|
||||
</Routes>
|
||||
)
|
||||
}
|
@ -1,4 +1,5 @@
|
||||
@use '../utils/resources/colors' as var;
|
||||
@use '../utils/helpers/functions' as function;
|
||||
@use '../utils/resources/fonts' as fonts;
|
||||
|
||||
:root {
|
||||
@ -46,3 +47,16 @@ button,
|
||||
textarea {
|
||||
font-family: var(--font-family-100);
|
||||
}
|
||||
|
||||
.window-content {
|
||||
width: 100%;
|
||||
padding: 0 16px;
|
||||
|
||||
@media screen and (min-width: 1025px) {
|
||||
width: function.fluid(1080px, 1280px);
|
||||
padding: 0;
|
||||
}
|
||||
@media screen and (min-width: 2500px) {
|
||||
width: function.fluid(2299.68px, 2500px);
|
||||
}
|
||||
}
|
||||
|
0
src/template/Sidebar/index.module.scss
Normal file
0
src/template/Sidebar/index.module.scss
Normal file
19
src/template/Sidebar/index.tsx
Normal file
19
src/template/Sidebar/index.tsx
Normal file
@ -0,0 +1,19 @@
|
||||
import { Link } from 'react-router-dom'
|
||||
|
||||
export function Sidebar() {
|
||||
return (
|
||||
<aside>
|
||||
<li>
|
||||
<Link to={'/'}>Initial</Link>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<Link to={'/about'}>About</Link>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<Link to={'/signup'}>Sign up</Link>
|
||||
</li>
|
||||
</aside>
|
||||
)
|
||||
}
|
Loading…
Reference in New Issue
Block a user