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

About goes to About page now instead of Starvoting.org #372

Merged
merged 3 commits into from
Oct 6, 2023
Merged

About goes to About page now instead of Starvoting.org #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21ab5e8
Volunteer list
Elitemoni Oct 6, 2023
25acd88
Merge branch 'main' of https://github.com/Elitemoni/star-server
Elitemoni Oct 6, 2023
1a705ce
About button update
Elitemoni Oct 6, 2023
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
2 changes: 2 additions & 0 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { Alert, Box, CssBaseline, Snackbar } from '@mui/material'
import { useAuthSession } from './hooks/useAuthSession'
import { Isnack, SnackbarContext } from './components/SnackbarContext'
import Footer from './components/Footer'
import About from './components/About'
const App = () => {
const authSession = useAuthSession()
const [snack, setSnack] = useState({
Expand Down Expand Up @@ -47,6 +48,7 @@ const App = () => {
}}>
<Routes>
<Route path='/' element={<LandingPage authSession={authSession} />} />
<Route path='/About' element={<About/>}/>
<Route path='/Elections' element={<Elections authSession={authSession} />} />
<Route path='/Login' element={<Login />} />
<Route path='/Debug' element={<DebugPage authSession={authSession} />} />
Expand Down
12 changes: 12 additions & 0 deletions frontend/src/components/About.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'

const About = () => {
return (
<>
<div>About</div>
<div>Star voting is the Star of voting</div>
</>
)
}

export default About
4 changes: 2 additions & 2 deletions frontend/src/components/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const Header = ({ authSession }) => {
>
<MenuItem
component={Link}
href='https://www.starvoting.us'
href='/About'
target="_blank">
About
</MenuItem>
Expand Down Expand Up @@ -117,7 +117,7 @@ const Header = ({ authSession }) => {
{/**** DESKTOP OPTIONS ****/}
<Box
sx={{ flexGrow: 100, flexWrap: 'wrap', display: { xs: 'none', md: 'flex' }, gap: 2, rowGap: 0 }}>
<Button color='inherit' href='https://www.starvoting.us' target="_blank">
<Button color='inherit' href='/About' target="_blank">
<Typography variant={navVariant} sx={{ fontWeight: 'bold' }} color={headerTextColor}>
About
</Typography>
Expand Down