소스 검색

Set the new landing view for Vue 3

Bubka 1 년 전
부모
커밋
4685e23fdb
3개의 변경된 파일4개의 추가작업 그리고 43개의 파일을 삭제
  1. 1 1
      app/Http/Controllers/SinglePageController.php
  2. 3 6
      resources/views/landing.blade.php
  3. 0 36
      resources/views/landing_v3.blade.php

+ 1 - 1
app/Http/Controllers/SinglePageController.php

@@ -30,7 +30,7 @@ class SinglePageController extends Controller
 
         // if (Auth::user()->preferences)
 
-        return view('landing_v3')->with([
+        return view('landing')->with([
             'appSettings' => $settings,
             'appConfig'   => collect([
                 'proxyAuth'      => $proxyAuth,

+ 3 - 6
resources/views/landing.blade.php

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html data-theme="{{ $userPreferences['theme'] }}" lang="{{ $lang }}">
+<html data-theme="{{ $defaultPreferences['theme'] }}" lang="{{ $lang }}">
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -17,7 +17,6 @@
     <link rel="apple-touch-icon-precomposed" href="{{ asset('favicon_lg.png') }}" />
     <link rel="manifest" href="/manifest.json">
 
-    <link href="{!! $subdirectory !!}{{ mix('css/app.css') }}" rel="stylesheet">
 </head>
 <body>
     <div id="app">
@@ -26,14 +25,12 @@
     <script type="text/javascript">
         var appSettings = {!! $appSettings !!};
         var appConfig = {!! $appConfig !!};
-        var userPreferences = {!! $userPreferences->toJson() !!};
+        var defaultPreferences = {!! $defaultPreferences->toJson() !!};
         var appVersion = '{{ config("2fauth.version") }}';
         var isDemoApp = {!! $isDemoApp !!};
         var isTestingApp = {!! $isTestingApp !!};
         var appLocales = {!! $locales !!};
     </script>
-    <script src="{!! $subdirectory !!}{{ mix('js/manifest.js') }}"></script>
-    <script src="{!! $subdirectory !!}{{ mix('js/vendor.js') }}"></script>
-    <script src="{!! $subdirectory !!}{{ mix('js/app.js') }}"></script>
+    @vite('resources/js/app.js')
 </body>
 </html>

+ 0 - 36
resources/views/landing_v3.blade.php

@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html data-theme="{{ $defaultPreferences['theme'] }}" lang="{{ $lang }}">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="description" content="{{ __('commons.2fauth_description') }}" lang="{{ $lang }}">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, shrink-to-fit=no, viewport-fit=cover">
-    <meta name="csrf-token" content="{{csrf_token()}}">
-    <meta name="robots" content="noindex, nofollow">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <title>{{ config('app.name') }}</title>
-
-    <link rel="shortcut icon" href="{{ asset('favicon.ico') }}" />
-    <link rel="icon" type="image/png" href="{{ asset('favicon.png') }}" />
-    <link rel="apple-touch-icon" href="{{ asset('favicon_lg.png') }}" />
-    <link rel="apple-touch-icon-precomposed" href="{{ asset('favicon_lg.png') }}" />
-    <link rel="manifest" href="/manifest.json">
-
-</head>
-<body>
-    <div id="app">
-        <app></app>
-    </div>
-    <script type="text/javascript">
-        var appSettings = {!! $appSettings !!};
-        var appConfig = {!! $appConfig !!};
-        var defaultPreferences = {!! $defaultPreferences->toJson() !!};
-        var appVersion = '{{ config("2fauth.version") }}';
-        var isDemoApp = {!! $isDemoApp !!};
-        var isTestingApp = {!! $isTestingApp !!};
-        var appLocales = {!! $locales !!};
-    </script>
-    @vite('resources/js/app.js')
-</body>
-</html>