gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
Conversation 0 Commits 429 Files Changed 142 +16 -9
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8a43494785 - Show all commits

9
apps/frontend/src/routes/forgot-password/index.lazy.tsx
View File

@ -18,6 +18,7 @@ import { Input } from "@/shadcn/components/ui/input.tsx";
import client from "@/honoClient"; import client from "@/honoClient";
import { useState } from "react"; import { useState } from "react";
import { DropdownMenu, DropdownMenuContent, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuTrigger } from "@/shadcn/components/ui/dropdown-menu"; import { DropdownMenu, DropdownMenuContent, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuTrigger } from "@/shadcn/components/ui/dropdown-menu";
import amatilogo from "@/assets/logos/amati-logo.png";
// Define validation schema using zod // Define validation schema using zod
const formSchema = z.object({ const formSchema = z.object({
@ -172,7 +173,9 @@ export function ForgotPasswordForm() {
<div className="relative flex flex-col min-h-screen p-7 bg-transparent justify-between z-10"> <div className="relative flex flex-col min-h-screen p-7 bg-transparent justify-between z-10">
{/* Top */} {/* Top */}
<div className="flex items-center font-bold">Amati</div> <div className="flex">
<img src={amatilogo} alt="Amati Logo" className="h-4 object-contain" />
</div>
{/* Center */} {/* Center */}
<div className="flex flex-col h-full w-full xl:ml-32 2xl:ml-72 bg-transparent justify-center lg:px-28"> <div className="flex flex-col h-full w-full xl:ml-32 2xl:ml-72 bg-transparent justify-center lg:px-28">
@ -221,13 +224,13 @@ export function ForgotPasswordForm() {
</div> </div>
{/* Bottom */} {/* Bottom */}
<div className="flex items-center justify-center lg:justify-start w-56 h-8 mx-auto lg:mx-0 bg-muted rounded-md"> {/* <div className="flex items-center justify-center lg:justify-start w-56 h-8 mx-auto lg:mx-0 bg-muted rounded-md">
<CustomDropdownMenu <CustomDropdownMenu
onSelect={handleSelect} onSelect={handleSelect}
defaultOption="English (United States)" defaultOption="English (United States)"
listOption={["English (United States)", "Indonesia"]} listOption={["English (United States)", "Indonesia"]}
/> />
</div> </div> */}
</div> </div>
</div> </div>
); );

9
apps/frontend/src/routes/forgot-password/verify.lazy.tsx
View File

@ -16,6 +16,7 @@ import { useEffect, useState } from "react";
import { DropdownMenu, DropdownMenuContent, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuTrigger } from "@/shadcn/components/ui/dropdown-menu"; import { DropdownMenu, DropdownMenuContent, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuTrigger } from "@/shadcn/components/ui/dropdown-menu";
import { HiOutlineGlobeAlt } from "react-icons/hi"; import { HiOutlineGlobeAlt } from "react-icons/hi";
import { IoIosArrowUp } from "react-icons/io"; import { IoIosArrowUp } from "react-icons/io";
import amatilogo from "@/assets/logos/amati-logo.png";
/// Define validation schema using zod /// Define validation schema using zod
const formSchema = z const formSchema = z
@ -208,7 +209,9 @@ export function ResetPasswordForm() {
<div className="relative flex flex-col min-h-screen p-7 bg-transparent justify-between z-10"> <div className="relative flex flex-col min-h-screen p-7 bg-transparent justify-between z-10">
{/* Top */} {/* Top */}
<div className="flex items-center font-bold">Amati</div> <div className="flex">
<img src={amatilogo} alt="Amati Logo" className="h-4 object-contain" />
</div>
{/* Center */} {/* Center */}
<div className="flex flex-col h-full w-full xl:ml-32 2xl:ml-72 bg-transparent justify-center lg:px-28"> <div className="flex flex-col h-full w-full xl:ml-32 2xl:ml-72 bg-transparent justify-center lg:px-28">
@ -262,13 +265,13 @@ export function ResetPasswordForm() {
</Form> </Form>
</div> </div>
<div className="flex items-center justify-center lg:justify-start w-56 h-8 mx-auto lg:mx-0 bg-muted rounded-md"> {/* <div className="flex items-center justify-center lg:justify-start w-56 h-8 mx-auto lg:mx-0 bg-muted rounded-md">
<CustomDropdownMenu <CustomDropdownMenu
onSelect={handleSelect} onSelect={handleSelect}
defaultOption="English (United States)" defaultOption="English (United States)"
listOption={["English (United States)", "Indonesia"]} listOption={["English (United States)", "Indonesia"]}
/> />
</div> </div> */}
</div> </div>
</div> </div>
); );

4
apps/frontend/src/routes/login/index.lazy.tsx
View File

@ -19,7 +19,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import useAuth from "@/hooks/useAuth"; import useAuth from "@/hooks/useAuth";
import { TbArrowNarrowRight } from "react-icons/tb"; import { TbArrowNarrowRight } from "react-icons/tb";
import logo from "@/assets/logos/amati-logo.png"; import amatilogo from "@/assets/logos/amati-logo.png";
export const Route = createLazyFileRoute("/login/")({ export const Route = createLazyFileRoute("/login/")({
component: LoginPage, component: LoginPage,
@ -102,7 +102,7 @@ export default function LoginPage() {
{/* Navbar */} {/* Navbar */}
<nav className="flex w-full bg-transparent px-8 py-7 justify-between"> <nav className="flex w-full bg-transparent px-8 py-7 justify-between">
<div className="flex"> <div className="flex">
<img src="../src/assets/logos/amati-logo.png" alt="Amati Logo" className="h-4 object-contain" /> <img src={amatilogo} alt="Amati Logo" className="h-4 object-contain" />
</div> </div>
</nav> </nav>

3
apps/frontend/src/routes/register/index.lazy.tsx
View File

@ -10,6 +10,7 @@ import { Checkbox } from "@/shadcn/components/ui/checkbox";
import { Form, FormField, FormControl, FormLabel, FormMessage, FormItem } from '@/shadcn/components/ui/form.tsx'; import { Form, FormField, FormControl, FormLabel, FormMessage, FormItem } from '@/shadcn/components/ui/form.tsx';
import { TbArrowNarrowRight } from 'react-icons/tb'; import { TbArrowNarrowRight } from 'react-icons/tb';
import client from "../../honoClient"; import client from "../../honoClient";
import amatilogo from "@/assets/logos/amati-logo.png";
// Define the schema for validation // Define the schema for validation
const formSchema = z.object({ const formSchema = z.object({
@ -100,7 +101,7 @@ export default function RegisterPage() {
{/* Logo */} {/* Logo */}
<div className="absolute top-7 left-6"> <div className="absolute top-7 left-6">
<img src="../src/assets/logos/amati-logo.png" alt="Amati Logo" className="h-4 w-full object-contain" /> <img src={amatilogo} alt="Amati Logo" className="h-4 w-full object-contain" />
</div> </div>
{/* Main content */} {/* Main content */}