bender/97b3d5cc-f6ae-49ad-96dd-e83db753c122
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-16 06:50:24 +00:00
Conversation 0 Commits 2 Files Changed 2 +23 -23
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/factions/page.tsx
View File

@@ -7,7 +7,7 @@ import FeatureBento from "@/components/sections/feature/FeatureBento";
import MetricCardOne from "@/components/sections/metrics/MetricCardOne";
import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
import Link from "next/link";
import { Flag, Shield, Heart, Briefcase, Zap, TrendingUp, Users, Star } from "lucide-react";
import { Flag, Shield, Heart, Briefcase, Zap, TrendingUp, Users, Star, Sparkles } from "lucide-react";
export default function FactionsPage() {
const navItems = [
@@ -58,42 +58,42 @@ export default function FactionsPage() {
id: "police",
name: "Police Department",
price: "Law & Order",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=8",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Police Department faction",
},
{
id: "ems",
name: "Emergency Medical Services",
price: "Saving Lives",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=9",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "EMS faction",
},
{
id: "government",
name: "Government",
price: "Administration",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=10",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Government faction",
},
{
id: "gangs",
name: "Criminal Organizations",
price: "Risk & Reward",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=11",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Criminal Organizations faction",
},
{
id: "business",
name: "Business Owners",
price: "Entrepreneurship",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=12",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Business Owners faction",
},
{
id: "independent",
name: "Independent Life",
price: "Freedom",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=13",
imageSrc: "http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Independent Life path",
},
]}

32
src/app/page.tsx
View File

@@ -50,7 +50,7 @@ export default function HomePage() {
borderRadius="pill"
contentWidth="small"
sizing="largeSmallSizeMediumTitles"
background="fluid"
background="circleGradient"
cardStyle="gradient-bordered"
primaryButtonStyle="flat"
secondaryButtonStyle="solid"
@@ -89,7 +89,7 @@ export default function HomePage() {
mediaItems={[
{
imageSrc:
"http://img.b2bpic.net/free-photo/digital-art-inmersive-exhibition_23-2151428542.jpg?_wi=1",
"http://img.b2bpic.net/free-photo/digital-art-inmersive-exhibition_23-2151428542.jpg",
imageAlt: "New Era RP server landscape",
},
]}
@@ -111,7 +111,7 @@ export default function HomePage() {
},
]}
buttonAnimation="slide-up"
imageSrc="http://img.b2bpic.net/free-photo/young-adults-with-social-media-addiction_23-2149324650.jpg?_wi=1"
imageSrc="http://img.b2bpic.net/free-photo/young-adults-with-social-media-addiction_23-2149324650.jpg"
imageAlt="New Era RP community collaboration"
useInvertedBackground={false}
/>
@@ -208,7 +208,7 @@ export default function HomePage() {
name: "Police Department",
price: "Law & Order",
imageSrc:
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=1",
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Police Department",
},
{
@@ -216,7 +216,7 @@ export default function HomePage() {
name: "Emergency Medical Services",
price: "Saving Lives",
imageSrc:
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=2",
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Emergency Medical Services",
},
{
@@ -224,7 +224,7 @@ export default function HomePage() {
name: "Government",
price: "Administration",
imageSrc:
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=3",
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Government",
},
{
@@ -232,7 +232,7 @@ export default function HomePage() {
name: "Criminal Organizations",
price: "Risk & Reward",
imageSrc:
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=4",
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Criminal Organizations",
},
{
@@ -240,7 +240,7 @@ export default function HomePage() {
name: "Business Owners",
price: "Entrepreneurship",
imageSrc:
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=5",
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Business Owners",
},
{
@@ -248,7 +248,7 @@ export default function HomePage() {
name: "Independent Life",
price: "Freedom",
imageSrc:
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=6",
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "Independent Life",
},
]}
@@ -324,7 +324,7 @@ export default function HomePage() {
company: "LSPD",
rating: 5,
imageSrc:
"http://img.b2bpic.net/free-photo/cute-gen-z-youngster-does-influencer-marketing-presenting-social-media-fans-product-endorsement_482257-76867.jpg?_wi=1",
"http://img.b2bpic.net/free-photo/cute-gen-z-youngster-does-influencer-marketing-presenting-social-media-fans-product-endorsement_482257-76867.jpg",
imageAlt: "Marcus Johnson",
},
{
@@ -334,7 +334,7 @@ export default function HomePage() {
company: "Chen's Garage",
rating: 5,
imageSrc:
"http://img.b2bpic.net/free-photo/front-view-young-male-green-t-shirt-holding-red-bank-card-d-sunglasses-light-white-wall-film-lonely-cinema_140725-71386.jpg?_wi=1",
"http://img.b2bpic.net/free-photo/front-view-young-male-green-t-shirt-holding-red-bank-card-d-sunglasses-light-white-wall-film-lonely-cinema_140725-71386.jpg",
imageAlt: "Sarah Chen",
},
{
@@ -344,7 +344,7 @@ export default function HomePage() {
company: "LSMC",
rating: 5,
imageSrc:
"http://img.b2bpic.net/free-photo/portrait-hacker_23-2148165932.jpg?_wi=1",
"http://img.b2bpic.net/free-photo/portrait-hacker_23-2148165932.jpg",
imageAlt: "David Rodriguez",
},
{
@@ -354,7 +354,7 @@ export default function HomePage() {
company: "Solo Operator",
rating: 5,
imageSrc:
"http://img.b2bpic.net/free-photo/impressed-young-male-student-wearing-headphones-playing-game-mobile-phone-isolated-purple-background_141793-135832.jpg?_wi=1",
"http://img.b2bpic.net/free-photo/impressed-young-male-student-wearing-headphones-playing-game-mobile-phone-isolated-purple-background_141793-135832.jpg",
imageAlt: "Emma Thompson",
},
]}
@@ -380,7 +380,7 @@ export default function HomePage() {
excerpt:
"Learn about our completely revamped faction system with new rank structures and progression mechanics.",
imageSrc:
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg?_wi=7",
"http://img.b2bpic.net/free-photo/man-with-holographic-tablet_1112-647.jpg",
imageAlt: "New Faction System",
authorName: "Admin Team",
authorAvatar:
@@ -394,7 +394,7 @@ export default function HomePage() {
excerpt:
"Join us for our biggest community event featuring competitions, giveaways, and special in-game rewards.",
imageSrc:
"http://img.b2bpic.net/free-photo/young-adults-with-social-media-addiction_23-2149324650.jpg?_wi=2",
"http://img.b2bpic.net/free-photo/young-adults-with-social-media-addiction_23-2149324650.jpg",
imageAlt: "New Era Festival",
authorName: "Community Manager",
authorAvatar:
@@ -408,7 +408,7 @@ export default function HomePage() {
excerpt:
"Major economic adjustments, 5 new job opportunities, and improved banking systems.",
imageSrc:
"http://img.b2bpic.net/free-photo/african-american-car-mechanic-his-coworker-communicating-auto-repair-shop_637285-4237.jpg?_wi=1",
"http://img.b2bpic.net/free-photo/african-american-car-mechanic-his-coworker-communicating-auto-repair-shop_637285-4237.jpg",
imageAlt: "v2.5 Patch Update",
authorName: "Dev Team",
authorAvatar: