Skip to content

Commit

Permalink
Merge pull request #2 from isd-sgcu/feature/joh-12-footer
Browse files Browse the repository at this point in the history
Feature/joh 12 footer
  • Loading branch information
MichaelScodaeng authored Dec 24, 2023
2 parents bcaae93 + c4ba957 commit 3767efb
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 3 deletions.
7 changes: 7 additions & 0 deletions src/assets/footer/FacebookLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/assets/footer/InstagramLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/footer/JohnJudLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/assets/footer/TwitterLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 49 additions & 3 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,53 @@
import facebookLogo from "../assets/footer/FacebookLogo.svg";
import twitterLogo from "../assets/footer/InstagramLogo.svg";
import johnjudLogo from "../assets/footer/JohnJudLogo.svg";
import instagramLogo from "../assets/footer/TwitterLogo.svg";
const Footer = () => {
/* mt-auto or margin-top will make footer always on the bottom
please delete this comment after you read it */
return <div className="mt-auto">Footer</div>;
return (
<div className="mt-auto w-full shrink-0 ">
<div>
<div className="mx-auto flex h-full w-full justify-between bg-teal-600 px-7 py-5 lg:py-9">
{/* Text & Logo*/}
<div className="flex-start m-0 inline-flex w-[66%] flex-col justify-start gap-4 lg:w-[55%] lg:flex-row lg:items-center lg:gap-0">
<div className="mr-12 inline-flex items-center justify-start gap-3">
<img
className="h-11 w-11 rounded-full"
src={johnjudLogo}
alt="Johnjud Logo"
/>
<div className="text-sm font-bold text-white">JOHNJUD</div>
</div>
{/*Text*/}
<div className="m-0 inline-flex flex-col gap-4 p-0 lg:w-96 lg:flex-wrap lg:gap-3">
<div className="w-full text-wrap text-xs font-normal text-white lg:w-[95%] lg:text-base">
สโมสรนิสิตคณะสัตวแพทยศาสตร์ <br className="gap-3"></br>
จุฬาลงกรณ์มหาวิทยาลัย ถนน อังรีดูนังต์ แขวงปทุมวัน เขตปทุมวัน
กรุงเทพ ฯ 10330
</div>
<div className="lg:w-90rem w-full text-xs font-normal text-white lg:w-[88%] lg:text-base">
พัฒนาโดย ฝ่ายพัฒนาระบบสารสนเทศ <br className="gap-3"></br>
องค์การบริหารสโมสรนิสิตจุฬาลงกรณ์มหาวิทยาลัย
</div>
</div>
</div>
{/*Social*/}
<div className="flex flex-col items-center justify-center gap-6">
<div className="flex items-center justify-center">
<img className="h-8 w-8" src={facebookLogo} alt="Facebook Logo" />
</div>
<div className="flex items-center justify-center">
<img className="h-8 w-8" src={twitterLogo} alt="Instagram Logo" />
</div>
<div className="flex items-center justify-center">
<img className="h-6 w-6" src={instagramLogo} alt="Twitter Logo" />
</div>
</div>
</div>
</div>
{/*Only available in less than md */}
{/*Johnjud*/}
</div>
);
};

export default Footer;

0 comments on commit 3767efb

Please sign in to comment.