Merge branch 'main' of https://github.com/Thomasluigi07/MORBLOX-WEBSITE

public/css/2018.css

@@ -376,10 +376,6 @@ body {
 	background: none;
 }
 
-#NavigationRedesignBannerContainer p {
-	color: #fff;
-}
-
 #logo_full,
 #logo_full .btn-logo {
 	height: 30px;
@@ -402,7 +398,7 @@ body {
 	height: 40px
 }
 
-.navbarbutton {
+#NavigationRedesignBannerContainer ul li a, .NavigationRedesign ul li a:visited, .navbarbutton {
 	color: #fff;
 	font-family: "Source Sans Pro", Arial, Helvetica Neue, sans-serif;
 	padding: 6px 9px;
@@ -415,13 +411,14 @@ body {
 	float: left;
 	margin: 4px auto;
 	top: 0;
+	text-shadow: none;
 }
 
 #NavigationRedesignBannerContainer {
 	font-family: "Source Sans Pro", Arial, Helvetica Neue, sans-serif;
 }
 
-.navbarbutton:hover {
+#NavigationRedesignBannerContainer ul li a:hover, .navbarbutton:hover {
 	background-color: #191919;
 	background-color: rgba(25, 25, 25, .1);
 	border-radius: 5px;
@@ -620,8 +617,9 @@ input:focus {
 	border-color: #00A2FF
 }
 
-#navbarsignedincontainer p a {
+#navbarsignedincontainer a {
-	color: #fff
+	color: #fff;
+	height: 25px;
 }
 
 button:hover a {

public/css/NewAdminCSS.css

@@ -1,3 +1,7 @@
+html {
+  background-color: #111;
+}
+
 body {
   background-color: #111;
   min-width: 0px;
@@ -13,7 +17,7 @@ h2 {
 }
 h3 {
   font-size: 20px;
-  font-family: 600;
+  font-weight: 600;
 }
 h4 {
   font-size: 18px;
@@ -28,7 +32,7 @@ h6 {
   font-weight: 200;
 }
 
-#MasterContainer.AdminPanel.NewPanel {
+#MasterContainer.NewPanel.AdminPanel {
   background-color: #111;
 }
 #MasterContainer.NewPanel #BodyWrapper {
@@ -36,7 +40,7 @@ h6 {
   background-color: #111;
   color: #fff;
 }
-.AdminPanel {
+.NewPanel.AdminPanel {
   height: 100%;
 }
 #MasterContainer.NewPanel .iphone-sidebar, #MasterContainer.NewPanel .iphone-content, #MasterContainer #AdminWrapper, #MasterContainer #BodyWrapper {
@@ -45,7 +49,7 @@ h6 {
 #MasterContainer.NewPanel #AdminWrapper, #MasterContainer.NewPanel #BodyWrapper {
   display: block;
 }
-#AdminWrapper.Navigation {
+.NewPanel #AdminWrapper.Navigation {
   width: 100%;
 }
 .NewPanel .AdminHeader {
@@ -79,19 +83,25 @@ h6 {
 }
 .NewPanel .AdminSubHeader li a {
   font-size: 14px;
+  font-weight: 100;
   color: #bbb;
+  cursor: pointer;
   transition: .1s all linear;
 }
-.NewPanel .AdminSubHeader li a:hover {
+.NewPanel .AdminSubHeader li:hover a {
-  font-size: 14px;
+  color: #ccc
+}
+.NewPanel .AdminSubHeader li a.Active, .NewPanel .AdminSubHeader li a.Active:active {
+  box-shadow: 0 2px 0 0 #00b7ff;
+}
+.NewPanel .AdminSubHeader li a:hover, .NewPanel .AdminSubHeader li a:active {
   color: #fff;
-  cursor: pointer;
   box-shadow: 0 2px 0 0 #fff;
   transition: .1s all linear;
 }
 .NewPanel .AdminHeader .Slogan {
   font-size: 16px;
-  font-weight: 600;
+  font-weight: 100;
   display: block;
   text-align: center;
   cursor: default;
@@ -106,41 +116,257 @@ h6 {
   width: 200px;
   height: 40px;
   padding: 5px;
-  background-image: url(../img/MORBLOXlogo.png);
+  background-image: url(/img/MORBLOXlogo.png);
   background-repeat: no-repeat;
   background-size: contain;
   background-position: 0;
   display: block;
   margin: auto;
 }
-.AdminPanel #Body {
+.NewPanel.AdminPanel #Body {
   background-color: #111;
 }
-.AdminPanel .MainHeader, .AdminPanel .Stats-Wrapper {
+.NewPanel.AdminPanel .MainHeader, .NewPanel.AdminPanel .SubHeader {
   text-align: center;
+  cursor: default;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
-.AdminPanel .StatsContainer {
+.NewPanel.AdminPanel .Reminder {
+  color: #ff7300
+}
+.NewPanel .text-error {
+  display: block;
+  text-align: center;
+  color: #d6241a;
+  font-weight: 200;
+  padding: 5px;
+}
+.NewPanel .text-header {
+  display: block;
+  text-align: center;
+  padding: 5px 0;
+}
+.NewPanel .text-secondary {
+  color: #bbb;
+  display: inline-block;
+  text-align: left;
+}
+.NewPanel.AdminPanel .Stats-Wrapper {
+  text-align: center;
+  padding: 4px;
+}
+.NewPanel.AdminPanel .StatsContainer {
   margin: 15px 15px 0 15px;
   padding: 15px;
-  border: 1px dotted #ff7300;
+  border: 1px dashed #ff7300;
   background-color: #080808;
 }
-.AdminPanel .Stats {
+.NewPanel.AdminPanel .Userlist {
-  font-size: 16px;
+  margin: 10px;
-  font-weight: 400;
-  color: #a7a7a7;
 }
-.AdminPanel .Stats.Counter {
+.NewPanel.AdminPanel form div {
-  font-weight: 600;
+  display: flex;
+  justify-content: center;
+}
+.NewPanel .SearchCloseBtn{
+  color: #af1400;
+  left: auto;
+  margin-left: -105px;
+  margin-top: 1px;
+  position: absolute;
+  font-size: 16px;
+}
+.NewPanel .SearchCloseBtn:hover {
+  color: #d41900;
+}
+.NewPanel.AdminPanel #SearchInput {
+  border: 1px solid #757575;
+  border-radius: 3px;
+  color: #b8b8b8;
+  background-color: #000;
+}
+.NewPanel.AdminPanel #SearchInput:focus, .AdminPanel #SearchInput:active {
+  border-color: #0099ff;
+}
+.NewPanel #SearchInput, .NewPanel .btn-neutral {
+  margin: 0 5px;
+}
+.NewPanel.AdminPanel #SearchInput:focus-visible {
+  outline: none;
+}
+.NewPanel.AdminPanel .Stats {
+  font-size: 16px;
+  font-weight: 100;
+  color: #a7a7a7;
+  cursor: default;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.NewPanel.AdminPanel .Stats.Counter {
+  font-weight: 400;
   color: #fff;
 }
-.AdminPanel .Stat-Separator {
+.NewPanel.AdminPanel .Stat-Separator {
   width: 50%;
   height: 1px;
-  background-color: #555;
+  background: linear-gradient(90deg,rgb(85, 85, 85,0) 0%, #555 50%, rgb(85, 85, 85,0) 100%);
   display: block;
   margin: auto;
 }
+.NewPanel.AdminPanel .SearchContainer {
+  width: 235px;
+  height: auto;
+  background-color: #555;
+  border-radius: 5px;
+  margin: 62px 25px 0 0;
+  display: flex;
+  align-items: center;
+  align-content: center;
+  flex-direction: column;
+}
+.NewPanel .SearchContainer .Thumbnail {
+  height: 64px;
+  width: 64px;
+  margin-top: -37px;
+  background-color: #555;
+  border: 5px solid #111;
+  border-radius: 100%;
+}
+.NewPanel .SearchBoard {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  justify-content: center;
+  align-items: flex-start;
+}
+.NewPanel .SearchContainer .UserThumbnail {
+  background-image: url(/img/defaultrender.png);
+  background-size: contain;
+  width: 100%;
+  height: 100%;
+}
+.NewPanel .SearchContainer .UserDetails {
+  width: 95%;
+  padding: 5px;
+}
+.NewPanel .SearchContainer .SearchBox {
+  width: 100%;
+}
+.NewPanel .AuthenticatedUserNameWrapper {
+  top: 10px;
+  right: 10px;
+  font-size: 16px;
+  font-weight: 100;
+  display: inline-block;
+  position: absolute;
+  color: #fff;
+  cursor: default;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.NewPanel .AuthenticatedUserName {
+  color: #009dff;
+  transition: .25s all ease-in-out;
+  display: inline-block;
+}
+.NewPanel .AdminHeader .HomeBtn {
+  color: #009dff;
+  cursor: default;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  display: flex;
+  flex-direction: row-reverse;
+}
+.NewPanel .HomeBtn {
+  top: 10px;
+  left: 10px;
+  background: none;
+  border: 0;
+  padding: 0;
+  height: auto;
+  font-size: 16px;
+  font-weight: 100;
+  display: inline-block;
+  position: absolute;
+}
+.NewPanel .BackArrow {
+  cursor: default;
+  transition: .25s all ease-in-out;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  line-height: 1.1rem;
+  margin-right: 2px;
+}
+.NewPanel .Backbtn {
+  color: inherit;
+  cursor: pointer;
+  transition: .25s all ease-in-out;
+  -webkit-touch-callout: text;
+  -webkit-user-select: text;
+  -khtml-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
+}
+.NewPanel .UserDetails .Row {
+  overflow-wrap: anywhere;
+}
+.NewPanel .AuthenticatedUserName:hover, .NewPanel .Backbtn:hover, .NewPanel .Backbtn:hover + .BackArrow {
+  color: #2fcfff;
+  transition: .25s all ease-in-out;
+}
+.NewPanel .SearchContainer .Thumbnail a {
+  width: 12px;
+  height: 12px;
+  display: block;
+  float: right;
+  top: -6px;
+  position: relative;
+  border-radius: 50%;
+}
+.NewPanel .website {
+  background: linear-gradient(0deg, #0087e0 0%, #005085 49%,#005a85 50%, #0099ff 95%, #fff 100%);
+  width: 12px;
+  height: 12px;
+  display: block;
+  border-radius: 50%;
+  margin: -5px;
+}
+.NewPanel .offline {
+  background: linear-gradient(0deg, #a3a3a3 0%, #7a7a7a 49%, #797979 50%, #c9c9c9 95%, #fff 100%);
+  width: 12px;
+  height: 12px;
+  display: block;
+  border-radius: 50%;
+  margin: -5px;
+}
+.NewPanel.AdminPanel .flex {
+  display: table!important;
+}
 
 @media (max-width:1000px) {
   .NewPanel .AdminSubHeader ul {
@@ -148,8 +374,8 @@ h6 {
   }
 }
 @media (max-width:990px) {
-  #Body, #BodyWrapper, #MasterContainer {
+  .NewPanel.AdminPanel #Body, .NewPanel.AdminPanel #BodyWrapper, .NewPanel.AdminPanel #MasterContainer {
-    width: 100% !important;
+    width: 100% !important; /*!important since late 2012 roblox uses element.style CRINGE!*/
     padding: 0;
   }
 }

public/css/app.css

@@ -93,10 +93,12 @@
 
 #alert {
   background: linear-gradient(#f07575 10%, #de2323 100%);
+  color: #fff;
 }
 
 #success {
-  background: linear-gradient(#a3e2bd 10%, #02b757 100%)
+  background: linear-gradient(#a3e2bd 10%, #02b757 100%);
+  color: #fff;
 }
 
 .warningtext {
@@ -111,6 +113,7 @@
 #logo_full {
   display: inline-block;
   float: left;
+  margin-right: 5px;
 }
 
 #logo_full,
@@ -133,8 +136,7 @@
 
 @media (max-width: 970px) {
 
-  .navbarbuttoncontainer a,
+  #navbarsignedincontainer,
-  #navbarusername,
   .arkotcontainer p,
   #navbarlogincontainer {
     font-size: 11px;
@@ -150,8 +152,7 @@
     position: relative;
   }
 
-  .navbarbuttoncontainer a,
+  #navbarsignedincontainer,
-  #navbarusername,
   .arkotcontainer p,
   #navbarlogincontainer {
     font-size: 9px;
@@ -339,6 +340,21 @@ div.mySubmenuFixed {
   background-position: 0 -54px;
 }
 
+#NavigationRedesignBannerContainer ul li a, .NavigationRedesign ul li a:visited {
+  border: 0 solid black;
+  font-size: 13px;
+  padding: 0;
+  text-decoration: none;
+  outline: none;
+  font-family: Arial,Helvetica,sans-serif;
+  text-shadow: #11111191 1px 1px 1px;
+}
+
+.NavigationRedesign ul {
+  margin: 0 auto;
+  padding: 0;
+}
+
 iframe {
   width: 100%;
   height: 2000px;
@@ -532,7 +548,7 @@ html {
 }
 
 .loggedout {
-  background: url('../img/animated.png');
+  background: url('/img/animated.png');
   background-color: rgb(49, 107, 223);
   background-position: center bottom;
   background-repeat: repeat-x;
@@ -589,17 +605,6 @@ body {
   background-color: rgb(255, 255, 255);
 }
 
-.content_signup a {
-  color: #0074bd;
-  transition: .25s all ease-in-out;
-}
-.content_signup a:hover {
-  color: #32cfff;
-}
-.hyperlink {
-  display: block;
-}
-
 .content_signup h1, .content_signup a, .content_signup p, .content_signup h2, .content_signup h5 {
   text-align: center;
 }
@@ -621,6 +626,20 @@ body {
   color: black;
 }
 
+.content_signup a, .content_signup p a {
+  color: #0074bd;
+  transition: .25s all ease-in-out;
+}
+#footer_signup a, #footer_signup p a, #footer a, #footer p a {
+  transition: .25s all ease-in-out;
+}
+.content_signup a:hover, .content_signup p a:hover, #footer_signup a:hover, #footer_signup p a:hover, #footer a:hover, #footer p a:hover {
+  color: #2fcfff;
+}
+.hyperlink {
+  display: block;
+}
+
 #footer {
   text-align: center;
   margin: auto;
@@ -638,7 +657,7 @@ body {
   bottom: 0;
 }
 
-/*Button gradients by TersisWilvin*/
+/*Legacy Button gradients by TersisWilvin*/
 
 .tab {
   background: rgb(255, 255, 255);
@@ -732,6 +751,99 @@ button:hover.greenbutton {
   background: linear-gradient(0deg, #3fc679 0%, #15933f 49%, #3cc175 50%, #46dc86 95%, #53ff9d 100%);
 }
 
+/*-------------*/
+
+.btn-large, .btn-medium, .btn-small {
+  margin: 0px;
+  display: inline-block;
+  zoom: 1;
+  text-align: center;
+  font-weight: normal;
+  text-decoration: none;
+  border-width: 1px;
+  border-style: solid;
+  cursor: pointer;
+  *display: inline;
+  *vertical-align: top;
+}
+.btn-small {
+  padding: 1px 7px 0px 7px;
+  height: 20px;
+  min-width: 40px;
+  font-size: 14px;
+  line-height: 18px;
+  background-position: left -160px;
+  border-radius: 0;
+}
+.btn-small:hover {
+  background-position: left -181px;
+}
+.btn-medium {
+  padding: 1px 13px 3px 13px;
+  height: 28px;
+  min-width: 62px;
+  font-size: 20px;
+  background-position: left -96px;
+  border-radius: 0;
+}
+.btn-medium:hover {
+  background-position: left -128px;
+}
+.btn-large {
+  padding: 9px 13px 0px 13px;
+  height: 39px;
+  min-width: 70px;
+  font-size: 23px;
+  line-height: 27px;
+  background-position: left 0px;
+  border-radius: 0;
+}
+.btn-large:hover {
+  background-position: left -48px;
+}
+.btn-disabled-primary, .btn-disabled-primary:hover, .btn-disabled-neutral, .btn-disabled-neutral:hover, .btn-disabled-negative, .btn-disabled-negative:hover {
+  cursor: default;
+  background-position: left -202px;
+}
+
+.btn-primary, .btn-primary:link, .btn-primary:active, .btn-primary:visited {
+  border-color: #007001;
+  background-color: #007001;
+  background-image: url(/images/buttons/StyleGuide/bg-btn-green.png);
+  color: white;
+}
+.btn-disabled-primary, .btn-disabled-primary:link, .btn-disabled-primary:active, .btn-disabled-primary:visited {
+  background-color: #99c699;
+  background-image: url(/images/buttons/StyleGuide/bg-btn-green.png);
+  border-color: #99c699;
+  color: white;
+}
+
+.btn-neutral, .btn-neutral:link, .btn-neutral:active, .btn-neutral:visited {
+  border-color: #0852b7;
+  background-color: #0852b7;
+  background-image: url(/images/buttons/StyleGuide/bg-btn-blue.png);
+  color: white;
+}
+.btn-disabled-neutral, .btn-disabled-neutral:link, .btn-disabled-neutral:active, .btn-disabled-neutral:visited {
+  background-color: #9cbae2;
+  background-image: url(/images/buttons/StyleGuide/bg-btn-blue.png);
+  border-color: #9cbae2;
+  color: white;
+}
+
+.btn-negative, .btn-negative:link, .btn-negative:active, .btn-negative:visited {
+  border-color: #565656;
+  background-color: #565656;
+  background-image: url(/images/buttons/StyleGuide/bg-btn-gray.png);
+  color: white;
+}
+.btn-disabled-negative, .btn-disabled-negative:link, .btn-disabled-negative:active, .btn-disabled-negative:visited {
+  background-color: #bbbcbb;
+  background-image: url(/images/buttons/StyleGuide/bg-btn-gray.png);
+  border-color: #bbbcbb;
+  color: white;
+}
 
 #footer_signup {
   text-align: center;

public/css/classicapp.css

@@ -34,7 +34,8 @@ html {
 }
 
 #logo_full {
-  display: none;
+	display: none;
+	margin-right: 0;
 }
 
 #logo_small {
@@ -114,13 +115,14 @@ html {
   align-items: center;
   height: 40px;
 }
-.navbarbutton {
+#NavigationRedesignBannerContainer ul li a, .NavigationRedesign ul li a:visited, .navbarbutton {
   position: relative;
   padding-right: 5px;
   text-align: center;
   font-size: 18px;
   font-family: "Helvetica Neue";
   font-weight: bold;
+  text-shadow: none;
 }
 .Redesign .smallnavbarbutton {
   position: relative;
@@ -137,6 +139,21 @@ html {
   top: 44px;
 }
 
+#footer_signup a, #footer_signup p a, #footer a, #footer p a {
+  transition: none;
+}
+
+.content_signup a:hover, .content_signup p a:hover, #footer_signup a:hover, #footer_signup p a:hover, #footer a:hover, #footer p a:hover {
+  color: inherit;
+}
+
+#navbarsignedincontainer {
+  display: block;
+}
+#navbarsignedincontainer a:nth-child(1)::after {
+  content: ' | ';
+}
+
 @media (min-width: 1688px) {
   #logo_full {
     display: block;

public/css/classicappdark.css

@@ -32,7 +32,8 @@ html {
 }
 
 #logo_full {
-  display: none;
+	display: none;
+	margin-right: 0;
 }
 
 #logo_small {
@@ -112,13 +113,14 @@ html {
   align-items: center;
   height: 40px;
 }
-.navbarbutton {
+#NavigationRedesignBannerContainer ul li a, .NavigationRedesign ul li a:visited, .navbarbutton {
   position: relative;
   padding-right: 5px;
   text-align: center;
   font-size: 18px;
   font-family: "Helvetica Neue";
   font-weight: bold;
+  text-shadow: none;
 }
 .Redesign .smallnavbarbutton {
   position: relative;
@@ -135,6 +137,21 @@ html {
   top: 44px;
 }
 
+#footer_signup a, #footer_signup p a, #footer a, #footer p a {
+  transition: none;
+}
+
+.content_signup a:hover, .content_signup p a:hover, #footer_signup a:hover, #footer_signup p a:hover, #footer a:hover, #footer p a:hover {
+  color: inherit;
+}
+
+#navbarsignedincontainer {
+  display: block;
+}
+#navbarsignedincontainer a:nth-child(1)::after {
+  content: ' | ';
+}
+
 @media (min-width: 1688px) {
   #logo_full {
     display: block;

resources/views/admin/index.blade.php

@@ -5,7 +5,6 @@
 
 @section('Body')
 <div id="Body" style="width: 970px;">
-<div class="Container">
 <h2 class="MainHeader">
     Administration Area
 </h2>
@@ -55,7 +54,6 @@
 </div>
 </div>
 </div>
-</div>
 @endsection
 @section('content')
     <h1>{{ env('APP_NAME') }}</h1>

resources/views/admin/tree.blade.php

@@ -13,6 +13,30 @@
     </style>
 @endsection
 
+@section('Body')
+<div id="Body" style="width: 970px;">
+<h2 class="MainHeader">
+    Invite Tree
+</h2>
+<div class="Userlist">
+<form method="GET" action="{{ route('admin_tree') }}">
+<div>
+<input type="text" id="SearchInput" name="q" placeholder="Search" value="{{ request()->q }}">
+@if (request()->query('q'))
+<a href="{{ route('admin_tree') }}" class="SearchCloseBtn">X</a>
+@endif
+</input>
+<button class="btn-neutral btn-small" name="searchBy" value="name">Search by Username</button>
+<button class="btn-neutral btn-small" name="searchBy" value="id">Search by ID</button>
+</div>
+</form>
+@if ($user)
+<div class="UserList">
+</div>
+@endif
+</div>
+</div>
+@endsection
 @section('content')
     <div id="UserList">
         <h2>Invite Tree</h2>

resources/views/admin/users.blade.php

@@ -9,6 +9,197 @@
     </style>
 @endsection
 
+@section('Body')
+<div id="Body" style="width: 970px;">
+<h2 class="MainHeader">
+    User List
+</h2>
+<h5 class="SubHeader Reminder">
+    Reminder, don't leak any users' date of birth or email address.
+</h5>
+<div class="Userlist">
+<form method="GET" action="{{ route('admin_users') }}">
+<div>
+<input type="text" id="SearchInput" name="q" placeholder="Search" value="{{ request()->q }}">
+@if (request()->query('q'))
+<a href="{{ route('admin_users') }}" class="SearchCloseBtn">X</a>
+@endif
+</input>
+<button class="btn-neutral btn-small" name="searchBy" value="name">Search by Username</button>
+<button class="btn-neutral btn-small" name="searchBy" value="id">Search by ID</button>
+</div>
+</form>
+<div class="SearchBoard">
+@foreach ($users as $user)
+<div class="SearchContainer">
+    <div class="Thumbnail">
+        <div class="UserThumbnail">
+        </div>
+        <a>
+        @if (Cache::has('is_online_' . $user->id))
+            <span class="website">
+            </span>
+        @else
+            <span class="offline">
+            </span>
+        @endif
+        </a>
+    </div>
+    <div class="UserDetails">
+        <div class="text-header">
+            User Details
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                Username:
+            </div>
+            <a href="{{ route('profile', $user->id) }}" class="AuthenticatedUserName">
+                {{ $user->name }}
+            </a>
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                ID:
+            </div>
+            <a class="text-secondary">
+                {{ $user->id }}
+            </a>
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                Email:
+            </div>
+            @if ($user->admin)
+                <a class="text-secondary">[Redacted]</a>
+            @else
+                <a class="text-secondary">{{ $user->email }}</a>
+            @endif
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                DOB:
+            </div>
+            <a class="text-secondary">
+                @if ($user->admin)
+                    [Redacted]
+                @else
+                    {{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }}
+                @endif
+            </a>
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                Feed Status :
+            </div>
+            <a class="text-secondary">
+                @if (!request()->has('q'))
+                    @if (!empty($user->feedposts->last()->status))
+                        "{{ $user->feedposts->last()->status }}"
+                    @else
+                        "I'm new to ARCHBLOX!"
+                    @endif
+                    @else
+                    @if (!empty(App\Models\FeedPost::where('user_id', $user->id)->first()->status))
+                        "{{ App\Models\FeedPost::where('user_id', $user->id)->orderBy('id', 'desc')->first()->status }}"
+                    @else
+                        "I'm new to ARCHBLOX!"
+                    @endif
+                @endif
+            </a>
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                Bio :
+            </div>
+            <a class="text-secondary">
+                {!! nl2br(e($user->blurb)) !!}
+            </a>
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                Total Friends :
+            </div>
+            <a class="text-secondary">
+                {{ $user->getFriendsCount() }}
+            </a>
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                Mutual Friends :
+            </div>
+            <a class="text-secondary">
+                {{ Auth::user()->getMutualFriendsCount($user) }}
+            </a>
+        </div>
+        <div class="Row hidden">
+            <div class="text-secondary">
+                Total Badges :
+            </div>
+            <a class="text-secondary">
+                N/A
+            </a>
+        </div>
+        <div class="Row hidden">
+            <div class="text-secondary">
+                Place Visits :
+            </div>
+            <a class="text-secondary">
+                TODO
+            </a>
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                Join Date :
+            </div>
+            <a class="text-secondary">
+                @guest
+                    {{ $user->created_at->format('d/m/Y') }}
+                @else
+                    {{ $user->created_at->format(Auth::user()->settings->date_preference) }}
+                @endguest
+            </a>
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                Invited By
+            </div>
+            <a href="{{ route('profile', App\Models\User::where('id', $user->invited_by)->first()->id) }}" class="AuthenticatedUserName">
+                {{ App\Models\User::where('id', $user->invited_by)->first()->name }}
+            </a>
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                Type:
+            </div>
+            <a class="text-secondary">
+                @if ($user->admin)
+                    Admin
+                @else
+                    Member
+                @endif
+            </a>
+        </div>
+        <div class="Row">
+            <div class="text-secondary">
+                Moderation Status:
+            </div>
+            <a class="text-secondary">
+                Normal
+            </a>
+        </div>
+    </div>
+</div>
+@endforeach
+@if ($users->isEmpty())
+<span class="text-error">
+    Unable to find user, please check if you entered the correct information.
+</span>
+@endif
+</div>
+</div>
+</div>
+{{ $users->appends($_GET)->links() }}
+@endsection
 @section('content')
     <div id="UserList">
         <h2>User List</h2>

resources/views/home.blade.php

@@ -19,12 +19,11 @@
         <form action="{{ route('feed_post') }}" method="POST">
             @csrf
             <p style="display: flex;">
-                <input id="FeedBox" type="text" name="status" placeholder="Say something..." style="width: 80%;"
+                <input id="FeedBox" type="text" name="status" placeholder="What are you up to?" style="width: 80%;"
                     value="{{ old('status') }}">
                 <button style="width: 20%;height: 28px;margin-left: 10px;" class="greybutton" id="FeedButton"
                     type="submit" alt="Post it!, Button"
-                    onClick="this.form.submit();this.disabled=true;this.innerText='Posting…';">Post
+                    onClick="this.form.submit();this.disabled=true;this.innerText='Posting…';">Share</button>
-                    it!</button>
             </p>
             @if ($errors->any())
             <span alt="Error: {{ $errors->first() }}" class="warningtext">{{ $errors->first() }}</span>
@@ -57,7 +56,8 @@
             </div>
             @endforeach
             @if ($posts->isEmpty())
-            <p>Your feed is empty.</p>
+            <p>No news about your friends... want to know what your friends are up to?</p>
+            <a href="/users">make some friends now.</a>
             @endif
         </div>
         {{ $posts->links() }}
@@ -92,10 +92,10 @@
     </div>
     @endif
     <br>
-    <h2>Recently Played</h2>
+    <h2>Recently Played Games</h2>
     <br>
     <div class="gamelist">
-        <p>You haven't played any games yet!</p>
+        <p>You haven't played any games recently.</p><a href="/incomplete" class="text-link">Play Now</a>
     </div>
     <br>
 </div>

resources/views/layouts/admin.blade.php

@@ -31,6 +31,13 @@
             <a class="Slogan">
                 Admin Panel
             </a>
+            <div class="AuthenticatedUserNameWrapper">
+            Logged in as <a class="AuthenticatedUserName" href="@guest {{ route('login') }} @else {{ route('profile', Auth::id()) }} @endguest">{{ Auth::user()->name }}</a>
+            </div>
+            <div class="HomeBtn">
+            <a href="{{ route('home') }}" class="Backbtn">Main Site</a>
+            <span class="BackArrow">←</span>
+            </div>
         </div>
         <div class="AdminSubHeader">
             <ul>

resources/views/layouts/app.blade.php

@@ -107,7 +107,8 @@
             <a id="logo_full" href="{{ route('home') }}"><img alt="ARCHBLOX Logo" class = "btn-logo" src="{{ asset('img/MORBLOXlogo.png') }}"/></a>
             <a id="logo_small" href="{{ route('home') }}"><img alt="ARCHBLOX Logo"
                     src="{{ asset('img/MORBLOXlogoshort.png') }}"/></a>
-            <div class="navbarbuttoncontainer">
+            <div id="NewRedesign" class="navbarbuttoncontainer NavigationRedesign">
+                <ul id="ctl00_cphBanner_ctl00_MenuUL">
                 <li><a class="navbarbutton" id="smallbtn5" href="{{ route('incomplete') }}">Games</a></li>
                 <li><a class="navbarbutton" id="smallbtn4" href="{{ route('catalog') }}">Catalog</a></li>
                 <li><a class="navbarbutton" id="smallbtn0" href="{{ route('incomplete') }}">Build</a></li>
@@ -115,6 +116,7 @@
     @else
     {{ route('profile', Auth::id()) }} @endguest">Profile</a></li>
                 <li><a class="navbarbutton" id="smallbtn3" href="{{ route('settings') }}">Settings</a></li>
+                </ul>
             </div>
             @guest
             <div id="navbarlogincontainer">
@@ -122,13 +124,12 @@
             </div>
             @else
             <div id="HeaderLoginButton" class="RightNav">
-                <div class="arkotcontainer"><img class="arkoticon_navbar" src="{{ asset('img/arkot.png') }}">
-                    <p> {{ Auth::user()->morbux }}</p>
-                </div>
                 <div id="navbarsignedincontainer">
-                    <p class="nonbolded" id="navbarusername"><a
+                    <a href="@guest {{ route('login') }} @else {{ route('profile', Auth::id()) }} @endguest">{{ Auth::user()->name }}</a>
-                            href="@guest {{ route('login') }} @else {{ route('profile', Auth::id()) }} @endguest">{{ Auth::user()->name }}</a> | <a href="{{ route('logout') }}" onclick="event.preventDefault();
+                    <div class="arkotcontainer"><img class="arkoticon_navbar" src="{{ asset('img/arkot.png') }}">
-                            document.getElementById('logout-form').submit();">Logout</a></p>
+                    <p> {{ Auth::user()->morbux }}</p>
+                    </div>
+                    <a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">Logout</a></p>
                 </div>
             </div>