Skip to content

Commit 76aa6bf

Browse files
ericsngyunericsngyun
committed
merge commit
1 parent ff7de62 commit 76aa6bf

File tree

4 files changed

+4
-147
lines changed

4 files changed

+4
-147
lines changed

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 2 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { string } from 'prop-types';
33
import TeamSection from '../components/TeamSection';
44
import Image from 'next/image';
55

6-
export default function LandingPage(): JSX.Element {
6+
export default function LandingPage():any {
77
return (
88
<div className="bg-white">
99
<main>
@@ -118,132 +118,7 @@ export default function LandingPage(): JSX.Element {
118118
</div>
119119

120120

121-
<<<<<<< HEAD
122-
<div className="relative mx-auto max-w-md px-4 sm:max-w-3xl sm:px-6 lg:px-0">
123-
{/* Content area */}
124-
<div className="pt-12 sm:pt-16 lg:pt-20">
125-
126-
<div className="mt-6 space-y-6 text-gray-500">
127-
128-
</div>
129-
</div>
130-
131-
{/* Stats section */}
132-
133-
</div>
134-
</div>
135-
</div>
136-
137-
{/* Logo cloud section */}
138-
<div className="mt-32">
139-
<div className="mx-auto max-w-md px-4 sm:max-w-3xl sm:px-6 lg:max-w-7xl lg:px-8">
140-
<div className="lg:grid lg:grid-cols-2 lg:items-center lg:gap-24">
141-
<div>
142-
<h2 className="text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl">
143-
Backed by world-renowned investors
144-
</h2>
145-
<p className="mt-6 max-w-3xl text-lg leading-7 text-gray-500">
146-
Sagittis scelerisque nulla cursus in enim consectetur quam. Dictum urna sed consectetur neque
147-
tristique pellentesque. Blandit amet, sed aenean erat arcu morbi. Cursus faucibus nunc nisl netus
148-
morbi vel porttitor vitae ut. Amet vitae fames senectus vitae.
149-
</p>
150-
<div className="mt-6">
151-
<a href="#" className="text-base font-medium text-rose-500">
152-
Meet our investors and advisors&nbsp&rarr;
153-
</a>
154-
</div>
155-
</div>
156-
<div className="mt-12 grid grid-cols-2 gap-0.5 md:grid-cols-3 lg:mt-0 lg:grid-cols-2">
157-
{logos.map((logo) => (
158-
<div key={logo.name} className="col-span-1 flex justify-center bg-gray-50 py-8 px-8">
159-
<img className="max-h-12" src={logo.url} alt={logo.name} />
160-
</div>
161-
))}
162-
</div>
163-
</div>
164-
</div>
165-
</div>
166-
167-
{/* CTA section */}
168-
<div className="relative mt-24 sm:mt-32 sm:py-16">
169-
<div aria-hidden="true" className="hidden sm:block">
170-
<div className="absolute inset-y-0 left-0 w-1/2 rounded-r-3xl bg-gray-50" />
171-
<svg className="absolute top-8 left-1/2 -ml-3" width={404} height={392} fill="none" viewBox="0 0 404 392">
172-
<defs>
173-
<pattern
174-
id="8228f071-bcee-4ec8-905a-2a059a2cc4fb"
175-
x={0}
176-
y={0}
177-
width={20}
178-
height={20}
179-
patternUnits="userSpaceOnUse"
180-
>
181-
<rect x={0} y={0} width={4} height={4} className="text-gray-200" fill="currentColor" />
182-
</pattern>
183-
</defs>
184-
<rect width={404} height={392} fill="url(#8228f071-bcee-4ec8-905a-2a059a2cc4fb)" />
185-
</svg>
186-
</div>
187-
<div className="mx-auto max-w-md px-4 sm:max-w-3xl sm:px-6 lg:max-w-7xl lg:px-8">
188-
<div className="relative overflow-hidden rounded-2xl bg-rose-500 px-6 py-10 shadow-xl sm:px-12 sm:py-20">
189-
<div aria-hidden="true" className="absolute inset-0 -mt-72 sm:-mt-32 md:mt-0">
190-
<svg
191-
className="absolute inset-0 h-full w-full"
192-
preserveAspectRatio="xMidYMid slice"
193-
xmlns="http://www.w3.org/2000/svg"
194-
fill="none"
195-
viewBox="0 0 1463 360"
196-
>
197-
<path
198-
className="text-rose-400 text-opacity-40"
199-
fill="currentColor"
200-
d="M-82.673 72l1761.849 472.086-134.327 501.315-1761.85-472.086z"
201-
/>
202-
<path
203-
className="text-rose-600 text-opacity-40"
204-
fill="currentColor"
205-
d="M-217.088 544.086L1544.761 72l134.327 501.316-1761.849 472.086z"
206-
/>
207-
</svg>
208-
</div>
209-
<div className="relative">
210-
<div className="sm:text-center">
211-
<h2 className="text-3xl font-bold tracking-tight text-white sm:text-4xl">
212-
Get notified when we&rsquo;re launching.
213-
</h2>
214-
<p className="mx-auto mt-6 max-w-2xl text-lg text-rose-100">
215-
Sagittis scelerisque nulla cursus in enim consectetur quam. Dictum urna sed consectetur neque
216-
tristique pellentesque.
217-
</p>
218-
</div>
219-
<form action="#" className="mt-12 sm:mx-auto sm:flex sm:max-w-lg">
220-
<div className="min-w-0 flex-1">
221-
<label htmlFor="cta-email" className="sr-only">
222-
Email address
223-
</label>
224-
<input
225-
id="cta-email"
226-
type="email"
227-
className="block w-full rounded-md border border-transparent px-5 py-3 text-base text-gray-900 placeholder-gray-500 shadow-sm focus:border-transparent focus:outline-none focus:ring-2 focus:ring-white focus:ring-offset-2 focus:ring-offset-rose-500"
228-
placeholder="Enter your email"
229-
/>
230-
</div>
231-
<div className="mt-4 sm:mt-0 sm:ml-3">
232-
<button
233-
type="submit"
234-
className="block w-full rounded-md border border-transparent bg-gray-900 px-5 py-3 text-base font-medium text-white shadow hover:bg-black focus:outline-none focus:ring-2 focus:ring-white focus:ring-offset-2 focus:ring-offset-rose-500 sm:px-10"
235-
>
236-
Notify me
237-
</button>
238-
</div>
239-
</form>
240-
</div>
241-
</div>
242-
</div>
243-
</div>
244-
=======
245-
>>>>>>> master
246-
</main>
121+
</main>``
247122

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function classNames(...classes: string[]) {
88

99
export default function NavBar() {
1010
return (
11-
<Disclosure as="nav" className="bg-[#333333]">
11+
<Disclosure as="nav" className="bg-[#333333] fixed z-10 w-screen drop-shadow-20px">
1212
{({ open }) => (
1313
<>
1414
<div className="mx-auto max-w9xl px-4 sm:px-6 lg:px-8">

‎www/src/pages/index.tsx

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

1313
return (
1414
<>
15-
<FeatureSlider/>
15+
{/* <FeatureSlider/> */}
1616
<NavBar />
1717
<LandingPage />
1818
<Blogs />

0 commit comments

Comments
 (0)