Merge branch 'main' of https://github.com/VAR-Virtual-Air-Rescue/var-monorepo
This commit is contained in:
@@ -28,6 +28,11 @@
|
|||||||
scrollbar-gutter: unset;
|
scrollbar-gutter: unset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.leaflet-container:focus {
|
||||||
|
outline: none !important;
|
||||||
|
box-shadow: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
.leaflet-popup-tip-container {
|
.leaflet-popup-tip-container {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,53 +62,59 @@ export const Login = () => {
|
|||||||
Registrierung
|
Registrierung
|
||||||
</Link>
|
</Link>
|
||||||
</span>
|
</span>
|
||||||
<label className="input input-bordered flex items-center gap-2 w-full">
|
<div className="alert alert-info alert-outline text-sm font-semibold text-center">
|
||||||
<svg
|
Du warst bereits Nutzer der V1? <br />
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
Registriere dich mit der gleichen E-Mail, um deinen Account zu übernehmen!
|
||||||
viewBox="0 0 16 16"
|
</div>
|
||||||
fill="currentColor"
|
<div className="mt-5 mb-2">
|
||||||
className="h-4 w-4 opacity-70"
|
<label className="input input-bordered flex items-center gap-2 w-full">
|
||||||
>
|
<svg
|
||||||
<path d="M2.5 3A1.5 1.5 0 0 0 1 4.5v.793c.026.009.051.02.076.032L7.674 8.51c.206.1.446.1.652 0l6.598-3.185A.755.755 0 0 1 15 5.293V4.5A1.5 1.5 0 0 0 13.5 3h-11Z" />
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
<path d="M15 6.954 8.978 9.86a2.25 2.25 0 0 1-1.956 0L1 6.954V11.5A1.5 1.5 0 0 0 2.5 13h11a1.5 1.5 0 0 0 1.5-1.5V6.954Z" />
|
viewBox="0 0 16 16"
|
||||||
</svg>
|
fill="currentColor"
|
||||||
<input type="text" className="grow" {...form.register("email")} placeholder="Email" />
|
className="h-4 w-4 opacity-70"
|
||||||
</label>
|
>
|
||||||
<p className="text-error">
|
<path d="M2.5 3A1.5 1.5 0 0 0 1 4.5v.793c.026.009.051.02.076.032L7.674 8.51c.206.1.446.1.652 0l6.598-3.185A.755.755 0 0 1 15 5.293V4.5A1.5 1.5 0 0 0 13.5 3h-11Z" />
|
||||||
{typeof form.formState.errors.email?.message === "string"
|
<path d="M15 6.954 8.978 9.86a2.25 2.25 0 0 1-1.956 0L1 6.954V11.5A1.5 1.5 0 0 0 2.5 13h11a1.5 1.5 0 0 0 1.5-1.5V6.954Z" />
|
||||||
? form.formState.errors.email.message
|
</svg>
|
||||||
: ""}
|
<input type="text" className="grow" {...form.register("email")} placeholder="Email" />
|
||||||
</p>
|
</label>
|
||||||
<label className="input input-bordered flex items-center gap-2 mt-2 w-full">
|
<p className="text-error">
|
||||||
<svg
|
{typeof form.formState.errors.email?.message === "string"
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
? form.formState.errors.email.message
|
||||||
viewBox="0 0 16 16"
|
: ""}
|
||||||
fill="currentColor"
|
</p>
|
||||||
className="h-4 w-4 opacity-70"
|
<label className="input input-bordered flex items-center gap-2 mt-2 w-full">
|
||||||
>
|
<svg
|
||||||
<path
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
fillRule="evenodd"
|
viewBox="0 0 16 16"
|
||||||
d="M14 6a4 4 0 0 1-4.899 3.899l-1.955 1.955a.5.5 0 0 1-.353.146H5v1.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2.293a.5.5 0 0 1 .146-.353l3.955-3.955A4 4 0 1 1 14 6Zm-4-2a.75.75 0 0 0 0 1.5.5.5 0 0 1 .5.5.75.75 0 0 0 1.5 0 2 2 0 0 0-2-2Z"
|
fill="currentColor"
|
||||||
clipRule="evenodd"
|
className="h-4 w-4 opacity-70"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
fillRule="evenodd"
|
||||||
|
d="M14 6a4 4 0 0 1-4.899 3.899l-1.955 1.955a.5.5 0 0 1-.353.146H5v1.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2.293a.5.5 0 0 1 .146-.353l3.955-3.955A4 4 0 1 1 14 6Zm-4-2a.75.75 0 0 0 0 1.5.5.5 0 0 1 .5.5.75.75 0 0 0 1.5 0 2 2 0 0 0-2-2Z"
|
||||||
|
clipRule="evenodd"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
<input
|
||||||
|
autoComplete="current-password"
|
||||||
|
type="password"
|
||||||
|
{...form.register("password")}
|
||||||
|
placeholder="Passwort"
|
||||||
|
className="grow"
|
||||||
/>
|
/>
|
||||||
</svg>
|
</label>
|
||||||
<input
|
<span className="text-sm font-medium flex justify-end">
|
||||||
autoComplete="current-password"
|
<Link href="/passwort-reset" className="link link-accent link-hover ">
|
||||||
type="password"
|
Passwort vergessen?
|
||||||
{...form.register("password")}
|
</Link>
|
||||||
placeholder="Passwort"
|
</span>
|
||||||
className="grow"
|
<div className="card-actions mt-6">
|
||||||
/>
|
<Button disabled={isLoading} isLoading={isLoading} className="btn btn-primary btn-block">
|
||||||
</label>
|
Login
|
||||||
<span className="text-sm font-medium flex justify-end">
|
</Button>
|
||||||
<Link href="/passwort-reset" className="link link-accent link-hover ">
|
</div>
|
||||||
Passwort vergessen?
|
|
||||||
</Link>
|
|
||||||
</span>
|
|
||||||
<div className="card-actions mt-6">
|
|
||||||
<Button disabled={isLoading} isLoading={isLoading} className="btn btn-primary btn-block">
|
|
||||||
Login
|
|
||||||
</Button>
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
import { Login } from './_components/Login';
|
import { Login } from "./_components/Login";
|
||||||
|
|
||||||
export default async () => {
|
const LoginPage = async () => {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Login />
|
<Login />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export default LoginPage;
|
||||||
|
|||||||
@@ -94,6 +94,10 @@ export const Register = () => {
|
|||||||
Login
|
Login
|
||||||
</Link>
|
</Link>
|
||||||
</span>
|
</span>
|
||||||
|
<div className="alert alert-info alert-outline text-sm font-semibold text-center">
|
||||||
|
Du warst bereits Nutzer der V1? <br />
|
||||||
|
Registriere dich mit der gleichen E-Mail, um deinen Account zu übernehmen!
|
||||||
|
</div>
|
||||||
<div className="mt-5 mb-2">
|
<div className="mt-5 mb-2">
|
||||||
<label className="input input-bordered flex items-center gap-2 mt-2 w-full">
|
<label className="input input-bordered flex items-center gap-2 mt-2 w-full">
|
||||||
<svg
|
<svg
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
import { Register } from './_components/Register';
|
import { Register } from "./_components/Register";
|
||||||
|
|
||||||
export default () => {
|
const RegisterPage = () => {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Register />
|
<Register />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export default RegisterPage;
|
||||||
|
|||||||
Reference in New Issue
Block a user