Merge pull request #58 from Dagdon/feature/merchant-settings-page

feat: Frontend - Implement Account & API Settings Page #22

Author: Pvsaint

fluxapay_frontend/package-lock.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev",
+    "dev": "next dev -p 3075",
     "build": "next build",
     "start": "next start",
     "lint": "eslint"
@@ -40,4 +40,4 @@
     "tw-animate-css": "^1.4.0",
     "typescript": "^5"
   }
-}
+}

fluxapay_frontend/package.json

@@ -1,17 +1,5 @@
-export default function SettingsPage() {
-    return (
-        <div className="space-y-6">
-            <div className="flex items-center justify-between">
-                <div>
-                    <h2 className="text-2xl font-bold tracking-tight">Settings</h2>
-                    <p className="text-muted-foreground">Manage your account preferences and configurations.</p>
-                </div>
-            </div>
+import { SettingsPage } from "@/features/settings";
 
-            {/* Pending Implementation: Settings Form */}
-            <div className="rounded-xl border bg-card shadow p-12 text-center text-muted-foreground">
-                Account Settings will be implemented here.
-            </div>
-        </div>
-    );
+export default function Settings() {
+    return <SettingsPage />;
 }