Skip to content

Commit d7750cc

Browse files
Fix: Footer, Star Wars effect, and background
- Fixed footer inconsistency on the home page. - Applied the Star Wars effect to the Hero component's text. - Removed the blue background from all pages except the home page. - Fixed duplicated footer on CoNetWorKing page.
1 parent 9577e01 commit d7750cc

File tree

4 files changed

+44
-22
lines changed

4 files changed

+44
-22
lines changed

src/components/Hero.tsx

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

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>
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>
5963
</motion.div>
6064

6165
<motion.div

src/components/Layout.tsx

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

22
import React from 'react';
3-
import { Outlet } from 'react-router-dom';
3+
import { Outlet, useLocation } 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+
818
return (
919
<div className="flex flex-col min-h-screen bg-black">
1020
<Header />

src/pages/CoNetWorKing.tsx

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

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

140137
return (
141-
<div className="min-h-screen bg-alien-space">
138+
<div className="relative flex flex-col flex-1 bg-alien-space">
142139
<StarBackground />
143-
<Header />
144-
<main className="container mx-auto px-4 pt-28 pb-16">
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">
145150
<div className="max-w-6xl mx-auto">
146151
<div className="text-center mb-16">
147152
<Network className="h-16 w-16 text-alien-gold mx-auto mb-4" />
148-
<h1 className="text-4xl md:text-5xl font-bold text-alien-gold mb-6 font-[Atomic Age, Star Wars]">CoNetWorKing</h1>
153+
<h1 className="text-4xl md:text-5xl font-bold text-alien-gold mb-6 font-nasalization">CoNetWorKing</h1>
149154
<p className="text-xl text-gray-300 max-w-3xl mx-auto font-[Exo]">
150155
Connect with like-minded individuals across the multiverse and forge powerful collaborations to shape the future.
151156
</p>
152157
</div>
153158

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

158163
<div className="aspect-[2/1] bg-alien-space-dark/50 rounded-lg relative overflow-hidden">
159164
{/* World map with glow points */}
@@ -232,7 +237,7 @@ const CoNetWorKing: React.FC = () => {
232237
{/* Featured Connections */}
233238
<div className="mb-16">
234239
<div className="flex justify-between items-center mb-6">
235-
<h2 className="text-2xl font-bold text-alien-gold font-[Atomic Age]">Featured Connections</h2>
240+
<h2 className="text-2xl font-bold text-alien-gold font-nasalization">Featured Connections</h2>
236241
<Button variant="outline" className="border-alien-green text-alien-green hover:bg-alien-green/10 font-[Exo]">
237242
View All
238243
</Button>
@@ -248,7 +253,7 @@ const CoNetWorKing: React.FC = () => {
248253
<div className="grid grid-cols-1 md:grid-cols-2 gap-8 mb-16">
249254
{/* Upcoming Networking Events */}
250255
<div>
251-
<h2 className="text-2xl font-bold text-alien-gold mb-6 font-[Atomic Age]">Upcoming Events</h2>
256+
<h2 className="text-2xl font-bold text-alien-gold mb-6 font-nasalization">Upcoming Events</h2>
252257
<div className="space-y-4">
253258
{upcomingEvents.map((event, index) => (
254259
<div key={index} className="bg-alien-space-dark/50 p-4 rounded-lg backdrop-blur-md border border-alien-gold/20">
@@ -275,7 +280,7 @@ const CoNetWorKing: React.FC = () => {
275280

276281
{/* Collaboration Opportunities */}
277282
<div>
278-
<h2 className="text-2xl font-bold text-alien-gold mb-6 font-[Atomic Age]">Collaboration Opportunities</h2>
283+
<h2 className="text-2xl font-bold text-alien-gold mb-6 font-nasalization">Collaboration Opportunities</h2>
279284
<div className="space-y-4">
280285
{collaborationOpportunities.map((opportunity, index) => (
281286
<div key={index} className="bg-alien-space-dark/50 p-4 rounded-lg backdrop-blur-md border border-alien-gold/20">
@@ -307,7 +312,7 @@ const CoNetWorKing: React.FC = () => {
307312
{/* CTA Section */}
308313
<div className="bg-gradient-to-r from-alien-green/30 to-alien-gold/30 rounded-lg p-8 text-center backdrop-blur-md">
309314
<Briefcase className="h-12 w-12 text-alien-gold mx-auto mb-4" />
310-
<h2 className="text-2xl font-bold text-alien-gold mb-3 font-[Atomic Age]">Create Your Professional Profile</h2>
315+
<h2 className="text-2xl font-bold text-alien-gold mb-3 font-nasalization">Create Your Professional Profile</h2>
311316
<p className="text-gray-200 max-w-2xl mx-auto mb-6 font-[Exo]">
312317
Showcase your skills, experience, and interests to connect with the perfect collaborators for your next cosmic venture.
313318
</p>
@@ -317,7 +322,6 @@ const CoNetWorKing: React.FC = () => {
317322
</div>
318323
</div>
319324
</main>
320-
<Footer />
321325
</div>
322326
);
323327
};

src/pages/Index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ 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';
1011

1112
const Index: React.FC = () => {
1213
return (
@@ -37,6 +38,9 @@ const Index: React.FC = () => {
3738
<ParticipationSection />
3839
</div>
3940
</div>
41+
42+
{/* Footer */}
43+
<Footer />
4044
</div>
4145
);
4246
};

0 commit comments

Comments
 (0)