diff --git a/front/packages/primitives/src/input.tsx b/front/packages/primitives/src/input.tsx index 7daa6cbd..a0d8cae2 100644 --- a/front/packages/primitives/src/input.tsx +++ b/front/packages/primitives/src/input.tsx @@ -20,7 +20,7 @@ import { forwardRef, ReactNode } from "react"; import { Platform, TextInput, TextInputProps, View } from "react-native"; -import { px, useYoshiki } from "yoshiki/native"; +import { px, Theme, useYoshiki } from "yoshiki/native"; import { ts } from "./utils"; const focusReset: object = Platform.OS === "web" ? { focus: { self: { boxShadow: "none" } } } : {}; @@ -29,7 +29,6 @@ export const Input = forwardRef< TextInput, { variant?: "small" | "big"; - style; right?: ReactNode; } & TextInputProps >(function _Input({ style, placeholderTextColor, variant = "small", right, ...props }, ref) { @@ -45,6 +44,8 @@ export const Input = forwardRef< borderWidth: px(1), padding: ts(0.5), flexDirection: "row", + alignContent: "center", + alignItems: "center" }, variant === "big" && { borderRadius: ts(4), @@ -57,7 +58,7 @@ export const Input = forwardRef< theme.paragraph, ...focusReset }, props)} + {...css({ flexGrow: 1, color: (theme: Theme) => theme.paragraph, ...focusReset }, props)} /> {right} diff --git a/front/packages/ui/src/login/index.tsx b/front/packages/ui/src/login/index.tsx index af339421..63df2f1d 100644 --- a/front/packages/ui/src/login/index.tsx +++ b/front/packages/ui/src/login/index.tsx @@ -24,15 +24,30 @@ import { ComponentProps, useState } from "react"; import { useTranslation } from "react-i18next"; import { ImageBackground, ImageProps, Platform, View } from "react-native"; import { Trans } from "react-i18next"; -import { max, min, percent, px, useYoshiki, vh, vw } from "yoshiki/native"; +import { min, percent, px, useYoshiki, vh, vw } from "yoshiki/native"; import Visibility from "@material-symbols/svg-400/rounded/visibility-fill.svg"; import VisibilityOff from "@material-symbols/svg-400/rounded/visibility_off-fill.svg"; import { DefaultLayout } from "../layout"; +import Svg, { SvgProps, Path } from "react-native-svg"; + +const SvgBlob = (props: SvgProps) => { + const { css, theme } = useYoshiki(); + + return ( + + + + + + ); +}; const PasswordInput = (props: ComponentProps) => { const { css } = useYoshiki(); const [show, setVisibility] = useState(false); - console.log(show); return ( { const { css } = useYoshiki(); // TODO: Replace the hardcoded 1 to a random show/movie thumbnail. + // TODO: Use a dynamic path for RN const src = `/api/shows/1/thumbnail`; const nativeProps = Platform.select({ web: { @@ -63,8 +79,6 @@ export const LoginPage: QueryPage = () => { default: {}, }); - // TODO: Replace the borderRadius 99999 with an svg shape - return ( { > theme.background, - paddingHorizontal: ts(1), - borderRadius: 99999999999999999999999999999, - justifyContent: "flex-end", - alignItems: "flex-end", + width: min(vh(90), px(1200)), + height: min(vh(90), px(1200)), })} > - - + +

{t("login.login")}

+

{t("login.email")}

+ +

{t("login.password")}

+ +