MythEclipse/imphnen-frontend-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
boboiazumi
2025-05-26 16:28:46 +07:00
parent 182ff7facc
commit 1a9b47953a
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dimentorin/src/app/auth/login/page.tsx
-7
View File
@@ -1,27 +1,20 @@
import { FC, ReactElement } from 'react'; import { FC, ReactElement } from 'react';
import { ControlledInputField, LoginBanner } from '@imphnen-frontend-service/ui/organisms'; import { ControlledInputField, LoginBanner } from '@imphnen-frontend-service/ui/organisms';
import { ControlledInputField, LoginBanner } from '@imphnen-frontend-service/ui/organisms';
import { Button } from '@imphnen-frontend-service/ui/atoms'; import { Button } from '@imphnen-frontend-service/ui/atoms';
import { useLogin } from '../../_hooks/use-login'; import { useLogin } from '../../_hooks/use-login';
import { ArrowLeftOutlined } from '@ant-design/icons'; import { ArrowLeftOutlined } from '@ant-design/icons';
import { useLogin } from '../../_hooks/use-login';
import { ArrowLeftOutlined } from '@ant-design/icons';
export const Components: FC = (): ReactElement => { export const Components: FC = (): ReactElement => {
const { form, onSubmit } = useLogin(); const { form, onSubmit } = useLogin();
return ( return (
<div className="flex flex-col justify-center items-center min-h-screen py-[60px] px-[80px]"> <div className="flex flex-col justify-center items-center min-h-screen py-[60px] px-[80px]">
<div className="bg-white xl:min-w-[1120px] xl:min-h-[712px] p-10 rounded-2xl shadow-md flex gap-6">
<div className="bg-white xl:min-w-[1120px] xl:min-h-[712px] p-10 rounded-2xl shadow-md flex gap-6"> <div className="bg-white xl:min-w-[1120px] xl:min-h-[712px] p-10 rounded-2xl shadow-md flex gap-6">
<LoginBanner /> <LoginBanner />
<div className="xl:border-2 xl:border-primary-500/50 md:w-[596px] rounded-lg md:py-[70px] md:px-[96px] flex justify-center">
<div className="md:w-[404px]">
<div className="xl:border-2 xl:border-primary-500/50 md:w-[596px] rounded-lg md:py-[70px] md:px-[96px] flex justify-center"> <div className="xl:border-2 xl:border-primary-500/50 md:w-[596px] rounded-lg md:py-[70px] md:px-[96px] flex justify-center">
<div className="md:w-[404px]"> <div className="md:w-[404px]">
<h2 className="text-4xl font-semibold text-primary-500 text-center mb-2"> <h2 className="text-4xl font-semibold text-primary-500 text-center mb-2">
Hallo Minna-san Hallo Minna-san
</h2> </h2>
<h5 className="text-xl font-medium text-primary-500 text-center mb-5">
<h5 className="text-xl font-medium text-primary-500 text-center mb-5"> <h5 className="text-xl font-medium text-primary-500 text-center mb-5">
Welcome to Dimentorin by IMPHNEN Welcome to Dimentorin by IMPHNEN
</h5> </h5>
apps/dimentorin/src/middleware.ts
+1
View File
@@ -9,6 +9,7 @@ const mappingPublicRoutes = [
'/', '/',
'/auth/login', '/auth/login',
'/auth/forgot', '/auth/forgot',
'/auth/register',
'/auth/new-password', '/auth/new-password',
]; ];
package-lock.json
Generated
+4 -4
View File
@@ -32,7 +32,7 @@
"payload": "^3.37.0", "payload": "^3.37.0",
"react": "^19.1.0", "react": "^19.1.0",
"react-dom": "^19.1.0", "react-dom": "^19.1.0",
"react-hook-form": "^7.55.0", "react-hook-form": "^7.56.4",
"react-icons": "^5.5.0", "react-icons": "^5.5.0",
"react-router-dom": "^7.3.0", "react-router-dom": "^7.3.0",
"sharp": "^0.34.1", "sharp": "^0.34.1",
@@ -33414,9 +33414,9 @@
} }
}, },
"node_modules/react-hook-form": { "node_modules/react-hook-form": {
"version": "7.56.1", "version": "7.56.4",
"resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.56.1.tgz", "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.56.4.tgz",
"integrity": "sha512-qWAVokhSpshhcEuQDSANHx3jiAEFzu2HAaaQIzi/r9FNPm1ioAvuJSD4EuZzWd7Al7nTRKcKPnBKO7sRn+zavQ==", "integrity": "sha512-Rob7Ftz2vyZ/ZGsQZPaRdIefkgOSrQSPXfqBdvOPwJfoGnjwRJUs7EM7Kc1mcoDv3NOtqBzPGbcMB8CGn9CKgw==",
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=18.0.0" "node": ">=18.0.0"
package.json
+1 -1
View File
@@ -49,7 +49,7 @@
"payload": "^3.37.0", "payload": "^3.37.0",
"react": "^19.1.0", "react": "^19.1.0",
"react-dom": "^19.1.0", "react-dom": "^19.1.0",
"react-hook-form": "^7.55.0", "react-hook-form": "^7.56.4",
"react-icons": "^5.5.0", "react-icons": "^5.5.0",
"react-router-dom": "^7.3.0", "react-router-dom": "^7.3.0",
"sharp": "^0.34.1", "sharp": "^0.34.1",