KoPKB/E-Vote
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature/standardize ui display

Browse Source
This commit is contained in:
ISMAIL MASSERAN
2026-06-23 07:44:42 +00:00
parent a969d4bbcf
commit 378b00a1e6
25 changed files with 2883 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/components/demo/admin/admin/index.vue
+4 -5
View File
@@ -139,15 +139,14 @@ export default {
// Swap admin token + user in local state.
var token = response.data.token;
if (token) {
localStorage['Access Token'] = 'Bearer ' + token;
vm.util.persistLoginSession(token, response.data.token_expires_at, {
adminSession: true,
adminRole: response.data.user && response.data.user.role
});
localStorage.setItem('is_impersonating', '1');
if (vm.util && vm.util.setAuthorization) vm.util.setAuthorization();
}
if (response.data.user) {
vm.data.user = response.data.user;
if (response.data.user.role !== undefined && response.data.user.role !== null) {
localStorage.setItem('admin_role', String(response.data.user.role));
}
}
vm.util.notify('Menyamar berjaya', 'success');
resources/assets/js/components/demo/admin/index.vue
+12 -10
View File
@@ -146,9 +146,14 @@ export default {
})
.catch(error => {
$.notifyClose();
if (this.util.showResult(error) == 401) {
vm.logout();
var status = error.response ? error.response.status : 500;
if (status === 401) {
vm.util.clearSession();
vm.$router.replace({ name: 'Admin Login' });
return;
}
vm.util.showResult(error, 'error');
vm.loading = false;
})
} else {
this.$router.push({ name: 'Admin Login' });
@@ -186,15 +191,14 @@ export default {
return;
}
if (response.data.token) {
localStorage['Access Token'] = 'Bearer ' + response.data.token;
if (vm.util && vm.util.setAuthorization) vm.util.setAuthorization();
vm.util.persistLoginSession(response.data.token, response.data.token_expires_at, {
adminSession: true,
adminRole: response.data.user && response.data.user.role
});
}
localStorage.removeItem('is_impersonating');
if (response.data.user) {
vm.data.user = response.data.user;
if (response.data.user.role !== undefined && response.data.user.role !== null) {
localStorage.setItem('admin_role', String(response.data.user.role));
}
}
vm.util.notify('Berjaya kembali', 'success');
if (vm.$router) vm.$router.go(0);
@@ -206,9 +210,7 @@ export default {
},
logout: function () {
localStorage.removeItem('admin_role');
localStorage.removeItem('is_impersonating');
localStorage.clear();
this.util.clearSession();
this.$router.push({ name: 'Admin Login' });
}
}
resources/assets/js/components/demo/admin/login.vue
+4 -6
View File
@@ -84,12 +84,10 @@ export default {
.then(response => {
vm.stopLoading();
if (this.util.showResult(response, 'success')) {
localStorage['Access Token'] = `Bearer ${response.data.token}`;
localStorage.setItem('admin_session', '1');
if (response.data.user && response.data.user.role !== undefined && response.data.user.role !== null) {
localStorage.setItem('admin_role', String(response.data.user.role));
}
this.util.setAuthorization();
this.util.persistLoginSession(response.data.token, response.data.token_expires_at, {
adminSession: true,
adminRole: response.data.user && response.data.user.role
});
if (Number(response.data.user && response.data.user.role) === 3) {
vm.$router.push({ name: 'Kehadiran Calon' });
} else {
resources/assets/js/components/demo/voter/home/index.vue
+55 -9
View File
@@ -53,13 +53,21 @@
</div>
<div class="member-info-card home-member-card home-member-card--in-section">
<div v-for="row in memberRows" :key="row.label" class="member-field">
<div v-for="row in memberRows" :key="row.key || row.label" class="member-field">
<span class="member-field-icon" aria-hidden="true"><i class="fa" :class="row.icon"></i></span>
<div class="member-field-body">
<span class="member-field-label">{{ row.label }}</span>
<div class="member-field-value-wrap">
<span class="member-field-value">{{ row.value }}</span>
<span v-if="row.subvalue" class="member-field-subvalue">{{ row.subvalue }}</span>
<template v-if="row.entries">
<div v-for="(entry, entryIdx) in row.entries" :key="entryIdx" class="member-field-entry">
<span class="member-field-value">{{ entry.period }}: {{ entry.value }}</span>
<span v-if="entry.subvalue" class="member-field-subvalue">{{ entry.subvalue }}</span>
</div>
</template>
<template v-else>
<span class="member-field-value">{{ row.value }}</span>
<span v-if="row.subvalue" class="member-field-subvalue">{{ row.subvalue }}</span>
</template>
</div>
</div>
</div>
@@ -399,19 +407,43 @@ export default {
{ icon: "fa-barcode", label: "No. Anggota", value: u.no_anggota || "—" },
{ icon: "fa-building", label: "Unit", value: u.unit || "—" },
{
key: "saham",
icon: "fa-line-chart",
label: "Saham",
value: "RM " + fmt(u.saham),
subvalue: dividendSub(u.saham, u.dividen_saham, 40)
entries: [
{
period: "Sehingga Jun 2025",
value: "RM " + fmt(u.saham),
subvalue: dividendSub(u.saham, u.dividen_saham, 40)
},
{
period: "Terkumpul Sehingga Mei 2026",
value: "RM " + fmt(u.saham_terkini)
}
]
},
{
key: "yuran",
icon: "fa-money",
label: "Yuran",
value: "RM " + fmt(u.yuran),
subvalue: dividendSub(u.yuran, u.dividen_yuran, 8)
entries: [
{
period: "Sehingga Jun 2025",
value: "RM " + fmt(u.yuran),
subvalue: dividendSub(u.yuran, u.dividen_yuran, 8)
},
{
period: "Terkumpul Sehingga Mei 2026",
value: "RM " + fmt(u.yuran_terkini)
}
]
},
{ icon: "fa-bank", label: "Simpanan Khas (Tabung 1) - (Sehingga Dis 2025)", value: "RM " + fmt(u.accumulated_amount) },
{ icon: "fa-percent", label: "Dividen Simpanan Khas (Tabung 1) Tahun 2025", value: "RM " + fmt(u.pelaburan) }
{
icon: "fa-bank",
label: "Simpanan Khas (Tabung 1) - (Sehingga Dis 2025)",
value: "RM " + fmt(u.accumulated_amount),
subvalue: dividendSub(u.accumulated_amount, u.pelaburan, 12)
}
];
}
},
@@ -1043,6 +1075,20 @@ export default {
gap: 4px;
}
.member-field-entry {
width: 100%;
display: flex;
flex-direction: column;
align-items: flex-end;
gap: 4px;
}
.member-field-entry+.member-field-entry {
margin-top: 8px;
padding-top: 8px;
border-top: 1px dashed #e2e8f0;
}
.member-field-value {
width: 100%;
text-align: right;
resources/assets/js/components/demo/voter/index.vue
+12 -4
View File
@@ -47,6 +47,10 @@ export default {
}),
created: function () {
if (!this.util.isLogin()) {
this.$router.replace({ name: 'Voter Login' });
return;
}
this.refreshInfo();
},
@@ -81,7 +85,7 @@ export default {
axios.post(config.API + 'voter/logout')
.catch(function () { })
.finally(function () {
localStorage.clear();
vm.util.clearSession();
vm.$router.push({ name: 'Voter Login' });
});
},
@@ -105,10 +109,14 @@ export default {
vm.data.result = response.data.result;
})
.catch(error => {
vm.loading = false;
if (vm.util.showResult(error, 'error') == 401) {
vm.$router.push({ name: 'Voter Login' });
var status = error.response ? error.response.status : 500;
if (status === 401) {
vm.util.clearSession();
vm.$router.replace({ name: 'Voter Login' });
return;
}
vm.loading = false;
vm.util.showResult(error, 'error');
});
}
}
resources/assets/js/components/demo/voter/verification.vue
+3 -4
View File
@@ -157,10 +157,9 @@ export default {
.then(response => {
vm.stopLoading();
if (this.util.showResult(response, 'success')) {
localStorage.removeItem('admin_role');
localStorage.removeItem('admin_session');
localStorage['Access Token'] = `Bearer ${response.data.token}`;
this.util.setAuthorization();
this.util.persistLoginSession(response.data.token, response.data.token_expires_at, {
clearAdminSession: true
});
vm.$router.push({ name: 'Voter Home' });
}
})