Skip to content

Commit

Permalink
Merge pull request #216 from LaurierHawkHacks/fix/asset-imports
Browse files Browse the repository at this point in the history
Fix asset imports in components and exports in index
  • Loading branch information
juancwu authored Apr 1, 2024
2 parents 63b7be0 + d887b9b commit 1483228
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 9 deletions.
4 changes: 3 additions & 1 deletion src/assets/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,14 @@ export {
*/
import Clouds from './team/clouds.svg';
import MeetTheTeamBalloon from './team/meet-the-team-balloon-banner.webp';
import MeetTheTeamBanner from "./team/meet-the-team-banner.webp"
import MeetTheTeamBuildingLeft from './team/meet-the-team-building-left.svg';
import MeetTheTeamBuildingRight from './team/meet-the-team-building-right.svg';

export {
Clouds,
MeetTheTeamBalloon,
MeetTheTeamBanner,
MeetTheTeamBuildingLeft,
MeetTheTeamBuildingRight,
};
Expand All @@ -117,4 +119,4 @@ export {
*/
import ExternalBalloon from './external/balloon.svg';

export { ExternalBalloon };
export { ExternalBalloon };
4 changes: 3 additions & 1 deletion src/components/LoadingAnimation.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { HawkHacksLogo } from '@assets';

const LoadingAnimation: React.FC = () => {
return (
<div className="loading-container flex h-screen items-center justify-center">
<img
className="h-14 w-14 animate-ping"
src="./src/assets/logo.svg"
src={HawkHacksLogo}
alt="Loading Animation"
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useState } from 'react';
import { NavItems, Menu, Button } from '@components';

import { HawkHacksLogo } from '@assets';
import Hamburger from 'hamburger-react';

const Navbar = () => {
Expand All @@ -18,7 +18,7 @@ const Navbar = () => {
<div className="logo lg:mr-8">
<img
className="h-14 w-14"
src="./src/assets/logo.svg"
src={HawkHacksLogo}
alt="HawkHacks Logo"
/>
</div>
Expand Down
17 changes: 12 additions & 5 deletions src/components/sections/TeamFAQ.section.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import { FaqBackground } from '@assets';
import { departments, faqData } from './data';
import { Accordion } from '@components';
import {
Clouds,
MeetTheTeamBalloon,
MeetTheTeamBanner,
MeetTheTeamBuildingLeft,
MeetTheTeamBuildingRight,
} from '@assets';

interface Member {
name: string;
Expand Down Expand Up @@ -70,30 +77,30 @@ const TeamSection = () => {
>
<img
className="mx-auto w-full max-w-fit sm:hidden"
src="src/assets/team/meet-the-team-banner.webp"
src={MeetTheTeamBalloon}
alt=""
/>
<img
className="mx-auto hidden w-full max-w-[70rem] sm:block"
src="src/assets/team/meet-the-team-balloon-banner.webp"
src={MeetTheTeamBanner}
alt=""
/>
<img
className="absolute bottom-0 z-10 hidden translate-y-1/2 sm:block"
src="src/assets/team/clouds.svg"
src={Clouds}
alt=""
/>
</div>

<img
className="absolute right-0 -z-10 hidden lg:block "
src="src/assets/team/meet-the-team-building-right.svg"
src={MeetTheTeamBuildingRight}
alt=""
/>

<img
className="absolute bottom-0 left-0 -z-10 hidden -translate-x-1/3 translate-y-1/2 lg:block 2xl:translate-y-[30%]"
src="src/assets/team/meet-the-team-building-left.svg"
src={MeetTheTeamBuildingLeft}
alt=""
/>

Expand Down

0 comments on commit 1483228

Please sign in to comment.