Skip to content

[CW2-36] Linking Merch Store Link in nav bar and hamburger #24

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

Merged
derekxu04 merged 3 commits into from
Aug 1, 2024
Merged

[CW2-36] Linking Merch Store Link in nav bar and hamburger #24

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
b8d4351
Adding Merch Store Link to nav bar and hamburger
Jul 11, 2024
5adfbe9
Adding suggested changes
Jul 18, 2024
a2dbfd4
Making hamburger link open in seperate tab
Aug 1, 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
12 changes: 12 additions & 0 deletions frontend/public/assets/merch-store-icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions frontend/src/components/Hamburger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ export default function Hamburger() {
<li className="py-2 text-lg">
<Link href={'./contact-us'}>Contact Us</Link>
</li>
<li className="py-2 text-lg">
<a target="_blank" href="https://csesoc-merch.square.site/">Merch Store</a>
</li>
</ul>
</motion.div>
)}
Expand Down
9 changes: 9 additions & 0 deletions frontend/src/components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ const Navbar = () => {
<Link href="/contact-us">
<div className="text-xl">{'//'} contact us</div>
</Link>
<a target="_blank" href="https://csesoc-merch.square.site/" className='flex'>
<Image
src="/assets/merch-store-icon.svg"
alt="Merchandise Store Icon"
width={29}
height={29}
draggable={false}
/>
</a>
</div>
<div className="md:hidden xl:hidden lg:hidden text-right font-bold block">
<Hamburger />
Expand Down