arifal/sibedas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
arifal
2025-03-07 14:52:51 +07:00
parent c529a5d511 fbfa2a37bb
commit 0431945a42
40 changed files with 817 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/business-industries/index.blade.php
View File

@@ -15,9 +15,14 @@
<div class="card w-100">
<div class="card-body">
<div class="d-flex flex-wrap justify-content-end align-items-center mb-2">
<a href="{{ route('business-industries.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Upload</a>
@if ($creator)
<a href="{{ route('business-industries.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Upload</a>
@endif
</div>
<div id="table-business-industries"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
<div id="table-business-industries"></div>
</div>
</div>
</div>

11
resources/views/customers/index.blade.php
View File

@@ -15,10 +15,15 @@
<div class="card w-100">
<div class="card-body">
<div class="d-flex flex-wrap justify-content-end align-items-center mb-2">
<a href="{{ route('customers.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto me-3">Create</a>
<a href="{{ route('customers.upload')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Upload</a>
@if ($creator)
<a href="{{ route('customers.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto me-3">Create</a>
<a href="{{ route('customers.upload')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Upload</a>
@endif
</div>
<div id="table-customers"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
<div id="table-customers"></div>
</div>
</div>
</div>

9
resources/views/data-settings/index.blade.php
View File

@@ -15,9 +15,14 @@
<div class="card w-100">
<div class="card-body">
<div class="d-flex flex-wrap justify-content-end align-items-center mb-2">
<a href="{{ route('data-settings.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Create</a>
@if ($creator)
<a href="{{ route('data-settings.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Create</a>
@endif
</div>
<div id="table-data-settings"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
<div id="table-data-settings"></div>
</div>
</div>
</div>

21
resources/views/data/advertisements/index.blade.php
View File

@@ -16,16 +16,21 @@
<div class="card-body">
<div class="row">
<div class="d-flex justify-content-end gap-10 pb-3">
<button class="btn btn-success me-2 width-lg btn-create" data-model="data/advertisements">
<i class='bx bxs-file-plus'></i>
Create</button>
<button class="btn btn-primary width-lg btn-bulk-create" data-model="data/advertisements">
<i class='bx bx-upload' ></i>
Bulk Create
</button>
@if ($creator)
<button class="btn btn-success me-2 width-lg btn-create" data-model="data/advertisements">
<i class='bx bxs-file-plus'></i>
Create</button>
<button class="btn btn-primary width-lg btn-bulk-create" data-model="data/advertisements">
<i class='bx bx-upload' ></i>
Bulk Create
</button>
@endif
</div>
<div>
<div id="reklame-data-table"></div>
<div id="reklame-data-table"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
</div>
</div>
</div>

21
resources/views/data/spatialPlannings/index.blade.php
View File

@@ -14,16 +14,21 @@
<div class="card-body">
<div class="row">
<div class="d-flex justify-content-end gap-10 pb-3">
<button class="btn btn-success me-2 width-lg btn-create" data-model="data/spatial-plannings">
<i class='bx bxs-file-plus'></i>
Create</button>
<button class="btn btn-primary width-lg btn-bulk-create" data-model="data/spatial-plannings">
<i class='bx bx-upload' ></i>
Bulk Create
</button>
@if ($creator)
<button class="btn btn-success me-2 width-lg btn-create" data-model="data/spatial-plannings">
<i class='bx bxs-file-plus'></i>
Create</button>
<button class="btn btn-primary width-lg btn-bulk-create" data-model="data/spatial-plannings">
<i class='bx bx-upload' ></i>
Bulk Create
</button>
@endif
</div>
<div>
<div id="spatial-planning-data-table"></div>
<div id="spatial-planning-data-table"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
</div>
</div>
</div>

26
resources/views/data/tourisms/index.blade.php
View File

@@ -14,16 +14,21 @@
<div class="card-body">
<div class="row">
<div class="d-flex justify-content-end gap-10 pb-3">
<button class="btn btn-success me-2 width-lg btn-create" data-model="data/tourisms">
<i class='bx bxs-file-plus'></i>
Create</button>
<button class="btn btn-primary width-lg btn-bulk-create" data-model="data/tourisms">
<i class='bx bx-upload' ></i>
Bulk Create
</button>
@if ($creator)
<button class="btn btn-success me-2 width-lg btn-create" data-model="data/tourisms">
<i class='bx bxs-file-plus'></i>
Create</button>
<button class="btn btn-primary width-lg btn-bulk-create" data-model="data/tourisms">
<i class='bx bx-upload' ></i>
Bulk Create
</button>
@endif
</div>
<div>
<div id="tourisms-data-table"></div>
<div id="tourisms-data-table"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
</div>
</div>
</div>
@@ -39,14 +44,15 @@
aria-label="Close"></button>
</div>
<div class="modal-body">
<iframe
{{-- <iframe
src=""
width="100%"
height="450"
style="border:0;"
allowfullscreen=""
loading="lazy">
</iframe>
</iframe> --}}
<div id="map" style="height: 400px;"></div>
</div>
</div>
</div>

21
resources/views/data/umkm/index.blade.php
View File

@@ -14,16 +14,21 @@
<div class="card-body">
<div class="row">
<div class="d-flex justify-content-end gap-10 pb-3">
<button class="btn btn-success me-2 width-lg btn-create" data-model="data/umkm">
<i class='bx bxs-file-plus'></i>
Create</button>
<button class="btn btn-primary width-lg btn-bulk-create" data-model="data/umkm">
<i class='bx bx-upload' ></i>
Bulk Create
</button>
@if ($creator)
<button class="btn btn-success me-2 width-lg btn-create" data-model="data/umkm">
<i class='bx bxs-file-plus'></i>
Create</button>
<button class="btn btn-primary width-lg btn-bulk-create" data-model="data/umkm">
<i class='bx bx-upload' ></i>
Bulk Create
</button>
@endif
</div>
<div>
<div id="umkm-data-table"></div>
<div id="umkm-data-table"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
</div>
</div>
</div>

4
resources/views/layouts/partials/sidebar.blade.php
View File

@@ -56,9 +56,13 @@
</div>
</div>
<!-- Efek Bintang -->
<!-- Efek Bintang -->
<div class="animated-stars">
@for ($i = 0; $i < 20; $i++)
<div class="shooting-star"></div>
@endfor
@for ($i = 0; $i < 20; $i++)
<div class="shooting-star"></div>
@endfor
</div>

13
resources/views/master/users/index.blade.php
View File

@@ -13,11 +13,16 @@
<div class="card w-100">
<div class="card-body">
<div class="d-flex flex-wrap justify-content-end align-items-center mb-2">
<a href="{{ route('users.create') }}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">
Create
</a>
@if ($creator)
<a href="{{ route('users.create') }}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">
Create
</a>
@endif
</div>
<div id="table-users"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
<div id="table-users"></div>
</div>
</div>
</div>

9
resources/views/menus/index.blade.php
View File

@@ -16,10 +16,15 @@
<div class="card w-100">
<div class="card-body">
<div class="d-flex flex-wrap justify-content-end align-items-center mb-2">
<a href="{{ route('menus.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Create</a>
@if ($creator)
<a href="{{ route('menus.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Create</a>
@endif
</div>
<div>
<div id="table-menus"></div>
<div id="table-menus"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
</div>
</div>
</div>

9
resources/views/pbg_task/index.blade.php
View File

@@ -13,9 +13,14 @@
<div class="card w-100">
<div class="card-body">
<div class="d-flex flex-wrap justify-content-end">
<a href="{{ route('pbg-task.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Create</a>
@if ($creator)
<a href="{{ route('pbg-task.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Create</a>
@endif
</div>
<div id="table-pbg-tasks"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
<div id="table-pbg-tasks"></div>
</div>
</div>
</div>

9
resources/views/roles/index.blade.php
View File

@@ -16,9 +16,14 @@
<div class="card w-100">
<div class="card-body">
<div class="d-flex flex-wrap justify-content-end align-items-center mb-2">
<a href="{{ route('roles.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Create</a>
@if ($creator)
<a href="{{ route('roles.create')}}" class="btn btn-success btn-sm d-block d-sm-inline w-auto">Create</a>
@endif
</div>
<div id="table-roles"
data-updater="{{ $updater }}"
data-destroyer="{{ $destroyer }}">
</div>
<div id="table-roles"></div>
</div>
</div>
</div>

10
resources/views/settings/syncronize/index.blade.php
View File

@@ -13,10 +13,12 @@
<div class="card w-100">
<div class="card-body">
<div class="d-flex flex-wrap justify-content-end gap-2">
<button type="button" class="btn btn-success btn-sm d-block d-sm-inline w-auto" id="btn-sync-submit">
<span id="spinner" class="spinner-border spinner-border-sm me-1 d-none" role="status" aria-hidden="true"></span>
Sync SIMBG
</button>
@if ($creator)
<button type="button" class="btn btn-success btn-sm d-block d-sm-inline w-auto" id="btn-sync-submit">
<span id="spinner" class="spinner-border spinner-border-sm me-1 d-none" role="status" aria-hidden="true"></span>
Sync SIMBG
</button>
@endif
</div>
<div>
<div id="table-import-datasources"></div>