awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-15 06:35:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflict issues and updated use of translations

Browse Source
This commit is contained in:
Sheen Capadngan
2023-05-10 21:39:11 +08:00
parent 32cef27e8e
commit 7ee33e9393
8 changed files with 39207 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/login.tsx
+1 -1
View File
@@ -109,8 +109,8 @@ export default function Login() {
<div className="flex justify-center mb-4 mt-20">
<Image src="/images/gradientLogo.svg" height={90} width={120} alt="Infisical logo" />
</div>
{renderView(step)}
</Link>
{renderView(step)}
<div className="absolute right-4 top-0 mt-4 flex items-center justify-center">
<div className="mx-auto w-48">
<ListBox
frontend/src/pages/signup.tsx
+7 -7
View File
@@ -29,7 +29,7 @@ export default function SignUp() {
const [attributionSource, setAttributionSource] = useState('');
const [code, setCode] = useState('123456');
const [codeError, setCodeError] = useState(false);
const [step, setStep] = useState(5);
const [step, setStep] = useState(1);
const router = useRouter();
const { data: serverDetails } = useFetchServerStatus();
const [isSignupWithEmail, setIsSignupWithEmail] = useState(false);
@@ -146,9 +146,9 @@ export default function SignUp() {
)
}
// if (serverDetails?.emailConfigured) {
return <TeamInviteStep />
// }
if (serverDetails?.emailConfigured) {
return <TeamInviteStep />
}
return ""
}
@@ -156,11 +156,11 @@ export default function SignUp() {
return (
<div className="bg-gradient-to-tr from-bunker-600 to-bunker-800 min-h-screen flex flex-col justify-center pb-28 px-6 ">
<Head>
<title>{t('common:head-title', { title: t('signup:title') })}</title>
<title>{t('common.head-title', { title: t('signup.title') })}</title>
<link rel="icon" href="/infisical.ico" />
<meta property="og:image" content="/images/message.png" />
<meta property="og:title" content={t('signup:og-title') as string} />
<meta name="og:description" content={t('signup:og-description') as string} />
<meta property="og:title" content={t('signup.og-title') as string} />
<meta name="og:description" content={t('signup.og-description') as string} />
</Head>
<div className="flex justify-center mb-8 mt-20">
<Image src="/images/gradientLogo.svg" height={90} width={120} alt="Infisical Logo" />