diff --git a/composer.json b/composer.json index 273b5b01e..ac00709da 100644 --- a/composer.json +++ b/composer.json @@ -88,7 +88,8 @@ ], "aliases": { "Alert": "Orchid\\Support\\Facades\\Alert", - "Dashboard": "Orchid\\Support\\Facades\\Dashboard" + "Orchid": "Orchid\\Support\\Facades\\Orchid", + "Dashboard": "Orchid\\Support\\Facades\\Orchid" } } }, diff --git a/config/platform.php b/config/orchid.php similarity index 96% rename from config/platform.php rename to config/orchid.php index c044da558..62651b7ec 100644 --- a/config/platform.php +++ b/config/orchid.php @@ -16,7 +16,7 @@ | */ - 'domain' => env('DASHBOARD_DOMAIN', null), + 'domain' => env('ORCHID_DOMAIN', null), /* |-------------------------------------------------------------------------- @@ -25,11 +25,11 @@ | | This prefix method can be used to specify the prefix of every route in | the administrator dashboard. This way, you can easily change the path - | to a URL you find more appropriate. For instance: '/', '/admin', or '/panel'. + | to a URL you find more appropriate. For instance: '/', '/admin', or '/orchid'. | */ - 'prefix' => env('DASHBOARD_PREFIX', '/admin'), + 'prefix' => env('ORCHID_PREFIX', '/admin'), /* |-------------------------------------------------------------------------- @@ -46,7 +46,7 @@ 'middleware' => [ 'public' => ['web', 'cache.headers:private;must_revalidate;etag'], - 'private' => ['web', 'platform', 'cache.headers:private;must_revalidate;etag'], + 'private' => ['web', 'orchid', 'cache.headers:private;must_revalidate;etag'], ], /* @@ -95,11 +95,11 @@ | redirected to this page when they enter the dashboard or click on the | dashboard's logo or links. | - | Example: 'platform.main' + | Example: 'orchid.main' | */ - 'index' => 'platform.main', + 'index' => 'orchid.main', /* |-------------------------------------------------------------------------- @@ -185,7 +185,7 @@ */ 'attachment' => [ - 'disk' => env('DASHBOARD_FILESYSTEM_DISK', 'public'), + 'disk' => env('ORCHID_FILESYSTEM_DISK', 'public'), 'generator' => \Orchid\Attachment\Engines\Generator::class, ], @@ -286,11 +286,11 @@ | It determines whether the entire user screen will be used or whether | the content will be compressed to a fixed width. | - | Options: 'platform::workspace.compact', 'platform::workspace.full' + | Options: 'orchid::workspace.compact', 'orchid::workspace.full' | */ - 'workspace' => 'platform::workspace.compact', + 'workspace' => 'orchid::workspace.compact', /* |-------------------------------------------------------------------------- diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index b23dbd572..f1f84e2eb 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -21,12 +21,12 @@ @stack('head') - - - - + + + + - @if(!config('platform.turbo.cache', false)) + @if(!config('orchid.turbo.cache', false)) @endif @@ -34,18 +34,18 @@ - @foreach(Dashboard::getResource('stylesheets') as $stylesheet) + @foreach(Orchid::getResource('stylesheets') as $stylesheet) @endforeach @stack('stylesheets') - @foreach(Dashboard::getResource('scripts') as $scripts) + @foreach(Orchid::getResource('scripts') as $scripts) @endforeach - @if(!empty(config('platform.vite', []))) - @vite(config('platform.vite')) + @if(!empty(config('orchid.vite', []))) + @vite(config('orchid.vite')) @endif @@ -62,7 +62,7 @@ - @include('platform::partials.toast') + @include('orchid::partials.toast') @stack('scripts') diff --git a/resources/views/auth.blade.php b/resources/views/auth.blade.php index e8b8b27c8..e9f725f84 100644 --- a/resources/views/auth.blade.php +++ b/resources/views/auth.blade.php @@ -1,4 +1,4 @@ -@extends('platform::app') +@extends('orchid::app') @section('body') @@ -6,8 +6,8 @@
- - @includeFirst([config('platform.template.header'), 'platform::header']) + + @includeFirst([config('orchid.template.header'), 'orchid::header'])
@@ -20,7 +20,7 @@
- @includeFirst([config('platform.template.footer'), 'platform::footer']) + @includeFirst([config('orchid.template.footer'), 'orchid::footer'])
diff --git a/resources/views/auth/impersonation.blade.php b/resources/views/auth/impersonation.blade.php index cb202b30c..b113de91e 100644 --- a/resources/views/auth/impersonation.blade.php +++ b/resources/views/auth/impersonation.blade.php @@ -1,4 +1,4 @@ -@extends('platform::auth') +@extends('orchid::auth') @section('title',__('Access Denied: Viewing as Another User')) @section('content') @@ -9,7 +9,7 @@ data-controller="form" data-form-need-prevents-form-abandonment-value="false" data-action="form#submit" - action="{{ route('platform.switch.logout') }}"> + action="{{ route('orchid.switch.logout') }}"> @csrf

diff --git a/resources/views/auth/lockme.blade.php b/resources/views/auth/lockme.blade.php index e8fd3be67..bdad9b5ab 100644 --- a/resources/views/auth/lockme.blade.php +++ b/resources/views/auth/lockme.blade.php @@ -29,7 +29,7 @@

- + {{__('Sign in with another user.')}}
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index aaa1ffae1..34a90f9fb 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,4 +1,4 @@ -@extends('platform::auth') +@extends('orchid::auth') @section('title',__('Sign in to your account')) @section('content') @@ -10,10 +10,10 @@ data-controller="form" data-form-need-prevents-form-abandonment-value="false" data-action="form#submit" - action="{{ route('platform.login.auth') }}"> + action="{{ route('orchid.login.auth') }}"> @csrf - @includeWhen($isLockUser,'platform::auth.lockme') - @includeWhen(!$isLockUser,'platform::auth.signin') + @includeWhen($isLockUser,'orchid::auth.lockme') + @includeWhen(!$isLockUser,'orchid::auth.signin') @endsection diff --git a/resources/views/components/notification.blade.php b/resources/views/components/notification.blade.php index b597217a4..346c33f19 100644 --- a/resources/views/components/notification.blade.php +++ b/resources/views/components/notification.blade.php @@ -1,10 +1,10 @@ - diff --git a/resources/views/components/stream.blade.php b/resources/views/components/stream.blade.php index 9dba6a0b1..1e1287055 100644 --- a/resources/views/components/stream.blade.php +++ b/resources/views/components/stream.blade.php @@ -1,4 +1,4 @@ -@props(['target', 'action', 'push', 'rule' => \Orchid\Support\Facades\Dashboard::isPartialRequest()]) +@props(['target', 'action', 'push', 'rule' => \Orchid\Support\Facades\Orchid::isPartialRequest()]) @if(filter_var($rule, FILTER_VALIDATE_BOOLEAN)) diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 16a80a473..2c11985b2 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -1,4 +1,4 @@ -@extends(config('platform.workspace', 'platform::workspace.compact')) +@extends(config('orchid.workspace', 'orchid::workspace.compact')) @section('aside')
@@ -10,17 +10,17 @@ @yield('title') - - @includeFirst([config('platform.template.header'), 'platform::header']) + + @includeFirst([config('orchid.template.header'), 'orchid::header'])
- @include('platform::partials.alert') + @include('orchid::partials.alert') @yield('content') @endsection diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index 3a546fda3..7957dca24 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -1,4 +1,4 @@ -@extends('platform::dashboard') +@extends('orchid::dashboard') @section('title', '404') @section('description', __("You requested a page that doesn't exist.")) diff --git a/resources/views/fields/cropper.blade.php b/resources/views/fields/cropper.blade.php index f53edebef..5366ac3d5 100644 --- a/resources/views/fields/cropper.blade.php +++ b/resources/views/fields/cropper.blade.php @@ -1,7 +1,7 @@ @component($typeForm, get_defined_vars())
@foreach($value as $key => $row) - @include('platform::partials.fields.matrixRow',['row' => $row, 'key' => $key]) + @include('orchid::partials.fields.matrixRow',['row' => $row, 'key' => $key]) @endforeach @@ -31,7 +31,7 @@ diff --git a/resources/views/fields/picture.blade.php b/resources/views/fields/picture.blade.php index c120a9c48..fcd9e1f52 100644 --- a/resources/views/fields/picture.blade.php +++ b/resources/views/fields/picture.blade.php @@ -1,7 +1,7 @@ @component($typeForm, get_defined_vars())

Crafted with - - - + + + - by Alexandr Chernyaev

+ by Alexandr Chernyaev +

@@ -17,10 +20,14 @@

@else @@ -28,7 +35,7 @@

{{ __('The application code is published under the MIT license.') }} 2016 - {{date('Y')}}
- {{ __('Version') }}: {{\Orchid\Platform\Dashboard::VERSION}} + {{ __('Version') }}: {{\Orchid\Platform\Orchid::VERSION}}

diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 6d09e2769..fb99391bc 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -1,4 +1,4 @@ -@extends('platform::dashboard') +@extends('orchid::dashboard') @section('title', (string) __($name)) @section('description', (string) __($description)) @@ -33,7 +33,7 @@ class="mb-md-4 h-100" > {!! $layouts !!} @csrf - @include('platform::partials.confirm') + @include('orchid::partials.confirm')
@@ -43,5 +43,5 @@ class="mb-md-4 h-100" >
- @includeWhen(isset($state), 'platform::partials.state') + @includeWhen(isset($state), 'orchid::partials.state') @endsection diff --git a/resources/views/layouts/pagination.blade.php b/resources/views/layouts/pagination.blade.php index b1cc5f2e8..31eeb20b1 100644 --- a/resources/views/layouts/pagination.blade.php +++ b/resources/views/layouts/pagination.blade.php @@ -34,14 +34,14 @@ class="btn btn-sm btn-link dropdown-toggle p-0 m-0" {!! $paginator->appends(request() ->except(['page','_token'])) - ->links('platform::partials.pagination') + ->links('orchid::partials.pagination') !!} @elseif($paginator instanceof \Illuminate\Contracts\Pagination\Paginator) {!! $paginator->appends(request() ->except(['page','_token'])) ->onEachSide($onEachSide ?? 3) - ->links('platform::partials.pagination') + ->links('orchid::partials.pagination') !!} @endif
diff --git a/resources/views/layouts/sortable.blade.php b/resources/views/layouts/sortable.blade.php index 51d22862a..37d87f6ef 100644 --- a/resources/views/layouts/sortable.blade.php +++ b/resources/views/layouts/sortable.blade.php @@ -14,7 +14,7 @@ data-controller="sortable" data-sortable-selector-value=".reorder-handle" data-sortable-model-value="{{ get_class($rows->first()) }}" - data-sortable-action-value="{{ route('platform.systems.sorting') }}" + data-sortable-action-value="{{ route('orchid.systems.sorting') }}" data-sortable-success-message-value="{{ $successSortMessage }}" data-sortable-failure-message-value="{{ $failureSortMessage }}" class="list-group"> diff --git a/resources/views/layouts/table.blade.php b/resources/views/layouts/table.blade.php index f7df4bd58..0ae6abe82 100644 --- a/resources/views/layouts/table.blade.php +++ b/resources/views/layouts/table.blade.php @@ -73,7 +73,7 @@ @else - @include('platform::layouts.pagination',[ + @include('orchid::layouts.pagination',[ 'paginator' => $rows, 'columns' => $columns, 'onEachSide' => $onEachSide, diff --git a/resources/views/partials/layouts/th.blade.php b/resources/views/partials/layouts/th.blade.php index ff2660fd4..894d593e2 100644 --- a/resources/views/partials/layouts/th.blade.php +++ b/resources/views/partials/layouts/th.blade.php @@ -1,7 +1,7 @@
- @includeWhen($filter !== null, "platform::partials.layouts.filter", ['filter' => $filter]) + @includeWhen($filter !== null, "orchid::partials.layouts.filter", ['filter' => $filter]) @if($sort) - + @if($image = Auth::user()->presenter()->image()) {{ Auth::user()->presenter()->title()}} @endif diff --git a/resources/views/partials/result-compact.blade.php b/resources/views/partials/result-compact.blade.php index f02d7eb97..1393215ea 100644 --- a/resources/views/partials/result-compact.blade.php +++ b/resources/views/partials/result-compact.blade.php @@ -33,7 +33,7 @@ @if($total >= 5) - + {{ __('See more results.') }} ({{ $total }}) diff --git a/resources/views/partials/result.blade.php b/resources/views/partials/result.blade.php index c0fb7799b..d3ac93404 100644 --- a/resources/views/partials/result.blade.php +++ b/resources/views/partials/result.blade.php @@ -39,7 +39,7 @@
@includeWhen($results instanceof \Illuminate\Contracts\Pagination\Paginator && $results->isNotEmpty(), - 'platform::layouts.pagination', + 'orchid::layouts.pagination', ['paginator' => $results] )
diff --git a/resources/views/partials/search.blade.php b/resources/views/partials/search.blade.php index e0deee0f1..f6348765e 100644 --- a/resources/views/partials/search.blade.php +++ b/resources/views/partials/search.blade.php @@ -1,4 +1,4 @@ -@empty(!Dashboard::getSearch()->all()) +@empty(!Orchid::getSearch()->all())