Skip to content

Commit 33b3b81

Browse files
hanifptwhanifptw
committed
Merge branch 'landing'
2 parents 1d11a48 + 59dd839 commit 33b3b81

File tree

9 files changed

+119
-2
lines changed

9 files changed

+119
-2
lines changed

Diff for: ‎public/images/about/about-cloud.webp

43.8 KB
Binary file not shown.

Diff for: ‎public/images/about/hanifptw.webp

23.2 KB
Binary file not shown.

Diff for: ‎public/images/about/ismail.jpeg

84.3 KB
Loading

Diff for: ‎public/images/about/josa.webp

35.1 KB
Binary file not shown.

Diff for: ‎public/images/about/mazizram.jpeg

59.5 KB
Loading

Diff for: ‎public/images/about/mhaidar.jpg

35.9 KB
Loading

Diff for: ‎public/images/about/myusuf.webp

110 KB
Binary file not shown.

Diff for: ‎src/routes/about.tsx

+118-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// import { useLoaderData } from "react-router-dom";
2+
import { Link } from "react-router-dom";
3+
import { Button } from "@/components/ui/button";
24

35
export async function loader() {
46
const responseAbout = "/about";
@@ -7,5 +9,120 @@ export async function loader() {
79
}
810

911
export function AboutRoute() {
10-
return <div>this is about</div>;
12+
return (
13+
<div>
14+
<header className="fixed w-full p-5 z-20 bg-gradient-to-b from-gray-700/60 justify-center flex ">
15+
<div className="max-w-screen-xl w-full">
16+
<div className="flex justify-between ">
17+
<div>
18+
<Link to="/">
19+
<img src="/images/landing/logo.svg" alt="logo" />
20+
</Link>
21+
</div>
22+
<div className="flex flex-row items-center gap-6 text-white">
23+
<Link to="/places">Places</Link>
24+
<Link to="/about">About</Link>
25+
<Button className="bg-primary-color text-white">
26+
<Link to="/login">Login</Link>
27+
</Button>
28+
</div>
29+
</div>
30+
</div>
31+
</header>
32+
33+
<section className="bg-[url('/images/about/about-cloud.webp')] bg-no-repeat bg-cover bg-top px-5">
34+
<div className="text-center pt-32 pb-16">
35+
<h1 className="text-lg font-semibold text-indigo-600 mb-2">
36+
Our Team
37+
</h1>
38+
<h2 className="text-3xl md:text-4xl font-bold text-gray-1000 mb-8">
39+
The great minds behind our work.
40+
</h2>
41+
</div>
42+
43+
<div className="grid grid-cols-2 md:grid-cols-3 px-5 gap-y-20 px-10 md:px-20 gap-x-5 ">
44+
<div className="flex flex-col items-center gap-4 ">
45+
<img
46+
src="/images/about/mhaidar.jpg"
47+
alt="M Haidar Hanif"
48+
className="w-[200px] h-auto rounded-full"
49+
/>
50+
<div className="text-center">
51+
<div className="text-base md:text-xl font-semibold ">
52+
M Haidar Hanif
53+
</div>
54+
<div className="text-xs text-slate-700 ">Project Manager</div>
55+
</div>
56+
</div>
57+
<div className="flex flex-col items-center gap-4">
58+
<img
59+
src="/images/about/mazizram.jpeg"
60+
alt="Aziz Ramdan"
61+
className="w-[200px] h-auto rounded-full"
62+
/>
63+
<div className="text-center">
64+
<div className="text-base md:text-xl font-semibold ">
65+
Aziz Ramdan Kurniawan
66+
</div>
67+
<div className="text-xs text-slate-700 ">Fullstack Engineer</div>
68+
</div>
69+
</div>
70+
<div className="flex flex-col items-center gap-4">
71+
<img
72+
src="/images/about/myusuf.webp"
73+
alt="M Yusuf UW"
74+
className="w-[200px] h-auto bg-cover bg-no-repeat rounded-full"
75+
/>
76+
<div className="text-center">
77+
<div className="text-base md:text-xl font-semibold ">
78+
M Yusuf Untung Wahyudi
79+
</div>
80+
<div className="text-xs text-slate-700 ">Backend Engineer</div>
81+
</div>
82+
</div>
83+
<div className="flex flex-col items-center gap-4">
84+
<img
85+
src="/images/about/hanifptw.webp"
86+
alt="hanifptw"
87+
className="w-[200px] h-auto rounded-full"
88+
/>
89+
<div className="text-center">
90+
<div className="text-base md:text-xl font-semibold ">
91+
Brilliant Hanif Almubarak
92+
</div>
93+
<div className="text-xs text-slate-700 ">
94+
Frontend Engineer/UI-UX Designer
95+
</div>
96+
</div>
97+
</div>
98+
<div className="flex flex-col items-center gap-4">
99+
<img
100+
src="/images/about/ismail.jpeg"
101+
alt="ismailfaruqi"
102+
className="w-[200px] h-auto rounded-full"
103+
/>
104+
<div className="text-center">
105+
<div className="text-base md:text-xl font-semibold ">
106+
Ismail Al Faruqi
107+
</div>
108+
<div className="text-xs text-slate-700 ">Frontend Engineer</div>
109+
</div>
110+
</div>
111+
<div className="flex flex-col items-center gap-4">
112+
<img
113+
src="/images/about/josa.webp"
114+
alt="josapratama"
115+
className="w-[200px] h-auto bg-auto bg-center rounded-full"
116+
/>
117+
<div className="text-center">
118+
<div className="text-base md:text-xl font-semibold ">
119+
Josa Pratama
120+
</div>
121+
<div className="text-xs text-slate-700 ">Backend Engineer</div>
122+
</div>
123+
</div>
124+
</div>
125+
</section>
126+
</div>
127+
);
11128
}

Diff for: ‎src/routes/footer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export function Footer() {
22
return (
3-
<footer className="relative p-10 pt-10 bg-footer bg-no-repeat bg-cover bg-center 2xl:bg-contain 2xl:bg-repeat">
3+
<footer className="relative p-10 mt-20 bg-footer bg-no-repeat bg-cover bg-center 2xl:bg-contain 2xl:bg-repeat mt-10">
44
<div className="relative z-10 flex flex-col items-center">
55
<img
66
src="/images/footer/island.png"

0 commit comments

Comments
 (0)