Skip to content

Commit

Permalink
Merge branch 'develop-minor' into v5/develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	panel/package-lock.json
#	panel/package.json
#	panel/src/components/Forms/index.js
#	panel/src/components/Views/index.js
  • Loading branch information
distantnative committed Jun 1, 2024
2 parents 6355252 + 85bc2dc commit ab16b33
Show file tree
Hide file tree
Showing 31 changed files with 241 additions and 161 deletions.
5 changes: 5 additions & 0 deletions panel/lab/components/login/1_login-form/index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

return [
'docs' => 'k-login-form'
];
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]',
Expand All @@ -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>
5 changes: 5 additions & 0 deletions panel/lab/components/login/2_login-code-form/index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

return [
'docs' => 'k-login-code-form'
];
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>
Expand Down
5 changes: 0 additions & 5 deletions panel/lab/components/login/login-code/index.php

This file was deleted.

5 changes: 0 additions & 5 deletions panel/lab/components/login/login/index.php

This file was deleted.

129 changes: 69 additions & 60 deletions panel/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions panel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@
"prosemirror-keymap": "^1.2.2",
"prosemirror-model": "^1.21.0",
"prosemirror-schema-list": "^1.3.0",
"prosemirror-view": "^1.33.6",
"prosemirror-view": "^1.33.7",
"sortablejs": "^1.15.2",
"vue": "^2.7.16",
"vuex": "^3.6.2"
},
"devDependencies": {
"@vitejs/plugin-vue2": "^2.3.1",
"eslint": "^9.3.0",
"eslint": "^9.4.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-vue": "^9.26.0",
"glob": "^10.4.1",
"jsdom": "^24.0.0",
"jsdom": "^24.1.0",
"prettier": "^3.2.5",
"rollup-plugin-external-globals": "^0.10.0",
"terser": "^5.31.0",
"vite": "^5.2.11",
"vite": "^5.2.12",
"vite-plugin-static-copy": "^1.0.5",
"vitest": "^1.6.0",
"vue-docgen-api": "^4.78.0",
Expand Down
9 changes: 0 additions & 9 deletions panel/src/components/Forms/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ import FormButtons from "./FormButtons.vue";
import Field from "./Field.vue";
import Fieldset from "./Fieldset.vue";
import Input from "./Input.vue";
import Login from "./Login.vue";
import LoginCode from "./LoginCode.vue";

/** Form Helpers */
import LoginAlert from "./LoginAlert.vue";

/* Form parts */
import Blocks from "./Blocks/index.js";
Expand All @@ -29,10 +24,6 @@ export default {
app.component("k-field", Field);
app.component("k-fieldset", Fieldset);
app.component("k-input", Input);
app.component("k-login", Login);
app.component("k-login-code", LoginCode);

app.component("k-login-alert", LoginAlert);

app.use(Blocks);
app.use(Inputs);
Expand Down
1 change: 1 addition & 0 deletions panel/src/components/Uploads/UploadItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
:after="'.' + extension"
:required="true"
:value="name"
allow="a-z0-9@._-"
class="k-upload-item-input"
type="slug"
@input="$emit('rename', $event)"
Expand Down
11 changes: 11 additions & 0 deletions panel/src/components/Views/Files/index.js
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);
}
};
7 changes: 7 additions & 0 deletions panel/src/components/Views/Installation/index.js
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);
}
};
Loading

0 comments on commit ab16b33

Please sign in to comment.