WildEgo/web
1
0
Fork 0
forked from metin2/web
Code Pull Requests Activity

Shop improvements, renamed "shop" to "mall", support for Argon2ID

Browse Source
This commit is contained in:
Exynox
2024-06-02 22:09:52 +03:00
parent 83f4f72b6e
commit 63d0d2ac79
1932 changed files with 729 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@
})
</script>
@vite(['resources/sass/app.scss', 'resources/js/app.js'])
@vite(['resources/css/app.css', 'resources/js/app.js'])
</head>
<body>
@ -250,7 +250,7 @@
<div class="modul-box-bg">
<div class="modul-box-bg-bottom">
<h3>{{ __('app/main.nav.itemshop') }}</h3>
<a href="{{ url('shop') }}" class="itemshop btn itemshop-btn iframe" title="{{ __('app/main.nav.itemshop') }}"></a>
<a href="{{ route('mall') }}" class="itemshop btn itemshop-btn iframe" title="{{ __('app/main.nav.itemshop') }}"></a>
</div>
</div>
</div>

64
resources/views/layouts/shop.blade.php → resources/views/layouts/mall.blade.php
View File

@ -4,19 +4,19 @@
<meta charset="utf-8" />
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title>{{ __('shop/main.title') }}</title>
<link href="{{ asset('assets/shop/css/style.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/start.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/options.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/discount.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/tiptip.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/fancybox.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/jScrollPane.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/promoted.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/pending.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/usermenu.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/purchase.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/shop/css/wheel.css') }}" rel="stylesheet" type="text/css" />
<title>{{ __('mall/main.title') }}</title>
<link href="{{ asset('assets/mall/css/style.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/start.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/options.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/discount.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/tiptip.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/fancybox.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/jScrollPane.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/promoted.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/pending.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/usermenu.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/purchase.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/mall/css/wheel.css') }}" rel="stylesheet" type="text/css" />
<!--[if IE]>
<style type="text/css">@import url(https://gf1.geo.gfsrv.net/cdn9a/6ea1bf4927ebc189a9ad0a0e2d7140.css);</style>
<style type="text/css">@import url(https://gf1.geo.gfsrv.net/cdn3e/8a0cdb2c5a2e9c5af58e1dcdee50e7.css);</style>
@ -45,7 +45,7 @@
/* <![CDATA[ */
function searchFocusGained()
{
if (trim(document.searchForm.searchString.value) === '{{ __('shop/main.nav.search_placeholder') }}')
if (trim(document.searchForm.searchString.value) === '{{ __('mall/main.nav.search_placeholder') }}')
{
document.searchForm.searchString.value = '';
}
@ -55,7 +55,7 @@
{
if (trim(document.searchForm.searchString.value) === '')
{
document.searchForm.searchString.value = '{{ __('shop/main.nav.search_placeholder') }}';
document.searchForm.searchString.value = '{{ __('mall/main.nav.search_placeholder') }}';
}
}
@ -63,7 +63,7 @@
{
searchString = trim(document.searchForm.searchString.value);
return searchString !== '' && searchString !== '{{ __('shop/main.nav.search_placeholder') }}';
return searchString !== '' && searchString !== '{{ __('mall/main.nav.search_placeholder') }}';
}
$(document).ready(function() {
@ -97,27 +97,27 @@
/* ]]> */
</script>
@vite(['resources/sass/app.scss', 'resources/js/app.js'])
@vite(['resources/css/app.css', 'resources/js/app.js'])
</head>
<body class="twoColFixLtHdr" scroll="no" ondblclick="return false;">
<div id="container">
<div id="header">
<div class="boxSigns">
<span class="heading">{{ __('shop/main.currency.mileage_long') }} ({{ __('shop/main.currency.mileage') }}):</span>
<span class="heading">{{ __('mall/main.currency.mileage_long') }} ({{ __('mall/main.currency.mileage') }}):</span>
<span class="marksValue">{{ Auth::user()->mileage }}</span>
<a href="{{ url('shop/faq', ['section' => 'mileage']) }}" class="tip helpSmallIcon" title="{{ __('shop/main.nav.help_tooltip') }}" style="right: 23px;">
<img src="{{ asset('assets/shop/img/helpSmallIcon.png') }}" />
<a href="{{ url('mall/faq', ['section' => 'mileage']) }}" class="tip helpSmallIcon" title="{{ __('mall/main.nav.help_tooltip') }}" style="right: 23px;">
<img src="{{ asset('assets/mall/img/helpSmallIcon.png') }}" />
</a>
</div>
<div class="boxCoins">
<span class="heading">{{ __('shop/main.currency.cash_long') }} ({{ __('shop/main.currency.cash') }}):</span>
<span class="heading">{{ __('mall/main.currency.cash_long') }} ({{ __('mall/main.currency.cash') }}):</span>
<span class="coinsValue">{{ Auth::user()->cash }}</span>
<a href="{{ url('shop/faq', ['section' => 'cash']) }}" class="tip helpSmallIcon" title="{{ __('shop/main.nav.help_tooltip') }}" style="right: 7px;">
<img src="{{ asset('assets/shop/img/helpSmallIcon.png') }}" />
<a href="{{ url('mall/faq', ['section' => 'cash']) }}" class="tip helpSmallIcon" title="{{ __('mall/main.nav.help_tooltip') }}" style="right: 7px;">
<img src="{{ asset('assets/mall/img/helpSmallIcon.png') }}" />
</a>
<a href="{{ url('shop/faq', ['section' => 'donate']) }}" class="purchaseButton" title="{{ __('shop/main.nav.buy_coins_tooltip') }}">
{!! nl2br(__('shop/main.nav.buy_coins_btn')) !!}
<a href="{{ url('mall/faq', ['section' => 'donate']) }}" class="purchaseButton" title="{{ __('mall/main.nav.buy_coins_tooltip') }}">
{!! nl2br(__('mall/main.nav.buy_coins_btn')) !!}
</a>
</div>
</div>
@ -128,9 +128,9 @@
<div class="userdataDiv">
@if ($storageCount > 0)
<a title="{{ __('shop/main.nav.user_data_tooltip') }}" href="{{ url('shop/userdata') }}" class="tip userdataInfoIcon"></a>
<a title="{{ __('mall/main.nav.user_data_tooltip') }}" href="{{ url('mall/userdata') }}" class="tip userdataInfoIcon"></a>
@else
<a title="{{ __('shop/main.nav.user_data_tooltip') }}" href="{{ url('shop/userdata') }}" class="tip userdataIcon"></a>
<a title="{{ __('mall/main.nav.user_data_tooltip') }}" href="{{ url('mall/userdata') }}" class="tip userdataIcon"></a>
@endif
</div>
@ -141,26 +141,26 @@
<div id="arrowBorderRight"></div>
</div>
<span id="discountLong">{{ __('shop/main.nav.stored_items', ['storageCount' => $storageCount]) }}</span>
<span id="discountLong">{{ __('mall/main.nav.stored_items', ['storageCount' => $storageCount]) }}</span>
</div>
@endif
<ul id="breadcrumb">
<li><a href="{{ url('shop') }}">{{ __('shop/main.nav.home') }}</a></li>
<li><a href="{{ route('mall') }}">{{ __('mall/main.nav.home') }}</a></li>
</ul>
<div id="sidebar1">
<div id="search">
<form action="{{ url('shop/search') }}" method="post" name="searchForm" onsubmit="return trySubmit()">
<form action="{{ url('mall/search') }}" method="post" name="searchForm" onsubmit="return trySubmit()">
@csrf
<input type="text" value="{{ __('shop/main.nav.search_placeholder') }}" class="type" name="searchString" onfocus="searchFocusGained()" onblur="searchFocusLost()" maxlength="42" />
<input type="text" value="{{ __('mall/main.nav.search_placeholder') }}" class="type" name="searchString" onfocus="searchFocusGained()" onblur="searchFocusLost()" maxlength="42" />
<input type="submit" value="" class="send" />
</form>
</div>
<ul id="mainMenu">
@foreach ($categories as $category)
<li><a href="{{ url('shop/category', ['id' => $category->id]) }}" title="{{ $category->name }}">{{ $category->name }}</a></li>
<li><a href="{{ url('mall/category', ['id' => $category->id]) }}" title="{{ $category->name }}">{{ $category->name }}</a></li>
@endforeach
</ul>
</div>