From 3ca2855c1d27662e20f76f0323517d2aae4f5749 Mon Sep 17 00:00:00 2001
From: nurafrinaalimi16 <nurafrinaalimi16@gmail.com>
Date: Tue, 26 Mar 2024 15:08:52 +0800
Subject: [PATCH 1/6] fix modal bootstrap

---
 .../js/components/demo/admin/home/index.vue   | 229 ++++++++++--------
 .../js/components/demo/voter/home/vote.vue    | 148 ++++++-----
 2 files changed, 209 insertions(+), 168 deletions(-)

diff --git a/resources/assets/js/components/demo/admin/home/index.vue b/resources/assets/js/components/demo/admin/home/index.vue
index e9bf588..70546a4 100644
--- a/resources/assets/js/components/demo/admin/home/index.vue
+++ b/resources/assets/js/components/demo/admin/home/index.vue
@@ -1,118 +1,142 @@
 <template>
-<div class="panel panel-default">
-	<div class="panel-body">
-		<h4> Recent Elections</h4>
-		<div class="form-group">
-			<button class="btn btn-success" v-if="data.election.status == 1" @click="util.showModal('#start-election-modal')">Start Election</button>
-			
-			<router-link :to="{name: 'Current Result'}" class="btn btn-info" v-if="data.election.status == 2">
-				View Results
-			</router-link>
-			
-			<button class="btn btn-danger" v-if="data.election.status == 2" @click="util.showModal('#stop-election-modal')">End Election</button>	
+	<div class="panel panel-default">
+		<div class="panel-body">
+			<h4> Recent Elections</h4>
+			<div class="form-group">
+				<button class="btn btn-success" v-if="data.election.status == 1 &&  data.user.role==1"
+					@click="util.showModal('#start-election-modal')">Start Election</button>
 
-			<label v-if="data.election.status == 2">Election has Started {{ start_date }}</label>
+				<router-link :to="{ name: 'Current Result' }" class="btn btn-info" v-if="data.election.status == 2">
+					View Results
+				</router-link>
+
+				<button class="btn btn-danger" v-if="data.election.status == 2"
+					@click="util.showModal('#stop-election-modal')">End Election</button>
+
+				<label v-if="data.election.status == 2">Election has Started {{ start_date }}</label>
+
+			</div>
+
+			<div class="table-responsive">
+				<table class="table table-hover">
+					<thead>
+						<tr>
+							<th>ID</th>
+							<th>Election Name</th>
+							<th>Election Start</th>
+							<th>Election End</th>
+							<th>View</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr v-for="election in data.elections">
+							<td>{{ election.id }}</td>
+							<td>{{ election.name }}</td>
+							<td>{{ election.start }}</td>
+							<td>{{ election.end }}</td>
+							<td>
+								<router-link :to="{ name: 'Election Result', params: { election_id: election.id } }"
+									class="btn btn-info">View Result</router-link>
+							</td>
+						</tr>
+						<tr v-if="data.elections.length < 1">
+							<td colspan="5">No elections yet</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+
+			<form @submit.prevent="start" id="start_form">
+				<div class="modal fade" id="start-election-modal" tabindex="-1" role="dialog"
+					aria-labelledby="start-election-modal" aria-hidden="true">
+					<div class="modal-dialog" role="document">
+						<div class="modal-content">
+							<div class="modal-header">
+								<h5 class="modal-title" id="exampleModalLabel">Start Election</h5>
+								<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+									<span aria-hidden="true">&times;</span>
+								</button>
+							</div>
+							<div class="modal-body">
+								<div class="form-group">
+									<label for="name">Election Name</label>
+									<input type="text" name="name" autocomplete="on" class="form-control" placeholder="(Optional)" />
+								</div>
+
+								<div class="form-group">
+									<label for="password">Confirm Password</label>
+									<input type="password" name="password" class="form-control" required />
+								</div>
+							</div>
+							<div class="modal-footer">
+								<input type="submit" class="btn btn-info" value="Start" />
+								<input type="button" data-dismiss="modal" class="btn btn-default" value="Cancel" />
+							</div>
+						</div>
+					</div>
+				</div>
+			</form>
+
+			<form @submit.prevent="stop" id="stop_form">
+				<div class="modal fade" id="stop-election-modal" tabindex="-1" role="dialog"
+					aria-labelledby="stop-election-modal" aria-hidden="true">
+					<div class="modal-dialog" role="document">
+						<div class="modal-content">
+							<div class="modal-header">
+								<h5 class="modal-title" id="exampleModalLabel">Stop Election</h5>
+								<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+									<span aria-hidden="true">&times;</span>
+								</button>
+							</div>
+							<div class="modal-body">
+								<div class="form-group">
+									<label for="name">Election Name</label>
+									<input type="text" name="name" :value="data.election.name" autocomplete="on" class="form-control" placeholder="(Optional)" />
+								</div>
+
+								<div class="form-group">
+									<label for="password">Confirm Password</label>
+									<input type="password" name="password" autocomplete="on" class="form-control" required />
+								</div>
+							</div>
+							<div class="modal-footer">
+								<input type="submit" class="btn btn-info" value="Stop Election" />
+								<input type="button" data-dismiss="modal" class="btn btn-default" value="Cancel" />
+							</div>
+						</div>
+					</div>
+				</div>
+			</form>
 
 		</div>
-
-		<div class="table-responsive">
-			<table class="table table-hover">
-				<thead>
-					<tr>
-						<th>ID</th>
-						<th>Election Name</th>
-						<th>Election Start</th>
-						<th>Election End</th>
-						<th>View</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="election in data.elections">
-						<td>{{ election.id }}</td>
-						<td>{{ election.name }}</td>
-						<td>{{ election.start}}</td>
-						<td>{{ election.end}}</td>
-						<td>
-							<router-link :to="{name: 'Election Result', params:{election_id:election.id}}" class="btn btn-info">View Result</router-link></td>
-					</tr>
-					<tr v-if="data.elections.length < 1">
-						<td colspan="5">No elections yet</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-
-		<form @submit.prevent="start" id="start_form">
-		<modal id="start-election-modal">
-			<modal-header>Start Election</modal-header>
-			<modal-body>
-				<div class="form-group">
-					<label for="name">Election Name</label>
-					<input type="text" name="name" class="form-control" placeholder="(Optional)"/>
-				</div>
-				<div class="form-group">
-					<label for="password">Confirm Password</label>
-					<input type="password" name="password" class="form-control" required/>
-				</div>
-			</modal-body>
-			<modal-footer>
-				<input type="submit" class="btn btn-info" value="Start"/>
-				<input type="button" data-dismiss="modal" class="btn btn-default" value="Cancel"/>
-			</modal-footer>
-		</modal>
-		</form>
-
-		<form @submit.prevent="stop" id="stop_form">
-		<modal id="stop-election-modal">
-			<modal-header>Stop Election</modal-header>
-			<modal-body>
-
-				<div class="form-group">
-					<label for="name">Election Name</label>
-					<input type="text" name="name" :value="data.election.name" class="form-control" placeholder="(Optional)"/>
-				</div>
-
-				<div class="form-group">
-					<label for="password">Confirm Password</label>
-					<input type="password" name="password" class="form-control" required/>
-				</div>
-			</modal-body>
-			<modal-footer>
-				<input type="submit" class="btn btn-danger" value="Stop Election"/>
-				<input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
-			</modal-footer>
-		</modal>
-		</form>
-
 	</div>
-</div>
 </template>
 
 <script>
-export default{
-	data: ()=>({
+export default {
+	data: () => ({
 		start_date: null
 	}),
 	created: function () {
 		this.refreshElection();
 		var vm = this;
-		setInterval(()=>{
+		setInterval(() => {
 			vm.start_date = moment(vm.data.election.start).fromNow();
-		},1000);
+		}, 1000);
 	},
 
 	methods: {
 
 		stop: function () {
 			var vm = this;
-			this.util.hideModal('#stop-election-modal');
+			// this.util.hideModal('#stop-election-modal');
 			this.util.notify('Stopping Election', 'loading');
-			axios.post(config.API+'election/stop', $('#stop_form').serialize())
-				.then(response=>{
+			axios.post(config.API + 'election/stop', $('#stop_form').serialize())
+				.then(response => {
 					$.notifyClose();
-					if (vm.util.showResult(response,'success')) {
+					if (vm.util.showResult(response, 'success')) {
 						vm.refreshElection();
-						vm.data.election =response.data.election;
+						vm.data.election = response.data.election;
 						vm.data.positions = [];
 						vm.data.partylists = [];
 						vm.data.voters = [];
@@ -120,7 +144,7 @@ export default{
 						vm.data.results = [];
 					}
 				})
-				.catch(error=>{
+				.catch(error => {
 					$.notifyClose();
 					vm.util.showResult(error, 'error');
 				})
@@ -128,31 +152,32 @@ export default{
 
 		start: function () {
 			var vm = this;
-			this.util.hideModal('#start-election-modal');
+			// this.util.hideModal('#start-election-modal');
+			console.log('this');
 			this.util.notify('Loading please wait', 'loading');
-			axios.post(config.API+'election/start', $('#start_form').serialize())
-				.then(response=>{
+			axios.post(config.API + 'election/start', $('#start_form').serialize())
+				.then(response => {
 					$.notifyClose();
-					if(vm.util.showResult(response, 'success')){
+					if (vm.util.showResult(response, 'success')) {
 						vm.refreshElection();
 						vm.data.election = response.data.election;
 					}
 				})
-				.catch(error=>{
+				.catch(error => {
 					$.notifyClose();
 					vm.util.showResult(error, 'error');
 				})
 		},
 
-		refreshElection: function(){		
+		refreshElection: function () {
 			this.util.notify('Refreshing Election', 'loading');
 			var vm = this;
-			axios.get(config.API+'election')
-				.then(response=>{
+			axios.get(config.API + 'election')
+				.then(response => {
 					$.notifyClose();
 					vm.data.elections = response.data;
 				})
-				.catch(error=>{
+				.catch(error => {
 					$.notifyClose();
 					vm.util.showResult(error, 'error');
 				})
diff --git a/resources/assets/js/components/demo/voter/home/vote.vue b/resources/assets/js/components/demo/voter/home/vote.vue
index c18812e..3909601 100644
--- a/resources/assets/js/components/demo/voter/home/vote.vue
+++ b/resources/assets/js/components/demo/voter/home/vote.vue
@@ -1,69 +1,82 @@
 <template>
-<div class="row col-md-10 col-md-offset-1">
-	<div class="col-md-4">
-		<h4>Vote Information</h4><hr/>
-		<ul class="list-group">
-			<li class="list-group-item" v-for="position in data.positions">
-				<b>{{ position.name }} : </b>{{ getName(position.id) }}
-			</li>
-			<li class="list-group-item">
-				<center>
-					<button class="btn btn-success" @click="util.showModal('#vote-modal')">Submit Vote</button>
-					<button class="btn btn-default" @click="reset()">Reset</button>
-				</center>
-			</li>
-		</ul>
-	</div>
-	<div class="col-md-8">
-		<h4>Select Candidates</h4><hr/>
-		<div class="panel panel-info" 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>Name</th>
-							<th>Partylist</th>
-							<th>Unit</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr v-for="nominee in data.nominees" v-if="nominee.position_id==position.id" @click="vote(position.id,nominee.id)">
-							<td><input type="radio" :name="position.id" :id="nominee.id"/></td>
-							<td>{{ nominee.name }}</td>
-							<td>{{ getPartylist(nominee.partylist_id) }}</td>
-							<td>{{ nominee.unit }}</td>
-						</tr>
-					</tbody>
-				</table>
+	<div class="row col-md-10 col-md-offset-1">
+		<div class="col-md-4">
+			<h4>Vote Information</h4>
+			<hr />
+			<ul class="list-group">
+				<li class="list-group-item" v-for="position in data.positions">
+					<b>{{ position.name }} : </b>{{ getName(position.id) }}
+				</li>
+				<li class="list-group-item">
+					<center>
+						<button class="btn btn-success" @click="util.showModal('#vote-modal')">Submit Vote</button>
+						<button class="btn btn-default" @click="reset()">Reset</button>
+					</center>
+				</li>
+			</ul>
+		</div>
+		<div class="col-md-8">
+			<h4>Select Candidates</h4>
+			<hr />
+			<div class="panel panel-info" 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>Name</th>
+								<th>Partylist</th>
+								<th>Unit</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="nominee in data.nominees" v-if="nominee.position_id==position.id"
+								@click="vote(position.id,nominee.id)">
+								<td><input type="radio" :name="position.id" :id="nominee.id"/></td>
+								<td>{{ nominee.name }}</td>
+								<td>{{ getPartylist(nominee.partylist_id) }}</td>
+								<td>{{ nominee.unit }}</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
 			</div>
 		</div>
+
+		<div class="modal fade" id="vote-modal" tabindex="-2" role="dialog" aria-labelledby="exampleModalLabel"
+			aria-hidden="true">
+			<div class="modal-dialog" role="document">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title" id="exampleModalLabel">Vote</h5>
+						<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+							<span aria-hidden="true">&times;</span>
+						</button>
+					</div>
+					<div class="modal-body">
+						<h3>Note: You can only vote once, so vote wisely.</h3>
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+						<button type="button" class="btn btn-primary" @click="submit()">Submit Vote</button>
+					</div>
+				</div>
+			</div>
+		</div>
+
 	</div>
-
-	<modal id="vote-modal">
-		<modal-header>Vote</modal-header>
-		<modal-body>
-			<h3>Note: You can only vote once, so vote wisely.</h3>
-		</modal-body>
-		<modal-footer>
-			<button class="btn btn-success" @click="submit()">Submit Vote</button>
-			<button class="btn btn-default" data-dismiss="modal">Cancel</button>
-		</modal-footer>
-	</modal>
-
-</div>
 </template>
 
 <script>
-export default{
+export default {
 	created: function () {
-		if (this.data.result.length > 0 || this.data.election.status != 2) 
-			this.$router.push({name: 'Voter Home'})
+		if (this.data.result.length > 0 || this.data.election.status != 2)
+			this.$router.push({ name: 'Voter Home' })
 		for (var i in this.data.positions) {
 			this.selected.push({
-				position_id: this.data.positions[i]['id'], 
-				nominee_id: null, 
+				position_id: this.data.positions[i]['id'],
+				nominee_id: null,
 			});
 		}
 	},
@@ -76,9 +89,12 @@ export default{
 	},
 
 	methods: {
-
+		test: function(){
+			console.log('tab');
+			this.util.showModal('#vote-modal')
+		},
 		submit: function () {
-			this.util.hideModal('#vote-modal');
+			// this.util.hideModal('#vote-modal');
 			if (this.hasNullVote()) return;
 			var vm = this;
 			this.util.notify('Submitting your vote, please wait...', 'loading');
@@ -87,9 +103,9 @@ export default{
 			axios.post(config.API+'election/vote', data)
 				.then(response=>{
 					$.notifyClose();
-					if (vm.util.showResult(response, 'success')){
+					if (vm.util.showResult(response, 'success')) {
 						vm.data.result = response.data.result;
-						vm.$router.push({name: 'Voter Home'});
+						vm.$router.push({ name: 'Voter Home' });
 					}
 
 				})
@@ -102,8 +118,8 @@ export default{
 
 		hasNullVote: function () {
 			let selected = this.selected;
-			for (var i in selected) 
-				if (selected[i]['nominee_id'] == null){
+			for (var i in selected)
+				if (selected[i]['nominee_id'] == null) {
 					this.util.notify('You must vote on all position', 'error');
 					return true;
 				}
@@ -112,7 +128,7 @@ export default{
 
 		reset: function () {
 			let selected = this.selected;
-			for (var i in selected){
+			for (var i in selected) {
 				$('#'+selected[i]['nominee_id']).selected(false);
 				selected[i]['nominee_id'] = null;
 			}
@@ -129,8 +145,8 @@ export default{
 		getName: function (id) {
 			let positions = this.data.positions;
 			let selected = this.selected;
-			for (var i in selected) 
-				if (selected[i]['position_id'] == id) 
+			for (var i in selected)
+				if (selected[i]['position_id'] == id)
 					return this.getNominee(selected[i]['nominee_id']);
 			return '';
 		},
@@ -144,7 +160,7 @@ export default{
 		getPartylist: function (id) {
 			let partylists = this.data.partylists;
 			for (var i in partylists)
-				if (partylists[i]['id']==id) return partylists[i]['name'];
+				if (partylists[i]['id'] == id) return partylists[i]['name'];
 			return 'No Partylist';
 		}
 	}

From 4d4a6928250a84217172955363650dbeb567778e Mon Sep 17 00:00:00 2001
From: nurafrinaalimi16 <nurafrinaalimi16@gmail.com>
Date: Tue, 26 Mar 2024 15:12:48 +0800
Subject: [PATCH 2/6] add new role for jawatankuasa audit

---
 .../API/v1/Admin/AddController.php            |  3 +-
 app/User.php                                  |  2 +-
 ...4_03_24_132333_add_role_to_users_table.php | 34 +++++++++
 .../js/components/demo/admin/admin/add.vue    | 75 +++++++++++--------
 .../assets/js/components/demo/admin/index.vue | 18 ++---
 5 files changed, 88 insertions(+), 44 deletions(-)
 create mode 100644 database/migrations/2024_03_24_132333_add_role_to_users_table.php

diff --git a/app/Http/Controllers/API/v1/Admin/AddController.php b/app/Http/Controllers/API/v1/Admin/AddController.php
index f8384f6..905c3ba 100644
--- a/app/Http/Controllers/API/v1/Admin/AddController.php
+++ b/app/Http/Controllers/API/v1/Admin/AddController.php
@@ -31,7 +31,8 @@ class AddController extends Controller
     		'name'  =>  'required|unique:users',
     		'email'  =>  'required|email|unique:users',
     		'password'  =>  'required',
-    		'confirm_password'  =>  'same:password'
+    		'confirm_password'  =>  'same:password',
+			'role'  =>  'required'
     	]);
     }
 }
diff --git a/app/User.php b/app/User.php
index 14dd530..6d3984d 100644
--- a/app/User.php
+++ b/app/User.php
@@ -16,7 +16,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password',
+        'name', 'email', 'password', 'role'
     ];
 
     /**
diff --git a/database/migrations/2024_03_24_132333_add_role_to_users_table.php b/database/migrations/2024_03_24_132333_add_role_to_users_table.php
new file mode 100644
index 0000000..278f0ab
--- /dev/null
+++ b/database/migrations/2024_03_24_132333_add_role_to_users_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddRoleToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            //
+            $table->string('role', 60);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            //
+            $table->dropColumn('role');
+        });
+    }
+}
diff --git a/resources/assets/js/components/demo/admin/admin/add.vue b/resources/assets/js/components/demo/admin/admin/add.vue
index da25169..e8df930 100644
--- a/resources/assets/js/components/demo/admin/admin/add.vue
+++ b/resources/assets/js/components/demo/admin/admin/add.vue
@@ -1,62 +1,71 @@
 <template>
-<div class="panel panel-default">
-	<div class="panel-body">
-		<form id="add_form" @submit.prevent="add()">
+	<div class="panel panel-default">
+		<div class="panel-body">
+			<form id="add_form" @submit.prevent="add()">
 
-			<div class="form-group">
-				<label for="name">Nama</label>
-				<input type="text" name="name" class="form-control" required/>
-			</div>
+				<div class="form-group">
+					<label for="name">Nama</label>
+					<input type="text" name="name" class="form-control" required />
+				</div>
 
-			<div class="form-group">
-				<label for="email">Email</label>
-				<input type="email" name="email" class="form-control" required/>
-			</div>
+				<div class="form-group">
+					<label for="email">Email</label>
+					<input type="email" name="email" class="form-control" required />
+				</div>
 
-			<div class="form-group">
-				<label for="password">Password</label>
-				<input type="password" name="password" class="form-control" required/>
-			</div>
+				<div class="form-group">
+					<label for="password">Password</label>
+					<input type="password" name="password" class="form-control" required />
+				</div>
 
-			<div class="form-group">
-				<label for="confirm_password">Confirm Password</label>
-				<input type="password" name="confirm_password" class="form-control" required/>
-			</div>
+				<div class="form-group">
+					<label for="confirm_password">Confirm Password</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: 'Manage Account'}" class="btn btn-default">Back</router-link>
-			</div>
+				<div class="form-group">
+					<label for="role">Role</label>
+					<select class="form-control" id="role" name="role"
+						value="" required>
+						<option value="1">Admin</option>
+						<option value="2">Jawatankuasa Audit</option>
+					</select>
+				</div>
 
-		</form>
+				<div class="form-group">
+					<input type="submit" value="Submit" class="btn btn-info" />
+					<router-link :to="{ name: 'Manage Account' }" class="btn btn-default">Back</router-link>
+				</div>
+
+			</form>
+		</div>
 	</div>
-</div>
 </template>
 
 <script>
-export default{
+export default {
 	data: () => ({
 		loading: false
 	}),
 
-	methods:{
+	methods: {
 		add: function () {
 			if (this.loading || !this.isPasswordMatch()) return;
 			var vm = this;
 			this.loading = true;
 			this.util.notify('Adding Admin', 'loading');
-			axios.post(config.API+'admin', $('#add_form').serialize())
-				.then(response=>{
+			axios.post(config.API + 'admin', $('#add_form').serialize())
+				.then(response => {
 					vm.loading = false;
 					$.notifyClose();
 					if (vm.util.showResult(response, 'success')) {
-						vm.$router.push({name: 'Manage Account'});
+						vm.$router.push({ name: 'Manage Account' });
 					}
 				})
-				.catch(error=>{
+				.catch(error => {
 					vm.loading = false;
 					$.notifyClose();
-					vm.util.showResult(error, 'error')	
+					vm.util.showResult(error, 'error')
 				})
 		},
 
@@ -65,6 +74,6 @@ export default{
 			if (!isMatch) this.util.notify('Password not match', 'error');
 			return isMatch;
 		}
-	}	
+	}
 }
 </script>
\ No newline at end of file
diff --git a/resources/assets/js/components/demo/admin/index.vue b/resources/assets/js/components/demo/admin/index.vue
index d649ac1..2484c72 100644
--- a/resources/assets/js/components/demo/admin/index.vue
+++ b/resources/assets/js/components/demo/admin/index.vue
@@ -14,22 +14,21 @@
 				<div class="collapse navbar-collapse" id="myNavbar">
 
 					<ul class="nav navbar-nav">
-
+						<!-- {{ users }} -->
 						<router-link :to="{name: 'Admin Home'}" tag="li" exact><a href="#">Home</a></router-link>
-						
-						<router-link :to="{name: 'Kemaskini Jawatan'}" tag="li">
+						<router-link :to="{name: 'Kemaskini Jawatan'}" v-if="data.user.role==1" tag="li">
 							<a href="#">Jawatan</a>
 						</router-link>
 						
-						<router-link :to="{name: 'Manage Partylist'}" tag="li">
+						<router-link :to="{name: 'Manage Partylist'}"  v-if="data.user.role==1" tag="li">
 							<a href="#">Manage Partylist</a>
 						</router-link>
 
-						<router-link :to="{name: 'Manage Voter'}" tag="li">
+						<router-link :to="{name: 'Manage Voter'}"  v-if="data.user.role==1" tag="li">
 							<a href="#">Anggota Koperasi</a>
 						</router-link>
 
-						<router-link :to="{name: 'Maklumat Calon'}" tag="li">
+						<router-link :to="{name: 'Maklumat Calon'}"  v-if="data.user.role==1" tag="li">
 							<a href="#">Calon</a>
 						</router-link>
 
@@ -75,9 +74,10 @@
 <script>
 export default{
 
-	data: () =>({
-		loading: true
-	}),
+	// data: () =>({
+	// 	loading: true,
+	// 	users:{'roles' : 1},
+	// }),
 
 	created: function () {
 		this.util.setTitle('Voting System - Administrator');

From 8bde7a0544e32ee22f38f416ab4ac655c7fe5d21 Mon Sep 17 00:00:00 2001
From: nurafrinaalimi16 <nurafrinaalimi16@gmail.com>
Date: Tue, 26 Mar 2024 15:24:48 +0800
Subject: [PATCH 3/6] add saham and yuran at voter

---
 app/Voter.php                                 |  2 +-
 ..._03_26_095932_add_saham_to_voter_table.php | 34 ++++++++++++++++++
 ..._03_26_100140_add_yuran_to_voter_table.php | 35 +++++++++++++++++++
 .../js/components/demo/admin/voter/add.vue    | 10 ++++++
 .../js/components/demo/admin/voter/index.vue  |  4 +++
 .../js/components/demo/voter/home/index.vue   |  2 ++
 6 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2024_03_26_095932_add_saham_to_voter_table.php
 create mode 100644 database/migrations/2024_03_26_100140_add_yuran_to_voter_table.php

diff --git a/app/Voter.php b/app/Voter.php
index a055a05..0ccd09e 100644
--- a/app/Voter.php
+++ b/app/Voter.php
@@ -10,5 +10,5 @@ class Voter extends Authenticatable
 	use HasApiTokens;
 
     protected $table = 'voter';
-    protected $fillable = ['name', 'no_kp', 'no_anggota','unit', 'election_id', 'alamat', 'telefon'];
+    protected $fillable = ['name', 'no_kp', 'no_anggota','unit', 'election_id', 'alamat', 'telefon', 'saham', 'yuran'];
 }
diff --git a/database/migrations/2024_03_26_095932_add_saham_to_voter_table.php b/database/migrations/2024_03_26_095932_add_saham_to_voter_table.php
new file mode 100644
index 0000000..9b30d61
--- /dev/null
+++ b/database/migrations/2024_03_26_095932_add_saham_to_voter_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSahamToVoterTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('voter', function (Blueprint $table) {
+            //
+            $table->decimal('saham', 9,2);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('voter', function (Blueprint $table) {
+            //
+            $table->dropColumn('saham');
+        });
+    }
+}
diff --git a/database/migrations/2024_03_26_100140_add_yuran_to_voter_table.php b/database/migrations/2024_03_26_100140_add_yuran_to_voter_table.php
new file mode 100644
index 0000000..2695571
--- /dev/null
+++ b/database/migrations/2024_03_26_100140_add_yuran_to_voter_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddYuranToVoterTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('voter', function (Blueprint $table) {
+            //
+            $table->decimal('yuran', 9,2);
+            
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('voter', function (Blueprint $table) {
+            //
+            $table->dropColumn('yuran');
+        });
+    }
+}
diff --git a/resources/assets/js/components/demo/admin/voter/add.vue b/resources/assets/js/components/demo/admin/voter/add.vue
index 5f4e828..e631ed0 100644
--- a/resources/assets/js/components/demo/admin/voter/add.vue
+++ b/resources/assets/js/components/demo/admin/voter/add.vue
@@ -34,6 +34,16 @@
 				<input type="text" name="telefon" class="form-control" required>
 			</div>
 
+			<div class="form-group">
+				<label for="saham">Saham</label>
+				<input type="text" name="saham" class="form-control" required>
+			</div>
+
+			<div class="form-group">
+				<label for="yuran">Yuran</label>
+				<input type="text" name="yuran" class="form-control" required>
+			</div>
+
 			<div class="form-group">
 				<button type="submit" class="btn btn-success">Submit</button>
 				<router-link :to="{name: 'Manage Voter'}" class="btn btn-default">Back</router-link>
diff --git a/resources/assets/js/components/demo/admin/voter/index.vue b/resources/assets/js/components/demo/admin/voter/index.vue
index b44b86c..ef38799 100644
--- a/resources/assets/js/components/demo/admin/voter/index.vue
+++ b/resources/assets/js/components/demo/admin/voter/index.vue
@@ -20,6 +20,8 @@
 						<th>No. Kad Pengenalan</th>
 						<th>No. Anggota</th>
 						<th>Unit</th>
+						<th>Saham</th>
+						<th>Yuran</th>
 						<th>Action</th>
 					</tr>
 				</thead>
@@ -29,6 +31,8 @@
 						<td>{{ voter.no_kp }}</td>
 						<td>{{ voter.no_anggota }}</td>
 						<td>{{ voter.unit }}</td>
+						<td>{{ voter.saham }}</td>
+						<td>{{ voter.yuran }}</td>
 						<td>
 							<button class="btn btn-info" @click="edit(i)">
 								<i class="fa fa-edit"></i> Edit
diff --git a/resources/assets/js/components/demo/voter/home/index.vue b/resources/assets/js/components/demo/voter/home/index.vue
index af24af8..c403564 100644
--- a/resources/assets/js/components/demo/voter/home/index.vue
+++ b/resources/assets/js/components/demo/voter/home/index.vue
@@ -7,6 +7,8 @@
 			<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>

From 1d892b064eda136a67138a357cd735beaca2ead2 Mon Sep 17 00:00:00 2001
From: Afiq Hamzah <afiqhamzah.codes@gmail.com>
Date: Sat, 23 Mar 2024 23:01:43 +0800
Subject: [PATCH 4/6] Add and fix nominee profile photo uploads

- Run artisan migrate to add column photo in nominee table
- npm run development/watch
---
 .../API/v1/Nominee/AddController.php          | 15 +++-
 .../API/v1/Nominee/UpdateController.php       | 15 ++--
 app/Nominee.php                               | 20 +++--
 ...5849_add_photo_column_to_nominee_table.php | 34 +++++++++
 .../js/components/demo/admin/nominee/add.vue  | 64 ++++++++++------
 .../js/components/demo/admin/nominee/edit.vue | 73 ++++++++++++++++---
 .../components/demo/admin/nominee/index.vue   | 26 ++++---
 .../js/components/demo/voter/home/index.vue   | 15 ++--
 8 files changed, 196 insertions(+), 66 deletions(-)
 create mode 100644 database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php

diff --git a/app/Http/Controllers/API/v1/Nominee/AddController.php b/app/Http/Controllers/API/v1/Nominee/AddController.php
index a9805eb..923d0fa 100644
--- a/app/Http/Controllers/API/v1/Nominee/AddController.php
+++ b/app/Http/Controllers/API/v1/Nominee/AddController.php
@@ -43,12 +43,19 @@ class AddController extends Controller
     	]);
     }
 
-    public function insertNominee ($request) 
+    public function insertNominee ($request)
     {
-    	$nominee = $request->all();
-        $default_image = config('app.cloudinary_enabled') ? config('app.cloudinary_image_default') : config('app.nominee_image');
-    	$nominee['image'] = Util::getImagePath($request, config('app.nominee_directory'), $default_image);
+        $nominee = $request->except(['photo']);
     	$nominee['election_id'] = Util::getCurrentElection();
+
+        if ($request->hasFile('photo')) {
+            $imageData = file_get_contents($request->file('photo'));
+            $nominee['photo'] = $imageData;
+        }
+
     	Nominee::create($nominee);
+        return response()->json(['message' => 'Photo updated successfully']);
+
+
     }
 }
diff --git a/app/Http/Controllers/API/v1/Nominee/UpdateController.php b/app/Http/Controllers/API/v1/Nominee/UpdateController.php
index f63c09e..82a0c4e 100644
--- a/app/Http/Controllers/API/v1/Nominee/UpdateController.php
+++ b/app/Http/Controllers/API/v1/Nominee/UpdateController.php
@@ -41,11 +41,10 @@ class UpdateController extends Controller
     	]);
     }
 
-    private function updateNominee ($request, $id) 
+    private function updateNominee ($request, $id)
     {
     	$nominee = Nominee::find($id);
-    	$default_image = $nominee->image;
-    	    	
+
     	$nominee->name = $request->name;
     	$nominee->unit = $request->unit;
     	$nominee->no_anggota = $request->no_anggota;
@@ -53,11 +52,13 @@ class UpdateController extends Controller
     	$nominee->partylist_id = $request->partylist_id;
         $nominee->motto = $request->motto;
         $nominee->description = $request->description;
-    	$nominee->image = Util::getImagePath($request, config('app.nominee_directory'), $default_image);
-    	$nominee->save();
 
-    	if (!empty($request->image))
-    		Util::deleteImage($default_image);
+        if ($request->hasFile('photo')) {
+            $imageData = file_get_contents($request->file('photo'));
+            $nominee->photo = $imageData;
+        }
+
+    	$nominee->save();
     }
 
 }
diff --git a/app/Nominee.php b/app/Nominee.php
index eb89e33..fdc1cd0 100644
--- a/app/Nominee.php
+++ b/app/Nominee.php
@@ -8,14 +8,24 @@ class Nominee extends Model
 {
     protected $table = 'nominee';
     protected $fillable = [
-    	'name', 
-    	'unit', 
-    	'no_anggota', 
+    	'name',
+    	'unit',
+    	'no_anggota',
     	'position_id',
     	'partylist_id',
     	'election_id',
-    	'image',
         'description',
-        'motto'
+        'motto',
+        'photo',
     ];
+    public $timestamp = false;
+
+    public function getPhotoAttribute($value)
+    {
+        if ($value) {
+            return base64_encode($value);
+        }
+
+        return null;
+    }
 }
diff --git a/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php b/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php
new file mode 100644
index 0000000..6ed0aca
--- /dev/null
+++ b/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPhotoColumnToNomineeTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('nominee', function (Blueprint $table) {
+            $table->binary('photo')->nullable();
+            $table->dropColumn('image');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('nominee', function (Blueprint $table) {
+            $table->dropColumn('photo');
+            $table->string('image');
+        });
+    }
+}
diff --git a/resources/assets/js/components/demo/admin/nominee/add.vue b/resources/assets/js/components/demo/admin/nominee/add.vue
index d86b311..3e71bc3 100644
--- a/resources/assets/js/components/demo/admin/nominee/add.vue
+++ b/resources/assets/js/components/demo/admin/nominee/add.vue
@@ -46,9 +46,12 @@
 						</select>
 					</div>
 
+                    <div id="imagePreview">
+                        <img :src="imageUrl" v-if="imageUrl" alt="Preview">
+                    </div>
 					<div>
 						<label for="image">Masukkan Gambar</label>
-						<input type="file" accept="image/*" @change="uploadImage($event)" id="file-input">
+						<input name="photo" type="file" accept="image/*" id="file-input" @change="handleImageChange">
 					</div>
 
 
@@ -70,6 +73,7 @@
 export default {
 	data: function () {
 		return {
+            imageUrl: '',
 			loading: false
 		}
 	},
@@ -88,6 +92,8 @@ export default {
 						vm.$router.push({ name: 'Maklumat Calon' });
 				},
 				error: function (error) {
+                    alert('Nominee with the same name has already registered');
+                    location.reload();
 					$.notifyClose();
 					vm.loading = false;
 					vm.util.showResult(error, 'error', 'ajax');
@@ -98,30 +104,27 @@ export default {
 			})
 		},
 
-		uploadImage(event) {
+        handleImageChange(event) {
+            const file = event.target.files[0]; // Get the selected file
+            const imageType = /image.*/; // RegExp to check if the file is an image
 
-			const URL = 'http://foobar.com/upload';
+            // Check if the selected file is an image
+            if (file && file.type.match(imageType)) {
+                const reader = new FileReader(); // Create a FileReader object
 
-			let data = new FormData();
-			data.append('name', 'my-picture');
-			data.append('file', event.target.files[0]);
+                reader.onload = (e) => {
+                    this.imageUrl = e.target.result; // Set the imageUrl to the data URL of the image
+                    document.getElementById('imagePreview').style.display = 'block'; // Display the div
+                };
 
-			let config = {
-				header: {
-					'Content-Type': 'image/png'
-				}
-			}
-
-			axios.put(
-				URL,
-				data,
-				config
-			).then(
-				response => {
-					console.log('image upload response > ', response)
-				}
-			)
-		}
+                reader.readAsDataURL(file); // Read the image data as a data URL
+            } else {
+                // Clear the file input and hide the div if the selected file is not an image
+                event.target.value = '';
+                this.imageUrl = '';
+                document.getElementById('imagePreview').style.display = 'none';
+            }
+        }
 	},
 
 	computed: {
@@ -136,4 +139,19 @@ export default {
 		}
 	}
 }
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+    #imagePreview {
+        width: 200px;
+        height: 200px;
+        border: 1px solid #ccc;
+        margin-bottom: 10px;
+        display: none; /* Initially hide the div */
+    }
+
+    #imagePreview img {
+        max-width: 100%;
+        max-height: 100%;
+    }
+</style>
diff --git a/resources/assets/js/components/demo/admin/nominee/edit.vue b/resources/assets/js/components/demo/admin/nominee/edit.vue
index 101a606..c3fc5cb 100644
--- a/resources/assets/js/components/demo/admin/nominee/edit.vue
+++ b/resources/assets/js/components/demo/admin/nominee/edit.vue
@@ -10,12 +10,8 @@
 			@submit.prevent="edit()">
 			<input type="hidden" name="_method" value="PUT"/>
 
-			<div class="col-md-4">
-				<uploader file-name="image" :image-src="data.storageURL+nominee.image"/>
-			</div>
-
 			<div class="col-md-8">
-				
+
 				<div class="form-group">
 					<label for="name">Nama</label>
 					<input type="text" name="name" class="form-control" :value="nominee.name" required/>
@@ -23,12 +19,12 @@
 
 				<div class="form-group">
 					<label for="student_id">No. Anggota</label>
-					<input type="text" name="student_id" class="form-control" :value="nominee.student_id" required/>
+					<input type="text" name="no_anggota" class="form-control" :value="nominee.no_anggota" required/>
 				</div>
 
 				<div class="form-group">
 					<label for="Unit">Unit</label>
-					<input type="text" name="unit" class="form-control" :value="nominee.Unit" required/>
+					<input type="text" name="unit" class="form-control" :value="nominee.unit" required/>
 				</div>
 
 				<div class="form-group">
@@ -57,10 +53,18 @@
 					</select>
 				</div>
 
+                <div id="imagePreview">
+                    <img :src="imageUrl" v-if="imageUrl" alt="Preview">
+                </div>
+                <div>
+                    <label for="image">Masukkan Gambar</label>
+                    <input name="photo" type="file" accept="image/*" id="file-input" @change="handleImageChange">
+                </div>
+
 				<div class="form-group pull-right">
 					<input type="submit" value="Submit" class="btn btn-info">
-					<router-link 
-						:to="{name:'Maklumat Calon'}" 
+					<router-link
+						:to="{name:'Maklumat Calon'}"
 						class="btn btn-default">
 						Back
 					</router-link>
@@ -75,6 +79,7 @@
 export default{
 	data: function () {
 		return {
+            imageUrl: '',
 			loading: false
 		}
 	},
@@ -84,7 +89,38 @@ export default{
 			this.$router.push({name:'Maklumat Calon'});
 	},
 
+    mounted: function () {
+        if(this.nominee.id) {
+            this.imageUrl = this.createBase64ImageUrl(this.nominee.photo);
+            document.getElementById('imagePreview').style.display = 'block';
+        }
+    },
+
 	methods: {
+        createBase64ImageUrl: function(base64ImageData) {
+            return "data:image/png;base64," + base64ImageData;
+        },
+        handleImageChange(event) {
+            const file = event.target.files[0]; // Get the selected file
+            const imageType = /image.*/; // RegExp to check if the file is an image
+
+            // Check if the selected file is an image
+            if (file && file.type.match(imageType)) {
+                const reader = new FileReader(); // Create a FileReader object
+
+                reader.onload = (e) => {
+                    this.imageUrl = e.target.result; // Set the imageUrl to the data URL of the image
+                    document.getElementById('imagePreview').style.display = 'block'; // Display the div
+                };
+
+                reader.readAsDataURL(file); // Read the image data as a data URL
+            } else {
+                // Clear the file input and hide the div if the selected file is not an image
+                event.target.value = '';
+                this.imageUrl = '';
+                document.getElementById('imagePreview').style.display = 'none';
+            }
+        },
 		edit: function () {
 			if (this.loading) return;
 			var vm = this;
@@ -94,7 +130,7 @@ export default{
 				success: function (response) {
 					$.notifyClose();
 					vm.loading = false;
-					if (vm.util.showResult(response, 'success', 'ajax')) 
+					if (vm.util.showResult(response, 'success', 'ajax'))
 						vm.$router.push({name: 'Maklumat Calon'});
 				},
 				error: function (error) {
@@ -122,4 +158,19 @@ export default{
 		}
 	}
 }
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+    #imagePreview {
+        width: 200px;
+        height: 200px;
+        border: 1px solid #ccc;
+        margin-bottom: 10px;
+        display: none; /* Initially hide the div */
+    }
+
+    #imagePreview img {
+        max-width: 100%;
+        max-height: 100%;
+    }
+</style>
diff --git a/resources/assets/js/components/demo/admin/nominee/index.vue b/resources/assets/js/components/demo/admin/nominee/index.vue
index c701e14..de8cf95 100644
--- a/resources/assets/js/components/demo/admin/nominee/index.vue
+++ b/resources/assets/js/components/demo/admin/nominee/index.vue
@@ -2,20 +2,20 @@
 <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 
+			<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 
+			<router-link
 				v-for="position in data.positions"
 				:key="position.id"
-				tag="li" 
-				class="list-group-item" 
+				tag="li"
+				class="list-group-item"
 				:to="{query: {position_id:position.id}}"
 				exact
 				replace>
@@ -43,7 +43,7 @@
 				<tbody>
 					<tr v-for="nominee in nominees">
 						<td>
-							<img :alt="nominee.name" :src="data.storageURL+nominee.image" class="thumbnail" style="height: 60px;width: 60px;">
+							<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>
@@ -142,7 +142,11 @@ export default{
 				if (partylists[i].id == id)
 					return partylists[i]['name'];
 			return 'No partylists';
-		}
+		},
+
+        createBase64ImageUrl: function(base64ImageData) {
+            return "data:image/png;base64," + base64ImageData;
+        }
 	},
 
 	computed: {
@@ -165,4 +169,4 @@ export default{
 		}
 	}
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/js/components/demo/voter/home/index.vue b/resources/assets/js/components/demo/voter/home/index.vue
index c403564..be90a11 100644
--- a/resources/assets/js/components/demo/voter/home/index.vue
+++ b/resources/assets/js/components/demo/voter/home/index.vue
@@ -51,10 +51,10 @@
 					</thead>
 					<tbody>
 						<tr v-for="(nominee,i) in data.nominees" v-if="nominee.position_id==position.id">
-							<td><img 
+							<td><img
 									@click="view(i)"
-									:src="data.storageURL+nominee.image" 
-									class="thumbnail" 
+									:src="createBase64ImageUrl(nominee.photo)"
+									class="thumbnail"
 									style="height: 60px;width: 60px;" />
 							</td>
 							<td>{{ nominee.name }}</td>
@@ -124,7 +124,7 @@ export default{
 
 		getNominee: function (id) {
 			let nominees = this.data.nominees;
-			for (var i in nominees) 
+			for (var i in nominees)
 				if (nominees[i]['id']==id) return nominees[i].name;
 			return '';
 		},
@@ -132,7 +132,12 @@ export default{
 		view: function (index) {
 			this.x = this.data.nominees[index];
 			this.util.showModal('#nominee-information-modal');
-		}
+		},
+
+        createBase64ImageUrl: function(base64ImageData) {
+            return "data:image/png;base64," + base64ImageData;
+        }
+
 	},
 
 	computed: {

From c657eafc709e184be6a6bf9ee86cd8c441998fdf Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Mon, 25 Mar 2024 21:40:03 +0800
Subject: [PATCH 5/6] added feature for OTP-SMS Koperasi

---
 .env.example                                  |   5 +
 .../API/v1/Voter/LoginController.php          | 184 +++++++++++++++++-
 app/UserOTP.php                               |  13 ++
 composer.json                                 |   2 +-
 config/onewaysms.php                          |   8 +
 .../2024_03_23_171932_user_login_otp.php      |  36 ++++
 package.json                                  |   5 +-
 resources/assets/js/app.js                    |   3 +
 .../assets/js/components/demo/voter/login.vue |  32 ++-
 .../js/components/demo/voter/verification.vue | 154 +++++++++++++++
 .../js/components/mycomponents/countdown.vue  |  48 +++++
 resources/assets/js/routesIndex.js            |   8 +
 routes/api.php                                |   1 +
 13 files changed, 475 insertions(+), 24 deletions(-)
 create mode 100644 app/UserOTP.php
 create mode 100644 config/onewaysms.php
 create mode 100644 database/migrations/2024_03_23_171932_user_login_otp.php
 create mode 100644 resources/assets/js/components/demo/voter/verification.vue
 create mode 100644 resources/assets/js/components/mycomponents/countdown.vue

diff --git a/.env.example b/.env.example
index ec702ba..2bece89 100644
--- a/.env.example
+++ b/.env.example
@@ -43,3 +43,8 @@ MAIL_ENCRYPTION=null
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+
+ONEWAY_SMS_USERNAME=APIFKZQX6MN6N
+ONEWAY_SMS_PASSWORD=APIFKZQX6MN6N9YHXP
+ONEWAY_SMS_SENDERID=INFO
+ONEWAY_SMS_LANG=1
diff --git a/app/Http/Controllers/API/v1/Voter/LoginController.php b/app/Http/Controllers/API/v1/Voter/LoginController.php
index aa56082..5e66643 100644
--- a/app/Http/Controllers/API/v1/Voter/LoginController.php
+++ b/app/Http/Controllers/API/v1/Voter/LoginController.php
@@ -5,14 +5,102 @@ namespace App\Http\Controllers\API\v1\Voter;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Util;
+use App\UserOTP;
+use App\Voter;
+use Carbon\Carbon;
+use Exception;
 use Illuminate\Support\Facades\Auth;
+use GuzzleHttp\Client;
 
 class LoginController extends Controller
 {
     public function __invoke(Request $request)
     {
     	//return response()->json(Auth::guard('user'));
-    	if (Auth::guard('voter')->attempt(['no_kp' => $request->no_kp, 'password' => 'admin', 'election_id' => Util::getCurrentElection()])) {
+
+		/* Request OTP */
+		try{
+			$currentDateTime = Carbon::now();
+
+			$expired_at = Carbon::now()->addMinutes(config('onewaysms.minutes'));
+			$created_at = $currentDateTime->toDateTimeString();
+
+			$voter = Voter::where('no_kp',$request->no_kp)->firstOrFail();
+
+			if($voter){
+				$expiration = $this->checkExpirationTAC($request->no_kp);
+
+				if($expiration['notexpired'] == true){
+					throw new \Exception('Expired TAC : ' . $expiration['remaining']);
+				} 
+				
+				$sms_token = $this->getTokenSMS($voter->telefon,$currentDateTime);
+
+				if($sms_token == 'error'){
+					throw new \Exception('error in getting the data from SMSToken');
+				}
+
+				$user_otp = new UserOTP();
+				$user_otp->nokp = $voter->no_kp;
+				$user_otp->telefon = $voter->telefon;
+				$user_otp->token = $sms_token;
+				$user_otp->created_at = $created_at;
+				$user_otp->expired_at = $expired_at;
+				$user_otp->save();
+
+				return response()->json([
+					'status' => 'success',
+					'message' => 'generated SMS Token',
+					'notel' => $voter->telefon,
+					'nokp' => $voter->no_kp,
+
+				]);
+
+			}else{
+				return response()->json([
+					'status'  =>  'failed',
+					'message'  =>  'Does not found NO KP.'
+				]);
+			}
+		}catch(Exception $e){
+			return response()->json([
+				'status'  =>  'failed',
+				'message'  =>  'Error: ' . $e->getMessage()
+			]);
+		}
+    }
+
+	public function checkExpirationTAC($nokp) : Array{
+        $currentDateTime = Carbon::now();
+
+		$expiretac = UserOTP::where('nokp',$nokp)
+			->whereDate('created_at','=',$currentDateTime)
+			->whereDate('expired_at','=',$currentDateTime)
+			->whereTime('expired_at','>=',$currentDateTime->toTimeString())
+			->whereTime('created_at','<=',$currentDateTime->toTimeString())
+			->latest()
+			->first();
+
+		if($expiretac){
+			$remaining = $this->getRemainingTime($expiretac->expired_at);
+			return ['notexpired' => true,'remaining' => $remaining];
+		}else{
+			return ['notexpired' => false];
+		}
+	}
+
+	public function verifyTAC(Request $request){
+
+		$authenticateOTP = $this->getTACModel($request->no_kp,$request->token);
+
+		if(!$authenticateOTP['condition']){
+			return response()->json([
+				'status'  =>  'failed',
+				'message'  =>  $authenticateOTP['message']
+			]);
+		}
+
+		if (Auth::guard('voter')->attempt(['no_kp' => $request->no_kp, 'password' => 'admin', 'election_id' => Util::getCurrentElection()])) {
     		return response()->json([
     			'status'  =>  'success',
     			'message'  =>  'Login successfully.',
@@ -26,5 +114,99 @@ class LoginController extends Controller
     			'message'  =>  'Invalid ID.'
     		]);
     	}
+
+		return response()->json([
+			'status'  =>  'success',
+			'message'  =>  'Login successfully.',
+		]);
+	}
+
+	private function getTACModel($no_kp,$token){
+        $currentDateTime = Carbon::now();
+
+		$result = UserOTP::where('nokp',$no_kp)
+				->whereDate('created_at','=',$currentDateTime)
+				->whereDate('expired_at','=',$currentDateTime)
+				->whereTime('expired_at','>=',$currentDateTime->toTimeString())
+				->whereTime('created_at','<=',$currentDateTime->toTimeString())
+				->latest()
+				->first();
+
+		if(!$result){
+			return ['condition' => false, 'message' => 'Token Expired'];
+		}
+
+		if($result['token'] == $token){
+			return ['condition' => true];
+		}else{
+			return ['condition' => false, 'message' => 'Invalid Token'];
+		}
+	}
+
+	private function getTokenSMS($tele,$date){
+		$tac_token = $this->randum_number(6,2,false);
+		if(env("APP_ENV") == 'production'){
+			$mobileno = '6' . $tele;
+			$messages = sprintf(config('onewaysms.message'),$tac_token,$date);
+
+			var_dump($mobileno,$messages);
+			$parameter = [
+				'apiusername' => env("ONEWAY_SMS_USERNAME"),
+				'apipassword' => env("ONEWAY_SMS_PASSWORD"),
+				'senderid' => env("ONEWAY_SMS_SENDERID",'INFO'),
+				'mobileno' => $mobileno,
+				'message'=> $messages,
+				'languagetype'=> env("ONEWAY_SMS_LANG",1)
+			];
+
+			$client = new Client(['verify' => false]);
+			$status = $client->get('http://gateway.onewaysms.com.my:10001/api.aspx',[
+				'query' => $parameter
+			]);
+
+			if($status){
+				return $tac_token;
+			}else{
+				return 'error';
+			}
+
+		}else{
+			return $tac_token;
+		}
+	}
+
+	private function randum_number($len = 6,$dup = 1, $sort = false){
+        if($dup < 1)
+            throw new \InvalidArgumentException('Second argument is < 1');
+        
+            $num = range(0,9);
+            shuffle($num);
+
+            $num = array_slice($num, 0, ($len-$dup) + 1);
+
+            if($dup > 0){
+                $k = array_rand($num, 1);
+                for($i=0;$i<($dup-1);$i++)
+                {
+                    $num[] = $num[$k];
+                }
+            }
+
+            if($sort){
+                sort($num);
+            }
+
+            return implode('',$num);
     }
+
+	private function getRemainingTime($expired_at){
+        $currentDateTime = Carbon::now();
+		$expiredAt = Carbon::parse($expired_at);
+
+		$remainingSeconds = $currentDateTime->diffInSeconds($expiredAt);
+
+		$remainingFormatted = gmdate('H:i:s', $remainingSeconds);
+
+		return $remainingFormatted;
+	}
 }
diff --git a/app/UserOTP.php b/app/UserOTP.php
new file mode 100644
index 0000000..ad22a70
--- /dev/null
+++ b/app/UserOTP.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserOTP extends Model
+{
+    protected $table = 'user_login_otp';
+    protected $fillable = ['id', 'nokp','telefon', 'token', 'created_at','expired_at'];
+
+    public $timestamps = false;
+}
diff --git a/composer.json b/composer.json
index 24e6ec8..646bd4d 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         "php": ">=5.6.4",
         "cloudinary/cloudinary_php": "^2.3",
         "doctrine/dbal": "^2.5",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^6.5",
         "laravel/framework": "5.8.*",
         "laravel/passport": "^4.0",
         "laravel/tinker": "~1.0",
diff --git a/config/onewaysms.php b/config/onewaysms.php
new file mode 100644
index 0000000..b8ad041
--- /dev/null
+++ b/config/onewaysms.php
@@ -0,0 +1,8 @@
+<?php 
+
+return [
+    'message' => 'KOPERASI : TAC:  %s - %s NOMBOR TAC',
+    'minutes' => 5
+];
+
+?>
\ No newline at end of file
diff --git a/database/migrations/2024_03_23_171932_user_login_otp.php b/database/migrations/2024_03_23_171932_user_login_otp.php
new file mode 100644
index 0000000..8c7ee94
--- /dev/null
+++ b/database/migrations/2024_03_23_171932_user_login_otp.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UserLoginOtp extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!Schema::hasTable('user_login_otp')) 
+        Schema::create('user_login_otp', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('nokp', 20);
+            $table->string('telefon');
+            $table->string('token');
+            $table->timestamp('created_at');
+            $table->timestamp('expired_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/package.json b/package.json
index 7e841ef..54616db 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,9 @@
     "sass": "^1.50.1",
     "sass-loader": "^12.1.0",
     "vue-loader": "^15.9.7",
-    "vue-template-compiler": "^2.6.14"
+    "vue-template-compiler": "^2.7.16"
+  },
+  "dependencies": {
+    "@bachdgvn/vue-otp-input": "^1.0.8"
   }
 }
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 3182c20..9f3fe8b 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -3,10 +3,13 @@ require('./bootstrap.js');
 //import VueRouter from 'vue-router';
 import Util from './util.js';
 import routes from './routesIndex.js';
+import OtpInput from "@bachdgvn/vue-otp-input";
 
+Vue.component("v-otp-input", OtpInput);
 
 Vue.use(VueRouter);
 Vue.mixin(Util);
+Vue.use(OtpInput);
 
 const router = new VueRouter({
 	mode: 'history',
diff --git a/resources/assets/js/components/demo/voter/login.vue b/resources/assets/js/components/demo/voter/login.vue
index c9e07ed..23348df 100644
--- a/resources/assets/js/components/demo/voter/login.vue
+++ b/resources/assets/js/components/demo/voter/login.vue
@@ -43,29 +43,19 @@ export default{
 	},
 
 	methods: {
-		login: function () {
-			if (this.loading) return;
-
-			let vm = this;
-
-			this.startLoading();
-
+		login: function(){
 			axios.post(config.API+'voter/login', $('#login_form').serialize())
-				 .then(response => {
-				 	vm.stopLoading();
-				 	if (this.util.showResult(response, 'success')) {
-				 		localStorage['Access Token'] = `Bearer ${response.data.token}`;
-						this.util.setAuthorization();
-				 		vm.$router.push({name: 'Voter Home'});
-				 	}
-				 })
-				 .catch(error => {
-				 	vm.stopLoading();
-				 	this.util.showResult(error, 'error');
-				 })
-
+			.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');
 			this.loading = true;
diff --git a/resources/assets/js/components/demo/voter/verification.vue b/resources/assets/js/components/demo/voter/verification.vue
new file mode 100644
index 0000000..e47310e
--- /dev/null
+++ b/resources/assets/js/components/demo/voter/verification.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="col-md-5 col-md-offset-3">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <a @click="$router.go(-1)">Kembali</a>
+        <h4 class="text-center">Kod Verifikasi!</h4>
+      </div>
+
+      <div class="panel-body">
+        <form @submit.prevent="login" id="login_form">
+          <div class="m-4">
+            <span>sila masukkan kod pengesahan yang dihantar ke</span>
+            <br>-<b>+6 {{ $route.params.notel }}</b>
+          </div>
+
+          <div class="justify-content-center d-flex" style="margin-top:20px;margin-bottom:20px;display: flex;flex-direction: row;justify-content: center;align-items: center;">
+            <v-otp-input
+              ref="otpInput"
+              input-classes="otp-input"
+              separator="-"
+              :num-inputs="6"
+              :should-auto-focus="true"
+              :is-input-num="true"
+              @on-change="handleOnChange"
+              @on-complete="handleOnComplete"
+            />
+          </div>
+
+          <div style="margin-bottom:20px;">
+            <!-- <span>dapatkan Kod baru dalam masa : 01:23 saat</span> -->
+            <!-- <Countdown ref="countdown"></Countdown> -->
+            <a @click="resendVerify">Hantar Kembali OTP!</a>
+          </div>
+
+          <div class="form-group">
+            <input
+              ref="submitbtn"
+              type="submit"
+              class="btn btn-primary form-control"
+              value="Sahkan & Teruskan"
+              disabled
+            />
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import Countdown from '../../mycomponents/countdown.vue'
+
+export default {
+  components:{
+    Countdown
+  },
+  data: function () {
+		return {
+			loading: false
+		}
+	},
+
+  created: function(){
+    console.log(this.$route.params.notel);
+  },
+  methods: {
+    handleOnComplete(value) {
+      console.log("OTP completed: ", value);
+      this.$refs.submitbtn.disabled = false;
+    },
+    handleOnChange(value) {
+      console.log("OTP changed: ", value);
+      this.$refs.submitbtn.disabled = true;
+    },
+    handleClearInput() {
+      this.$refs.otpInput.clearInput();
+    },
+    resendVerify: function(){
+			axios.post(config.API+'voter/login', {
+        'no_kp' : '970403035003'
+      })
+			.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} })
+          this.$refs.countdown.restarttimer();
+          console.log('resend verify');
+				}
+			})
+			.catch(error => {
+				vm.stopLoading();
+				this.util.showResult(error, 'error');
+			})
+    },
+    startLoading: function () {
+			this.util.notify('Logging in', 'loading');
+			this.loading = true;
+		},
+    stopLoading: function () {
+			$.notifyClose();
+			this.loading = false;
+		},
+    login: function () {
+          if (this.loading) return;
+
+          let vm = this;
+
+          this.startLoading();
+          console.log('OTP INPUT : ');
+          let otp = this.mergeOTP(this.$refs.otpInput.otp);
+          console.log(otp);
+          axios.post(config.API+'voter/verify', {
+            'no_kp' : this.$route.params.nokp,
+            'token' : otp
+          })
+            .then(response => {
+              vm.stopLoading();
+              if (this.util.showResult(response, 'success')) {
+                localStorage['Access Token'] = `Bearer ${response.data.token}`;
+                this.util.setAuthorization();
+                vm.$router.push({name: 'Voter Home'});
+              }
+            })
+            .catch(error => {
+              vm.stopLoading();
+              this.util.showResult(error, 'error');
+            })
+
+        },
+    mergeOTP: function(OTP){
+      return OTP.join('');
+    },
+  },
+};
+</script>
+<style>
+.otp-input {
+  width: 40px;
+  height: 40px;
+  padding: 5px;
+  margin: 0 10px;
+  font-size: 20px;
+  border-radius: 4px;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  text-align: center;
+  &.error {
+    border: 1px solid red !important;
+  }
+}
+.otp-input::-webkit-inner-spin-button,
+.otp-input::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+</style>
diff --git a/resources/assets/js/components/mycomponents/countdown.vue b/resources/assets/js/components/mycomponents/countdown.vue
new file mode 100644
index 0000000..d140ec2
--- /dev/null
+++ b/resources/assets/js/components/mycomponents/countdown.vue
@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <p>Dapatkan Kod baru dalam masa : {{ minutes }}:{{ seconds }} saat</p>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      minutes: 5,
+      seconds: 0,
+      timer: null // Initialize timer variable
+    };
+  },
+  created() {
+    this.startTimer(); // Start the timer when the component is created
+  },
+  methods: {
+    startTimer() {
+      // Clear existing timer if it exists
+      if (this.timer) {
+        clearInterval(this.timer);
+      }
+
+      // Start the timer
+      this.timer = setInterval(this.countdown, 1000);
+    },
+    restarttimer() {
+      this.startTimer();
+      console.log('restarted');
+    },
+    countdown() {
+      if (this.seconds > 0) {
+        this.seconds--;
+      } else if (this.minutes > 0) {
+        this.minutes--;
+        this.seconds = 59;
+      } else {
+        clearInterval(this.timer);
+      }
+    }
+  },
+  beforeDestroy() {
+    clearInterval(this.timer); // Clear the timer when the component is destroyed
+  }
+};
+</script>
diff --git a/resources/assets/js/routesIndex.js b/resources/assets/js/routesIndex.js
index d87cf50..6b15e27 100644
--- a/resources/assets/js/routesIndex.js
+++ b/resources/assets/js/routesIndex.js
@@ -1,4 +1,6 @@
 import VoterLogin from './components/demo/voter/login.vue';
+import VoterVerification from './components/demo/voter/verification.vue';
+
 import VoterHome from './components/demo/voter/index.vue';
 
 import Home from './components/demo/voter/home/index.vue';
@@ -91,6 +93,12 @@ export default [
 		name: 'Voter Login'
 	},
 
+	{
+		path: '/verification',
+		component: VoterVerification,
+		name: 'Voter Verify'
+	},
+
 	{
 		path: '/admin/login',
 		component: AdminLogin,
diff --git a/routes/api.php b/routes/api.php
index 067804f..59fe6f1 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -23,6 +23,7 @@ Route::get('/user', 'Auth\UserController@index')->middleware('auth:api');
 Route::prefix('v1')->group(function(){ //Version 1 of my Rest API
 	//Voters API
 	Route::post('voter/login', 'API\v1\Voter\LoginController'); 
+	Route::post('voter/verify','API\v1\Voter\LoginController@verifyTAC');
 
 	Route::middleware(['auth:voterAPI', 'voter'])->group(function() {
 		Route::get('election/information', 'API\v1\Election\InformationController');

From 1ebdadec8003fde96fed353163e16c7f66e93a75 Mon Sep 17 00:00:00 2001
From: Afiq Hamzah <afiq.hamzah@pkb.net.my>
Date: Wed, 27 Mar 2024 10:51:05 +0800
Subject: [PATCH 6/6] Modify migration to allow larger file size, remove
 image_path column if available

---
 ..._03_23_135849_add_photo_column_to_nominee_table.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php b/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php
index 6ed0aca..846bb8e 100644
--- a/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php
+++ b/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php
@@ -3,6 +3,7 @@
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
 
 class AddPhotoColumnToNomineeTable extends Migration
 {
@@ -14,9 +15,16 @@ class AddPhotoColumnToNomineeTable extends Migration
     public function up()
     {
         Schema::table('nominee', function (Blueprint $table) {
-            $table->binary('photo')->nullable();
             $table->dropColumn('image');
         });
+
+        if (Schema::hasColumn('nominee', 'image_path')) {
+            Schema::table('nominee', function (Blueprint $table) {
+                $table->dropColumn('image_path');
+            });
+        }
+
+        DB::statement("ALTER TABLE nominee ADD photo MEDIUMBLOB");
     }
 
     /**