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

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

@@ -50,8 +50,8 @@ class UpdateController extends Controller
     	$nominee->no_anggota = $request->no_anggota;
     	$nominee->position_id = $request->position_id;
     	$nominee->partylist_id = $request->partylist_id;
-        $nominee->motto = $request->motto;
-        $nominee->description = $request->description;
+        $nominee->education = $request->education;
+        $nominee->experience = $request->experience;
 
         if ($request->hasFile('photo')) {
             $imageData = file_get_contents($request->file('photo'));

app/Nominee.php

@@ -14,8 +14,8 @@ class Nominee extends Model
     	'position_id',
     	'partylist_id',
     	'election_id',
-        'description',
-        'motto',
+        'experience',
+        'education',
         'photo',
     ];
     public $timestamp = false;

database/migrations/2024_03_31_111517_rename_education_in_nominee_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RenameEducationInNomineeTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('nominee', function (Blueprint $table) {
+            $table->renameColumn('motto', 'education');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('nominee', function (Blueprint $table) {
+            $table->renameColumn('motto', 'education');
+        });
+    }
+}

database/migrations/2024_03_31_112252_rename_experience_in_nominee_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RenameExperienceInNomineeTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('nominee', function (Blueprint $table) {
+            $table->renameColumn('description', 'experience');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('nominee', function (Blueprint $table) {
+            $table->renameColumn('description', 'experience');
+        });
+    }
+}

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

@@ -9,7 +9,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="">Voting System</a>
+				<a class="navbar-brand" href="">MyKoPKB</a>
 			</div>
 		
 			<div class="collapse navbar-collapse" id="myNavbar">

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 Login</h4>
+			<h4>Admin Log Masuk </h4>
 		</div>
 
 		<div class="panel-body">

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

@@ -5,7 +5,7 @@
 			<h3><b>Tambah Jawatan</b></h3>
 			<form>
 				<div class="form-group">
-					<label for="name">Position</label>
+					<label for="name">Jawatan</label>
 					<input type="text" name="name" class="form-control" required/>
 				</div>
 

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

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

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

@@ -1,10 +1,10 @@
 <template>
 <div class="panel panel-default">
 	<div class="panel-body">
-		<h4>Update Account</h4>
+		<h4>Kemaskini Akaun</h4>
 		<form @submit.prevent="edit()" id="edit_form">
 			<div class="form-group">
-				<label for="name">Name</label>
+				<label for="name">Nama</label>
 				<input type="text" name="name" class="form-control" :value="data.user.name" required/>
 			</div>
 
@@ -15,7 +15,7 @@
 
 			<div class="form-group">
 				<input type="submit" value="Submit" class="btn btn-info"/>
-				<router-link :to="{name: 'Update Password'}" class="btn btn-default">Change Password</router-link>
+				<router-link :to="{name: 'Update Password'}" class="btn btn-default">Tukar Kata Laluan</router-link>
 			</div>
 		</form>
 	</div>

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

@@ -13,9 +13,9 @@
 			<thead>
 				<tr>
 					<th>ID</th>
-					<th>Name</th>
+					<th>Nama</th>
 					<th>Email</th>
-					<th>Delete</th>
+					<th>Padam</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -25,7 +25,7 @@
 					<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> Delete
+							<i class="fa fa-trash"></i> Padam
 						</button>
 					</td>
 				</tr>

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

@@ -1,26 +1,26 @@
 <template>
 <div class="panel panel-default">
 	<div class="panel-body">
-		<h4>Update Password</h4>
+		<h4>Kemaskini Kata Laluan </h4>
 		<form @submit.prevent="edit()" id="edit_form">
 			<div class="form-group">
-				<label for="old_password">Old Password</label>
+				<label for="old_password">Kata Laluan lama</label>
 				<input type="password" name="old_password" class="form-control" required/>
 			</div>
 
 			<div class="form-group">
-				<label for="password">New Password</label>
+				<label for="password">Kata Laluan Baru </label>
 				<input type="password" name="password" class="form-control" required/>
 			</div>
 
 			<div class="form-group">
-				<label for="confirm_password">Confirm Password</label>
+				<label for="confirm_password">Sahkan Kata Laluan</label>
 				<input type="password" name="confirm_password" class="form-control" required/>
 			</div>
 
 			<div class="form-group">
 				<input type="submit" value="Submit" class="btn btn-info"/>
-				<router-link :to="{name: 'Update Account'}" class="btn btn-default">Back</router-link>
+				<router-link :to="{name: 'Update Account'}" class="btn btn-default">Kembali</router-link>
 			</div>
 		</form>
 	</div>

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

@@ -9,10 +9,10 @@
 						<thead>
 							<tr>
 								<th width="10%">No. Anggota</th>
-								<th width="30%">Name</th>
+								<th width="30%">Nama</th>
 								<th width="20%">Partylist</th>
 								<th width="20%">Unit</th>
-								<th width="20%">Votes</th>
+								<th width="20%">Undian</th>
 							</tr>
 						</thead>
 						<tbody>

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

@@ -1,7 +1,7 @@
 <template> 
 <div class="row">
 	<div class="col-md-4">
-		<h4>Positions</h4><hr/>
+		<h4>Jawatan</h4><hr/>
 		<ul class="list-group">
 			<router-link :key="position.id" v-for="position in data.positions" class="list-group-item" :class="{'active':position.id==position_id}" tag="li" :to="{query:{position_id:position.id}}" exact replace>
 				{{ position.name }}
@@ -9,14 +9,14 @@
 			<li class="list-group-item">
 				<center>
 					<button class="btn btn-info" @click="refreshNominees()">
-						Refresh results <i class="fa fa-refresh"></i>
+						Kemaskini Keputusan<i class="fa fa-refresh"></i>
 					</button>
 				</center>
 			</li>
 		</ul>
 	</div>
 	<div class="col-md-8">
-		<h4>Results</h4><hr/>
+		<h4>Keputusan</h4><hr/>
 		<div class="panel panel-default">
 			<div class="panel-heading">{{ getPosition(position_id) }} - Results as of : {{ last_update }}</div>
 			<div class="panel-body">

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

@@ -9,7 +9,7 @@
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 					</button>	
-					<a class="navbar-brand" :href="data.baseURL" >AGM</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">
 
@@ -46,14 +46,14 @@
 							<ul class="dropdown-menu">
 
 								<router-link :to="{name:'Update Account'}" tag="li" exact>
-									<a href="#">Update Account</a>
+									<a href="#">Kemaskini Akaun</a>
 								</router-link>
 
 								<router-link :to="{name: 'Manage Account'}" tag="li" v-if="data.user.id==1">
-									<a href="#">Manage Account</a>
+									<a href="#">Pengurusan Akaun</a>
 								</router-link>
 
-								<li @click="logout()"><a>Logout</a></li>
+								<li @click="logout()"><a>Log Keluar</a></li>
 							</ul>
 						</li>
 					</ul>

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

@@ -21,36 +21,36 @@
 					</div>
 
 					<div class="form-group">
-						<label for="motto">Motto</label>
-						<input type="text" name="motto" class="form-control" placeholder="(Optional)" />
+						<label for="education">Taraf Pendidikan</label>
+						<input type="text" name="education" class="form-control" placeholder="(Optional)" />
 					</div>
 
 					<div class="form-group">
-						<label for="description">Description</label>
-						<textarea name="description" class="form-control" placeholder="(Optional)"></textarea>
+						<label for="pengalaman">Pengalaman Kerja</label>
+						<textarea name="pengalaman" class="form-control" placeholder="(Optional)"></textarea>
 					</div>
 
 					<div class="form-group">
-						<label for="position_id">Position</label>
+						<label for="position_id">Jawatan</label>
 						<select class="form-control" v-model="position_id" name="position_id" required>
-							<option value="0" disabled>--- Select Position ---</option>
+							<option value="0" disabled>--- Pilih Jawatan ---</option>
 							<option v-for="position in data.positions" :value="position.id">{{ position.name }}</option>
 						</select>
 					</div>
 
-					<div class="form-group">
+					<!-- <div class="form-group">
 						<label for="partylist_id">Partylist</label>
 						<select class="form-control" name="partylist_id">
 							<option value="">--- Select Partylist (Optional) ---</option>
 							<option v-for="partylist in data.partylists" :value="partylist.id">{{ partylist.name }}</option>
 						</select>
-					</div>
+					</div> -->
 
                     <div id="imagePreview">
                         <img :src="imageUrl" v-if="imageUrl" alt="Preview">
                     </div>
 					<div>
-						<label for="image">Masukkan Gambar</label>
+						<label for="image">Muatnaik  Gambar</label>
 						<input name="photo" type="file" accept="image/*" id="file-input" @change="handleImageChange">
 					</div>
 

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

@@ -28,19 +28,19 @@
 				</div>
 
 				<div class="form-group">
-					<label for="motto">Motto</label>
-					<input type="text" name="motto" class="form-control" :value="nominee.motto" placeholder="(Optional)" />
+					<label for="education">Taraf Pendidikan</label>
+					<input type="text" name="education" class="form-control" :value="nominee.education" placeholder="(Optional)" />
 				</div>
 
 				<div class="form-group">
-					<label for="description">Description</label>
-					<textarea name="description" class="form-control" placeholder="(Optional)">{{ nominee.description}}</textarea>
+					<label for="experience">Pengalaman Kerja </label>
+					<textarea name="experience" class="form-control" placeholder="(Optional)">{{ nominee.experience}}</textarea>
 				</div>
 
 				<div class="form-group">
-					<label for="position_id">Position</label>
+					<label for="position_id">Jawatan</label>
 					<select class="form-control" name="position_id" :value="nominee.position_id" required>
-						<option value="0" disabled>--- Select Position ---</option>
+						<option value="0" disabled>--- Pilih Jawatan ---</option>
 						<option v-for="position in data.positions" :value="position.id">{{ position.name }}</option>
 					</select>
 				</div>
@@ -57,7 +57,7 @@
                     <img :src="imageUrl" v-if="imageUrl" alt="Preview">
                 </div>
                 <div>
-                    <label for="image">Masukkan Gambar</label>
+                    <label for="image">Muat Naik Gambar</label>
                     <input name="photo" type="file" accept="image/*" id="file-input" @change="handleImageChange">
                 </div>
 
@@ -66,7 +66,7 @@
 					<router-link
 						:to="{name:'Maklumat Calon'}"
 						class="btn btn-default">
-						Back
+						Kembali
 					</router-link>
 				</div>
 			</div>
@@ -131,7 +131,7 @@ export default{
 					$.notifyClose();
 					vm.loading = false;
 					if (vm.util.showResult(response, 'success', 'ajax'))
-						vm.$router.push({name: 'Maklumat Calon'});
+						vm.$router.push({name: 'Maklumat Calon',query:{refresh:true}});
 				},
 				error: function (error) {
 					$.notifyClose();
@@ -139,7 +139,7 @@ export default{
 					vm.util.showResult(error, 'error', 'ajax');
 				},
 				uploadProgress: function (a, b, c, progress) {
-					vm.util.notify('Updating Nominee', 'progress', progress);
+					this.util.notify('Updating nominee', 'progress', progress);
 				}
 			})
 		}

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

@@ -1,91 +1,90 @@
 <template>
-<div class="row">
-	<div class="col-md-3" style="max-width: 250px;">
-		<ul class="list-group">
-			<router-link
-				tag="li"
-				class="list-group-item"
-				:to="{name: 'Maklumat Calon'}"
-				exact
-				replace
-				:class="{'active':position_id==0}">
-				All Position
-			</router-link>
-			<router-link
-				v-for="position in data.positions"
-				:key="position.id"
-				tag="li"
-				class="list-group-item"
-				:to="{query: {position_id:position.id}}"
-				exact
-				replace>
-				{{ position.name }}
-			</router-link>
-		</ul>
-	</div>
-	<div class="col-md-9 panel panel-default">
-		<div class="panel-body table-responsive">
-			<div class="form-group">
-				<router-link :to="{name: 'Tambah Calon', query:{position_id:position_id}}" class="btn btn-success"><i class="fa fa-plus"></i> Tambah Calon</router-link>
-			</div>
-			<table class="table table-hover">
-				<thead>
-					<tr>
-						<th></th>
-						<th>Name</th>
-						<th>No. Anggota</th>
-						<th>Unit</th>
-						<th>Position</th>
-						<!-- <th>Partylist</th> -->
-						<th>Action</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="nominee in nominees">
-						<td>
-							<img :alt="nominee.name" :src="createBase64ImageUrl(nominee.photo)" class="thumbnail" style="height: 60px;width: 60px;">
-						</td>
-						<td>{{ nominee.name}}</td>
-						<td>{{ nominee.no_anggota}}</td>
-						<td>{{ nominee.unit}}</td>
-						<td>{{ nominee.position}}</td>
-						<!-- <td>{{ nominee.partylist}}</td> -->
-						<td>
-							<router-link :to="{name: 'Edit Nominee', params:{id:nominee.id}}" class="btn btn-info">
+	<div class="row">
+		<div class="col-md-3" style="max-width: 250px;">
+			<ul class="list-group">
+				<router-link tag="li" class="list-group-item" :to="{ name: 'Maklumat Calon' }" exact replace
+					:class="{ 'active': position_id == 0 }">
+					Senarai Jawatan
+				</router-link>
+				<router-link v-for="position in data.positions" :key="position.id" tag="li" class="list-group-item"
+					:to="{ query: { position_id: position.id } }" exact replace>
+					{{ position.name }}
+				</router-link>
+			</ul>
+		</div>
+		<div class="col-md-9 panel panel-default">
+			<div class="panel-body table-responsive">
+				<div class="form-group">
+					<router-link :to="{ name: 'Tambah Calon', query: { position_id: position_id } }"
+						class="btn btn-success"><i class="fa fa-plus"></i> Tambah Calon</router-link>
+				</div>
+				<table class="table table-hover">
+					<thead>
+						<tr>
+							<th>Id</th>
+							<th>Nama</th>
+							<th>No. Anggota</th>
+							<th>Unit</th>
+							<th>Jawatan</th>
+							<!-- <th>Partylist</th> -->
+							<th>Taraf Pendidikan </th>
+							<th>Pengalaman Kerja</th>
+							<th>Tindakan</th>
+
+						</tr>
+					</thead>
+					<tbody>
+						<tr v-for="nominee in nominees">
+							<td>
+								<img :alt="nominee.name" :src="createBase64ImageUrl(nominee.photo)" class="thumbnail"
+									style="height: 60px;width: 60px;">
+							</td>
+							<td>{{ nominee.name }}</td>
+							<td>{{ nominee.no_anggota }}</td>
+							<td>{{ nominee.unit }}</td>
+							<td>{{ nominee.position }}</td>
+							<td>{{ nominee.education }}</td>
+							<td>{{ nominee.experience }}</td>
+
+
+
+							<router-link :to="{ name: 'Edit Nominee', params: { id: nominee.id } }"
+								class="btn btn-primary">
 								<i class="fa fa-edit"></i> Edit
 							</router-link>
-							<button 
-								class="btn btn-danger" 
-								@click="util.showModal('#delete-nominee-modal');id=nominee.id">
-								<i class="fa fa-trash"></i> Delete
+							<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 nominees</td>
-					</tr>
-				</tbody>
-			</table>
+							</td>
+						</tr>
+						<tr v-if="nominees.length < 1">
+							<td colspan="7">No Calon</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
 		</div>
+
+		<modal id="delete-nominee-modal">
+			<modal-header>Padam Calon</modal-header>
+			<modal-body>
+				<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-default" @click="util.hideModal('#delete-nominee-modal')">
+					Kembali
+				</button>
+			</modal-footer>
+		</modal>
 	</div>
 
-	<modal id="delete-nominee-modal">
-		<modal-header>Delete Nominee</modal-header>
-		<modal-body>
-			<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-default" @click="util.hideModal('#delete-nominee-modal')">
-				Back
-			</button>
-		</modal-footer>
-	</modal>
-</div>
 </template>
 
 <script>
-export default{
+export default {
+
+
 	data: function () {
 		return {
 			id: 0
@@ -98,32 +97,33 @@ export default{
 
 	methods: {
 
-		deleteNominee: function () {
-			this.util.hideModal('#delete-nominee-modal');
-			var vm = this;
-			this.util.notify('Deleting nominee', 'loading');
-			axios.delete(config.API+'nominee/'+this.id)
-				 .then(response=>{
-				 	$.notifyClose();
-				 	if(vm.util.showResult(response, 'success'))
-				 	vm.refreshNominee();
-				 })
-				 .catch(error=>{
-				 	$.notifyClose();
-				 	vm.util.showResult(error, 'error');
-				 })
+		deleteNominee(nomineeId) {
+			this.util.hideModal('#delete-nominee-modal'); // Hide modal
+			this.util.notify('Deleting nominee', 'loading'); // Show loading notification
+
+			axios.delete(config.API + 'nominee/' + nomineeId) // Make DELETE request
+				.then(response => {
+					$.notifyClose(); // Close notification
+					if (this.util.showResult(response, 'success')) { // Show success notification
+						this.refreshNominee(); // Refresh the list of nominees
+					}
+				})
+				.catch(error => {
+					$.notifyClose(); // Close notification
+					this.util.showResult(error, 'error'); // Show error notification
+				})
 		},
-		
+
 		refreshNominee: function () {
 			var vm = this;
 			this.util.notify('Refreshing Nominees', 'loading');
-			axios.get(config.API+'nominee')
-				.then(response=>{
+			axios.get(config.API + 'nominee')
+				.then(response => {
 					$.notifyClose();
 					console.log(response);
 					vm.data.nominees = response.data;
 				})
-				.catch(error=>{
+				.catch(error => {
 					$.notifyClose();
 					vm.showResult(error);
 				})
@@ -131,7 +131,7 @@ export default{
 
 		getPosition: function (id) {
 			var positions = this.data.positions;
-			for (var i in positions) 
+			for (var i in positions)
 				if (positions[i].id == id)
 					return positions[i]['name'];
 		},
@@ -144,9 +144,9 @@ export default{
 			return 'No partylists';
 		},
 
-        createBase64ImageUrl: function(base64ImageData) {
-            return "data:image/png;base64," + base64ImageData;
-        }
+		createBase64ImageUrl: function (base64ImageData) {
+			return "data:image/png;base64," + base64ImageData;
+		}
 	},
 
 	computed: {
@@ -170,3 +170,6 @@ export default{
 	}
 }
 </script>
+
+
+<style></style>

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

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

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

@@ -4,12 +4,12 @@
 		<h4>Tambah Jawatan</h4>
 		<form @submit.prevent="add()" id="add-form">
 			<div class="form-group">
-				<label for="name">Name</label>
+				<label for="name">Nama</label>
 				<input type="text" name="name" class="form-control" required>
 			</div>
 			<div class="form-group">
-				<button type="submit" class="btn btn-success">Submit</button>
-				<router-link :to="{name: 'Kemaskini Jawatan'}" class="btn btn-default">Back</router-link>
+				<button type="submit" class="btn btn-success">Hantar</button>
+				<router-link :to="{name: 'Kemaskini Jawatan'}" class="btn btn-default">Kembali</router-link>
 			</div>
 		</form>
 	</div>

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

@@ -1,15 +1,15 @@
 <template>
 <div class="panel panel-default">
 	<div class="panel-body">
-		<h4>Edit Position</h4>
+		<h4>Edit Jawatan</h4>
 		<form @submit.prevent="edit()" id="edit-form">
 			<div class="form-group">
-				<label for="name">Name</label>
+				<label for="name">Nama</label>
 				<input type="text" name="name" class="form-control" :value="data.position.name" required/>
 			</div>
 			<div class="form-group">
 				<input type="submit" value="Submit" class="btn btn-success"/>
-				<router-link :to="{name: 'Kemaskini Jawatan'}" class="btn btn-default">Back</router-link>
+				<router-link :to="{name: 'Kemaskini Jawatan'}" class="btn btn-default">Kembali</router-link>
 			</div>
 		</form>
 	</div>

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

@@ -18,8 +18,8 @@
 				<thead>
 					<tr>
 						<th>ID</th>
-						<th>Name</th>
-						<th>Action</th>
+						<th>Nama</th>
+						<th>Tindakan</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -33,12 +33,12 @@
 							<button 
 								class="btn btn-danger" 
 								@click="util.showModal('#delete-position-modal');id=position.id">
-								<i class="fa fa-trash"></i> Delete
+								<i class="fa fa-trash"></i> Padam
 							</button>
 						</td>
 					</tr>
 					<tr v-if="data.positions.length < 1">
-						<td colspan="3">No Positions</td>
+						<td colspan="3">No Jawatan</td>
 					</tr>
 				</tbody>
 			</table>
@@ -47,12 +47,12 @@
 </div>
 
 <modal id="delete-position-modal">
-	<modal-header>Delete Position</modal-header>
+	<modal-header>Padam Jawatan</modal-header>
 	<modal-body>
 		<h2>Are you sure to delete Position?</h2>
 	</modal-body>
 	<modal-footer>
-		<button class="btn btn-danger" @click="deletePosition()">Delete</button>
+		<button class="btn btn-danger" @click="deletePosition()">Padam</button>
 		<button class="btn btn-default" @click="util.hideModal('#delete-position-modal')">Cancel</button>
 	</modal-footer>
 </modal>

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

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

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

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

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

@@ -1,7 +1,7 @@
 <template>
     <div class="row col-md-10 col-md-offset-1">
         <div class="col-md-12">
-            <h2 class="text-center">Pengesahan Kehadiran</h2>
+            <h3 class="text-center">Pendaftaran Kehadiran</h3>
             <hr />
             <ul class="list-group">
                 <li class="list-group-item"><b>No. Kad Pengenalan : </b>{{ data.user.no_kp }}</li>
@@ -18,7 +18,7 @@
             </ul>
             <div v-if="hasVoted()">
                 <hr />
-                <h4>Your votes information</h4>
+                <h4>Maklumat Undian</h4>
                 <hr />
                 <ul class="list-group">
                     <li class="list-group-item" v-for="result in data.result">

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

@@ -18,7 +18,7 @@
 						Vote Now
 					</router-link>
 					<router-link v-else :to="{name: 'Result'}" class="btn btn-info">
-						View Result
+						Papar Keputusan
 					</router-link>
 				</center>
 			</li>
@@ -45,8 +45,9 @@
 						<tr>
 							<th></th>
 							<th>Name</th>
-							<th>Partylist</th>
 							<th>Unit</th>
+							<th>Taraf Pendidikan</th>
+							<th>Pengalaman Kerja </th>
 						</tr>
 					</thead>
 					<tbody>
@@ -58,8 +59,9 @@
 									style="height: 60px;width: 60px;" />
 							</td>
 							<td>{{ nominee.name }}</td>
-							<td>{{ getPartylist(nominee.partylist_id) }}</td>
-							<td>{{ nominee.unit }}</td>
+							<td>{{ nominee.unit  }}</td>
+							<td>{{ nominee.education}}</td>
+							<td>{{ nominee.experience}}</td>
 						</tr>
 					</tbody>
 				</table>
@@ -77,8 +79,8 @@
 						<h3><strong><em>"{{ x.motto }}"</em></strong></h3>
 						<b> Name : </b>{{ x.name }}<br/>
 						<b> Unit : </b>{{ x.unit }}<br/>
-						<b> Partylist : </b>{{ getPartylist(x.partylist_id) }}<br/><hr/>
-						{{ x.description }}
+						<b> education : </b>{{ getPartylist(x.education) }}<br/><hr/>
+						{{ x.experience }}
 					</div>
 				</div>
 			</modal-body>

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

@@ -1,7 +1,7 @@
 <template> 
 <div class="row col-md-10 col-md-offset-1">
 	<div class="col-md-4">
-		<h4>Positions</h4><hr/>
+		<h4>Jawatan</h4><hr/>
 		<ul class="list-group">
 			<router-link :key="position.id" v-for="position in data.positions" class="list-group-item" :class="{'active':position.id==position_id}" tag="li" :to="{query:{position_id:position.id}}" exact replace>
 				{{ position.name }}
@@ -9,7 +9,7 @@
 			<li class="list-group-item">
 				<center>
 					<button class="btn btn-info" @click="refreshResults()">
-						Refresh results <i class="fa fa-refresh"></i>
+						Kemaskini Keputusan  <i class="fa fa-refresh"></i>
 					</button>
 				</center>
 			</li>

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

@@ -1,16 +1,43 @@
 <template>
     <div class="row col-md-10 col-md-offset-1">
         <div class="col-md-12">
-            <h2 class="text-center">Pautan Zoom</h2>
-           
-        </div>
+            <h3 class="text-center">Pautan Zoom</h3>
+           <div>
+            <img :src="imageUrl" alt="Centered Image " class="centered-image" />
+          
+            </div><hr>
+
+                    <CENTER><h4>SELAMAT DATANG KE MESYUARAT AGUNG TAHUNAN KoPKB 
+                    <br> KALI KE-27/2023  </h4></CENTER>
+
+                    <div class ="centered-button">
+                        <button class="btn btn-primary" @click=" navigateToURL">Klik pada pautan berikut >></button>
+                     </div>
+
+
+<!-- 
+                    <div>
+                     <button class="centered-button" @click="handleClick">Klik pada pautan berikut >> </button>
+                    </div> -->
+
+             </div>
 
        
     </div>
 </template>
 
 <script>
+
+
 export default {
+
+    methods: {
+    navigateToURL() {
+      // Navigate to the desired URL
+      window.location.href = 'https://us06web.zoom.us/j/87138156396?pwd=JEakXmAZjRnPeXbPN7K8ajnbL0X77a.1';
+    }
+  },
+
     created: function () {
         //console.log(this)
     },
@@ -21,12 +48,63 @@ export default {
         }
     },
 
-    
-
     computed: {
         header: function () {
             return this.x.name + ' for ' + this.getPosition(this.x.position_id);
         }
+    },
+
+    data() {
+    return {
+        imageUrl:'https://th.bing.com/th/id/OIP.vCNlpyR-8eSN6qHGGIQemAHaCr?w=338&h=126&c=7&r=0&o=5&dpr=2&pid=1.7'
     }
+  
+    }
+
+   
+//     CustomButton {
+//   }
+//  methods: {
+//   goToDestination() {
+//     // Replace 'destinationURL' with the URL you want to navigate to
+//     window.location.href = 'https://us06web.zoom.us/j/87138156396?pwd=JEakXmAZjRnPeXbPN7K8ajnbL0X77a.1';
+//   }
+// }
+};
+</script>
+<style>
+
+.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 */
+    position: relative;
+     /* top: 50%; */
+     left: 50%;
+     transform: translate(-50%, -50%);
+
+  }
+  .centered-button {
+  /* Button styles */
+    align-items: center; 
+  /* background-color: #4CAF50; Green */
+  border-color:rgb(219, 222, 226);
+  padding: 20px 40px;
+  text-align: center;
+  color: #fff;
+  border-radius: 5px;
+  cursor: pointer;
+  
 }
-</script>
+.centered-button:hover {
+  /* Button styles on hover */
+  outline-color: #045415;
+ 
+}
+
+
+ 
+</style>
+
+
+  

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

@@ -9,7 +9,7 @@
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 					</button>	
-					<a class="navbar-brand" :href="data.baseURL" >AGM</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">
 

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

@@ -1,34 +1,46 @@
 <template>
-<div class="col-md-5 col-md-offset-3">
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			<h4>Selamat Datang!</h4>
-		</div>
+	<div class="col-md-5 col-md-offset-3">
+		<div class="panel panel-default">
 
-		<div class="panel-body">
-			<form @submit.prevent="login" id="login_form">
+			<div class="text-center">
 
-				<div class="form-group">
-					<label for="no_kp">Masukkan No. Kad Pengenalan!</label>
-					<input type="text" name="no_kp" class="form-control" required/>
+				<div class="panel-heading">
+					<img id="logo" alt="Logo">
+					<h4>Selamat Datang ke MyKoPKB eVoting System !</h4>
 				</div>
+			</div>
+			<div class="panel-body">
+				<form @submit.prevent="login" id="login_form">
 
-				<div class="form-group">
-					<input 
-						type="submit" 
-						class="btn btn-primary form-control"
-						value="Login"/>
-				</div>
+					<div class="form-group">
+						<label for="no_kp">Sila Masukkan No. Kad Pengenalan</label>
+						<input type="text" name="no_kp" placeholder="masukkan no .k/p" class="form-control" required />
+					</div>
+
+					<div class="form-group">
+						<input type="submit" class="btn btn-primary form-control" value="Masuk" />
+					</div>
+
+				</form>
+			</div>
 
-			</form>
 		</div>
-
 	</div>
-</div>
 </template>
 
 <script>
-export default{
+
+
+// JavaScript to set the image source
+document.addEventListener('DOMContentLoaded', function () {
+	// Select the image element by its ID
+	var logoImage = document.getElementById('logo');
+	// Set the source of the image dynamically
+	logoImage.src = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS62as3fVF6AdC6CZhfSIG4GCDBSzS3YyhlJg&s'; // Replace this URL with your desired image URL
+});
+
+
+export default {
 
 	data: function () {
 		return {
@@ -39,22 +51,22 @@ export default{
 	created: function () {
 		if (this.util.isLogin())
 			//return this.$router.push({name:'Admin Home'})
-		this.util.setTitle('Voter Login');
+			this.util.setTitle('Log Masuk Pengundi=====');
 	},
 
 	methods: {
-		login: function(){
-			axios.post(config.API+'voter/login', $('#login_form').serialize())
-			.then(response => {
-				this.stopLoading();
-				if (this.util.showResult(response, 'success')) {
-						this.$router.push({ name: 'Voter Verify',params: {'nokp' : response.data.nokp,'notel' : response.data.notel} })
-				}
-			})
-			.catch(error => {
-				vm.stopLoading();
-				this.util.showResult(error, 'error');
-			})
+		login: function () {
+			axios.post(config.API + 'voter/login', $('#login_form').serialize())
+				.then(response => {
+					this.stopLoading();
+					if (this.util.showResult(response, 'success')) {
+						this.$router.push({ name: 'Voter Verify', params: { 'nokp': response.data.nokp, 'notel': response.data.notel } })
+					}
+				})
+				.catch(error => {
+					vm.stopLoading();
+					this.util.showResult(error, 'error');
+				})
 		},
 		startLoading: function () {
 			this.util.notify('Logging in', 'loading');
@@ -67,11 +79,41 @@ export default{
 		}
 	},
 
-}
+
+};
+
 </script>
 
 <style>
 body {
 	padding: 50px 5px;
+	/* background-color:; */
+
 }
-</style>
+
+.logo {
+	width: 200px;
+	/* Adjust width as needed */
+	height: auto;
+	object-fit: cover;
+
+}
+
+.form-control {
+
+border-radius: 0.80rem;
+cursor: pointer;
+
+}
+
+.btn-primary:hover {
+
+	background-color:#A7D397;
+color: #f3f6f8; /* Change text color on hover */
+text-shadow : 2px 2px 8px rgba(0, 0, 0, 0.5);
+
+
+}
+
+
+</style>

resources/assets/js/components/mycomponents/modal/header.vue

@@ -4,3 +4,5 @@
 	<h4><slot></slot></h4>
 </div>
 </template>
+
+

resources/views/admin.blade.php

@@ -3,7 +3,7 @@
 <head lang="en">
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Voting System - Administrator</title>
+	<title>MyKoPKB - Administrator</title>
 	<link rel="stylesheet" href="{{ asset('css/app.css') }}">
 </head>
 <body>

resources/views/index.blade.php

@@ -2,15 +2,12 @@
 <html>
 
 <head lang="en">
-    <meta charset="UTF-8">
-    <link rel="icon" href="{{ asset('img/myKoPKG.jpg') }}">
-    <title>myKoPKB</title>
-    <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">
+	<meta charset="UTF-8">
+	<title>MyKoPKB == eVoting System</title>
+	<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>