Skip to content

Commit

Permalink
Merge branch 'main' into feat/sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
miguel-merlin authored Feb 23, 2024
2 parents 8d60795 + c806653 commit cb58cef
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 1 deletion.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ Commit your changes
```
git commit -m "Commit message"
```
Before pushing your changes you have to run the linter. (The linter will
make sure your code if following standard code styling)
```
npm run lint
```
Push your changes
```
git push --set-upstream origin {branch_name}
Expand Down
10 changes: 9 additions & 1 deletion src/app/App.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import React from 'react'
import { Routes, Route } from 'react-router-dom'
import HomePage from '../pages/HomePage'
import DashboardPage from '../pages/DashboardPage'
import BlogPage from '../pages/BlogPage'

function App (): JSX.Element {
return (
<Routes>
<Route path="/" element={<HomePage />} />
</Routes>
<div>
<Routes>
<Route path="/" element={<HomePage />} />
<Route path="/dashboard" element={<DashboardPage />} />
<Route path="/blog" element={<BlogPage />} />
</Routes>
</div>
)
}

Expand Down
8 changes: 8 additions & 0 deletions src/pages/BlogPage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
function BlogPage (): JSX.Element {
return (
<div>
</div>
)
}

export default BlogPage
8 changes: 8 additions & 0 deletions src/pages/DashboardPage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
function DashboardPage (): JSX.Element {
return (
<div>
</div>
)
}

export default DashboardPage

0 comments on commit cb58cef

Please sign in to comment.