diff --git a/core/app/(user)/UserStyles.module.css b/core/app/(user)/UserStyles.module.css new file mode 100644 index 0000000000..f5254b4617 --- /dev/null +++ b/core/app/(user)/UserStyles.module.css @@ -0,0 +1,4 @@ +.logo { + width: 25px; + height: 25px; +} diff --git a/core/app/confirm/page.tsx b/core/app/(user)/confirm/page.tsx similarity index 100% rename from core/app/confirm/page.tsx rename to core/app/(user)/confirm/page.tsx diff --git a/core/app/forgot/ForgotForm.tsx b/core/app/(user)/forgot/ForgotForm.tsx similarity index 87% rename from core/app/forgot/ForgotForm.tsx rename to core/app/(user)/forgot/ForgotForm.tsx index 311bb5e370..d2d7554dc8 100644 --- a/core/app/forgot/ForgotForm.tsx +++ b/core/app/(user)/forgot/ForgotForm.tsx @@ -26,15 +26,19 @@ export default function ForgotForm() { }; return ( - <> +
{!success && ( <>

Enter your email below to receive a secure link for reseting yor password.

-
-
+
+ setEmail(evt.target.value)} placeholder="example@mail.com" @@ -54,6 +58,6 @@ export default function ForgotForm() { Password reset email sent! Please check your inbox.
)} - +
); } diff --git a/core/app/forgot/page.tsx b/core/app/(user)/forgot/page.tsx similarity index 100% rename from core/app/forgot/page.tsx rename to core/app/(user)/forgot/page.tsx diff --git a/core/app/(user)/layout.tsx b/core/app/(user)/layout.tsx new file mode 100644 index 0000000000..fa3d781c36 --- /dev/null +++ b/core/app/(user)/layout.tsx @@ -0,0 +1,10 @@ +export default async function UserLayout({ children }: { children: React.ReactNode }) { + return ( +
+
+ +
+
{children}
+
+ ); +} diff --git a/core/app/login/LoginForm.tsx b/core/app/(user)/login/LoginForm.tsx similarity index 57% rename from core/app/login/LoginForm.tsx rename to core/app/(user)/login/LoginForm.tsx index 45a552c4a6..5f3a95fa9f 100644 --- a/core/app/login/LoginForm.tsx +++ b/core/app/(user)/login/LoginForm.tsx @@ -27,26 +27,43 @@ export default function LoginForm() { }; return ( - <> -

Login

+
+

Login

- - setEmail(evt.target.value)} - /> - - setPassword(evt.target.value)} - /> +
+ +
+
+ setEmail(evt.target.value)} + /> +
+
+ +
+
+ setPassword(evt.target.value)} + /> +
-
- @@ -58,6 +75,6 @@ export default function LoginForm() { )}
- +
); } diff --git a/core/app/login/page.tsx b/core/app/(user)/login/page.tsx similarity index 100% rename from core/app/login/page.tsx rename to core/app/(user)/login/page.tsx diff --git a/core/app/reset/ResetForm.tsx b/core/app/(user)/reset/ResetForm.tsx similarity index 100% rename from core/app/reset/ResetForm.tsx rename to core/app/(user)/reset/ResetForm.tsx diff --git a/core/app/reset/page.tsx b/core/app/(user)/reset/page.tsx similarity index 100% rename from core/app/reset/page.tsx rename to core/app/(user)/reset/page.tsx diff --git a/core/app/settings/SettingsForm.tsx b/core/app/(user)/settings/SettingsForm.tsx similarity index 100% rename from core/app/settings/SettingsForm.tsx rename to core/app/(user)/settings/SettingsForm.tsx diff --git a/core/app/settings/page.tsx b/core/app/(user)/settings/page.tsx similarity index 100% rename from core/app/settings/page.tsx rename to core/app/(user)/settings/page.tsx diff --git a/core/app/signup/SignupForm.tsx b/core/app/(user)/signup/SignupForm.tsx similarity index 52% rename from core/app/signup/SignupForm.tsx rename to core/app/(user)/signup/SignupForm.tsx index a72930ed3d..87d5b3b4a4 100644 --- a/core/app/signup/SignupForm.tsx +++ b/core/app/(user)/signup/SignupForm.tsx @@ -35,39 +35,58 @@ export default function SignupForm() { }; return ( - <> +
{!signupComplete && ( <> -

Signup

+

Signup

- - setName(evt.target.value)} - /> - - setEmail(evt.target.value)} - /> - - setPassword(evt.target.value)} - /> - +
+ +
+
+ setName(evt.target.value)} + /> +
+
+ +
+
+ setEmail(evt.target.value)} + /> +
+
+ +
+
+ setPassword(evt.target.value)} + /> +
+
+ +
@@ -81,6 +100,6 @@ export default function SignupForm() {
)} - +
); } diff --git a/core/app/signup/page.tsx b/core/app/(user)/signup/page.tsx similarity index 100% rename from core/app/signup/page.tsx rename to core/app/(user)/signup/page.tsx diff --git a/core/package.json b/core/package.json index 15c68a0267..914a714c04 100644 --- a/core/package.json +++ b/core/package.json @@ -42,6 +42,7 @@ "zod": "^3.21.4" }, "devDependencies": { + "@tailwindcss/forms": "^0.5.6", "@types/diacritics": "^1.3.1", "@types/jsonwebtoken": "^9.0.2", "@types/node": "20.3.1", diff --git a/core/public/logos/icon.svg b/core/public/logos/icon.svg new file mode 100644 index 0000000000..8a259b949d --- /dev/null +++ b/core/public/logos/icon.svg @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/core/tailwind.config.js b/core/tailwind.config.js index 76b14050fd..f97fea77ab 100644 --- a/core/tailwind.config.js +++ b/core/tailwind.config.js @@ -4,6 +4,7 @@ const sharedConfig = require("ui/tailwind.config.js"); module.exports = { presets: [sharedConfig], + plugins: [require("@tailwindcss/forms")], content: [ "./app/**/*.{ts,tsx}", // "../packages/ui/**/*.{js,ts,jsx,tsx}" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d65c70dbc4..8cf6103fa2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -96,6 +96,9 @@ importers: specifier: ^3.21.4 version: 3.21.4 devDependencies: + '@tailwindcss/forms': + specifier: ^0.5.6 + version: 0.5.6(tailwindcss@3.3.3) '@types/diacritics': specifier: ^1.3.1 version: 1.3.1 @@ -1968,6 +1971,15 @@ packages: tslib: 2.6.1 dev: false + /@tailwindcss/forms@0.5.6(tailwindcss@3.3.3): + resolution: {integrity: sha512-Fw+2BJ0tmAwK/w01tEFL5TiaJBX1NLT1/YbWgvm7ws3Qcn11kiXxzNTEQDMs5V3mQemhB56l3u0i9dwdzSQldA==} + peerDependencies: + tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1' + dependencies: + mini-svg-data-uri: 1.4.4 + tailwindcss: 3.3.3(ts-node@10.9.1) + dev: true + /@ts-rest/core@3.28.0(zod@3.21.4): resolution: {integrity: sha512-m0Wn2DgO3O57dsGT5fqxvF/WNFPx/8/dxbqLMV9TYXwLBgaJG4vDgR7qXVIYss/c5vlHTQ0oB9X+PwxhI3ksMg==} peerDependencies: @@ -4126,6 +4138,11 @@ packages: engines: {node: '>=4'} dev: true + /mini-svg-data-uri@1.4.4: + resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==} + hasBin: true + dev: true + /minim@0.23.8: resolution: {integrity: sha512-bjdr2xW1dBCMsMGGsUeqM4eFI60m94+szhxWys+B1ztIt6gWSfeGBdSVCIawezeHYLYn0j6zrsXdQS/JllBzww==} engines: {node: '>=6'}