From a7d867936e0c084b3ee01226db495a4106b8569c Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 12 Jun 2019 23:56:35 -0600
Subject: [PATCH] Update Settings views

---
 .../views/settings/accessibility.blade.php    |  2 +-
 resources/views/settings/email.blade.php      | 29 +++++++++++++++++--
 resources/views/settings/home.blade.php       | 16 ----------
 .../views/settings/partial/sidebar.blade.php  | 28 +++++++++---------
 4 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/resources/views/settings/accessibility.blade.php b/resources/views/settings/accessibility.blade.php
index 6c63b68a8..53466edd4 100644
--- a/resources/views/settings/accessibility.blade.php
+++ b/resources/views/settings/accessibility.blade.php
@@ -48,7 +48,7 @@
       <label class="form-check-label font-weight-bold" for="video_autoplay">
         {{__('Disable video autoplay')}}
       </label>
-      <p class="text-muted small help-text">Prevent videos from autoplaying. <a href="#">Learn more</a>.</p>
+      <p class="text-muted small help-text">Prevent videos from autoplaying.</p>
     </div>
     <div class="form-group row mt-5 pt-5">
       <div class="col-12 text-right">
diff --git a/resources/views/settings/email.blade.php b/resources/views/settings/email.blade.php
index 60bbd8768..aaef42b21 100644
--- a/resources/views/settings/email.blade.php
+++ b/resources/views/settings/email.blade.php
@@ -6,8 +6,31 @@
     <h3 class="font-weight-bold">Email Settings</h3>
   </div>
   <hr>
-  <div class="alert alert-danger">
-    Coming Soon
-  </div>
+  <form method="post" action="{{route('settings')}}">
+    @csrf
+    <input type="hidden" class="form-control" name="name" value="{{Auth::user()->profile->name}}">
+    <input type="hidden" class="form-control" name="username" value="{{Auth::user()->profile->username}}">
+    <input type="hidden" class="form-control" name="website" value="{{Auth::user()->profile->website}}">
+
+    <div class="form-group row">
+      <label for="email" class="col-sm-3 col-form-label font-weight-bold text-right">Email</label>
+      <div class="col-sm-9">
+        <input type="email" class="form-control" id="email" name="email" placeholder="Email Address" value="{{Auth::user()->email}}">
+        <p class="help-text small text-muted font-weight-bold">
+          @if(Auth::user()->email_verified_at)
+          <span class="text-success">Verified</span> {{Auth::user()->email_verified_at->diffForHumans()}}
+          @else
+          <span class="text-danger">Unverified</span> You need to <a href="/i/verify-email">verify your email</a>.
+          @endif
+        </p>
+      </div>
+    </div>
+    <hr>
+    <div class="form-group row">
+      <div class="col-12 text-right">
+        <button type="submit" class="btn btn-primary font-weight-bold float-right">Submit</button>
+      </div>
+    </div>
+  </form>
 
 @endsection
\ No newline at end of file
diff --git a/resources/views/settings/home.blade.php b/resources/views/settings/home.blade.php
index 6c13dc5a3..5487eaafd 100644
--- a/resources/views/settings/home.blade.php
+++ b/resources/views/settings/home.blade.php
@@ -63,22 +63,6 @@
         </p>
       </div>
     </div>
-    <div class="pt-3">
-      <p class="font-weight-bold text-muted text-center">Private Information</p>
-    </div>
-    <div class="form-group row">
-      <label for="email" class="col-sm-3 col-form-label font-weight-bold text-right">Email</label>
-      <div class="col-sm-9">
-        <input type="email" class="form-control" id="email" name="email" placeholder="Email Address" value="{{Auth::user()->email}}">
-        <p class="help-text small text-muted font-weight-bold">
-          @if(Auth::user()->email_verified_at)
-          <span class="text-success">Verified</span> {{Auth::user()->email_verified_at->diffForHumans()}}
-          @else
-          <span class="text-danger">Unverified</span> You need to <a href="/i/verify-email">verify your email</a>.
-          @endif
-        </p>
-      </div>
-    </div>
     <div class="pt-3">
       <p class="font-weight-bold text-muted text-center">Storage Usage</p>
     </div>
diff --git a/resources/views/settings/partial/sidebar.blade.php b/resources/views/settings/partial/sidebar.blade.php
index a1b908d42..68fd09e83 100644
--- a/resources/views/settings/partial/sidebar.blade.php
+++ b/resources/views/settings/partial/sidebar.blade.php
@@ -3,19 +3,15 @@
       <li class="nav-item pl-3 {{request()->is('settings/home')?'active':''}}">
         <a class="nav-link font-weight-light  text-muted" href="{{route('settings')}}">Account</a>
       </li>
-      <li class="nav-item pl-3 {{request()->is('settings/relationships*')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('settings.relationships')}}">Followers</a>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('settings/password')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('settings.password')}}">Password</a>
-      </li>
-      {{--
       <li class="nav-item pl-3 {{request()->is('settings/accessibility')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.accessibility')}}">Accessibility</a>
       </li>
       <li class="nav-item pl-3 {{request()->is('settings/email')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.email')}}">Email</a>
       </li>
+      <li class="nav-item pl-3 {{request()->is('settings/relationships*')?'active':''}}">
+        <a class="nav-link font-weight-light text-muted" href="{{route('settings.relationships')}}">Followers</a>
+      </li>
       @if(config('pixelfed.user_invites.enabled'))
       <li class="nav-item pl-3 {{request()->is('settings/invites*')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.invites')}}">Invites</a>
@@ -24,14 +20,16 @@
       <li class="nav-item pl-3 {{request()->is('settings/notifications')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.notifications')}}">Notifications</a>
       </li> 
-      <li class="nav-item pl-3 {{request()->is('settings/reports*')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('settings.reports')}}">Reports</a>
+      <li class="nav-item pl-3 {{request()->is('settings/password')?'active':''}}">
+        <a class="nav-link font-weight-light text-muted" href="{{route('settings.password')}}">Password</a>
       </li>
-      --}}
-  
       <li class="nav-item pl-3 {{request()->is('settings/privacy*')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.privacy')}}">Privacy</a>
       </li>
+      <li class="nav-item pl-3 {{request()->is('settings/reports*')?'active':''}}">
+        <a class="nav-link font-weight-light text-muted" href="{{route('settings.reports')}}">Reports</a>
+      </li>
+  
       <li class="nav-item pl-3 {{request()->is('settings/security*')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.security')}}">Security</a>
       </li>
@@ -44,16 +42,16 @@
       <li class="nav-item pl-3 {{request()->is('settings/data-export')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.dataexport')}}">Data Export</a>
       </li>
-      {{-- 
+      
       <li class="nav-item">
       <hr>
       </li>
-      <li class="nav-item pl-3 {{request()->is('settings/applications')?'active':''}}">
+      {{-- <li class="nav-item pl-3 {{request()->is('settings/applications')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.applications')}}">Applications</a>
-      </li>
+      </li> --}}
       <li class="nav-item pl-3 {{request()->is('settings/developers')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.developers')}}">Developers</a>
-      </li> --}}
+      </li>
       <li class="nav-item">
       <hr>
       </li>