[5.x] Move sites out of config

config/system.php

@@ -16,6 +16,22 @@
 
  'license_key' => env('STATAMIC_LICENSE_KEY'),
 
+ /*
+ |--------------------------------------------------------------------------
+ | Enable Multi-site
+ |--------------------------------------------------------------------------
+ |
+ | Whether Statamic's multi-site functionality should be enabled. It is
+ | assumed Statamic Pro is also enabled. To get started, you can run
+ | the `php please multisite` command to update your content file
+ | structure, after which you can manage your sites in the CP.
+ |
+ | https://statamic.dev/multi-site
+ |
+ */
+
+ 'multisite' => false,
+
  /*
  |--------------------------------------------------------------------------
  | Default Addons Paths

resources/js/app.js

@@ -143,6 +143,7 @@ import AssetContainerEditForm from './components/asset-containers/EditForm.vue';
 import NavBuilder from './components/nav/Builder.vue';
 import Updater from './components/updater/Updater.vue';
 import PortalTargets from './components/portals/PortalTargets.vue';
+import SitesEditForm from './components/sites/EditForm.vue';
 
 
 Statamic.app({
@@ -198,6 +199,7 @@ Statamic.app({
  NavBuilder,
  Updater,
  PortalTargets,
+ SitesEditForm,
  },
 
  data: {

resources/js/components/fieldtypes/grid/Grid.vue

@@ -5,6 +5,13 @@
  <element-container @resized="containerWidth = $event.width">
  <div class="grid-fieldtype-container" :class="{'grid-fullscreen bg-white': fullScreenMode }">
 
+ <template v-if="config.fullscreen || !config.hide_display">
+ <header class="bg-gray-200 border-b py-3 rtl:pr-3 ltr:pl-3 flex items-center justify-between relative" v-if="fullScreenMode">
+ <h2 v-text="__(config.display)" />
+ <button class="btn-close absolute top-2 rtl:left-5 ltr:right-5" @click="fullScreenMode = false" :aria-label="__('Exit Fullscreen Mode')">&times;</button>
+ </header>
+ </template>
+
  <header class="bg-gray-200 border-b py-3 rtl:pr-3 ltr:pl-3 flex items-center justify-between relative" v-if="fullScreenMode">
  <h2 v-text="__(config.display)" />
  <button class="btn-close absolute top-2 rtl:left-5 ltr:right-5" @click="fullScreenMode = false" :aria-label="__('Exit Fullscreen Mode')">&times;</button>

resources/js/components/sites/EditForm.vue

@@ -0,0 +1,120 @@
+<template>
+
+ <publish-container
+ v-if="blueprint"
+ ref="container"
+ name="sites"
+ reference="sites"
+ :blueprint="blueprint"
+ :values="values"
+ :meta="meta"
+ :errors="errors"
+ @updated="values = $event"
+ >
+ <div slot-scope="{ setFieldValue, setFieldMeta }">
+ <header class="mb-6">
+ <div class="flex items-center">
+ <h1 class="flex-1" v-text="pageTitle" />
+ <button type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
+ </div>
+ </header>
+ <publish-tabs
+ @updated="setFieldValue"
+ @meta-updated="setFieldMeta"
+ :enable-sidebar="false"/>
+ </div>
+ </publish-container>
+
+</template>
+
+<script>
+export default {
+
+ props: {
+ blueprint: Object,
+ initialValues: Object,
+ meta: Object,
+ url: String
+ },
+
+ data() {
+ return {
+ values: this.initialValues,
+ error: null,
+ errors: {},
+ }
+ },
+
+ computed: {
+ pageTitle() {
+ return this.$config.get('multisiteEnabled')
+ ? __('Configure Sites')
+ : __('Configure Site');
+ },
+
+ initialSiteHandles() {
+ return this.$config.get('multisiteEnabled')
+ ? this.initialValues.sites.map(site => site.handle)
+ : [this.initialValues.handle];
+ },
+
+ currentSiteHandles() {
+ return this.$config.get('multisiteEnabled')
+ ? this.values.sites.map(site => site.handle)
+ : [this.values.handle];
+ },
+
+ initialHandleChanged() {
+ return this.initialSiteHandles.filter(handle => ! this.currentSiteHandles.includes(handle)).length > 0;
+ },
+
+ initialHandleChangedWarning() {
+ return __('Warning! Changing a site handle may break existing site content!');
+ },
+ },
+
+ methods: {
+
+ clearErrors() {
+ this.error = null;
+ this.errors = {};
+ },
+
+ submit() {
+ if (this.initialHandleChanged && ! confirm(this.initialHandleChangedWarning)) {
+ return;
+ }
+
+ this.saving = true;
+ this.clearErrors();
+
+ this.$axios.patch(this.url, this.values).then(response => {
+ this.saving = false;
+ this.$toast.success(__('Saved'));
+ this.$refs.container.saved();
+ }).catch(e => this.handleAxiosError(e));
+ },
+
+ handleAxiosError(e) {
+ this.saving = false;
+ if (e.response && e.response.status === 422) {
+ const { message, errors } = e.response.data;
+ this.error = message;
+ this.errors = errors;
+ this.$toast.error(message);
+ } else {
+ this.$toast.error(__('Something went wrong'));
+ }
+ },
+
+ },
+
+ created() {
+ this.$keys.bindGlobal(['mod+s'], e => {
+ e.preventDefault();
+ this.submit();
+ });
+ },
+
+}
+</script>

resources/lang/en/permissions.php

@@ -8,6 +8,8 @@
  'group_cp' => 'Control Panel',
  'access_cp' => 'Access the Control Panel',
  'access_cp_desc' => 'Allows access into control panel, but doesn\'t guarantee anything can be done once inside.',
+ 'configure_sites' => 'Configure Sites',
+ 'configure_sites_desc' => 'Ability to configure sites when multi-site is enabled.',
  'configure_fields' => 'Configure Fields',
  'configure_fields_desc' => 'Ability to edit blueprints, fieldsets, and their fields.',
  'configure_addons' => 'Configure Addons',

resources/views/sites/configure.blade.php

@@ -0,0 +1,21 @@
+@php use function Statamic\trans as __; @endphp
+
+@extends('statamic::layout')
+@section('title', __('Configure Sites'))
+
+@section('content')
+
+ <sites-edit-form
+ :blueprint="{{ json_encode($blueprint) }}"
+ :initial-values="{{ json_encode($values) }}"
+ :meta="{{ json_encode($meta) }}"
+ url="{{ cp_route('sites.update') }}"
+ class="-mb-8"
+ ></sites-edit-form>
+
+ @include('statamic::partials.docs-callout', [
+ 'topic' => __('Multi-Site'),
+ 'url' => Statamic::docsUrl('multi-site')
+ ])
+
+@stop

routes/cp.php

@@ -73,6 +73,7 @@
 use Statamic\Http\Controllers\CP\SearchController;
 use Statamic\Http\Controllers\CP\SelectSiteController;
 use Statamic\Http\Controllers\CP\SessionTimeoutController;
+use Statamic\Http\Controllers\CP\Sites\SitesController;
 use Statamic\Http\Controllers\CP\SlugController;
 use Statamic\Http\Controllers\CP\StartPageController;
 use Statamic\Http\Controllers\CP\Taxonomies\PublishedTermsController;
@@ -233,6 +234,9 @@
  Route::get('svgs/{encoded_asset}', [SvgController::class, 'show'])->name('assets.svgs.show');
  Route::get('pdfs/{encoded_asset}', [PdfController::class, 'show'])->name('assets.pdfs.show');
 
+ Route::get('sites', [SitesController::class, 'edit'])->name('sites.edit');
+ Route::patch('sites', [SitesController::class, 'update'])->name('sites.update');
+
  Route::group(['prefix' => 'fields'], function () {
  Route::get('/', [FieldsController::class, 'index'])->name('fields.index');
  Route::post('edit', [FieldsController::class, 'edit'])->name('fields.edit');

src/Auth/CorePermissions.php

@@ -18,6 +18,7 @@ public function boot()
  {
  $this->group('cp', function () {
  $this->register('access cp');
+ $this->register('configure sites');
  $this->register('configure fields');
  $this->register('configure form fields');
  $this->register('configure addons');
@@ -70,7 +71,7 @@ public function boot()
 
  protected function registerSites()
  {
- if (! Site::hasMultiple()) {
+ if (! Site::multiEnabled()) {
  return;
  }
 

src/CP/Navigation/CoreNav.php

@@ -147,6 +147,11 @@ protected function makeContentSection()
  })->filter();
  });
 
+ Nav::content(Site::multiEnabled() ? 'Sites' : 'Site')
+ ->route('sites.edit')
+ ->icon('/sites')
+ ->can('configure sites');
+
  return $this;
  }