Skip to content

Commit 64f70fa

Browse files
lovable-dev[bot]lovable-dev[bot]
committed
Refactor: Implement the plan
This commit implements the changes outlined in the plan.
1 parent cca6910 commit 64f70fa

File tree

10 files changed

+56
-37
lines changed

10 files changed

+56
-37
lines changed

‎index.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
<meta name="author" content="AlienFlowSpace" />
99
<meta name="description" content="AlienFlowSpace DAO unites BioFi, DeFi, DePin, DeSci, IPFS, QFS, ReFi, RWA, SocialFi, and TradFi under one cosmic ecosystem." />
1010

11+
<!-- Preload Fonts for Better Performance -->
12+
<link rel="preload" href="https://fonts.googleapis.com/css2?family=Atomic+Age&display=swap" as="style" />
13+
<link rel="preload" href="https://fonts.googleapis.com/css2?family=Exo:wght@300;400;500;600;700&display=swap" as="style" />
14+
15+
<!-- Font Stylesheets -->
16+
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Atomic+Age&display=swap" />
17+
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Exo:wght@300;400;500;600;700&display=swap" />
18+
1119
<!-- Open Graph Meta Tags -->
1220
<meta property="og:title" content="AlienFlowSpace DAO | Cosmic Decentralized Governance" />
1321
<meta property="og:description" content="AlienFlowSpace DAO unites BioFi, DeFi, DePin, DeSci, IPFS, QFS, ReFi, RWA, SocialFi, and TradFi under one cosmic ecosystem." />

‎src/components/Header/ConnectButton.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Button } from '@/components/ui/button';
44

55
const ConnectButton = () => {
66
return (
7-
<Button className="bg-alien-green hover:bg-alien-green-light text-alien-gold font-[Atomic Age] rounded-full flex items-center gap-2">
7+
<Button className="bg-alien-green hover:bg-alien-green-light text-alien-gold font-atomic-force rounded-full flex items-center gap-2">
88
<img
99
src="/lovable-uploads/AW.png"
1010
alt="Wallet"

‎src/components/Header/DesktopNav.tsx‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ const DesktopNav = () => {
1414
return (
1515
<nav className="hidden md:flex items-center gap-6">
1616
<div className="hidden md:flex space-x-4">
17-
<Link to="/" className="text-alien-gold hover:text-alien-green px-2 py-2 font-bold" style={{fontFamily: "'Atomic Age', cursive"}}>
17+
<Link to="/" className="text-alien-gold hover:text-alien-green px-2 py-2 font-atomic-force font-bold">
1818
Home
1919
</Link>
20-
<Link to="/about" className="text-alien-gold hover:text-alien-green px-2 py-2 font-bold" style={{fontFamily: "'Atomic Age', cursive"}}>
20+
<Link to="/about" className="text-alien-gold hover:text-alien-green px-2 py-2 font-atomic-force font-bold">
2121
About
2222
</Link>
23-
<Link to="/alien-trip" className="text-alien-gold hover:text-alien-green px-2 py-2 font-bold" style={{fontFamily: "'Atomic Age', cursive"}}>
23+
<Link to="/alien-trip" className="text-alien-gold hover:text-alien-green px-2 py-2 font-atomic-force font-bold">
2424
AlienTrip
2525
</Link>
26-
<Link to="/contact" className="text-alien-gold hover:text-alien-green px-2 py-2 font-bold" style={{fontFamily: "'Atomic Age', cursive"}}>
26+
<Link to="/contact" className="text-alien-gold hover:text-alien-green px-2 py-2 font-atomic-force font-bold">
2727
Contact
2828
</Link>
2929

@@ -32,8 +32,7 @@ const DesktopNav = () => {
3232
<DropdownMenuTrigger asChild>
3333
<Button
3434
variant="ghost"
35-
className="text-alien-gold hover:text-alien-green bg-transparent hover:bg-alien-space-light/30 px-2 py-2 rounded flex items-center group font-bold"
36-
style={{fontFamily: "'Atomic Age', cursive"}}
35+
className="text-alien-gold hover:text-alien-green bg-transparent hover:bg-alien-space-light/30 px-2 py-2 rounded flex items-center group font-atomic-force font-bold"
3736
>
3837
Explore Spaces
3938
<ChevronDown
@@ -51,7 +50,7 @@ const DesktopNav = () => {
5150
className="flex items-start p-2 rounded-lg hover:bg-alien-space-light/20 group cursor-pointer"
5251
>
5352
<div className="flex-1">
54-
<h3 className="text-alien-gold group-hover:text-alien-green font-bold mb-1" style={{fontFamily: "'Atomic Age', cursive"}}>Academy</h3>
53+
<h3 className="text-alien-gold group-hover:text-alien-green font-bold mb-1 font-atomic-force">Academy</h3>
5554
<p className="text-sm text-gray-400">Unlock cosmic knowledge through educational resources</p>
5655
</div>
5756
</Link>
@@ -62,7 +61,7 @@ const DesktopNav = () => {
6261
className="flex items-start p-2 rounded-lg hover:bg-alien-space-light/20 group cursor-pointer"
6362
>
6463
<div className="flex-1">
65-
<h3 className="text-alien-gold group-hover:text-alien-green font-bold mb-1" style={{fontFamily: "'Atomic Age', cursive"}}>Clubs</h3>
64+
<h3 className="text-alien-gold group-hover:text-alien-green font-bold mb-1 font-atomic-force">Clubs</h3>
6665
<p className="text-sm text-gray-400">Join specialized communities focused on interests</p>
6766
</div>
6867
</Link>
@@ -73,7 +72,7 @@ const DesktopNav = () => {
7372
className="flex items-start p-2 rounded-lg hover:bg-alien-space-light/20 group cursor-pointer"
7473
>
7574
<div className="flex-1">
76-
<h3 className="text-alien-gold group-hover:text-alien-green font-bold mb-1" style={{fontFamily: "'Atomic Age', cursive"}}>CoNetWorKing</h3>
75+
<h3 className="text-alien-gold group-hover:text-alien-green font-bold mb-1 font-atomic-force">CoNetWorKing</h3>
7776
<p className="text-sm text-gray-400">Connect with like-minded and profits across the multiverse</p>
7877
</div>
7978
</Link>

‎src/components/Header/Logo.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Logo = () => {
1212
alt="AlienFlowSpaceDAO Logo"
1313
className="h-9"
1414
/>
15-
<span className="font-['Atomic_Age'] text-xl" style={{fontFamily: "'Atomic Age', cursive"}}>
15+
<span className="font-atomic-force text-xl">
1616
<span className="text-alien-green">Δlieπ</span>
1717
<span className="text-alien-gold">FlΦw</span>
1818
<span className="text-alien-green"> $pac€</span>

‎src/components/Header/MobileNav.tsx‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
import React, { useState } from 'react';
23
import { motion } from 'framer-motion';
34
import { Link } from 'react-router-dom';
@@ -26,33 +27,29 @@ const MobileNav = ({ isMenuOpen, setIsMenuOpen }: MobileNavProps) => {
2627
<nav className="flex flex-col space-y-4">
2728
<Link
2829
to="/"
29-
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md font-bold"
30+
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md font-atomic-force font-bold"
3031
onClick={() => setIsMenuOpen(false)}
31-
style={{fontFamily: "'Atomic Age', cursive"}}
3232
>
3333
Home
3434
</Link>
3535
<Link
3636
to="/about"
37-
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md font-bold"
37+
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md font-atomic-force font-bold"
3838
onClick={() => setIsMenuOpen(false)}
39-
style={{fontFamily: "'Atomic Age', cursive"}}
4039
>
4140
About
4241
</Link>
4342
<Link
4443
to="/alien-trip"
45-
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md font-bold"
44+
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md font-atomic-force font-bold"
4645
onClick={() => setIsMenuOpen(false)}
47-
style={{fontFamily: "'Atomic Age', cursive"}}
4846
>
4947
AlienTrip
5048
</Link>
5149
<Link
5250
to="/contact"
53-
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md font-bold"
51+
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md font-atomic-force font-bold"
5452
onClick={() => setIsMenuOpen(false)}
55-
style={{fontFamily: "'Atomic Age', cursive"}}
5653
>
5754
Contact
5855
</Link>
@@ -61,8 +58,7 @@ const MobileNav = ({ isMenuOpen, setIsMenuOpen }: MobileNavProps) => {
6158
<div className="flex flex-col">
6259
<button
6360
onClick={() => setSpacesExpanded(!spacesExpanded)}
64-
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md flex justify-between items-center font-bold"
65-
style={{fontFamily: "'Atomic Age', cursive"}}
61+
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md flex justify-between items-center font-atomic-force font-bold"
6662
>
6763
<span>Explore Spaces</span>
6864
{spacesExpanded ? <ChevronUp size={16} /> : <ChevronDown size={16} />}
@@ -75,23 +71,23 @@ const MobileNav = ({ isMenuOpen, setIsMenuOpen }: MobileNavProps) => {
7571
className="p-2 hover:bg-alien-space-light rounded-md text-alien-gold hover:text-alien-green"
7672
onClick={() => setIsMenuOpen(false)}
7773
>
78-
<h3 className="font-bold" style={{fontFamily: "'Atomic Age', cursive"}}>Academy</h3>
74+
<h3 className="font-bold font-atomic-force">Academy</h3>
7975
<p className="text-sm text-gray-400">Unlock cosmic knowledge through educational resources</p>
8076
</Link>
8177
<Link
8278
to="/clubs"
8379
className="p-2 hover:bg-alien-space-light rounded-md text-alien-gold hover:text-alien-green"
8480
onClick={() => setIsMenuOpen(false)}
8581
>
86-
<h3 className="font-bold" style={{fontFamily: "'Atomic Age', cursive"}}>Clubs</h3>
82+
<h3 className="font-bold font-atomic-force">Clubs</h3>
8783
<p className="text-sm text-gray-400">Join specialized communities focused on interests</p>
8884
</Link>
8985
<Link
9086
to="/conetworking"
9187
className="p-2 hover:bg-alien-space-light rounded-md text-alien-gold hover:text-alien-green"
9288
onClick={() => setIsMenuOpen(false)}
9389
>
94-
<h3 className="font-bold" style={{fontFamily: "'Atomic Age', cursive"}}>CoNetWorKing</h3>
90+
<h3 className="font-bold font-atomic-force">CoNetWorKing</h3>
9591
<p className="text-sm text-gray-400">Connect with like-minded and profits across the multiverse</p>
9692
</Link>
9793
</div>
@@ -102,8 +98,7 @@ const MobileNav = ({ isMenuOpen, setIsMenuOpen }: MobileNavProps) => {
10298
<div className="flex flex-col">
10399
<button
104100
onClick={() => setLanguageExpanded(!languageExpanded)}
105-
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md flex items-center justify-between font-bold"
106-
style={{fontFamily: "'Atomic Age', cursive"}}
101+
className="text-alien-gold py-2 px-4 hover:text-alien-green hover:bg-alien-space-light rounded-md flex items-center justify-between font-atomic-force font-bold"
107102
>
108103
<div className="flex items-center">
109104
<Globe className="mr-2 h-5 w-5" />
@@ -146,7 +141,7 @@ const MobileNav = ({ isMenuOpen, setIsMenuOpen }: MobileNavProps) => {
146141
)}
147142
</div>
148143

149-
<Button className="bg-alien-green hover:bg-alien-green-light text-alien-gold rounded-full mt-4 flex items-center gap-2 font-bold" style={{fontFamily: "'Atomic Age', cursive"}}>
144+
<Button className="bg-alien-green hover:bg-alien-green-light text-alien-gold rounded-full mt-4 flex items-center gap-2 font-atomic-force font-bold">
150145
<img
151146
src="/lovable-uploads/e2d45b36-c4c1-4b45-953d-5376a5f5b6cc.png"
152147
alt="Wallet"

‎src/components/Header/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const Header = () => {
1616
const isMobile = useIsMobile();
1717

1818
if (isMobile === undefined) {
19-
return <div className="bg-alien-space-dark h-16 w-full flex items-center justify-center" style={{fontFamily: "'Atomic Age', cursive"}}>Cargando...</div>;
19+
return <div className="bg-alien-space-dark h-16 w-full flex items-center justify-center font-atomic-force">Cargando...</div>;
2020
}
2121

2222
return (

‎src/components/Hero.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const Hero = () => {
4040

4141
{/* Título del Hero */}
4242
<h1
43-
className="text-4xl md:text-6xl lg:text-7xl font-bold mb-4 tracking-tight text-glow text-center font-atomic"
43+
className="text-4xl md:text-6xl lg:text-7xl font-bold mb-4 tracking-tight text-glow text-center font-atomic-force"
4444
>
4545
<span className="text-alien-green">Δlieπ</span>
4646
<span className="text-alien-gold">FlΦw</span>
@@ -67,7 +67,7 @@ const Hero = () => {
6767
{/* Botón About */}
6868
<Link to="/about">
6969
<Button
70-
className="bg-alien-green text-alien-gold hover:bg-alien-gold hover:text-alien-green font-atomic px-8 py-6 text-lg rounded-full transition-colors"
70+
className="bg-alien-green text-alien-gold hover:bg-alien-gold hover:text-alien-green font-atomic-force px-8 py-6 text-lg rounded-full transition-colors"
7171
>
7272
<Orbit className="mr-2 h-5 w-5" /> About Enter Portal
7373
</Button>
@@ -76,7 +76,7 @@ const Hero = () => {
7676
{/* Botón AlienTrip */}
7777
<Link to="/alientrip">
7878
<Button
79-
className="bg-alien-green text-alien-gold hover:bg-alien-gold hover:text-alien-green font-atomic px-8 py-6 text-lg rounded-full transition-colors"
79+
className="bg-alien-green text-alien-gold hover:bg-alien-gold hover:text-alien-green font-atomic-force px-8 py-6 text-lg rounded-full transition-colors"
8080
>
8181
<ScrollText className="mr-2 h-5 w-5" /> Alientrip Manifesto
8282
</Button>
@@ -85,7 +85,7 @@ const Hero = () => {
8585
{/* Botón Contact */}
8686
<Link to="/contact">
8787
<Button
88-
className="bg-alien-green text-alien-gold hover:bg-alien-gold hover:text-alien-green font-atomic px-8 py-6 text-lg rounded-full transition-colors"
88+
className="bg-alien-green text-alien-gold hover:bg-alien-gold hover:text-alien-green font-atomic-force px-8 py-6 text-lg rounded-full transition-colors"
8989
>
9090
<Globe className="mr-2 h-5 w-5" /> Contact & Join
9191
</Button>

‎src/global.css‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,16 @@ main {
6565
box-shadow: 0 0 15px rgba(255, 215, 0, 0.2);
6666
}
6767

68-
/* Ensure fonts apply correctly */
68+
/* Force Atomic Age font to appear correctly */
6969
h1, h2, h3, h4, h5, h6, .font-atomic {
7070
font-family: 'Atomic Age', cursive !important;
7171
}
7272

73-
/* Force the Atomic Age font to appear correctly */
74-
.force-atomic {
73+
/* We're adding a separate class with higher specificity for problematic elements */
74+
.font-atomic-force {
7575
font-family: 'Atomic Age', cursive !important;
76+
font-weight: 400 !important;
77+
font-style: normal !important;
7678
}
7779

7880
/* Alignment correction for sections */

‎src/index.css‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

2-
@import url('https://fonts.googleapis.com/css2?family=Atomic+Age&family=Exo:wght@300;400;500;600;700&display=swap');
2+
@import url('https://fonts.googleapis.com/css2?family=Atomic+Age&display=swap');
3+
@import url('https://fonts.googleapis.com/css2?family=Exo:wght@300;400;500;600;700&display=swap');
34

45
@tailwind base;
56
@tailwind components;
@@ -54,6 +55,20 @@
5455
body, p, span, div, a, button {
5556
font-family: 'Exo', system-ui, sans-serif;
5657
}
58+
59+
/* Force font loading */
60+
@font-face {
61+
font-family: 'Atomic Age';
62+
font-style: normal;
63+
font-weight: 400;
64+
font-display: swap;
65+
src: url(https://fonts.gstatic.com/s/atomicage/v27/f0Xz0eug6sdmRFkYZZGL58Ht9a8.woff2) format('woff2');
66+
}
67+
68+
.font-atomic-force {
69+
font-family: 'Atomic Age', cursive !important;
70+
font-weight: 400 !important;
71+
}
5772
}
5873

5974
@layer base {

‎src/pages/Index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const Index: React.FC = () => {
2323
<div className="relative z-10">
2424
<Hero />
2525
<div className="container mx-auto text-center px-4 py-8 section-center">
26-
<h2 className="text-4xl md:text-5xl font-bold mb-4 text-alien-gold force-atomic" style={{fontFamily: "'Atomic Age', cursive"}}>₿£€$$</h2>
26+
<h2 className="text-4xl md:text-5xl font-bold mb-4 text-alien-gold font-atomic-force">₿£€$$</h2>
2727
</div>
2828
<FinancialFreedomSection />
2929
{/* StatsSection removed from here as its content has been moved to ParticipationSection */}

0 commit comments

Comments
 (0)