diff --git a/composer.json b/composer.json index f16053b..e4bae5f 100644 --- a/composer.json +++ b/composer.json @@ -21,15 +21,12 @@ "laravel/sanctum": "^3.2", "laravel/tinker": "^2.7", "laravelcollective/html": "^6.4", + "laravolt/avatar": "^5.0", "nwidart/laravel-modules": "^10.0", + "putrakuningan/approval-module": "dev-master", + "putrakuningan/cetaklabel-module": "dev-_temp", "putrakuningan/logs-module": "dev-master", - "putrakuningan/usermanager-module": "dev-erp", - "putrakuningan/buyer-module": "dev-master", - "putrakuningan/company-module": "dev-master", - "putrakuningan/master-module": "dev-master", - "putrakuningan/supplier-module": "dev-master", - "putrakuningan/product-module": "dev-master", - "putrakuningan/warehouse-module": "dev-master", + "putrakuningan/usermanager-module": "dev-master", "simplesoftwareio/simple-qrcode": "^4.2", "spatie/laravel-activitylog": "^4.7", "spatie/laravel-permission": "^5.10", @@ -103,34 +100,14 @@ "url": "https://git.putrakuningan.com/putrakuningan/Usermanager" }, { - "name": "putrakuningan/company-module", + "name": "putrakuningan/cetaklabel-module", "type": "vcs", - "url": "https://git.putrakuningan.com/putrakuningan/Company" + "url": "https://git.putrakuningan.com/putrakuningan/Cetaklabel" }, { - "name": "putrakuningan/supplier-module", + "name": "putrakuningan/approval-module", "type": "vcs", - "url": "https://git.putrakuningan.com/putrakuningan/Supplier" - }, - { - "name": "putrakuningan/buyer-module", - "type": "vcs", - "url": "https://git.putrakuningan.com/putrakuningan/Buyer" - }, - { - "name": "putrakuningan/master-module", - "type": "vcs", - "url": "https://git.putrakuningan.com/putrakuningan/Master" - }, - { - "name": "putrakuningan/product-module", - "type": "vcs", - "url": "https://git.putrakuningan.com/putrakuningan/Product" - }, - { - "name": "putrakuningan/warehouse-module", - "type": "vcs", - "url": "https://git.putrakuningan.com/putrakuningan/Warehouse" + "url": "https://git.putrakuningan.com/putrakuningan/Approval" } ] } diff --git a/public/assets/media/logos/android-chrome-192x192.png b/public/assets/media/logos/android-chrome-192x192.png new file mode 100644 index 0000000..6c71e6a Binary files /dev/null and b/public/assets/media/logos/android-chrome-192x192.png differ diff --git a/public/assets/media/logos/android-chrome-512x512.png b/public/assets/media/logos/android-chrome-512x512.png new file mode 100644 index 0000000..f66731a Binary files /dev/null and b/public/assets/media/logos/android-chrome-512x512.png differ diff --git a/public/assets/media/logos/apple-touch-icon.png b/public/assets/media/logos/apple-touch-icon.png new file mode 100644 index 0000000..ce5ce96 Binary files /dev/null and b/public/assets/media/logos/apple-touch-icon.png differ diff --git a/public/assets/media/logos/favicon-16x16.png b/public/assets/media/logos/favicon-16x16.png new file mode 100644 index 0000000..644cdb9 Binary files /dev/null and b/public/assets/media/logos/favicon-16x16.png differ diff --git a/public/assets/media/logos/favicon-32x32.png b/public/assets/media/logos/favicon-32x32.png new file mode 100644 index 0000000..a122424 Binary files /dev/null and b/public/assets/media/logos/favicon-32x32.png differ diff --git a/public/assets/media/logos/favicon.ico b/public/assets/media/logos/favicon.ico new file mode 100644 index 0000000..3fd4fd8 Binary files /dev/null and b/public/assets/media/logos/favicon.ico differ diff --git a/public/assets/media/logos/logo_agi.png b/public/assets/media/logos/logo_agi.png new file mode 100644 index 0000000..a16ae47 Binary files /dev/null and b/public/assets/media/logos/logo_agi.png differ diff --git a/resources/views/layout/partials/sidebar-layout/header/_navbar.blade.php b/resources/views/layout/partials/sidebar-layout/header/_navbar.blade.php index d342034..5176ae2 100644 --- a/resources/views/layout/partials/sidebar-layout/header/_navbar.blade.php +++ b/resources/views/layout/partials/sidebar-layout/header/_navbar.blade.php @@ -9,7 +9,7 @@
- user + {{ Auth::user()->name }}
@include('partials/menus/_user-account-menu') diff --git a/resources/views/layout/partials/sidebar-layout/sidebar/_logo.blade.php b/resources/views/layout/partials/sidebar-layout/sidebar/_logo.blade.php index d88a598..b0d751f 100644 --- a/resources/views/layout/partials/sidebar-layout/sidebar/_logo.blade.php +++ b/resources/views/layout/partials/sidebar-layout/sidebar/_logo.blade.php @@ -2,8 +2,8 @@ - - - - - @foreach($module as $row => $key) @if($key) @if(file_exists(dirname(__FILE__, 4) . '/Modules/'.$row.'/Resources/views/partials/menu/_root.blade.php')) diff --git a/resources/views/pages/dashboards/index.blade.php b/resources/views/pages/dashboards/index.blade.php index b274753..00bcc50 100644 --- a/resources/views/pages/dashboards/index.blade.php +++ b/resources/views/pages/dashboards/index.blade.php @@ -1,85 +1,3 @@ - -
- -
- @include('partials/widgets/cards/_widget-20') - @include('partials/widgets/cards/_widget-7') -
- - -
- @include('partials/widgets/cards/_widget-17') - - @include('partials/widgets/lists/_widget-26') -
- - -
- @include('partials/widgets/engage/_widget-10') -
- -
- - - -
- -
- @include('partials/widgets/charts/_widget-8') -
- - -
- @include('partials/widgets/tables/_widget-16') -
- -
- - - -
- -
- @include('partials/widgets/cards/_widget-18') -
- - -
- @include('partials/widgets/charts/_widget-36') -
- -
- - - -
- -
- @include('partials/widgets/charts/_widget-35') -
- - -
- @include('partials/widgets/tables/_widget-14') -
- -
- - - -
- -
- @include('partials/widgets/charts/_widget-31') -
- - -
- @include('partials/widgets/charts/_widget-24') -
- -
-
diff --git a/resources/views/partials/menus/_user-account-menu.blade.php b/resources/views/partials/menus/_user-account-menu.blade.php index 410f39f..70604de 100644 --- a/resources/views/partials/menus/_user-account-menu.blade.php +++ b/resources/views/partials/menus/_user-account-menu.blade.php @@ -5,7 +5,7 @@