Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/backend-core/src/middleware/passport/local.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import * as users from "../../users"
import { authError } from "./utils"
import { BBContext } from "@budibase/types"

const INVALID_ERR = "Invalid credentials"
const EXPIRED = "This account has expired. Please reset your password"
const INVALID_ERR = "정상적으로 로그인할 수 없습니다."
const EXPIRED = "이 계정은 만료되었습니다. 비밀번호를 재설정하세요"

export const options = {
passReqToCallback: true,
Expand Down
4 changes: 2 additions & 2 deletions packages/bbui/src/Modal/ModalContent.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

export let title = undefined
export let size = "S"
export let cancelText = "Cancel"
export let confirmText = "Confirm"
export let cancelText = "취소"
export let confirmText = "확인"
export let showCancelButton = true
export let showConfirmButton = true
export let showCloseIcon = true
Expand Down
2 changes: 1 addition & 1 deletion packages/builder/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset='utf8'>
<meta name='viewport' content='width=device-width'>
<title>Budibase</title>
<title>ABLECLOUD - Partner Management</title>
<link rel='icon' href='/src/favicon.png'>
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@

<Layout gap="XS" noPadding>
<Input
label="Password"
label="비밀번호"
type="password"
error={$firstTouched && $passwordError}
bind:value={$firstPassword}
/>
<Input
label="Repeat Password"
label="비밀번호 확인"
type="password"
error={$repeatTouched &&
$firstPassword !== $repeatPassword &&
"Passwords must match"}
"비밀번호가 일치하지 않습니다."}
bind:value={$repeatPassword}
/>
</Layout>
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
const updatePassword = async () => {
try {
await auth.updateSelf({ password })
notifications.success("Password changed successfully")
notifications.success("비밀번호가 성공적으로 변경되었습니다.")
} catch (error) {
notifications.error("Failed to update password")
notifications.error("비밀번호를 변경하지 못했습니다.")
}
}
</script>

<ModalContent
title="Update password"
confirmText="Update password"
title="비밀번호 수정"
confirmText="비밀번호 수정"
onConfirm={updatePassword}
disabled={error || !password}
>
<Body size="S">Enter your new password below.</Body>
<Body size="S">새로운 비밀번호를 입력해주세요.</Body>
<PasswordRepeatInput bind:password bind:error />
</ModalContent>
16 changes: 7 additions & 9 deletions packages/builder/src/components/settings/ProfileModal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,17 @@
const updateInfo = async () => {
try {
await auth.updateSelf($values)
notifications.success("Information updated successfully")
notifications.success("정보가 성공적으로 변경되었습니다.")
} catch (error) {
console.error(error)
notifications.error("Failed to update information")
notifications.error("정보를 변경하지 못했습니다.")
}
}
</script>

<ModalContent title="My profile" confirmText="Save" onConfirm={updateInfo}>
<Body size="S">
Personalise the platform by adding your first name and last name.
</Body>
<Input disabled bind:value={$auth.user.email} label="Email" />
<Input bind:value={$values.firstName} label="First name" />
<Input bind:value={$values.lastName} label="Last name" />
<ModalContent title="내 프로필" confirmText="확인" onConfirm={updateInfo}>
<Body size="S">이름과 성을 입력하실수 있습니다.</Body>
<Input disabled bind:value={$auth.user.email} label="이메일" />
<Input bind:value={$values.firstName} label="이름" />
<Input bind:value={$values.lastName} label="성" />
</ModalContent>
Binary file modified packages/builder/src/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 15 additions & 14 deletions packages/builder/src/pages/builder/apps/index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -104,32 +104,32 @@
<Icon size="XL" name="ChevronDown" />
</div>
<MenuItem icon="UserEdit" on:click={() => userInfoModal.show()}>
My profile
프로필 정보
</MenuItem>
<MenuItem
icon="LockClosed"
on:click={() => changePasswordModal.show()}
>
Update password
비밀번호 변경
</MenuItem>
{#if $auth.isBuilder}
<MenuItem
icon="UserDeveloper"
on:click={() => $goto("../portal")}
>
Open developer mode
개발모드로 열기
</MenuItem>
{/if}
<MenuItem icon="LogOut" on:click={logout}>Log out</MenuItem>
<MenuItem icon="LogOut" on:click={logout}>로그 아웃</MenuItem>
</ActionMenu>
</div>
<Layout noPadding gap="XS">
<Heading size="M">
Hey {$auth.user.firstName || $auth.user.email}
{$auth.user.firstName || $auth.user.email} 님 환영합니다.
</Heading>
<Body>
Welcome to the {$organisation.company} portal. Below you'll find the
list of apps that you have access to.
{$organisation.company} 파트너 관리에 오신 것을 환영합니다. 아래에서
액세스할 수 있는 앱 목록을 찾을 수 있습니다.
</Body>
</Layout>
<Divider />
Expand All @@ -138,13 +138,13 @@
<Layout gap="S" justifyItems="center">
<img class="spaceman" alt="spaceman" src={Spaceman} />
<Heading size="M">
{"Your apps are currently offline."}
{"앱이 현재 오프라인 상태입니다."}
</Heading>
Please contact the account holder to get them back online.
다시 온라인 상태로 되돌리려면 계정 소유자에게 문의하십시오.
</Layout>
</div>
{:else if userApps.length}
<Heading>Apps</Heading>
<Heading>앱 목록</Heading>
<div class="group">
<Layout gap="S" noPadding>
{#each userApps as app, idx (app.appId)}
Expand All @@ -155,15 +155,15 @@
<Body size="S">
{#if app.updatedAt}
{processStringSync(
"Updated {{ duration time 'millisecond' }} ago",
"{{ duration time 'millisecond' }} 전 업데이트 됨",
{
time:
new Date().getTime() -
new Date(app.updatedAt).getTime(),
}
)}
{:else}
Never updated
업데이트 없음.
{/if}
</Body>
</div>
Expand All @@ -174,9 +174,10 @@
</div>
{:else}
<Layout gap="XS" noPadding>
<Heading size="S">You don't have access to any apps yet.</Heading>
<Heading size="S">현재 접근할 수 있는 앱 목록이 없습니다.</Heading
>
<Body size="S">
The apps you have access to will be listed here.
접근 권한이 있는 앱 목록이 아래에 나열됩니다.
</Body>
</Layout>
{/if}
Expand Down
15 changes: 7 additions & 8 deletions packages/builder/src/pages/builder/auth/forgot.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
submitted = true
try {
await auth.forgotPassword(email)
notifications.success("Email sent - please check your inbox")
notifications.success("이메일을 보냈습니다 - 받은 편지함을 확인하십시오")
} catch (err) {
submitted = false
notifications.error("Unable to send reset password link")
notifications.error("비밀번호 재설정 링크를 보낼 수 없습니다.")
}
}

Expand All @@ -52,28 +52,27 @@
<span class="back-chev" on:click={() => $goto("../")}>
<Icon name="ChevronLeft" size="XL" />
</span>
Forgot your password?
비밀번호를 잊으셨습니까?
</div>
</Heading>
</span>
<Layout gap="XS" noPadding>
<Body size="M">
No problem! Just enter your account's email address and we'll send you a
link to reset it.
계정의 이메일 주소를 입력하면 재설정 링크를 보내드립니다.
</Body>
</Layout>

<Layout gap="S" noPadding>
<FancyForm bind:this={form}>
<FancyInput
label="Email"
label="이메일을 입력해주세요."
value={email}
on:change={e => {
email = e.detail
}}
validate={() => {
if (!email) {
return "Please enter your email"
return "이메일을 입력해주세요."
}
return null
}}
Expand All @@ -89,7 +88,7 @@
cta
on:click={forgot}
>
Reset password
비밀번호 재설정
</Button>
</div>
</Layout>
Expand Down
20 changes: 10 additions & 10 deletions packages/builder/src/pages/builder/auth/login.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
if ($auth?.user?.forceResetPassword) {
$goto("./reset")
} else {
notifications.success("Logged in successfully")
notifications.success("성공적으로 로그인했습니다.")
$goto("../portal")
}
} catch (err) {
notifications.error(err.message ? err.message : "Invalid credentials")
notifications.error(err.message ? err.message : "정상적으로 로그인할 수 없습니다.")
}
}

Expand All @@ -71,20 +71,20 @@
{#if loaded}
<img alt="logo" src={$organisation.logoUrl || Logo} />
{/if}
<Heading size="M">Log in to Budibase</Heading>
<Heading size="M">ABLECLOUD 파트너 관리</Heading>
</Layout>
<Layout gap="S" noPadding>
{#if loaded && ($organisation.google || $organisation.oidc)}
<FancyForm>
<OIDCButton oidcIcon={$oidc.logo} oidcName={$oidc.name} />
<GoogleButton />
<!-- <GoogleButton /> -->
</FancyForm>
{/if}
{#if !$organisation.isSSOEnforced}
<Divider />
<FancyForm bind:this={form}>
<FancyInput
label="Your work email"
label="이메일을 입력해주세요."
value={formData.username}
on:change={e => {
formData = {
Expand All @@ -95,15 +95,15 @@
validate={() => {
let fieldError = {
username: !formData.username
? "Please enter a valid email"
? "유효한 이메일을 입력해주세요."
: undefined,
}
errors = handleError({ ...errors, ...fieldError })
}}
error={errors.username}
/>
<FancyInput
label="Password"
label="비밀번호를 입력해주세요."
value={formData.password}
type="password"
on:change={e => {
Expand All @@ -115,7 +115,7 @@
validate={() => {
let fieldError = {
password: !formData.password
? "Please enter your password"
? "올바른 비밀번호를 입력해주세요."
: undefined,
}
errors = handleError({ ...errors, ...fieldError })
Expand All @@ -133,13 +133,13 @@
disabled={Object.keys(errors).length > 0}
on:click={login}
>
Log in to {company}
로그인
</Button>
</Layout>
<Layout gap="XS" noPadding justifyItems="center">
<div class="user-actions">
<ActionButton size="L" quiet on:click={() => $goto("./forgot")}>
Forgot password?
비밀번호를 잊으셨습니까?
</ActionButton>
</div>
</Layout>
Expand Down
Loading