-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
-
-
-
+
-
-
@@ -28,7 +31,7 @@ export default {
data() {
return {
rows: this.initialRows
- }
+ };
},
methods: {
@@ -43,5 +46,5 @@ export default {
}
-}
+};
diff --git a/resources/js/components/Bard.js b/resources/js/components/Bard.js
index bfa8991eaf4..c2b15568355 100644
--- a/resources/js/components/Bard.js
+++ b/resources/js/components/Bard.js
@@ -1,5 +1,5 @@
import * as core from '@tiptap/core';
-import * as vue2 from '@tiptap/vue-2';
+import * as vue2 from '@tiptap/vue-3';
import * as state from '@tiptap/pm/state';
import * as model from '@tiptap/pm/model';
import * as view from '@tiptap/pm/view';
diff --git a/resources/js/components/Component.js b/resources/js/components/Component.js
index 40455835e69..7770e4fe60f 100644
--- a/resources/js/components/Component.js
+++ b/resources/js/components/Component.js
@@ -1,24 +1,23 @@
class Component {
-
constructor(id, name, props) {
this.id = id;
this.name = name;
- this.props = props;
- this.events = {};
+ this.props = reactive(props); // Make props reactive
+ this.events = reactive({});
}
prop(prop, value) {
- this.props[prop] = value;
+ this.props[prop] = value; // Directly set the property, Vue 3's reactivity system will track it
}
on(event, handler) {
- Vue.set(this.events, event, handler);
+ this.events[event] = handler; // Directly set the event handler
}
destroy() {
+ // Ensure Statamic is properly imported or available in your context
Statamic.$components.destroy(this.id);
}
-
}
export default Component;
diff --git a/resources/js/components/Components.js b/resources/js/components/Components.js
index 2ada42f068e..518b4094f9b 100644
--- a/resources/js/components/Components.js
+++ b/resources/js/components/Components.js
@@ -2,15 +2,15 @@ import uniqid from 'uniqid';
import Component from './Component';
class Components {
-
constructor(root) {
this.$root = root;
}
register(name, component) {
- Vue.component(name, component);
+ this.$root.component(name, component)
}
+ // @todo(jelleroorda): check if this still works
append(name, { props }) {
const id = `appended-${uniqid()}`;
const component = new Component(id, name, props);
@@ -33,6 +33,7 @@ class Components {
if (appended) {
const index = _.indexOf(this.$root.appendedComponents, appended);
+
this.$root.appendedComponents.splice(index, 1);
}
}
diff --git a/resources/js/components/Config.js b/resources/js/components/Config.js
index 467c9d00489..473f59a645a 100644
--- a/resources/js/components/Config.js
+++ b/resources/js/components/Config.js
@@ -1,12 +1,10 @@
-import Vue from 'vue';
-
class Config {
- constructor(instance) {
- this.instance = instance;
+ constructor(store) {
+ this.store = store;
}
all() {
- return this.instance.$store.state.statamic.config;
+ return this.store.state.statamic.config;
}
get(key, fallback) {
@@ -14,14 +12,8 @@ class Config {
}
set(key, value) {
- this.instance.$store.commit('statamic/configValue', {key, value});
+ this.store.commit('statamic/configValue', {key, value});
}
}
-Object.defineProperties(Vue.prototype, {
- $config: {
- get() {
- return new Config(this);
- }
- }
-});
+export default Config;
diff --git a/resources/js/components/DarkModeToggle.vue b/resources/js/components/DarkModeToggle.vue
index 53b4fbca5dc..72f6decfe7a 100644
--- a/resources/js/components/DarkModeToggle.vue
+++ b/resources/js/components/DarkModeToggle.vue
@@ -1,23 +1,28 @@
-
-
-
+
+
+
+
+
+
+
-
+
+
diff --git a/resources/js/components/DirtyState.js b/resources/js/components/DirtyState.js
deleted file mode 100644
index 0f056f3b20c..00000000000
--- a/resources/js/components/DirtyState.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import Vue from 'vue'
-
-const vm = new Vue({
-
- data: {
- names: []
- },
-
- watch: {
-
- names(names) {
- if (names.length) {
- this.enableWarning();
- }
-
- if (names.length === 0) {
- this.disableWarning();
- }
- }
-
- },
-
- methods: {
-
- add(name) {
- if (this.names.indexOf(name) == -1) {
- this.names.push(name);
- }
- },
-
- remove(name) {
- this.names = this.names.filter(n => n !== name);
- },
-
- enableWarning() {
- if (Statamic.$preferences.get('confirm_dirty_navigation', true)) {
- window.onbeforeunload = () => '';
- }
- },
-
- disableWarning() {
- window.onbeforeunload = null;
- }
-
- }
-
-});
-
-class DirtyState {
- state(name, state) {
- state ? this.add(name) : this.remove(name);
- }
- add(name) {
- vm.add(name);
- }
- remove(name) {
- vm.remove(name);
- }
- names() {
- return vm.names;
- }
- count() {
- return vm.names.length;
- }
- has(name) {
- return vm.names.includes(name);
- }
- disableWarning() {
- vm.disableWarning();
- }
-}
-
-Object.defineProperties(Vue.prototype, {
- $dirty: {
- get() {
- return new DirtyState;
- }
- }
-});
diff --git a/resources/js/components/DropdownItem.vue b/resources/js/components/DropdownItem.vue
index a1fe9b2ab7e..f2ab18d4ed6 100644
--- a/resources/js/components/DropdownItem.vue
+++ b/resources/js/components/DropdownItem.vue
@@ -8,36 +8,24 @@
diff --git a/resources/js/components/DropdownList.vue b/resources/js/components/DropdownList.vue
index cb90e5cb0ff..042e5be4337 100644
--- a/resources/js/components/DropdownList.vue
+++ b/resources/js/components/DropdownList.vue
@@ -1,18 +1,35 @@
-
+
-
diff --git a/resources/js/components/ElementContainer.vue b/resources/js/components/ElementContainer.vue
index a2f275037eb..1a0ca294984 100644
--- a/resources/js/components/ElementContainer.vue
+++ b/resources/js/components/ElementContainer.vue
@@ -1,7 +1,9 @@
diff --git a/resources/js/components/FavoriteCreator.vue b/resources/js/components/FavoriteCreator.vue
index 12266b0a41d..0e03a43beb2 100644
--- a/resources/js/components/FavoriteCreator.vue
+++ b/resources/js/components/FavoriteCreator.vue
@@ -1,11 +1,12 @@
-
-
diff --git a/resources/js/components/Modal.vue b/resources/js/components/Modal.vue
index e8d4df5b900..fc8f3623a3b 100644
--- a/resources/js/components/Modal.vue
+++ b/resources/js/components/Modal.vue
@@ -1,81 +1,70 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/js/components/ModalDialog.vue b/resources/js/components/ModalDialog.vue
index 8bc63585709..3f9ace36201 100644
--- a/resources/js/components/ModalDialog.vue
+++ b/resources/js/components/ModalDialog.vue
@@ -1,7 +1,7 @@
- Installed
-
-
-
-
+
diff --git a/resources/js/components/App.vue b/resources/js/components/App.vue
new file mode 100644
index 00000000000..9f6bcae10ec
--- /dev/null
+++ b/resources/js/components/App.vue
@@ -0,0 +1,133 @@
+
diff --git a/resources/js/components/AssetContainerList.vue b/resources/js/components/AssetContainerList.vue
index b3b5773350d..5b01586373f 100644
--- a/resources/js/components/AssetContainerList.vue
+++ b/resources/js/components/AssetContainerList.vue
@@ -1,18 +1,21 @@
-
-
- {{ container.title }}
-
-
-
-
-
-
-
+
+
+
+
+ {{ container.title }}
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -20,10 +20,10 @@
+
+
+
+
-
-
+ >
+
+
+
-
+
-
diff --git a/resources/js/components/asset-containers/EditForm.vue b/resources/js/components/asset-containers/EditForm.vue
index 0ba93c9854b..502e27578cd 100644
--- a/resources/js/components/asset-containers/EditForm.vue
+++ b/resources/js/components/asset-containers/EditForm.vue
@@ -1,5 +1,4 @@
-
-
-
-
-
diff --git a/resources/js/components/Preference.js b/resources/js/components/Preference.js
index 669288f45c4..ee67ec07394 100644
--- a/resources/js/components/Preference.js
+++ b/resources/js/components/Preference.js
@@ -1,13 +1,14 @@
-import Vue from 'vue';
+import {useStore} from "vuex";
class Preference {
- constructor(instance) {
- this.instance = instance;
+ constructor(http, store) {
+ this.http = http;
+ this.store = store;
this.url = cp_url('preferences/js');
}
all() {
- return this.instance.$store.state.statamic.config.user.preferences;
+ return this.store.state.statamic.config.user.preferences;
}
get(key, fallback) {
@@ -16,19 +17,19 @@ class Preference {
set(key, value) {
return this.commitOnSuccessAndReturnPromise(
- this.instance.$axios.post(this.url, {key, value})
+ this.http.post(this.url, {key, value})
);
}
append(key, value) {
return this.commitOnSuccessAndReturnPromise(
- this.instance.$axios.post(this.url, {key, value, append: true})
+ this.http.post(this.url, {key, value, append: true})
);
}
remove(key, value=null, cleanup=true) {
return this.commitOnSuccessAndReturnPromise(
- this.instance.$axios.delete(`${this.url}/${key}`, { data: { value, cleanup } })
+ this.http.delete(`${this.url}/${key}`, { data: { value, cleanup } })
);
}
@@ -38,7 +39,7 @@ class Preference {
commitOnSuccessAndReturnPromise(promise) {
promise.then(response => {
- this.instance.$store.commit('statamic/preferences', response.data);
+ this.store.commit('statamic/preferences', response.data);
});
return promise;
@@ -57,10 +58,4 @@ class Preference {
}
}
-Object.defineProperties(Vue.prototype, {
- $preferences: {
- get() {
- return new Preference(this);
- }
- }
-});
+export default Preference;
diff --git a/resources/js/components/ProgressBar.js b/resources/js/components/ProgressBar.js
deleted file mode 100644
index 17936aa26ed..00000000000
--- a/resources/js/components/ProgressBar.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import Vue from 'vue'
-import progress from 'nprogress';
-
-const vm = new Vue({
-
- data: {
- progressing: false,
- names: [],
- timer: null,
- },
-
- watch: {
-
- names(names) {
- if (names.length > 0 && !this.progressing) {
- this.start();
- }
-
- if (names.length === 0 && this.progressing) {
- this.stop();
- }
- }
-
- },
-
- methods: {
-
- start() {
- this.progressing = true;
- this.timer = setTimeout(() => progress.start(), 500);
- },
-
- stop() {
- if (this.timer) clearTimeout(this.timer);
- progress.done();
- this.progressing = false;
- },
-
- add(name) {
- if (this.names.indexOf(name) == -1) {
- this.names.push(name);
- }
- },
-
- remove(name) {
- const i = this.names.indexOf(name);
- this.names.splice(i, 1);
- }
-
- }
-
-});
-
-class ProgressBar {
- loading(name, loading) {
- loading ? this.start(name) : this.complete(name);
- }
- start(name) {
- vm.add(name);
- }
- complete(name) {
- vm.remove(name);
- }
- names() {
- return vm.names;
- }
- count() {
- return vm.names.length;
- }
- isComplete() {
- return this.count() === 0;
- }
-}
-
-Object.defineProperties(Vue.prototype, {
- $progress: {
- get() {
- return new ProgressBar;
- }
- }
-});
diff --git a/resources/js/components/ResourceDeleter.vue b/resources/js/components/ResourceDeleter.vue
index 76e7fe18452..dad101b0160 100644
--- a/resources/js/components/ResourceDeleter.vue
+++ b/resources/js/components/ResourceDeleter.vue
@@ -1,18 +1,18 @@
+
-
+
-
-
-
+
+ {{ __('Edit Container') }}
-
+
+
+ {{ __('Edit Blueprint') }}
+
+ {{ __('Delete Container') }}
-
+ :route="container.delete_url"
+ />
- {{ __('Create Container') }}
+
+ {{ __('Create Container') }}
+
-
diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue
index 8397e3c2702..951713233bc 100644
--- a/resources/js/components/assets/Browser/Browser.vue
+++ b/resources/js/components/assets/Browser/Browser.vue
@@ -15,248 +15,250 @@
@upload-complete="uploadCompleted"
@error="uploadError"
>
- {{ __(container.title) }}
-
-
+
+
+
-
+
-
-
-
-
-
-
+
+
-
-
-
+
+
-
-
+
-
+
+
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
- this.$refs.search.focus());
+ this.$nextTick(() => {
+ this.$refs.search.focus()
+ })
}
},
@@ -530,7 +534,7 @@ export default {
this.loading = false;
this.initializing = false;
}).catch(e => {
- this.$toast.error(e.response.data.message, { action: null, duration: null });
+ this.$toast.error(e.response.data.message, { timeout: false });
this.assets = [];
this.folders = [];
this.loading = false;
@@ -548,10 +552,11 @@ export default {
setMode(mode) {
this.mode = mode;
- this.setPreference('mode', mode == 'table' ? null : mode);
+ this.setPreference('mode', mode === 'table' ? null : mode);
},
edit(id) {
+ console.log('hoi', id);
this.editedAssetId = id;
},
@@ -578,8 +583,7 @@ export default {
this.sortColumn = 'last_modified';
this.sortDirection = 'desc';
- this.selectedAssets.push(asset.id);
- this.$emit('selections-updated', this.selectedAssets);
+ this.$emit('selections-updated', [...this.selectedAssets, asset.id]);
}
this.loadAssets();
@@ -620,23 +624,28 @@ export default {
toggleSelection(id, index, $event) {
const i = this.selectedAssets.indexOf(id);
+
this.$refs.browser.focus()
+ let newSelection = [...this.selectedAssets];
+
if (this.maxFiles === 1) {
- this.selectedAssets = [id];
+ newSelection = [id];
} else if (i != -1) {
- this.selectedAssets.splice(i, 1);
+ newSelection.splice(i, 1);
} else if (! this.reachedSelectionLimit) {
if ($event.shiftKey && this.lastItemClicked !== null) {
- this.selectRange(
+ newSelection = this.selectRange(
Math.min(this.lastItemClicked, index),
Math.max(this.lastItemClicked, index)
);
} else {
- this.selectedAssets.push(id);
+ newSelection = [...this.selectedAssets, id];
}
}
- this.$emit('selections-updated', this.selectedAssets);
+
+ this.$emit('selections-updated', newSelection);
+
this.lastItemClicked = index;
},
@@ -645,13 +654,17 @@ export default {
},
selectRange(from, to) {
+ let newSelection = [...this.selectedAssets]
+
for (var i = from; i <= to; i++ ) {
let asset = this.assets[i].id;
- if (! this.selectedAssets.includes(asset) && ! this.reachedSelectionLimit) {
- this.selectedAssets.push(asset);
+
+ if (! newSelection.includes(asset) && newSelection.length < this.maxFiles) {
+ newSelection = [...newSelection, asset];
}
- this.$emit('selections-updated', this.selectedAssets);
- };
+ }
+
+ return newSelection
},
shiftDown() {
diff --git a/resources/js/components/assets/Browser/CreateFolder.vue b/resources/js/components/assets/Browser/CreateFolder.vue
index ba04482b8e5..d2424d62ee4 100644
--- a/resources/js/components/assets/Browser/CreateFolder.vue
+++ b/resources/js/components/assets/Browser/CreateFolder.vue
@@ -66,6 +66,7 @@ export default {
this.$axios.post(url, payload).then(response => {
this.$toast.success(__('Folder created'));
this.$emit('created', response.data);
+ this.directory = this.initialDirectory
}).catch(e => {
this.handleErrors(e);
}).finally(() => {
diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index ea80ed29bd8..de18d37556d 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -1,9 +1,11 @@
-
+ @closed="close"
+ >
-
-
+
-
+
+
+
-
+
@@ -131,22 +133,24 @@
:errors="errors"
@updated="values = { ...$event, focus: values.focus }"
>
-
@@ -305,7 +309,7 @@ export default {
},
mounted() {
- this.$modal.show('asset-editor');
+ this.$modal.open('asset-editor');
this.load();
},
@@ -401,7 +405,7 @@ export default {
},
close() {
- this.$modal.hide('asset-editor');
+ this.$modal.close('asset-editor');
this.$emit('closed');
},
diff --git a/resources/js/components/assets/Selector.vue b/resources/js/components/assets/Selector.vue
index 1244cfcdb04..caf00cb10e3 100644
--- a/resources/js/components/assets/Selector.vue
+++ b/resources/js/components/assets/Selector.vue
@@ -1,55 +1,54 @@
+
+
+
+
-
+
-
+
+
-
+
-
+
+
+
+
+
+
+
+
-
-
-
diff --git a/resources/js/components/assets/Upload.vue b/resources/js/components/assets/Upload.vue
index 8fb5b5a3b75..9a2e7a5f57e 100644
--- a/resources/js/components/assets/Upload.vue
+++ b/resources/js/components/assets/Upload.vue
@@ -1,7 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+ : __n(':count selected|:count selected', browserSelections)"
+ >
+
+
+
-
@@ -41,15 +38,11 @@
>
-
-
diff --git a/resources/js/components/assets/Uploader.vue b/resources/js/components/assets/Uploader.vue
index 6e0904d4e67..563fa32bee9 100644
--- a/resources/js/components/assets/Uploader.vue
+++ b/resources/js/components/assets/Uploader.vue
@@ -1,30 +1,32 @@
diff --git a/resources/js/components/blueprints/Builder.vue b/resources/js/components/blueprints/Builder.vue
index 314a2918583..4cb98263ce9 100644
--- a/resources/js/components/blueprints/Builder.vue
+++ b/resources/js/components/blueprints/Builder.vue
@@ -1,7 +1,5 @@
-
-
-
@@ -46,9 +44,7 @@
:can-define-localizable="canDefineLocalizable"
@updated="tabsUpdated"
/>
-
-
diff --git a/resources/js/components/blueprints/LinkFields.vue b/resources/js/components/blueprints/LinkFields.vue
index e8c32bfef98..0d800019f7f 100644
--- a/resources/js/components/blueprints/LinkFields.vue
+++ b/resources/js/components/blueprints/LinkFields.vue
@@ -8,82 +8,84 @@
-
-
- {{ __('Link Fields') }}
-
-
+
+
-
-
+
+
@@ -39,6 +41,7 @@
import Listing from '../Listing.vue';
export default {
+ emits: ['reordered'],
mixins: [Listing],
@@ -56,12 +59,9 @@ export default {
},
watch: {
-
initialRows(rows) {
this.rows = rows;
}
-
}
-
}
diff --git a/resources/js/components/blueprints/RegularField.vue b/resources/js/components/blueprints/RegularField.vue
index 3ddb0e1ce3b..7c89cdbd679 100644
--- a/resources/js/components/blueprints/RegularField.vue
+++ b/resources/js/components/blueprints/RegularField.vue
@@ -103,7 +103,7 @@ export default {
labelText() {
return this.field.config.display
- || Vue.options.filters.titleize(Vue.options.filters.deslugify(this.field.handle));
+ || this.$filters.titleize(this.$filters.deslugify(this.field.handle));
},
width: {
diff --git a/resources/js/components/blueprints/Section.vue b/resources/js/components/blueprints/Section.vue
index 54e3d3291e0..d107ae37fe3 100644
--- a/resources/js/components/blueprints/Section.vue
+++ b/resources/js/components/blueprints/Section.vue
@@ -1,26 +1,37 @@
-
+
+
-
diff --git a/resources/js/components/collections/OneOrManySitesField.vue b/resources/js/components/collections/OneOrManySitesField.vue
index a3960b70817..f2d0273e819 100644
--- a/resources/js/components/collections/OneOrManySitesField.vue
+++ b/resources/js/components/collections/OneOrManySitesField.vue
@@ -3,13 +3,18 @@
@@ -25,8 +30,9 @@
-
-
diff --git a/resources/js/components/blueprints/Listing.vue b/resources/js/components/blueprints/Listing.vue
index dccc78b1a18..ed357ef28e0 100644
--- a/resources/js/components/blueprints/Listing.vue
+++ b/resources/js/components/blueprints/Listing.vue
@@ -1,37 +1,39 @@
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+ {{ __('Link Fields') }}
-
-
-
-
-
+ type="button"
+ class="btn-close"
+ @click="close"
+ v-html="'×'" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{ value }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ value }}
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
-
+
+
-
-
diff --git a/resources/js/components/blueprints/TabContent.vue b/resources/js/components/blueprints/TabContent.vue
index ece2950576e..3c013e46b63 100644
--- a/resources/js/components/blueprints/TabContent.vue
+++ b/resources/js/components/blueprints/TabContent.vue
@@ -20,10 +20,9 @@
diff --git a/resources/js/components/blueprints/Tabs.vue b/resources/js/components/blueprints/Tabs.vue
index 863fcb68d0b..cbe0ae867d0 100644
--- a/resources/js/components/blueprints/Tabs.vue
+++ b/resources/js/components/blueprints/Tabs.vue
@@ -22,10 +22,13 @@
-
+
+
+
+
-
diff --git a/resources/js/components/blueprints/Sections.vue b/resources/js/components/blueprints/Sections.vue
index ba0323c13fe..d1aba3f1136 100644
--- a/resources/js/components/blueprints/Sections.vue
+++ b/resources/js/components/blueprints/Sections.vue
@@ -1,13 +1,10 @@
-
+
-
@@ -71,17 +102,15 @@
@field-editing="editingField = $event"
@editor-closed="editingField = null"
>
-
+
-
-
-
-
-
+
+
+
diff --git a/resources/js/components/collections/EditForm.vue b/resources/js/components/collections/EditForm.vue
index 7971fac2c58..d1b1b983bc7 100644
--- a/resources/js/components/collections/EditForm.vue
+++ b/resources/js/components/collections/EditForm.vue
@@ -12,19 +12,21 @@
:site="site"
@updated="values = $event"
>
-
+
+
+ {{ __('Blueprints') }}
+ +
+
+
+
+ {{ __('Create Blueprint') }}
+
+
+
-
-
-
+
+
-
-
-
-
+
+
+
+
diff --git a/resources/js/components/collections/Listing.vue b/resources/js/components/collections/Listing.vue
index e9dc3946c48..468ba1c5a92 100644
--- a/resources/js/components/collections/Listing.vue
+++ b/resources/js/components/collections/Listing.vue
@@ -1,27 +1,30 @@
+
+
+
+
-
-
- {{ __(collection.title) }}
-
-
-
-
-
-
-
+
+
+
+
+ {{ __(collection.title) }}
+
+
+
+
+
+
+
+
+
-
| @@ -29,58 +37,66 @@ | ||||
|---|---|---|---|---|
| - | - - | -
- |
- - - {{ __(row.collection.title) }} - {{ __(row.taxonomy.title) }} - - | -
- |
-
| + | + + | +
+ |
+ + + {{ __(row.collection.title) }} + {{ __(row.taxonomy.title) }} + + | +
+ |
+
+
diff --git a/resources/js/components/entries/BaseCreateForm.vue b/resources/js/components/entries/BaseCreateForm.vue
index 7970232f628..7d90c380d63 100644
--- a/resources/js/components/entries/BaseCreateForm.vue
+++ b/resources/js/components/entries/BaseCreateForm.vue
@@ -30,7 +30,6 @@
diff --git a/resources/js/components/entries/CreateEntryButton.vue b/resources/js/components/entries/CreateEntryButton.vue
index 1220a6d8297..a6a1d68dfee 100644
--- a/resources/js/components/entries/CreateEntryButton.vue
+++ b/resources/js/components/entries/CreateEntryButton.vue
@@ -1,5 +1,4 @@
-
-
+
-
diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
index 8550f58bbf0..8070963a520 100644
--- a/resources/js/components/entries/Listing.vue
+++ b/resources/js/components/entries/Listing.vue
@@ -14,106 +14,135 @@
:sort-direction="sortDirection"
@visible-columns-updated="visibleColumns = $event"
>
-
-
-
-
-
-
@@ -141,12 +170,12 @@ export default {
initialSite: this.site,
pushQuery: true,
previousFilters: null,
- }
+ };
},
computed: {
actionContext() {
- return {collection: this.collection};
+ return { collection: this.collection };
},
},
@@ -203,12 +232,12 @@ export default {
getStatusTooltip(entry) {
if (entry.status === 'published') {
return entry.collection.dated
- ? __('messages.status_published_with_date', {date: entry.date})
+ ? __('messages.status_published_with_date', { date: entry.date })
: null; // The label is sufficient.
} else if (entry.status === 'scheduled') {
- return __('messages.status_scheduled_with_date', {date: entry.date})
+ return __('messages.status_scheduled_with_date', { date: entry.date });
} else if (entry.status === 'expired') {
- return __('messages.status_expired_with_date', {date: entry.date})
+ return __('messages.status_expired_with_date', { date: entry.date });
} else if (entry.status === 'draft') {
return null; // The label is sufficient.
}
@@ -243,7 +272,7 @@ export default {
},
setSiteFilter(site) {
- this.filterChanged({ handle: 'site', values: { site }});
+ this.filterChanged({ handle: 'site', values: { site } });
},
saveOrder() {
@@ -257,7 +286,7 @@ export default {
this.$axios.post(this.reorderUrl, payload)
.then(response => {
this.$emit('reordered');
- this.$toast.success(__('Entries successfully reordered'))
+ this.$toast.success(__('Entries successfully reordered'));
})
.catch(e => {
console.log(e);
@@ -274,5 +303,5 @@ export default {
}
}
-}
+};
diff --git a/resources/js/components/entries/PublishActions.vue b/resources/js/components/entries/PublishActions.vue
index 6fb7919f6cb..fb2e559d5f8 100644
--- a/resources/js/components/entries/PublishActions.vue
+++ b/resources/js/components/entries/PublishActions.vue
@@ -1,72 +1,74 @@
-
-
- {{ __('Publish') }}
-
-
-
-
-
-
-
import LinkToolbar from './LinkToolbar.vue';
+import BardToolbarButton from './ToolbarButton.vue'
export default {
-
mixins: [BardToolbarButton],
components: {
@@ -45,7 +46,6 @@ export default {
},
methods: {
-
toggleLinkToolbar() {
this.showingToolbar = ! this.showingToolbar;
@@ -69,18 +69,20 @@ export default {
this.editor.chain().focus().setLink(attributes).run();
this.linkAttrs = null;
this.close();
- }
- },
+ },
- created() {
- this.bard.$on('link-toggle', () => {
+ linkToggle() {
this.toggleLinkToolbar();
this.$refs.popover.toggle();
- });
+ },
+ },
+
+ mounted() {
+ this.bard.eventBus.on('link-toggle', this.linkToggle);
},
- beforeDestroy() {
- this.bard.$off('link-toggle');
+ unmounted() {
+ this.bard.eventBus.off('link-toggle', this.linkToggle);
}
}
diff --git a/resources/js/components/fieldtypes/bard/Set.js b/resources/js/components/fieldtypes/bard/Set.js
index 48a9cb8a860..7f578ca36cf 100644
--- a/resources/js/components/fieldtypes/bard/Set.js
+++ b/resources/js/components/fieldtypes/bard/Set.js
@@ -2,7 +2,7 @@ import { Node } from '@tiptap/core';
import { Plugin, PluginKey } from '@tiptap/pm/state';
import { Slice, Fragment } from '@tiptap/pm/model';
import { Decoration, DecorationSet } from "@tiptap/pm/view";
-import { VueNodeViewRenderer } from '@tiptap/vue-2'
+import { VueNodeViewRenderer } from '@tiptap/vue-3'
import SetComponent from './Set.vue';
import { TextSelection } from '@tiptap/pm/state';
diff --git a/resources/js/components/fieldtypes/bard/Set.vue b/resources/js/components/fieldtypes/bard/Set.vue
index eddd88a6697..b1f1268e69f 100644
--- a/resources/js/components/fieldtypes/bard/Set.vue
+++ b/resources/js/components/fieldtypes/bard/Set.vue
@@ -1,10 +1,14 @@
-
+
+
@@ -30,6 +30,7 @@
+ {{ __('Publish') }}
+
-
+
-
+
diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 2f8d0b9d535..728d70f1ca8 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -7,7 +7,7 @@
+
-
+
-
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
-
-
+
+
-
+
@@ -30,6 +30,7 @@
+
-
-
-
+ :model-value="modelValue"
+ @update:model-value="update"
+ >
@@ -24,7 +25,7 @@
diff --git a/resources/js/components/fieldtypes/UserRolesFieldtype.vue b/resources/js/components/fieldtypes/UserRolesFieldtype.vue
index df14207d691..504c5e429cf 100644
--- a/resources/js/components/fieldtypes/UserRolesFieldtype.vue
+++ b/resources/js/components/fieldtypes/UserRolesFieldtype.vue
@@ -3,7 +3,7 @@
diff --git a/resources/js/components/fieldtypes/VideoFieldtype.vue b/resources/js/components/fieldtypes/VideoFieldtype.vue
index 0f0e31cb634..163ae6aba28 100644
--- a/resources/js/components/fieldtypes/VideoFieldtype.vue
+++ b/resources/js/components/fieldtypes/VideoFieldtype.vue
@@ -3,7 +3,9 @@
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
-
diff --git a/resources/js/components/fieldtypes/TemplateFieldtype.vue b/resources/js/components/fieldtypes/TemplateFieldtype.vue
index 7af0416d95c..983d2a44f4c 100644
--- a/resources/js/components/fieldtypes/TemplateFieldtype.vue
+++ b/resources/js/components/fieldtypes/TemplateFieldtype.vue
@@ -3,7 +3,6 @@
-
-
-
-
-
@@ -69,7 +68,6 @@ import Condition from './Condition.vue';
import { __ } from '../../bootstrap/globals';
export default {
-
mixins: [HasInputOptions],
components: { Condition },
@@ -90,11 +88,10 @@ export default {
customMethod: null,
conditions: [],
alwaysSave: false,
- }
+ };
},
computed: {
-
whenOptions() {
return this.normalizeInputOptions({
always: __('Always show'),
@@ -116,7 +113,7 @@ export default {
},
isStandard() {
- return this.hasConditions && ! this.isCustom;
+ return this.hasConditions && !this.isCustom;
},
isCustom() {
@@ -128,7 +125,7 @@ export default {
let key = this.type === 'any' ? `${this.when}_any` : this.when;
let saveableConditions = this.prepareSaveableConditions(this.conditions);
- if (this.isStandard && ! _.isEmpty(saveableConditions)) {
+ if (this.isStandard && !_.isEmpty(saveableConditions)) {
conditions[key] = saveableConditions;
} else if (this.isCustom && this.customMethod) {
conditions[key] = this.customMethod;
@@ -136,11 +133,9 @@ export default {
return conditions;
}
-
},
watch: {
-
saveableConditions: {
deep: true,
handler(conditions) {
@@ -151,7 +146,6 @@ export default {
alwaysSave(alwaysSave) {
this.$emit('updated-always-save', alwaysSave);
},
-
},
created() {
@@ -161,7 +155,6 @@ export default {
},
methods: {
-
add() {
this.conditions.push({
_id: uniqid(),
@@ -187,7 +180,7 @@ export default {
let conditions = this.config[key];
- if (! conditions) {
+ if (!conditions) {
return;
}
@@ -222,7 +215,7 @@ export default {
prepareSaveableConditions(conditions) {
conditions = _.reject(conditions, condition => {
- return ! condition.field || ! condition.value;
+ return !condition.field || !condition.value;
});
return (new Converter).toBlueprint(conditions);
@@ -240,7 +233,6 @@ export default {
return operator;
},
-
}
-}
+};
diff --git a/resources/js/components/field-conditions/Condition.vue b/resources/js/components/field-conditions/Condition.vue
index 735395eaa00..f2735a8ac09 100644
--- a/resources/js/components/field-conditions/Condition.vue
+++ b/resources/js/components/field-conditions/Condition.vue
@@ -4,7 +4,6 @@
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+ :disabled="!canSave"
+ @click.prevent="save"
+ v-text="saveText">
+
+
+
+
+
+
+
+
-
-
-
-
- ✓
-
-
-
- !
-
-
-
- ✓
-
-
-
- !
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ __(option.name) }}
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ✓
+
+
+
+ !
+
+
+
+ ✓
+
+
+
+ !
+
+
+
+
+
+
+
+
+
+ {{ __(option.name) }}
+
+
+
+
+
@@ -247,27 +261,30 @@
}"
:disabled="!canSave"
@click.prevent="save"
- v-text="__(revisionsEnabled ? 'Save Changes' : 'Save')" />
+ v-text="__(revisionsEnabled ? 'Save Changes' : 'Save')"
+ />
+
-
+
-
+
+
+
-
-
-
@@ -10,19 +8,22 @@
-
{{ __('messages.field_conditions_instructions') }}
@@ -54,9 +55,7 @@
-
+
{{ __('URL') }}
-
+ @blur="$emit('blur')"
+ />
-
@@ -8,17 +8,16 @@
diff --git a/resources/js/components/fieldtypes/assets/AssetsIndexFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsIndexFieldtype.vue
index fa9111204f4..22fd425927a 100644
--- a/resources/js/components/fieldtypes/assets/AssetsIndexFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsIndexFieldtype.vue
@@ -1,5 +1,4 @@
-
-
diff --git a/resources/js/components/fieldtypes/bard/BardButtonsSettingFieldtype.vue b/resources/js/components/fieldtypes/bard/BardButtonsSettingFieldtype.vue
index 2c1d2b37cec..84d849334a5 100644
--- a/resources/js/components/fieldtypes/bard/BardButtonsSettingFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardButtonsSettingFieldtype.vue
@@ -1,7 +1,6 @@
YAML
+ YAML
-
-
@@ -18,7 +22,7 @@
{{ display || config.handle }}
@@ -67,7 +71,7 @@
diff --git a/resources/js/components/fieldtypes/date/RangePopover.vue b/resources/js/components/fieldtypes/date/RangePopover.vue
index d5174cb97ce..19bd553562a 100644
--- a/resources/js/components/fieldtypes/date/RangePopover.vue
+++ b/resources/js/components/fieldtypes/date/RangePopover.vue
@@ -1,112 +1,86 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
-
diff --git a/resources/js/components/fieldtypes/date/SingleInline.vue b/resources/js/components/fieldtypes/date/SingleInline.vue
index 02834f6def1..2068a074c1e 100644
--- a/resources/js/components/fieldtypes/date/SingleInline.vue
+++ b/resources/js/components/fieldtypes/date/SingleInline.vue
@@ -1,37 +1,31 @@
-
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/resources/js/components/fieldtypes/grid/GridIndex.vue b/resources/js/components/fieldtypes/grid/GridIndex.vue
index 39d05dcdc8a..3a09e3102c1 100644
--- a/resources/js/components/fieldtypes/grid/GridIndex.vue
+++ b/resources/js/components/fieldtypes/grid/GridIndex.vue
@@ -1,15 +1,15 @@
-
+
+
-
-
-
-
-
-
-
-
-
- {{ __('Max Rows') }}: {{ maxRows }}
-
-
- {{ __('Min Rows') }}: {{ minRows }}
-
-
-
-
-
-
+
+
+
+
+
+ {{ __('Max Rows') }}: {{ maxRows }}
+
+
+ {{ __('Min Rows') }}: {{ minRows }}
+
+
+
+
+
- {{ __n(':count row|:count rows', value) }}
+
-
diff --git a/resources/js/components/fieldtypes/grid/Row.vue b/resources/js/components/fieldtypes/grid/Row.vue
index b40f72a0c0f..cf21ddb65fa 100644
--- a/resources/js/components/fieldtypes/grid/Row.vue
+++ b/resources/js/components/fieldtypes/grid/Row.vue
@@ -1,19 +1,19 @@
-
-
-
diff --git a/resources/js/components/fieldtypes/grid/Table.vue b/resources/js/components/fieldtypes/grid/Table.vue
index ad6a315fd3d..0c88604e58a 100644
--- a/resources/js/components/fieldtypes/grid/Table.vue
+++ b/resources/js/components/fieldtypes/grid/Table.vue
@@ -1,9 +1,8 @@
-
-
+
+ {{ __n(':count row|:count rows', modelValue) }}
diff --git a/resources/js/components/fieldtypes/grid/HeaderCell.vue b/resources/js/components/fieldtypes/grid/HeaderCell.vue
index 13b8e922d78..d09a6019982 100644
--- a/resources/js/components/fieldtypes/grid/HeaderCell.vue
+++ b/resources/js/components/fieldtypes/grid/HeaderCell.vue
@@ -1,23 +1,25 @@
-
{{ __(field.display || field.handle) }}
- | + |
|---|