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

Merge branch 'backup' of https://gitlab.com/erahn/voting into hotfix/pdf

Browse Source
This commit is contained in:
nurafrinaalimi16
2024-04-29 17:06:13 +08:00
parent eac65986a6 8696ea382d
commit d0bc2661d7
3 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/components/demo/admin/index.vue
+27 -27
View File
@@ -1,5 +1,5 @@
<template> <template>
<div> <div>
<div v-if="!loading"> <div v-if="!loading">
<nav class="navbar navbar-default navbar-fixed-top" id="nav"> <nav class="navbar navbar-default navbar-fixed-top" id="nav">
<div class="container-fluid"> <div class="container-fluid">
@@ -8,63 +8,63 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" :href="data.baseURL" ><img src='https://i.postimg.cc/ZBDD0ZfQ/Whats-App-Image-2024-03-21-at-1-24-46-PM-2.jpg' border='0' alt="MyKoPKB Logo"></a> <a class="navbar-brand" :href="data.baseURL" ><img src='/images/MyKoPKB-logo.png' border='0' alt="MyKoPKB Logo"></a>
</div> </div>
<div class="collapse navbar-collapse" id="myNavbar"> <div class="collapse navbar-collapse" id="myNavbar">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<!-- {{ users }} --> <!-- {{ users }} -->
<router-link :to="{name: 'Admin Home'}" tag="li" exact><a href="#">Laman Utama</a></router-link> <router-link :to="{name: 'Admin Home'}" tag="li" exact><a href="#">Laman Utama</a></router-link>
<router-link :to="{name: 'Kemaskini Jawatan'}" v-if="data.user.role==1" tag="li"> <router-link :to="{name: 'Kemaskini Jawatan'}" v-if="data.user.role==1" tag="li">
<a href="#">Jawatan</a> <a href="#">Jawatan</a>
</router-link> </router-link>
<!-- <router-link :to="{name: 'Manage Partylist'}" v-if="data.user.role==1" tag="li"> <!-- <router-link :to="{name: 'Manage Partylist'}" v-if="data.user.role==1" tag="li">
<a href="#">Manage Partylist</a> <a href="#">Manage Partylist</a>
</router-link> --> </router-link> -->
<router-link :to="{name: 'Manage Voter'}" v-if="data.user.role==1" tag="li"> <router-link :to="{name: 'Manage Voter'}" v-if="data.user.role==1" tag="li">
<a href="#">Anggota Koperasi</a> <a href="#">Anggota Koperasi</a>
</router-link> </router-link>
<router-link :to="{name: 'Maklumat Calon'}" v-if="data.user.role==1" tag="li"> <router-link :to="{name: 'Maklumat Calon'}" v-if="data.user.role==1" tag="li">
<a href="#">Calon</a> <a href="#">Calon</a>
</router-link> </router-link>
<router-link :to="{name: 'Kehadiran Calon'}" v-if="data.user.role==1" tag="li"> <router-link :to="{name: 'Kehadiran Calon'}" v-if="data.user.role==1" tag="li">
<a href="#">Kehadiran</a> <a href="#">Kehadiran</a>
</router-link> </router-link>
</ul> </ul>
<ul class="nav navbar-right navbar-nav"> <ul class="nav navbar-right navbar-nav">
<li class="dropdown"> <li class="dropdown">
<a <a
href="#" href="#"
class="dropdown-toggle" class="dropdown-toggle"
data-toggle="dropdown" data-toggle="dropdown"
role="button" aria-haspopup="true" role="button" aria-haspopup="true"
aria-expanded="false"> aria-expanded="false">
<span class="fa fa-user"></span> {{ data.user.name }} <span class="caret"></span> <span class="fa fa-user"></span> {{ data.user.name }} <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<router-link :to="{name:'Update Account'}" tag="li" exact> <router-link :to="{name:'Update Account'}" tag="li" exact>
<a href="#">Kemaskini Akaun</a> <a href="#">Kemaskini Akaun</a>
</router-link> </router-link>
<router-link :to="{name: 'Manage Account'}" tag="li" v-if="data.user.id==1"> <router-link :to="{name: 'Manage Account'}" tag="li" v-if="data.user.id==1">
<a href="#">Pengurusan Akaun</a> <a href="#">Pengurusan Akaun</a>
</router-link> </router-link>
<li @click="logout()"><a>Log Keluar</a></li> <li @click="logout()"><a>Log Keluar</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</nav> </nav>
<router-view></router-view> <router-view></router-view>
</div> </div>
<div v-if="loading" class="container"> <div v-if="loading" class="container">
@@ -74,15 +74,15 @@
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default{ export default{
// data: () =>({ // data: () =>({
// loading: true, // loading: true,
// users:{'roles' : 1}, // users:{'roles' : 1},
// }), // }),
created: function () { created: function () {
this.util.setTitle('Voting System - Administrator'); this.util.setTitle('Voting System - Administrator');
var vm = this; var vm = this;
@@ -99,7 +99,7 @@
}) })
.catch(error=>{ .catch(error=>{
$.notifyClose(); $.notifyClose();
if (this.util.showResult(error) == 401) { if (this.util.showResult(error) == 401) {
vm.logout(); vm.logout();
} }
}) })
@@ -107,7 +107,7 @@
this.$router.push({name:'Admin Login'}); this.$router.push({name:'Admin Login'});
} }
}, },
methods: { methods: {
logout: function () { logout: function () {
localStorage.clear(); localStorage.clear();
@@ -116,9 +116,9 @@
} }
} }
</script> </script>
<style> <style>
body{ body{
padding: 70px 5px; padding: 70px 5px;
} }
</style> </style>
resources/assets/js/components/demo/voter/home/index.vue
+24 -2
View File
@@ -93,7 +93,7 @@
<div class="detail-section"> <div class="detail-section">
<span><b> Nama : </b>{{ nomineeViewed.name }}</span> <span><b> Nama : </b>{{ nomineeViewed.name }}</span>
<span><b> Unit : </b>{{ nomineeViewed.unit }}</span> <span><b> Unit : </b>{{ nomineeViewed.unit }}</span>
<span> <b>Taraf Pendidikan :</b> </span> <span> <b>Taraf Pendidikan :</b> </span>
<ol> <ol>
<li v-for="(item, index) in nomineeViewed.education" :key="index">{{ item }}</li> <li v-for="(item, index) in nomineeViewed.education" :key="index">{{ item }}</li>
</ol> </ol>
@@ -185,7 +185,7 @@ export default {
$('#view-nominee-modal').modal(); $('#view-nominee-modal').modal();
}, },
}, },
@@ -229,6 +229,28 @@ export default {
padding: 5px 0; padding: 5px 0;
} }
/* Mobile styles */
@media (max-width: 576px) {
#view-nominee-modal .modal-dialog {
max-width: none;
padding-left: 10px;
padding-right: 20px;
margin-bottom: 50px;
margin-left: 0px;
}
#view-nominee-modal .photo-section {
flex: 0 0 100%; /* Set photo section to full width */
max-width: none; /* Remove max-width */
margin-right: 0; /* Remove right margin */
margin-bottom: 20px; /* Add space between photo and details */
}
#view-nominee-modal .detail-section {
flex: 0 0 100%; /* Set detail section to full width */
}
}
#table-nominee tbody tr { #table-nominee tbody tr {
cursor: pointer; cursor: pointer;
} }
resources/assets/js/components/demo/voter/index.vue
+10 -11
View File
@@ -8,13 +8,13 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" :href="data.baseURL" ><img src='https://i.postimg.cc/ZBDD0ZfQ/Whats-App-Image-2024-03-21-at-1-24-46-PM-2.jpg' border='0' alt="MyKoPKB Logo" width="150" height="auto"></a> <a class="navbar-brand" :href="data.baseURL" ><img src='/images/MyKoPKB-logo.png' border='0' alt="MyKoPKB Logo" width="150" height="auto"></a>
</div> </div>
<div class="collapse navbar-collapse" id="myNavbar"> <div class="collapse navbar-collapse" id="myNavbar">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<router-link :to="{name: 'Voter Home'}" tag="li" exact> <router-link :to="{name: 'Voter Home'}" tag="li" exact>
<a href="#"><b>LAMAN UTAMA</b></a> <a href="#"><b>LAMAN UTAMA</b></a>
</router-link> </router-link>
@@ -29,7 +29,7 @@
<router-link :to="{name: 'Vote'}" v-if="data.election.status==2 && data.user.saham >= 500 && !hasVoted() && data.user.kehadiran != 0" tag="li" exact> <router-link :to="{name: 'Vote'}" v-if="data.election.status==2 && data.user.saham >= 500 && !hasVoted() && data.user.kehadiran != 0" tag="li" exact>
<a href="#"><b>UNDIAN</b></a> <a href="#"><b>UNDIAN</b></a>
</router-link> </router-link>
<router-link :to="{name: 'Zoom'}" v-if="data.user.kehadiran != 0" tag="li" exact> <router-link :to="{name: 'Zoom'}" v-if="data.user.kehadiran != 0" tag="li" exact>
<a href="#"><b>PAUTAN ZOOM</b></a> <a href="#"><b>PAUTAN ZOOM</b></a>
@@ -42,11 +42,11 @@
</ul> </ul>
<ul class="nav navbar-right navbar-nav"> <ul class="nav navbar-right navbar-nav">
<li class="dropdown"> <li class="dropdown">
<a <a
href="#" href="#"
class="dropdown-toggle" class="dropdown-toggle"
data-toggle="dropdown" data-toggle="dropdown"
role="button" aria-haspopup="true" role="button" aria-haspopup="true"
aria-expanded="false"> aria-expanded="false">
<span class="fa fa-user"></span> {{ data.user.name }} <span class="caret"></span> <span class="fa fa-user"></span> {{ data.user.name }} <span class="caret"></span>
</a> </a>
@@ -117,6 +117,5 @@ export default{
<style> <style>
body{ body{
padding: 70px 5px; padding: 70px 5px;
} }
</style> </style>