-
-
Notifications
You must be signed in to change notification settings - Fork 170
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop-minor' into v5/develop
# Conflicts: # panel/package-lock.json # panel/package.json # panel/src/components/Forms/index.js # panel/src/components/Views/index.js
- Loading branch information
Showing
31 changed files
with
241 additions
and
161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?php | ||
|
||
return [ | ||
'docs' => 'k-login-form' | ||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
<template> | ||
<k-lab-examples> | ||
<k-lab-example label="Default"> | ||
<k-login /> | ||
<k-login-form /> | ||
</k-lab-example> | ||
<k-lab-example label="With password"> | ||
<k-login :methods="['password']" /> | ||
<k-login-form :methods="['password']" /> | ||
</k-lab-example> | ||
<k-lab-example label="Prefilled"> | ||
<k-login | ||
<k-login-form | ||
:methods="['password']" | ||
:value="{ | ||
email: '[email protected]', | ||
|
@@ -17,10 +17,10 @@ | |
/> | ||
</k-lab-example> | ||
<k-lab-example label="Toggle between login methods"> | ||
<k-login :methods="['password', 'code']" /> | ||
<k-login-form :methods="['password', 'code']" /> | ||
</k-lab-example> | ||
<k-lab-example label="Password reset"> | ||
<k-login :methods="['password', 'password-reset']" /> | ||
<k-login-form :methods="['password', 'password-reset']" /> | ||
</k-lab-example> | ||
</k-lab-examples> | ||
</template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?php | ||
|
||
return [ | ||
'docs' => 'k-login-code-form' | ||
]; |
6 changes: 3 additions & 3 deletions
6
...lab/components/login/login-code/index.vue → ...ponents/login/2_login-code-form/index.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
<template> | ||
<k-lab-examples> | ||
<k-lab-example label="Default"> | ||
<k-login-code /> | ||
<k-login-code-form /> | ||
</k-lab-example> | ||
<k-lab-example label="Prefilled"> | ||
<k-login-code value="123456" /> | ||
<k-login-code-form value="123456" /> | ||
</k-lab-example> | ||
<k-lab-example label="Pending info"> | ||
<k-login-code | ||
<k-login-code-form | ||
:pending="{ email: '[email protected]', challenge: 'totp' }" | ||
/> | ||
</k-lab-example> | ||
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import FileView from "./FileView.vue"; | ||
import FileFocusButton from "./FileFocusButton.vue"; | ||
import FilePreview from "./FilePreview.vue"; | ||
|
||
export default { | ||
install(app) { | ||
app.component("k-file-view", FileView); | ||
app.component("k-file-preview", FilePreview); | ||
app.component("k-file-focus-button", FileFocusButton); | ||
} | ||
}; |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
import InstallationView from "./InstallationView.vue"; | ||
|
||
export default { | ||
install(app) { | ||
app.component("k-installation-view", InstallationView); | ||
} | ||
}; |
Oops, something went wrong.