]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'basic-pwa-support' into development
authorDan Brown <redacted>
Mon, 2 Oct 2023 14:58:07 +0000 (15:58 +0100)
committerDan Brown <redacted>
Mon, 2 Oct 2023 14:58:07 +0000 (15:58 +0100)
1  2 
resources/views/layouts/base.blade.php
routes/web.php

index f9dbc68b455b6d831c796ac213bae0494fa6fb6a,8693f021d88e48299f93905e7035f11dbf0178aa..67b074905126037b118b730633503f586392cacb
@@@ -10,7 -10,7 +10,7 @@@
      <meta name="viewport" content="width=device-width">
      <meta name="token" content="{{ csrf_token() }}">
      <meta name="base-url" content="{{ url('/') }}">
-     <meta name="theme-color" content="{{ setting('app-color') }}"/>
+     <meta name="theme-color" content="{{(setting()->getForCurrentUser('dark-mode-enabled') ? setting('app-color-dark') : setting('app-color'))}}"/>
  
      <!-- Social Cards Meta -->
      <meta property="og:title" content="{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }}">
      <link rel="icon" type="image/png" sizes="64x64" href="{{ setting('app-icon-64') ?: url('/icon-64.png') }}">
      <link rel="icon" type="image/png" sizes="32x32" href="{{ setting('app-icon-32') ?: url('/icon-32.png') }}">
  
+     <!-- PWA -->
+     <link rel="manifest" href="{{ url('/manifest.json') }}" crossorigin="use-credentials">
+     <meta name="mobile-web-app-capable" content="yes">
      @yield('head')
  
      <!-- Custom Styles & Head Content -->
 -    @include('common.custom-styles')
 -    @include('common.custom-head')
 +    @include('layouts.parts.custom-styles')
 +    @include('layouts.parts.custom-head')
  
      @stack('head')
  
        class="@stack('body-class')">
  
      @include('layouts.parts.base-body-start')
 -    @include('common.skip-to-content')
 -    @include('common.notifications')
 -    @include('common.header')
 +    @include('layouts.parts.skip-to-content')
 +    @include('layouts.parts.notifications')
 +    @include('layouts.parts.header')
  
      <div id="content" components="@yield('content-components')" class="block">
          @yield('content')
      </div>
  
 -    @include('common.footer')
 +    @include('layouts.parts.footer')
  
      <div component="back-to-top" class="back-to-top print-hidden">
          <div class="inner">
diff --combined routes/web.php
index 9f5e84c62afb5161d057b1290cd945a5c16b0cb4,9c049ba362aed2d4427ef4c9d24052d2f556bfe0..06dffa636b778066f8083a5e02006d0b5da9ed4e
@@@ -20,6 -20,7 +20,7 @@@ use Illuminate\View\Middleware\ShareErr
  Route::get('/status', [SettingControllers\StatusController::class, 'show']);
  Route::get('/robots.txt', [HomeController::class, 'robots']);
  Route::get('/favicon.ico', [HomeController::class, 'favicon']);
+ Route::get('/manifest.json', [HomeController::class, 'pwaManifest']);
  
  // Authenticated routes...
  Route::middleware('auth')->group(function () {
      Route::post('/images/drawio', [UploadControllers\DrawioImageController::class, 'create']);
      Route::get('/images/edit/{id}', [UploadControllers\ImageController::class, 'edit']);
      Route::put('/images/{id}/file', [UploadControllers\ImageController::class, 'updateFile']);
 +    Route::put('/images/{id}/rebuild-thumbnails', [UploadControllers\ImageController::class, 'rebuildThumbnails']);
      Route::put('/images/{id}', [UploadControllers\ImageController::class, 'update']);
      Route::delete('/images/{id}', [UploadControllers\ImageController::class, 'destroy']);