Acasă Explorează Ajutor
Înregistrare Autentificare
oleg
/
pixelfed
oglindă de https://github.com/pixelfed/pixelfed.git
1
0
Bifurcare 0
Fisiere Probleme 0 Wiki
Răsfoiți Sursa

Update base layouts

Daniel Supernault 6 ani în urmă
părinte
d26da6af95
comite
4c30ad4940
7 a modificat fișierele cu 61 adăugiri și 8 ștergeri
Vizualizare divizată Arată Statisticile Diff
  1. 47 0
      app/Util/Site/Config.php
  2. 1 1
      resources/assets/js/app.js
  3. 2 0
      resources/views/layouts/anon.blade.php
  4. 6 2
      resources/views/layouts/app.blade.php
  5. 3 0
      resources/views/layouts/blank.blade.php
  6. 1 0
      resources/views/site/index.blade.php
  7. 1 5
      resources/views/timeline/home.blade.php

+ 47 - 0
app/Util/Site/Config.php
Vizualizați fișierul 

@@ -0,0 +1,47 @@
 
+<?php
 
+
 
+namespace App\Util\Site;
 
+
 
+use Cache;
 
+
 
+class Config {
 
+
 
+	public static function get() {
 
+		return Cache::remember('api:site:configuration', now()->addMinutes(30), function() {
 
+			return [
 
+				'uploader' => [
 
+					'max_photo_size' => config('pixelfed.max_photo_size'),
 
+					'max_caption_length' => config('pixelfed.max_caption_length'),
 
+					'album_limit' => config('pixelfed.max_album_length'),
 
+					'image_quality' => config('pixelfed.image_quality'),
 
+
 
+					'optimize_image' => config('pixelfed.optimize_image'),
 
+					'optimize_video' => config('pixelfed.optimize_video'),
 
+
 
+					'media_types' => config('pixelfed.media_types'),
 
+					'enforce_account_limit' => config('pixelfed.enforce_account_limit')
 
+				],
 
+
 
+				'activitypub' => [
 
+					'enabled' => config('federation.activitypub.enabled'),
 
+					'remote_follow' => config('federation.activitypub.remoteFollow')
 
+				],
 
+
 
+				'ab' => [
 
+					'lc' => config('exp.lc'),
 
+					'rec' => config('exp.rec'),
 
+					'loops' => config('exp.loops')
 
+				],
 
+
 
+				'site' => [
 
+					'domain' => config('pixelfed.domain.app'),
 
+					'url'    => config('app.url')
 
+				]
 
+			];
 
+		});
 
+	}
 
+
 
+	public static function json() {
 
+		return json_encode(self::get(), JSON_FORCE_OBJECT);
 
+	}
 
+}

+ 1 - 1
resources/assets/js/app.js
Vizualizați fișierul 

@@ -14,7 +14,7 @@ if (token) {
 
     console.error('CSRF token not found.');
 
 }
 
 
-window.App = {};
 
+window.App = window.App || {};
 
 
 window.App.boot = function() {
 
 	new Vue({ el: '#content'});

+ 2 - 0
resources/views/layouts/anon.blade.php
Vizualizați fișierul 

@@ -27,6 +27,8 @@
 
     <link rel="canonical" href="{{request()->url()}}">
 
     <link href="{{ mix('css/app.css') }}" rel="stylesheet" data-stylesheet="light">
 
     @stack('styles')
 
+
 
+    <script type="text/javascript">window.App = {}; window.App.config = {!!App\Util\Site\Config::json()!!}</script>
 
 </head>
 
 <body class="">
 
     @include('layouts.partial.noauthnav')

+ 6 - 2
resources/views/layouts/app.blade.php
Vizualizați fișierul 

@@ -1,7 +1,6 @@
 
 <!DOCTYPE html>
 
 <html lang="{{ app()->getLocale() }}">
 
 <head>
 
-    
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
@@ -25,12 +24,17 @@
 
     <link rel="apple-touch-icon" type="image/png" href="/img/favicon.png?v=2">
 
     <link rel="canonical" href="{{request()->url()}}">
 
     @if(request()->cookie('dark-mode')) 
+    
     <link href="{{ mix('css/appdark.css') }}" rel="stylesheet" data-stylesheet="dark">
 
     @else
 
+    
     <link href="{{ mix('css/app.css') }}" rel="stylesheet" data-stylesheet="light">
 
     @endif
 
+    
     @stack('styles')
 
-
 
+    
+    <script type="text/javascript">window.App = {}; window.App.config = {!!App\Util\Site\Config::json()!!}</script>
 
+    
 </head>
 
 <body class="{{Auth::check()?'loggedIn':''}}">
 
     @include('layouts.partial.nav')

+ 3 - 0
resources/views/layouts/blank.blade.php
Vizualizați fișierul 

@@ -25,6 +25,9 @@
 
     <link rel="canonical" href="{{request()->url()}}">
 
     <link href="{{ mix('css/app.css') }}" rel="stylesheet" data-stylesheet="light">
 
     @stack('styles')
 
+
 
+    <script type="text/javascript">window.App = {}; window.App.config = {!!App\Util\Site\Config::json()!!}</script>
 
+
 
 </head>
 
 <body class="">
 
     <main id="content">

+ 1 - 0
resources/views/site/index.blade.php
Vizualizați fișierul 

@@ -23,6 +23,7 @@
 
     <link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
 
     <link rel="apple-touch-icon" type="image/png" href="/img/favicon.png?v=2">
 
     <link href="{{ mix('css/landing.css') }}" rel="stylesheet">
 
+    <script type="text/javascript">window.App = {}; window.App.config = {!!App\Util\Site\Config::json()!!}</script>
 
 </head>
 
 <body class="">
 
     <main id="content">

+ 1 - 5
resources/views/timeline/home.blade.php
Vizualizați fișierul 

@@ -9,9 +9,5 @@
 
 @push('scripts')
 
 <script type="text/javascript" src="{{ mix('js/timeline.js') }}"></script>
 
 <script type="text/javascript" src="{{ mix('js/compose.js') }}"></script>
 
-<script type="text/javascript">
 
-	new Vue({
 
-		el: '#content'
 
-	});
 
-</script>
 
+<script type="text/javascript">window.App.boot()</script>
 
 @endpush