Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import CssBaseline from "@material-ui/core/CssBaseline";
import { ThemeProvider } from "@material-ui/core/styles";

import ConnectionsTracker from "./components/ConnectionsTracker";
import Footer from "./components/Footer";
import Navbar from "./components/Navbar";
import WelcomeDialog from "./components/WelcomeDialog";
import { SettingsContext, UserContext } from "./context";
Expand Down Expand Up @@ -185,6 +186,7 @@ function App() {
<Route exact path="/profile/:id" component={ProfilePage} />
<Route component={NotFoundPage} />
</Switch>
<Footer />
</SettingsContext.Provider>
</UserContext.Provider>
)}
Expand Down
27 changes: 27 additions & 0 deletions src/components/Footer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import Link from "@material-ui/core/Link";
import Typography from "@material-ui/core/Typography";

import InternalLink from "./InternalLink";

function Footer() {
return (
<Typography variant="body1" align="center" style={{ padding: "16px 0" }}>
<InternalLink to="/help">Help</InternalLink> •{" "}
<InternalLink to="/about">About</InternalLink> •{" "}
<InternalLink to="/conduct">Conduct</InternalLink> •{" "}
<Link
target="_blank"
rel="noopener"
href="https://github.com/eltoder/setwithfriends"
>
GitHub
</Link>
{" • "}
<Link target="_blank" rel="noopener" href="https://discord.gg/XbjJyc9">
Discord
</Link>
</Typography>
);
}

export default Footer;
7 changes: 0 additions & 7 deletions src/pages/AboutPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@ function AboutPage() {
<InternalLink to="/legal">terms of service</InternalLink>.
</Typography>
</Paper>
<Typography
variant="body1"
align="center"
style={{ marginTop: 12, paddingBottom: 12 }}
>
<InternalLink to="/">Return to home</InternalLink>
</Typography>
</Container>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/pages/ConductPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import Link from "@material-ui/core/Link";
import Paper from "@material-ui/core/Paper";
import Typography from "@material-ui/core/Typography";

import InternalLink from "../components/InternalLink";

function ConductPage() {
return (
<Container>
Expand Down Expand Up @@ -93,13 +91,6 @@ function ConductPage() {
and contact a moderator.
</Typography>
</Paper>
<Typography
variant="body1"
align="center"
style={{ marginTop: 12, paddingBottom: 12 }}
>
<InternalLink to="/">Return to home</InternalLink>
</Typography>
</Container>
);
}
Expand Down
8 changes: 0 additions & 8 deletions src/pages/HelpPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import Link from "@material-ui/core/Link";
import Paper from "@material-ui/core/Paper";
import Typography from "@material-ui/core/Typography";

import InternalLink from "../components/InternalLink";
import ScrollToHash from "../components/ScrollToHash";
import SetCard from "../components/SetCard";
import { SettingsContext } from "../context";
Expand Down Expand Up @@ -655,13 +654,6 @@ function HelpPage() {
and computed as a floating-point number.
</Typography>
</Paper>
<Typography
variant="body1"
align="center"
style={{ marginTop: 12, paddingBottom: 12 }}
>
<InternalLink to="/">Return to home</InternalLink>
</Typography>
</Container>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/pages/LegalPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import Tab from "@material-ui/core/Tab";
import Tabs from "@material-ui/core/Tabs";
import Typography from "@material-ui/core/Typography";

import InternalLink from "../components/InternalLink";

// Created with GetTerms - https://getterms.io/

const TermsOfService = () => (
Expand Down Expand Up @@ -201,13 +199,6 @@ function LegalPage() {
<Paper style={{ padding: "1rem", maxWidth: 720, margin: "12px auto" }}>
{tab === "terms" ? <TermsOfService /> : <PrivacyPolicy />}
</Paper>
<Typography
variant="body1"
align="center"
style={{ marginTop: 12, paddingBottom: 12 }}
>
<InternalLink to="/">Return to home</InternalLink>
</Typography>
</Container>
);
}
Expand Down
16 changes: 0 additions & 16 deletions src/pages/LobbyPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import Button from "@material-ui/core/Button";
import Container from "@material-ui/core/Container";
import Grid from "@material-ui/core/Grid";
import Link from "@material-ui/core/Link";

Check warning on line 9 in src/pages/LobbyPage.js

View workflow job for this annotation

GitHub Actions / Lint and Test

'Link' is defined but never used
import Paper from "@material-ui/core/Paper";
import Tab from "@material-ui/core/Tab";
import Table from "@material-ui/core/Table";
Expand All @@ -22,7 +22,7 @@

import Chat from "../components/Chat";
import GameInfoRow from "../components/GameInfoRow";
import InternalLink from "../components/InternalLink";

Check warning on line 25 in src/pages/LobbyPage.js

View workflow job for this annotation

GitHub Actions / Lint and Test

'InternalLink' is defined but never used
import { UserContext } from "../context";
import firebase, { createGame } from "../firebase";
import useFirebaseQuery from "../hooks/useFirebaseQuery";
Expand Down Expand Up @@ -309,22 +309,6 @@
</Grid>
</Box>
</Grid>
<Typography variant="body1" align="center" style={{ padding: "16px 0" }}>
<InternalLink to="/help">Help</InternalLink> •{" "}
<InternalLink to="/about">About</InternalLink> •{" "}
<InternalLink to="/conduct">Conduct</InternalLink> •{" "}
<Link
target="_blank"
rel="noopener"
href="https://github.com/eltoder/setwithfriends"
>
GitHub
</Link>{" "}
•{" "}
<Link target="_blank" rel="noopener" href="https://discord.gg/XbjJyc9">
Discord
</Link>
</Typography>
</Container>
);
}
Expand Down
8 changes: 0 additions & 8 deletions src/pages/NotFoundPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Container from "@material-ui/core/Container";
import Typography from "@material-ui/core/Typography";

import cowImage from "../assets/cow_404.png";
import InternalLink from "../components/InternalLink";

function NotFoundPage() {
return (
Expand All @@ -15,13 +14,6 @@ function NotFoundPage() {
alt="404"
style={{ display: "block", maxWidth: "100%", margin: "0 auto 8px" }}
/>
<Typography
variant="body1"
align="center"
style={{ marginTop: 12, paddingBottom: 12 }}
>
<InternalLink to="/">Return to home</InternalLink>
</Typography>
</Container>
);
}
Expand Down