Skip to content

Commit

Permalink
Merge branch 'release/0.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@w1lldone
w1lldone committed Jun 14, 2021
2 parents 8210274 + e0832cc commit d52061f
Show file tree
Hide file tree
Showing 6 changed files with 137 additions and 67 deletions.
2 changes: 1 addition & 1 deletion public/css/tailwind.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
View file
@@ -1,8 +1,8 @@
{
"/js/app.js": "/js/app.js?id=50c904477191ff54404f",
"/js/app.js": "/js/app.js?id=c406c74192b5024a6044",
"/js/alpine.js": "/js/alpine.js?id=eea86eb67d792d022004",
"/css/app.css": "/css/app.css?id=e7d562d43302aade9de8",
"/css/tailwind.css": "/css/tailwind.css?id=893fd2fe312a2b912ac5",
"/css/tailwind.css": "/css/tailwind.css?id=adbaf74b631a368842d9",
"/dropboxes/hijau_lubang bulat.jpg": "/dropboxes/hijau_lubang bulat.jpg?id=1269f80703da5b8d1471",
"/dropboxes/hijau_lubang kotak.jpg": "/dropboxes/hijau_lubang kotak.jpg?id=bc1e6364c9576c231556",
"/dropboxes/kuning_lubang bulat.jpg": "/dropboxes/kuning_lubang bulat.jpg?id=33e10edd426427f90080",
Expand Down
61 changes: 28 additions & 33 deletions resources/js/components/Profile/ProfilePage.vue
View file
@@ -1,13 +1,8 @@
<template>
<div>
<div class="d-flex">
<div class="col-md-3">
<img
class="img-fluid rounded-circle p-2 w-100"
src="img/profile_photo.png"
alt="Profile Picture"

>
<div class="col-md-3 text-center">
<div class="mdi mdi-account-circle-outline" style="font-size: 100px !important;"></div>
</div>
<div class="col-md-9">
<div class="d-flex my-3">
Expand Down Expand Up @@ -54,53 +49,53 @@
</div>
</div>
<div class="d-md-flex">
<button
v-show="!isEdit"
<button
v-show="!isEdit"
class="btn btn-primary col-12 col-md-4 mx-3"
@click="isEdit = true"
>
EDIT PROFIL
</button>

<button
v-show="isEdit && !isLoading"
<button
v-show="isEdit && !isLoading"
class="btn btn-success col-12 col-md-2 mx-3"
@click="doSave()"
>
SAVE
</button>
<button
v-show="isEdit && isLoading"
<button
v-show="isEdit && isLoading"
disabled
class="btn btn-success col-12 col-md-2 mx-3"
>
SAVING
</button>
<button
v-show="isEdit && !isLoading"
<button
v-show="isEdit && !isLoading"
class="btn btn-outline-primary col-12 col-md-2 mx-3"
@click="doResetEdit()"
>
CANCEL
</button>
<button
v-show="isEdit && isLoading"
<button
v-show="isEdit && isLoading"
disabled
class="btn btn-outline-primary col-12 col-md-2 mx-3"
>
CANCEL
</button>

<button
<button
v-show="!isUpdatePassword"
class="btn btn-primary col-12 col-md-4 mx-3"
@click="isUpdatePassword = true"
>
GANTI PASSWORD
</button>
</div>


<div v-show="isUpdatePassword" class="mt-4">
<div v-if="!user.has_no_password" class="d-flex my-3">
<div class="col-3 my-auto text-secondary font-weight-bold">
Expand Down Expand Up @@ -156,31 +151,31 @@
</div>
</div>
</div>

<div class="d-md-flex">
<button
v-show="isUpdatePassword && !isLoading"
<button
v-show="isUpdatePassword && !isLoading"
class="btn btn-success col-12 col-md-2 mx-3"
@click="doUpdatePassword()"
>
SAVE
</button>
<button
v-show="isUpdatePassword && isLoading"
<button
v-show="isUpdatePassword && isLoading"
disabled
class="btn btn-success col-12 col-md-2 mx-3"
>
SAVING
</button>
<button
v-show="isUpdatePassword && !isLoading"
<button
v-show="isUpdatePassword && !isLoading"
class="btn btn-outline-primary col-12 col-md-2 mx-3"
@click="doResetUpdatePassword()"
>
CANCEL
</button>
<button
v-show="isUpdatePassword && isLoading"
<button
v-show="isUpdatePassword && isLoading"
disabled
class="btn btn-outline-primary col-12 col-md-2 mx-3"
>
Expand All @@ -203,17 +198,17 @@
},
},
data() {
return {
form: {...this.user},
form: {...this.user},
isLoading: false,
isEdit: false,
isUpdatePassword: false,
errors: {}
}
},
methods: {
Expand Down Expand Up @@ -274,7 +269,7 @@
return "";
},
},
}
</script>
Expand Down
104 changes: 102 additions & 2 deletions resources/js/components/Reports/ReportList.vue
View file
Expand Up @@ -79,7 +79,8 @@
<button
class="btn btn-primary shadow mr-2"
v-show="!isLoading && form.report_id != ''"
@click="doSubmit()"
data-toggle="modal"
data-target="#resolve-modal"
>
RESOLVE
</button>
Expand All @@ -94,7 +95,8 @@
<button
class="btn btn-secondary shadow"
v-show="!isLoading"
@click="doResolveAll()"
data-toggle="modal"
data-target="#resolve-all-modal"
>
RESOLVE ALL
</button>
Expand All @@ -106,6 +108,104 @@
RESOLVE ALL
</button>
</div>
<!-- Modals -->
<div
class="modal fade"
id="resolve-modal"
tabindex="-1"
role="dialog"
aria-labelledby="modal-id"
aria-hidden="true"
>
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header mx-4">
<h5
class="modal-title font-weight-bold text-muted"
style="text-transform: uppercase"
>
RESOLVE REPORTS
</h5>
<button
type="button"
class="close"
data-dismiss="modal"
aria-label="Close"
>
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body text-left mx-4">
<div>
Apakah Anda yakin akan mengubah status laporan menjadi resolved?<br>
Pastikan laporan telah selesai ditangani!
</div>
<div class="mt-4 text-right">
<button type="button" class="btn btn-primary mx-2 shadow" data-dismiss="modal">TIDAK</button>
<button
class="btn btn-secondary shadow"
v-show="!isLoading"
@click="doSubmit()"
>
YA
</button>
<button class="btn btn-secondary" disabled v-show="isLoading">
YA
</button>
</div>
</div>
</div>
</div>
</div>

<div
class="modal fade"
id="resolve-all-modal"
tabindex="-1"
role="dialog"
aria-labelledby="modal-id"
aria-hidden="true"
>
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header mx-4">
<h5
class="modal-title font-weight-bold text-muted"
style="text-transform: uppercase"
>
RESOLVE ALL REPORTS
</h5>
<button
type="button"
class="close"
data-dismiss="modal"
aria-label="Close"
>
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body text-left mx-4">
<div>
Apakah Anda yakin akan mengubah status <b>semua</b> laporan menjadi resolved?<br>
Pastikan laporan telah selesai ditangani!
</div>
<div class="mt-4 text-right">
<button type="button" class="btn btn-primary mx-2 shadow" data-dismiss="modal">TIDAK</button>
<button
class="btn btn-secondary shadow"
v-show="!isLoading"
@click="doResolveAll()"
>
YA
</button>
<button class="btn btn-secondary" disabled v-show="isLoading">
YA
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</template>

Expand Down
31 changes: 3 additions & 28 deletions resources/views/layouts/template.blade.php
View file
Expand Up @@ -131,15 +131,6 @@ class="nav-link font-weight-bold px-3 {{ Route::is('user.*') ? 'btn-primary text
</a>
</li>
@endcan
<li class="nav-item text-left">
<a
class="nav-link font-weight-bold px-3 {{ Request::is('settings/*') ? 'btn-primary text-white rounded' : 'text-secondary' }}"
href="{{ url('/setting')}}"
>
<span class="mdi mdi-settings" style="font-size: 18px"></span>
<span class="ml-2 {{ Request::is('settings/*') ? '' : 'text-dark' }}">Pengaturan</span>
</a>
</li>
</ul>

</div>
Expand Down Expand Up @@ -200,15 +191,6 @@ class="nav-link font-weight-bold px-3 {{ Route::is('user.*') ? 'btn-primary text
</a>
</li>
@endcan
<li class="nav-item text-left">
<a
class="nav-link font-weight-bold px-3 {{ Request::is('settings/*') ? 'btn-primary text-white rounded' : 'text-secondary' }}"
href="{{ url('/setting')}}"
>
<span class="mdi mdi-settings" style="font-size: 18px"></span>
<span class="ml-2 {{ Request::is('settings/*') ? '' : 'text-dark' }}">Pengaturan</span>
</a>
</li>
</ul>
</nav>
</div>
Expand All @@ -227,18 +209,11 @@ class="nav-link font-weight-bold px-3 {{ Request::is('settings/*') ? 'btn-primar
aria-expanded="false"
class="nav-link flex-row dropdown card border-0 rounded shadow p-0"
>
<div>
<img
class="img-fluid rounded"
src="{{ asset('img/profile_photo.png')}}"
alt="Profile"
style="width: 42px; height: 42px"
>
</div>

<div class="d-flex flex-column text-left mx-2">
<span class="text-primary font-weight-bold">{{ Auth::user()->name }}</span>
<span class="text-dark" style="font-size: 12px">Admin</span>
<span class="text-dark" style="font-size: 12px">
{{ Auth::user()->is_superadmin ? 'Admin' : 'Member' }}
</span>
</div>

<div class="nav-link text-left dropdown-toggle my-auto">
Expand Down

0 comments on commit d52061f

Please sign in to comment.