diff --git a/margin_frontend/package.json b/margin_frontend/package.json
index bc2f70f8..c66a98ba 100644
--- a/margin_frontend/package.json
+++ b/margin_frontend/package.json
@@ -23,6 +23,7 @@
},
"devDependencies": {
"@eslint/js": "^9.19.0",
+ "@playwright/test": "^1.50.1",
"@types/react": "^19.0.10",
"@types/react-dom": "^19.0.3",
"@vitejs/plugin-react": "^4.3.4",
diff --git a/margin_frontend/src/assets/img/DiscordLogo.png b/margin_frontend/src/assets/img/DiscordLogo.png
new file mode 100644
index 00000000..cc023055
Binary files /dev/null and b/margin_frontend/src/assets/img/DiscordLogo.png differ
diff --git a/margin_frontend/src/assets/img/TelegramLogo.png b/margin_frontend/src/assets/img/TelegramLogo.png
new file mode 100644
index 00000000..46752bad
Binary files /dev/null and b/margin_frontend/src/assets/img/TelegramLogo.png differ
diff --git a/margin_frontend/src/assets/img/XLogo.png b/margin_frontend/src/assets/img/XLogo.png
new file mode 100644
index 00000000..cfbbb203
Binary files /dev/null and b/margin_frontend/src/assets/img/XLogo.png differ
diff --git a/margin_frontend/src/routes/index.tsx b/margin_frontend/src/routes/index.tsx
index 682928a7..0d7dee53 100644
--- a/margin_frontend/src/routes/index.tsx
+++ b/margin_frontend/src/routes/index.tsx
@@ -36,11 +36,7 @@ function Content() {
Trade smarter, earn bigger, and grow your portfolio with confidence.
-
diff --git a/margin_frontend/src/ui/core/button.tsx b/margin_frontend/src/ui/core/button.tsx
index c228fc81..a90c1daf 100644
--- a/margin_frontend/src/ui/core/button.tsx
+++ b/margin_frontend/src/ui/core/button.tsx
@@ -1,5 +1,6 @@
import { cva, type VariantProps } from "class-variance-authority";
import { ReactNode } from "react";
+import { cn } from "../../utils/cn";
const buttonVariants = cva(
"inline-flex items-center justify-center uppercase cursor-pointer rounded-md font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none",
@@ -10,7 +11,7 @@ const buttonVariants = cva(
destructive:
"bg-destructive text-destructive-foreground hover:bg-destructive/90",
outline:
- "baseWhite border border-btnBorderColor text-baseWhite bg-background font-normal hover:bg-accent hover:text-accent-foreground",
+ "text-baseWhite border border-btnBorderColor text-baseWhite bg-transparent font-normal",
secondary:
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground",
@@ -18,7 +19,7 @@ const buttonVariants = cva(
},
size: {
sm: "h-8 px-3 text-sm",
- md: "h-14 text-sm",
+ md: "h-12 text-sm",
lg: "h-[72px] text-xl font-normal",
},
},
@@ -44,7 +45,7 @@ export function Button({
}: ButtonProps) {
return (
{children}
diff --git a/margin_frontend/src/ui/layout/footer.tsx b/margin_frontend/src/ui/layout/footer.tsx
index 31935770..56c0dea1 100644
--- a/margin_frontend/src/ui/layout/footer.tsx
+++ b/margin_frontend/src/ui/layout/footer.tsx
@@ -1,16 +1,16 @@
const socials = [
{
- icon: "src/assets/images/DiscordLogo.png",
+ icon: "src/assets/img/DiscordLogo.png",
link: "https://discord.com/",
title: "Discord",
},
{
- icon: "src/assets/images/XLogo.png",
+ icon: "src/assets/img/XLogo.png",
link: "https://twitter.com/SpotNet_123",
title: "X",
},
{
- icon: "src/assets/images/TelegramLogo.png",
+ icon: "src/assets/img/TelegramLogo.png",
link: "https://t.me/djeck_vorobey1",
title: "Telegram",
},
diff --git a/margin_frontend/src/ui/layout/header.tsx b/margin_frontend/src/ui/layout/header.tsx
index 477f77c4..1dd45f31 100644
--- a/margin_frontend/src/ui/layout/header.tsx
+++ b/margin_frontend/src/ui/layout/header.tsx
@@ -32,7 +32,7 @@ export function Header() {
))}
-
+
Connect Wallet
diff --git a/margin_frontend/vite.config.ts b/margin_frontend/vite.config.ts
index e52a3aad..ed90572e 100644
--- a/margin_frontend/vite.config.ts
+++ b/margin_frontend/vite.config.ts
@@ -1,14 +1,16 @@
import { defineConfig } from "vitest/config";
import react from "@vitejs/plugin-react";
+import tailwindcss from "@tailwindcss/vite";
export default defineConfig({
- plugins: [react()],
+ plugins: [react(), tailwindcss()],
test: {
name: "react",
browser: {
enabled: true,
- name: "chromium",
provider: "playwright",
+ headless: true,
},
+ exclude: ["test/browser/**/*"],
},
});