From 19ec020046e3d1561adad990dbf3be9eb6b45adf Mon Sep 17 00:00:00 2001 From: echo Date: Fri, 12 Dec 2025 02:08:03 +0100 Subject: [PATCH] db backup and restore implemented --- .../backup-2025-12-12T01-06-38-797Z.db | Bin 0 -> 69632 bytes apps/admin/next-env.d.ts | 2 +- apps/admin/package-lock.json | 478 +++++++++++++++++- apps/admin/package.json | 1 + apps/admin/scripts/verify-db.ts | 3 +- .../app/api/admin/backups/restore/route.ts | 47 ++ apps/admin/src/app/api/admin/backups/route.ts | 78 +++ .../api/fitness-goals/[id]/complete/route.ts | 2 +- .../src/app/api/fitness-goals/[id]/route.ts | 6 +- apps/admin/src/app/profile/page.tsx | 2 +- apps/admin/src/app/settings/page.tsx | 175 +++++++ apps/admin/src/components/Navigation.tsx | 9 +- .../analytics/AnalyticsDashboard.tsx | 8 +- apps/admin/src/components/ui/Button.tsx | 23 - apps/admin/src/components/ui/Card.tsx | 30 -- apps/admin/src/components/ui/button.tsx | 97 ++-- .../src/components/users/Recommendations.tsx | 2 +- .../src/components/users/UserManagement.tsx | 2 +- 18 files changed, 847 insertions(+), 118 deletions(-) create mode 100644 apps/admin/backups/backup-2025-12-12T01-06-38-797Z.db create mode 100644 apps/admin/src/app/api/admin/backups/restore/route.ts create mode 100644 apps/admin/src/app/api/admin/backups/route.ts create mode 100644 apps/admin/src/app/settings/page.tsx delete mode 100644 apps/admin/src/components/ui/Button.tsx delete mode 100644 apps/admin/src/components/ui/Card.tsx diff --git a/apps/admin/backups/backup-2025-12-12T01-06-38-797Z.db b/apps/admin/backups/backup-2025-12-12T01-06-38-797Z.db new file mode 100644 index 0000000000000000000000000000000000000000..6dcb3a4f6b607ec3460b9aada48b6f9a6918d939 GIT binary patch literal 69632 zcmeI5O>7%Uc7U4}O-iz4&R{oTW|hFDod6PHNn=uyEw5nA&=RHLNTSCQF(y=06`EKGe)wzIRx+_z#@kna#$d@1UUrQ+nyFlu6vkcZaFRx1Xu*ft7?)` zv)K|omXo#T(V|)Ge)ad&dtHD1nnw@!xywk|vg_0(tIAtSB%*vkh@vRpgZJC;?!V#? zi1xq0XXH#cEciWTj6RQbB1-g;@=N&lGOxSW zW66Vsh{8>sb(|*#)JUaG*OK4WGIvepIBLbBhNGr^UlU&)U5h7g-i-X@GnbYOW;4yI z*O{qPms_SY^mS(IFqbXnNHKeVKSzd6lErB<^x`@x=6+ZtA0OrqvWJh!UheTyK&a_3 zTkT609u!I8cz-`A)-QI$w#wXKW5n>6Pjy+x^@mc$T@ZHWp!3Oh`(PTwbYdr2})=-dx2b=4N$SM%eeF4Fqhvg z2n8aGJ%ve;!`x2pFjv^h9T9QNA&Xp3kp~5!w4Vbt-O3(qWw&#|qWY2xDwZ$hq0?cR z_?jVgZzh&}cr(l({fY@DIdow5>E~1NG^ho*g|czXO5TcK8E zT21Aq>hd}pN4vZTR@3#z2)2paZLrZMBF{(zsdVeYAT)zIjtDfM(Jhl2s%ukj3e!oY zf+?Gp%RK7~o_jH+_36!vs-a&)R;Odh-T5#LIc-lheHy;@RVNltE-y!Z`mWTAVbvV| z9{1_U@Yze%6mne1KRg~`YE{N7RToS(JK~z&KJO&0Fp@76bGy02V7tLZPG`2KFTE>i z?~qiKIyIP3kTUCsEVs&RsWUb!Lx%%Op}Lmp(C$c`8FT~&Yca!@&(JBEpTl%!y43E9 z91KxoqpM0mS&X^`g@wzV?_i7BXJw#wvRVC%$S76rx1s3DLoUOt!)%Q^Os&!qcf<5v z_Fd;n)S1pTFfGl3PDu_1LNcTV3>zvu)Wo=X(zL@*znBI7A9fpldwqX0mONSxv)6vR z^adx6ni)Pa^?v+?5*Q5A`bkcHX+`77xw*)X*QN1m1_zaMdLLJPrrtYvsTLlz!8)s# z-~wFb4K@7YJuD>6r9>UB^^CF3oARRG;*F7(cqW1K#!*2rnbWBaa`QCoG#xS4l0&Ls zy-r}-z(AUM7d59+3Wvt{m))z8jf+101`j~NB{{S0VIF~kN^@u0!ZNXCGc5f`ry5} z8?&?X(Wsa?s;lee?x&^9!{YkdqsL$Dms_2*c9hpOb1x4Iz_8J0e^3#N1S_zSs`EOB zgAL}wW}Z{y&R~AcH;?{@Z$A1LEjoR$1<5P#oF?CC)INGty?flbRkTWeRP6VPjJAg|@}}v0^Z4Jz`$rSg2kXgqXO-k2lUj-GI4ryBZWP+J$4{Q@ zexyIK%i0~2n!H9!RwZ-mv>I7)?7mfjEhwwSYbSDHpr5#QW%}UWysrjk_D;UDe{wh9 z*x1?Y?xx%H_;|1INlh!Qz`A_RfnrlTy>=#p!O{B${elTp{u+S(d@5SuObxzyEA)yl z8lcFgA?awMt|aP-uM>Zr_~+MGQ?cYo00|%gB!C2v01`j~NB{{S0VIF~en$xW@x(!- zzlajH$`L&y6uL?=aYiU~wc*OU69-fM?84S;y!rogCGk&*e@i@1{O9ioDJ%vOKmter z2_OL^fCP{L5PCf$Kb*K13A@SQ%6BK;n+n{b zF)L`kr6{=b|K_U|)({CG0VIF~kN^@u0!RP}AOR$R1YSD=yOEh2n@Mn*fRaa}+Q}MS z&8#_Xc+iu(EVlfY(|2yKuiahC++EvPyCa`B;ywO@Zx(+4>|5;r%lZFrUONU@U?hM9 zkN^@u0!RP}AOR$R1dsp{Kmtf0oWRV)jj6$kf!P0#B>q-`KYSqpB!C2v01`j~NB{{S z0VIF~kN^@u0{<@rK99V8~2JU;i2WHV@zY zleBpM==<>7A5B~Qp4Rt26Z`*>#BUV%!xs`j0!RP}AOR$R1dsp{Kmter2_OL^@a7N@ z`~QPg1aJQTwUYSy&8Z;P1PLGkB!C2v01`j~NB{{S0VIF~kifTzz&OwU_wN7yg_8Ki zw}}ka6$u~#B!C2v01`j~NB{{S0VIF~kihFgU^_B-;{$jfM5EtPqO}cU!zgztyT~no zZ$A1jzWK>qrCS$4y#N1oX>Tki5r4@Ooh2C_gRITUX2W^z0B(k_{B4# zff%<$p}o8YMI{a`Go!mgwrQ87e?ZbHsQGf8n@yLIlFgkOX;Y&nicU%0(wR-+1fL%3n=-adSc{3^lE_~+ zGOI`jjQA&zF#Iy5pUOa*EuBRLIdc*sFi zHBB6YYfKPrS1p4rLor3&EQr5C_M4_wg?3uMRUs7{R0GlhZd#2&nMEDkB}hSQHlXMo zIM-sJ6+)*RvM7|O&h(U5`}BJmDfgtwO^bpCaMNTqB%OhzOSA@&9ct7qQzU2z?GoRq z-cv3{%Uvh|W2V+JJT=mJRHxP}OqN5Ve$< z=nj;?=B89NL(~IM8Qf*I)U7tColSHqOh7=QEsG12sR(T=K||ZL!kiVzz_wbD*=8vQ z?~RKt7CpI`xBvfZCGqQ5aG}E_kpL1v0!RP}AOR$R1dsp{Kmter2_S)2N?>8)cxs$Q zMbH1gt0cOwv^bbJ5oL4FCkd{=v}NiUND#2qUSRd_i$ zYPy%D_cig=(Y1K;=FP}YK9jy8HWQvs;3On{VVt3_Gh2tbY%xcQ+57uB@U8L5lErB< z^a4kXV(y1U^6_E*Aba?j?ByOW1%%|1PG7R{phybG`};w$ezC#Lqs$GaUL3<;KGkI% z*DFqVCUS*{yIr*bt~?hB>zuh`2@3Zp@EnpT`gxPB4|7|4!ZSyn%NNMvLIb#i_sqf) zS?Ig7h_KC0z-f%>3#k;@&h2E6_lx9IHo&vOz?lb}W^@&Nu(qMOiur>a>E{~++t2E( z_&HMG9wjOgln{PY#+?U;x%_THC=glfDNKqS=5}(2xx!ZNNP63WpA*+p zn~5bK-V8H(zhZ((4jq_%`uS8m zIX@qHc1;>3bzNbR;9GVYn)aFE>G4-=g<6$qHIcFrX4u6mP^kMkyrD_E^F618`k1(sMTzm(!%#OHzdn@xH zC&7h}Rbu2B?2z3s%Ak4Bpg@6%mrL#nO)(b=ETjD zCiumMMZd%@qVLr04P!#A`x5Q-{mEGJXgSPY`)$=5oH%M`_{h}z@fS*9Fih(wIr*g( zjVI^kB0pZ27X)y#1~qhgA6I?m-#d7zRv)y>I;)r90$k+{HT>c|EF?{+L>;d6473jJ z!6Mk=jgi)QCV}(DQ9&`8)2UqwH*2x|C-MS^dok9ML#klCPGD@ViqXk9{Tp;euG-=b zIDz+j!(fVF>)=FfYF%MrE|fzx!5uq9X@kOzss&!|qm4T#Z8O6gyhFo;M7l&f^z~|D z_bT1HlT8zY#$zC5bKG /// -import "./.next/dev/types/routes.d.ts"; +import "./.next/types/routes.d.ts"; // NOTE: This file should not be edited // see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/apps/admin/package-lock.json b/apps/admin/package-lock.json index 9f31f6f..eba2431 100644 --- a/apps/admin/package-lock.json +++ b/apps/admin/package-lock.json @@ -12,6 +12,7 @@ "@fitai/database": "file:../../packages/database", "@fitai/shared": "file:../../packages/shared", "@hookform/resolvers": "^5.2.2", + "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-slot": "^1.2.4", "@tanstack/react-query": "^5.90.7", "@types/bcryptjs": "^3.0.0", @@ -76,6 +77,8 @@ "name": "@fitai/shared", "version": "1.0.0", "dependencies": { + "clsx": "^2.1.1", + "tailwind-merge": "^3.4.0", "zod": "^4.1.12" }, "devDependencies": { @@ -2402,6 +2405,12 @@ "url": "https://opencollective.com/pkgr" } }, + "node_modules/@radix-ui/primitive": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz", + "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==", + "license": "MIT" + }, "node_modules/@radix-ui/react-compose-refs": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz", @@ -2417,6 +2426,249 @@ } } }, + "node_modules/@radix-ui/react-context": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz", + "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-dialog": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz", + "integrity": "sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.3", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-dismissable-layer": "1.1.11", + "@radix-ui/react-focus-guards": "1.1.3", + "@radix-ui/react-focus-scope": "1.1.7", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-portal": "1.1.9", + "@radix-ui/react-presence": "1.1.5", + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-slot": "1.2.3", + "@radix-ui/react-use-controllable-state": "1.2.2", + "aria-hidden": "^1.2.4", + "react-remove-scroll": "^2.6.3" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", + "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.2" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-dismissable-layer": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.11.tgz", + "integrity": "sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.3", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-escape-keydown": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-focus-guards": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz", + "integrity": "sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-focus-scope": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.7.tgz", + "integrity": "sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-use-callback-ref": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-id": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz", + "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-portal": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.9.tgz", + "integrity": "sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-presence": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.5.tgz", + "integrity": "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-primitive": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", + "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-slot": "1.2.3" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-primitive/node_modules/@radix-ui/react-slot": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", + "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.2" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-slot": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.4.tgz", @@ -2435,6 +2687,91 @@ } } }, + "node_modules/@radix-ui/react-use-callback-ref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz", + "integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-controllable-state": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz", + "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-effect-event": "0.0.2", + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-effect-event": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz", + "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-escape-keydown": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz", + "integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-callback-ref": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-layout-effect": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz", + "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@reduxjs/toolkit": { "version": "2.10.1", "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.10.1.tgz", @@ -2899,7 +3236,7 @@ "version": "19.2.3", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz", "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", - "dev": true, + "devOptional": true, "license": "MIT", "peer": true, "peerDependencies": { @@ -3777,6 +4114,18 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "license": "Python-2.0" }, + "node_modules/aria-hidden": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz", + "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/aria-query": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", @@ -5255,6 +5604,12 @@ "node": ">=8" } }, + "node_modules/detect-node-es": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", + "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==", + "license": "MIT" + }, "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", @@ -6696,6 +7051,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-nonce": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz", + "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/get-package-type": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", @@ -10826,6 +11190,75 @@ } } }, + "node_modules/react-remove-scroll": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz", + "integrity": "sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==", + "license": "MIT", + "dependencies": { + "react-remove-scroll-bar": "^2.3.7", + "react-style-singleton": "^2.2.3", + "tslib": "^2.1.0", + "use-callback-ref": "^1.3.3", + "use-sidecar": "^1.1.3" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/react-remove-scroll-bar": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz", + "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==", + "license": "MIT", + "dependencies": { + "react-style-singleton": "^2.2.2", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/react-style-singleton": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz", + "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==", + "license": "MIT", + "dependencies": { + "get-nonce": "^1.0.0", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", @@ -12900,6 +13333,49 @@ "punycode": "^2.1.0" } }, + "node_modules/use-callback-ref": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz", + "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/use-sidecar": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz", + "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==", + "license": "MIT", + "dependencies": { + "detect-node-es": "^1.1.0", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/use-sync-external-store": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz", diff --git a/apps/admin/package.json b/apps/admin/package.json index d5d3af6..72adfc4 100644 --- a/apps/admin/package.json +++ b/apps/admin/package.json @@ -15,6 +15,7 @@ "@fitai/database": "file:../../packages/database", "@fitai/shared": "file:../../packages/shared", "@hookform/resolvers": "^5.2.2", + "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-slot": "^1.2.4", "@tanstack/react-query": "^5.90.7", "@types/bcryptjs": "^3.0.0", diff --git a/apps/admin/scripts/verify-db.ts b/apps/admin/scripts/verify-db.ts index ae2e5ab..7462411 100644 --- a/apps/admin/scripts/verify-db.ts +++ b/apps/admin/scripts/verify-db.ts @@ -1,5 +1,5 @@ -import { getDatabase } from '../src/lib/database/index.ts'; +import { getDatabase } from '../src/lib/database/index'; async function verifyDatabase() { console.log('Starting database verification...'); @@ -34,6 +34,7 @@ async function verifyDatabase() { // 3. Create Fitness Profile console.log('Creating fitness profile...'); const profile = await db.createFitnessProfile({ + id: 'test-profile-id', userId: user.id, height: '180', weight: '75', diff --git a/apps/admin/src/app/api/admin/backups/restore/route.ts b/apps/admin/src/app/api/admin/backups/restore/route.ts new file mode 100644 index 0000000..8c3c7ae --- /dev/null +++ b/apps/admin/src/app/api/admin/backups/restore/route.ts @@ -0,0 +1,47 @@ +import { auth } from '@clerk/nextjs/server' +import { NextResponse } from 'next/server' +import { getDatabase, DatabaseFactory } from '@/lib/database' +import { ensureUserSynced } from '@/lib/sync-user' +import fs from 'fs' +import path from 'path' + +const BACKUP_DIR = path.join(process.cwd(), 'backups') +const DB_PATH = path.join(process.cwd(), 'data', 'fitai.db') + +export async function POST(req: Request) { + try { + const { userId } = await auth() + if (!userId) return new NextResponse('Unauthorized', { status: 401 }) + + const db = await getDatabase() + const user = await ensureUserSynced(userId, db) + + if (!user || (user.role !== 'admin' && user.role !== 'superAdmin')) { + return new NextResponse('Forbidden', { status: 403 }) + } + + const { filename } = await req.json() + if (!filename) { + return new NextResponse('Filename is required', { status: 400 }) + } + + const backupPath = path.join(BACKUP_DIR, filename) + if (!fs.existsSync(backupPath)) { + return new NextResponse('Backup file not found', { status: 404 }) + } + + // Close existing connection + await DatabaseFactory.disconnect() + + // Restore file + fs.copyFileSync(backupPath, DB_PATH) + + // Re-initialize connection (will happen automatically on next getDatabase call, but good to verify) + await getDatabase() + + return NextResponse.json({ success: true }) + } catch (error) { + console.error('Restore backup error:', error) + return new NextResponse('Internal Server Error', { status: 500 }) + } +} diff --git a/apps/admin/src/app/api/admin/backups/route.ts b/apps/admin/src/app/api/admin/backups/route.ts new file mode 100644 index 0000000..766b70b --- /dev/null +++ b/apps/admin/src/app/api/admin/backups/route.ts @@ -0,0 +1,78 @@ +import { auth } from '@clerk/nextjs/server' +import { NextResponse } from 'next/server' +import { getDatabase } from '@/lib/database' +import { ensureUserSynced } from '@/lib/sync-user' +import fs from 'fs' +import path from 'path' + +const BACKUP_DIR = path.join(process.cwd(), 'backups') +const DB_PATH = path.join(process.cwd(), 'data', 'fitai.db') + +export async function GET() { + try { + const { userId } = await auth() + if (!userId) return new NextResponse('Unauthorized', { status: 401 }) + + const db = await getDatabase() + const user = await ensureUserSynced(userId, db) + + if (!user || (user.role !== 'admin' && user.role !== 'superAdmin')) { + return new NextResponse('Forbidden', { status: 403 }) + } + + if (!fs.existsSync(BACKUP_DIR)) { + fs.mkdirSync(BACKUP_DIR, { recursive: true }) + } + + const files = fs.readdirSync(BACKUP_DIR) + .filter(file => file.endsWith('.db')) + .map(file => { + const stats = fs.statSync(path.join(BACKUP_DIR, file)) + return { + name: file, + size: stats.size, + createdAt: stats.birthtime + } + }) + .sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime()) + + return NextResponse.json(files) + } catch (error) { + console.error('List backups error:', error) + return new NextResponse('Internal Server Error', { status: 500 }) + } +} + +export async function POST() { + try { + const { userId } = await auth() + if (!userId) return new NextResponse('Unauthorized', { status: 401 }) + + const db = await getDatabase() + const user = await ensureUserSynced(userId, db) + + if (!user || (user.role !== 'admin' && user.role !== 'superAdmin')) { + return new NextResponse('Forbidden', { status: 403 }) + } + + if (!fs.existsSync(BACKUP_DIR)) { + fs.mkdirSync(BACKUP_DIR, { recursive: true }) + } + + const timestamp = new Date().toISOString().replace(/[:.]/g, '-') + const backupPath = path.join(BACKUP_DIR, `backup-${timestamp}.db`) + + // Ensure source DB exists + if (!fs.existsSync(DB_PATH)) { + return new NextResponse('Database file not found', { status: 404 }) + } + + // Copy file + fs.copyFileSync(DB_PATH, backupPath) + + return NextResponse.json({ success: true, filename: `backup-${timestamp}.db` }) + } catch (error) { + console.error('Create backup error:', error) + return new NextResponse('Internal Server Error', { status: 500 }) + } +} diff --git a/apps/admin/src/app/api/fitness-goals/[id]/complete/route.ts b/apps/admin/src/app/api/fitness-goals/[id]/complete/route.ts index 6f62465..28a8504 100644 --- a/apps/admin/src/app/api/fitness-goals/[id]/complete/route.ts +++ b/apps/admin/src/app/api/fitness-goals/[id]/complete/route.ts @@ -5,7 +5,7 @@ import { getDatabase } from '@/lib/database'; // POST - Mark goal as complete export async function POST( req: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { const { userId } = await auth(); diff --git a/apps/admin/src/app/api/fitness-goals/[id]/route.ts b/apps/admin/src/app/api/fitness-goals/[id]/route.ts index dc31594..d0f6fb5 100644 --- a/apps/admin/src/app/api/fitness-goals/[id]/route.ts +++ b/apps/admin/src/app/api/fitness-goals/[id]/route.ts @@ -5,7 +5,7 @@ import { getDatabase } from '@/lib/database'; // GET - Get specific goal export async function GET( req: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { const { userId } = await auth(); @@ -40,7 +40,7 @@ export async function GET( // PUT - Update goal export async function PUT( req: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { const { userId } = await auth(); @@ -82,7 +82,7 @@ export async function PUT( // DELETE - Delete goal export async function DELETE( req: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { const { userId } = await auth(); diff --git a/apps/admin/src/app/profile/page.tsx b/apps/admin/src/app/profile/page.tsx index 646ae54..43533e2 100644 --- a/apps/admin/src/app/profile/page.tsx +++ b/apps/admin/src/app/profile/page.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { useUser } from "@clerk/nextjs"; -import { Button } from "@/components/ui/Button"; +import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; interface UserProfile { diff --git a/apps/admin/src/app/settings/page.tsx b/apps/admin/src/app/settings/page.tsx new file mode 100644 index 0000000..0e594a6 --- /dev/null +++ b/apps/admin/src/app/settings/page.tsx @@ -0,0 +1,175 @@ +"use client"; + +import { useEffect, useState } from "react"; +import axios from "axios"; +import { Database, Download, RefreshCw, AlertTriangle, Check, Loader2 } from "lucide-react"; +import { Button } from "@/components/ui/button"; + +interface Backup { + name: string; + size: number; + createdAt: string; +} + +export default function SettingsPage() { + const [backups, setBackups] = useState([]); + const [loading, setLoading] = useState(true); + const [creatingBackup, setCreatingBackup] = useState(false); + const [restoring, setRestoring] = useState(null); + const [message, setMessage] = useState<{ type: 'success' | 'error', text: string } | null>(null); + + const fetchBackups = async () => { + try { + const response = await axios.get("/api/admin/backups"); + setBackups(response.data); + } catch (error) { + console.error("Failed to fetch backups:", error); + } finally { + setLoading(false); + } + }; + + useEffect(() => { + fetchBackups(); + }, []); + + const handleCreateBackup = async () => { + setCreatingBackup(true); + setMessage(null); + try { + await axios.post("/api/admin/backups"); + await fetchBackups(); + setMessage({ type: 'success', text: 'Backup created successfully' }); + } catch (error) { + console.error("Failed to create backup:", error); + setMessage({ type: 'error', text: 'Failed to create backup' }); + } finally { + setCreatingBackup(false); + } + }; + + const handleRestore = async (filename: string) => { + if (!window.confirm(`Are you sure you want to restore from ${filename}? This will overwrite the current database.`)) { + return; + } + + setRestoring(filename); + setMessage(null); + try { + await axios.post("/api/admin/backups/restore", { filename }); + setMessage({ type: 'success', text: 'Database restored successfully' }); + // Optional: Refresh page or force re-login if session is invalidated + } catch (error) { + console.error("Failed to restore backup:", error); + setMessage({ type: 'error', text: 'Failed to restore backup' }); + } finally { + setRestoring(null); + } + }; + + const formatSize = (bytes: number) => { + const units = ['B', 'KB', 'MB', 'GB']; + let size = bytes; + let unitIndex = 0; + while (size >= 1024 && unitIndex < units.length - 1) { + size /= 1024; + unitIndex++; + } + return `${size.toFixed(2)} ${units[unitIndex]}`; + }; + + const formatDate = (dateString: string) => { + return new Date(dateString).toLocaleString(); + }; + + return ( +
+
+

Settings

+

Manage your application settings and database.

+
+ +
+
+
+
+ +
+
+

Database Management

+

Create backups and restore your database

+
+
+ +
+ + {message && ( +
+ {message.type === 'success' ? : } + {message.text} +
+ )} + +
+ + + + + + + + + + + {loading ? ( + + + + ) : backups.length === 0 ? ( + + + + ) : ( + backups.map((backup) => ( + + + + + + + )) + )} + +
FilenameSizeCreated AtActions
+ Loading backups... +
+ No backups found +
{backup.name}{formatSize(backup.size)}{formatDate(backup.createdAt)} + +
+
+
+
+ ); +} diff --git a/apps/admin/src/components/Navigation.tsx b/apps/admin/src/components/Navigation.tsx index 9faa549..44e561f 100644 --- a/apps/admin/src/components/Navigation.tsx +++ b/apps/admin/src/components/Navigation.tsx @@ -3,10 +3,10 @@ import { type ReactElement } from "react"; import Link from "next/link"; import { usePathname } from "next/navigation"; -import { Home, Users, BarChart3, User, Brain } from "lucide-react"; +import { Home, Users, BarChart3, User, Brain, Settings } from "lucide-react"; import { SignedIn, UserButton } from "@clerk/nextjs"; import { cn } from "@/lib/utils"; -import { Button } from "@/components/ui/Button"; +import { Button } from "@/components/ui/button"; interface NavItem { href: string; @@ -40,6 +40,11 @@ const navItems: NavItem[] = [ label: "Profile", icon: User, }, + { + href: "/settings", + label: "Settings", + icon: Settings, + }, ]; export function Navigation(): ReactElement { diff --git a/apps/admin/src/components/analytics/AnalyticsDashboard.tsx b/apps/admin/src/components/analytics/AnalyticsDashboard.tsx index 8031fdc..9410bc1 100644 --- a/apps/admin/src/components/analytics/AnalyticsDashboard.tsx +++ b/apps/admin/src/components/analytics/AnalyticsDashboard.tsx @@ -132,7 +132,13 @@ export function AnalyticsDashboard() {

Monthly Revenue

- + ({ + category: item.label, + value: item.value, + color: item.color + }))} + /> diff --git a/apps/admin/src/components/ui/Button.tsx b/apps/admin/src/components/ui/Button.tsx deleted file mode 100644 index 340f409..0000000 --- a/apps/admin/src/components/ui/Button.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import React from 'react' - -interface ButtonProps extends React.ButtonHTMLAttributes { - variant?: 'primary' | 'secondary' - children: React.ReactNode -} - -export function Button({ variant = 'primary', children, className = '', ...props }: ButtonProps) { - const baseClasses = 'px-4 py-2 rounded-md font-medium transition-colors' - const variantClasses = { - primary: 'bg-blue-600 text-white hover:bg-blue-700', - secondary: 'bg-gray-200 text-gray-900 hover:bg-gray-300', - } - - return ( - - ) -} \ No newline at end of file diff --git a/apps/admin/src/components/ui/Card.tsx b/apps/admin/src/components/ui/Card.tsx deleted file mode 100644 index 1841511..0000000 --- a/apps/admin/src/components/ui/Card.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import React from 'react' - -interface CardProps { - children: React.ReactNode - className?: string -} - -export function Card({ children, className = '' }: CardProps) { - return ( -
- {children} -
- ) -} - -export function CardHeader({ children, className = '' }: CardProps) { - return ( -
- {children} -
- ) -} - -export function CardContent({ children, className = '' }: CardProps) { - return ( -
- {children} -
- ) -} \ No newline at end of file diff --git a/apps/admin/src/components/ui/button.tsx b/apps/admin/src/components/ui/button.tsx index d6c7bcb..0b60055 100644 --- a/apps/admin/src/components/ui/button.tsx +++ b/apps/admin/src/components/ui/button.tsx @@ -1,56 +1,49 @@ -import * as React from "react"; -import { Slot } from "@radix-ui/react-slot"; -import { cva, type VariantProps } from "class-variance-authority"; +import React from 'react' +import { cn } from '@/lib/utils' +import { Loader2 } from 'lucide-react' -import { cn } from "@/lib/utils"; - -const buttonVariants = cva( - "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0", - { - variants: { - variant: { - default: "bg-primary text-primary-foreground hover:bg-primary/90", - destructive: - "bg-destructive text-destructive-foreground hover:bg-destructive/90", - outline: - "border border-input bg-background hover:bg-accent hover:text-accent-foreground", - secondary: - "bg-secondary text-secondary-foreground hover:bg-secondary/80", - ghost: "hover:bg-accent hover:text-accent-foreground", - link: "text-primary underline-offset-4 hover:underline", - }, - size: { - default: "h-10 px-4 py-2", - sm: "h-9 rounded-md px-3", - lg: "h-11 rounded-md px-8", - icon: "h-10 w-10", - }, - }, - defaultVariants: { - variant: "default", - size: "default", - }, - }, -); - -export interface ButtonProps - extends React.ButtonHTMLAttributes, - VariantProps { - asChild?: boolean; +interface ButtonProps extends React.ButtonHTMLAttributes { + variant?: 'primary' | 'secondary' | 'ghost' | 'destructive' | 'outline' | 'default' + size?: 'default' | 'sm' | 'lg' | 'icon' + isLoading?: boolean + children: React.ReactNode } -const Button = React.forwardRef( - ({ className, variant, size, asChild = false, ...props }, ref) => { - const Comp = asChild ? Slot : "button"; - return ( - - ); - }, -); -Button.displayName = "Button"; +export function Button({ + variant = 'primary', + size = 'default', + isLoading = false, + children, + className = '', + disabled, + ...props +}: ButtonProps) { + const baseClasses = 'inline-flex items-center justify-center rounded-md font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50' -export { Button, buttonVariants }; + const variantClasses = { + primary: 'bg-blue-600 text-white hover:bg-blue-700 shadow hover:bg-blue-700/90', + default: 'bg-blue-600 text-white hover:bg-blue-700 shadow hover:bg-blue-700/90', + secondary: 'bg-slate-100 text-slate-900 hover:bg-slate-200/80', + ghost: 'hover:bg-slate-100 hover:text-slate-900', + destructive: 'bg-red-500 text-white hover:bg-red-600/90', + outline: 'border border-input bg-transparent shadow-sm hover:bg-slate-100 hover:text-slate-900' + } + + const sizeClasses = { + default: 'h-9 px-4 py-2', + sm: 'h-8 rounded-md px-3 text-xs', + lg: 'h-10 rounded-md px-8', + icon: 'h-9 w-9' + } + + return ( + + ) +} \ No newline at end of file diff --git a/apps/admin/src/components/users/Recommendations.tsx b/apps/admin/src/components/users/Recommendations.tsx index 4b097ca..e1671ff 100644 --- a/apps/admin/src/components/users/Recommendations.tsx +++ b/apps/admin/src/components/users/Recommendations.tsx @@ -1,7 +1,7 @@ "use client"; import { useState, useEffect } from "react"; -import { Button } from "@/components/ui/Button"; +import { Button } from "@/components/ui/button"; import { Card, CardHeader, CardContent } from "@/components/ui/card"; interface Recommendation { diff --git a/apps/admin/src/components/users/UserManagement.tsx b/apps/admin/src/components/users/UserManagement.tsx index df01a3d..c44b28b 100644 --- a/apps/admin/src/components/users/UserManagement.tsx +++ b/apps/admin/src/components/users/UserManagement.tsx @@ -2,7 +2,7 @@ import { useState, useEffect } from "react"; import { UserGrid } from "@/components/users/UserGrid"; -// import { Button } from "@/components/ui/Button"; +// import { Button } from "@/components/ui/button"; import { Card, CardHeader, CardContent } from "@/components/ui/card"; import { Button } from "@/components/ui/button";