Skip to content

Commit 66b880a

Browse files
ericsngyunericsngyun
committed
merging recent pull
2 parents 76aa6bf + b076254 commit 66b880a

File tree

7 files changed

+132
-8
lines changed

7 files changed

+132
-8
lines changed

‎www/src/pages/components/FeatureSlider.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Swiper, SwiperSlide } from 'swiper/react'
22
import { Navigation, Pagination, Scrollbar, A11y } from 'swiper'
3-
import FeatureSliderCard from "./FeatureSliderCard"
43

54
import 'swiper/css';
65
import 'swiper/css/navigation';

‎www/src/pages/components/FeaturesSection.jsx‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import {
2+
ArrowPathIcon,
3+
CloudArrowUpIcon,
4+
CogIcon,
5+
LockClosedIcon,
6+
ServerIcon,
7+
ShieldCheckIcon,
8+
} from '@heroicons/react/24/outline'
9+
10+
const features = [
11+
{
12+
name: 'Push to Deploy',
13+
description: 'Ac tincidunt sapien vehicula erat auctor pellentesque rhoncus. Et magna sit morbi lobortis.',
14+
icon: CloudArrowUpIcon,
15+
},
16+
{
17+
name: 'SSL Certificates',
18+
description: 'Ac tincidunt sapien vehicula erat auctor pellentesque rhoncus. Et magna sit morbi lobortis.',
19+
icon: LockClosedIcon,
20+
},
21+
{
22+
name: 'Simple Queues',
23+
description: 'Ac tincidunt sapien vehicula erat auctor pellentesque rhoncus. Et magna sit morbi lobortis.',
24+
icon: ArrowPathIcon,
25+
},
26+
{
27+
name: 'Advanced Security',
28+
description: 'Ac tincidunt sapien vehicula erat auctor pellentesque rhoncus. Et magna sit morbi lobortis.',
29+
icon: ShieldCheckIcon,
30+
},
31+
{
32+
name: 'Powerful API',
33+
description: 'Ac tincidunt sapien vehicula erat auctor pellentesque rhoncus. Et magna sit morbi lobortis.',
34+
icon: CogIcon,
35+
},
36+
{
37+
name: 'Database Backups',
38+
description: 'Ac tincidunt sapien vehicula erat auctor pellentesque rhoncus. Et magna sit morbi lobortis.',
39+
icon: ServerIcon,
40+
},
41+
]
42+
43+
export default function FeaturesSection() {
44+
return (
45+
<div className="relative bg-white py-24 sm:py-32 lg:py-40">
46+
<div className="mx-auto max-w-md px-6 text-center sm:max-w-3xl lg:max-w-7xl lg:px-8">
47+
<h2 className="text-lg font-semibold text-indigo-600">Deploy faster</h2>
48+
<p className="mt-2 text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl">
49+
Everything you need to deploy your app
50+
</p>
51+
<p className="mx-auto mt-5 max-w-prose text-xl text-gray-500">
52+
Phasellus lorem quam molestie id quisque diam aenean nulla in. Accumsan in quis quis nunc, ullamcorper
53+
malesuada. Eleifend condimentum id viverra nulla.
54+
</p>
55+
<div className="mt-20">
56+
<div className="grid grid-cols-1 gap-12 sm:grid-cols-2 lg:grid-cols-3">
57+
{features.map((feature) => (
58+
<div key={feature.name} className="pt-6">
59+
<div className="flow-root rounded-lg bg-gray-50 px-6 pb-8">
60+
<div className="-mt-6">
61+
<div>
62+
<span className="inline-flex items-center justify-center rounded-xl bg-indigo-500 p-3 shadow-lg">
63+
<feature.icon className="h-8 w-8 text-white" aria-hidden="true" />
64+
</span>
65+
</div>
66+
<h3 className="mt-8 text-lg font-semibold leading-8 tracking-tight text-gray-900">
67+
{feature.name}
68+
</h3>
69+
<p className="mt-5 text-base leading-7 text-gray-600">{feature.description}</p>
70+
</div>
71+
</div>
72+
</div>
73+
))}
74+
</div>
75+
</div>
76+
</div>
77+
</div>
78+
)
79+
}

‎www/src/pages/components/LandingPage.tsx‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import { ChevronRightIcon, StarIcon } from '@heroicons/react/20/solid';
22
import { string } from 'prop-types';
33
import TeamSection from '../components/TeamSection';
4+
import FeaturesSection from '../components/FeaturesSection';
45
import Image from 'next/image';
6+
import Blogs from './Blogs';
57

68
export default function LandingPage():any {
79
return (
8-
<div className="bg-white">
10+
<div className="bg-gray-50">
911
<main>
1012
{/* Hero section */}
1113
<div className="overflow-hidden pt-8 sm:pt-12 lg:relative lg:py-48">
@@ -114,11 +116,17 @@ export default function LandingPage():any {
114116
</div>
115117

116118
<div className="relative mt-16">
119+
<Blogs />
120+
<FeaturesSection />
117121
<TeamSection />
118122
</div>
119123

120124

125+
<<<<<<< HEAD
121126
</main>``
127+
=======
128+
</main>
129+
>>>>>>> b0762547e2888aed98ea28a1845973415410bdf6
122130

123131
{/* Footer section */}
124132
<footer className="mt-8 bg-[#333333] gray-900 sm:mt-8">

‎www/src/pages/components/NavBar.tsx‎

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,41 @@
1-
import { Fragment } from 'react'
1+
import { Fragment, useEffect, useState } from 'react'
22
import { Disclosure, Menu, Transition } from '@headlessui/react'
33
import { Bars3Icon, BellIcon, XMarkIcon } from '@heroicons/react/24/outline'
44

55
function classNames(...classes: string[]) {
66
return classes.filter(Boolean).join(' ')
77
}
88

9+
10+
911
export default function NavBar() {
12+
13+
const [scrollPosition, setScrollPosition] = useState(0);
14+
15+
const handleScroll = () => {
16+
const position = window.pageYOffset;
17+
setScrollPosition(position);
18+
};
19+
20+
useEffect(() => {
21+
window.addEventListener('scroll', handleScroll, { passive: true });
22+
23+
return () => {
24+
window.removeEventListener('scroll', handleScroll);
25+
};
26+
}, []);
27+
28+
function NavBarSytling() {
29+
return scrollPosition === 0 ? "sticky top-0 bg-gray-50 w-screen z-20 border-b" : "sticky top-0 bg-gray-50 w-screen z-20 shadow-xl";
30+
}
31+
32+
1033
return (
34+
<<<<<<< HEAD
1135
<Disclosure as="nav" className="bg-[#333333] fixed z-10 w-screen drop-shadow-20px">
36+
=======
37+
<Disclosure as="nav" className={NavBarSytling()}>
38+
>>>>>>> b0762547e2888aed98ea28a1845973415410bdf6
1239
{({ open }) => (
1340
<>
1441
<div className="mx-auto max-w9xl px-4 sm:px-6 lg:px-8">
@@ -21,7 +48,7 @@ export default function NavBar() {
2148
alt="Your Company"
2249
/>
2350
<img
24-
className="hidden h-8 w-auto lg:block invert"
51+
className="hidden h-8 w-auto lg:block"
2552
src="https://i.imgur.com/ELBAyVb.png"
2653
alt="Your Company"
2754
/>
@@ -40,19 +67,19 @@ export default function NavBar() {
4067
</a>
4168
<a
4269
href="#"
43-
className="rounded-md px-3 py-2 text-sm font-medium text-gray-300 hover:bg-gray-700 hover:text-white"
70+
className="rounded-md px-3 py-2 text-sm font-medium text-gray-500 hover:bg-gray-700 hover:text-white"
4471
>
4572
Team
4673
</a>
4774
<a
4875
href="#"
49-
className="rounded-md px-3 py-2 text-sm font-medium text-gray-300 hover:bg-gray-700 hover:text-white"
76+
className="rounded-md px-3 py-2 text-sm font-medium text-gray-500 hover:bg-gray-700 hover:text-white"
5077
>
5178
Projects
5279
</a>
5380
<a
5481
href="#"
55-
className="rounded-md px-3 py-2 text-sm font-medium text-gray-300 hover:bg-gray-700 hover:text-white"
82+
className="rounded-md px-3 py-2 text-sm font-medium text-gray-500 hover:bg-gray-700 hover:text-white"
5683
>
5784
Calendar
5885
</a>

‎www/src/pages/components/TeamSection.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ const people: string[][] = [
7272
]
7373

7474
function replace(e: React.SyntheticEvent<HTMLImageElement>): void{
75+
console.log('test');
7576
e.currentTarget.onerror = null;
7677
e.currentTarget.src = "/profileFallback.png"
7778
}

‎www/src/pages/index.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@ const Home: NextPage = () => {
1212

1313
return (
1414
<>
15+
<<<<<<< HEAD
1516
{/* <FeatureSlider/> */}
17+
=======
18+
19+
>>>>>>> b0762547e2888aed98ea28a1845973415410bdf6
1620
<NavBar />
21+
1722
<LandingPage />
18-
<Blogs />
23+
{/* <FeatureSlider/> */}
24+
{/* <Blogs /> */}
1925
</>
2026
);
2127
};

‎www/src/styles/globals.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
@tailwind base;
22
@tailwind components;
33
@tailwind utilities;
4+
5+
body {
6+
background-color: rgba(249, 250, 251);
7+
}

0 commit comments

Comments
 (0)