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

Updated design language of multiple pages

This commit is contained in:
Thomas G 2022-09-15 06:40:26 +10:00
parent 2b3f88a1bd
commit 8a9dbd89b9
13 changed files with 79 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/2018.css
View File

@ -66,6 +66,7 @@ body {
width: 970px;
padding-top: 12px;
margin: 40px auto 0;
margin-top: 60px;
padding-bottom: 40px;
min-height: calc(100% - 40px);
}
@ -672,8 +673,7 @@ button:hover a {
width: 120px;
}
.content,
iframe {
.content, iframe {
padding-left: 180px;
padding-right: 10px;
}

9
resources/views/home.blade.php
View File

@ -56,8 +56,8 @@
</div>
@endforeach
@if ($posts->isEmpty())
<p>No news about your friends... want to know what your friends are up to?</p>
<a href="/users">make some friends now.</a>
<p>It's quiet... Too quiet... Why not make a post on your feed, or </p>
<a href="{{ route('games')}}">make some friends!</a>
@endif
</div>
{{ $posts->links() }}
@ -72,7 +72,6 @@
@endif
</div>
<br>
<br>
<div class="friendslist">
@if (Auth::user()->getFriendsCount() > 0)
<div id="profilefriendcontainer" class="content_special"
@ -88,14 +87,14 @@
</div>
</div>
@else
<p>You don't have any friends yet!</p>
<p>You don't have any friends yet. <a href="{{ route('users')}}">Why not make some!</a></p>
</div>
@endif
<br>
<h2>Recently Played Games</h2>
<br>
<div class="gamelist">
<p>You haven't played any games recently.</p><a href="{{ route('games')}}" class="text-link">Play Now</a>
<p>You haven't played any games recently.</p> <a href="{{ route('games')}}" class="text-link">Play Now!</a>
</div>
</div>
</div>

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

@ -92,9 +92,13 @@
@default
@endswitch
@endauth
<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>
@guest
<a id="logo_full" href="{{ route('index') }}"><img alt="ARCHBLOX Logo" class="btn-logo" src="{{ asset('img/MORBLOXlogo.png') }}"/></a>
<a id="logo_small" href="{{ route('index') }}"><img alt="ARCHBLOX Logo" src="{{ asset('img/MORBLOXlogoshort.png') }}"/></a>
@else
<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>
@endguest
<div id="NewRedesign" class="navbarbuttoncontainer NavigationRedesign">
<ul id="ctl00_cphBanner_ctl00_MenuUL">
<li><a class="navbarbutton" id="smallbtn5" href="{{ route('games') }}">Games</a></li>

35
resources/views/messages/content.blade.php
View File

@ -4,26 +4,33 @@
@endsection
@section('content')
<div class="PageTitleBar">
<div>
<h2>{{ $message->subject }}</h2>
@if ($message->sendto_id != Auth::id())
<h3>To: {{ App\Models\User::where('id', $message->sendto_id)->first()->name }}</h3>
@else
<h3>From: {{ $message->user->name }}</h3>
@endif
</div>
<div>
<button type="button" class="greybutton" onclick="window.location=document.referrer;">Back</button>
@if ($message->sendto_id == Auth::id())
<button type="button" class="greybutton" onclick="window.location='/my/messages/compose?replyTo={{ $message->id }}'">Reply</button>
@endif
@if (Auth::id() != $message->user_id)
<form action="{{ route('delete_message', $message->id) }}" method="post" style="display:inline-block">
@csrf
@if ($message->deleted)
<button class="greenbutton" type="submit">Recover</button>
@else
<button class="redbutton" type="submit">Delete</button>
@endif
</form>
@endif
<br>
@if ($message->sendto_id != Auth::id())
<h3>To: {{ App\Models\User::where('id', $message->sendto_id)->first()->name }}</h3>
@else
<h3>From: {{ $message->user->name }}</h3>
<form action="{{ route('delete_message', $message->id) }}" method="post" style="display:inline-block">
@csrf
@if ($message->deleted)
<button class="greenbutton" type="submit">Recover</button>
@else
<button class="redbutton" type="submit">Delete</button>
@endif
</form>
@endif
</div>
</div>
@if (!Auth::user()->settings->time_preference_24hr)
<p>{{ $message->created_at->format('F d, Y h:i A') }}</p>
@else

19
resources/views/messages/create.blade.php
View File

@ -1,6 +1,6 @@
@extends('layouts.app')
@section('title')
<title>Create Message - {{ env('APP_NAME') }}</title>
<title>New Message - {{ env('APP_NAME') }}</title>
@endsection
@section('alert')
@ -10,26 +10,25 @@
@endsection
@section('content')
<h1 id="usernameframe">Create Message</h1>
<h1 id="usernameframe">New Message</h1>
<br>
<form action="{{ route('send_message') }}" method="POST">
@csrf
@if (request()->has('replyTo'))
<p>To: <input type="text" name="name" placeholder="Username" value="{{ $replyName }}"></p>
<p>Subject: <input type="text" name="subject" placeholder=" " value="{{ $replySubject }}"></p>
<p>To: <input style="width: 95%;" type="text" name="name" placeholder="Enter a username..." value="{{ $replyName }}"></p>
<p>Subject: <input style="width: 91%" type="text" name="subject" placeholder=" " value="{{ $replySubject }}"></p>
<textarea style="width: calc(100% - 5px); height: 170px; min-height: 170px; resize: vertical;"
placeholder="Write your message..." id="message" name="message">{{ old('message') ? old('message') : $replyContent }}</textarea>
<button class="greybutton" type="button" onClick="document.getElementById('message').value = ''" style="margin-top:3px;margin-bottom:3px">Clear Message Text</button>
<br>
<button class="greybutton" type="button" onClick="document.getElementById('message').value = ''" style="margin-top:3px;margin-bottom:3px">Clear Message</button>
<button class="greenbutton" type="submit">Send</button>
<button class="redbutton" type="reset"><a href="{{ route('inbox') }}"
style="color:white;font-weight:normal">Cancel</a></button>
@else
<p>To: <input type="text" name="name" placeholder="Username" @if (request()->has('to')) value="{{ request()->to }}" @else value="{{ old('name') }}" @endif></p>
<p>Subject: <input type="text" name="subject" placeholder="Subject" value="{{ old('subject') }}"></p>
<button class="greybutton" type="button" onClick="document.getElementById('message').value = ''" style="margin-top:3px;margin-bottom:3px">Clear Message</button>
<p>To: <input style="width: 95%" type="text" name="name" placeholder="Enter a username..." @if (request()->has('to')) value="{{ request()->to }}" @else value="{{ old('name') }}" @endif></p>
<p>Subject: <input style="width: 91%" type="text" name="subject" placeholder=" " value="{{ old('subject') }}"></p>
<textarea style="width: 99%; width: calc(100% - 5px); height: 170px; min-height: 170px; resize: vertical;"
placeholder="Write your message..." id="message" name="message">{{ old('message') }}</textarea>
placeholder="Write your message..." id="message" name="message">{{ old('message') }}</textarea>
<button class="greybutton" type="button" onClick="document.getElementById('message').value = ''" style="margin-top:3px;margin-bottom:3px">Clear Message</button>
<button class="greenbutton" type="submit">Send</button>
<button class="redbutton" type="reset"><a href="{{ route('inbox') }}" style="color:white;font-weight:normal">Cancel</a></button>
@endif

5
resources/views/messages/deleted.blade.php
View File

@ -15,14 +15,17 @@
@endsection
@section('content')
<div class="PageTitleBar">
<h1 id="usernameframe">My Messages</h1>
<div>
<button type="button" class="greenbutton"><a href="{{ route('compose') }}" style="color:white;font-weight:normal">New
Message</a></button>
<form action="{{ route('recover_all') }}" method="POST" style="display:inline-block">
@csrf
<button class="greenbutton" type="submit">Recover All Messages</button>
</form>
<br>
</div>
</div>
<br>
<a href="{{ route('inbox') }}" class="tab">Inbox
({{ App\Models\Message::where('sendto_id', Auth::id())->where('deleted', false)->count() }})</a>

5
resources/views/messages/index.blade.php
View File

@ -13,14 +13,17 @@
@endsection
@section('content')
<div class="PageTitleBar">
<h1 id="usernameframe">My Messages</h1>
<div>
<button type="button" class="greenbutton"><a href="{{ route('compose') }}" style="color:white;font-weight:normal">New
Message</a></button>
<form action="{{ route('delete_all') }}" method="POST" style="display:inline-block">
@csrf
<button class="redbutton" type="submit">Delete All Messages</button>
</form>
<br>
</div>
</div>
<br>
<a href="#" class="tab_selected">Inbox
({{ App\Models\Message::where('sendto_id', Auth::id())->where('deleted', false)->count() }})</a>

6
resources/views/messages/sent.blade.php
View File

@ -11,10 +11,10 @@
@endsection
@section('content')
<div class="PageTitleBar">
<h1 id="usernameframe">My Messages</h1>
<button type="button" class="greenbutton"><a href="{{ route('compose') }}" style="color:white;font-weight:normal">New
Message</a></button>
<br>
<button type="button" class="greenbutton"><a href="{{ route('compose') }}" style="color:white;font-weight:normal">New Message</a></button>
</div>
<br>
<a href="{{ route('inbox') }}" class="tab">Inbox
({{ App\Models\Message::where('sendto_id', Auth::id())->where('deleted', false)->count() }})</a>

6
resources/views/pages/avatar.blade.php
View File

@ -14,7 +14,12 @@
@endsection
@section('content')
<div class="PageTitleBar">
<h1>Avatar Editor</h1>
<div>
<button class="tab_selected">Wardrobe</button> <button class="tab">My Outfits</button>
</div>
</div>
<br>
<div class="content_special">
<div class="avatarleft" style="width: 30%;">
@ -46,7 +51,6 @@
</div>
</div>
<div class="avatarright" style="width: 69%;">
<button class="tab_selected">Wardrobe</button> <button class="tab">My Outfits</button>
<div class="wardrobecontainer">
</div>

11
resources/views/pages/friends.blade.php
View File

@ -4,16 +4,13 @@
@endsection
@section('content')
<div class="PageTitleBar">
<h1 id="usernameframe">Friends ({{ Auth::user()->getFriendsCount() }})</h1>
<div>
<a href="#" class="tab_selected">All Friends</a>
<a href="{{ route('requests') }}" class="tab">Pending Requests ({{ count(Auth::user()->getFriendRequests()) }})</a>
<br>
<!--
<form method="GET" action="{{ route('friends') }}">
<p><input type="text" id="q" name="q" placeholder="Enter a Username..." value="{{ request()->q }}">
<button class="greybutton" type="submit">Search</button>
</p>
</form>-->
</div>
</div>
<br>
<div class="content_special" id="FriendsContainer" style="flex-wrap: wrap;">
@foreach ($userFriends as $user)

16
resources/views/pages/profile.blade.php
View File

@ -10,7 +10,8 @@
@endsection
@section('content')
<div id="profiletopcontainer">
<div class="PageTitleBar" style="align-content: flex-end; align-items: flex-end;">
<div>
<h1 id="usernameframe">{{ $user->name }}</h1>
@if ($user->settings->changed_name)
<h4>Previous Username: {{ $user->settings->old_name }}</h4>
@ -21,7 +22,8 @@
<strong id="onlinestatus" class="onlinestatus_offline">Offline - Last Online
{{ Carbon\Carbon::parse($user->last_seen)->diffForHumans() }}</strong>
@endif
<br>
</div>
<div>
@if (!Auth::guest() && Auth::id() != $user->id)
@if (Auth::user()->hasSentFriendRequestTo($user))
<button class="bluebutton" type="submit" disabled>Pending...</button>
@ -50,14 +52,16 @@
@if (Auth::user()->isFriendWith($user))
<a href="/my/messages/compose?to={{ $user->name }}"><button class="greybutton">Message</button></a>
@else
<a href="#"><button class="greybutton" disabled>Message (Friends Only)</button></a>
<a href="#"><button class="greybutton" disabled>Message</button></a>
@endif
@break
@default
<a href="#"><button class="greybutton" disabled>Message (Disabled)</button></a>
<a href="#"><button class="greybutton" disabled>Message</button></a>
@endswitch
@endif
</div>
</div>
<br>
<div class="content_special">
<div id="profileleftcontainer">
@if (!empty($user->feedposts->last()->status))
@ -100,9 +104,9 @@
<div id="profilerightcontainer">
<div class="content_special" style="justify-content: center;">
<h2>Games </h2>
<a href="{{ route('incomplete') }}" style="margin-left: 5px"> <button class="bluebutton"
<!--<a href="route('incomplete')" style="margin-left: 5px"> <button class="bluebutton"
style="margin-top: 5px">View
All</button></a>
All</button></a>-->
</div>
<p>This user hasn't made any games yet!</p>
<br>

5
resources/views/pages/requests.blade.php
View File

@ -4,10 +4,13 @@
@endsection
@section('content')
<div class="PageTitleBar">
<h1 id="usernameframe">Friends</h1>
<div>
<a href="{{ route('friends') }}" class="tab">All Friends</a>
<a href="#" class="tab_selected">Pending Requests ({{ count(Auth::user()->getFriendRequests()) }})</a>
<br>
</div>
</div>
<br>
<div class="content_special" id="FriendsContainer" style="flex-wrap: wrap;">
@foreach ($userRequests as $userReq)

2
resources/views/pages/users.blade.php
View File

@ -10,6 +10,7 @@
@endsection
@section('content')
<div class="PageTitleBar">
@if (request()->query('q'))
<h1 id="usernameframe">Users -
{{ DB::table('users')->where('name', 'LIKE', '%' . request()->query('q') . '%')->count() }} found</h1>
@ -23,6 +24,7 @@
<button class="greybutton" type="submit">Search</button>
</p>
</form>
</div>
<br>
<div id="SearchContainer">
@foreach ($users as $user)