diff --git a/web/.env.example b/web/.env.example index 56b0c19..c98b2d1 100644 --- a/web/.env.example +++ b/web/.env.example @@ -5,6 +5,9 @@ APP_DEBUG=true APP_URL=http://gtoria.net MIX_APP_URL=http://gtoria.net +GAMESERVER_IP=127.0.0.1 +THUMBNAILER_IP=127.0.0.1 + LOG_CHANNEL=stack LOG_DEPRECATIONS_CHANNEL=null LOG_LEVEL=debug diff --git a/web/app/Http/Controllers/Web/SettingsController.php b/web/app/Http/Controllers/Web/SettingsController.php new file mode 100644 index 0000000..b8d7deb --- /dev/null +++ b/web/app/Http/Controllers/Web/SettingsController.php @@ -0,0 +1,14 @@ + env('GAMESERVER_IP'), + + 'thumbnailer_ip' => env('THUMBNAILER_IP'), + +]; diff --git a/web/resources/sass/Graphictoria.scss b/web/resources/sass/Graphictoria.scss index cad5cb6..4cc8710 100644 --- a/web/resources/sass/Graphictoria.scss +++ b/web/resources/sass/Graphictoria.scss @@ -36,6 +36,11 @@ img.twemoji { // Shop +.graphictoria-item-page { + max-width: 1096px; + margin: 0 auto 0 auto; +} + .graphictoria-list-dropdown::after { @include caret-down(); @@ -145,7 +150,9 @@ img.twemoji { } .modal-content { - background-color: #222 !important; + html.gtoria-dark & { + background-color: #222 !important; + } } .float-right { @@ -959,6 +966,37 @@ input { // Containers +@media (min-width: 768px) { + .container-small { + width: 300px; + } + .container-large { + width: 970px; + } +} + +@media (min-width: 992px) { + .container-small { + width: 500px; + } + .container-large { + width: 1170px; + } +} + +@media (min-width: 1200px) { + .container-small { + width: 700px; + } + .container-large { + width: 1500px; + } +} + +.container-small, .container-large { + max-width: 100%; +} + a.list-group-item { &-success { &.active { diff --git a/web/resources/views/web/shop/asset.blade.php b/web/resources/views/web/shop/asset.blade.php index f91998f..b1c4208 100644 --- a/web/resources/views/web/shop/asset.blade.php +++ b/web/resources/views/web/shop/asset.blade.php @@ -6,68 +6,114 @@ @endsection @section('content') -
+{{-- XlXi: MOVE THESE TO JS --}} +@if(false) + + +@endif + +
@if(!$asset->approved)
This asset is pending approval. It will not appear in-game and cannot be voted on or purchased at this time.
@endif -
-
-
-
- {{ $asset->name }} -
-
-

{{ $asset->name }}

- {{-- TODO: XlXi: url to user's profile --}} -

By {{ $asset->user->username }}

-
- {{-- TODO: XlXi: limiteds/trading --}} -
-
-

Price

-
-
- @if( $asset->onSale ) -

- {{ \App\Helpers\NumberHelper::Abbreviate(Auth::user()->tokens) }}

- - @endif - @php - $buttonText = 'Buy'; - $buttonClass = 'success'; - - // TODO: XlXi: Owned items - if(!$asset->onSale) { - $buttonText = 'Offsale'; - $buttonClass = 'secondary'; - } - @endphp - -
+
+
+
+
+
+ {{ $asset->name }}
-
-
-

Type

+
+

{{ $asset->name }}

+ {{-- TODO: XlXi: url to user's profile --}} +

By {{ $asset->user->username }}

+
+ {{-- TODO: XlXi: limiteds/trading --}} +
+
+

Price

+
+
+ @if( $asset->onSale ) +

+ {{ number_format($asset->priceInTokens) }}

+ + @endif + @auth + @php + $buttonText = 'Buy'; + $buttonClass = 'success'; + + // TODO: XlXi: Owned items + if(!$asset->onSale) { + $buttonText = 'Offsale'; + $buttonClass = 'secondary'; + } + @endphp + + @endauth +
-
-

{{ $asset->typeString() }}

+
+
+

Type

+
+
+

{{ $asset->typeString() }}

+
-
-
-
-

Description

-
-
- @if ( $asset->description ) -

{{ $asset->description }}

- @else -

This item has no description.

- @endif +
+
+

Description

+
+
+ @if ( $asset->description ) +

{{ $asset->description }}

+ @else +

This item has no description.

+ @endif +
+
@endsection \ No newline at end of file diff --git a/web/resources/views/web/user/settings.blade.php b/web/resources/views/web/user/settings.blade.php new file mode 100644 index 0000000..fe720ed --- /dev/null +++ b/web/resources/views/web/user/settings.blade.php @@ -0,0 +1,13 @@ +@extends('layouts.app') + +@section('title', 'Settings') + +@section('page-specific') +@endsection + +@section('content') +
+

Settings

+ +
+@endsection \ No newline at end of file diff --git a/web/routes/web.php b/web/routes/web.php index 6e765ec..38520b8 100644 --- a/web/routes/web.php +++ b/web/routes/web.php @@ -12,6 +12,12 @@ Route::group(['as' => 'shop.', 'prefix' => 'shop'], function() { Route::get('/{asset}/{assetName:slug?}', 'ShopController@showAsset')->name('asset'); }); +Route::middleware('auth')->group(function () { + Route::group(['as' => 'user.', 'prefix' => 'my'], function() { + Route::get('/settings', 'SettingsController@index')->name('index'); + }); +}); + Route::group(['as' => 'auth.', 'namespace' => 'Auth'], function() { Route::group(['as' => 'protection.', 'prefix' => 'request-blocked'], function() { Route::get('/', 'DoubleSessionBlockController@index')->name('index');