Skip to content

Commit

Permalink
Merge pull request #346 from ocf/oski-bear-patch-1
Browse files Browse the repository at this point in the history
Issue #343
  • Loading branch information
ben9583 authored Sep 26, 2023
2 parents 11801f0 + 4d96d52 commit 1323330
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
15 changes: 5 additions & 10 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Text, Flex } from "@chakra-ui/react"
import FullWidthBox from "~/components/FullWidthBox"
import Link from "~/components/InternalLink"

const Footer = () => {
return (
Expand All @@ -12,16 +11,12 @@ const Footer = () => {
gap={8}
>
<Flex flexDirection="column" gap={2}>
<Link to="https://ocf.io/donate">Donate to the OCF</Link>
<Link to="https://www.ocf.berkeley.edu/~staff/bod/">
<a href="https://ocf.io/donate">Donate to the OCF</a>
<a href="https://www.ocf.berkeley.edu/~staff/bod/">
Board Meeting Minutes
</Link>
<Link to="https://www.ocf.berkeley.edu/docs/docs/">
Official Documents
</Link>
<Link to="https://www.ocf.berkeley.edu/docs/privacy/">
Privacy Policy
</Link>
</a>
<a href="/docs/">Official Documents</a>
<a href="https://ocf.berkeley.edu/docs/privacy/">Privacy Policy</a>
</Flex>
<Flex
direction="column"
Expand Down
11 changes: 9 additions & 2 deletions src/components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ const Navbar = ({
gap={2}
display={{ base: "none", lg: "flex" }}
>
<NavbarButton>Staff Hours</NavbarButton>
<NavbarButton href="https://www.ocf.berkeley.edu/staff-hours">
Staff Hours
</NavbarButton>
<NavbarButton href="https://new.ocf.berkeley.edu/docs">
Documentation
</NavbarButton>
Expand Down Expand Up @@ -121,7 +123,12 @@ const Navbar = ({
<NavbarDropdownLink>Officers</NavbarDropdownLink>
<NavbarDropdownLink>Meet Our Staff</NavbarDropdownLink>
</NavbarDropdown>
<NavbarButton mr={4}>Contact Us</NavbarButton>
<NavbarButton
mr={4}
href="https://new.ocf.berkeley.edu/docs/internal/contact/"
>
Contact Us
</NavbarButton>
{keycloak.authenticated ? (
<NavbarDropdown title={user?.username ?? ""} width={150}>
<NavbarDropdownLink disabled>{user?.name}</NavbarDropdownLink>
Expand Down
8 changes: 4 additions & 4 deletions src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,20 @@ const IndexPage = () => {
Create Account
</Button>
<Button
to="/account/hosting"
href="/docs/services/webapps/#requesting-app-hosting"
bg="white"
textDecoration="none"
_hover={{ textDecoration: "none" }}
as={Link}
as="a"
>
Request Hosting
</Button>
<Button
to="/docs/printing"
href="/docs/services/lab/printing"
bg="white"
textDecoration="none"
_hover={{ textDecoration: "none" }}
as={Link}
as="a"
>
How to Print
</Button>
Expand Down

0 comments on commit 1323330

Please sign in to comment.