shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2603 from brkcvn/master

Browse Source 
Added warning message for exist js file
This commit is contained in:
Cüneyt Şentürk 2022-08-17 11:07:32 +03:00 committed by GitHub
commit 3dbaf1f640
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/lang/en-GB/install.php
View File

@ -22,6 +22,7 @@ return [
'extension' => ':extension extension needs to be installed and loaded!', 'extension' => ':extension extension needs to be installed and loaded!',
'directory' => ':directory directory needs to be writable!', 'directory' => ':directory directory needs to be writable!',
'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.',
'npm' => '<b>Missing JavaScript files !</b> <br><br><span>You should run <em class="underline">npm install</em> and <em class="underline">npm run dev</em> commands.</span>',
], ],
'database' => [ 'database' => [

40
resources/views/components/layouts/install.blade.php
View File

@ -10,21 +10,39 @@
@stack('body_start') @stack('body_start')
<div class="bg-no-repeat bg-cover bg-center" style="background-image: url({{ asset('public/img/auth/login-bg.png') }});"> <div class="bg-no-repeat bg-cover bg-center" style="background-image: url({{ asset('public/img/auth/login-bg.png') }});">
<div class="relative w-full lg:max-w-7xl flex items-center m-auto"> @if (! file_exists(public_path('public/js/install/install.min.js')))
<x-layouts.auth.slider> <div class="relative w-full lg:max-w-7xl flex flex-col lg:flex-row items-center m-auto">
{!! $slider ?? '' !!} <div class="md:w-6/12 h-screen hidden lg:flex flex-col items-center justify-center">
</x-layouts.auth.slider> <img src="{{ asset('public/img/empty_pages/transactions.png') }}" alt="" />
</div>
<div class="w-full lg:w-46 h-31 flex flex-col justify-center gap-12 px-6 lg:px-24 py-24 mt-12 lg:mt-0"> <div class="w-full lg:w-46 h-31 flex flex-col justify-center gap-12 px-6 lg:px-24 py-24 mt-12 lg:mt-0">
<div class="flex flex-col gap-4"> <div class="flex flex-col gap-4">
<img src="{{ asset('public/img/akaunting-logo-green.svg') }}" class="w-16 my-3" alt="Akaunting" /> <img src="{{ asset('public/img/akaunting-logo-green.svg') }}" class="w-16 my-3" alt="Akaunting" />
<x-layouts.install.content :title="$title"> <div class="rounded-xl px-5 py-3 mb-5 bg-red-100 text-sm mb-0 text-red-600">
{!! $content !!} {!! trans('install.requirements.npm') !!}
</x-layouts.install.content> </div>
</div>
</div> </div>
</div> </div>
</div> @else
<div class="relative w-full lg:max-w-7xl flex items-center m-auto">
<x-layouts.auth.slider>
{!! $slider ?? '' !!}
</x-layouts.auth.slider>
<div class="w-full lg:w-46 h-31 flex flex-col justify-center gap-12 px-6 lg:px-24 py-24 mt-12 lg:mt-0">
<div class="flex flex-col gap-4">
<img src="{{ asset('public/img/akaunting-logo-green.svg') }}" class="w-16 my-3" alt="Akaunting" />
<x-layouts.install.content :title="$title">
{!! $content !!}
</x-layouts.install.content>
</div>
</div>
</div>
@endif
</div> </div>
@stack('body_end') @stack('body_end')