ENV + welcome design fix + auth master override

rxcod9 · Jan 31, 2023 · 39da060 · 39da060
1 parent 98fd576
commit 39da060
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 1 deletion.
diff --git a/.env.example b/.env.example
@@ -1,5 +1,5 @@
 APP_NAME="Joy Voyager Crm Demo"
-APP_DESCRIPTION="Joy Voyager modules demo integrated with Voyager."
+APP_DESCRIPTION="Welcome to Joy Voyager Crm Demo. The Missing Admin for Laravel"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true

diff --git a/public/css/style.css b/public/css/style.css
@@ -112,6 +112,10 @@ body {
   z-index: 1;
 }
 
+.notfound p.notfound-footer {
+  margin-top: 25px;
+}
+
 @media only screen and (max-width: 480px) {
   .notfound .notfound-404 {
     position: relative;

diff --git a/resources/views/vendor/voyager/auth/master.blade.php b/resources/views/vendor/voyager/auth/master.blade.php
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="{{ config('app.locale') }}" dir="{{ __('voyager::generic.is_rtl') == 'true' ? 'rtl' : 'ltr' }}">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="robots" content="none" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimal-ui">
+    <meta name="description" content="admin login">
+    <title>@yield('title', 'Admin - '.Voyager::setting("admin.title"))</title>
+    <link rel="stylesheet" href="{{ mix('assets/css/app.css') }}">
+    @if (__('voyager::generic.is_rtl') == 'true')
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.4.0/css/bootstrap-rtl.css">
+        <link rel="stylesheet" href="{{ mix('assets/css/rtl.css') }}">
+    @endif
+    <style>
+        body {
+            background-image:url('{{ Voyager::image( Voyager::setting("admin.bg_image"), voyager_asset("images/bg.jpg") ) }}');
+            background-color: {{ Voyager::setting("admin.bg_color", "#FFFFFF" ) }};
+        }
+        body.login .login-sidebar {
+            border-top:5px solid {{ config('voyager.primary_color','#22A7F0') }};
+        }
+        @media (max-width: 767px) {
+            body.login .login-sidebar {
+                border-top:0px !important;
+                border-left:5px solid {{ config('voyager.primary_color','#22A7F0') }};
+            }
+        }
+        body.login .form-group-default.focused{
+            border-color:{{ config('voyager.primary_color','#22A7F0') }};
+        }
+        .login-button, .bar:before, .bar:after{
+            background:{{ config('voyager.primary_color','#22A7F0') }};
+        }
+        .remember-me-text{
+            padding:0 5px;
+        }
+    </style>
+
+    @yield('pre_css')
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet">
+</head>
+<body class="login">
+<div class="container-fluid">
+    <div class="row">
+        <div class="faded-bg animated"></div>
+        <div class="hidden-xs col-sm-7 col-md-8">
+            <div class="clearfix">
+                <div class="col-sm-12 col-md-10 col-md-offset-2">
+                    <div class="logo-title-container">
+                        <?php $admin_logo_img = Voyager::setting('admin.icon_image', ''); ?>
+                        @if($admin_logo_img == '')
+                            <img class="img-responsive pull-left flip logo hidden-xs animated fadeIn" src="{{ asset('assets/images/logo-icon-light.png') }}" alt="Logo Icon">
+                        @else
+                            <img class="img-responsive pull-left flip logo hidden-xs animated fadeIn" src="{{ Voyager::image($admin_logo_img) }}" alt="Logo Icon">
+                        @endif
+                        <div class="copy animated fadeIn">
+                            <h1>{{ Voyager::setting('admin.title', 'Voyager') }}</h1>
+                            <p>{{ Voyager::setting('admin.description', __('voyager::login.welcome')) }}</p>
+                        </div>
+                    </div> <!-- .logo-title-container -->
+                </div>
+            </div>
+        </div>
+
+        <div class="col-xs-12 col-sm-5 col-md-4 login-sidebar">
+
+           @yield('content')
+
+        </div> <!-- .login-sidebar -->
+    </div> <!-- .row -->
+</div> <!-- .container-fluid -->
+@yield('post_js')
+
+@env(['local', 'demo'])
+    <!-- Start of HubSpot Embed Code -->
+    <script type="text/javascript" id="hs-script-loader" async defer src="//js-eu1.hs-scripts.com/26678290.js"></script>
+    <!-- End of HubSpot Embed Code -->
+@endenv
+</body>
+</html>
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -116,6 +116,7 @@
                 </a>
 			</div>
             @endenv
+            <p class="notfound-footer">Laravel v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }})</p>
 		</div>
 	</div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,6 +116,7 @@ @@
                     </a>
     			</div>
                 @endenv
+                <p class="notfound-footer">Laravel v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }})</p>
     		</div>
     	</div>
@@ Expand Down @@