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

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}

app/Http/Controllers/API/v1/Nominee/DeleteController.php

@@ -11,7 +11,7 @@ class DeleteController extends Controller
 {
     public function __invoke ($id) 
     {
-    	$nominee = Nominee::find($id);
+		$nominee = Nominee::findOrFail($id);
     	Util::deleteImage($nominee->image);
     	$nominee->delete();
 

app/Http/Middleware/AdminMiddleware.php

@@ -1,4 +1,4 @@
-<?php
+<?php 
 
 namespace App\Http\Middleware;
 

app/Nominee.php

@@ -8,6 +8,7 @@ class Nominee extends Model
 {
     protected $table = 'nominee';
     protected $fillable = [
+        
     	'name',
     	'unit',
     	'no_anggota',

resources/assets/js/components/admin/index.vue

@@ -33,7 +33,7 @@
 export default {
 	created: function () {
 		if (!this.util.isLogin())
-			return this.$router.push({name: 'Admin Login'});
+			return this.$router.push({name: 'Log Masuk Admin ==='});
 	}
 }
 </script>

resources/assets/js/components/admin/login.vue

@@ -2,7 +2,7 @@
 <div class="col-md-5 col-md-offset-3">
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<h4>Admin Log Masuk </h4>
+			<h4>Log Masuk Admin</h4>
 		</div>
 
 		<div class="panel-body">
@@ -14,7 +14,7 @@
 				</div>
 
 				<div class="form-group">
-					<label for="password">Password</label>
+					<label for="password">Kata Laluan</label>
 					<input type="password" name="password" class="form-control" id="password" required/>
 				</div>
 
@@ -24,7 +24,7 @@
 						id="visibility"  
 						onclick=" $(this)[0].checked ? 
 									$('#password').attr('type','text'):
-									$('#password').attr('type','password')"/> Show Password
+									$('#password').attr('type','password')"/> Papar Katalaluan
 				</label>
 
 				<div class="form-group">

resources/assets/js/components/demo/admin/admin/admin.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="container col-md-8 col-md-offset-2">
-	<h4>Manage Account</h4>
+	<h4>Pengurusan Akaun Pengguna </h4>
 	<router-view></router-view>
 </div>
 </template>

resources/assets/js/components/demo/admin/admin/edit.vue

@@ -56,7 +56,7 @@ export default{
 				.catch(error=>{
 					$.notifyClose();
 					vm.loading = false;
-					vm.util.showResult(error, 'error')
+					vm.util.showResult(error.response, 'error'); 
 				})
 		}
 	}

resources/assets/js/components/demo/admin/admin/index.vue

@@ -4,7 +4,7 @@
 		
 		<div class="form-group">
 			<router-link :to="{name: 'Add Account'}" class="btn btn-success">
-				<i class="fa fa-plus"></i> Add Account</router-link>
+				<i class="fa fa-plus"></i> Tambah Akaun Pengguna</router-link>
 			<button class="btn btn-default" @click="refreshAdmin()">
 				<i class="fa fa-refresh"></i> Refresh</button>
 		</div>
@@ -24,8 +24,8 @@
 					<td>{{ admin.name }}</td>
 					<td>{{ admin.email }}</td>
 					<td>
-						<button class="btn btn-danger" @click="id=admin.id;util.showModal('#delete-admin-modal')">
-							<i class="fa fa-trash"></i> Padam
+						<button class="btn btn-danger" @click="deleteAdmin(admin.id)">
+    					<i class="fa fa-trash"></i> Padam
 						</button>
 					</td>
 				</tr>
@@ -38,8 +38,8 @@
 			<h3>Are you sure to delete this admin?</h3>
 		</modal-body>
 		<modal-footer>
-			<button @click="deleteAdmin()" class="btn btn-danger">Delete</button>
-			<button @click="util.hideModal('#delete-admin-modal')" class="btn btn-default">Cancel</button>
+			<button @click="deleteAdmin()" class="btn btn-danger">Padam</button>
+			<button @click="util.hideModal('#delete-admin-modal')" class="btn btn-default">Batal</button>
 		</modal-footer>
 	</modal>
 </div>

resources/assets/js/components/demo/admin/admin/password.vue

@@ -40,7 +40,7 @@ export default{
 			if (this.loading || !this.checkPassword()) return;
 			var vm = this;
 			vm.loading = true;
-			vm.util.notify('Updating Password', 'loading');
+			vm.util.notify('Kemaskini Katalaluan', 'loading');
 			axios.put(config.API+'admin/password/'+this.data.user.id, $('#edit_form').serialize())
 				.then(response=>{
 					$.notifyClose();

resources/assets/js/components/demo/admin/home/home.vue

@@ -8,7 +8,7 @@
 <script>
 export default{
 	created: function () {
-		this.util.setTitle('Voting System - Maklumat Undian');
+		this.util.setTitle('MyKoPKB - Maklumat Undian');
 	}
 }
 </script> 

resources/assets/js/components/demo/admin/home/index.vue

@@ -26,6 +26,10 @@
 							<th>Undian Mula</th>
 							<th>Undian Tamat</th>
 							<th>Papar</th>
+							<th>Nama Undian</th>
+							<th>Undian Mula</th>
+							<th>Undian Tamat</th>
+							<th>Papar</th>
 						</tr>
 					</thead>
 					<tbody>

resources/assets/js/components/demo/admin/index.vue

@@ -1,5 +1,6 @@
 <template>
 <div>	
+	
 	<div v-if="!loading">
 		<nav class="navbar navbar-default navbar-fixed-top" id="nav">
 			<div class="container-fluid">
@@ -15,9 +16,9 @@
 
 					<ul class="nav navbar-nav">
 						<!-- {{ 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">
-							<a href="#">Jawatan</a>
+							<a href="#"><b>JAWATAN</b></a>
 						</router-link>
 						
 						<!-- <router-link :to="{name: 'Manage Partylist'}"  v-if="data.user.role==1" tag="li">
@@ -25,15 +26,15 @@
 						</router-link> -->
 
 						<router-link :to="{name: 'Manage Voter'}"  v-if="data.user.role==1" tag="li">
-							<a href="#">Anggota Koperasi</a>
+							<a href="#"><b>ANGGOTA KOPERASI</b></a>
 						</router-link>
 
 						<router-link :to="{name: 'Maklumat Calon'}"  v-if="data.user.role==1" tag="li">
-							<a href="#">Calon</a>
+							<a href="#"><b>SENARAI ALK</b></a>
 						</router-link>
 
 						<router-link :to="{name: 'Kehadiran Calon'}"  v-if="data.user.role==1" tag="li">
-							<a href="#">Kehadiran</a>
+							<a href="#"><b>KEHADIRAN</b></a>
 						</router-link>
 
 					</ul>
@@ -84,7 +85,7 @@ export default{
 	// }),
 
 	created: function () {
-		this.util.setTitle('Voting System - Administrator');
+		this.util.setTitle('MyKoPKB - Administrator');
 		var vm = this;
 		if (this.util.isLogin()) {
 			this.util.setAuthorization();

resources/assets/js/components/demo/admin/login.vue

@@ -69,7 +69,7 @@ export default{
 	created: function () {
 		if (this.util.isLogin())
 			return this.$router.push({name:'Admin Home'})
-		this.util.setTitle('Admin Login');
+		this.util.setTitle('Log Masuk Admin ');
 	},
 
 	methods: {

resources/assets/js/components/demo/admin/nominee/add.vue

@@ -34,7 +34,7 @@
 						<label for="position_id">Jawatan</label>
 						<select class="form-control" v-model="position_id" name="position_id" required>
 							<option value="0" disabled>--- Pilih Jawatan ---</option>
-							<option v-for="position in data.positions" :value="position.id">{{ position.name }}</option>
+							<option v-for="position in data.positions" :key="position.id" :value="position.id">{{ position.name }}</option>
 						</select>
 					</div>
 

resources/assets/js/components/demo/admin/nominee/edit.vue

@@ -49,7 +49,7 @@
 					<label for="partylist_id">Partylist</label>
 					<select class="form-control" name="partylist_id" :value="nominee.partylist_id">
 						<option value="">--- Select Partylist (Optional) ---</option>
-						<option v-for="partylist in data.partylists" :value="partylist.id">{{ partylist.name}}</option>
+						<option v-for="partylist in data.partylists" :key="partylist.id" :value="partylist.id">{{ partylist.name }}</option>
 					</select>
 				</div>
 
@@ -62,7 +62,7 @@
                 </div>
 
 				<div class="form-group pull-right">
-					<input type="submit" value="Submit" class="btn btn-info">
+					<input type="submit" value="Simpan" class="btn btn-info">
 					<router-link
 						:to="{name:'Maklumat Calon'}"
 						class="btn btn-default">
@@ -125,7 +125,7 @@ export default{
 			if (this.loading) return;
 			var vm = this;
 			this.loading = true;
-			this.util.notify('Updating nominee', 'progress', 0);
+			this.util.notify('Kemaskini undian', 'progress', 0);
 			$('#edit_form').ajaxSubmit({
 				success: function (response) {
 					$.notifyClose();
@@ -139,7 +139,7 @@ export default{
 					vm.util.showResult(error, 'error', 'ajax');
 				},
 				uploadProgress: function (a, b, c, progress) {
-					this.util.notify('Updating nominee', 'progress', progress);
+					this.util.notify('Kemaskini undian', 'progress', progress);
 				}
 			})
 		}

resources/assets/js/components/demo/admin/nominee/index.vue

@@ -34,11 +34,12 @@
 						</tr>
 					</thead>
 					<tbody>
-						<tr v-for="nominee in nominees">
+						<tr v-for="nominee in nominees" :key="nominee.id">
 							<td>
 								<img :alt="nominee.name" :src="createBase64ImageUrl(nominee.photo)" class="thumbnail"
 									style="height: 60px;width: 60px;">
 							</td>
+							<!-- <td>{{ nominee.id }}</td> -->
 							<td>{{ nominee.name }}</td>
 							<td>{{ nominee.no_anggota }}</td>
 							<td>{{ nominee.unit }}</td>
@@ -50,12 +51,12 @@
 
 							<router-link :to="{ name: 'Edit Nominee', params: { id: nominee.id } }"
 								class="btn btn-primary">
-								<i class="fa fa-edit"></i> Edit
+								<i class="fa fa-edit"></i> Set semula
 							</router-link>
 							<button class="btn btn-danger" @click="util.showModal(nominee.id)" id=nominee.id>
 								<i class="fa fa-trash"></i> Padam
 							</button>
-							</td>
+							
 						</tr>
 						<tr v-if="nominees.length < 1">
 							<td colspan="7">No Calon</td>
@@ -71,7 +72,7 @@
 				<h3>Are you sure to delete this nominee?</h3>
 			</modal-body>
 			<modal-footer>
-				<button class="btn btn-danger" @click="deleteNominee()">Delete</button>
+				<button class="btn btn-danger" @click="deleteNominee()">Padam</button>
 				<button class="btn btn-default" @click="util.hideModal('#delete-nominee-modal')">
 					Kembali
 				</button>
@@ -104,8 +105,16 @@ export default {
 			axios.delete(config.API + 'nominee/' + nomineeId) // Make DELETE request
 				.then(response => {
 					$.notifyClose(); // Close notification
-					if (this.util.showResult(response, 'success')) { // Show success notification
+					// if (this.util.showResult(response, 'success')) {
+						if (response.data && response.data.status === 'success') {
+						this.util.notify('Nominee deleted successfully', 'success');
+
+						
+						// Show success notification
 						this.refreshNominee(); // Refresh the list of nominees
+					} else {
+                this.util.notify('Failed to delete nominee', 'error'); // Show error notification
+            
 					}
 				})
 				.catch(error => {

resources/assets/js/components/demo/admin/partylist/partylist.vue

@@ -8,7 +8,7 @@
 <script>
 export default{
 	created: function () {
-		this.util.setTitle('Voting System - Manage Partylist');
+		this.util.setTitle('MyKoPKB - Manage Partylist');
 	}
 }
 </script> 

resources/assets/js/components/demo/admin/position/index.vue

@@ -9,7 +9,7 @@
 				<i class="fa fa-plus"></i> Tambah Jawatan
 			</router-link>
 			<button class="btn btn-default" @click="refreshPosition()">
-				<i class="fa fa-refresh"></i> Refresh Position
+				<i class="fa fa-refresh"></i> Kemaskini Jawatan
 			</button>
 		</div>
 

resources/assets/js/components/demo/admin/voter/index.vue

@@ -23,7 +23,7 @@
 						<th>Unit</th>
 						<th>Saham</th>
 						<th>Yuran</th>
-						<th>Action</th>
+						<th>Tindakan</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -37,12 +37,12 @@
 						<td>{{ voter.yuran }}</td>
 						<td>
 							<button class="btn btn-info" @click="edit(i)">
-								<i class="fa fa-edit"></i> Edit
+								<i class="fa fa-edit"></i> Set semula
 							</button>
 							<button 
 								class="btn btn-danger" 
 								@click="util.showModal('#delete-voter-modal');id=voter.id">
-								<i class="fa fa-trash"></i> Delete
+								<i class="fa fa-trash"></i> Padam
 							</button>
 						</td>
 					</tr>

resources/assets/js/components/demo/voter/home/index.vue

@@ -1,8 +1,38 @@
 <template>
+<<<<<<< HEAD
+<div class="row col-md-10 col-md-offset-1">
+	<div class="col-md-4">
+		<h4>Maklumat Anggota</h4><hr/>
+		<ul class="list-group">
+			<li class="list-group-item"><b>No. Kad Pengenalan : </b>{{ data.user.no_kp }}</li>
+			<li class="list-group-item"><b>No. Anggota : </b>{{ data.user.no_anggota }}</li>
+			<li class="list-group-item"><b>Nama : </b>{{ data.user.name }}</li>
+			<li class="list-group-item"><b>Unit : </b>{{ data.user.unit }}</li>
+			<li class="list-group-item"><b>Saham : </b>{{ data.user.saham }}</li>
+			<li class="list-group-item"><b>Yuran : </b>{{ data.user.yuran }}</li>
+			<li class="list-group-item" v-if="data.election.status==1">
+				<center>Undian belum bermula</center>
+			</li>
+			<li class="list-group-item" v-if="data.election.status==2">
+				<center>
+					<router-link v-if="!hasVoted()" :to="{name: 'Vote'}" class="btn btn-info">
+						Undi Sekarang
+					</router-link>
+					<router-link v-else :to="{name: 'Result'}" class="btn btn-info">
+						Papar Keputusan
+					</router-link>
+				</center>
+			</li>
+		</ul>
+		<div v-if="hasVoted()">
+			<hr/>
+			<h4>Your votes information</h4><hr/>
+=======
 	<div class="row col-md-10 col-md-offset-1">
 		<div class="col-md-4">
 			<h4>Maklumat Anggota</h4>
 			<hr />
+>>>>>>> 5d1d05717ec58a685bba0b6393ad934904cba077
 			<ul class="list-group">
 				<li class="list-group-item"><b>Nama : </b>{{ data.user.name }}</li>
 				<li class="list-group-item"><b>No. Kad Pengenalan : </b>{{ data.user.no_kp }}</li>
@@ -25,6 +55,42 @@
 					</center>
 				</li>
 			</ul>
+<<<<<<< HEAD
+		</div>
+	</div>
+
+	<div class="col-md-8">
+		<h4>Maklumat Calon</h4><hr/>
+		<small>Click Picture to see details</small>
+		<div class="panel panel-primary" v-for="position in data.positions">
+			<div class="panel-heading">{{ position.name }}</div>
+			<div class="panel-body table-responsive">
+				<table class="table table-hover">
+					<thead>
+						<tr>
+							<th></th>
+							<th>Nama</th>
+							<th>Unit</th>
+							<th>Taraf Pendidikan</th>
+							<th>Pengalaman Kerja </th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr v-for="(nominee,i) in data.nominees" v-if="nominee.position_id==position.id">
+							<td><img
+									@click="view(i)"
+									:src="createBase64ImageUrl(nominee.photo)"
+									class="thumbnail"
+									style="height: 60px;width: 60px;" />
+							</td>
+							<td>{{ nominee.name }}</td>
+							<td>{{ nominee.unit  }}</td>
+							<td>{{ nominee.education}}</td>
+							<td>{{ nominee.experience}}</td>
+						</tr>
+					</tbody>
+				</table>
+=======
 			<div v-if="hasVoted()">
 				<hr />
 				<h4>Maklumat Undian Anda</h4>
@@ -34,6 +100,7 @@
 						<b>{{ getPosition(result.position_id) }} : </b>{{ getNominee(result.nominee_id) }}
 					</li>
 				</ul>
+>>>>>>> 5d1d05717ec58a685bba0b6393ad934904cba077
 			</div>
 		</div>
 

resources/assets/js/components/demo/voter/home/mat.vue

@@ -0,0 +1,92 @@
+<template>
+    <div class="row col-md-10 col-md-offset-1">
+        <div class="col-md-12">
+
+            <!-- <h6 class="text-center">Pautan Zoom</h6> -->
+            <div>
+                <img :src="imageUrl" alt="background-img" class="background-img"  @click="navigateToURL"  />
+
+            </div><hr>
+
+            <!-- <div class="right-button">
+                <button class="btn btn-info right-button">Lampiran Dokumen MAT ke-27/2023 >></button>
+            </div> -->
+        </div>
+
+
+    </div>
+</template>
+
+<script>
+
+
+export default {
+
+    methods: {
+        navigateToURL() {
+            // Navigate to the desired URL
+            window.open('https://linktr.ee/kopkb', '_blank');
+        }
+    },
+
+    created: function () {
+        //console.log(this)
+    },
+
+    data: function () {
+        return {
+            x: {}
+        }
+    },
+
+    computed: {
+        header: function () {
+            return this.x.name + ' for ' + this.getPosition(this.x.position_id);
+        }
+    },
+
+    data() {
+        return {
+            imageUrl: 'https://imagetolink.com/ib/0zxQzuS6tl.png'
+        }
+
+    }
+
+
+
+};
+</script>
+<style>
+.background-img {
+    /* Styles for the image */
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: center;
+
+    /* Ensure the image does not exceed container dimensions */
+    max-width: 100%;
+    max-height: 80vh;
+    border-radius: 20px; 
+}
+    /* transform: translate(-50%, -50%); */
+
+
+
+.right-button {
+
+    border-color: rgb(14, 14, 15);
+    text-align: left; /* Align button content to the left */
+    color: #fff;
+    border-radius: 10px;
+    cursor: pointer;
+    /* padding: 15px ;  */
+}
+
+
+
+.right-button :hover {
+    /* Button styles on hover */
+    outline-color: #045415;
+
+}
+</style>

resources/assets/js/components/demo/voter/home/vote.vue

@@ -12,11 +12,18 @@
 						<b> - {{ getSelectedNomineeName(nominee_id) }}</b>
 					</li>
 				</ul>
+				<ul class="list-group">
+					<li class="list-group-item" v-for="nominee_id in selected[0].nominee_id">
+						<b> - {{ getSelectedNomineeName(nominee_id) }}</b>
+					</li>
+				</ul>
 
 				<li class="list-group-item">
 					<center>
 						<button class="btn btn-success" @click="util.showModal('#vote-modal')">Hantar</button>
 						<!-- <button class="btn btn-default" @click="reset()">Reset</button> -->
+						<button class="btn btn-success" @click="util.showModal('#vote-modal')">Hantar</button>
+						<!-- <button class="btn btn-default" @click="reset()">Reset</button> -->
 					</center>
 				</li>
 			</ul>
@@ -37,6 +44,9 @@
 								<th>Bil.</th>
 								<th></th>
 								<th>Nama</th>
+								<th>Bil.</th>
+								<th></th>
+								<th>Nama</th>
 								<th>Unit</th>
 							</tr>
 						</thead>
@@ -49,6 +59,10 @@
 								<td><img @click="view(i)" :src="createBase64ImageUrl(nominee.photo)" class="thumbnail"
 										style="height: 60px;width: 60px;" />
 								</td>
+								<td>{{ nominee.no_calon }}</td>
+								<td><img @click="view(i)" :src="createBase64ImageUrl(nominee.photo)" class="thumbnail"
+										style="height: 60px;width: 60px;" />
+								</td>
 								<td>{{ nominee.name }}</td>
 								<td>{{ nominee.unit }}</td>
 							</tr>
@@ -63,6 +77,7 @@
 			<div class="modal-dialog" role="document">
 				<div class="modal-content">
 					<div class="modal-header">
+						<h5 class="modal-title" id="exampleModalLabel"></h5>
 						<h5 class="modal-title" id="exampleModalLabel"></h5>
 						<button type="button" class="close" data-dismiss="modal" aria-label="Close">
 							<span aria-hidden="true">&times;</span>
@@ -70,10 +85,13 @@
 					</div>
 					<div class="modal-body">
 						<h5>Nota: Sila pastikan anda telah membuat undian dengan betul.</h5>
+						<h5>Nota: Sila pastikan anda telah membuat undian dengan betul.</h5>
 					</div>
 					<div class="modal-footer">
 						<button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
 						<button type="button" class="btn btn-primary" @click="submit()">Hantar</button>
+						<button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
+						<button type="button" class="btn btn-primary" @click="submit()">Hantar</button>
 					</div>
 				</div>
 			</div>
@@ -134,6 +152,7 @@ export default {
 						vm.data.result = response.data.result;
 						vm.$router.push({ name: 'Voter Home' });
 						$('.modal').modal('hide');
+						$('.modal').modal('hide');
 					}
 				})
 				.catch(error => {
@@ -181,9 +200,11 @@ export default {
             console.log(this.selected[0])
         },
 
+		getSelectedNomineeName: function (id) {
 		getSelectedNomineeName: function (id) {
 			return this.getNominee(id);
 		},
+		},
 
 		getName: function (id) {
 			let positions = this.data.positions;
@@ -200,6 +221,7 @@ export default {
 			let nominees = this.data.nominees;
 			for (var i in nominees)
 				if (nominees[i]['id'] == id) return nominees[i].name;
+				if (nominees[i]['id'] == id) return nominees[i].name;
 			return '';
 		},
 
@@ -225,6 +247,15 @@ export default {
 			return "data:image/png;base64," + base64ImageData;
 		}
 
+		view: function (index) {
+			this.x = this.data.nominees[index];
+			this.util.showModal('#nominee-information-modal');
+		},
+
+		createBase64ImageUrl: function (base64ImageData) {
+			return "data:image/png;base64," + base64ImageData;
+		}
+
 		// uncheck: function (checkedName) {
 		// 	this.checkedName = this.checkedNames.filter(name => name !== checkedName);
 		// }

resources/assets/js/components/demo/voter/home/zoom.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="row col-md-10 col-md-offset-1">
         <div class="col-md-12">
-            <h3 class="text-center">Pautan Zoom</h3>
+         
+            <h6 class="text-center">Pautan Zoom</h6>
            <div>
             <img :src="imageUrl" alt="Centered Image " class="centered-image" />
           
@@ -11,7 +12,7 @@
                     <br> KALI KE-27/2023  </h4></CENTER>
 
                     <div class ="centered-button">
-                        <button class="btn btn-primary" @click=" navigateToURL">Klik pada pautan berikut >></button>
+                        <button class="btn btn-primary" @click=" navigateToURL" target="_blank">Klik pada pautan berikut >></button>
                      </div>
 
 
@@ -76,8 +77,8 @@ export default {
 
 .centered-image {
     /* Styles for the image */
-    max-width: 30%; /* Ensure the image does not exceed container width */
-    max-height: 30%; /* Ensure the image does not exceed container height */
+    max-width: 20%; /* Ensure the image does not exceed container width */
+    max-height: 20%; /* Ensure the image does not exceed container height */
     position: relative;
      /* top: 50%; */
      left: 50%;
@@ -92,7 +93,7 @@ export default {
   padding: 20px 40px;
   text-align: center;
   color: #fff;
-  border-radius: 5px;
+  border-radius: 15px;
   cursor: pointer;
   
 }

resources/assets/js/components/demo/voter/index.vue

@@ -9,30 +9,34 @@
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 					</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='https://i.postimg.cc/ZBDD0ZfQ/Whats-App-Image-2024-03-21-at-1-24-46-PM-2.jpg' border='0' alt="MyKoPKB Logo"></a>
 				</div>
 				<div class="collapse navbar-collapse" id="myNavbar">
 
 					<ul class="nav navbar-nav">
 
 						<router-link :to="{name: 'Voter Home'}" tag="li" exact>
-							<a href="#">Laman Utama</a>
+							<a href="#"><b>LAMAN UTAMA</b></a>
 						</router-link>
 
 						<router-link :to="{name: 'Mat'}" tag="li" exact>
-							<a href="#">MAT27</a>
+							<a href="#"><b>MAT27</b></a>
 						</router-link>
 
 						<router-link :to="{name: 'Attendance'}"  tag="li" exact>
-							<a href="#">Kehadiran</a>
+							<a href="#"><b>KEHADIRAN</b></a>
 						</router-link>
 
 						<router-link :to="{name: 'Zoom'}" tag="li" exact>
-							<a href="#">Pautan Zoom</a>
+							<a href="#"><b>PAUTAN ZOOM</b></a>
 						</router-link>
 
+						<router-link :to="{name: 'Result'}" v-if="data.election.status==2 && hasVoted()" tag="li">
+							<a href="#"><b>KEPUTUSAN</b></a>
+						</router-link>			
+
 						<router-link :to="{name: 'Vote'}" v-if="data.election.status==2 && data.user.saham >= 500 && !hasVoted()" tag="li" exact>
-							<a href="#">Undian</a>
+							<a href="#"><b>UNDIAN</b></a>
 						</router-link>	
 
 						<!-- <router-link :to="{name: 'Result'}" v-if="data.election.status==2 && hasVoted()" tag="li">
@@ -51,7 +55,7 @@
 								<span class="fa fa-user"></span> {{ data.user.name }} <span class="caret"></span>
 							</a>
 							<ul class="dropdown-menu">
-								<li @click="logout()"><a>Logout</a></li>
+								<li @click="logout()"><a>Log Keluar</a></li>
 							</ul>
 						</li>
 					</ul>

resources/views/index.blade.php

@@ -3,12 +3,13 @@
 
 <head lang="en">
 	<meta charset="UTF-8">
-	<title>MyKoPKB == eVoting System</title>
+	<title>Portal MyKoPKB </title>
+    <link rel="icon" type="image/png" href="https://i.ibb.co/XjbXhMQ/My-Ko-PKB-logo-removebg-preview-1.png" alt="My-Ko-PKB-logo-removebg-preview-1">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
 	<link rel="stylesheet" href="/css/app.css">
-
+    
 
 </head>
 
@@ -20,6 +21,8 @@
 
     <div id="error"></div>
 
+    
+
     <script>
         window.config = {
             "API": "/api/v1/", //URL OF YOUR API LOCATED
@@ -45,6 +48,31 @@
     <script src="https://cdn.jsdelivr.net/npm/moment@2.29.1/moment.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/vue-router@3.4.9/dist/vue-router.min.js"></script>
     <script src="/js/app.js"></script>
+    <!-- Bootstrap CSS -->
+   
 </body>
+<footer class="bg-body-tertiary text-center text-lg-start">
+    <!-- Copyright -->
+    <div class="text-center py-4" style="background-color: rgba(0, 0, 0, 0.05);">
+      <b>Koperasi Permodalan Kelantan Berhad © 2024 All Right Reserved</b>
+      <a class="text-body" href="https://koppkb.com"></a>
+    </div>
+    <!-- Copyright -->
+  </footer>
 
+  <style>
+
+footer {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    /* padding: 40px 0; */
+   
+}
+
+
+
+  </style>
 </html>
+