Skip to content

I
IPRSv2
Commit a13ab9b1 authored by Michael Ngei's avatar Michael Ngei
Browse files
Options

Merge branch 'iprsv2_brian' into 'master' 

Nav icons changed to black, icons and images added

See merge request !1
parents 8ade4683 bf8f22a7
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 69 deletions
config/adminlte.php
View file @ a13ab9b1
......@@ -20,7 +20,7 @@ return [
'title_icon' => [
'enabled' => true,
'img' => [
'path' => 'images/coat-of-arms.webp',
'path' => 'images/coat-of-arms.png',
'alt' => 'Coat of Arms',
],
],
......@@ -38,8 +38,8 @@ return [
|
*/
'use_ico_only' => true,
'use_full_favicon' => false,
'use_ico_only' => false,
'use_full_favicon' => true,
/*
|--------------------------------------------------------------------------
......@@ -72,11 +72,13 @@ return [
*/
'logo' => '<b>IPRS</b>',
'logo_img' => 'images/coat-of-arms.webp',
'logo_img' => 'images/coat-of-arms.png',
'logo_img_class' => 'brand-image img-circle elevation-3',
'logo_img_xl' => null,
'logo_img_xl_class' => 'brand-image-xs',
'logo_img_alt' => 'IPRS Logo',
'logo-img-width' => 20,
'logo-img-height' => 20,
/*
|--------------------------------------------------------------------------
......@@ -94,7 +96,7 @@ return [
'auth_logo' => [
'enabled' => false,
'img' => [
'path' => 'vendor/adminlte/dist/img/coat-of-arms.webp',
'path' => 'vendor/adminlte/dist/img/coat-of-arms.png',
'alt' => 'IPRS Logo',
'class' => '',
'width' => 50,
......@@ -121,7 +123,7 @@ return [
'enabled' => true,
'mode' => 'fullscreen',
'img' => [
'path' => 'images/coat-of-arms.webp',
'path' => 'images/coat-of-arms.png',
'alt' => 'Coat of Arms',
'effect' => 'animation__wobble',
'width' => 160,
......@@ -355,15 +357,16 @@ return [
],
// Sidebar items:
[
'type' => 'sidebar-menu-search',
'text' => 'search',
],
[
'text' => 'blog',
'url' => 'admin/blog',
'can' => 'manage-blog',
],
// [
// 'type' => 'sidebar-menu-search',
// 'text' => 'search',
// ],
// [
// 'text' => 'blog',
// 'url' => 'admin/blog',
// 'can' => 'manage-blog',
// ],
[
'text' => 'Dashboard',
......@@ -381,18 +384,12 @@ return [
],
[
'text' => 'Search',
'text' => 'Basic Search',
'url' => 'meta/search',
'icon' => 'fas fa-fw fa-search',
'can'=> 'basicSearch'
],
[
'text' => 'Account',
'route' => 'account.index',
'icon' => 'far fa-fw fa-address-card',
'can'=> 'isClient'
],
[
'text' => 'Advanced Search',
'icon' => 'fas fa-bolt',
......@@ -413,15 +410,20 @@ return [
'url' => '#',
'can'=> ['advanceSearch','isAdmin']
],
[
'text' => 'Family Relations',
'url' => '#',
'can'=> ['advanceSearch','isAdmin']
],
]
],
// [
// 'text' => 'Advanced Search',
// 'url' => 'admin/search',
// 'icon' => 'fas fa-bolt',
// 'can'=> ['isClient','isAdmin']
// ],
[
'text' => 'Account',
'route' => 'account.index',
'icon' => 'far fa-fw fa-address-card',
'can'=> 'isClient'
],
[
'text' => 'Billing',
......@@ -476,43 +478,53 @@ return [
]
],
// [
// 'text' => 'Onboarding',
// 'icon' => 'fas fa-fw fa-plus',
// 'url' => 'admin/client/onboarding',
// 'can'=> 'isAdmin'
// ],
[
'text' => 'Administration',
'icon' => 'fa fa-users-cog',
'submenu' => [
[
'text' => 'Onboarding',
'icon' => 'fas fa-fw fa-plus',
// 'icon' => 'fas fa-fw fa-plus',
'url' => 'admin/client/onboarding',
'can'=> 'isAdmin'
],
[
'text' => 'Administration',
'icon' => 'fa fa-users-cog',
'submenu' => [
[
'text' => 'Clients',
#'url' => 'client'
'route'=> 'client.index',
'can'=> 'isAdmin'
],
[
'text' => 'Contracts',
'text' => 'Subscriptions',
'route' => 'contract.index',
'can'=> 'isAdmin'
],
[
'text' => 'Dictionaries',
'url' => '#',
'text' => 'Users',
'route' => 'user.index',
'can'=> 'isAdmin'
],
[
'text' => 'Doubles',
'url' => '#',
'can'=> 'isAdmin'
'text' => 'Permissions',
'route' => 'permission.index',
'can' => 'isAdmin'
],
[
'text' => 'System Configuration',
'url' => '#',
'can'=> 'isSuperAdmin'
'text' => 'Roles',
'route' => 'role.index',
'can'=> 'isAdmin'
],
// [
// 'text' => 'Services',
// 'route' => 'service.index',
......@@ -521,45 +533,79 @@ return [
]
],
// [
// 'text' => 'Users',
// 'icon' => 'fa fa-user',
// 'submenu' => [
// [
// 'text' => 'Users',
// 'route' => 'user.index',
// 'can'=> 'isAdmin'
// ],
// [
// 'text' => 'Permissions',
// 'route' => 'permission.index',
// 'can' => 'isAdmin'
// ],
// [
// 'text' => 'Roles',
// 'route' => 'role.index',
// 'can'=> 'isAdmin'
// ],
// ]
// ],
[
'text' => 'Users',
'icon' => 'fa fa-user',
'text' => 'Reports',
'icon' => 'fas fa-chart-pie',
'submenu' => [
[
'text' => 'Users',
'route' => 'user.index',
'text' => 'Dictionaries',
'url' => '#',
'can'=> 'isAdmin'
],
[
'text' => 'Permissions',
'route' => 'permission.index',
'can' => 'isAdmin'
],
[
'text' => 'Roles',
'route' => 'role.index',
'text' => 'Doubles',
'url' => '#',
'can'=> 'isAdmin'
],
]
[
'text' => 'System Configuration',
'url' => '#',
'can'=> 'isSuperAdmin'
],
[
'text' => 'Performance',
'icon' => 'fa fa-cog',
'submenu' => [
[
'text' => 'Audit Trails',
'url' => '#',
'can'=> 'isAdmin'
'can'=> 'isSuperAdmin'
],
[
'text' => 'Logged Users',
'url' => '#',
'can'=> 'isAdmin'
]
'can'=> 'isSuperAdmin'
],
]
],
// [
// 'text' => 'Performance',
// 'icon' => 'fa fa-cog',
// 'submenu' => [
// [
// 'text' => 'Audit Trails',
// 'url' => '#',
// 'can'=> 'isAdmin'
// ],
// [
// 'text' => 'Logged Users',
// 'url' => '#',
// 'can'=> 'isAdmin'
// ]
// ]
// ],
[
'key' => 'organization',
'text' => 'Manage Organization',
......
public/favicon/favicon.svg 0 → 100644
View file @ a13ab9b1
This source diff could not be displayed because it is too large. You can view the blob instead.
public/favicon/site.webmanifest 0 → 100644
View file @ a13ab9b1
{
"name": "MyWebSite",
"short_name": "MySite",
"icons": [
{
"src": "/coat-of-arms/web-app-manifest-192x192.png",
"sizes": "192x192",
"type": "image/png",
"purpose": "maskable"
},
{
"src": "/coat-of-arms/web-app-manifest-512x512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "maskable"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
\ No newline at end of file
resources/views/layouts/app.blade.php
View file @ a13ab9b1
......@@ -8,6 +8,7 @@
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name', 'IPRS') }}</title>
<link rel="shortcut icon" href="{{ asset('favicon/favicon.ico') }}">
<!-- Fonts -->
<link rel="dns-prefetch" href="//fonts.bunny.net">
......
resources/views/vendor/adminlte/partials/common/brand-logo-xs.blade.php
View file @ a13ab9b1
......@@ -19,7 +19,7 @@
<img src="{{ asset(config('adminlte.logo_img', 'vendor/adminlte/dist/img/AdminLTELogo.png')) }}"
alt="{{ config('adminlte.logo_img_alt', 'AdminLTE') }}"
class="{{ config('adminlte.logo_img_class', 'brand-image img-circle elevation-3') }}"
style="width: 55px; height: 55px;">
style="width: 45px; height: 45px;">
{{-- Brand text --}}
<span class="brand-text font-weight-light {{ config('adminlte.classes_brand_text') }}" > &nbsp;|&nbsp;
......
resources/views/vendor/adminlte/partials/navbar/menu-item-dropdown-menu.blade.php
View file @ a13ab9b1
......@@ -5,10 +5,10 @@
data-toggle="dropdown" {!! $item['data-compiled'] ?? '' !!}>
{{-- Icon (optional) --}}
<div class="d-flex justify-content-center align-items-center rounded-circle p-1" style="height: 30px; width: 30px; background-color: #E7FFF2;">
<div class="d-flex justify-content-center align-items-center rounded-circle p-1" style="height: 30px; width: 30px;">
@isset($item['icon'])
<i class="{{ $item['icon'] }} {{
isset($item['icon_color']) ? 'text-' . $item['icon_color'] : 'text-green'
isset($item['icon_color']) ? 'text-' . $item['icon_color'] : 'text-black'
}}"></i>
@endisset
</div>
......
resources/views/vendor/adminlte/partials/navbar/menu-item-link.blade.php
View file @ a13ab9b1
......@@ -4,11 +4,11 @@
@isset($item['target']) target="{{ $item['target'] }}" @endisset
{!! $item['data-compiled'] ?? '' !!}>
<div class="d-flex justify-content-center align-items-center rounded-circle p-1" style="height: 30px; width: 30px; background-color: #E7FFF2;">
<div class="d-flex justify-content-center align-items-center rounded-circle p-1" style="height: 30px; width: 30px;">
{{-- Icon (optional) --}}
@isset($item['icon'])
<i class="{{ $item['icon'] }} {{
isset($item['icon_color']) ? 'text-' . $item['icon_color'] : 'text-green'
isset($item['icon_color']) ? 'text-' . $item['icon_color'] : 'text-black'
}}"></i>
@endisset
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment