bender/442648a6-e78c-45af-99c3-0aae56b58c5f
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #5

Merged
bender merged 2 commits from version_2 into main 2026-06-03 08:43:43 +00:00
Conversation 0 Commits 2 Files Changed 2 +26 -14
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/dashboard/page.tsx
View File

@@ -7,7 +7,6 @@ import FooterSimple from '@/components/sections/footer/FooterSimple';
import ProductCatalog from '@/components/ecommerce/productCatalog/ProductCatalog';
import FeatureCardTwentyFour from '@/components/sections/feature/FeatureCardTwentyFour';
import { LayoutDashboard } from "lucide-react"; // Import necessary icons
import { ThemeProviderProps, CTAButtonVariant, AnimationType, BorderRadiusPreset, ContentWidthPreset, SizingPreset, BackgroundType, CardStyleVariant, PrimaryButtonStyleVariant, SecondaryButtonStyleVariant, HeadingFontWeight } from "@/providers/themeProvider/config/types";
export default function DashboardPage() {
const commonNavItems = [
@@ -22,10 +21,6 @@ export default function DashboardPage() {
{ name: "Contact", id: "#contact" },
];
const themeProps: ThemeProviderProps = { // Copy from src/app/page.tsx
defaultButtonVariant: "bounce-effect", defaultTextAnimation: "entrance-slide", borderRadius: "soft", contentWidth: "compact", sizing: "largeSmallSizeMediumTitles", background: "fluid", cardStyle: "inset", primaryButtonStyle: "radial-glow", secondaryButtonStyle: "layered", headingFontWeight: "semibold"
};
const dummyWatchlistProducts = [
{ id: "crypto1", name: "Bitcoin", category: "Cryptocurrency", price: "$65,000", rating: 5, reviewCount: "10k+", imageSrc: "http://img.b2bpic.net/free-vector/bitcoin-symbol-cryptocurrency-blockchain-technology-background_1017-32766.jpg" },
{ id: "crypto2", name: "Ethereum", category: "Cryptocurrency", price: "$3,500", rating: 4.8, reviewCount: "8k+", imageSrc: "http://img.b2bpic.net/free-vector/blockchain-ethereum-cryptocurrency-virtual-money-business-vector-illustration_53876-116361.jpg" },
@@ -39,7 +34,18 @@ export default function DashboardPage() {
];
return (
<ThemeProvider {...themeProps}>
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultTextAnimation="entrance-slide"
borderRadius="soft"
contentWidth="compact"
sizing="largeSmallSizeMediumTitles"
background="fluid"
cardStyle="inset"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="layered"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
@@ -110,4 +116,4 @@ export default function DashboardPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

20
src/app/profile/page.tsx
View File

@@ -7,7 +7,6 @@ import FooterSimple from '@/components/sections/footer/FooterSimple';
import SplitAbout from '@/components/sections/about/SplitAbout';
import ContactCTA from '@/components/sections/contact/ContactCTA';
import { User, ShieldCheck, Mail, Settings2 } from "lucide-react"; // Import necessary icons
import { ThemeProviderProps, CTAButtonVariant, AnimationType, BorderRadiusPreset, ContentWidthPreset, SizingPreset, BackgroundType, CardStyleVariant, PrimaryButtonStyleVariant, SecondaryButtonStyleVariant, HeadingFontWeight } from "@/providers/themeProvider/config/types";
export default function ProfilePage() {
const commonNavItems = [
@@ -22,12 +21,19 @@ export default function ProfilePage() {
{ name: "Contact", id: "#contact" },
];
const themeProps: ThemeProviderProps = { // Copy from src/app/page.tsx
defaultButtonVariant: "bounce-effect", defaultTextAnimation: "entrance-slide", borderRadius: "soft", contentWidth: "compact", sizing: "largeSmallSizeMediumTitles", background: "fluid", cardStyle: "inset", primaryButtonStyle: "radial-glow", secondaryButtonStyle: "layered", headingFontWeight: "semibold"
};
return (
<ThemeProvider {...themeProps}>
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultTextAnimation="entrance-slide"
borderRadius="soft"
contentWidth="compact"
sizing="largeSmallSizeMediumTitles"
background="fluid"
cardStyle="inset"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="layered"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
@@ -117,4 +123,4 @@ export default function ProfilePage() {
</ReactLenis>
</ThemeProvider>
);
}
}