Przeglądaj źródła

Move account actions to Settings

Alan Lam 8 lat temu
rodzic
commit
26d09168e7
3 zmienionych plików z 110 dodań i 111 usunięć
  1. 4 0
      engine/user.php
  2. 0 31
      views/account.php
  3. 106 80
      views/settings.php

+ 4 - 0
engine/user.php

@@ -270,6 +270,10 @@ class User extends Model {
 		return $this->level == User::LEVEL_TESTER;
 	}
 
+	public function isDeactivated() {
+		return $this->level == User::LEVEL_DEACTIVATED;
+	}
+
 	public function getGenderText() {
 
 		if($this->gender == "M") return "Male";

+ 0 - 31
views/account.php

@@ -60,37 +60,6 @@
 			}
 			?>
 			</div>
-			<h3>Actions</h3>
-			<div class="row">
-			<?php
-			foreach($actions as $icon) {
-				$button_class = preg_match("/delete/i", $icon->name) ? "btn-danger" : "btn-light";
-				?>
-				<div class="col-6 col-sm-4 text-center">
-					<a class="btn <?=$button_class?> btn-block mb-3 p-2" href="<?=htmlspecialchars($icon->url)?>">
-						<?php
-						if($icon->counter) {
-							?>
-							<span class="fa-layers fa-fw fa-3x mb-2">
-								<i class="fal fa-<?=htmlspecialchars($icon->icon)?>"></i>
-								<span class="fa-layers-counter fa-layers-bottom-right"><?=number_format($icon->counter)?></span>
-							</span>
-							<?php
-						}
-						else {
-							?>
-							<i class="fal fa-3x fa-<?=htmlspecialchars($icon->icon)?> mb-2"></i>
-							<?php
-						}
-						?>
-						<br />
-						<?=htmlspecialchars($icon->name)?>
-					</a>
-				</div>
-				<?php
-			}
-			?>
-			</div>
 		</div>
 		<div class="col-xl mb-3 mb-lg-0">
 

+ 106 - 80
views/settings.php

@@ -5,110 +5,136 @@
 		<div class="row">
 			<div class="col-lg-8 offset-lg-2">
 
-				<h3>Personal Details</h3>
+				<div class="card card-body mb-3">
+					<h3>Personal</h3>
 
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label" for="title">Title</label>
-					<div class="col-sm">
-						<select class="form-control" name="title" id="title" required>
-							<option value="">Select title</option>
-							<?php
-							foreach(User::TITLES as $title) {
-								$selected = ($user->title == $title) ? "selected" : "";
-								?>
-								<option value="<?=htmlspecialchars($title)?>" <?=$selected?>><?=htmlspecialchars($title)?></option>
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label" for="title">Title</label>
+						<div class="col-sm">
+							<select class="form-control" name="title" id="title" required>
+								<option value="">Select title</option>
 								<?php
-							}
-							?>
-						</select>
+								foreach(User::TITLES as $title) {
+									$selected = ($user->title == $title) ? "selected" : "";
+									?>
+									<option value="<?=htmlspecialchars($title)?>" <?=$selected?>><?=htmlspecialchars($title)?></option>
+									<?php
+								}
+								?>
+							</select>
+						</div>
 					</div>
-				</div>
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="first-name">First Name</label>
-					<div class="col-sm">
-						<input class="form-control" type="text" name="first_name" id="first-name" placeholder="Enter first name" value="<?=htmlspecialchars($user->first_name)?>" required />
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label"  for="first-name">First Name</label>
+						<div class="col-sm">
+							<input class="form-control" type="text" name="first_name" id="first-name" placeholder="Enter first name" value="<?=htmlspecialchars($user->first_name)?>" required />
+						</div>
 					</div>
-				</div>
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="last-name">Last Name</label>
-					<div class="col-sm">
-						<input class="form-control" type="text" name="last_name" id="last-name" placeholder="Enter last name" value="<?=htmlspecialchars($user->last_name)?>" required />
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label"  for="last-name">Last Name</label>
+						<div class="col-sm">
+							<input class="form-control" type="text" name="last_name" id="last-name" placeholder="Enter last name" value="<?=htmlspecialchars($user->last_name)?>" required />
+						</div>
 					</div>
 				</div>
 
-				<h3 class="mt-3">Contact Details</h3>
+				<div class="card card-body mb-3">
+					<h3>Contact</h3>
 
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="email">Email Address</label>
-					<div class="col-sm">
-						<input class="form-control" type="email" name="email" id="email" placeholder="Enter email address" value="<?=htmlspecialchars($user->email)?>" required />
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label"  for="email">Email Address</label>
+						<div class="col-sm">
+							<input class="form-control" type="email" name="email" id="email" placeholder="Enter email address" value="<?=htmlspecialchars($user->email)?>" required />
+						</div>
 					</div>
-				</div>
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="phone">Mobile Number</label>
-					<div class="col-sm">
-						<input class="form-control" type="phone" name="phone" id="phone" placeholder="Enter mobile number" value="<?=htmlspecialchars($user->phone)?>" required />
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label"  for="phone">Mobile Number</label>
+						<div class="col-sm">
+							<input class="form-control" type="phone" name="phone" id="phone" placeholder="Enter mobile number" value="<?=htmlspecialchars($user->phone)?>" required />
+						</div>
 					</div>
 				</div>
 
-				<h3 class="mt-3">Security Details</h3>
+				<div class="card card-body mb-3">
+					<h3>Security</h3>
 
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="password">Password (if changing)</label>
-					<div class="col-sm">
-						<input class="form-control" type="password" name="password" id="password" placeholder="Enter password" />
-						<small class="text-muted form-text">At least <span data-length-requirement>6 characters</span>. Must contain at least one <span data-lowercase-requirement>lowercase</span>, <span data-uppercase-requirement>uppercase</span>, <span data-number-requirement>number</span> and <span data-special-requirement>special</span> character.</small>
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label"  for="password">Password (if changing)</label>
+						<div class="col-sm">
+							<input class="form-control" type="password" name="password" id="password" placeholder="Enter password" />
+							<small class="text-muted form-text">At least <span data-length-requirement>6 characters</span>. Must contain at least one <span data-lowercase-requirement>lowercase</span>, <span data-uppercase-requirement>uppercase</span>, <span data-number-requirement>number</span> and <span data-special-requirement>special</span> character.</small>
+						</div>
 					</div>
-				</div>
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="password-confirm">Confirm Password</label>
-					<div class="col-sm">
-						<input class="form-control" type="password" name="password_confirm" id="password-confirm" placeholder="Confirm password" />
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label"  for="password-confirm">Confirm Password</label>
+						<div class="col-sm">
+							<input class="form-control" type="password" name="password_confirm" id="password-confirm" placeholder="Confirm password" />
+						</div>
 					</div>
 				</div>
-
-				<h3 class="mt-3">Payment Details</h3>
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label" for="preferred-payment-method">Preferred Payment Method</label>
-					<div class="col-sm">
-						<select class="form-control" name="preferred_payment_method" id="preferred-payment-method">
-							<?php
-							foreach(User::PAYMENT_METHODS as $value => $display) {
-								$selected = ($user->preferred_payment_method == $value) ? "selected" : "";
-								?>
-								<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
+				<div class="card card-body mb-3">
+					<h3>Payment</h3>
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label" for="preferred-payment-method">Preferred Payment Method</label>
+						<div class="col-sm">
+							<select class="form-control" name="preferred_payment_method" id="preferred-payment-method">
 								<?php
-							}
-							?>
-						</select>
+								foreach(User::PAYMENT_METHODS as $value => $display) {
+									$selected = ($user->preferred_payment_method == $value) ? "selected" : "";
+									?>
+									<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
+									<?php
+								}
+								?>
+							</select>
+						</div>
 					</div>
-				</div>
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="bank-name">Bank Name</label>
-					<div class="col-sm">
-						<input class="form-control" type="text" name="bank_name" id="bank-name" placeholder="Enter bank name" value="<?=htmlspecialchars($user->bank_name)?>" />
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label"  for="bank-name">Bank Name</label>
+						<div class="col-sm">
+							<input class="form-control" type="text" name="bank_name" id="bank-name" placeholder="Enter bank name" value="<?=htmlspecialchars($user->bank_name)?>" />
+						</div>
 					</div>
-				</div>
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="bank-sort-code">Bank Sort Code</label>
-					<div class="col-sm">
-						<input class="form-control" type="text" name="bank_sort_code" id="bank-sort-code" placeholder="Enter bank sort code" value="<?=htmlspecialchars($user->bank_sort_code)?>" />
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label"  for="bank-sort-code">Bank Sort Code</label>
+						<div class="col-sm">
+							<input class="form-control" type="text" name="bank_sort_code" id="bank-sort-code" placeholder="Enter bank sort code" value="<?=htmlspecialchars($user->bank_sort_code)?>" />
+						</div>
 					</div>
-				</div>
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="bank-account-number">Bank Account Number</label>
-					<div class="col-sm">
-						<input class="form-control" type="text" name="bank_account_number" id="bank-account-number" placeholder="Enter bank account number" value="<?=htmlspecialchars($user->bank_account_number)?>" />
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label"  for="bank-account-number">Bank Account Number</label>
+						<div class="col-sm">
+							<input class="form-control" type="text" name="bank_account_number" id="bank-account-number" placeholder="Enter bank account number" value="<?=htmlspecialchars($user->bank_account_number)?>" />
+						</div>
 					</div>
-				</div>
-				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label" for="paypal-email">PayPal Email Address</label>
-					<div class="col-sm">
-						<input class="form-control" type="email" name="paypal_email" id="paypal-email" placeholder="Enter PayPal email address" value="<?=htmlspecialchars($user->paypal_email)?>" />
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label" for="paypal-email">PayPal Email Address</label>
+						<div class="col-sm">
+							<input class="form-control" type="email" name="paypal_email" id="paypal-email" placeholder="Enter PayPal email address" value="<?=htmlspecialchars($user->paypal_email)?>" />
+						</div>
 					</div>
 				</div>
 
-				<button class="btn btn-primary mt-3" type="submit" name="submit" value="<?=$_SESSION["csrf_token"]?>">Save</button>
+				<div class="row">
+					<div class="col">
+						<?php
+						if(Core::$user->isTester()) {
+							?>
+							<a href="/account/deactivate">Deactivate Account...</a><br />
+							<?php
+						}
+						if(Core::$user->isDeactivated()) {
+							?>
+							<a href="/account/reactivate">Reactivate Account</a><br />
+							<?php
+						}
+						?>
+						<a class="text-danger" href="/account/delete">Delete Account...</a><br />
+					</div>
+					<div class="col text-right">
+						<button class="btn btn-primary" type="submit" name="submit" value="<?=$_SESSION["csrf_token"]?>">Save</button>
+					</div>
+				</div>
 			</div>
 		</div>
 	</form>