Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: modified footer position #13

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: modified footer position #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78be8bd
feat: fixed footer location
silvertoml Jul 22, 2024
17ad3e5
Update Footer.jsx
silvertoml Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,26 @@ import Footer from './components/layout/Footer'

function App() {
return (
<QuotteryProvider>
<QubicConnectProvider>
<BrowserRouter>
<Header />
<Routes>
<Route>
<Route path="/" element={<StartPage />} />
</Route>
<Route>
<Route path="/bet/:id" element={<BetDetailsPage />} />
</Route>
</Routes>
<Footer />
</BrowserRouter>
</QubicConnectProvider>
</QuotteryProvider>
<div className="flex flex-col min-h-screen">
<QuotteryProvider>
<QubicConnectProvider>
<BrowserRouter>
<Header />
<div className='flex-grow'>
<Routes>
<Route>
<Route path="/" element={<StartPage />} />
</Route>
<Route>
<Route path="/bet/:id" element={<BetDetailsPage />} />
</Route>
</Routes>
</div>
<Footer />
</BrowserRouter>
</QubicConnectProvider>
</QuotteryProvider>
</div>
)
}

Expand Down
72 changes: 36 additions & 36 deletions src/components/layout/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,50 +9,50 @@ const Footer = () => {
// if the current route is not '/bet/:id', render the footer
if(pathname.indexOf('/bet/') === -1) {
return (
<div className="px-5 sm:px-20 md:px-100 py-16 flex flex-col sm:flex-row items-center sm:justify-between sm:items-end gap-10">
<div className="flex gap-10">
<img src={logoShort} alt="logo-short" />
<span className="text-gray-50 text-12 leading-18 font-space">
{'\u00A9'} {new Date().getFullYear()} Qubic
</span>
</div>
<div className="px-5 sm:px-20 md:px-100 py-16 flex flex-col sm:flex-row items-center sm:justify-center sm:items-center gap-10">
<div className="flex gap-10">
<img src={logoShort} alt="logo-short" />
<span className="text-gray-50 text-12 leading-18 font-space">
{'\u00A9'} {new Date().getFullYear()} Qubic
</span>
</div>

<div className="flex items-center gap-2">
<a
style={{ textDecoration: 'none', color: 'white' }}
className="text-12 leading-18 font-space"
target='_blank' rel="noreferrer"
href="https://qubic.org/Terms-of-service"
>
Terms of service
</a>
<span className="text-gray-50">•</span>
<a
<div className="flex items-center gap-2">
<a
style={{ textDecoration: 'none', color: 'white' }}
className="text-12 leading-18 font-space"
target='_blank' rel="noreferrer"
href="https://qubic.org/Terms-of-service"
>
Terms of service
</a>
<span className="text-gray-50">•</span>
<a
style={{ textDecoration: 'none', color: 'white' }}
className="text-12 leading-18 font-space"
target='_blank' rel="noreferrer"
href="https://qubic.org/Privacy-policy"
>
Privacy Policy
</a>
<span className="text-gray-50">•</span>
<a
style={{ textDecoration: 'none', color: 'white' }}
className="text-12 leading-18 font-space"
target='_blank' rel="noreferrer"
href="https://qubic.org/Privacy-policy"
>
Privacy Policy
</a>
<span className="text-gray-50">•</span>
<a
style={{ textDecoration: 'none', color: 'white' }}
className="text-12 leading-18 font-space"
target='_blank' rel="noreferrer"
href="https://status.qubic.li/"
>
Network Status
</a>
<span className='text-gray-50 text-12'>
Version {pkg.version}
</span>
</div>
href="https://status.qubic.li/"
>
Network Status
</a>
<span className='text-gray-50 text-12'>
Version {pkg.version}
</span>
</div>
</div>
)
}

return null
}

export default Footer
export default Footer