merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts

This commit is contained in:
Deepak Singh Gusain 2022-01-21 12:06:10 +05:30
parent d2dde1ccc2 39a854adcd
commit 2cb8af2b27
8 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/database.php
View File

@ -1,7 +1,5 @@
<?php
use Illuminate\Support\Str;
return [
/*
@ -38,7 +36,7 @@ return [
'sqlite' => [
'driver' => 'sqlite',
'database' => env('DB_DATABASE', database_path('database.sqlite')),
'prefix' => env('DB_PREFIX'),
'prefix' => env('DB_PREFIX', ''),
],
'mysql' => [
@ -51,7 +49,7 @@ return [
'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => env('DB_PREFIX'),
'prefix' => env('DB_PREFIX', ''),
'strict' => false,
'engine' => 'InnoDB ROW_FORMAT=DYNAMIC',
],

6
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

5
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1 @@
{
"/js/admin.js": "/js/admin.js?id=94da304c8b02ad3ba649",
"/css/admin.css": "/css/admin.css?id=da73b52104913b4fb2fe"
}
{}

4
packages/Webkul/Admin/src/Resources/assets/sass/_variables.scss vendored
View File

@ -26,5 +26,7 @@ $font-color: #3A3A3A;
$link-color: #a2a2a2;
$link-active-color: #a2a2a2;
//Switch Color
$dark-mode-switch-background: #000;
$dark-mode-switch-border: #24384c;
$nav-hover-color: #e6e6e6;

11
packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss vendored
View File

@ -698,4 +698,15 @@
border-color: #24384c !important;
}
.control-group .slider {
top: -2px !important;
right: -2px !important;
background-color: $dark-mode-switch-background !important;
border: 1px solid $dark-mode-switch-border !important;
}
.control-group input:checked + .slider {
background-color: $dark-mode-switch-background !important;
}
}

4
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss vendored
View File

@ -252,7 +252,7 @@ body {
}
&.active {
background-color: $nav-hover-color;
background-color: #e6e6e6;
.menu-label {
color: $blue;
}
@ -338,7 +338,7 @@ body {
}
&.active, &:hover {
background-color: $nav-hover-color;
background-color: #e6e6e6;
.menu-label {
color: #000 !important;
}

14
packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php
View File

@ -80,13 +80,15 @@
mounted(){
$('.menubar-ancor').click(function(){
var tabname = this.children[1].innerHTML;
$('.menu-item').click(function(){
if(! this.classList.contains('active')){
$('.menu-item').removeClass('active');
if (tabname != 'Dashboard') {
this.parentElement.classList.toggle('active');
this.children[2].classList.toggle("rotate-arrow-icon");
}
if (this.children[0].children[1].innerHTML != 'Dashboard') {
this.classList.toggle('active');
this.children[0].children[2].classList.toggle("rotate-arrow-icon");
}
}
});
},
});

23
packages/Webkul/Core/src/Providers/EnvValidatorServiceProvider.php
View File

@ -2,25 +2,29 @@
namespace Webkul\Core\Providers;
use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Facades\Validator;
use Dotenv\Exception\InvalidFileException;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\ServiceProvider;
use Symfony\Component\Console\Output\ConsoleOutput;
class EnvValidatorServiceProvider extends ServiceProvider
{
/*
/**
* Set environment variable rules.
*
* @var array
*/
protected $rules = [
'DB_PREFIX' => 'not_regex:/[^A-Za-z0-9]/'
'DB_PREFIX' => 'not_regex:/[^A-Za-z0-9_]/',
];
/*
/**
* Set environment variable error messages.
*
* @var array
*/
protected $messages = [
'not_regex' => 'DB_PREFIX ENV is not valid.'
'not_regex' => 'DB_PREFIX ENV is not valid.',
];
/**
@ -35,6 +39,8 @@ class EnvValidatorServiceProvider extends ServiceProvider
/**
* Validate environment variables.
*
* @return void
*/
private function validateEnvVariables()
{
@ -53,9 +59,8 @@ class EnvValidatorServiceProvider extends ServiceProvider
/**
* Generate a friendly error message.
*
* @param string $cause
* @param string $subject
*
* @param string $cause
* @param string $subject
* @return string
*/
private function getErrorMessage($cause, $subject)