Merge version_11 into main

Update theme colors
2026-04-13 06:08:10 +00:00 · 2026-04-13 06:08:07 +00:00 · 2026-04-13 06:07:29 +00:00 · 2026-04-13 06:07:26 +00:00 · 2026-04-13 06:07:13 +00:00 · 2026-04-13 06:07:07 +00:00
3 changed files with 33 additions and 71 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,69 +1,32 @@
-import type { Metadata } from "next";
-import { Montserrat } from "next/font/google";
-import { Inter } from "next/font/google";
-import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
+import type { Metadata } from 'next';
+import { Geist, Geist_Mono } from 'next/font/google';
+import './globals.css';

-const montserrat = Montserrat({
-  variable: "--font-montserrat",
-  subsets: ["latin"],
+const geist = Geist({
+  variable: '--font-geist-sans',
+  subsets: ['latin'],
 });

-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
+const geistMono = Geist_Mono({
+  variable: '--font-geist-mono',
+  subsets: ['latin'],
 });

 export const metadata: Metadata = {
-  title: "Trade with Ease - Learn Forex, Crypto, & Stock Trading",
-  description: "Master trading with interactive lessons, paper trading simulator, and expert courses. Learn forex, candlestick patterns, risk management, crypto trading, technical analysis, and stock market basics.",
-  keywords: "trading education, forex trading, crypto trading, technical analysis, stock trading, risk management, candlestick patterns, paper trading simulator, trading courses",
-  metadataBase: new URL("https://tradewithease.com"),
-  alternates: {
-    canonical: "https://tradewithease.com",
-  },
-  openGraph: {
-    title: "Trade with Ease - Learn Trading from Basics to Advanced",
-    description: "Interactive trading education platform with paper simulator, real-time lessons, and professional courses.",
-    url: "https://tradewithease.com",
-    siteName: "Trade with Ease",
-    type: "website",
-    images: [
-      {
-        url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/a-modern-sleek-trading-dashboard-interfa-1772579752422-c15395dc.png",
-        alt: "Trade with Ease - Trading Dashboard",
-      },
-    ],
-  },
-  twitter: {
-    card: "summary_large_image",
-    title: "Trade with Ease - Learn Trading Online",
-    description: "Master forex, crypto, stocks, and technical analysis with our comprehensive trading education platform.",
-    images: [
-      "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/a-modern-sleek-trading-dashboard-interfa-1772579752422-c15395dc.png",
-    ],
-  },
-  robots: {
-    index: true,
-    follow: true,
-  },
+  title: 'Trade with Ease - Learn Trading',
+  description: 'Master forex, crypto, stocks, and technical analysis with interactive lessons and paper trading simulator',
 };

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${montserrat.variable} ${inter.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={`${geist.variable} ${geistMono.variable} antialiased`}>
+        {children}
+      
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1431,7 +1394,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -124,19 +124,19 @@ export default function HomePage() {
          features={[
            {
              id: 1,
-              title: "Interactive Lessons",              description: "Learn forex, candlestick patterns, technical analysis, risk management, crypto trading, and stock market basics through engaging video lessons, interactive quizzes, and real-time market examples.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/visual-representation-of-forex-trading-c-1772579752386-e5287888.png?_wi=1"
+              title: "Interactive Lessons — Learn Faster",              description: "Learn forex, candlestick patterns, technical analysis, risk management, crypto trading, and stock market basics through engaging video lessons, interactive quizzes, and real-time market examples.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/visual-representation-of-forex-trading-c-1772579752386-e5287888.png?_wi=1"
            },
            {
              id: 2,
-              title: "Paper Trading Simulator",              description: "Practice your trading strategies with virtual money in a risk-free environment. Execute real market data trades without losing actual capital and track your performance metrics.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/trading-simulator-platform-visualization-1772579752437-99e94864.png?_wi=1"
+              title: "Paper Trading Simulator — Risk-Free Practice",              description: "Practice your trading strategies with virtual money in a risk-free environment. Execute real market data trades without losing actual capital and track your performance metrics.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/trading-simulator-platform-visualization-1772579752437-99e94864.png?_wi=1"
            },
            {
              id: 3,
-              title: "Technical Analysis Tools",              description: "Master chart patterns, candlestick formations, and technical indicators. Learn to identify support/resistance levels, trend lines, and execute trades based on technical signals.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/comprehensive-technical-analysis-tools-v-1772579752011-f5e5357f.png?_wi=1"
+              title: "Technical Analysis Tools — Trade Smarter",              description: "Master chart patterns, candlestick formations, and technical indicators. Learn to identify support/resistance levels, trend lines, and execute trades based on technical signals.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/comprehensive-technical-analysis-tools-v-1772579752011-f5e5357f.png?_wi=1"
            },
            {
              id: 4,
-              title: "Risk Management Academy",              description: "Understand portfolio diversification, position sizing, stop-loss strategies, and risk-reward ratios. Learn to protect your capital and minimize losses in volatile markets.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/visual-concept-for-risk-management-in-tr-1772579751568-4b03176f.png?_wi=1"
+              title: "Risk Management Academy — Protect Wealth",              description: "Understand portfolio diversification, position sizing, stop-loss strategies, and risk-reward ratios. Learn to protect your capital and minimize losses in volatile markets.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/visual-concept-for-risk-management-in-tr-1772579751568-4b03176f.png?_wi=1"
            },
          ]}
          tagAnimation="slide-up"
@@ -244,7 +244,7 @@ export default function HomePage() {
          tag="Get Started"
          tagIcon={ArrowRight}
          title="Join Thousands of Successful Traders"
-          description="Start your trading education journey today with Trade with Ease. Get instant access to all courses, the paper trading simulator, and our growing community of traders."
+          description="Get instant access to all courses and start trading confidently today."
          background={{ variant: "sparkles-gradient" }}
          useInvertedBackground={true}
          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AQxD9eiHViVZvAURUrlHdTerQJ/a-modern-sleek-trading-dashboard-interfa-1772579752422-c15395dc.png?_wi=2"
@@ -266,4 +266,4 @@ export default function HomePage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #737373;;
  --background-accent: #737373;; */

-  --background: #0a0a0a;;
-  --card: #1a1a1a;;
-  --foreground: #f8f5ffe6;;
-  --primary-cta: #c89bff;;
-  --primary-cta-text: #0a0a0a;;
-  --secondary-cta: #1a1a1a;;
-  --secondary-cta-text: #f8f5ffe6;;
-  --accent: #737373;;
-  --background-accent: #737373;;
+  --background: #000000;;
+  --card: #1a2a1a;;
+  --foreground: #ffffff;;
+  --primary-cta: #ffffff;;
+  --primary-cta-text: #0a150a;;
+  --secondary-cta: #0d1a0d;;
+  --secondary-cta-text: #e1f6e1;;
+  --accent: #2d4a2d;;
+  --background-accent: #c1e1c1;;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	7e9f593898	Merge version_11 into main Merge version_11 into main	2026-04-13 06:08:10 +00:00
bender	bcb8030cf4	Update theme colors	2026-04-13 06:08:07 +00:00
bender	c0632c842a	Merge version_10 into main Merge version_10 into main	2026-04-13 06:07:29 +00:00
bender	78e9d1f7c4	Update theme colors	2026-04-13 06:07:26 +00:00
bender	070f9662b4	Merge version_9 into main Merge version_9 into main	2026-04-13 06:07:13 +00:00
bender	144c24d47c	Update theme colors	2026-04-13 06:07:07 +00:00
bender	65709eb76c	Merge version_8 into main Merge version_8 into main	2026-04-13 06:06:15 +00:00
bender	14dd85b446	Update theme colors	2026-04-13 06:06:12 +00:00
bender	1a1bce253c	Merge version_7 into main Merge version_7 into main	2026-04-13 06:05:38 +00:00
bender	a97e827f95	Update theme colors	2026-04-13 06:05:35 +00:00
bender	74890e60e5	Merge version_6 into main Merge version_6 into main	2026-04-13 06:05:13 +00:00
bender	a81e7f573f	Update theme colors	2026-04-13 06:05:10 +00:00
bender	47abce6a75	Merge version_5 into main Merge version_5 into main	2026-04-13 06:04:21 +00:00
bender	c0932df878	Update theme colors	2026-04-13 06:04:18 +00:00
bender	18d6b0795f	Merge version_4 into main Merge version_4 into main	2026-03-04 08:43:56 +00:00
bender	9e5c67eddc	Update src/app/page.tsx	2026-03-04 08:43:51 +00:00
bender	9f0c8b0457	Merge version_2 into main Merge version_2 into main	2026-03-03 23:24:12 +00:00
bender	1d4b5291c7	Update src/app/page.tsx	2026-03-03 23:24:08 +00:00
bender	4202406bbb	Update src/app/layout.tsx	2026-03-03 23:24:07 +00:00
bender	fddf78ed4a	Merge version_1 into main Merge version_1 into main	2026-03-03 23:23:17 +00:00
bender	d227e61e68	Merge version_1 into main Merge version_1 into main	2026-03-03 23:22:09 +00:00
bender	41e0b88bef	Merge version_1 into main Merge version_1 into main	2026-03-03 23:19:46 +00:00
bender	f2f644cb83	Merge version_1 into main Merge version_1 into main	2026-03-03 23:17:30 +00:00