-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Jazon
committed
Feb 20, 2021
1 parent
d8d6431
commit 0194db2
Showing
4 changed files
with
40 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
.Content { | ||
display: flex; | ||
height: 100vh; | ||
justify-content: space-between; | ||
flex-direction: column; | ||
} | ||
|
||
.Footer { | ||
flex-shrink: 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,34 @@ | ||
import PageScrollProgress from "./PageScrollProgress"; | ||
import { BrowserRouter, Routes, Route } from "react-router-dom"; | ||
import Footer from "./Footer"; | ||
import PageScrollProgress from './PageScrollProgress'; | ||
import { BrowserRouter, Routes, Route } from 'react-router-dom'; | ||
import Footer from './Footer'; | ||
|
||
import RegistrationPage from "./RegistrationPage"; | ||
import HistoryPage from "./HistoryPage"; | ||
import MainPage from "./MainPage"; | ||
import NotFoundPage from "./NotFoundPage"; | ||
import RegistrationPage from './RegistrationPage'; | ||
import HistoryPage from './HistoryPage'; | ||
import MainPage from './MainPage'; | ||
import NotFoundPage from './NotFoundPage'; | ||
|
||
import './App.css'; | ||
|
||
const App = () => ( | ||
<> | ||
<PageScrollProgress /> | ||
<BrowserRouter> | ||
<Routes basename="/2021"> | ||
<Route path="/registration" element={<RegistrationPage />} /> | ||
<Route path="/history" element={<HistoryPage />} /> | ||
<Route path="/" element={<MainPage />} /> | ||
<Route path="*" element={<NotFoundPage />} /> | ||
</Routes> | ||
</BrowserRouter> | ||
<Footer /> | ||
</> | ||
<div className='Content'> | ||
<div> | ||
<PageScrollProgress /> | ||
<BrowserRouter> | ||
<Routes basename='/2021'> | ||
<Route | ||
path='/registration' | ||
element={<RegistrationPage />} | ||
/> | ||
<Route path='/history' element={<HistoryPage />} /> | ||
<Route path='/' element={<MainPage />} /> | ||
<Route path='*' element={<NotFoundPage />} /> | ||
</Routes> | ||
</BrowserRouter> | ||
</div> | ||
<div className="Footer"> | ||
<Footer /> | ||
</div> | ||
</div> | ||
); | ||
|
||
export default App; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,7 @@ | ||
.footer { | ||
background-color: var(--theme-primary); | ||
color: #fff; | ||
margin-top: auto; | ||
position: fixed; | ||
left: 0; | ||
bottom: 0; | ||
width: 100%; | ||
margin-top: auto; | ||
padding-top: 1rem; | ||
padding-bottom: 1rem; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
.hero { | ||
height: 100%; | ||
height: 100vh; | ||
min-height: 750px; | ||
padding-top: 5%; | ||
/* position: relative; */ | ||
|