From f843fa9eb586c396eff3f4860a1845d4eb06e33b Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Thu, 15 Sep 2022 05:29:46 +1000 Subject: [PATCH] avatar.blade.php --- app/Http/Controllers/PageController.php | 5 + public/css/app.css | 137 ++++++++++++++++++------ resources/views/layouts/app.blade.php | 2 +- resources/views/pages/avatar.blade.php | 55 ++++++++++ resources/views/pages/catalog.blade.php | 2 +- routes/web.php | 3 + 6 files changed, 169 insertions(+), 35 deletions(-) create mode 100644 resources/views/pages/avatar.blade.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index e82c0e1..067e815 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -125,4 +125,9 @@ class PageController extends Controller { return view('pages.gamepage'); } + + public function avatar() + { + return view('pages.avatar'); + } } diff --git a/public/css/app.css b/public/css/app.css index d9d1f8a..e0a64a6 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -160,7 +160,10 @@ font-size: 9px; } } -.popupcontainer, .popupcontainer_studio, .popupcontainer_client { + +.popupcontainer, +.popupcontainer_studio, +.popupcontainer_client { top: 0%; position: fixed; background-color: rgba(0, 0, 0, 0.5); @@ -180,6 +183,7 @@ background-repeat: no-repeat; height: 266px; } + .gamethumbnail_small { background-color: black; background-position-x: center; @@ -200,14 +204,14 @@ .PageTitleBar { display: -webkit-box; -display: -webkit-flex; -display: -ms-flexbox; -display: flex; - width: 100%; - align-items: center; - align-content: center; - justify-content: space-between; - flex-wrap: nowrap; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + width: 100%; + align-items: center; + align-content: center; + justify-content: space-between; + flex-wrap: nowrap; } .popup { @@ -352,7 +356,7 @@ div.mySubmenuFixed { } #HeaderSignUp { - font-family: Arial, 'Helvetica Neue', Helvetica, Sans-Serif; + font-family: Arial, 'Helvetica Neue', Helvetica, Sans-Serif; font-weight: bold; color: #fff; font-size: 13px; @@ -362,7 +366,7 @@ div.mySubmenuFixed { } #HeaderOr { - font-family: Arial, 'Helvetica Neue', Helvetica, Sans-Serif; + font-family: Arial, 'Helvetica Neue', Helvetica, Sans-Serif; font-weight: normal; color: #9Ec3E7; font-size: 13px; @@ -394,13 +398,14 @@ div.mySubmenuFixed { 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; font-size: 13px; padding: 0; text-decoration: none; outline: none; - font-family: Arial, 'Helvetica Neue', Helvetica, Sans-Serif; + font-family: Arial, 'Helvetica Neue', Helvetica, Sans-Serif; text-shadow: #11111191 1px 1px 1px; } @@ -521,13 +526,14 @@ iframe { width: 50%; } -.leftgamecontainer { +.leftgamecontainer { text-align: center; padding-left: 5px; padding-right: 5px; width: inherit; } -.rightgamecontainer { + +.rightgamecontainer { text-align: right; padding-left: 5px; padding-right: 5px; @@ -592,7 +598,7 @@ iframe { text-decoration: none; font-weight: 800; outline: none; - font-family: Arial, 'Helvetica Neue', Helvetica, Sans-Serif; + font-family: Arial, 'Helvetica Neue', Helvetica, Sans-Serif; } .smallnavbarbutton { @@ -666,7 +672,7 @@ body { color: black; min-height: 100%; padding: 5px 5px 25px 5px; - /* Height of the footer */ + /* Height of the footer */ margin: 100px auto 0 auto; width: 970px; background: rgb(255, 255, 255); @@ -684,7 +690,11 @@ body { background-color: rgb(255, 255, 255); } -.content_signup h1, .content_signup a, .content_signup p, .content_signup h2, .content_signup h5 { +.content_signup h1, +.content_signup a, +.content_signup p, +.content_signup h2, +.content_signup h5 { text-align: center; } @@ -705,16 +715,28 @@ body { color: black; } -.content_signup a, .content_signup p a { +.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 { + +#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 { + +.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; text-align: center; @@ -833,7 +855,9 @@ button:hover.greenbutton { /*-------------*/ -.btn-large, .btn-medium, .btn-small { +.btn-large, +.btn-medium, +.btn-small { margin: 0px; display: inline-block; zoom: 1; @@ -846,6 +870,7 @@ button:hover.greenbutton { *display: inline; *vertical-align: top; } + .btn-small { padding: 1px 7px 0px 7px; height: 20px; @@ -855,9 +880,11 @@ button:hover.greenbutton { background-position: left -160px; border-radius: 0; } + .btn-small:hover { background-position: left -181px; } + .btn-medium { padding: 1px 13px 3px 13px; height: 28px; @@ -866,9 +893,11 @@ button:hover.greenbutton { background-position: left -96px; border-radius: 0; } + .btn-medium:hover { background-position: left -128px; } + .btn-large { padding: 9px 13px 0px 13px; height: 39px; @@ -878,47 +907,75 @@ button:hover.greenbutton { 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 { + +.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 { +.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 { + +.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 { +.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 { + +.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 { +.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 { + +.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; @@ -943,6 +1000,15 @@ button:hover.greenbutton { color: #555; } +#ColorChooser { + height: 240px; + width: 194px; + text-align: center; + margin-left: auto; + margin-right: auto; + margin-top: 21px; +} + p, h1, h2, @@ -996,11 +1062,14 @@ a, overflow: visible; width: 100%; } -div#testingSitePanelWrapper, #BodyWrapper { + +div#testingSitePanelWrapper, +#BodyWrapper { margin: 0 auto; width: 970px; background: white; } + #Body { _overflow: hidden; min-height: 550px; @@ -1011,12 +1080,14 @@ div#testingSitePanelWrapper, #BodyWrapper { } .hidden { - visibility: hidden!important; - display: none!important; + visibility: hidden !important; + display: none !important; } @media (max-width:980px) { - .content_signup, #footer_signup { + + .content_signup, + #footer_signup { width: 100%; } } \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f20bedd..c0c1859 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -137,7 +137,7 @@ ({{ count(Auth::user()->getFriendRequests()) }}) @endif - Avatar + Avatar Users Messages @if (!Auth::guest() && App\Models\Message::where(['sendto_id' => Auth::id(), 'read' => false])->count()) diff --git a/resources/views/pages/avatar.blade.php b/resources/views/pages/avatar.blade.php new file mode 100644 index 0000000..dd3079c --- /dev/null +++ b/resources/views/pages/avatar.blade.php @@ -0,0 +1,55 @@ +@extends('layouts.app') +@section('title') + Avatar - {{ env('APP_NAME') }} +@endsection +@section('titlediscord') + +@endsection +@section('descdiscord') + +@endsection + +@section('alert') +
Avatar Editor is currently work in progress.
+@endsection + +@section('content') +

Avatar Editor

+
+
+
+ avatar image +

Avatar not updating? Click here to update it!

+
+

Body Colors

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ +
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/pages/catalog.blade.php b/resources/views/pages/catalog.blade.php index a8c53de..e8fa988 100644 --- a/resources/views/pages/catalog.blade.php +++ b/resources/views/pages/catalog.blade.php @@ -28,7 +28,7 @@
-

Item Name

+

ARCHBLOX Visor

10
diff --git a/routes/web.php b/routes/web.php index 459362a..bbe48b7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -38,6 +38,9 @@ Route::middleware(['auth'])->group(function () { // catalog Route::get('/catalog', [App\Http\Controllers\PageController::class, 'catalog'])->name('catalog'); + // avatar + Route::get('/my/avatar', [App\Http\Controllers\PageController::class, 'avatar'])->name('avatar'); + // games & game page Route::get('/games', [App\Http\Controllers\PageController::class, 'games'])->name('games'); Route::get('/games/1', [App\Http\Controllers\PageController::class, 'gamepage'])->name('gamepage');