itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'branch-jagad' into 'main'

Browse Source 
update

See merge request fiqhpratama1/xpendify!40
This commit is contained in:
Jagad Raya
2025-01-19 12:11:55 +00:00
parent 4758575885 2b2f2f5ce1
commit b42eda7de2
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/backend/pages/dashboard/index.blade.php
+14 -11
View File
@@ -21,9 +21,10 @@
</section>
<section class="content">
<div class="container-fluid">
<div class="row">
<!-- Statistic Cards Grid -->
<div class="row row-cols-2 row-cols-md-2 row-cols-lg-3 g-4">
<!-- Statistic Card 1 -->
<div class="col-lg-4 col-6">
<div class="col">
<div class="small-box bg-info">
<div class="inner">
<h3>Rp {{ number_format($forms['vehicle'] + $forms['entertainment'] + $forms['meeting'] + $forms['upcountry'] + $forms['others'], 0, ',', '.') }}</h3>
@@ -38,7 +39,7 @@
</div>
</div>
<!-- Statistic Card 2 -->
<div class="col-lg-4 col-6">
<div class="col">
<div class="small-box bg-success">
<div class="inner">
<h3>Rp {{ number_format($forms['upcountry'], 0, ',', '.') }}</h3>
@@ -53,7 +54,7 @@
</div>
</div>
<!-- Statistic Card 3 -->
<div class="col-lg-4 col-6">
<div class="col">
<div class="small-box bg-warning">
<div class="inner text-white">
<h3>Rp {{ number_format($forms['vehicle'], 0, ',', '.') }}</h3>
@@ -67,9 +68,8 @@
</a>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-6">
<!-- Statistic Card 4 -->
<div class="col">
<div class="small-box bg-purple">
<div class="inner">
<h3>Rp {{ number_format($forms['entertainment'], 0, ',', '.') }}</h3>
@@ -83,7 +83,8 @@
</a>
</div>
</div>
<div class="col-lg-4 col-6">
<!-- Statistic Card 5 -->
<div class="col">
<div class="small-box bg-danger">
<div class="inner">
<h3>Rp {{ number_format($forms['meeting'], 0, ',', '.') }}</h3>
@@ -97,7 +98,8 @@
</a>
</div>
</div>
<div class="col-lg-4 col-6">
<!-- Statistic Card 6 -->
<div class="col">
<div class="small-box bg-pink">
<div class="inner">
<h3>Rp {{ number_format($forms['others'], 0, ',', '.') }}</h3>
@@ -112,11 +114,12 @@
</div>
</div>
</div>
<div class="card card-primary card-outline">
<!-- Welcome Card -->
<div class="card card-primary card-outline mt-4">
<div class="card-body text-center">
<p class="lead">Welcome to {{ config('app.name') }} (development version).</p>
</div>
</div>
</div>
</section>
@endsection
@endsection
resources/views/layouts/app.blade.php
+3 -10
View File
@@ -38,9 +38,9 @@
{{-- <span id="date-time" class="font-weight-bold"></span> --}}
</div>
<ul class="navbar-nav">
<li class="nav-item dropdown">
<a class="nav-link" data-toggle="dropdown" href="#" role="button" data-widget="notification">
<ul class="navbar-nav" style="margin-top: 0px;">
<li class="nav-item dropdown" style="margin-top: 0px;">
<a class="nav-link" data-toggle="dropdown" href="#" role="button" data-widget="notification" style="margin-top: 0px;">
<i class="fas fa-bell"></i>
<span id="notification-dot" class="badge badge-danger" style="display: none; position: absolute; top: 8px; right: 10px; font-size: 0.6rem;"></span>
</a>
@@ -63,13 +63,6 @@
</div>
</li>
<!-- Fullscreen Icon -->
<li class="nav-item">
<a class="nav-link" data-widget="fullscreen" href="#" role="button">
<i class="fas fa-expand-arrows-alt"></i>
</a>
</li>
<!-- Profile Section -->
<li class="nav-item dropdown" title="Account Profile">
<a class="nav-link" data-toggle="dropdown" href="#">