From be54ebf8fbfd9e643bb3dcedae98588900398595 Mon Sep 17 00:00:00 2001 From: BrettonYe Date: Wed, 31 Jul 2024 22:53:51 +0800 Subject: [PATCH] Minor Changes --- app/Http/Controllers/UserController.php | 4 +- resources/views/admin/article/index.blade.php | 2 +- resources/views/admin/config/common.blade.php | 30 +++++---- .../views/admin/logs/notification.blade.php | 4 +- .../admin/logs/onlineIPMonitor.blade.php | 2 +- .../views/admin/logs/userOnlineIP.blade.php | 2 +- resources/views/admin/node/info.blade.php | 2 +- .../views/admin/report/accounting.blade.php | 2 +- .../admin/report/nodeDataAnalysis.blade.php | 66 +++++++------------ .../admin/report/siteDataAnalysis.blade.php | 4 +- resources/views/admin/ticket/index.blade.php | 10 +-- resources/views/admin/ticket/reply.blade.php | 2 +- resources/views/auth/activeUser.blade.php | 2 +- resources/views/auth/login.blade.php | 4 +- resources/views/auth/maintenance.blade.php | 4 +- resources/views/auth/register.blade.php | 12 ++-- resources/views/auth/reset.blade.php | 2 +- resources/views/auth/resetPassword.blade.php | 2 +- resources/views/user/buy.blade.php | 1 - resources/views/user/index.blade.php | 8 +-- resources/views/user/invoiceDetail.blade.php | 2 +- resources/views/user/profile.blade.php | 2 +- resources/views/user/replyTicket.blade.php | 2 +- resources/views/user/services.blade.php | 2 +- resources/views/user/ticketList.blade.php | 6 +- 25 files changed, 80 insertions(+), 99 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 969aa7eb..d345f5ea 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -306,7 +306,7 @@ class UserController extends Controller if (empty($title) || empty($content)) { return Response::json([ - 'status' => 'fail', 'message' => trans('validation.required', ['attribute' => trans('validation.attributes.title').'&'.trans('validation.attributes.content')]), + 'status' => 'fail', 'message' => trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.title')).'&'.ucfirst(trans('validation.attributes.content'))]), ]); } @@ -332,7 +332,7 @@ class UserController extends Controller if (empty($content)) { return Response::json([ - 'status' => 'fail', 'message' => trans('validation.required', ['attribute' => trans('validation.attributes.title').'&'.trans('validation.attributes.content')]), + 'status' => 'fail', 'message' => trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.title')).'&'.ucfirst(trans('validation.attributes.content'))]), ]); } diff --git a/resources/views/admin/article/index.blade.php b/resources/views/admin/article/index.blade.php index b6edf2fa..07910a73 100644 --- a/resources/views/admin/article/index.blade.php +++ b/resources/views/admin/article/index.blade.php @@ -54,7 +54,7 @@ # {{ trans('model.common.type') }} {{ trans('model.article.category') }} - {{ trans('validation.attributes.title') }} + {{ ucfirst(trans('validation.attributes.title')) }} {{ trans('model.article.language') }} {{ trans('model.common.sort') }} {{ trans('model.article.created_at') }} diff --git a/resources/views/admin/config/common.blade.php b/resources/views/admin/config/common.blade.php index 9887321c..5e12269e 100644 --- a/resources/views/admin/config/common.blade.php +++ b/resources/views/admin/config/common.blade.php @@ -40,7 +40,7 @@ - + @@ -74,7 +74,7 @@
{{ trans('validation.attributes.name') }} {{ ucfirst(trans('validation.attributes.name')) }} {{ trans('common.action') }}
- + @@ -108,7 +108,7 @@
{{ trans('validation.attributes.name') }} {{ ucfirst(trans('validation.attributes.name')) }} {{ trans('common.action') }}
- + @@ -143,7 +143,7 @@ - + @@ -179,7 +179,7 @@
{{ trans('validation.attributes.name') }} {{ ucfirst(trans('validation.attributes.name')) }} {{ trans('common.action') }}
{{ trans('model.common.level') }} {{ trans('validation.attributes.name') }} {{ ucfirst(trans('validation.attributes.name')) }} {{ trans('common.action') }}
- + @@ -256,7 +256,7 @@
{{ trans('validation.attributes.name') }} {{ ucfirst(trans('validation.attributes.name')) }} {{ trans('model.common.sort') }} {{ trans('common.action') }}
- + @@ -314,7 +314,8 @@
- +
@@ -343,7 +344,7 @@
+ placeholder="{{ ucfirst(trans('validation.attributes.name')) }}">
@@ -369,7 +370,7 @@
+ placeholder="{{ ucfirst(trans('validation.attributes.name')) }}">
@@ -427,7 +428,8 @@
- +
@@ -457,7 +459,7 @@ } if (level_name.trim() === '') { - $('#level_msg').show().html('{{ trans('validation.required', ['attribute' => trans('validation.attributes.name')]) }}'); + $('#level_msg').show().html('{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.name'))]) }}'); $('#level_name').focus(); return false; } @@ -595,7 +597,7 @@ const sort = $('#add_category_sort').val(); if (name.trim() === '') { - $('#category_msg').show().html('{{ trans('validation.required', ['attribute' => trans('validation.attributes.name')]) }}'); + $('#category_msg').show().html('{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.name'))]) }}'); $('#category_name').focus(); return false; } @@ -882,7 +884,7 @@ const type = $('#type').val(); if (name.trim() === '') { - $('#msg').show().html('{{ trans('validation.required', ['attribute' => trans('validation.attributes.name')]) }}'); + $('#msg').show().html('{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.name'))]) }}'); $('#name').focus(); return false; } @@ -1019,7 +1021,7 @@ const sort = $('#add_label_sort').val(); if (name.trim() === '') { - $('#lable_msg').show().html('{{ trans('validation.required', ['attribute' => trans('validation.attributes.name')]) }}'); + $('#lable_msg').show().html('{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.name'))]) }}'); return false; } diff --git a/resources/views/admin/logs/notification.blade.php b/resources/views/admin/logs/notification.blade.php index 35f4bcca..eae360c1 100644 --- a/resources/views/admin/logs/notification.blade.php +++ b/resources/views/admin/logs/notification.blade.php @@ -30,8 +30,8 @@
- - + + diff --git a/resources/views/admin/logs/onlineIPMonitor.blade.php b/resources/views/admin/logs/onlineIPMonitor.blade.php index 12d8cc47..e4c2e798 100644 --- a/resources/views/admin/logs/onlineIPMonitor.blade.php +++ b/resources/views/admin/logs/onlineIPMonitor.blade.php @@ -45,7 +45,7 @@ - + diff --git a/resources/views/admin/logs/userOnlineIP.blade.php b/resources/views/admin/logs/userOnlineIP.blade.php index 9fbc197c..ecadd924 100644 --- a/resources/views/admin/logs/userOnlineIP.blade.php +++ b/resources/views/admin/logs/userOnlineIP.blade.php @@ -73,7 +73,7 @@ - + diff --git a/resources/views/admin/node/info.blade.php b/resources/views/admin/node/info.blade.php index 4f02df0d..1ae5ff9a 100644 --- a/resources/views/admin/node/info.blade.php +++ b/resources/views/admin/node/info.blade.php @@ -327,7 +327,7 @@
+ placeholder="{{ ucfirst(trans('validation.attributes.password')) }}">
diff --git a/resources/views/admin/report/accounting.blade.php b/resources/views/admin/report/accounting.blade.php index a7193f33..23fc58ec 100644 --- a/resources/views/admin/report/accounting.blade.php +++ b/resources/views/admin/report/accounting.blade.php @@ -156,7 +156,7 @@ }, plugins: { legend: false, - tooltip: label_callbacks(' {{ trans('validation.attributes.year') }}') + tooltip: label_callbacks(' {{ ucfirst(trans('validation.attributes.year')) }}') }, }, }); diff --git a/resources/views/admin/report/nodeDataAnalysis.blade.php b/resources/views/admin/report/nodeDataAnalysis.blade.php index 7b3a3fa0..7da05d14 100644 --- a/resources/views/admin/report/nodeDataAnalysis.blade.php +++ b/resources/views/admin/report/nodeDataAnalysis.blade.php @@ -44,34 +44,24 @@ @isset($data) -
+
-
-
-
-
{{ trans('admin.report.hourly_traffic') }}
-
-
+
+
{{ trans('admin.report.hourly_traffic') }}
-
-
-
-
{{ trans('admin.report.daily_distribution') }}
-
+
+
{{ trans('admin.report.daily_distribution') }}
+
+
-
-
-
-
-
{{ trans('admin.report.daily_traffic') }}
-
-
+
+
{{ trans('admin.report.daily_traffic') }}
@@ -94,13 +84,15 @@ window.location.href = window.location.href.split('?')[0]; } - function initDatepicker() { - $('.input-daterange').datepicker({ - format: 'yyyy-mm-dd', - startDate: nodeData.start_date, - endDate: new Date(), - }); - } + $('.input-daterange').datepicker({ + format: 'yyyy-mm-dd', + startDate: nodeData.start_date, + endDate: new Date(), + }); + + $('form').on('submit', function() { + cleanSubmit(this); + }); function cleanSubmit(form) { $(form).find('input:not([type="submit"]), select').filter(function() { @@ -112,18 +104,6 @@ }, 0); } - function handleFormSubmit() { - $('form').on('submit', function() { - cleanSubmit(this); - }); - } - - function initSelectors() { - $('#nodes').selectpicker('val', @json(Request::query('nodes'))); - $('#hour_date').selectpicker('val', @json(Request::query('hour_date'))); - $('.input-daterange').datepicker('update', @json(Request::query('start')), @json(Request::query('end'))); - } - function optimizeDatasets(datasets) { const dataByDate = datasets.reduce((acc, dataset) => { dataset.data.forEach(item => { @@ -281,7 +261,7 @@ top, left } = chartArea; - const text = `${date}\n\n${total.toFixed(2)} GiB`; + const text = `${date}\n${total.toFixed(2)} GiB`; ctx.save(); ctx.font = 'bold 32px Roboto'; ctx.fillStyle = 'black'; @@ -326,7 +306,7 @@ const total = context.dataset.data.reduce((sum, val) => sum + val, 0); const percentage = (value / total * 100).toFixed(1); const label = context.chart.data.labels[context.dataIndex]; - return percentage > 1 ? `${label} ${value.toFixed(2)}G ${percentage}%` : ''; + return percentage > 1 ? `${label} ${percentage}%` : ''; }, anchor: "center", rotation: function(ctx) { @@ -370,9 +350,9 @@ } $(document).ready(function() { - initDatepicker(); - handleFormSubmit(); - initSelectors(); + $('#nodes').selectpicker('val', @json(Request::query('nodes'))); + $('#hour_date').selectpicker('val', @json(Request::query('hour_date'))); + $('.input-daterange').datepicker('update', @json(Request::query('start')), @json(Request::query('end'))); initCharts(); }); diff --git a/resources/views/admin/report/siteDataAnalysis.blade.php b/resources/views/admin/report/siteDataAnalysis.blade.php index 75c21fa3..b5500a32 100644 --- a/resources/views/admin/report/siteDataAnalysis.blade.php +++ b/resources/views/admin/report/siteDataAnalysis.blade.php @@ -185,7 +185,7 @@ ], common_options()); create_chart('years', 'line', yearlyFlowsLabels, [ - create_area_dataset('{{ trans('validation.attributes.year') }}', yearlyFlowsData, 'rgba(184, 215, 255)'), + create_area_dataset('{{ ucfirst(trans('validation.attributes.year')) }}', yearlyFlowsData, 'rgba(184, 215, 255)'), ], { responsive: true, scales: { @@ -203,7 +203,7 @@ }, plugins: { legend: false, - tooltip: label_callbacks(' {{ trans('validation.attributes.year') }}', ' TiB'), + tooltip: label_callbacks(' {{ ucfirst(trans('validation.attributes.year')) }}', ' TiB'), }, }); diff --git a/resources/views/admin/ticket/index.blade.php b/resources/views/admin/ticket/index.blade.php index 6ec0b853..27ed6b7a 100644 --- a/resources/views/admin/ticket/index.blade.php +++ b/resources/views/admin/ticket/index.blade.php @@ -30,7 +30,7 @@
- + @@ -112,10 +112,10 @@
- +
- +
@@ -147,7 +147,7 @@ if (title.trim() === '') { swal.fire({ - title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.title')]) }}', + title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.title')])) }}', icon: 'warning', }); return false; @@ -155,7 +155,7 @@ if (content.trim() === '') { swal.fire({ - title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.content')]) }}', + title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.content')])) }}', icon: 'warning', }); return false; diff --git a/resources/views/admin/ticket/reply.blade.php b/resources/views/admin/ticket/reply.blade.php index 26c639ef..6cf472f0 100644 --- a/resources/views/admin/ticket/reply.blade.php +++ b/resources/views/admin/ticket/reply.blade.php @@ -206,7 +206,7 @@ if (content.trim() === '') { swal.fire({ - title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.content')]) }}!', + title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.content')])) }}!', icon: 'warning', timer: 1500, }); diff --git a/resources/views/auth/activeUser.blade.php b/resources/views/auth/activeUser.blade.php index 55261a7e..471d33bf 100644 --- a/resources/views/auth/activeUser.blade.php +++ b/resources/views/auth/activeUser.blade.php @@ -16,7 +16,7 @@
@else diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index d85aadc9..7f9da561 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -12,12 +12,12 @@
- +
@yield('captcha', view('auth.captcha'))
diff --git a/resources/views/auth/maintenance.blade.php b/resources/views/auth/maintenance.blade.php index 95ffe4a6..d83bcde3 100644 --- a/resources/views/auth/maintenance.blade.php +++ b/resources/views/auth/maintenance.blade.php @@ -27,8 +27,8 @@ const countdownElement = document.getElementById('countdown'); const daysLabel = '{{ trans_choice('common.days.attribute', 1) }}'; const hoursLabel = '{{ trans_choice('common.hour', 1) }}'; - const minutesLabel = '{{ trans('validation.attributes.minute') }}'; - const secondsLabel = '{{ trans('validation.attributes.second') }}'; + const minutesLabel = '{{ ucfirst(trans('validation.attributes.minute')) }}'; + const secondsLabel = '{{ ucfirst(trans('validation.attributes.second')) }}'; const updateCountdown = () => { const distance = countDownDate - new Date().getTime(); diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 7e60b848..686caa93 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -21,7 +21,7 @@ @if ($emailList)
- +
@
@@ -35,7 +35,7 @@ @else @endif
@@ -54,11 +54,11 @@ @endif
- +
- +
@if (sysConfig('is_invite_register'))
@@ -169,7 +169,7 @@ const emailTail = $('#emailTail').val(); if (email === '') { swal.fire({ - title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.email')]) }}', + title: '{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.email'))]) }}', icon: 'warning', timer: 1500, }); @@ -191,7 +191,7 @@ if (email === '') { swal.fire({ - title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.email')]) }}', + title: '{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.email'))]) }}', icon: 'warning', timer: 1500, }); diff --git a/resources/views/auth/reset.blade.php b/resources/views/auth/reset.blade.php index c9fa0fc7..a545c150 100644 --- a/resources/views/auth/reset.blade.php +++ b/resources/views/auth/reset.blade.php @@ -18,7 +18,7 @@
- +
@endif {{ trans('common.back') }} diff --git a/resources/views/auth/resetPassword.blade.php b/resources/views/auth/resetPassword.blade.php index c336d064..4a3d4c7c 100644 --- a/resources/views/auth/resetPassword.blade.php +++ b/resources/views/auth/resetPassword.blade.php @@ -16,7 +16,7 @@
@else diff --git a/resources/views/user/buy.blade.php b/resources/views/user/buy.blade.php index b45d3170..ff6eed88 100644 --- a/resources/views/user/buy.blade.php +++ b/resources/views/user/buy.blade.php @@ -102,7 +102,6 @@ discount.toFixed(2); total_price = goods_price - discount; } else { - console.log(ret.data.value); total_price = goods_price - ret.data.value.match(/(.*?[^0-9])(\d+\.?.*)/)[2]; total_price = total_price > 0 ? total_price : 0; if (ret.data.type === 1) { diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php index 5725b217..d34b37ce 100644 --- a/resources/views/user/index.blade.php +++ b/resources/views/user/index.blade.php @@ -26,7 +26,7 @@
@if (!$paying_user)

{{ trans('common.more') }} - {{ trans('validation.attributes.time') }} + {{ ucfirst(trans('validation.attributes.time')) }}

{{ trans('common.more') }} {{ trans('user.attribute.data') }} @@ -283,7 +283,7 @@

  • {{ trans('validation.attributes.month') }} + aria-selected="true">{{ ucfirst(trans('validation.attributes.month')) }}
    • @@ -487,10 +487,10 @@ string += hour + ' ' + @json(trans_choice('common.hour', 1)); } if (minute) { - string += ' ' + minute + ' ' + @json(trans('validation.attributes.minute')); + string += ' ' + minute + ' ' + @json(ucfirst(trans('validation.attributes.minute'))); } if (seconds) { - string += ' ' + Math.floor((distance % 60000) / 1000) + ' ' + @json(trans('validation.attributes.second')); + string += ' ' + Math.floor((distance % 60000) / 1000) + ' ' + @json(ucfirst(trans('validation.attributes.second'))); } document.getElementById(id).innerHTML = string; diff --git a/resources/views/user/invoiceDetail.blade.php b/resources/views/user/invoiceDetail.blade.php index c31ffa86..fd1de413 100644 --- a/resources/views/user/invoiceDetail.blade.php +++ b/resources/views/user/invoiceDetail.blade.php @@ -52,7 +52,7 @@
    @if ($order->goods->type === 2) {{ $order->goods->traffic_label }} - {{ trans('user.attribute.data') }}/{{ trans('validation.attributes.month') }} + {{ trans('user.attribute.data') }}/{{ ucfirst(trans('validation.attributes.month')) }} @else {{ $order->goods->traffic_label }} {{ trans('user.attribute.data') }}/ diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index 31636886..1e422b24 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -85,7 +85,7 @@
    - + @@ -139,7 +139,7 @@ if (title.trim() === '') { swal.fire({ - title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.title')]) }}!', + title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.title')])) }}!', icon: 'warning', }); return false; @@ -147,7 +147,7 @@ if (content.trim() === '') { swal.fire({ - title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.content')]) }}!', + title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.content')])) }}!', icon: 'warning', }); return false;
    {{ trans('validation.attributes.name') }} {{ ucfirst(trans('validation.attributes.name')) }} {{ trans('admin.setting.common.connect_nodes') }} {{ trans('model.common.sort') }} {{ trans('common.action') }} # {{ trans('model.common.type') }} {{ trans('model.notification.address') }} {{ trans('validation.attributes.title') }} {{ trans('validation.attributes.content') }} {{ ucfirst(trans('validation.attributes.title')) }} {{ ucfirst(trans('validation.attributes.content')) }} {{ trans('model.notification.created_at') }} {{ trans('model.notification.status') }}
    {{ trans('common.account') }} IP {{ trans('model.ip.info') }} {{ trans('validation.attributes.time') }} {{ ucfirst(trans('validation.attributes.time')) }}
    {{ trans('model.node.attribute') }} {{ trans('model.ip.network_type') }} IP {{ trans('validation.attributes.time') }} {{ ucfirst(trans('validation.attributes.time')) }}
    # {{ trans('model.user.username') }} {{ trans('validation.attributes.title') }} {{ ucfirst(trans('validation.attributes.title')) }} {{ trans('common.status.attribute') }} {{ trans('common.action') }}
    # {{ trans('validation.attributes.title') }} {{ ucfirst(trans('validation.attributes.title')) }} {{ trans('common.status.attribute') }}