bender/f4e22ac1-8848-4056-870d-8a8da003bd41
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #6

Merged
bender merged 3 commits from version_2 into main 2026-03-26 09:57:46 +00:00
Conversation 0 Commits 3 Files Changed 3 +8 -4
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,6 +99,8 @@ export default function DashboardPage() {
id: "m4", value: "30", title: "Personal Bests", items: ["New max: Deadlift", "Faster run time"]
}
]}
textboxLayout="default"
useInvertedBackground={false}
/>
</div>
@@ -145,6 +147,8 @@ export default function DashboardPage() {
description="Explore a comprehensive library of exercises with detailed instructions and high-quality images."
products={exerciseLibrary.map(ex => ({ ...ex, name: ex.name, price: ex.price }))} // Map dummy price to actual price for ProductCardOne
uniformGridCustomHeightClasses="min-h-95 2xl:min-h-105"
textboxLayout="default"
useInvertedBackground={false}
/>
</div>
</main>

4
src/app/login/page.tsx
View File

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import RotatedRaysBackground from '@/components/background/RotatedRaysBackground';
import { Github, Google, Facebook } from "lucide-react";
import { Github, Chrome, Facebook } from "lucide-react";
import Link from "next/link";
export default function LoginPage() {
@@ -91,7 +91,7 @@ export default function LoginPage() {
<div className="text-center my-6 text-gray-400 text-sm">— Or continue with —</div>
<div className="flex justify-center space-x-4 mb-6">
<button className="p-3 border border-gray-700 rounded-full text-foreground hover:border-accent focus:outline-none focus:ring-2 focus:ring-accent transition-all duration-200">
<Google size={24} className="text-white" />
<Chrome size={24} className="text-white" />
</button>
<button className="p-3 border border-gray-700 rounded-full text-foreground hover:border-accent focus:outline-none focus:ring-2 focus:ring-accent transition-all duration-200">
<Github size={24} className="text-white" />

4
src/app/signup/page.tsx
View File

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import RotatedRaysBackground from '@/components/background/RotatedRaysBackground';
import { Github, Google, Facebook } from "lucide-react";
import { Github, Chrome, Facebook } from "lucide-react";
import Link from "next/link";
export default function SignupPage() {
@@ -125,7 +125,7 @@ export default function SignupPage() {
<div className="text-center my-6 text-gray-400 text-sm">— Or continue with —</div>
<div className="flex justify-center space-x-4 mb-6">
<button className="p-3 border border-gray-700 rounded-full text-foreground hover:border-accent focus:outline-none focus:ring-2 focus:ring-accent transition-all duration-200">
<Google size={24} className="text-white" />
<Chrome size={24} className="text-white" />
</button>
<button className="p-3 border border-gray-700 rounded-full text-foreground hover:border-accent focus:outline-none focus:ring-2 focus:ring-accent transition-all duration-200">
<Github size={24} className="text-white" />