Skip to content

Commit 4b12269

Browse files
Reverted to commit 9577e01
1 parent d7750cc commit 4b12269

File tree

4 files changed

+22
-44
lines changed

4 files changed

+22
-44
lines changed

src/components/Hero.tsx

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,14 @@ const Hero = () => {
4848
</div>
4949
</div>
5050

51-
<div className="star-wars-crawl mb-8">
52-
<div className="star-wars-content">
53-
<motion.p
54-
className="text-lg sm:text-xl md:text-2xl text-gray-300 max-w-3xl mx-auto mb-8 font-[Exo] text-center"
55-
initial={{ opacity: 0 }}
56-
animate={{ opacity: 1 }}
57-
transition={{ delay: 0.3, duration: 0.8 }}
58-
>
59-
Access & Explore the DAO with Innovative Solutions, Unlock Energy Efficiency & Environmental Sustainability, Uniting: BioFi, DeFi, DePin, DeSci, IPFS, QFS, ReFi, RWA, SocialFi, and TradFi under one cosmic ecosystem.
60-
</motion.p>
61-
</div>
62-
</div>
51+
<motion.p
52+
className="text-lg sm:text-xl md:text-2xl text-gray-300 max-w-3xl mx-auto mb-8 font-[Exo] text-center"
53+
initial={{ opacity: 0 }}
54+
animate={{ opacity: 1 }}
55+
transition={{ delay: 0.3, duration: 0.8 }}
56+
>
57+
Access & Explore the DAO with Innovative Solutions, Unlock Energy Efficiency & Environmental Sustainability, Uniting: BioFi, DeFi, DePin, DeSci, IPFS, QFS, ReFi, RWA, SocialFi, and TradFi under one cosmic ecosystem.
58+
</motion.p>
6359
</motion.div>
6460

6561
<motion.div

src/components/Layout.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11

22
import React from 'react';
3-
import { Outlet, useLocation } from 'react-router-dom';
3+
import { Outlet } from 'react-router-dom';
44
import Header from './Header';
55
import Footer from './Footer';
66

77
const Layout: React.FC = () => {
8-
const location = useLocation();
9-
10-
// Pages that handle their own header/footer
11-
const pagesWithOwnLayout = ['/', '/conetworking'];
12-
const hasOwnLayout = pagesWithOwnLayout.includes(location.pathname);
13-
14-
if (hasOwnLayout) {
15-
return <Outlet />;
16-
}
17-
188
return (
199
<div className="flex flex-col min-h-screen bg-black">
2010
<Header />

src/pages/CoNetWorKing.tsx

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
12
import React from 'react';
23
import StarBackground from '@/components/StarBackground';
4+
import Header from '@/components/Header';
5+
import Footer from '@/components/Footer';
36
import { Network, Globe, Users, Zap, Briefcase, MapPin } from 'lucide-react';
47
import { Button } from '@/components/ui/button';
58

@@ -135,30 +138,22 @@ const CoNetWorKing: React.FC = () => {
135138
];
136139

137140
return (
138-
<div className="relative flex flex-col flex-1 bg-alien-space">
141+
<div className="min-h-screen bg-alien-space">
139142
<StarBackground />
140-
<div
141-
className="absolute inset-0 -z-10 bg-cover bg-center bg-no-repeat pointer-events-none"
142-
style={{
143-
backgroundImage: `url('/lovable-uploads/EMWBack.png')`,
144-
}}
145-
>
146-
<div className="w-full h-full bg-black/50" />
147-
</div>
148-
149-
<main className="relative z-10 flex-grow container mx-auto px-4 pt-28 pb-16">
143+
<Header />
144+
<main className="container mx-auto px-4 pt-28 pb-16">
150145
<div className="max-w-6xl mx-auto">
151146
<div className="text-center mb-16">
152147
<Network className="h-16 w-16 text-alien-gold mx-auto mb-4" />
153-
<h1 className="text-4xl md:text-5xl font-bold text-alien-gold mb-6 font-nasalization">CoNetWorKing</h1>
148+
<h1 className="text-4xl md:text-5xl font-bold text-alien-gold mb-6 font-[Atomic Age, Star Wars]">CoNetWorKing</h1>
154149
<p className="text-xl text-gray-300 max-w-3xl mx-auto font-[Exo]">
155150
Connect with like-minded individuals across the multiverse and forge powerful collaborations to shape the future.
156151
</p>
157152
</div>
158153

159154
{/* Connection Map */}
160155
<div className="mb-16 relative bg-alien-space-dark/30 rounded-lg overflow-hidden p-6 backdrop-blur-md border border-alien-gold/20">
161-
<h2 className="text-2xl font-bold text-alien-gold mb-6 font-nasalization">Global Network</h2>
156+
<h2 className="text-2xl font-bold text-alien-gold mb-6 font-[Atomic Age]">Global Network</h2>
162157

163158
<div className="aspect-[2/1] bg-alien-space-dark/50 rounded-lg relative overflow-hidden">
164159
{/* World map with glow points */}
@@ -237,7 +232,7 @@ const CoNetWorKing: React.FC = () => {
237232
{/* Featured Connections */}
238233
<div className="mb-16">
239234
<div className="flex justify-between items-center mb-6">
240-
<h2 className="text-2xl font-bold text-alien-gold font-nasalization">Featured Connections</h2>
235+
<h2 className="text-2xl font-bold text-alien-gold font-[Atomic Age]">Featured Connections</h2>
241236
<Button variant="outline" className="border-alien-green text-alien-green hover:bg-alien-green/10 font-[Exo]">
242237
View All
243238
</Button>
@@ -253,7 +248,7 @@ const CoNetWorKing: React.FC = () => {
253248
<div className="grid grid-cols-1 md:grid-cols-2 gap-8 mb-16">
254249
{/* Upcoming Networking Events */}
255250
<div>
256-
<h2 className="text-2xl font-bold text-alien-gold mb-6 font-nasalization">Upcoming Events</h2>
251+
<h2 className="text-2xl font-bold text-alien-gold mb-6 font-[Atomic Age]">Upcoming Events</h2>
257252
<div className="space-y-4">
258253
{upcomingEvents.map((event, index) => (
259254
<div key={index} className="bg-alien-space-dark/50 p-4 rounded-lg backdrop-blur-md border border-alien-gold/20">
@@ -280,7 +275,7 @@ const CoNetWorKing: React.FC = () => {
280275

281276
{/* Collaboration Opportunities */}
282277
<div>
283-
<h2 className="text-2xl font-bold text-alien-gold mb-6 font-nasalization">Collaboration Opportunities</h2>
278+
<h2 className="text-2xl font-bold text-alien-gold mb-6 font-[Atomic Age]">Collaboration Opportunities</h2>
284279
<div className="space-y-4">
285280
{collaborationOpportunities.map((opportunity, index) => (
286281
<div key={index} className="bg-alien-space-dark/50 p-4 rounded-lg backdrop-blur-md border border-alien-gold/20">
@@ -312,7 +307,7 @@ const CoNetWorKing: React.FC = () => {
312307
{/* CTA Section */}
313308
<div className="bg-gradient-to-r from-alien-green/30 to-alien-gold/30 rounded-lg p-8 text-center backdrop-blur-md">
314309
<Briefcase className="h-12 w-12 text-alien-gold mx-auto mb-4" />
315-
<h2 className="text-2xl font-bold text-alien-gold mb-3 font-nasalization">Create Your Professional Profile</h2>
310+
<h2 className="text-2xl font-bold text-alien-gold mb-3 font-[Atomic Age]">Create Your Professional Profile</h2>
316311
<p className="text-gray-200 max-w-2xl mx-auto mb-6 font-[Exo]">
317312
Showcase your skills, experience, and interests to connect with the perfect collaborators for your next cosmic venture.
318313
</p>
@@ -322,6 +317,7 @@ const CoNetWorKing: React.FC = () => {
322317
</div>
323318
</div>
324319
</main>
320+
<Footer />
325321
</div>
326322
);
327323
};

src/pages/Index.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import EcosystemSection from '@/components/EcosystemSection';
77
import FeaturesSection from '@/components/FeaturesSection';
88
import FinancialFreedomSection from '@/components/FinancialFreedomSection';
99
import ParticipationSection from '@/components/ParticipationSection';
10-
import Footer from '@/components/Footer';
1110

1211
const Index: React.FC = () => {
1312
return (
@@ -38,9 +37,6 @@ const Index: React.FC = () => {
3837
<ParticipationSection />
3938
</div>
4039
</div>
41-
42-
{/* Footer */}
43-
<Footer />
4440
</div>
4541
);
4642
};

0 commit comments

Comments
 (0)