ARCHBLOX
/
website
1
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

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

This commit is contained in:
Thomas G 2022-09-03 12:27:06 +10:00
parent 05a15d9c75 40b7adca9b
commit ebf881a16f
12 changed files with 237 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/css/2018.css
View File

@ -642,7 +642,8 @@ button:hover a {
color: #b8b8b8; color: #b8b8b8;
} }
iframe { #NavigationRedesignBannerContainer .HeaderDivider {
display: none;
} }
#logo_full { #logo_full {

154
public/css/NewAdminCSS.css
View File

@ -7,6 +7,14 @@ body {
min-width: 0px; min-width: 0px;
} }
@font-face
{
font-family: "copenhagen-icons";
src: url(copenhagen-icons-268fb7c014de8a06d7d40310b5000daa..woff) format("woff");
font-weight: normal;
font-style: normal
}
h1 { h1 {
font-size: 32px; font-size: 32px;
font-weight: 800; font-weight: 800;
@ -66,6 +74,8 @@ h6 {
box-shadow: 0 2px 8px 0 #000; box-shadow: 0 2px 8px 0 #000;
z-index: 1; z-index: 1;
position: relative; position: relative;
border-bottom-left-radius: 15px;
border-bottom-right-radius: 15px;
} }
.NewPanel .AdminSubHeader ul { .NewPanel .AdminSubHeader ul {
padding: 0; padding: 0;
@ -282,12 +292,12 @@ h6 {
user-select: none; user-select: none;
} }
.NewPanel .AuthenticatedUserName { .NewPanel .AuthenticatedUserName {
color: #009dff; color: #00b7ff;
transition: .25s all ease-in-out; transition: .25s all ease-in-out;
display: inline-block; display: inline-block;
} }
.NewPanel .AdminHeader .HomeBtn { .NewPanel .AdminHeader .HomeBtn {
color: #009dff; color: #00b7ff;
cursor: default; cursor: default;
-webkit-touch-callout: none; -webkit-touch-callout: none;
-webkit-user-select: none; -webkit-user-select: none;
@ -337,7 +347,7 @@ h6 {
overflow-wrap: anywhere; overflow-wrap: anywhere;
} }
.NewPanel .AuthenticatedUserName:hover, .NewPanel .Backbtn:hover, .NewPanel .Backbtn:hover + .BackArrow { .NewPanel .AuthenticatedUserName:hover, .NewPanel .Backbtn:hover, .NewPanel .Backbtn:hover + .BackArrow {
color: #2fcfff; color: #7ddaff;
transition: .25s all ease-in-out; transition: .25s all ease-in-out;
} }
.NewPanel .SearchContainer .Thumbnail a { .NewPanel .SearchContainer .Thumbnail a {
@ -370,41 +380,121 @@ h6 {
.NewPanel.AdminPanel .flex { .NewPanel.AdminPanel .flex {
display: table!important; display: table!important;
} }
.NewPanel .InvitationUserName { /*Heavily based off of the roblox developer tree list (because it looks cool)*/
text-align: center; .NewPanel .SearchTree {
margin-top: 20px; width: 260px;
font-size: 20px; height: 100%;
font-weight: 600; padding: 0;
margin: 10px auto 0;
min-height: 550px;
}
.NewPanel .SearchTree .Menu {
list-style-type: none;
position: relative;
top: 0;
bottom: 0;
line-height: 20px;
min-height: 550px;
}
.NewPanel .SearchTree a {
color: #9b9b9b;
transition: .15s all ease-in-out;
font-size: 14px;
margin: 0 0 0 38px;
padding-right: 5px;
position: relative;
top: 18px;
display: inline-block;
}
.NewPanel .SearchTree a:hover {
color: #00b7ff;
}
.NewPanel .SearchTree a:after {
content: '';
border: 1px solid #555;
border-radius: 100%;
width: 2px;
height: 2px;
display: inline-block;
left: -10px;
position: absolute;
top: 9px;
}
.NewPanel .SearchTree a span {
display: block; display: block;
} }
.NewPanel .InvitationSubName { .NewPanel #BodyWrapper .forwardArrow::before {
text-align: center; font-family: "copenhagen-icons";
font-size: 18px; font-style: normal;
font-weight: 100; font-weight: normal;
line-height: 1em;
vertical-align: middle;
-webkit-font-smoothing: antialiased;
} }
.NewPanel .InvitationSubName .InvitationText { .NewPanel #BodyWrapper .forwardArrow::before {
content: '\2794';
}
.NewPanel .SearchTree .forwardArrow:hover {
color: #00b7ff;
}
.NewPanel #BodyWrapper .forwardArrow {
position: relative;
display: inline-block; display: inline-block;
font-weight: 100; margin: 0;
cursor: default; padding: 0;
-webkit-touch-callout: none; line-height: 14px;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
} }
.NewPanel .InvitationSubText { .NewPanel #BodyWrapper .forwardArrow::after, .NewPanel #BodyWrapper .userInfo::after {
text-align: center; display: none;
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 .InvitationSubName li { .NewPanel #BodyWrapper .userInfo {
list-style: none; margin: 0;
}
.NewPanel #BodyWrapper .userInfo::before {
font-family: "copenhagen-icons";
font-style: normal;
font-weight: normal;
line-height: 1em;
vertical-align: middle;
-webkit-font-smoothing: antialiased;
}
.NewPanel #BodyWrapper .userInfo::before {
content: '\2139';
padding: 0 2px;
border: 1px solid;
border-radius: 100%;
}
.NewPanel .TreeList {
border-left: 1px dashed #555;
margin: 13px 0 0 30px;
padding: 0;
}
.NewPanel #DropDown.TreeList {
min-height: 550px;
}
.NewPanel .SearchTree li ul li {
list-style-type: none;
position: relative;
top: 3px;
bottom: 0;
padding-bottom: 16px;
white-space: nowrap;
}
.NewPanel .SearchTree li ul li:last-child {
padding-bottom: 11px;
}
.NewPanel .SearchTree li ul li.subList {
padding-bottom: 0;
}
.NewPanel .SearchTree li ul li:before {
content: '';
display: inline-block;
width: 25px;
height: 0;
position: absolute;
left: 0em;
top: 28px;
border-top: 1px dashed #555;
} }
@media (max-width:1000px) { @media (max-width:1000px) {

22
public/css/app.css
View File

@ -377,6 +377,14 @@ div.mySubmenuFixed {
background-position: 0 -54px; background-position: 0 -54px;
} }
#NavigationRedesignBannerContainer .HeaderDivider {
margin: -5px 5px 0 5px;
float: right;
height: 25px;
width: 0;
Border-left: 1px solid #5355a0;
}
#NavigationRedesignBannerContainer ul li a, .NavigationRedesign ul li a:visited { #NavigationRedesignBannerContainer ul li a, .NavigationRedesign ul li a:visited {
border: 0 solid black; border: 0 solid black;
font-size: 13px; font-size: 13px;
@ -592,8 +600,6 @@ html {
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif; font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
font-style: normal; font-style: normal;
height: 100%; height: 100%;
color: #000;
background-color: #cccccc;
} }
.loggedout { .loggedout {
@ -608,12 +614,11 @@ html {
} }
body { body {
margin-left: 0px; margin: 0px;
margin-right: 0px;
margin-top: 0px;
margin-bottom: 0px;
height: 100%; height: 100%;
padding-bottom: 0px; padding-bottom: 0px;
background: #e6e6e6;
color: #000;
} }
.content_special, .content_special,
@ -687,6 +692,7 @@ body {
} }
.hyperlink { .hyperlink {
display: block; display: block;
text-align: center;
} }
#footer { #footer {
@ -699,9 +705,9 @@ body {
width: calc(100% - 30px); width: calc(100% - 30px);
padding-bottom: 5px; padding-bottom: 5px;
padding-top: 5px; padding-top: 5px;
background: rgb(172, 172, 172); background: #e6e6e6;
/* Fallback for IE 11*/ /* Fallback for IE 11*/
background-color: rgb(172, 172, 172); background-color: #e6e6e6;
min-height: fit-content; min-height: fit-content;
bottom: 0; bottom: 0;
} }

13
public/css/appdark.css
View File

@ -47,23 +47,27 @@
background: linear-gradient(#303030 10%, #000000 100%); background: linear-gradient(#303030 10%, #000000 100%);
} }
html { body {
background-color: rgb(31, 31, 31); background-color: rgb(31, 31, 31);
color: white; color: white;
} }
.loggedout body {
background-color: transparent;
}
.loggedout { .loggedout {
background-image: url('../img/animateddark.png'); background-image: url('../img/animateddark.png');
background-color: rgb(1, 17, 48); background-color: rgb(1, 17, 48);
} }
.content { .content {
color: rgb(167 167 167); color: rgb(167, 167, 167);
background: rgb(25, 25, 25); background: rgb(25, 25, 25);
} }
.content_signup { .content_signup {
color: rgb(167 167 167); color: rgb(167, 167, 167);
background: rgb(25, 25, 25); background: rgb(25, 25, 25);
} }
@ -77,7 +81,7 @@ html {
} }
#footer { #footer {
background: rgb(0, 0, 0); background: rgb(31, 31, 31);
} }
#footer_signup { #footer_signup {
@ -122,7 +126,6 @@ input {
color: rgb(200,200,200); color: rgb(200,200,200);
} }
.tab_selected { .tab_selected {
background: linear-gradient(180deg, #00a2ff 0%, #01639c 100%) background: linear-gradient(180deg, #00a2ff 0%, #01639c 100%)
} }

7
public/css/classicapp.css
View File

@ -23,6 +23,9 @@ html {
animation-duration: 50s; animation-duration: 50s;
animation-iteration-count: infinite; animation-iteration-count: infinite;
} }
body {
background: transparent;
}
#alert, #alert,
#success { #success {
@ -172,6 +175,10 @@ html {
top: 44px; top: 44px;
} }
#NavigationRedesignBannerContainer .HeaderDivider {
display: none;
}
#footer_signup a, #footer_signup p a, #footer a, #footer p a { #footer_signup a, #footer_signup p a, #footer a, #footer p a {
transition: none; transition: none;
} }

38
public/css/classicappdark.css
View File

@ -23,6 +23,9 @@ html {
animation-duration: 50s; animation-duration: 50s;
animation-iteration-count: infinite; animation-iteration-count: infinite;
} }
body {
background: transparent;
}
.content, #footer { .content, #footer {
max-width: 1000px; max-width: 1000px;
@ -54,19 +57,20 @@ html {
.content_signup { .content_signup {
background: rgba(25, 25, 25,0.75); background: rgba(25, 25, 25,0.75);
} }
.content, #footer {
max-width: 1000px;
width: 1000px;
margin: auto;
}
.content { .content {
margin-top: 105px; margin-top: 105px;
background: rgba(25, 25, 25,0.75); background: rgba(25, 25, 25,0.75);
min-height: 550px; min-height: 550px;
} }
#footer {
width: max-content;
}
#logo_full { #logo_full {
display: none; display: none;
margin-right: 0;
} }
#logo_small { #logo_small {
@ -168,6 +172,30 @@ html {
height: 29px; height: 29px;
top: 44px; top: 44px;
} }
#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;
}
#navbarsignedincontainer {
display: block;
}
#navbarsignedincontainer a:nth-child(1)::after {
content: ' | ';
}
#NavigationRedesignBannerContainer .HeaderDivider {
display: 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;
}
@media (min-width: 1688px) { @media (min-width: 1688px) {
#logo_full { #logo_full {

6
resources/views/admin/index.blade.php
View File

@ -6,7 +6,7 @@
@section('Body') @section('Body')
<div id="Body" style="width: 970px;"> <div id="Body" style="width: 970px;">
<h2 class="MainHeader"> <h2 class="MainHeader">
Administration Area Home
</h2> </h2>
<div class="StatsContainer"> <div class="StatsContainer">
<div class="Stats-Wrapper"> <div class="Stats-Wrapper">
@ -41,7 +41,7 @@
{{ App\Models\InviteKey::count() }} {{ App\Models\InviteKey::count() }}
</span> </span>
<span class="Stats"> <span class="Stats">
Invite Keys Invite Key(s)
</span> </span>
</div> </div>
<div class="Stats-Wrapper"> <div class="Stats-Wrapper">
@ -49,7 +49,7 @@
{{ App\Models\InviteKey::where('active', true)->count() }} {{ App\Models\InviteKey::where('active', true)->count() }}
</span> </span>
<span class="Stats"> <span class="Stats">
Unused Invite Keys Unused Invite Key(s)
</span> </span>
</div> </div>
</div> </div>

39
resources/views/admin/tree.blade.php
View File

@ -37,17 +37,34 @@
</div> </div>
</form> </form>
@if ($user) @if ($user)
<a class="InvitationUserName AuthenticatedUserName" href="{{ route('profile', $user->id) }}">{{ $user->name }}</a> <ul class="SearchTree">
<div class="InvitationSubName"> <li class="Menu">
<h4 class="InvitationText">Invited By </h4> <a title="{{ $invited_by }}'s Invite Tree" href="/iphone/tree?q={{ App\Models\User::where('name', $invited_by)->first()->id }}&searchBy=id">
<a href="{{ route('profile', App\Models\User::where('name', $invited_by)->first()->id) }}" class="AuthenticatedUserName">{{ $invited_by }}</a> <span>{{ $invited_by }}</span>
<h5 class="InvitationSubText">{{ $user->name }} Invited</h5> </a>
@foreach ($children as $child) <a href="/iphone/users?q={{ App\Models\User::where('name', $invited_by)->first()->id }}&searchBy=id" title="View {{ App\Models\User::where('name', $invited_by)->first()->name }}'s Details" class="userInfo"></a>
<li> <a href="{{ route('profile', App\Models\User::where('name', $invited_by)->first()->id) }}" title="{{ $invited_by }}'s Profile" class="forwardArrow"></a>
<a href="{{ route('profile', $child->id) }}" target="_blank" class="AuthenticatedUserName">{{ $child->name }}</a> <ul id="DropDown" class="TreeList">
</li> <li class="subList">
@endforeach <a href="{{ route('profile', $user->id) }}" title="{{ $user->name }}'s Profile" class="RedirectArrow">
</div> <span>{{ $user->name }}</span>
</a>
<a href="/iphone/users?q={{ $user->id }}&searchBy=id" title="View {{ $user->name }}'s Details" class="userInfo"></a>
<ul class="TreeList">
@foreach ($children as $child)
<li>
<a href="/iphone/tree?q={{ $child->id }}&searchBy=id" title="{{ $child->name }}'s Invite Tree">
<span>{{ $child->name }}</span>
</a>
<a href="/iphone/users?q={{ $child->id }}&searchBy=id" title="View {{ $child->name }}'s Details" class="userInfo"></a>
<a href="{{ route('profile', $child->id) }}" title="{{ $child->name }}'s Profile" class="forwardArrow"></a>
</li>
@endforeach
</ul>
</li>
</ul>
</li>
</ul>
@endif @endif
</div> </div>
</div> </div>

15
resources/views/admin/users.blade.php
View File

@ -82,7 +82,11 @@
@if ($user->admin) @if ($user->admin)
[Redacted] [Redacted]
@else @else
{{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }} @guest
{{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }}
@else
{{ Carbon\Carbon::parse($user->dob)->format(Auth::user()->settings->date_preference) }}
@endguest
@endif @endif
</a> </a>
</div> </div>
@ -165,6 +169,15 @@
<a href="{{ route('profile', App\Models\User::where('id', $user->invited_by)->first()->id) }}" class="AuthenticatedUserName"> <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 }} {{ App\Models\User::where('id', $user->invited_by)->first()->name }}
</a> </a>
<a href="/iphone/tree?q={{ App\Models\User::where('id', $user->invited_by)->first()->id }}&searchBy=id" title="{{ App\Models\User::where('id', $user->invited_by)->first()->name }}'s Invite Tree" class="forwardArrow AuthenticatedUserName"></a>
</div>
<div class="Row">
<div class="text-secondary">
View
</div>
<a href="/iphone/tree?q={{ $user->id }}&searchBy=id" title="View invite tree from {{ $user->name }}" class="AuthenticatedUserName">
Invite Tree
</a>
</div> </div>
<div class="Row"> <div class="Row">
<div class="text-secondary"> <div class="text-secondary">

2
resources/views/index.blade.php
View File

@ -15,5 +15,5 @@
<br> <br>
<p><a alt="Sign Up button" href="{{ route('register') }}" >Sign Up</a> or <a alt="Log In button" href="{{ route('login') }}">Login</a></p> <p><a alt="Sign Up button" href="{{ route('register') }}" >Sign Up</a> or <a alt="Log In button" href="{{ route('login') }}">Login</a></p>
<br> <br>
<a class="hyperlink" href="https://discord.gg/nudzQ7hkWY">Join our Discord!</a> <span class="hyperlink"><a href="https://discord.gg/nudzQ7hkWY">Join our Discord!</a></span>
@endsection @endsection

2
resources/views/layouts/app.blade.php
View File

@ -127,9 +127,11 @@
<div id="HeaderLoginButton" class="RightNav"> <div id="HeaderLoginButton" class="RightNav">
<div id="navbarsignedincontainer"> <div id="navbarsignedincontainer">
<a href="@guest {{ route('login') }} @else {{ route('profile', Auth::id()) }} @endguest">{{ Auth::user()->name }}</a> <a href="@guest {{ route('login') }} @else {{ route('profile', Auth::id()) }} @endguest">{{ Auth::user()->name }}</a>
<div class="HeaderDivider"></div>
<div class="arkotcontainer"><img class="arkoticon_navbar" src="{{ asset('img/arkot.png') }}"> <div class="arkotcontainer"><img class="arkoticon_navbar" src="{{ asset('img/arkot.png') }}">
<p> {{ Auth::user()->morbux }}</p> <p> {{ Auth::user()->morbux }}</p>
</div> </div>
<div class="HeaderDivider"></div>
<a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">Logout</a></p> <a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">Logout</a></p>
</div> </div>
</div> </div>

4
resources/views/layouts/loggedout.blade.php
View File

@ -53,7 +53,9 @@ $splash = array(
'promise me you\'ll never install archblox ooghghIMFUCKING DYING', 'promise me you\'ll never install archblox ooghghIMFUCKING DYING',
'okay mr krabs', 'okay mr krabs',
'conkley is EPIC', 'conkley is EPIC',
'skeuomorphism is awesome' 'skeuomorphism is awesome',
'It\'s free!',
'It\'s archtastic!'
); );
@endphp @endphp