Merge pull request #1048 from pixelfed/frontend-ui-refactor

Frontend ui refactor

resources/views/site/help.blade.php

@@ -45,8 +45,8 @@
             </p>
             <p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.hashtags')}}</p>
             <div class="text-center pt-3">
-              <p class="small text-dark font-weight-bold mb-0">&nbsp;</p>
-              <p class="small text-dark font-weight-bold mb-0">&nbsp;</p>
+              <p class="small text-dark font-weight-bold mb-0">What are hashtags?</p>
+              <p class="small text-dark font-weight-bold mb-0">Hashtag Tips</p>
             </div>
           </div>
         </div>
@@ -68,7 +68,7 @@
         </div>
       </a>
     </div>
-    <div class="col-12 col-md-6 mb-3">
+    {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.discover')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -77,13 +77,13 @@
             </p>
             <p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.discover')}}</p>
             <div class="text-center pt-3">
-              <p class="small text-dark font-weight-bold mb-0">&nbsp;</p>
-              <p class="small text-dark font-weight-bold mb-0">&nbsp;</p>
+              <p class="small text-dark font-weight-bold mb-0">What is Discover?</p>
+              <p class="small text-dark font-weight-bold mb-0">What are Discover Categories?</p>
             </div>
           </div>
         </div>
       </a>
-    </div>
+    </div> --}}
     <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.your-profile')}}" class="text-decoration-none">
         <div class="card">
@@ -100,7 +100,7 @@
         </div>
       </a>
     </div>
-    <div class="col-12 col-md-6 mb-3">
+    {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.dm')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -115,8 +115,8 @@
           </div>
         </div>
       </a>
-    </div>
-    <div class="col-12 col-md-6 mb-3">
+    </div> --}}
+    {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.stories')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -131,8 +131,8 @@
           </div>
         </div>
       </a>
-    </div>
-    <div class="col-12 col-md-6 mb-3">
+    </div> --}}
+    {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.timelines')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -147,9 +147,9 @@
           </div>
         </div>
       </a>
-    </div>
+    </div> --}}
 
-    <div class="col-12 col-md-6 mb-3">
+    {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.community-guidelines')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -164,8 +164,8 @@
           </div>
         </div>
       </a>
-    </div>
-    <div class="col-12 col-md-6 mb-3">
+    </div> --}}
+    {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.blocking-accounts')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -180,8 +180,8 @@
           </div>
         </div>
       </a>
-    </div>
-    <div class="col-12 col-md-6 mb-3">
+    </div> --}}
+    {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.what-is-fediverse')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -196,7 +196,7 @@
           </div>
         </div>
       </a>
-    </div>
+    </div> --}}
     <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.safety-tips')}}" class="text-decoration-none">
         <div class="card">
@@ -206,14 +206,14 @@
             </p>
             <p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.safetyTips')}}</p>
             <div class="text-center pt-3">
-              <p class="small text-dark font-weight-bold mb-0">&nbsp;</p>
-              <p class="small text-dark font-weight-bold mb-0">&nbsp;</p>
+              <p class="small text-dark font-weight-bold mb-0">Know the rules</p>
+              <p class="small text-dark font-weight-bold mb-0">Make your account or posts private</p>
             </div>
           </div>
         </div>
       </a>
     </div>
-    <div class="col-12 col-md-6 mb-3">
+    {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.controlling-visibility')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -228,8 +228,8 @@
           </div>
         </div>
       </a>
-    </div>
-    <div class="col-12 col-md-6 mb-3">
+    </div> --}}
+    {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.report-something')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -244,8 +244,8 @@
           </div>
         </div>
       </a>
-    </div>
-    <div class="col-12 col-md-6 mb-3">
+    </div> --}}
+    {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.data-policy')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -253,57 +253,8 @@
           </div>
         </div>
       </a>
-    </div>
+    </div> --}}
   </div>
-  {{-- <div class="card mb-3">
-  	<div class="card-body">
-  		<p class="h5 font-weight-bold">Using Pixelfed</p>
-  		<div class="row font-weight-bold text-muted">
-  			<div class="col-12 col-md-6">
-  				<ul>
-  					<li><a href="{{route('help.getting-started')}}">Getting Started</a></li>
-
-  					<li><a href="{{route('help.sharing-media')}}">Sharing Photos & Videos</a></li>
-  					<li><a href="{{route('help.your-profile')}}">Your Profile</a></li>
-  					<li><a href="{{route('help.stories')}}">Stories</a></li>
-  				</ul>
-  			</div>
-  			<div class="col-12 col-md-6">
-  				<ul>
-  					<li><a href="{{route('help.hashtags')}}">Hashtags</a></li>
-
-  					<li><a href="{{route('help.discover')}}">Discover</a></li>
-  					<li><a href="{{route('help.dm')}}">Direct Messaging</a></li>
-  					<li><a href="{{route('help.timelines')}}">Timelines</a></li>
-  				</ul>
-  			</div>
-  		</div>
-  	</div>
-  </div>
-  <div class="card mb-3">
-  	<div class="card-body">
-  		<p class="h5 font-weight-bold">Privacy and Safety</p>
-  		<div class="row font-weight-bold text-muted">
-  			<div class="col-12 col-md-6">
-  				<ul>
-  					<li><a href="#">Community Guidelines</a></li>
-  					<li><a href="#">What is the fediverse?</a></li>
-  					<li><a href="#">Controlling your visibility</a></li>
-  					<li><a href="#">Abuse/malicious activity</a></li>
-  				</ul>
-  			</div>
-  			<div class="col-12 col-md-6">
-  				<ul>
-  					<li><a href="#">Blocking accounts</a></li>
-
-  					<li><a href="#">Safety Tips</a></li>
-  					<li><a href="#">Report Something</a></li>
-  					<li><a href="#">Data Policy</a></li>
-  				</ul>
-  			</div>
-  		</div>
-  	</div>
-  </div> --}}
 @endsection
 
 @push('meta')

resources/views/site/help/partial/sidebar.blade.php

@@ -9,59 +9,59 @@
       <li class="nav-item {{request()->is('*/your-profile')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.your-profile')}}">{{__('helpcenter.profile')}}</a>
       </li>
-      <li class="nav-item {{request()->is('*/stories')?'active':''}}">
+      {{-- <li class="nav-item {{request()->is('*/stories')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.stories')}}">{{__('helpcenter.stories')}}</a>
-      </li>
+      </li> --}}
       <li class="nav-item {{request()->is('*/hashtags')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.hashtags')}}">{{__('helpcenter.hashtags')}}</a>
       </li>
-      <li class="nav-item {{request()->is('*/discover')?'active':''}}">
+      {{-- <li class="nav-item {{request()->is('*/discover')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.discover')}}">{{__('helpcenter.discover')}}</a>
-      </li>
-      <li class="nav-item {{request()->is('*/direct-messages')?'active':''}}">
+      </li> --}}
+      {{-- <li class="nav-item {{request()->is('*/direct-messages')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.dm')}}">{{__('helpcenter.directMessages')}}</a>
-      </li>
-      <li class="nav-item {{request()->is('*/timelines')?'active':''}}">
+      </li> --}}
+      {{-- <li class="nav-item {{request()->is('*/timelines')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.timelines')}}">{{__('helpcenter.timelines')}}</a>
-      </li>
-      <li class="nav-item {{request()->is('*/embed')?'active':''}}">
+      </li> --}}
+      {{-- <li class="nav-item {{request()->is('*/embed')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.embed')}}">{{__('helpcenter.embed')}}</a>
-      </li>
+      </li> --}}
       <li class="nav-item">
         <hr>
       </li>
-      <li class="nav-item {{request()->is('*/community-guidelines')?'active':''}}">
+      {{-- <li class="nav-item {{request()->is('*/community-guidelines')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.community-guidelines')}}">
           {{__('helpcenter.communityGuidelines')}}
         </a>
-      </li>
-      <li class="nav-item {{request()->is('*/what-is-the-fediverse')?'active':''}}">
+      </li> --}}
+      {{-- <li class="nav-item {{request()->is('*/what-is-the-fediverse')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.what-is-fediverse')}}">{{__('helpcenter.whatIsTheFediverse')}}</a>
-      </li>
-      <li class="nav-item {{request()->is('*/controlling-visibility')?'active':''}}">
+      </li> --}}
+      {{-- <li class="nav-item {{request()->is('*/controlling-visibility')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.controlling-visibility')}}">
           {{__('helpcenter.controllingVisibility')}}
         </a>
-      </li>
-      <li class="nav-item {{request()->is('*/blocking-accounts')?'active':''}}">
+      </li> --}}
+      {{-- <li class="nav-item {{request()->is('*/blocking-accounts')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.blocking-accounts')}}">
           {{__('helpcenter.blockingAccounts')}}
         </a>
-      </li>
+      </li> --}}
       <li class="nav-item {{request()->is('*/safety-tips')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.safety-tips')}}">
           {{__('helpcenter.safetyTips')}}
         </a>
       </li>
-      <li class="nav-item {{request()->is('*/report-something')?'active':''}}">
+      {{-- <li class="nav-item {{request()->is('*/report-something')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.report-something')}}">
           {{__('helpcenter.reportSomething')}}
         </a>
-      </li>
-      <li class="nav-item {{request()->is('*/data-policy')?'active':''}}">
+      </li> --}}
+      {{-- <li class="nav-item {{request()->is('*/data-policy')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.data-policy')}}">
           {{__('helpcenter.dataPolicy')}}
         </a>
-      </li>
+      </li> --}}
     </ul>
   </div>

resources/views/site/help/safety-tips.blade.php

@@ -29,28 +29,28 @@
   <div class="card border-left-blue mb-3">
     <div class="card-body">
       <p class="h5">Know the rules</p>
-      <p class="mb-0">To keep yourself safe, it is important to know the terms of service rules. You can find them <a href="#">here</a>.</p>
+      <p class="mb-0">To keep yourself safe, it is important to know the <a href="{{route('site.terms')}}">terms of service</a> rules.</p>
     </div>
   </div>
 
   <div class="card border-left-blue mb-3">
     <div class="card-body">
       <p class="h5">Know the age guidelines</p>
-      <p class="mb-0">Please keep in mind that Pixelfed is meant for people over the age of 16 or 13 depending on where you live. For more information click <a href="#">here</a>.</p>
+      <p class="mb-0">Please keep in mind that Pixelfed is meant for people over the age of 16 or 13 depending on where you live.</p>
     </div>
   </div>
 
   <div class="card border-left-blue mb-3">
     <div class="card-body">
       <p class="h5">Report problematic content</p>
-      <p class="mb-0">You can report content that you think is in violation of our policies. For more information click <a href="#">here</a>.</p>
+      <p class="mb-0">You can report content that you think is in violation of our policies.</p>
     </div>
   </div>
 
   <div class="card border-left-blue mb-3">
     <div class="card-body">
       <p class="h5">Understanding content visibility</p>
-      <p class="mb-0">You can limit the visibility of your content to specific people, followers, public and more. For more information about visibility, click <a href="#">here</a>.</p>
+      <p class="mb-0">You can limit the visibility of your content to specific people, followers, public and more.</p>
     </div>
   </div>
 
@@ -58,7 +58,7 @@
   <div class="card border-left-blue mb-3">
     <div class="card-body">
       <p class="h5">Make your account or posts private</p>
-      <p class="mb-0">You can limit the visibility of your content to specific people, followers, public and more. For more information about visibility, click <a href="#">here</a>.</p>
+      <p class="mb-0">You can limit the visibility of your content to specific people, followers, public and more.</p>
     </div>
   </div>
 @endsection