Re-structuring

composer.json

@@ -20,7 +20,7 @@
  "pixelfear/composer-dist-plugin": "^0.1.0",
  "scrumpy/html-to-prosemirror": "^0.6.0",
  "scrumpy/prosemirror-to-html": "^0.8.0",
- "spatie/blink": "^1.1",
+ "spatie/blink": "^1.1.2",
  "statamic/stringy": "^3.1",
  "symfony/var-exporter": "^4.3",
  "symfony/yaml": "^4.1@dev",

config/stache.php

@@ -48,9 +48,9 @@
  'directory' => base_path('content/collections'),
  ],
 
- 'structures' => [
- 'class' => Stores\StructuresStore::class,
- 'directory' => base_path('content/structures'),
+ 'navigation' => [
+ 'class' => Stores\NavigationStore::class,
+ 'directory' => base_path('content/navigation'),
  ],
 
  'globals' => [

resources/blueprints/entry_link.yaml

@@ -0,0 +1,11 @@
+title: Link
+fields:
+ -
+ handle: title
+ field:
+ type: text
+ -
+ handle: redirect
+ field:
+ type: redirect
+ required: true

resources/js/app.js

@@ -103,7 +103,6 @@ Statamic.app({
  components: {
  GlobalSearch: require('./components/GlobalSearch.vue').default,
  SiteSelector: require('./components/SiteSelector.vue').default,
- PageTree: require('./components/structures/PageTree.vue').default,
  Login: require('./components/login/login'),
  LoginModal: require('./components/login/LoginModal.vue').default,
  BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
@@ -128,10 +127,12 @@ Statamic.app({
  CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
  CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
  CollectionEditForm: require('./components/collections/EditForm.vue').default,
+ CollectionView: require('./components/collections/View.vue').default,
  SessionExpiry: require('./components/SessionExpiry.vue').default,
- StructureWizard: require('./components/structures/Wizard.vue').default,
- StructureListing: require('./components/structures/Listing.vue').default,
- StructureEditForm: require('./components/structures/EditForm.vue').default,
+ NavigationListing: require('./components/navigation/Listing.vue').default,
+ NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
+ NavigationEditForm: require('./components/navigation/EditForm.vue').default,
+ NavigationView: require('./components/navigation/View.vue').default,
  Stacks: require('./components/stacks/Stacks.vue').default,
  TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
  TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
@@ -163,6 +164,10 @@ Statamic.app({
 
  stackCount() {
  return this.$stacks.count();
+ },
+
+ wrapperClass() {
+ return this.$config.get('wrapperClass', 'max-w-xl');
  }
 
  },

resources/js/bootstrap/fieldtypes.js

@@ -13,7 +13,6 @@ Vue.component('slug-fieldtype', require('../components/fieldtypes/SlugFieldtype.
 // Fieldtypes
 import FieldsetFieldtype from '../components/fieldtypes/FieldsetFieldtype.vue'
 import RevealerFieldtype from '../components/fieldtypes/RevealerFieldtype.vue'
-import RoutesFieldtype from '../components/fieldtypes/RoutesFieldtype.vue'
 import StatusFieldtype from '../components/fieldtypes/StatusFieldtype.vue'
 import TemplateFieldtype from '../components/fieldtypes/TemplateFieldtype.vue'
 
@@ -25,6 +24,7 @@ Vue.component('bard-fieldtype', require('../components/fieldtypes/bard/BardField
 Vue.component('bard_buttons_setting-fieldtype', require('../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue').default);
 Vue.component('checkboxes-fieldtype', require('../components/fieldtypes/CheckboxesFieldtype.vue').default);
 Vue.component('code-fieldtype', require('../components/fieldtypes/CodeFieldtype.vue').default);
+Vue.component('collection_routes-fieldtype', require('../components/collections/Routes.vue').default);
 Vue.component('color-fieldtype', require('../components/fieldtypes/ColorFieldtype.vue').default);
 Vue.component('date-fieldtype', require('../components/fieldtypes/DateFieldtype.vue').default);
 Vue.component('fieldset-fieldtype', FieldsetFieldtype);
@@ -37,17 +37,16 @@ Vue.component('list-fieldtype', require('../components/fieldtypes/ListFieldtype.
 Vue.component('markdown-fieldtype', require('../components/fieldtypes/MarkdownFieldtype.vue').default);
 Vue.component('radio-fieldtype', require('../components/fieldtypes/RadioFieldtype.vue').default);
 Vue.component('range-fieldtype', require('../components/fieldtypes/RangeFieldtype.vue').default);
+Vue.component('redirect-fieldtype', require('../components/fieldtypes/RedirectFieldtype.vue').default);
 Vue.component('relationship-fieldtype', require('../components/fieldtypes/relationship/RelationshipFieldtype.vue').default);
 Vue.component('relationship-fieldtype-index', require('../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue').default);
 Vue.component('replicator-fieldtype', require('../components/fieldtypes/replicator/Replicator.vue').default);
 Vue.component('replicator-fieldtype-index', require('../components/fieldtypes/replicator/ReplicatorIndex.vue').default);
 Vue.component('revealer-fieldtype', RevealerFieldtype);
-Vue.component('routes-fieldtype', RoutesFieldtype);
 Vue.component('section-fieldtype', require('../components/fieldtypes/SectionFieldtype.vue').default);
 Vue.component('select-fieldtype', require('../components/fieldtypes/SelectFieldtype.vue').default);
 Vue.component('sets-fieldtype', require('../components/fieldtypes/replicator/SetsFieldtype.vue').default);
 Vue.component('status-fieldtype', StatusFieldtype);
-Vue.component('structure_sites-fieldtype', require('../components/structures/Sites.vue').default);
 Vue.component('table-fieldtype', require('../components/fieldtypes/TableFieldtype.vue').default);
 Vue.component('tags-fieldtype', require('../components/fieldtypes/TagsFieldtype.vue').default);
 Vue.component('tags-fieldtype-index', require('../components/fieldtypes/TagsIndexFieldtype.vue').default);

resources/js/components/DropdownItem.vue

@@ -12,7 +12,7 @@ export default {
  props: ['text', 'redirect', 'externalLink'],
 
  methods: {
- selectAndClose() {
+ selectAndClose($event) {
  if (this.redirect) {
  location.href = this.redirect;
  return;
@@ -23,7 +23,7 @@ export default {
  return;
  }
 
- this.$emit('click');
+ this.$emit('click', $event);
 
  this.$parent.close();
  }

resources/js/components/collections/DeleteEntryConfirmation.vue

@@ -0,0 +1,42 @@
+<template>
+
+ <modal name="delete-entry-confirmation" :pivotY="0.1" :overflow="false">
+ <div class="confirmation-modal flex flex-col h-full">
+ <div class="text-lg font-medium p-2 pb-0">
+ {{ __('Delete Entry') }}
+ </div>
+ <div class="flex-1 px-2 py-3 text-grey">
+ <p class="mb-2">Are you sure you want to delete this entry?</p>
+ <label class="flex items-center" v-if="children">
+ <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
+ {{ __n('Delete child entry|Delete :count child entries', children) }}
+ </label>
+ </div>
+ <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
+ <button class="text-grey hover:text-grey-90"
+ @click="$emit('cancel')"
+ v-text="__('Cancel')" />
+ <button class="btn ml-2 btn-danger"
+ @click="$emit('confirm', shouldDeleteChildren)"
+ v-text="__('Delete')" />
+ </div>
+ </div>
+ </modal>
+
+</template>
+
+<script>
+export default {
+
+ props: {
+ children: Number
+ },
+
+ data() {
+ return {
+ shouldDeleteChildren: false
+ }
+ }
+
+}
+</script>

resources/js/components/collections/EditForm.vue

@@ -33,14 +33,11 @@ export default {
  blueprint: Object,
  initialValues: Object,
  meta: Object,
- initialTitle: String,
- url: String,
- listingUrl: String,
+ url: String
  },
 
  data() {
  return {
- title: this.initialTitle,
  values: this.initialValues,
  error: null,
  errors: {},
@@ -60,7 +57,6 @@ export default {
 
  this.$axios.patch(this.url, this.values).then(response => {
  this.saving = false;
- this.title = response.data.title;
  this.$toast.success(__('Saved'));
  this.$refs.container.saved();
  }).catch(e => this.handleAxiosError(e));

resources/js/components/collections/Routes.vue

@@ -0,0 +1,118 @@
+<template>
+
+ <div>
+ <div v-if="hasMultipleSites">
+ <div class="radio-fieldtype mb-1">
+ <radio-fieldtype handle="route_mode" v-model="routeMode" :config="{
+ inline: true,
+ options: {
+ single: 'Single route',
+ multiple: 'Separate route for each site',
+ }
+ }" />
+ </div>
+ <table class="grid-table" v-if="perSiteRouting">
+ <thead>
+ <tr>
+ <th>Site</th>
+ <th class="w-2/3">Route</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="site in sites" :key="site.handle">
+ <td class="align-middle" v-text="site.name" />
+ <td>
+ <text-input
+ class="font-mono text-xs"
+ :value="value[site.handle]"
+ @input="updateSiteRoute(site.handle, $event)" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div v-if="!hasMultipleSites || !perSiteRouting">
+ <text-input v-model="singleRoute" class="font-mono text-xs" />
+ </div>
+ </div>
+
+</template>
+
+<script>
+export default {
+
+ mixins: [Fieldtype],
+
+ inject: ['storeName'],
+
+ data() {
+ return {
+ routeMode: null,
+ singleRoute: null,
+ }
+ },
+
+ created() {
+ this.routeMode = this.identicalRoutes ? 'single' : 'multiple';
+ },
+
+ computed: {
+
+ sites() {
+ let state = this.$store.state.publish[this.storeName];
+
+ if (!state.values.sites) return [];
+
+ return state.values.sites.map((handle, i) => {
+ return {
+ handle,
+ name: state.meta.sites.data[i].title
+ }
+ });
+ },
+
+ hasMultipleSites() {
+ return this.sites.length > 1;
+ },
+
+ perSiteRouting() {
+ return this.routeMode === 'multiple';
+ },
+
+ identicalRoutes() {
+ return _.uniq(Object.values(this.value)).length === 1;
+ }
+
+ },
+
+ watch: {
+
+ singleRoute(route) {
+ this.update(route);
+ },
+
+ routeMode(mode) {
+ if (mode === 'single') {
+ this.singleRoute = Object.values(this.value)[0];
+ } else {
+ let value = {};
+ this.sites.forEach(site => value[site.handle] = '');
+ this.update(value);
+ }
+ }
+
+ },
+
+ methods: {
+
+ updateSiteRoute(site, route) {
+ let value = this.value;
+ value[site] = route;
+ this.update(value);
+ }
+
+ }
+
+}
+</script>

composer.json

@@ -20,7 +20,7 @@
  "pixelfear/composer-dist-plugin": "^0.1.0",
  "scrumpy/html-to-prosemirror": "^0.6.0",
  "scrumpy/prosemirror-to-html": "^0.8.0",
- "spatie/blink": "^1.1",
+ "spatie/blink": "^1.1.2",
  "statamic/stringy": "^3.1",
  "symfony/var-exporter": "^4.3",
  "symfony/yaml": "^4.1@dev",

config/stache.php

@@ -48,9 +48,9 @@
  'directory' => base_path('content/collections'),
  ],
 
- 'structures' => [
- 'class' => Stores\StructuresStore::class,
- 'directory' => base_path('content/structures'),
+ 'navigation' => [
+ 'class' => Stores\NavigationStore::class,
+ 'directory' => base_path('content/navigation'),
  ],
 
  'globals' => [

resources/blueprints/entry_link.yaml

@@ -0,0 +1,11 @@
+title: Link
+fields:
+ -
+ handle: title
+ field:
+ type: text
+ -
+ handle: redirect
+ field:
+ type: redirect
+ required: true

resources/js/app.js

@@ -103,7 +103,6 @@ Statamic.app({
  components: {
  GlobalSearch: require('./components/GlobalSearch.vue').default,
  SiteSelector: require('./components/SiteSelector.vue').default,
- PageTree: require('./components/structures/PageTree.vue').default,
  Login: require('./components/login/login'),
  LoginModal: require('./components/login/LoginModal.vue').default,
  BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
@@ -128,10 +127,12 @@ Statamic.app({
  CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
  CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
  CollectionEditForm: require('./components/collections/EditForm.vue').default,
+ CollectionView: require('./components/collections/View.vue').default,
  SessionExpiry: require('./components/SessionExpiry.vue').default,
- StructureWizard: require('./components/structures/Wizard.vue').default,
- StructureListing: require('./components/structures/Listing.vue').default,
- StructureEditForm: require('./components/structures/EditForm.vue').default,
+ NavigationListing: require('./components/navigation/Listing.vue').default,
+ NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
+ NavigationEditForm: require('./components/navigation/EditForm.vue').default,
+ NavigationView: require('./components/navigation/View.vue').default,
  Stacks: require('./components/stacks/Stacks.vue').default,
  TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
  TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
@@ -163,6 +164,10 @@ Statamic.app({
 
  stackCount() {
  return this.$stacks.count();
+ },
+
+ wrapperClass() {
+ return this.$config.get('wrapperClass', 'max-w-xl');
  }
 
  },

resources/js/bootstrap/fieldtypes.js

@@ -13,7 +13,6 @@ Vue.component('slug-fieldtype', require('../components/fieldtypes/SlugFieldtype.
 // Fieldtypes
 import FieldsetFieldtype from '../components/fieldtypes/FieldsetFieldtype.vue'
 import RevealerFieldtype from '../components/fieldtypes/RevealerFieldtype.vue'
-import RoutesFieldtype from '../components/fieldtypes/RoutesFieldtype.vue'
 import StatusFieldtype from '../components/fieldtypes/StatusFieldtype.vue'
 import TemplateFieldtype from '../components/fieldtypes/TemplateFieldtype.vue'
 
@@ -25,6 +24,7 @@ Vue.component('bard-fieldtype', require('../components/fieldtypes/bard/BardField
 Vue.component('bard_buttons_setting-fieldtype', require('../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue').default);
 Vue.component('checkboxes-fieldtype', require('../components/fieldtypes/CheckboxesFieldtype.vue').default);
 Vue.component('code-fieldtype', require('../components/fieldtypes/CodeFieldtype.vue').default);
+Vue.component('collection_routes-fieldtype', require('../components/collections/Routes.vue').default);
 Vue.component('color-fieldtype', require('../components/fieldtypes/ColorFieldtype.vue').default);
 Vue.component('date-fieldtype', require('../components/fieldtypes/DateFieldtype.vue').default);
 Vue.component('fieldset-fieldtype', FieldsetFieldtype);
@@ -37,17 +37,16 @@ Vue.component('list-fieldtype', require('../components/fieldtypes/ListFieldtype.
 Vue.component('markdown-fieldtype', require('../components/fieldtypes/MarkdownFieldtype.vue').default);
 Vue.component('radio-fieldtype', require('../components/fieldtypes/RadioFieldtype.vue').default);
 Vue.component('range-fieldtype', require('../components/fieldtypes/RangeFieldtype.vue').default);
+Vue.component('redirect-fieldtype', require('../components/fieldtypes/RedirectFieldtype.vue').default);
 Vue.component('relationship-fieldtype', require('../components/fieldtypes/relationship/RelationshipFieldtype.vue').default);
 Vue.component('relationship-fieldtype-index', require('../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue').default);
 Vue.component('replicator-fieldtype', require('../components/fieldtypes/replicator/Replicator.vue').default);
 Vue.component('replicator-fieldtype-index', require('../components/fieldtypes/replicator/ReplicatorIndex.vue').default);
 Vue.component('revealer-fieldtype', RevealerFieldtype);
-Vue.component('routes-fieldtype', RoutesFieldtype);
 Vue.component('section-fieldtype', require('../components/fieldtypes/SectionFieldtype.vue').default);
 Vue.component('select-fieldtype', require('../components/fieldtypes/SelectFieldtype.vue').default);
 Vue.component('sets-fieldtype', require('../components/fieldtypes/replicator/SetsFieldtype.vue').default);
 Vue.component('status-fieldtype', StatusFieldtype);
-Vue.component('structure_sites-fieldtype', require('../components/structures/Sites.vue').default);
 Vue.component('table-fieldtype', require('../components/fieldtypes/TableFieldtype.vue').default);
 Vue.component('tags-fieldtype', require('../components/fieldtypes/TagsFieldtype.vue').default);
 Vue.component('tags-fieldtype-index', require('../components/fieldtypes/TagsIndexFieldtype.vue').default);

resources/js/components/DropdownItem.vue

@@ -12,7 +12,7 @@ export default {
  props: ['text', 'redirect', 'externalLink'],
 
  methods: {
- selectAndClose() {
+ selectAndClose($event) {
  if (this.redirect) {
  location.href = this.redirect;
  return;
@@ -23,7 +23,7 @@ export default {
  return;
  }
 
- this.$emit('click');
+ this.$emit('click', $event);
 
  this.$parent.close();
  }

resources/js/components/collections/DeleteEntryConfirmation.vue

@@ -0,0 +1,42 @@
+<template>
+
+ <modal name="delete-entry-confirmation" :pivotY="0.1" :overflow="false">
+ <div class="confirmation-modal flex flex-col h-full">
+ <div class="text-lg font-medium p-2 pb-0">
+ {{ __('Delete Entry') }}
+ </div>
+ <div class="flex-1 px-2 py-3 text-grey">
+ <p class="mb-2">Are you sure you want to delete this entry?</p>
+ <label class="flex items-center" v-if="children">
+ <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
+ {{ __n('Delete child entry|Delete :count child entries', children) }}
+ </label>
+ </div>
+ <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
+ <button class="text-grey hover:text-grey-90"
+ @click="$emit('cancel')"
+ v-text="__('Cancel')" />
+ <button class="btn ml-2 btn-danger"
+ @click="$emit('confirm', shouldDeleteChildren)"
+ v-text="__('Delete')" />
+ </div>
+ </div>
+ </modal>
+
+</template>
+
+<script>
+export default {
+
+ props: {
+ children: Number
+ },
+
+ data() {
+ return {
+ shouldDeleteChildren: false
+ }
+ }
+
+}
+</script>

resources/js/components/collections/EditForm.vue

@@ -33,14 +33,11 @@ export default {
  blueprint: Object,
  initialValues: Object,
  meta: Object,
- initialTitle: String,
- url: String,
- listingUrl: String,
+ url: String
  },
 
  data() {
  return {
- title: this.initialTitle,
  values: this.initialValues,
  error: null,
  errors: {},
@@ -60,7 +57,6 @@ export default {
 
  this.$axios.patch(this.url, this.values).then(response => {
  this.saving = false;
- this.title = response.data.title;
  this.$toast.success(__('Saved'));
  this.$refs.container.saved();
  }).catch(e => this.handleAxiosError(e));

resources/js/components/collections/Routes.vue

@@ -0,0 +1,118 @@
+<template>
+
+ <div>
+ <div v-if="hasMultipleSites">
+ <div class="radio-fieldtype mb-1">
+ <radio-fieldtype handle="route_mode" v-model="routeMode" :config="{
+ inline: true,
+ options: {
+ single: 'Single route',
+ multiple: 'Separate route for each site',
+ }
+ }" />
+ </div>
+ <table class="grid-table" v-if="perSiteRouting">
+ <thead>
+ <tr>
+ <th>Site</th>
+ <th class="w-2/3">Route</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="site in sites" :key="site.handle">
+ <td class="align-middle" v-text="site.name" />
+ <td>
+ <text-input
+ class="font-mono text-xs"
+ :value="value[site.handle]"
+ @input="updateSiteRoute(site.handle, $event)" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div v-if="!hasMultipleSites || !perSiteRouting">
+ <text-input v-model="singleRoute" class="font-mono text-xs" />
+ </div>
+ </div>
+
+</template>
+
+<script>
+export default {
+
+ mixins: [Fieldtype],
+
+ inject: ['storeName'],
+
+ data() {
+ return {
+ routeMode: null,
+ singleRoute: null,
+ }
+ },
+
+ created() {
+ this.routeMode = this.identicalRoutes ? 'single' : 'multiple';
+ },
+
+ computed: {
+
+ sites() {
+ let state = this.$store.state.publish[this.storeName];
+
+ if (!state.values.sites) return [];
+
+ return state.values.sites.map((handle, i) => {
+ return {
+ handle,
+ name: state.meta.sites.data[i].title
+ }
+ });
+ },
+
+ hasMultipleSites() {
+ return this.sites.length > 1;
+ },
+
+ perSiteRouting() {
+ return this.routeMode === 'multiple';
+ },
+
+ identicalRoutes() {
+ return _.uniq(Object.values(this.value)).length === 1;
+ }
+
+ },
+
+ watch: {
+
+ singleRoute(route) {
+ this.update(route);
+ },
+
+ routeMode(mode) {
+ if (mode === 'single') {
+ this.singleRoute = Object.values(this.value)[0];
+ } else {
+ let value = {};
+ this.sites.forEach(site => value[site.handle] = '');
+ this.update(value);
+ }
+ }
+
+ },
+
+ methods: {
+
+ updateSiteRoute(site, route) {
+ let value = this.value;
+ value[site] = route;
+ this.update(value);
+ }
+
+ }
+
+}
+</script>

composer.json

@@ -20,7 +20,7 @@
  "pixelfear/composer-dist-plugin": "^0.1.0",
  "scrumpy/html-to-prosemirror": "^0.6.0",
  "scrumpy/prosemirror-to-html": "^0.8.0",
- "spatie/blink": "^1.1",
+ "spatie/blink": "^1.1.2",
  "statamic/stringy": "^3.1",
  "symfony/var-exporter": "^4.3",
  "symfony/yaml": "^4.1@dev",

config/stache.php

@@ -48,9 +48,9 @@
  'directory' => base_path('content/collections'),
  ],
 
- 'structures' => [
- 'class' => Stores\StructuresStore::class,
- 'directory' => base_path('content/structures'),
+ 'navigation' => [
+ 'class' => Stores\NavigationStore::class,
+ 'directory' => base_path('content/navigation'),
  ],
 
  'globals' => [

resources/blueprints/entry_link.yaml

@@ -0,0 +1,11 @@
+title: Link
+fields:
+ -
+ handle: title
+ field:
+ type: text
+ -
+ handle: redirect
+ field:
+ type: redirect
+ required: true

resources/js/app.js

@@ -103,7 +103,6 @@ Statamic.app({
  components: {
  GlobalSearch: require('./components/GlobalSearch.vue').default,
  SiteSelector: require('./components/SiteSelector.vue').default,
- PageTree: require('./components/structures/PageTree.vue').default,
  Login: require('./components/login/login'),
  LoginModal: require('./components/login/LoginModal.vue').default,
  BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
@@ -128,10 +127,12 @@ Statamic.app({
  CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
  CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
  CollectionEditForm: require('./components/collections/EditForm.vue').default,
+ CollectionView: require('./components/collections/View.vue').default,
  SessionExpiry: require('./components/SessionExpiry.vue').default,
- StructureWizard: require('./components/structures/Wizard.vue').default,
- StructureListing: require('./components/structures/Listing.vue').default,
- StructureEditForm: require('./components/structures/EditForm.vue').default,
+ NavigationListing: require('./components/navigation/Listing.vue').default,
+ NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
+ NavigationEditForm: require('./components/navigation/EditForm.vue').default,
+ NavigationView: require('./components/navigation/View.vue').default,
  Stacks: require('./components/stacks/Stacks.vue').default,
  TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
  TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
@@ -163,6 +164,10 @@ Statamic.app({
 
  stackCount() {
  return this.$stacks.count();
+ },
+
+ wrapperClass() {
+ return this.$config.get('wrapperClass', 'max-w-xl');
  }
 
  },

resources/js/bootstrap/fieldtypes.js

@@ -13,7 +13,6 @@ Vue.component('slug-fieldtype', require('../components/fieldtypes/SlugFieldtype.
 // Fieldtypes
 import FieldsetFieldtype from '../components/fieldtypes/FieldsetFieldtype.vue'
 import RevealerFieldtype from '../components/fieldtypes/RevealerFieldtype.vue'
-import RoutesFieldtype from '../components/fieldtypes/RoutesFieldtype.vue'
 import StatusFieldtype from '../components/fieldtypes/StatusFieldtype.vue'
 import TemplateFieldtype from '../components/fieldtypes/TemplateFieldtype.vue'
 
@@ -25,6 +24,7 @@ Vue.component('bard-fieldtype', require('../components/fieldtypes/bard/BardField
 Vue.component('bard_buttons_setting-fieldtype', require('../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue').default);
 Vue.component('checkboxes-fieldtype', require('../components/fieldtypes/CheckboxesFieldtype.vue').default);
 Vue.component('code-fieldtype', require('../components/fieldtypes/CodeFieldtype.vue').default);
+Vue.component('collection_routes-fieldtype', require('../components/collections/Routes.vue').default);
 Vue.component('color-fieldtype', require('../components/fieldtypes/ColorFieldtype.vue').default);
 Vue.component('date-fieldtype', require('../components/fieldtypes/DateFieldtype.vue').default);
 Vue.component('fieldset-fieldtype', FieldsetFieldtype);
@@ -37,17 +37,16 @@ Vue.component('list-fieldtype', require('../components/fieldtypes/ListFieldtype.
 Vue.component('markdown-fieldtype', require('../components/fieldtypes/MarkdownFieldtype.vue').default);
 Vue.component('radio-fieldtype', require('../components/fieldtypes/RadioFieldtype.vue').default);
 Vue.component('range-fieldtype', require('../components/fieldtypes/RangeFieldtype.vue').default);
+Vue.component('redirect-fieldtype', require('../components/fieldtypes/RedirectFieldtype.vue').default);
 Vue.component('relationship-fieldtype', require('../components/fieldtypes/relationship/RelationshipFieldtype.vue').default);
 Vue.component('relationship-fieldtype-index', require('../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue').default);
 Vue.component('replicator-fieldtype', require('../components/fieldtypes/replicator/Replicator.vue').default);
 Vue.component('replicator-fieldtype-index', require('../components/fieldtypes/replicator/ReplicatorIndex.vue').default);
 Vue.component('revealer-fieldtype', RevealerFieldtype);
-Vue.component('routes-fieldtype', RoutesFieldtype);
 Vue.component('section-fieldtype', require('../components/fieldtypes/SectionFieldtype.vue').default);
 Vue.component('select-fieldtype', require('../components/fieldtypes/SelectFieldtype.vue').default);
 Vue.component('sets-fieldtype', require('../components/fieldtypes/replicator/SetsFieldtype.vue').default);
 Vue.component('status-fieldtype', StatusFieldtype);
-Vue.component('structure_sites-fieldtype', require('../components/structures/Sites.vue').default);
 Vue.component('table-fieldtype', require('../components/fieldtypes/TableFieldtype.vue').default);
 Vue.component('tags-fieldtype', require('../components/fieldtypes/TagsFieldtype.vue').default);
 Vue.component('tags-fieldtype-index', require('../components/fieldtypes/TagsIndexFieldtype.vue').default);

resources/js/components/DropdownItem.vue

@@ -12,7 +12,7 @@ export default {
  props: ['text', 'redirect', 'externalLink'],
 
  methods: {
- selectAndClose() {
+ selectAndClose($event) {
  if (this.redirect) {
  location.href = this.redirect;
  return;
@@ -23,7 +23,7 @@ export default {
  return;
  }
 
- this.$emit('click');
+ this.$emit('click', $event);
 
  this.$parent.close();
  }

resources/js/components/collections/DeleteEntryConfirmation.vue

@@ -0,0 +1,42 @@
+<template>
+
+ <modal name="delete-entry-confirmation" :pivotY="0.1" :overflow="false">
+ <div class="confirmation-modal flex flex-col h-full">
+ <div class="text-lg font-medium p-2 pb-0">
+ {{ __('Delete Entry') }}
+ </div>
+ <div class="flex-1 px-2 py-3 text-grey">
+ <p class="mb-2">Are you sure you want to delete this entry?</p>
+ <label class="flex items-center" v-if="children">
+ <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
+ {{ __n('Delete child entry|Delete :count child entries', children) }}
+ </label>
+ </div>
+ <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
+ <button class="text-grey hover:text-grey-90"
+ @click="$emit('cancel')"
+ v-text="__('Cancel')" />
+ <button class="btn ml-2 btn-danger"
+ @click="$emit('confirm', shouldDeleteChildren)"
+ v-text="__('Delete')" />
+ </div>
+ </div>
+ </modal>
+
+</template>
+
+<script>
+export default {
+
+ props: {
+ children: Number
+ },
+
+ data() {
+ return {
+ shouldDeleteChildren: false
+ }
+ }
+
+}
+</script>

resources/js/components/collections/EditForm.vue

@@ -33,14 +33,11 @@ export default {
  blueprint: Object,
  initialValues: Object,
  meta: Object,
- initialTitle: String,
- url: String,
- listingUrl: String,
+ url: String
  },
 
  data() {
  return {
- title: this.initialTitle,
  values: this.initialValues,
  error: null,
  errors: {},
@@ -60,7 +57,6 @@ export default {
 
  this.$axios.patch(this.url, this.values).then(response => {
  this.saving = false;
- this.title = response.data.title;
  this.$toast.success(__('Saved'));
  this.$refs.container.saved();
  }).catch(e => this.handleAxiosError(e));

resources/js/components/collections/Routes.vue

@@ -0,0 +1,118 @@
+<template>
+
+ <div>
+ <div v-if="hasMultipleSites">
+ <div class="radio-fieldtype mb-1">
+ <radio-fieldtype handle="route_mode" v-model="routeMode" :config="{
+ inline: true,
+ options: {
+ single: 'Single route',
+ multiple: 'Separate route for each site',
+ }
+ }" />
+ </div>
+ <table class="grid-table" v-if="perSiteRouting">
+ <thead>
+ <tr>
+ <th>Site</th>
+ <th class="w-2/3">Route</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="site in sites" :key="site.handle">
+ <td class="align-middle" v-text="site.name" />
+ <td>
+ <text-input
+ class="font-mono text-xs"
+ :value="value[site.handle]"
+ @input="updateSiteRoute(site.handle, $event)" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div v-if="!hasMultipleSites || !perSiteRouting">
+ <text-input v-model="singleRoute" class="font-mono text-xs" />
+ </div>
+ </div>
+
+</template>
+
+<script>
+export default {
+
+ mixins: [Fieldtype],
+
+ inject: ['storeName'],
+
+ data() {
+ return {
+ routeMode: null,
+ singleRoute: null,
+ }
+ },
+
+ created() {
+ this.routeMode = this.identicalRoutes ? 'single' : 'multiple';
+ },
+
+ computed: {
+
+ sites() {
+ let state = this.$store.state.publish[this.storeName];
+
+ if (!state.values.sites) return [];
+
+ return state.values.sites.map((handle, i) => {
+ return {
+ handle,
+ name: state.meta.sites.data[i].title
+ }
+ });
+ },
+
+ hasMultipleSites() {
+ return this.sites.length > 1;
+ },
+
+ perSiteRouting() {
+ return this.routeMode === 'multiple';
+ },
+
+ identicalRoutes() {
+ return _.uniq(Object.values(this.value)).length === 1;
+ }
+
+ },
+
+ watch: {
+
+ singleRoute(route) {
+ this.update(route);
+ },
+
+ routeMode(mode) {
+ if (mode === 'single') {
+ this.singleRoute = Object.values(this.value)[0];
+ } else {
+ let value = {};
+ this.sites.forEach(site => value[site.handle] = '');
+ this.update(value);
+ }
+ }
+
+ },
+
+ methods: {
+
+ updateSiteRoute(site, route) {
+ let value = this.value;
+ value[site] = route;
+ this.update(value);
+ }
+
+ }
+
+}
+</script>

composer.json

@@ -20,7 +20,7 @@
  "pixelfear/composer-dist-plugin": "^0.1.0",
  "scrumpy/html-to-prosemirror": "^0.6.0",
  "scrumpy/prosemirror-to-html": "^0.8.0",
- "spatie/blink": "^1.1",
+ "spatie/blink": "^1.1.2",
  "statamic/stringy": "^3.1",
  "symfony/var-exporter": "^4.3",
  "symfony/yaml": "^4.1@dev",

config/stache.php

@@ -48,9 +48,9 @@
  'directory' => base_path('content/collections'),
  ],
 
- 'structures' => [
- 'class' => Stores\StructuresStore::class,
- 'directory' => base_path('content/structures'),
+ 'navigation' => [
+ 'class' => Stores\NavigationStore::class,
+ 'directory' => base_path('content/navigation'),
  ],
 
  'globals' => [

resources/blueprints/entry_link.yaml

@@ -0,0 +1,11 @@
+title: Link
+fields:
+ -
+ handle: title
+ field:
+ type: text
+ -
+ handle: redirect
+ field:
+ type: redirect
+ required: true

resources/js/app.js

@@ -103,7 +103,6 @@ Statamic.app({
  components: {
  GlobalSearch: require('./components/GlobalSearch.vue').default,
  SiteSelector: require('./components/SiteSelector.vue').default,
- PageTree: require('./components/structures/PageTree.vue').default,
  Login: require('./components/login/login'),
  LoginModal: require('./components/login/LoginModal.vue').default,
  BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
@@ -128,10 +127,12 @@ Statamic.app({
  CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
  CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
  CollectionEditForm: require('./components/collections/EditForm.vue').default,
+ CollectionView: require('./components/collections/View.vue').default,
  SessionExpiry: require('./components/SessionExpiry.vue').default,
- StructureWizard: require('./components/structures/Wizard.vue').default,
- StructureListing: require('./components/structures/Listing.vue').default,
- StructureEditForm: require('./components/structures/EditForm.vue').default,
+ NavigationListing: require('./components/navigation/Listing.vue').default,
+ NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
+ NavigationEditForm: require('./components/navigation/EditForm.vue').default,
+ NavigationView: require('./components/navigation/View.vue').default,
  Stacks: require('./components/stacks/Stacks.vue').default,
  TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
  TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
@@ -163,6 +164,10 @@ Statamic.app({
 
  stackCount() {
  return this.$stacks.count();
+ },
+
+ wrapperClass() {
+ return this.$config.get('wrapperClass', 'max-w-xl');
  }
 
  },

resources/js/bootstrap/fieldtypes.js

@@ -13,7 +13,6 @@ Vue.component('slug-fieldtype', require('../components/fieldtypes/SlugFieldtype.
 // Fieldtypes
 import FieldsetFieldtype from '../components/fieldtypes/FieldsetFieldtype.vue'
 import RevealerFieldtype from '../components/fieldtypes/RevealerFieldtype.vue'
-import RoutesFieldtype from '../components/fieldtypes/RoutesFieldtype.vue'
 import StatusFieldtype from '../components/fieldtypes/StatusFieldtype.vue'
 import TemplateFieldtype from '../components/fieldtypes/TemplateFieldtype.vue'
 
@@ -25,6 +24,7 @@ Vue.component('bard-fieldtype', require('../components/fieldtypes/bard/BardField
 Vue.component('bard_buttons_setting-fieldtype', require('../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue').default);
 Vue.component('checkboxes-fieldtype', require('../components/fieldtypes/CheckboxesFieldtype.vue').default);
 Vue.component('code-fieldtype', require('../components/fieldtypes/CodeFieldtype.vue').default);
+Vue.component('collection_routes-fieldtype', require('../components/collections/Routes.vue').default);
 Vue.component('color-fieldtype', require('../components/fieldtypes/ColorFieldtype.vue').default);
 Vue.component('date-fieldtype', require('../components/fieldtypes/DateFieldtype.vue').default);
 Vue.component('fieldset-fieldtype', FieldsetFieldtype);
@@ -37,17 +37,16 @@ Vue.component('list-fieldtype', require('../components/fieldtypes/ListFieldtype.
 Vue.component('markdown-fieldtype', require('../components/fieldtypes/MarkdownFieldtype.vue').default);
 Vue.component('radio-fieldtype', require('../components/fieldtypes/RadioFieldtype.vue').default);
 Vue.component('range-fieldtype', require('../components/fieldtypes/RangeFieldtype.vue').default);
+Vue.component('redirect-fieldtype', require('../components/fieldtypes/RedirectFieldtype.vue').default);
 Vue.component('relationship-fieldtype', require('../components/fieldtypes/relationship/RelationshipFieldtype.vue').default);
 Vue.component('relationship-fieldtype-index', require('../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue').default);
 Vue.component('replicator-fieldtype', require('../components/fieldtypes/replicator/Replicator.vue').default);
 Vue.component('replicator-fieldtype-index', require('../components/fieldtypes/replicator/ReplicatorIndex.vue').default);
 Vue.component('revealer-fieldtype', RevealerFieldtype);
-Vue.component('routes-fieldtype', RoutesFieldtype);
 Vue.component('section-fieldtype', require('../components/fieldtypes/SectionFieldtype.vue').default);
 Vue.component('select-fieldtype', require('../components/fieldtypes/SelectFieldtype.vue').default);
 Vue.component('sets-fieldtype', require('../components/fieldtypes/replicator/SetsFieldtype.vue').default);
 Vue.component('status-fieldtype', StatusFieldtype);
-Vue.component('structure_sites-fieldtype', require('../components/structures/Sites.vue').default);
 Vue.component('table-fieldtype', require('../components/fieldtypes/TableFieldtype.vue').default);
 Vue.component('tags-fieldtype', require('../components/fieldtypes/TagsFieldtype.vue').default);
 Vue.component('tags-fieldtype-index', require('../components/fieldtypes/TagsIndexFieldtype.vue').default);

resources/js/components/DropdownItem.vue

@@ -12,7 +12,7 @@ export default {
  props: ['text', 'redirect', 'externalLink'],
 
  methods: {
- selectAndClose() {
+ selectAndClose($event) {
  if (this.redirect) {
  location.href = this.redirect;
  return;
@@ -23,7 +23,7 @@ export default {
  return;
  }
 
- this.$emit('click');
+ this.$emit('click', $event);
 
  this.$parent.close();
  }

resources/js/components/collections/DeleteEntryConfirmation.vue

@@ -0,0 +1,42 @@
+<template>
+
+ <modal name="delete-entry-confirmation" :pivotY="0.1" :overflow="false">
+ <div class="confirmation-modal flex flex-col h-full">
+ <div class="text-lg font-medium p-2 pb-0">
+ {{ __('Delete Entry') }}
+ </div>
+ <div class="flex-1 px-2 py-3 text-grey">
+ <p class="mb-2">Are you sure you want to delete this entry?</p>
+ <label class="flex items-center" v-if="children">
+ <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
+ {{ __n('Delete child entry|Delete :count child entries', children) }}
+ </label>
+ </div>
+ <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
+ <button class="text-grey hover:text-grey-90"
+ @click="$emit('cancel')"
+ v-text="__('Cancel')" />
+ <button class="btn ml-2 btn-danger"
+ @click="$emit('confirm', shouldDeleteChildren)"
+ v-text="__('Delete')" />
+ </div>
+ </div>
+ </modal>
+
+</template>
+
+<script>
+export default {
+
+ props: {
+ children: Number
+ },
+
+ data() {
+ return {
+ shouldDeleteChildren: false
+ }
+ }
+
+}
+</script>

resources/js/components/collections/EditForm.vue

@@ -33,14 +33,11 @@ export default {
  blueprint: Object,
  initialValues: Object,
  meta: Object,
- initialTitle: String,
- url: String,
- listingUrl: String,
+ url: String
  },
 
  data() {
  return {
- title: this.initialTitle,
  values: this.initialValues,
  error: null,
  errors: {},
@@ -60,7 +57,6 @@ export default {
 
  this.$axios.patch(this.url, this.values).then(response => {
  this.saving = false;
- this.title = response.data.title;
  this.$toast.success(__('Saved'));
  this.$refs.container.saved();
  }).catch(e => this.handleAxiosError(e));

resources/js/components/collections/Routes.vue

@@ -0,0 +1,118 @@
+<template>
+
+ <div>
+ <div v-if="hasMultipleSites">
+ <div class="radio-fieldtype mb-1">
+ <radio-fieldtype handle="route_mode" v-model="routeMode" :config="{
+ inline: true,
+ options: {
+ single: 'Single route',
+ multiple: 'Separate route for each site',
+ }
+ }" />
+ </div>
+ <table class="grid-table" v-if="perSiteRouting">
+ <thead>
+ <tr>
+ <th>Site</th>
+ <th class="w-2/3">Route</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="site in sites" :key="site.handle">
+ <td class="align-middle" v-text="site.name" />
+ <td>
+ <text-input
+ class="font-mono text-xs"
+ :value="value[site.handle]"
+ @input="updateSiteRoute(site.handle, $event)" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div v-if="!hasMultipleSites || !perSiteRouting">
+ <text-input v-model="singleRoute" class="font-mono text-xs" />
+ </div>
+ </div>
+
+</template>
+
+<script>
+export default {
+
+ mixins: [Fieldtype],
+
+ inject: ['storeName'],
+
+ data() {
+ return {
+ routeMode: null,
+ singleRoute: null,
+ }
+ },
+
+ created() {
+ this.routeMode = this.identicalRoutes ? 'single' : 'multiple';
+ },
+
+ computed: {
+
+ sites() {
+ let state = this.$store.state.publish[this.storeName];
+
+ if (!state.values.sites) return [];
+
+ return state.values.sites.map((handle, i) => {
+ return {
+ handle,
+ name: state.meta.sites.data[i].title
+ }
+ });
+ },
+
+ hasMultipleSites() {
+ return this.sites.length > 1;
+ },
+
+ perSiteRouting() {
+ return this.routeMode === 'multiple';
+ },
+
+ identicalRoutes() {
+ return _.uniq(Object.values(this.value)).length === 1;
+ }
+
+ },
+
+ watch: {
+
+ singleRoute(route) {
+ this.update(route);
+ },
+
+ routeMode(mode) {
+ if (mode === 'single') {
+ this.singleRoute = Object.values(this.value)[0];
+ } else {
+ let value = {};
+ this.sites.forEach(site => value[site.handle] = '');
+ this.update(value);
+ }
+ }
+
+ },
+
+ methods: {
+
+ updateSiteRoute(site, route) {
+ let value = this.value;
+ value[site] = route;
+ this.update(value);
+ }
+
+ }
+
+}
+</script>

composer.json

@@ -20,7 +20,7 @@
  "pixelfear/composer-dist-plugin": "^0.1.0",
  "scrumpy/html-to-prosemirror": "^0.6.0",
  "scrumpy/prosemirror-to-html": "^0.8.0",
- "spatie/blink": "^1.1",
+ "spatie/blink": "^1.1.2",
  "statamic/stringy": "^3.1",
  "symfony/var-exporter": "^4.3",
  "symfony/yaml": "^4.1@dev",

config/stache.php

@@ -48,9 +48,9 @@
  'directory' => base_path('content/collections'),
  ],
 
- 'structures' => [
- 'class' => Stores\StructuresStore::class,
- 'directory' => base_path('content/structures'),
+ 'navigation' => [
+ 'class' => Stores\NavigationStore::class,
+ 'directory' => base_path('content/navigation'),
  ],
 
  'globals' => [

resources/blueprints/entry_link.yaml

@@ -0,0 +1,11 @@
+title: Link
+fields:
+ -
+ handle: title
+ field:
+ type: text
+ -
+ handle: redirect
+ field:
+ type: redirect
+ required: true

resources/js/app.js

@@ -103,7 +103,6 @@ Statamic.app({
  components: {
  GlobalSearch: require('./components/GlobalSearch.vue').default,
  SiteSelector: require('./components/SiteSelector.vue').default,
- PageTree: require('./components/structures/PageTree.vue').default,
  Login: require('./components/login/login'),
  LoginModal: require('./components/login/LoginModal.vue').default,
  BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
@@ -128,10 +127,12 @@ Statamic.app({
  CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
  CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
  CollectionEditForm: require('./components/collections/EditForm.vue').default,
+ CollectionView: require('./components/collections/View.vue').default,
  SessionExpiry: require('./components/SessionExpiry.vue').default,
- StructureWizard: require('./components/structures/Wizard.vue').default,
- StructureListing: require('./components/structures/Listing.vue').default,
- StructureEditForm: require('./components/structures/EditForm.vue').default,
+ NavigationListing: require('./components/navigation/Listing.vue').default,
+ NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
+ NavigationEditForm: require('./components/navigation/EditForm.vue').default,
+ NavigationView: require('./components/navigation/View.vue').default,
  Stacks: require('./components/stacks/Stacks.vue').default,
  TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
  TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
@@ -163,6 +164,10 @@ Statamic.app({
 
  stackCount() {
  return this.$stacks.count();
+ },
+
+ wrapperClass() {
+ return this.$config.get('wrapperClass', 'max-w-xl');
  }
 
  },

resources/js/bootstrap/fieldtypes.js

@@ -13,7 +13,6 @@ Vue.component('slug-fieldtype', require('../components/fieldtypes/SlugFieldtype.
 // Fieldtypes
 import FieldsetFieldtype from '../components/fieldtypes/FieldsetFieldtype.vue'
 import RevealerFieldtype from '../components/fieldtypes/RevealerFieldtype.vue'
-import RoutesFieldtype from '../components/fieldtypes/RoutesFieldtype.vue'
 import StatusFieldtype from '../components/fieldtypes/StatusFieldtype.vue'
 import TemplateFieldtype from '../components/fieldtypes/TemplateFieldtype.vue'
 
@@ -25,6 +24,7 @@ Vue.component('bard-fieldtype', require('../components/fieldtypes/bard/BardField
 Vue.component('bard_buttons_setting-fieldtype', require('../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue').default);
 Vue.component('checkboxes-fieldtype', require('../components/fieldtypes/CheckboxesFieldtype.vue').default);
 Vue.component('code-fieldtype', require('../components/fieldtypes/CodeFieldtype.vue').default);
+Vue.component('collection_routes-fieldtype', require('../components/collections/Routes.vue').default);
 Vue.component('color-fieldtype', require('../components/fieldtypes/ColorFieldtype.vue').default);
 Vue.component('date-fieldtype', require('../components/fieldtypes/DateFieldtype.vue').default);
 Vue.component('fieldset-fieldtype', FieldsetFieldtype);
@@ -37,17 +37,16 @@ Vue.component('list-fieldtype', require('../components/fieldtypes/ListFieldtype.
 Vue.component('markdown-fieldtype', require('../components/fieldtypes/MarkdownFieldtype.vue').default);
 Vue.component('radio-fieldtype', require('../components/fieldtypes/RadioFieldtype.vue').default);
 Vue.component('range-fieldtype', require('../components/fieldtypes/RangeFieldtype.vue').default);
+Vue.component('redirect-fieldtype', require('../components/fieldtypes/RedirectFieldtype.vue').default);
 Vue.component('relationship-fieldtype', require('../components/fieldtypes/relationship/RelationshipFieldtype.vue').default);
 Vue.component('relationship-fieldtype-index', require('../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue').default);
 Vue.component('replicator-fieldtype', require('../components/fieldtypes/replicator/Replicator.vue').default);
 Vue.component('replicator-fieldtype-index', require('../components/fieldtypes/replicator/ReplicatorIndex.vue').default);
 Vue.component('revealer-fieldtype', RevealerFieldtype);
-Vue.component('routes-fieldtype', RoutesFieldtype);
 Vue.component('section-fieldtype', require('../components/fieldtypes/SectionFieldtype.vue').default);
 Vue.component('select-fieldtype', require('../components/fieldtypes/SelectFieldtype.vue').default);
 Vue.component('sets-fieldtype', require('../components/fieldtypes/replicator/SetsFieldtype.vue').default);
 Vue.component('status-fieldtype', StatusFieldtype);
-Vue.component('structure_sites-fieldtype', require('../components/structures/Sites.vue').default);
 Vue.component('table-fieldtype', require('../components/fieldtypes/TableFieldtype.vue').default);
 Vue.component('tags-fieldtype', require('../components/fieldtypes/TagsFieldtype.vue').default);
 Vue.component('tags-fieldtype-index', require('../components/fieldtypes/TagsIndexFieldtype.vue').default);

resources/js/components/DropdownItem.vue

@@ -12,7 +12,7 @@ export default {
  props: ['text', 'redirect', 'externalLink'],
 
  methods: {
- selectAndClose() {
+ selectAndClose($event) {
  if (this.redirect) {
  location.href = this.redirect;
  return;
@@ -23,7 +23,7 @@ export default {
  return;
  }
 
- this.$emit('click');
+ this.$emit('click', $event);
 
  this.$parent.close();
  }

resources/js/components/collections/DeleteEntryConfirmation.vue

@@ -0,0 +1,42 @@
+<template>
+
+ <modal name="delete-entry-confirmation" :pivotY="0.1" :overflow="false">
+ <div class="confirmation-modal flex flex-col h-full">
+ <div class="text-lg font-medium p-2 pb-0">
+ {{ __('Delete Entry') }}
+ </div>
+ <div class="flex-1 px-2 py-3 text-grey">
+ <p class="mb-2">Are you sure you want to delete this entry?</p>
+ <label class="flex items-center" v-if="children">
+ <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
+ {{ __n('Delete child entry|Delete :count child entries', children) }}
+ </label>
+ </div>
+ <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
+ <button class="text-grey hover:text-grey-90"
+ @click="$emit('cancel')"
+ v-text="__('Cancel')" />
+ <button class="btn ml-2 btn-danger"
+ @click="$emit('confirm', shouldDeleteChildren)"
+ v-text="__('Delete')" />
+ </div>
+ </div>
+ </modal>
+
+</template>
+
+<script>
+export default {
+
+ props: {
+ children: Number
+ },
+
+ data() {
+ return {
+ shouldDeleteChildren: false
+ }
+ }
+
+}
+</script>

resources/js/components/collections/EditForm.vue

@@ -33,14 +33,11 @@ export default {
  blueprint: Object,
  initialValues: Object,
  meta: Object,
- initialTitle: String,
- url: String,
- listingUrl: String,
+ url: String
  },
 
  data() {
  return {
- title: this.initialTitle,
  values: this.initialValues,
  error: null,
  errors: {},
@@ -60,7 +57,6 @@ export default {
 
  this.$axios.patch(this.url, this.values).then(response => {
  this.saving = false;
- this.title = response.data.title;
  this.$toast.success(__('Saved'));
  this.$refs.container.saved();
  }).catch(e => this.handleAxiosError(e));

resources/js/components/collections/Routes.vue

@@ -0,0 +1,118 @@
+<template>
+
+ <div>
+ <div v-if="hasMultipleSites">
+ <div class="radio-fieldtype mb-1">
+ <radio-fieldtype handle="route_mode" v-model="routeMode" :config="{
+ inline: true,
+ options: {
+ single: 'Single route',
+ multiple: 'Separate route for each site',
+ }
+ }" />
+ </div>
+ <table class="grid-table" v-if="perSiteRouting">
+ <thead>
+ <tr>
+ <th>Site</th>
+ <th class="w-2/3">Route</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="site in sites" :key="site.handle">
+ <td class="align-middle" v-text="site.name" />
+ <td>
+ <text-input
+ class="font-mono text-xs"
+ :value="value[site.handle]"
+ @input="updateSiteRoute(site.handle, $event)" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div v-if="!hasMultipleSites || !perSiteRouting">
+ <text-input v-model="singleRoute" class="font-mono text-xs" />
+ </div>
+ </div>
+
+</template>
+
+<script>
+export default {
+
+ mixins: [Fieldtype],
+
+ inject: ['storeName'],
+
+ data() {
+ return {
+ routeMode: null,
+ singleRoute: null,
+ }
+ },
+
+ created() {
+ this.routeMode = this.identicalRoutes ? 'single' : 'multiple';
+ },
+
+ computed: {
+
+ sites() {
+ let state = this.$store.state.publish[this.storeName];
+
+ if (!state.values.sites) return [];
+
+ return state.values.sites.map((handle, i) => {
+ return {
+ handle,
+ name: state.meta.sites.data[i].title
+ }
+ });
+ },
+
+ hasMultipleSites() {
+ return this.sites.length > 1;
+ },
+
+ perSiteRouting() {
+ return this.routeMode === 'multiple';
+ },
+
+ identicalRoutes() {
+ return _.uniq(Object.values(this.value)).length === 1;
+ }
+
+ },
+
+ watch: {
+
+ singleRoute(route) {
+ this.update(route);
+ },
+
+ routeMode(mode) {
+ if (mode === 'single') {
+ this.singleRoute = Object.values(this.value)[0];
+ } else {
+ let value = {};
+ this.sites.forEach(site => value[site.handle] = '');
+ this.update(value);
+ }
+ }
+
+ },
+
+ methods: {
+
+ updateSiteRoute(site, route) {
+ let value = this.value;
+ value[site] = route;
+ this.update(value);
+ }
+
+ }
+
+}
+</script>

composer.json

@@ -20,7 +20,7 @@
  "pixelfear/composer-dist-plugin": "^0.1.0",
  "scrumpy/html-to-prosemirror": "^0.6.0",
  "scrumpy/prosemirror-to-html": "^0.8.0",
- "spatie/blink": "^1.1",
+ "spatie/blink": "^1.1.2",
  "statamic/stringy": "^3.1",
  "symfony/var-exporter": "^4.3",
  "symfony/yaml": "^4.1@dev",

config/stache.php

@@ -48,9 +48,9 @@
  'directory' => base_path('content/collections'),
  ],
 
- 'structures' => [
- 'class' => Stores\StructuresStore::class,
- 'directory' => base_path('content/structures'),
+ 'navigation' => [
+ 'class' => Stores\NavigationStore::class,
+ 'directory' => base_path('content/navigation'),
  ],
 
  'globals' => [

resources/blueprints/entry_link.yaml

@@ -0,0 +1,11 @@
+title: Link
+fields:
+ -
+ handle: title
+ field:
+ type: text
+ -
+ handle: redirect
+ field:
+ type: redirect
+ required: true

resources/js/app.js

@@ -103,7 +103,6 @@ Statamic.app({
  components: {
  GlobalSearch: require('./components/GlobalSearch.vue').default,
  SiteSelector: require('./components/SiteSelector.vue').default,
- PageTree: require('./components/structures/PageTree.vue').default,
  Login: require('./components/login/login'),
  LoginModal: require('./components/login/LoginModal.vue').default,
  BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
@@ -128,10 +127,12 @@ Statamic.app({
  CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
  CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
  CollectionEditForm: require('./components/collections/EditForm.vue').default,
+ CollectionView: require('./components/collections/View.vue').default,
  SessionExpiry: require('./components/SessionExpiry.vue').default,
- StructureWizard: require('./components/structures/Wizard.vue').default,
- StructureListing: require('./components/structures/Listing.vue').default,
- StructureEditForm: require('./components/structures/EditForm.vue').default,
+ NavigationListing: require('./components/navigation/Listing.vue').default,
+ NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
+ NavigationEditForm: require('./components/navigation/EditForm.vue').default,
+ NavigationView: require('./components/navigation/View.vue').default,
  Stacks: require('./components/stacks/Stacks.vue').default,
  TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
  TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
@@ -163,6 +164,10 @@ Statamic.app({
 
  stackCount() {
  return this.$stacks.count();
+ },
+
+ wrapperClass() {
+ return this.$config.get('wrapperClass', 'max-w-xl');
  }
 
  },

resources/js/bootstrap/fieldtypes.js

@@ -13,7 +13,6 @@ Vue.component('slug-fieldtype', require('../components/fieldtypes/SlugFieldtype.
 // Fieldtypes
 import FieldsetFieldtype from '../components/fieldtypes/FieldsetFieldtype.vue'
 import RevealerFieldtype from '../components/fieldtypes/RevealerFieldtype.vue'
-import RoutesFieldtype from '../components/fieldtypes/RoutesFieldtype.vue'
 import StatusFieldtype from '../components/fieldtypes/StatusFieldtype.vue'
 import TemplateFieldtype from '../components/fieldtypes/TemplateFieldtype.vue'
 
@@ -25,6 +24,7 @@ Vue.component('bard-fieldtype', require('../components/fieldtypes/bard/BardField
 Vue.component('bard_buttons_setting-fieldtype', require('../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue').default);
 Vue.component('checkboxes-fieldtype', require('../components/fieldtypes/CheckboxesFieldtype.vue').default);
 Vue.component('code-fieldtype', require('../components/fieldtypes/CodeFieldtype.vue').default);
+Vue.component('collection_routes-fieldtype', require('../components/collections/Routes.vue').default);
 Vue.component('color-fieldtype', require('../components/fieldtypes/ColorFieldtype.vue').default);
 Vue.component('date-fieldtype', require('../components/fieldtypes/DateFieldtype.vue').default);
 Vue.component('fieldset-fieldtype', FieldsetFieldtype);
@@ -37,17 +37,16 @@ Vue.component('list-fieldtype', require('../components/fieldtypes/ListFieldtype.
 Vue.component('markdown-fieldtype', require('../components/fieldtypes/MarkdownFieldtype.vue').default);
 Vue.component('radio-fieldtype', require('../components/fieldtypes/RadioFieldtype.vue').default);
 Vue.component('range-fieldtype', require('../components/fieldtypes/RangeFieldtype.vue').default);
+Vue.component('redirect-fieldtype', require('../components/fieldtypes/RedirectFieldtype.vue').default);
 Vue.component('relationship-fieldtype', require('../components/fieldtypes/relationship/RelationshipFieldtype.vue').default);
 Vue.component('relationship-fieldtype-index', require('../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue').default);
 Vue.component('replicator-fieldtype', require('../components/fieldtypes/replicator/Replicator.vue').default);
 Vue.component('replicator-fieldtype-index', require('../components/fieldtypes/replicator/ReplicatorIndex.vue').default);
 Vue.component('revealer-fieldtype', RevealerFieldtype);
-Vue.component('routes-fieldtype', RoutesFieldtype);
 Vue.component('section-fieldtype', require('../components/fieldtypes/SectionFieldtype.vue').default);
 Vue.component('select-fieldtype', require('../components/fieldtypes/SelectFieldtype.vue').default);
 Vue.component('sets-fieldtype', require('../components/fieldtypes/replicator/SetsFieldtype.vue').default);
 Vue.component('status-fieldtype', StatusFieldtype);
-Vue.component('structure_sites-fieldtype', require('../components/structures/Sites.vue').default);
 Vue.component('table-fieldtype', require('../components/fieldtypes/TableFieldtype.vue').default);
 Vue.component('tags-fieldtype', require('../components/fieldtypes/TagsFieldtype.vue').default);
 Vue.component('tags-fieldtype-index', require('../components/fieldtypes/TagsIndexFieldtype.vue').default);

resources/js/components/DropdownItem.vue

@@ -12,7 +12,7 @@ export default {
  props: ['text', 'redirect', 'externalLink'],
 
  methods: {
- selectAndClose() {
+ selectAndClose($event) {
  if (this.redirect) {
  location.href = this.redirect;
  return;
@@ -23,7 +23,7 @@ export default {
  return;
  }
 
- this.$emit('click');
+ this.$emit('click', $event);
 
  this.$parent.close();
  }

resources/js/components/collections/DeleteEntryConfirmation.vue

@@ -0,0 +1,42 @@
+<template>
+
+ <modal name="delete-entry-confirmation" :pivotY="0.1" :overflow="false">
+ <div class="confirmation-modal flex flex-col h-full">
+ <div class="text-lg font-medium p-2 pb-0">
+ {{ __('Delete Entry') }}
+ </div>
+ <div class="flex-1 px-2 py-3 text-grey">
+ <p class="mb-2">Are you sure you want to delete this entry?</p>
+ <label class="flex items-center" v-if="children">
+ <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
+ {{ __n('Delete child entry|Delete :count child entries', children) }}
+ </label>
+ </div>
+ <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
+ <button class="text-grey hover:text-grey-90"
+ @click="$emit('cancel')"
+ v-text="__('Cancel')" />
+ <button class="btn ml-2 btn-danger"
+ @click="$emit('confirm', shouldDeleteChildren)"
+ v-text="__('Delete')" />
+ </div>
+ </div>
+ </modal>
+
+</template>
+
+<script>
+export default {
+
+ props: {
+ children: Number
+ },
+
+ data() {
+ return {
+ shouldDeleteChildren: false
+ }
+ }
+
+}
+</script>

resources/js/components/collections/EditForm.vue

@@ -33,14 +33,11 @@ export default {
  blueprint: Object,
  initialValues: Object,
  meta: Object,
- initialTitle: String,
- url: String,
- listingUrl: String,
+ url: String
  },
 
  data() {
  return {
- title: this.initialTitle,
  values: this.initialValues,
  error: null,
  errors: {},
@@ -60,7 +57,6 @@ export default {
 
  this.$axios.patch(this.url, this.values).then(response => {
  this.saving = false;
- this.title = response.data.title;
  this.$toast.success(__('Saved'));
  this.$refs.container.saved();
  }).catch(e => this.handleAxiosError(e));

resources/js/components/collections/Routes.vue

@@ -0,0 +1,118 @@
+<template>
+
+ <div>
+ <div v-if="hasMultipleSites">
+ <div class="radio-fieldtype mb-1">
+ <radio-fieldtype handle="route_mode" v-model="routeMode" :config="{
+ inline: true,
+ options: {
+ single: 'Single route',
+ multiple: 'Separate route for each site',
+ }
+ }" />
+ </div>
+ <table class="grid-table" v-if="perSiteRouting">
+ <thead>
+ <tr>
+ <th>Site</th>
+ <th class="w-2/3">Route</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="site in sites" :key="site.handle">
+ <td class="align-middle" v-text="site.name" />
+ <td>
+ <text-input
+ class="font-mono text-xs"
+ :value="value[site.handle]"
+ @input="updateSiteRoute(site.handle, $event)" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div v-if="!hasMultipleSites || !perSiteRouting">
+ <text-input v-model="singleRoute" class="font-mono text-xs" />
+ </div>
+ </div>
+
+</template>
+
+<script>
+export default {
+
+ mixins: [Fieldtype],
+
+ inject: ['storeName'],
+
+ data() {
+ return {
+ routeMode: null,
+ singleRoute: null,
+ }
+ },
+
+ created() {
+ this.routeMode = this.identicalRoutes ? 'single' : 'multiple';
+ },
+
+ computed: {
+
+ sites() {
+ let state = this.$store.state.publish[this.storeName];
+
+ if (!state.values.sites) return [];
+
+ return state.values.sites.map((handle, i) => {
+ return {
+ handle,
+ name: state.meta.sites.data[i].title
+ }
+ });
+ },
+
+ hasMultipleSites() {
+ return this.sites.length > 1;
+ },
+
+ perSiteRouting() {
+ return this.routeMode === 'multiple';
+ },
+
+ identicalRoutes() {
+ return _.uniq(Object.values(this.value)).length === 1;
+ }
+
+ },
+
+ watch: {
+
+ singleRoute(route) {
+ this.update(route);
+ },
+
+ routeMode(mode) {
+ if (mode === 'single') {
+ this.singleRoute = Object.values(this.value)[0];
+ } else {
+ let value = {};
+ this.sites.forEach(site => value[site.handle] = '');
+ this.update(value);
+ }
+ }
+
+ },
+
+ methods: {
+
+ updateSiteRoute(site, route) {
+ let value = this.value;
+ value[site] = route;
+ this.update(value);
+ }
+
+ }
+
+}
+</script>

composer.json

@@ -20,7 +20,7 @@
  "pixelfear/composer-dist-plugin": "^0.1.0",
  "scrumpy/html-to-prosemirror": "^0.6.0",
  "scrumpy/prosemirror-to-html": "^0.8.0",
- "spatie/blink": "^1.1",
+ "spatie/blink": "^1.1.2",
  "statamic/stringy": "^3.1",
  "symfony/var-exporter": "^4.3",
  "symfony/yaml": "^4.1@dev",

config/stache.php

@@ -48,9 +48,9 @@
  'directory' => base_path('content/collections'),
  ],
 
- 'structures' => [
- 'class' => Stores\StructuresStore::class,
- 'directory' => base_path('content/structures'),
+ 'navigation' => [
+ 'class' => Stores\NavigationStore::class,
+ 'directory' => base_path('content/navigation'),
  ],
 
  'globals' => [

resources/blueprints/entry_link.yaml

@@ -0,0 +1,11 @@
+title: Link
+fields:
+ -
+ handle: title
+ field:
+ type: text
+ -
+ handle: redirect
+ field:
+ type: redirect
+ required: true

resources/js/app.js

@@ -103,7 +103,6 @@ Statamic.app({
  components: {
  GlobalSearch: require('./components/GlobalSearch.vue').default,
  SiteSelector: require('./components/SiteSelector.vue').default,
- PageTree: require('./components/structures/PageTree.vue').default,
  Login: require('./components/login/login'),
  LoginModal: require('./components/login/LoginModal.vue').default,
  BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
@@ -128,10 +127,12 @@ Statamic.app({
  CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
  CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
  CollectionEditForm: require('./components/collections/EditForm.vue').default,
+ CollectionView: require('./components/collections/View.vue').default,
  SessionExpiry: require('./components/SessionExpiry.vue').default,
- StructureWizard: require('./components/structures/Wizard.vue').default,
- StructureListing: require('./components/structures/Listing.vue').default,
- StructureEditForm: require('./components/structures/EditForm.vue').default,
+ NavigationListing: require('./components/navigation/Listing.vue').default,
+ NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
+ NavigationEditForm: require('./components/navigation/EditForm.vue').default,
+ NavigationView: require('./components/navigation/View.vue').default,
  Stacks: require('./components/stacks/Stacks.vue').default,
  TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
  TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
@@ -163,6 +164,10 @@ Statamic.app({
 
  stackCount() {
  return this.$stacks.count();
+ },
+
+ wrapperClass() {
+ return this.$config.get('wrapperClass', 'max-w-xl');
  }
 
  },

resources/js/bootstrap/fieldtypes.js

@@ -13,7 +13,6 @@ Vue.component('slug-fieldtype', require('../components/fieldtypes/SlugFieldtype.
 // Fieldtypes
 import FieldsetFieldtype from '../components/fieldtypes/FieldsetFieldtype.vue'
 import RevealerFieldtype from '../components/fieldtypes/RevealerFieldtype.vue'
-import RoutesFieldtype from '../components/fieldtypes/RoutesFieldtype.vue'
 import StatusFieldtype from '../components/fieldtypes/StatusFieldtype.vue'
 import TemplateFieldtype from '../components/fieldtypes/TemplateFieldtype.vue'
 
@@ -25,6 +24,7 @@ Vue.component('bard-fieldtype', require('../components/fieldtypes/bard/BardField
 Vue.component('bard_buttons_setting-fieldtype', require('../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue').default);
 Vue.component('checkboxes-fieldtype', require('../components/fieldtypes/CheckboxesFieldtype.vue').default);
 Vue.component('code-fieldtype', require('../components/fieldtypes/CodeFieldtype.vue').default);
+Vue.component('collection_routes-fieldtype', require('../components/collections/Routes.vue').default);
 Vue.component('color-fieldtype', require('../components/fieldtypes/ColorFieldtype.vue').default);
 Vue.component('date-fieldtype', require('../components/fieldtypes/DateFieldtype.vue').default);
 Vue.component('fieldset-fieldtype', FieldsetFieldtype);
@@ -37,17 +37,16 @@ Vue.component('list-fieldtype', require('../components/fieldtypes/ListFieldtype.
 Vue.component('markdown-fieldtype', require('../components/fieldtypes/MarkdownFieldtype.vue').default);
 Vue.component('radio-fieldtype', require('../components/fieldtypes/RadioFieldtype.vue').default);
 Vue.component('range-fieldtype', require('../components/fieldtypes/RangeFieldtype.vue').default);
+Vue.component('redirect-fieldtype', require('../components/fieldtypes/RedirectFieldtype.vue').default);
 Vue.component('relationship-fieldtype', require('../components/fieldtypes/relationship/RelationshipFieldtype.vue').default);
 Vue.component('relationship-fieldtype-index', require('../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue').default);
 Vue.component('replicator-fieldtype', require('../components/fieldtypes/replicator/Replicator.vue').default);
 Vue.component('replicator-fieldtype-index', require('../components/fieldtypes/replicator/ReplicatorIndex.vue').default);
 Vue.component('revealer-fieldtype', RevealerFieldtype);
-Vue.component('routes-fieldtype', RoutesFieldtype);
 Vue.component('section-fieldtype', require('../components/fieldtypes/SectionFieldtype.vue').default);
 Vue.component('select-fieldtype', require('../components/fieldtypes/SelectFieldtype.vue').default);
 Vue.component('sets-fieldtype', require('../components/fieldtypes/replicator/SetsFieldtype.vue').default);
 Vue.component('status-fieldtype', StatusFieldtype);
-Vue.component('structure_sites-fieldtype', require('../components/structures/Sites.vue').default);
 Vue.component('table-fieldtype', require('../components/fieldtypes/TableFieldtype.vue').default);
 Vue.component('tags-fieldtype', require('../components/fieldtypes/TagsFieldtype.vue').default);
 Vue.component('tags-fieldtype-index', require('../components/fieldtypes/TagsIndexFieldtype.vue').default);

resources/js/components/DropdownItem.vue

@@ -12,7 +12,7 @@ export default {
  props: ['text', 'redirect', 'externalLink'],
 
  methods: {
- selectAndClose() {
+ selectAndClose($event) {
  if (this.redirect) {
  location.href = this.redirect;
  return;
@@ -23,7 +23,7 @@ export default {
  return;
  }
 
- this.$emit('click');
+ this.$emit('click', $event);
 
  this.$parent.close();
  }

resources/js/components/collections/DeleteEntryConfirmation.vue

@@ -0,0 +1,42 @@
+<template>
+
+ <modal name="delete-entry-confirmation" :pivotY="0.1" :overflow="false">
+ <div class="confirmation-modal flex flex-col h-full">
+ <div class="text-lg font-medium p-2 pb-0">
+ {{ __('Delete Entry') }}
+ </div>
+ <div class="flex-1 px-2 py-3 text-grey">
+ <p class="mb-2">Are you sure you want to delete this entry?</p>
+ <label class="flex items-center" v-if="children">
+ <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
+ {{ __n('Delete child entry|Delete :count child entries', children) }}
+ </label>
+ </div>
+ <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
+ <button class="text-grey hover:text-grey-90"
+ @click="$emit('cancel')"
+ v-text="__('Cancel')" />
+ <button class="btn ml-2 btn-danger"
+ @click="$emit('confirm', shouldDeleteChildren)"
+ v-text="__('Delete')" />
+ </div>
+ </div>
+ </modal>
+
+</template>
+
+<script>
+export default {
+
+ props: {
+ children: Number
+ },
+
+ data() {
+ return {
+ shouldDeleteChildren: false
+ }
+ }
+
+}
+</script>

resources/js/components/collections/EditForm.vue

@@ -33,14 +33,11 @@ export default {
  blueprint: Object,
  initialValues: Object,
  meta: Object,
- initialTitle: String,
- url: String,
- listingUrl: String,
+ url: String
  },
 
  data() {
  return {
- title: this.initialTitle,
  values: this.initialValues,
  error: null,
  errors: {},
@@ -60,7 +57,6 @@ export default {
 
  this.$axios.patch(this.url, this.values).then(response => {
  this.saving = false;
- this.title = response.data.title;
  this.$toast.success(__('Saved'));
  this.$refs.container.saved();
  }).catch(e => this.handleAxiosError(e));

resources/js/components/collections/Routes.vue

@@ -0,0 +1,118 @@
+<template>
+
+ <div>
+ <div v-if="hasMultipleSites">
+ <div class="radio-fieldtype mb-1">
+ <radio-fieldtype handle="route_mode" v-model="routeMode" :config="{
+ inline: true,
+ options: {
+ single: 'Single route',
+ multiple: 'Separate route for each site',
+ }
+ }" />
+ </div>
+ <table class="grid-table" v-if="perSiteRouting">
+ <thead>
+ <tr>
+ <th>Site</th>
+ <th class="w-2/3">Route</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="site in sites" :key="site.handle">
+ <td class="align-middle" v-text="site.name" />
+ <td>
+ <text-input
+ class="font-mono text-xs"
+ :value="value[site.handle]"
+ @input="updateSiteRoute(site.handle, $event)" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div v-if="!hasMultipleSites || !perSiteRouting">
+ <text-input v-model="singleRoute" class="font-mono text-xs" />
+ </div>
+ </div>
+
+</template>
+
+<script>
+export default {
+
+ mixins: [Fieldtype],
+
+ inject: ['storeName'],
+
+ data() {
+ return {
+ routeMode: null,
+ singleRoute: null,
+ }
+ },
+
+ created() {
+ this.routeMode = this.identicalRoutes ? 'single' : 'multiple';
+ },
+
+ computed: {
+
+ sites() {
+ let state = this.$store.state.publish[this.storeName];
+
+ if (!state.values.sites) return [];
+
+ return state.values.sites.map((handle, i) => {
+ return {
+ handle,
+ name: state.meta.sites.data[i].title
+ }
+ });
+ },
+
+ hasMultipleSites() {
+ return this.sites.length > 1;
+ },
+
+ perSiteRouting() {
+ return this.routeMode === 'multiple';
+ },
+
+ identicalRoutes() {
+ return _.uniq(Object.values(this.value)).length === 1;
+ }
+
+ },
+
+ watch: {
+
+ singleRoute(route) {
+ this.update(route);
+ },
+
+ routeMode(mode) {
+ if (mode === 'single') {
+ this.singleRoute = Object.values(this.value)[0];
+ } else {
+ let value = {};
+ this.sites.forEach(site => value[site.handle] = '');
+ this.update(value);
+ }
+ }
+
+ },
+
+ methods: {
+
+ updateSiteRoute(site, route) {
+ let value = this.value;
+ value[site] = route;
+ this.update(value);
+ }
+
+ }
+
+}
+</script>

composer.json

@@ -20,7 +20,7 @@
  "pixelfear/composer-dist-plugin": "^0.1.0",
  "scrumpy/html-to-prosemirror": "^0.6.0",
  "scrumpy/prosemirror-to-html": "^0.8.0",
- "spatie/blink": "^1.1",
+ "spatie/blink": "^1.1.2",
  "statamic/stringy": "^3.1",
  "symfony/var-exporter": "^4.3",
  "symfony/yaml": "^4.1@dev",

config/stache.php

@@ -48,9 +48,9 @@
  'directory' => base_path('content/collections'),
  ],
 
- 'structures' => [
- 'class' => Stores\StructuresStore::class,
- 'directory' => base_path('content/structures'),
+ 'navigation' => [
+ 'class' => Stores\NavigationStore::class,
+ 'directory' => base_path('content/navigation'),
  ],
 
  'globals' => [

resources/blueprints/entry_link.yaml

@@ -0,0 +1,11 @@
+title: Link
+fields:
+ -
+ handle: title
+ field:
+ type: text
+ -
+ handle: redirect
+ field:
+ type: redirect
+ required: true

resources/js/app.js

@@ -103,7 +103,6 @@ Statamic.app({
  components: {
  GlobalSearch: require('./components/GlobalSearch.vue').default,
  SiteSelector: require('./components/SiteSelector.vue').default,
- PageTree: require('./components/structures/PageTree.vue').default,
  Login: require('./components/login/login'),
  LoginModal: require('./components/login/LoginModal.vue').default,
  BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
@@ -128,10 +127,12 @@ Statamic.app({
  CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
  CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
  CollectionEditForm: require('./components/collections/EditForm.vue').default,
+ CollectionView: require('./components/collections/View.vue').default,
  SessionExpiry: require('./components/SessionExpiry.vue').default,
- StructureWizard: require('./components/structures/Wizard.vue').default,
- StructureListing: require('./components/structures/Listing.vue').default,
- StructureEditForm: require('./components/structures/EditForm.vue').default,
+ NavigationListing: require('./components/navigation/Listing.vue').default,
+ NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
+ NavigationEditForm: require('./components/navigation/EditForm.vue').default,
+ NavigationView: require('./components/navigation/View.vue').default,
  Stacks: require('./components/stacks/Stacks.vue').default,
  TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
  TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
@@ -163,6 +164,10 @@ Statamic.app({
 
  stackCount() {
  return this.$stacks.count();
+ },
+
+ wrapperClass() {
+ return this.$config.get('wrapperClass', 'max-w-xl');
  }
 
  },

resources/js/bootstrap/fieldtypes.js

@@ -13,7 +13,6 @@ Vue.component('slug-fieldtype', require('../components/fieldtypes/SlugFieldtype.
 // Fieldtypes
 import FieldsetFieldtype from '../components/fieldtypes/FieldsetFieldtype.vue'
 import RevealerFieldtype from '../components/fieldtypes/RevealerFieldtype.vue'
-import RoutesFieldtype from '../components/fieldtypes/RoutesFieldtype.vue'
 import StatusFieldtype from '../components/fieldtypes/StatusFieldtype.vue'
 import TemplateFieldtype from '../components/fieldtypes/TemplateFieldtype.vue'
 
@@ -25,6 +24,7 @@ Vue.component('bard-fieldtype', require('../components/fieldtypes/bard/BardField
 Vue.component('bard_buttons_setting-fieldtype', require('../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue').default);
 Vue.component('checkboxes-fieldtype', require('../components/fieldtypes/CheckboxesFieldtype.vue').default);
 Vue.component('code-fieldtype', require('../components/fieldtypes/CodeFieldtype.vue').default);
+Vue.component('collection_routes-fieldtype', require('../components/collections/Routes.vue').default);
 Vue.component('color-fieldtype', require('../components/fieldtypes/ColorFieldtype.vue').default);
 Vue.component('date-fieldtype', require('../components/fieldtypes/DateFieldtype.vue').default);
 Vue.component('fieldset-fieldtype', FieldsetFieldtype);
@@ -37,17 +37,16 @@ Vue.component('list-fieldtype', require('../components/fieldtypes/ListFieldtype.
 Vue.component('markdown-fieldtype', require('../components/fieldtypes/MarkdownFieldtype.vue').default);
 Vue.component('radio-fieldtype', require('../components/fieldtypes/RadioFieldtype.vue').default);
 Vue.component('range-fieldtype', require('../components/fieldtypes/RangeFieldtype.vue').default);
+Vue.component('redirect-fieldtype', require('../components/fieldtypes/RedirectFieldtype.vue').default);
 Vue.component('relationship-fieldtype', require('../components/fieldtypes/relationship/RelationshipFieldtype.vue').default);
 Vue.component('relationship-fieldtype-index', require('../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue').default);
 Vue.component('replicator-fieldtype', require('../components/fieldtypes/replicator/Replicator.vue').default);
 Vue.component('replicator-fieldtype-index', require('../components/fieldtypes/replicator/ReplicatorIndex.vue').default);
 Vue.component('revealer-fieldtype', RevealerFieldtype);
-Vue.component('routes-fieldtype', RoutesFieldtype);
 Vue.component('section-fieldtype', require('../components/fieldtypes/SectionFieldtype.vue').default);
 Vue.component('select-fieldtype', require('../components/fieldtypes/SelectFieldtype.vue').default);
 Vue.component('sets-fieldtype', require('../components/fieldtypes/replicator/SetsFieldtype.vue').default);
 Vue.component('status-fieldtype', StatusFieldtype);
-Vue.component('structure_sites-fieldtype', require('../components/structures/Sites.vue').default);
 Vue.component('table-fieldtype', require('../components/fieldtypes/TableFieldtype.vue').default);
 Vue.component('tags-fieldtype', require('../components/fieldtypes/TagsFieldtype.vue').default);
 Vue.component('tags-fieldtype-index', require('../components/fieldtypes/TagsIndexFieldtype.vue').default);

resources/js/components/DropdownItem.vue

@@ -12,7 +12,7 @@ export default {
  props: ['text', 'redirect', 'externalLink'],
 
  methods: {
- selectAndClose() {
+ selectAndClose($event) {
  if (this.redirect) {
  location.href = this.redirect;
  return;
@@ -23,7 +23,7 @@ export default {
  return;
  }
 
- this.$emit('click');
+ this.$emit('click', $event);
 
  this.$parent.close();
  }

resources/js/components/collections/DeleteEntryConfirmation.vue

@@ -0,0 +1,42 @@
+<template>
+
+ <modal name="delete-entry-confirmation" :pivotY="0.1" :overflow="false">
+ <div class="confirmation-modal flex flex-col h-full">
+ <div class="text-lg font-medium p-2 pb-0">
+ {{ __('Delete Entry') }}
+ </div>
+ <div class="flex-1 px-2 py-3 text-grey">
+ <p class="mb-2">Are you sure you want to delete this entry?</p>
+ <label class="flex items-center" v-if="children">
+ <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
+ {{ __n('Delete child entry|Delete :count child entries', children) }}
+ </label>
+ </div>
+ <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
+ <button class="text-grey hover:text-grey-90"
+ @click="$emit('cancel')"
+ v-text="__('Cancel')" />
+ <button class="btn ml-2 btn-danger"
+ @click="$emit('confirm', shouldDeleteChildren)"
+ v-text="__('Delete')" />
+ </div>
+ </div>
+ </modal>
+
+</template>
+
+<script>
+export default {
+
+ props: {
+ children: Number
+ },
+
+ data() {
+ return {
+ shouldDeleteChildren: false
+ }
+ }
+
+}
+</script>

resources/js/components/collections/EditForm.vue

@@ -33,14 +33,11 @@ export default {
  blueprint: Object,
  initialValues: Object,
  meta: Object,
- initialTitle: String,
- url: String,
- listingUrl: String,
+ url: String
  },
 
  data() {
  return {
- title: this.initialTitle,
  values: this.initialValues,
  error: null,
  errors: {},
@@ -60,7 +57,6 @@ export default {
 
  this.$axios.patch(this.url, this.values).then(response => {
  this.saving = false;
- this.title = response.data.title;
  this.$toast.success(__('Saved'));
  this.$refs.container.saved();
  }).catch(e => this.handleAxiosError(e));

resources/js/components/collections/Routes.vue

@@ -0,0 +1,118 @@
+<template>
+
+ <div>
+ <div v-if="hasMultipleSites">
+ <div class="radio-fieldtype mb-1">
+ <radio-fieldtype handle="route_mode" v-model="routeMode" :config="{
+ inline: true,
+ options: {
+ single: 'Single route',
+ multiple: 'Separate route for each site',
+ }
+ }" />
+ </div>
+ <table class="grid-table" v-if="perSiteRouting">
+ <thead>
+ <tr>
+ <th>Site</th>
+ <th class="w-2/3">Route</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="site in sites" :key="site.handle">
+ <td class="align-middle" v-text="site.name" />
+ <td>
+ <text-input
+ class="font-mono text-xs"
+ :value="value[site.handle]"
+ @input="updateSiteRoute(site.handle, $event)" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div v-if="!hasMultipleSites || !perSiteRouting">
+ <text-input v-model="singleRoute" class="font-mono text-xs" />
+ </div>
+ </div>
+
+</template>
+
+<script>
+export default {
+
+ mixins: [Fieldtype],
+
+ inject: ['storeName'],
+
+ data() {
+ return {
+ routeMode: null,
+ singleRoute: null,
+ }
+ },
+
+ created() {
+ this.routeMode = this.identicalRoutes ? 'single' : 'multiple';
+ },
+
+ computed: {
+
+ sites() {
+ let state = this.$store.state.publish[this.storeName];
+
+ if (!state.values.sites) return [];
+
+ return state.values.sites.map((handle, i) => {
+ return {
+ handle,
+ name: state.meta.sites.data[i].title
+ }
+ });
+ },
+
+ hasMultipleSites() {
+ return this.sites.length > 1;
+ },
+
+ perSiteRouting() {
+ return this.routeMode === 'multiple';
+ },
+
+ identicalRoutes() {
+ return _.uniq(Object.values(this.value)).length === 1;
+ }
+
+ },
+
+ watch: {
+
+ singleRoute(route) {
+ this.update(route);
+ },
+
+ routeMode(mode) {
+ if (mode === 'single') {
+ this.singleRoute = Object.values(this.value)[0];
+ } else {
+ let value = {};
+ this.sites.forEach(site => value[site.handle] = '');
+ this.update(value);
+ }
+ }
+
+ },
+
+ methods: {
+
+ updateSiteRoute(site, route) {
+ let value = this.value;
+ value[site] = route;
+ this.update(value);
+ }
+
+ }
+
+}
+</script>