Skip to content

Commit

Permalink
Merge pull request #3 from WebmasterCamp/home
Browse files Browse the repository at this point in the history 
add
  • Loading branch information
@SmartMedicalRoom
SmartMedicalRoom authored Jul 21, 2024
2 parents 1e2e260 + 41b103e commit ee8070f
Show file tree
Hide file tree
Showing 17 changed files with 426 additions and 50 deletions.
Binary file modified bun.lockb
View file
Binary file not shown.
103 changes: 103 additions & 0 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"dependencies": {
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-slot": "^1.1.0",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
Expand All @@ -19,17 +20,18 @@
"next-themes": "^0.3.0",
"react": "^18",
"react-dom": "^18",
"react-hook-form": "^7.52.1",
"tailwind-merge": "^2.4.0",
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
"typescript": "^5",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"eslint": "^8",
"eslint-config-next": "14.2.5",
"postcss": "^8",
"tailwindcss": "^3.4.1",
"eslint": "^8",
"eslint-config-next": "14.2.5"
"typescript": "^5"
}
}
Binary file removed public/cabibara.webp
View file
Binary file not shown.
Binary file added public/img.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/jj.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/rr.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/tt.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/app/globals.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
--card-foreground: 222.2 84% 4.9%;
--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;
--primary: 222.2 47.4% 11.2%;
--primary: 141.9 69.2% 58%;
--primary-foreground: 210 40% 98%;
--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;
Expand Down Expand Up @@ -38,7 +38,7 @@
--card-foreground: 210 40% 98%;
--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;
--primary: 210 40% 98%;
--primary: 141.9 69.2% 58%;
--primary-foreground: 222.2 47.4% 11.2%;
--secondary: 217.2 32.6% 17.5%;
--secondary-foreground: 210 40% 98%;
Expand Down
2 changes: 1 addition & 1 deletion src/app/layout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function RootLayout({
<main>
{children}
</main>
<Footer />
<Footer/>
</ThemeProvider>
</body>
</html>
Expand Down
93 changes: 63 additions & 30 deletions src/app/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,74 @@ import {
AccordionContent,
AccordionItem,
AccordionTrigger,
} from "@/components/ui/accordion"
} from "@/components/ui/accordion";

export default function Page() {
return (
<div className="m-12 flex flex-col">
<div className="flex flex-row">
<div className="flex flex-col">
<img src="cabibara.webp" alt="" />
<div className="relative min-h-screen overflow-hidden">
<div className="absolute inset-0 h-full w-full bg-white bg-[linear-gradient(to_right,#80808012_1px,transparent_1px),linear-gradient(to_bottom,#80808012_1px,transparent_1px)] bg-[size:24px_24px] z-0"></div>

<div className="relative m-12 flex flex-col items-center z-10">
<div className="flex flex-row space-x-12 items-center w-60 h-60">
<img src="img.png" alt="" />
<div className="">
<h1 className="font-extrabol text-4xl">CashyBuddy</h1>
<p className="mt-2">“คู่หูรู้ใจไฟแนนซ์วัยทีน”</p>
</div>
</div>
<div>
<img src="cabibara.webp" alt="" />
<div className="mt-10 bg-slate-50 p-4 m-2 text-xl">
<h1>เกี่ยวกับเรา</h1>
</div>
<div className="flex flex-row mt-4 space-x-6">
<div className="items-center">
<h1 className="font-extrabol text-4xl">CashyBuddy</h1>
<p className="mt-2">“คู่หูรู้ใจไฟแนนซ์วัยทีน”</p>
</div>
<div>
<p>
CashyBuddy
ช่วยให้เพื่อนนักเรียนสามารถบริหารจัดการเงินของตัวเองได้ผ่านมาสคอตผู้ช่วย
“Cashy” ถ้าเพื่อน ๆ กำลังเจอปัญหาเงินไม่พอใช้
วางแผนทางการเงินไม่เป็น และไม่มีพื้นฐานด้านการเงินเลย Cashy
สามารถช่วยเพื่อน ๆ ได้นะ{" "}
</p>
</div>
</div>
<div className="bg-slate-50 p-4">
<h1>FAQ</h1>
</div>
<div className="flex flex-col space-y-8 mt-4 ">
<div className="bg-green-300">
<Accordion type="single" collapsible className="p-2">
<AccordionItem value="item-1">
<AccordionTrigger>CashyBuddy คืออะไร ?</AccordionTrigger>
<AccordionContent>
CashyBuddy ไม่เรียกเก็บค่าบริการใด ๆ เพื่อน ๆ สามารถใช้ฟีเจอร์ทุกอย่างในเว็บไซต์ได้ตามใจต้องการ ~
</AccordionContent>
</AccordionItem>
</Accordion>
</div>
<div className="bg-green-300">
<Accordion type="single" collapsible className="p-2">
<AccordionItem value="item-2">
<AccordionTrigger>CashyBuddy ใช้งานอย่างไร ?</AccordionTrigger>
<AccordionContent>
เหมาะกับเพื่อน ๆ วัยมัธยมศึกษาที่มีปัญหาการบริหารจัดการเงินรายรับที่ได้จากผู้ปกครองที่ได้รับมาในแต่ละเดือน เช่น วางแผนสัดส่วนค่าใช้จ่ายไม่เป็น ไม่สามารถใช้จ่ายเงินตามที่ได้รับในแต่ละเดือนได้
</AccordionContent>
</AccordionItem>
</Accordion>
</div>
<div className="bg-green-300">
<Accordion type="single" collapsible className="p-2">
<AccordionItem value="item-3">
<AccordionTrigger>Click to open ?</AccordionTrigger>
<AccordionContent>
เหมาะกับเพื่อน ๆ วัยมัธยมศึกษาที่มีปัญหาการบริหารจัดการเงินรายรับที่ได้จากผู้ปกครองที่ได้รับมาในแต่ละเดือน เช่น วางแผนสัดส่วนค่าใช้จ่ายไม่เป็น ไม่สามารถใช้จ่ายเงินตามที่ได้รับในแต่ละเดือนได้
</AccordionContent>
</AccordionItem>
</Accordion>
</div>
</div>
</div>
<div className="flex flex-row">
<h1>About us</h1>
<p>Lorem ipsum dolor sit amet consectetur, adipisicing elit. Nemo reprehenderit alias natus, enim atque corporis ratione esse expedita ea facilis! Dolorem eos animi sapiente necessitatibus cum! Unde animi vitae veniam!</p>
</div>
<div className="flex flex-row">
<h1>F&Q</h1>
<Accordion type="single" collapsible>
<AccordionItem value="item-1">
<AccordionTrigger>Is it accessible?</AccordionTrigger>
<AccordionContent>
Yes. It adheres to the WAI-ARIA design pattern.
</AccordionContent>
<AccordionTrigger>Is it accessible?</AccordionTrigger>
<AccordionContent>
Yes. It adheres to the WAI-ARIA design pattern.
</AccordionContent>
<AccordionTrigger>Is it accessible?</AccordionTrigger>
<AccordionContent>
Yes. It adheres to the WAI-ARIA design pattern.
</AccordionContent>
</AccordionItem>
</Accordion>
</div>
</div>
);
Expand Down
11 changes: 7 additions & 4 deletions src/components/footer.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@

export function Footer (){
return(
<div className="flex flex-row">
<div className="flex flex-1 items-center space-x-20">
<div >
<p>Gmail</p>
<img src="jj.png" alt="" className="w-20" />
</div>
<div>
<p>contact</p>
<div >
<img src="rr.png" alt="" className="w-20" />
</div>
<div >
<img src="tt.png" alt="" className="w-20" />
</div>
</div>
);
Expand Down
15 changes: 5 additions & 10 deletions src/components/navbar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,12 @@ export function Navbar() {
<h1 className="font-bold">CashyBuddy</h1>
</Link>
</div>
<div className="flex flex-row items-center space-x-4">
<Link href="/faq">วิธีใช้</Link>
<Link href="/management">วางแผนการเงิน</Link>
<Link href="/about">เกี่ยวกับเรา</Link>
</div>
<div className="flex flex-1 items-center justify-end space-x-2">
<Link href="/signin">
<Button variant="default">เข้าสู่ระบบ</Button>
</Link>
<ThemeToggle />
<div className="flex flex-1 items-center justify-end space-x-10">
<Link href="/faq">ABOUT US</Link>
<Link href="/management">FAQ</Link>
<Button><Link href="/about">LOGIN</Link></Button>
</div>

</div>
</header>
);
Expand Down
11 changes: 11 additions & 0 deletions src/components/ui/collapsible.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
"use client"

import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"

const Collapsible = CollapsiblePrimitive.Root

const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger

const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent

export { Collapsible, CollapsibleTrigger, CollapsibleContent }
Loading

0 comments on commit ee8070f

Please sign in to comment.