Skip to content

Commit f280158

Browse files
Fix: Resolve issues with home page, calendar, and clubs page
1 parent 8080e91 commit f280158

File tree

7 files changed

+85
-40
lines changed

7 files changed

+85
-40
lines changed
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 10 additions & 0 deletions
Loading
Lines changed: 5 additions & 0 deletions
Loading
Lines changed: 10 additions & 0 deletions
Loading

src/components/Footer.tsx

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import React from 'react';
22
import { X, Facebook, Instagram, Mail, Disc, Send, Github, Linkedin, MessageSquare, BookOpen } from 'lucide-react';
33
import { Link } from 'react-router-dom';
4+
import { getCurrentChineseYear } from '@/lib/chineseCalendar';
45
const Footer = () => {
6+
const chineseYear = getCurrentChineseYear();
7+
const currentYear = new Date().getFullYear();
8+
59
return <footer className="bg-gradient-to-br from-alien-space-dark/95 to-alien-space/90 backdrop-blur-sm border-t-2 border-alien-gold/30 py-6 lg:py-8 mt-auto relative z-20">
610
<div className="container mx-auto px-4 lg:px-6">
711
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 lg:gap-8">
@@ -134,11 +138,27 @@ const Footer = () => {
134138
</div>
135139
</div>
136140

137-
<div className="border-t-2 border-alien-gold/30 mt-6 pt-4 bg-gradient-to-r from-alien-space-dark/50 to-alien-space/30 rounded-lg px-4 py-2">
138-
<div className="flex flex-col lg:flex-row justify-between items-center gap-2">
141+
<div className="border-t-2 border-alien-gold/30 mt-6 pt-4 bg-gradient-to-r from-alien-space-dark/50 to-alien-space/30 rounded-lg px-4 py-3">
142+
<div className="flex flex-col lg:flex-row justify-between items-center gap-3">
139143
<p className="text-xs text-alien-green/70 font-[Exo] text-center lg:text-left">
140-
© {new Date().getFullYear()} AlienFlowSpace DAO. All rights reserved across the multiverse.
144+
© {currentYear} AlienFlowSpace DAO. All rights reserved across the multiverse.
141145
</p>
146+
147+
{/* Chinese Calendar Display */}
148+
<div className="flex items-center gap-2 bg-alien-space-dark/40 px-3 py-1.5 rounded-lg border border-alien-gold/20">
149+
<span className="text-2xl" style={{ filter: `drop-shadow(0 0 6px ${chineseYear.color})` }}>
150+
{chineseYear.icon}
151+
</span>
152+
<div className="text-left">
153+
<p className="text-alien-gold font-bold text-xs font-nasalization">
154+
{currentYear} / {chineseYear.year}
155+
</p>
156+
<p className="text-[10px] font-[Exo]" style={{ color: chineseYear.color }}>
157+
{chineseYear.element} {chineseYear.animal}
158+
</p>
159+
</div>
160+
</div>
161+
142162
<div className="flex items-center gap-1 text-xs text-alien-gold/80">
143163
<span>Made with</span>
144164
<span className="text-alien-green text-base">💚</span>

src/components/ParticipationSection.tsx

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React from 'react';
22
import { motion } from 'framer-motion';
33
import { Button } from '@/components/ui/button';
44
import { CircleDollarSign, Calendar, MessagesSquare, Database, Globe } from 'lucide-react';
5-
import { getCurrentChineseYear } from '@/lib/chineseCalendar';
65

76
const features = [{
87
icon: <CircleDollarSign className="h-6 w-6 text-alien-gold" />,
@@ -29,12 +28,14 @@ const stats = [{
2928
label: "Data Storage",
3029
icon: Database,
3130
color: "text-alien-gold"
31+
}, {
32+
value: "$125M",
33+
label: "Total Value Locked",
34+
icon: CircleDollarSign,
35+
color: "text-alien-gold"
3236
}];
3337

3438
const ParticipationSection = () => {
35-
const chineseYear = getCurrentChineseYear();
36-
const currentYear = new Date().getFullYear();
37-
3839
return <section id="participate" className="py-20 relative">
3940
<div className="container mx-auto px-4 flex flex-col items-center text-center">
4041
{/* Título */}
@@ -91,7 +92,7 @@ const ParticipationSection = () => {
9192
</Button>
9293
{/* Stats Grid - MORE TRANSPARENT */}
9394
<div className="flex justify-center mt-12 w-full">
94-
<div className="grid grid-cols-1 md:grid-cols-2 gap-6 text-center max-w-2xl w-full">
95+
<div className="grid grid-cols-1 md:grid-cols-3 gap-6 text-center max-w-4xl w-full">
9596
{stats.map((stat, index) => <motion.div key={index} initial={{
9697
opacity: 0,
9798
y: 20
@@ -135,29 +136,6 @@ const ParticipationSection = () => {
135136
</motion.div>)}
136137
</div>
137138
</div>
138-
139-
{/* Year Display with Chinese Calendar */}
140-
<motion.div
141-
initial={{ opacity: 0, y: 20 }}
142-
whileInView={{ opacity: 1, y: 0 }}
143-
transition={{ duration: 0.6, delay: 0.4 }}
144-
viewport={{ once: true }}
145-
className="mt-8 bg-alien-space-dark/30 backdrop-blur-sm p-6 rounded-xl border border-alien-gold/20 max-w-md"
146-
>
147-
<div className="flex items-center justify-center gap-4">
148-
<span className="text-4xl" style={{ filter: `drop-shadow(0 0 8px ${chineseYear.color})` }}>
149-
{chineseYear.icon}
150-
</span>
151-
<div className="text-left">
152-
<p className="text-alien-gold font-bold text-xl font-nasalization">
153-
Year {currentYear} / {chineseYear.year}
154-
</p>
155-
<p className="text-sm font-[Exo]" style={{ color: chineseYear.color }}>
156-
{chineseYear.element} {chineseYear.animal}
157-
</p>
158-
</div>
159-
</div>
160-
</motion.div>
161139
</div>
162140
</section>;
163141
};

src/pages/Clubs.tsx

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ const Clubs: React.FC = () => {
164164
icon: '/lovable-uploads/Clubs/SafePal.png'
165165
}, {
166166
name: 'Trezor',
167-
url: 'https://trezor.io/'
167+
url: 'https://trezor.io/',
168+
icon: '/lovable-uploads/Clubs/Trezor.svg'
168169
}]
169170
}, {
170171
title: 'Hot Wallets',
@@ -177,13 +178,16 @@ const Clubs: React.FC = () => {
177178
icon: '/lovable-uploads/Clubs/AtomicWallet.svg'
178179
}, {
179180
name: 'Base',
180-
url: 'https://www.base.org/'
181+
url: 'https://www.base.org/',
182+
icon: '/lovable-uploads/Clubs/Coinbase.svg'
181183
}, {
182184
name: 'Bitget Wallet',
183-
url: 'https://newshare.bwb.global/es_es/referralLanding?inviteCode=cmR3qk&utm_source=newInviteRebate&type=card'
185+
url: 'https://newshare.bwb.global/es_es/referralLanding?inviteCode=cmR3qk&utm_source=newInviteRebate&type=card',
186+
icon: '/lovable-uploads/Clubs/Bitget.png'
184187
}, {
185188
name: 'Crypto Onchain',
186-
url: 'https://crypto.com/onchain'
189+
url: 'https://crypto.com/onchain',
190+
icon: '/lovable-uploads/Clubs/Cryptocom.svg'
187191
}, {
188192
name: 'Exodus',
189193
url: 'https://www.exodus.com/',
@@ -198,17 +202,20 @@ const Clubs: React.FC = () => {
198202
icon: '/lovable-uploads/Clubs/MetaMask.svg'
199203
}, {
200204
name: 'OKX',
201-
url: 'https://my.okx.com/join/11556162'
205+
url: 'https://my.okx.com/join/11556162',
206+
icon: '/lovable-uploads/Clubs/OKX.svg'
202207
}, {
203208
name: 'Phantom',
204209
url: 'https://phantom.com',
205210
icon: '/lovable-uploads/Clubs/PhantomLogo.svg'
206211
}, {
207212
name: 'Pi Network',
208-
url: 'https://minepi.com/Aitor69Alien'
213+
url: 'https://minepi.com/Aitor69Alien',
214+
icon: '/lovable-uploads/Clubs/PiNetwork.svg'
209215
}, {
210216
name: 'Trust Wallet',
211-
url: 'https://trustwallet.com/'
217+
url: 'https://trustwallet.com/',
218+
icon: '/lovable-uploads/Clubs/TrustWallet.svg'
212219
}]
213220
}]
214221
},
@@ -435,12 +442,23 @@ const Clubs: React.FC = () => {
435442
return (
436443
<div className="relative flex flex-col min-h-screen">
437444
<Header />
438-
<main className="flex-grow container mx-auto px-4 py-16">
445+
<main className="flex-grow container mx-auto px-4 pt-24 pb-16">
446+
{/* Page Header with Logo */}
447+
<div className="flex items-center justify-center gap-4 mb-12">
448+
<img
449+
src="/lovable-uploads/ClubLogo.png"
450+
alt="Clubs Logo"
451+
className="h-16 w-auto object-contain"
452+
/>
453+
<h1 className="text-4xl md:text-5xl font-bold font-nasalization text-alien-green text-glow">
454+
Clubs
455+
</h1>
456+
</div>
439457
<section id="featured" className="mb-16">
440458
<h2 className="text-3xl font-bold mb-8 font-nasalization text-alien-green text-center">
441459
Featured Clubs
442460
</h2>
443-
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
461+
<div className="space-y-8">
444462
{featuredClubs.map((club, index) => (
445463
<FeaturedClubCard key={index} club={club} />
446464
))}

0 commit comments

Comments
 (0)