From 87e067d49ce97f4fd2403eb449939e467125446b Mon Sep 17 00:00:00 2001 From: BitSec Date: Thu, 30 Sep 2021 05:01:29 +0200 Subject: [PATCH 01/23] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index acea121c..0ee0d65c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 Arno VIsker +Copyright (c) 2021 ControlPanel.gg Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 211319ea98a1af6b3669fe3f86b0b88096239a5a Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 14 Oct 2021 09:01:35 +0200 Subject: [PATCH 02/23] HotFix to change Hard-Coded Server-limit-after-irl-purchase This is absolutely not tested. --- app/Http/Controllers/Admin/PaymentController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 110d2c0d..5b8e3725 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/app/Http/Controllers/Admin/PaymentController.php @@ -141,9 +141,9 @@ class PaymentController extends Controller $user->increment('credits', $paypalProduct->quantity); //update server limit - if (Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE', 10) !== 0) { - if ($user->server_limit < Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE', 10)) { - $user->update(['server_limit' => 10]); + if (Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { + if ($user->server_limit < Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE')) { + $user->update(['server_limit' => Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE')]); } } From b3d73e37862d49aa62391038f23b2726578ba320 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 14 Oct 2021 09:05:59 +0200 Subject: [PATCH 03/23] Reverse Changes. Wrong Commit --- app/Http/Controllers/Admin/PaymentController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 5b8e3725..110d2c0d 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/app/Http/Controllers/Admin/PaymentController.php @@ -141,9 +141,9 @@ class PaymentController extends Controller $user->increment('credits', $paypalProduct->quantity); //update server limit - if (Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { - if ($user->server_limit < Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE')) { - $user->update(['server_limit' => Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE')]); + if (Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE', 10) !== 0) { + if ($user->server_limit < Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE', 10)) { + $user->update(['server_limit' => 10]); } } From 9644fe0fe25ad204833d905c5d8b6c95023809cd Mon Sep 17 00:00:00 2001 From: 1day2die Date: Mon, 6 Dec 2021 17:11:48 +0100 Subject: [PATCH 04/23] first steps --- config/app.php | 2 +- resources/lang/de.json | 25 +++++++++++++++++++ .../views/admin/activitylogs/index.blade.php | 20 +++++++-------- .../admin/configurations/editModel.blade.php | 8 +++--- .../admin/configurations/index.blade.php | 18 ++++++------- 5 files changed, 49 insertions(+), 24 deletions(-) create mode 100644 resources/lang/de.json diff --git a/config/app.php b/config/app.php index 334ff5b2..7ca6180b 100644 --- a/config/app.php +++ b/config/app.php @@ -81,7 +81,7 @@ return [ | */ - 'locale' => 'en', + 'locale' => env('LOCALE', 'en'), /* |-------------------------------------------------------------------------- diff --git a/resources/lang/de.json b/resources/lang/de.json new file mode 100644 index 00000000..6d4e07a1 --- /dev/null +++ b/resources/lang/de.json @@ -0,0 +1,25 @@ +{ + + + "Activity Logs": "Aktivitäts logs", + "No recent activity from cronjobs": "Keine neuen aktivitäten von Cronjobs", + "Check the docs for it here": "Zur Dokumentation", + "Are cronjobs running?": "Sind die Cronjobs gestartet?", + "Causer": "Verursacher", + "Description": "Beschreibung", + "Created at": "Erstellt am", + + "Edit Configuration": "Einstellungen bearbeiten", + "Text Field": "Textfeld", + "Cancel": "Abbrechen", + "Save": "Speichern", + "true": "wahr", + "false": "falsch", + + "Configurations": "Einstellungen", + "Dashboard": "Dashboard", + "Key": "Schlüssel", + "Value": "Wert", + "Type": "Typ" + +} diff --git a/resources/views/admin/activitylogs/index.blade.php b/resources/views/admin/activitylogs/index.blade.php index 978e8c9c..6a49b5a0 100644 --- a/resources/views/admin/activitylogs/index.blade.php +++ b/resources/views/admin/activitylogs/index.blade.php @@ -6,12 +6,12 @@
-

Activity Logs

+

{{ __('Activity Logs')}}

  1. Dashboard
    2. -
  2. Activity Logs +
  3. {{ __('Activity Logs')}}
@@ -32,8 +32,8 @@
@else
-

No recent activity from cronjobs

-

Are cronjobs running? Check the docs for it here

+

{{ __('No recent activity from cronjobs')}}

+

{{ __('Are cronjobs running?')}} {{ __('Check the docs for it here')}}

@endif @@ -42,7 +42,7 @@
-
Activity Logs
+
{{ __('Activity Logs')}}
@@ -63,16 +63,16 @@ - - - + + + @foreach($logs as $log) -
CauserDescriptionCreated At{{ __('Causer') }}{{ __('Description') }}{{ __('Created at') }}
@if($log->causer) {{json_decode($log->causer)->name}} - @else + @if($log->causer) {{json_decode($log->causer)->name}} + @else System @endif diff --git a/resources/views/admin/configurations/editModel.blade.php b/resources/views/admin/configurations/editModel.blade.php index b040c2f0..e2dde89c 100644 --- a/resources/views/admin/configurations/editModel.blade.php +++ b/resources/views/admin/configurations/editModel.blade.php @@ -8,14 +8,14 @@ @method('PATCH')
-

Edit Configuration

+

{{__('Edit Configuration')}}

- +
@@ -32,8 +32,8 @@
- - + +
diff --git a/resources/views/admin/configurations/index.blade.php b/resources/views/admin/configurations/index.blade.php index 2b7297da..e8fc8623 100644 --- a/resources/views/admin/configurations/index.blade.php +++ b/resources/views/admin/configurations/index.blade.php @@ -6,13 +6,13 @@
-

Configurations

+

{{__('Configurations')}}

    -
  1. Dashboard
    2. +
  3. Configurations
    4. + href="{{route('admin.configurations.index')}}">{{__('Configurations')}}
@@ -28,7 +28,7 @@
-
Configurations
+
{{__('Configurations')}}
@@ -37,11 +37,11 @@ - - - - - + + + + + From 24ee173326f7b70da8626fb4462f3d73ad0444f5 Mon Sep 17 00:00:00 2001 From: 1Day Date: Mon, 13 Dec 2021 08:42:53 +0100 Subject: [PATCH 05/23] saving progress --- resources/lang/de.json | 71 ++++++- resources/views/admin/nests/index.blade.php | 5 + resources/views/admin/nodes/index.blade.php | 5 + .../views/admin/overview/index.blade.php | 6 +- .../views/admin/payments/index.blade.php | 28 +-- .../views/admin/products/create.blade.php | 71 +++---- resources/views/admin/products/edit.blade.php | 192 +++++++++--------- .../views/admin/products/index.blade.php | 38 ++-- resources/views/admin/products/show.blade.php | 40 ++-- resources/views/admin/servers/index.blade.php | 8 +- resources/views/admin/servers/table.blade.php | 12 +- .../views/admin/settings/index.blade.php | 12 +- 12 files changed, 286 insertions(+), 202 deletions(-) diff --git a/resources/lang/de.json b/resources/lang/de.json index 6d4e07a1..952c1364 100644 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -1,6 +1,4 @@ { - - "Activity Logs": "Aktivitäts logs", "No recent activity from cronjobs": "Keine neuen aktivitäten von Cronjobs", "Check the docs for it here": "Zur Dokumentation", @@ -20,6 +18,73 @@ "Dashboard": "Dashboard", "Key": "Schlüssel", "Value": "Wert", - "Type": "Typ" + "Type": "Typ", + + "Admin Overview": "Admin Übersicht", + "Support server": "Discord Server", + "Documentation": "Dokumentation", + "Github": "Github", + "Support ControlPanel": "Unterstütze Controlpanel.gg", + "Servers": "Server", + "Users": "Benutzer", + "Total": "Gesamt", + "Payments": "Zahlungen", + "Pterodactyl": "Pterodactyl", + "Sync": "Sync", + "Resources": "Ressourcen", + "Count": "Anzahl", + "Locations": "Standorte", + "Nodes": "Nodes", + "Nests": "Nests", + "Eggs": "Eggs", + "Last updated :date": "Zuletzt aktualisiert :date", + + "ID": "ID", + "User": "Benutzer", + "Amount": "Anzahl", + "Product Price": "Produktpreis", + "Tax": "Steuer", + "Total Price": "Gesamtpreis", + "Payment_ID": "Zahlungs-ID", + "Payer_ID": "Käufer-ID", + + "Products": "Produkte", + "Create": "Erstellen", + "Product Details": "Produktdetails", + "Product Linking": "Produktbeziehungen", + "Name": "Name", + "Price in": "Preis in ", + "Memory": "Arbeitsspeicher", + "Cpu": "Prozessorleistung", + "Swap": "Swap", + "Disk": "Festplatte", + "Minimum": "Mindest", + "IO": "IO", + "Databases": "Datenbanken", + "Backups": "Backups", + "Allocations": "Port Zuweisungen", + "Disabled": "Deaktiviert", + "Submit": "Abschicken", + "This product will only be available for these nodes": "Dieses Produkt wurd nur für die ausgewählten Nodes verfügbar sein", + "This product will only be available for these eggs": "Dieses Produkt wurd nur für die ausgewählten Eggs verfügbar sein", + "Will hide this option from being selected": "Wird dieses Produkt nicht zum Kauf zur Verfügung stellen", + "Link your products to nodes and eggs to create dynamic pricing for each option": "Verbinde deine Produkte mit Nodes und Eggs um ein dynamisches Preismodell zu erstellen", + "Setting to -1 will use the value from configuration.": "Benutzt den Standard, wenn der Wert auf -1 gesetzt wird", + "This is what the users sees": "Das wird der Benutzer sehen", + "Edit": "Bearbeiten", + + "Price": "Preis", + "Are you sure you wish to delete?": "Sicher, dass du dies löschen möchtest?", + "Create new": "Neu erstellen", + "Show": "Zeige", + "Updated at": "Aktualisiert", + "Suspended at": "Suspendiert", + + "Settings": "Einstellungen", + "Dashboard icons": "Dashboard Icons", + "Select panel icon": "Icon auswählen", + "Select panel favicon": "Favicon auswählen" + + } diff --git a/resources/views/admin/nests/index.blade.php b/resources/views/admin/nests/index.blade.php index e29e822a..f49e9594 100644 --- a/resources/views/admin/nests/index.blade.php +++ b/resources/views/admin/nests/index.blade.php @@ -1,3 +1,8 @@ + + + @extends('layouts.main') @section('content') diff --git a/resources/views/admin/nodes/index.blade.php b/resources/views/admin/nodes/index.blade.php index 70836025..ab87e0ba 100644 --- a/resources/views/admin/nodes/index.blade.php +++ b/resources/views/admin/nodes/index.blade.php @@ -1,3 +1,8 @@ + + + @extends('layouts.main') @section('content') diff --git a/resources/views/admin/overview/index.blade.php b/resources/views/admin/overview/index.blade.php index 0c491a55..8da6292d 100644 --- a/resources/views/admin/overview/index.blade.php +++ b/resources/views/admin/overview/index.blade.php @@ -6,13 +6,13 @@
-

Admin Overview

+

{{__('Admin Overview')}}

    -
  1. Dashboard
    2. +
  2. {{__('Dashboard')}}
  3. Admin Overview
    4. + href="{{route('admin.overview.index')}}">{{__('Admin Overview')}}
diff --git a/resources/views/admin/payments/index.blade.php b/resources/views/admin/payments/index.blade.php index b6765901..7b31fc59 100644 --- a/resources/views/admin/payments/index.blade.php +++ b/resources/views/admin/payments/index.blade.php @@ -6,12 +6,12 @@
-

Payments

+

{{__('Payments')}}

  1. Dashboard
    2. -
  2. Payments +
  3. {{__('Payments')}}
@@ -26,24 +26,24 @@
-
Payments
+
{{__('Payments')}}
KeyValueTypeDescriptionCreated at{{__('Key')}}{{__('Value')}}{{__('Type')}}{{__('Description')}}{{__('Created at')}}
- - - - - - - - - - - + + + + + + + + + + + diff --git a/resources/views/admin/products/create.blade.php b/resources/views/admin/products/create.blade.php index dcb4e8c0..c809a2ef 100644 --- a/resources/views/admin/products/create.blade.php +++ b/resources/views/admin/products/create.blade.php @@ -6,14 +6,15 @@
-

Products

+

{{__('Products')}}

    -
  1. Dashboard
    2. -
  2. Products
    3. +
  3. {{__('Dashboard')}}
    4. +
  4. {{__('Products')}} +
  5. Create + href="{{ route('admin.products.create') }}">{{__('Create')}}
@@ -31,7 +32,7 @@
-
Product Details
+
{{__('Product Details')}}
@@ -39,9 +40,9 @@
-
@@ -49,7 +50,7 @@
- +
- + - +
- +
- +
- + @error('description') -
- {{ $message }} -
+
+ {{ $message }} +
@enderror
- + + class="form-control @error('disk') is-invalid @enderror" + required="required"> @error('disk') -
- {{ $message }} -
+
+ {{ $message }} +
@enderror
- + name="minimum_credits" type="number" + class="form-control @error('minimum_credits') is-invalid @enderror" + required="required"> @error('minimum_credits') -
- {{ $message }} -
+
+ {{ $message }} +
@enderror
- + + class="form-control @error('io') is-invalid @enderror" + required="required"> @error('io') -
- {{ $message }} -
+
+ {{ $message }} +
@enderror
- + + type="number" + class="form-control @error('databases') is-invalid @enderror" + required="required"> @error('databases') -
- {{ $message }} -
+
+ {{ $message }} +
@enderror
- + + type="number" + class="form-control @error('backups') is-invalid @enderror" + required="required"> @error('backups') -
- {{ $message }} -
+
+ {{ $message }} +
@enderror
- + + name="allocations" type="number" + class="form-control @error('allocations') is-invalid @enderror" + required="required"> @error('allocations') -
- {{ $message }} -
+
+ {{ $message }} +
@enderror
@@ -213,7 +219,7 @@
@@ -224,16 +230,16 @@
-
Product Linking +
{{__('Product Linking')}}
- +
IDUserTypeAmountProduct PriceTaxTax(%)Total PricePayment_IDPayer_IDCreated at{{__('ID')}}{{__('User')}}{{__('Type')}}{{__('Amount')}}{{__('Product Price')}}{{__('Tax')}}{{__('Tax')}}(%){{__('Total Price')}}{{__('Payment_ID')}}{{__('Payer_ID')}}{{__('Created at')}}
- - - - - - - - - - - - - + + + + + + + + + + + + + @@ -71,7 +71,7 @@ + + + function setRandomCode() { + let element = document.getElementById('code') + element.value = getRandomCode(36) + } + + function getRandomCode(length) { + let result = ''; + let characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-'; + let charactersLength = characters.length; + for (let i = 0; i < length; i++) { + result += characters.charAt(Math.floor(Math.random() * + charactersLength)); + } + return result; + } + @endsection diff --git a/resources/views/admin/vouchers/edit.blade.php b/resources/views/admin/vouchers/edit.blade.php index 7447f237..df7d945b 100644 --- a/resources/views/admin/vouchers/edit.blade.php +++ b/resources/views/admin/vouchers/edit.blade.php @@ -1,170 +1,193 @@ @extends('layouts.main') @section('content') - -
-
-
-
-

Vouchers

-
-
-
    -
  1. Dashboard
    2. -
  2. Vouchers
    3. -
  3. Edit -
    4. -
+ +
+
+
+
+

{{__('Vouchers')}}

+
+
+
    +
  1. {{__('Dashboard')}}
    2. +
  2. {{__('Vouchers')}} +
    3. +
  3. {{__('Edit')}} +
    4. +
+
-
-
- + + - -
-
+ +
+
-
-
-
-
-
- Voucher details -
-
-
-
- @csrf - @method('PATCH') +
+
+
+
+
+ {{__('Voucher details')}} +
+
+
+ + @csrf + @method('PATCH') -
- - - @error('memo') -
- {{$message}} +
+ + + @error('memo') +
+ {{$message}} +
+ @enderror
- @enderror -
-
- - - @error('credits') -
- {{$message}} +
+ + + @error('credits') +
+ {{$message}} +
+ @enderror
- @enderror -
-
- -
- -
-
@error('code')
{{$message}} -
- @enderror -
- -
- -
- -
-
+ @enderror
- @error('uses') -
- {{$message}} -
- @enderror -
-
- -
- -
-
+
+ +
+ +
+ +
+ @error('uses') +
+ {{$message}} +
+ @enderror
- @error('expires_at') -
- {{$message}} + +
+ +
+ +
+
+
+
+ @error('expires_at') +
+ {{$message}} +
+ @enderror
- @enderror -
-
- -
- +
+ +
+ +
+
- -
-
- +
+ - + + + function setRandomCode() { + let element = document.getElementById('code') + element.value = getRandomCode(36) + } + + function getRandomCode(length) { + let result = ''; + let characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-'; + let charactersLength = characters.length; + for (let i = 0; i < length; i++) { + result += characters.charAt(Math.floor(Math.random() * + charactersLength)); + } + return result; + } + @endsection diff --git a/resources/views/admin/vouchers/index.blade.php b/resources/views/admin/vouchers/index.blade.php index 3b8b604a..ba99e1f3 100644 --- a/resources/views/admin/vouchers/index.blade.php +++ b/resources/views/admin/vouchers/index.blade.php @@ -6,13 +6,13 @@
-

Vouchers

+

{{__('Vouchers')}}

    -
  1. Dashboard
    2. +
  2. {{__('Dashboard')}}
  3. Vouchers
    4. + href="{{route('admin.vouchers.index')}}">{{__('Vouchers')}}
@@ -28,9 +28,9 @@
-
Vouchers
+
{{__('Vouchers')}}
Create new + class="fas fa-plus mr-1">{{__('Create new')}}
@@ -39,12 +39,12 @@
ActiveNamePriceMemoryCpuSwapDiskDatabasesBackupsEggsNodesServersCreated at{{__('Active')}}{{__('Name')}}{{__('Price')}}{{__('Memory')}}{{__('Cpu')}}{{__('Swap')}}{{__('Disk')}}{{__('Databases')}}{{__('Backups')}}{{__('Eggs')}}{{__('Nodes')}}{{__('Servers')}}{{__('Created at')}}
- - - + + + - - + + @@ -64,7 +64,7 @@ @endsection diff --git a/resources/views/store/checkout.blade.php b/resources/views/store/checkout.blade.php index f2bce40a..6baa4c7d 100644 --- a/resources/views/store/checkout.blade.php +++ b/resources/views/store/checkout.blade.php @@ -6,12 +6,12 @@
-

Store

+

{{__('Store')}}

    -
  1. Dashboard
    2. -
  2. Store
    3. +
  3. {{__('Dashboard')}}
    4. +
  4. {{__('Store')}}
@@ -34,7 +34,7 @@

{{ config('app.name', 'Laravel') }} - Date: {{Carbon\Carbon::now()->isoFormat('LL')}} + {{__('Date')}}: {{Carbon\Carbon::now()->isoFormat('LL')}}

@@ -42,24 +42,24 @@
- To + {{__('To')}}
{{config('app.name' , 'Laravel')}}
- Email: {{env('PAYPAL_EMAIL' , env('MAIL_FROM_NAME'))}} + {{__('Email')}}: {{env('PAYPAL_EMAIL' , env('MAIL_FROM_NAME'))}}
- From + {{__('From')}}
{{Auth::user()->name}}
- Email: {{Auth::user()->email}} + {{__('Email')}}: {{Auth::user()->email}}
- Status
- Pending
+ {{__('Status')}}
+ {{__('Pending')}}
{{-- Order ID: 4F3S8J
--}}
@@ -72,10 +72,10 @@
StatusCodeMemo{{__('Status')}}{{__('Code')}}{{__('Memo')}} {{CREDITS_DISPLAY_NAME}}Used / UsesExpires{{__('Used / Uses')}}{{__('Expires')}}
- - - - + + + + @@ -95,34 +95,34 @@
-

Payment Methods:

+

{{__('Payment Methods')}}:

Paypal

- By purchasing this product you agree and accept our terms of service + {{__('By purchasing this product you agree and accept our terms of service')}}

-

Amount Due {{Carbon\Carbon::now()->isoFormat('LL')}}

+

{{__('Amount Due')}} {{Carbon\Carbon::now()->isoFormat('LL')}}

QuantityProductDescriptionSubtotal{{__('Quantity')}}{{__('Product')}}{{__('Description')}}{{__('Subtotal')}}
- + - + - + - +
Subtotal:{{__('Subtotal')}}: {{$product->formatToCurrency($product->price)}}
Tax ({{$taxpercent}}%){{__('Tax')}} ({{$taxpercent}}%) {{$product->formatToCurrency($taxvalue)}}
Quantity:{{__('Quantity')}}: 1
Total:{{__('Total')}}: {{$product->formatToCurrency($total)}}
@@ -135,8 +135,8 @@
- Submit - Payment + {{__('Submit + Payment')}}
diff --git a/resources/views/store/index.blade.php b/resources/views/store/index.blade.php index 880d83a4..24d1fdb9 100644 --- a/resources/views/store/index.blade.php +++ b/resources/views/store/index.blade.php @@ -7,12 +7,12 @@
-

Store

+

{{__('Store')}}

    -
  1. Dashboard
    2. -
  2. Store
    3. +
  3. {{__('Dashboard')}}
    4. +
  4. {{__('Store')}}
@@ -26,7 +26,7 @@
@@ -40,9 +40,9 @@ - - - + + + @@ -65,7 +65,7 @@ @else
-

@if($products->count() == 0) There are no store products! @else The store is not correctly configured! @endif +

@if($products->count() == 0) {{__('There are no store products!')}} @else {{__('The store is not correctly configured!')}} @endif

From 7ef8fdff4ea7534e38dc84a7c9ff31dc03e5886f Mon Sep 17 00:00:00 2001 From: 1Day Date: Mon, 13 Dec 2021 11:47:35 +0100 Subject: [PATCH 10/23] guess im done? --- .../Admin/ApplicationApiController.php | 6 +-- .../Admin/ConfigurationController.php | 2 +- .../Controllers/Admin/PaymentController.php | 8 +-- .../Admin/PaypalProductController.php | 8 +-- .../Controllers/Admin/ProductController.php | 6 +-- .../Controllers/Admin/ServerController.php | 6 +-- .../Controllers/Admin/SettingsController.php | 2 +- .../Admin/UsefulLinkController.php | 6 +-- app/Http/Controllers/Admin/UserController.php | 8 +-- .../Controllers/Admin/VoucherController.php | 14 ++--- app/Http/Controllers/HomeController.php | 9 ++-- app/Http/Controllers/ProfileController.php | 2 +- app/Http/Controllers/ServerController.php | 14 ++--- app/Http/Controllers/StoreController.php | 4 +- resources/lang/de.json | 52 ++++++++++++++++++- resources/views/admin/api/create.blade.php | 14 ++--- resources/views/admin/api/edit.blade.php | 14 ++--- resources/views/admin/api/index.blade.php | 18 +++---- resources/views/layouts/main.blade.php | 5 +- resources/views/profile/index.blade.php | 3 +- 20 files changed, 126 insertions(+), 75 deletions(-) diff --git a/app/Http/Controllers/Admin/ApplicationApiController.php b/app/Http/Controllers/Admin/ApplicationApiController.php index e091605a..9918dcbb 100644 --- a/app/Http/Controllers/Admin/ApplicationApiController.php +++ b/app/Http/Controllers/Admin/ApplicationApiController.php @@ -52,7 +52,7 @@ class ApplicationApiController extends Controller 'memo' => $request->input('memo') ]); - return redirect()->route('admin.api.index')->with('success', 'api key created!'); + return redirect()->route('admin.api.index')->with('success', __('api key created!')); } /** @@ -94,7 +94,7 @@ class ApplicationApiController extends Controller $applicationApi->update($request->all()); - return redirect()->route('admin.api.index')->with('success', 'api key updated!'); + return redirect()->route('admin.api.index')->with('success', __('api key updated!')); } /** @@ -106,7 +106,7 @@ class ApplicationApiController extends Controller public function destroy(ApplicationApi $applicationApi) { $applicationApi->delete(); - return redirect()->back()->with('success', 'api key has been removed!'); + return redirect()->back()->with('success', __('api key has been removed!')); } /** diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php index d16a765e..4eb84868 100644 --- a/app/Http/Controllers/Admin/ConfigurationController.php +++ b/app/Http/Controllers/Admin/ConfigurationController.php @@ -92,7 +92,7 @@ class ConfigurationController extends Controller $configuration->update($request->all()); - return redirect()->route('admin.configurations.index')->with('success', 'configuration has been updated!'); + return redirect()->route('admin.configurations.index')->with('success', __('configuration has been updated!')); } /** diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 4c52a310..4ce1ac88 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/app/Http/Controllers/Admin/PaymentController.php @@ -93,7 +93,7 @@ class PaymentController extends Controller 'shipping_preference' => 'NO_SHIPPING' ] - + ]; @@ -164,7 +164,7 @@ class PaymentController extends Controller $user->update(['server_limit' => Configuration::getValueByKey('SERVER_LIMIT_AFTER_IRL_PURCHASE')]); } } - + //update role if ($user->role == 'member') { $user->update(['role' => 'client']); @@ -192,7 +192,7 @@ class PaymentController extends Controller event(new UserUpdateCreditsEvent($user)); //redirect back to home - return redirect()->route('home')->with('success', 'Your credit balance has been increased!'); + return redirect()->route('home')->with('success', __('Your credit balance has been increased!')); } // If call returns body in response, you can get the deserialized version from the result attribute of the response @@ -220,7 +220,7 @@ class PaymentController extends Controller */ public function cancel(Request $request) { - return redirect()->route('store.index')->with('success', 'Payment was Canceled'); + return redirect()->route('store.index')->with('success', __('Payment was Canceled')); } diff --git a/app/Http/Controllers/Admin/PaypalProductController.php b/app/Http/Controllers/Admin/PaypalProductController.php index ee4764e4..51120f44 100644 --- a/app/Http/Controllers/Admin/PaypalProductController.php +++ b/app/Http/Controllers/Admin/PaypalProductController.php @@ -62,7 +62,7 @@ class PaypalProductController extends Controller $disabled = !is_null($request->input('disabled')); PaypalProduct::create(array_merge($request->all(), ['disabled' => $disabled])); - return redirect()->route('admin.store.index')->with('success', 'Store item has been created!'); + return redirect()->route('admin.store.index')->with('success', __('Store item has been created!')); } /** @@ -112,7 +112,7 @@ class PaypalProductController extends Controller $disabled = !is_null($request->input('disabled')); $paypalProduct->update(array_merge($request->all(), ['disabled' => $disabled])); - return redirect()->route('admin.store.index')->with('success', 'Store item has been updated!'); + return redirect()->route('admin.store.index')->with('success', __('Store item has been updated!')); } /** @@ -124,7 +124,7 @@ class PaypalProductController extends Controller { $paypalProduct->update(['disabled' => !$paypalProduct->disabled]); - return redirect()->route('admin.store.index')->with('success', 'Product has been updated!'); + return redirect()->route('admin.store.index')->with('success', __('Product has been updated!')); } /** @@ -136,7 +136,7 @@ class PaypalProductController extends Controller public function destroy(PaypalProduct $paypalProduct) { $paypalProduct->delete(); - return redirect()->back()->with('success', 'Store item has been removed!'); + return redirect()->back()->with('success', __('Store item has been removed!')); } diff --git a/app/Http/Controllers/Admin/ProductController.php b/app/Http/Controllers/Admin/ProductController.php index a71f81da..353327b4 100644 --- a/app/Http/Controllers/Admin/ProductController.php +++ b/app/Http/Controllers/Admin/ProductController.php @@ -84,7 +84,7 @@ class ProductController extends Controller $product->eggs()->attach($request->input('eggs')); $product->nodes()->attach($request->input('nodes')); - return redirect()->route('admin.products.index')->with('success', 'Product has been created!'); + return redirect()->route('admin.products.index')->with('success', __('Product has been created!')); } /** @@ -152,7 +152,7 @@ class ProductController extends Controller $product->eggs()->attach($request->input('eggs')); $product->nodes()->attach($request->input('nodes')); - return redirect()->route('admin.products.index')->with('success', 'Product has been updated!'); + return redirect()->route('admin.products.index')->with('success', __('Product has been updated!')); } /** @@ -181,7 +181,7 @@ class ProductController extends Controller } $product->delete(); - return redirect()->back()->with('success', 'Product has been removed!'); + return redirect()->back()->with('success', __('Product has been removed!')); } diff --git a/app/Http/Controllers/Admin/ServerController.php b/app/Http/Controllers/Admin/ServerController.php index 493993d8..f53cf49d 100644 --- a/app/Http/Controllers/Admin/ServerController.php +++ b/app/Http/Controllers/Admin/ServerController.php @@ -92,9 +92,9 @@ class ServerController extends Controller { try { $server->delete(); - return redirect()->route('admin.servers.index')->with('success', 'Server removed'); + return redirect()->route('admin.servers.index')->with('success', __('Server removed')); } catch (Exception $e) { - return redirect()->route('admin.servers.index')->with('error', 'An exception has occurred while trying to remove a resource "' . $e->getMessage() . '"'); + return redirect()->route('admin.servers.index')->with('error', __('An exception has occurred while trying to remove a resource "') . $e->getMessage() . '"'); } } @@ -109,7 +109,7 @@ class ServerController extends Controller return redirect()->back()->with('error', $exception->getMessage()); } - return redirect()->back()->with('success', 'Server has been updated!'); + return redirect()->back()->with('success', __('Server has been updated!')); } /** diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php index 375c5c0c..d4d82fbe 100644 --- a/app/Http/Controllers/Admin/SettingsController.php +++ b/app/Http/Controllers/Admin/SettingsController.php @@ -36,7 +36,7 @@ class SettingsController extends Controller $request->file('favicon')->storeAs('public', 'favicon.ico'); } - return redirect()->route('admin.settings.index')->with('success', 'Icons updated!'); + return redirect()->route('admin.settings.index')->with('success', __('Icons updated!')); } } diff --git a/app/Http/Controllers/Admin/UsefulLinkController.php b/app/Http/Controllers/Admin/UsefulLinkController.php index f2e94694..92671677 100644 --- a/app/Http/Controllers/Admin/UsefulLinkController.php +++ b/app/Http/Controllers/Admin/UsefulLinkController.php @@ -50,7 +50,7 @@ class UsefulLinkController extends Controller ]); UsefulLink::create($request->all()); - return redirect()->route('admin.usefullinks.index')->with('success', 'link has been created!'); + return redirect()->route('admin.usefullinks.index')->with('success', __('link has been created!')); } /** @@ -94,7 +94,7 @@ class UsefulLinkController extends Controller ]); $usefullink->update($request->all()); - return redirect()->route('admin.usefullinks.index')->with('success', 'link has been updated!'); + return redirect()->route('admin.usefullinks.index')->with('success', __('link has been updated!')); } /** @@ -106,7 +106,7 @@ class UsefulLinkController extends Controller public function destroy(UsefulLink $usefullink) { $usefullink->delete(); - return redirect()->back()->with('success', 'product has been removed!'); + return redirect()->back()->with('success', __('product has been removed!')); } public function dataTable() diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 4c9f9ba0..1872a295 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -115,7 +115,7 @@ class UserController extends Controller if (isset($this->pterodactyl->getUser($request->input('pterodactyl_id'))['errors'])) { throw ValidationException::withMessages([ - 'pterodactyl_id' => ["User does not exists on pterodactyl's panel"] + 'pterodactyl_id' => [__("User does not exists on pterodactyl's panel")] ]); } @@ -145,7 +145,7 @@ class UserController extends Controller public function destroy(User $user) { $user->delete(); - return redirect()->back()->with('success', 'user has been removed!'); + return redirect()->back()->with('success', __('user has been removed!')); } /** @@ -218,7 +218,7 @@ class UserController extends Controller $all = $data["all"] ?? false; $users = $all ? User::all() : User::whereIn("id", $data["users"])->get(); Notification::send($users, new DynamicNotification($data["via"], $database, $mail)); - return redirect()->route('admin.users.notifications')->with('success', 'Notification sent!'); + return redirect()->route('admin.users.notifications')->with('success', __('Notification sent!')); } /** @@ -232,7 +232,7 @@ class UserController extends Controller return redirect()->back()->with('error', $exception->getMessage()); } - return redirect()->back()->with('success', 'User has been updated!'); + return redirect()->back()->with('success', __('User has been updated!')); } /** diff --git a/app/Http/Controllers/Admin/VoucherController.php b/app/Http/Controllers/Admin/VoucherController.php index 31947dbd..d3f772e9 100644 --- a/app/Http/Controllers/Admin/VoucherController.php +++ b/app/Http/Controllers/Admin/VoucherController.php @@ -55,7 +55,7 @@ class VoucherController extends Controller Voucher::create($request->except('_token')); - return redirect()->route('admin.vouchers.index')->with('success', 'voucher has been created!'); + return redirect()->route('admin.vouchers.index')->with('success', __('voucher has been created!')); } /** @@ -101,7 +101,7 @@ class VoucherController extends Controller $voucher->update($request->except('_token')); - return redirect()->route('admin.vouchers.index')->with('success', 'voucher has been updated!'); + return redirect()->route('admin.vouchers.index')->with('success', __('voucher has been updated!')); } /** @@ -113,7 +113,7 @@ class VoucherController extends Controller public function destroy(Voucher $voucher) { $voucher->delete(); - return redirect()->back()->with('success', 'voucher has been removed!'); + return redirect()->back()->with('success', __('voucher has been removed!')); } public function users(Voucher $voucher) @@ -140,19 +140,19 @@ class VoucherController extends Controller #extra validations if ($voucher->getStatus() == 'USES_LIMIT_REACHED') throw ValidationException::withMessages([ - 'code' => 'This voucher has reached the maximum amount of uses' + 'code' => __('This voucher has reached the maximum amount of uses') ]); if ($voucher->getStatus() == 'EXPIRED') throw ValidationException::withMessages([ - 'code' => 'This voucher has expired' + 'code' => __('This voucher has expired') ]); if (!$request->user()->vouchers()->where('id', '=', $voucher->id)->get()->isEmpty()) throw ValidationException::withMessages([ - 'code' => 'You already redeemed this voucher code' + 'code' => __('You already redeemed this voucher code') ]); if ($request->user()->credits + $voucher->credits >= 99999999) throw ValidationException::withMessages([ - 'code' => "You can't redeem this voucher because you would exceed the " . CREDITS_DISPLAY_NAME . " limit" + 'code' => "You can't redeem this voucher because you would exceed the limit of " . CREDITS_DISPLAY_NAME ]); #redeem voucher diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index f287aa5e..965bcdea 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -15,7 +15,6 @@ class HomeController extends Controller const TIME_LEFT_BG_SUCCESS = "bg-success"; const TIME_LEFT_BG_WARNING = "bg-warning"; const TIME_LEFT_BG_DANGER = "bg-danger"; - const TIME_LEFT_OUT_OF_CREDITS_TEXT = "You ran out of Credits"; public function __construct() { @@ -51,8 +50,8 @@ class HomeController extends Controller */ public function getTimeLeftBoxUnit(float $daysLeft, float $hoursLeft) { - if ($daysLeft > 1) return 'days'; - return $hoursLeft < 1 ? null : "hours"; + if ($daysLeft > 1) return __('days'); + return $hoursLeft < 1 ? null : __("hours"); } /** @@ -66,7 +65,7 @@ class HomeController extends Controller public function getTimeLeftBoxText(float $daysLeft, float $hoursLeft) { if ($daysLeft > 1) return strval(number_format($daysLeft, 0)); - return ($hoursLeft < 1 ? $this::TIME_LEFT_OUT_OF_CREDITS_TEXT : strval($hoursLeft)); + return ($hoursLeft < 1 ? __("You ran out of Credits") : strval($hoursLeft)); } /** Show the application dashboard. */ @@ -85,7 +84,7 @@ class HomeController extends Controller $bg = $this->getTimeLeftBoxBackground($daysLeft); $boxText = $this->getTimeLeftBoxText($daysLeft, $hoursLeft); - $unit = $daysLeft < 1 ? ($hoursLeft < 1 ? null : "hours") : "days"; + $unit = $daysLeft < 1 ? ($hoursLeft < 1 ? null : __("hours")) : __("days"); } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 00ec4b1c..3ddc1655 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -86,6 +86,6 @@ class ProfileController extends Controller 'email' => $request->input('email'), ]); - return redirect()->route('profile.index')->with('success' , 'Profile updated'); + return redirect()->route('profile.index')->with('success' , __('Profile updated')); } } diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 484c2e4a..5944480b 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -71,7 +71,7 @@ class ServerController extends Controller { //limit validation if (Auth::user()->servers()->count() >= Auth::user()->server_limit) { - return redirect()->route('servers.index')->with('error', 'Server limit reached!'); + return redirect()->route('servers.index')->with('error', __('Server limit reached!')); } // minimum credits @@ -89,12 +89,12 @@ class ServerController extends Controller //Required Verification for creating an server if (Configuration::getValueByKey('FORCE_EMAIL_VERIFICATION', 'false') === 'true' && !Auth::user()->hasVerifiedEmail()) { - return redirect()->route('profile.index')->with('error', "You are required to verify your email address before you can create a server."); + return redirect()->route('profile.index')->with('error', __("You are required to verify your email address before you can create a server.")); } //Required Verification for creating an server if (Configuration::getValueByKey('FORCE_DISCORD_VERIFICATION', 'false') === 'true' && !Auth::user()->discordUser) { - return redirect()->route('profile.index')->with('error', "You are required to link your discord account before you can create a server."); + return redirect()->route('profile.index')->with('error', __("You are required to link your discord account before you can create a server.")); } return null; @@ -146,7 +146,7 @@ class ServerController extends Controller } } - return redirect()->route('servers.index')->with('success', 'Server created'); + return redirect()->route('servers.index')->with('success', __('Server created')); } /** @@ -159,7 +159,7 @@ class ServerController extends Controller $server->delete(); Auth::user()->notify(new ServerCreationError($server)); - return redirect()->route('servers.index')->with('error', 'No allocations satisfying the requirements for automatic deployment on this node were found.'); + return redirect()->route('servers.index')->with('error', __('No allocations satisfying the requirements for automatic deployment on this node were found.')); } /** @@ -180,9 +180,9 @@ class ServerController extends Controller { try { $server->delete(); - return redirect()->route('servers.index')->with('success', 'Server removed'); + return redirect()->route('servers.index')->with('success', __('Server removed')); } catch (Exception $e) { - return redirect()->route('servers.index')->with('error', 'An exception has occurred while trying to remove a resource "' . $e->getMessage() . '"'); + return redirect()->route('servers.index')->with('error', __('An exception has occurred while trying to remove a resource "') . $e->getMessage() . '"'); } } } diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index 1b23d305..52181856 100644 --- a/app/Http/Controllers/StoreController.php +++ b/app/Http/Controllers/StoreController.php @@ -18,12 +18,12 @@ class StoreController extends Controller //Required Verification for creating an server if (Configuration::getValueByKey('FORCE_EMAIL_VERIFICATION', false) === 'true' && !Auth::user()->hasVerifiedEmail()) { - return redirect()->route('profile.index')->with('error', "You are required to verify your email address before you can purchase credits."); + return redirect()->route('profile.index')->with('error', __("You are required to verify your email address before you can purchase credits.")); } //Required Verification for creating an server if (Configuration::getValueByKey('FORCE_DISCORD_VERIFICATION', false) === 'true' && !Auth::user()->discordUser) { - return redirect()->route('profile.index')->with('error', "You are required to link your discord account before you can purchase ".CREDITS_DISPLAY_NAME."."); + return redirect()->route('profile.index')->with('error', __("You are required to link your discord account before you can purchase Credits")); } return view('store.index')->with([ diff --git a/resources/lang/de.json b/resources/lang/de.json index 351269fe..fec8eb4e 100644 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -91,6 +91,9 @@ "Select panel icon": "Icon auswählen", "Select panel favicon": "Favicon auswählen", + "Token": "Token", + "Last used": "Zuletzt benutzt", + "Store": "Laden", "Currency code": "Währungscode", "Checkout the paypal docs to select the appropriate code": "Siehe Paypal für die entsprechenden Codes", @@ -254,9 +257,56 @@ "By purchasing this product you agree and accept our terms of service": "Mit dem kauf akzeptierst du unsere TOS", "There are no store products!": "Es gibt keine Produkte", "The store is not correctly configured!": "Der Laden wurde nicht richtig konfiguriert", - "Out of Credits in": "Keine :credits mehr in" + "Out of Credits in": "Keine :credits mehr in", + "days": "Tage", + "hours": "Stunden", + "You ran out of Credits": "Keine Credits übrig!", + "Profile updated": "Profile updated", + "Server limit reached!": "Server limit erreicht", + + "You are required to verify your email address before you can create a server.": "Du musst deine E-Mail verifizieren bevor du einen Server erstellen kannst", + "You are required to link your discord account before you can create a server.": "Du musst dein Discord verifizieren bevor du einen Server erstellen kannst", + "No allocations satisfying the requirements for automatic deployment on this node were found.": "Keine automatischen Portzuweisungen für dieses Node vorhanden", + "Server removed": "Server gelöscht", + "Server created": "Server erstellt!", + "An exception has occurred while trying to remove a resource \"": "Folgender Fehler ist aufgetreten: ", + "You are required to verify your email address before you can purchase credits.": "Vor dem Kauf musst du deine E-Mail verifizieren", + "You are required to link your discord account before you can purchase ": "Vor dem Kauf musst du dein Discord verlinken!", + + "Warning!": "Warnung!", + + "api key created!": "API Key erstellt", + "api key updated!": "API Key updated", + "api key has been removed!": "API Key gelöscht", + "configuration has been updated!": "Konfig updated", + "Pterodactyl synced": "Pterodactyl synced", + "Your credit balance has been increased!": "Dein Kontostand wurde updated", + "Payment was Canceled": "Zahlung abgebrochen", + + "Store item has been created!": "Item wurde erstellt!", + "Store item has been updated!": "Item updated", + "Product has been updated!": "Product updated", + "Store item has been removed!":"Item gelöscht", + "Product has been created!": "Produkt erstellt", + "Product has been removed!": "Produkt gelöscht", + "Server has been updated!": "Server updated", + "Icons updated!": "Icons Updated", + "link has been created!": "Link erstellt!", + "link has been updated!": "Link updated!", + "user has been removed!": "User gelöscht", + "Notification sent!": "Nachricht gesendet", + "User has been updated!": "User updated!", + "User does not exists on pterodactyl's panel": "User existiert nicht in Pterodactyl", + "voucher has been created!": "Gutschein erstellt", + "voucher has been updated!": "Gutschein Updated", + "voucher has been removed!": "Gutschein gelöscht", + "This voucher has reached the maximum amount of uses": "Maximale Anzahl an Einlösungen erreicht", + "This voucher has expired": "Gutschein abgelaufen", + "You already redeemed this voucher code": "Du hast diesen Gutschein bereits eingelöst", + "You can't redeem this voucher because you would exceed the limit of ": "Du kannst diesen Gutschein nicht einlösen sonst hast du zu viele ", + " have been added to your balance!": "Wurden deinem Konto hinzugefügt" diff --git a/resources/views/admin/api/create.blade.php b/resources/views/admin/api/create.blade.php index 300d0754..e0025e85 100644 --- a/resources/views/admin/api/create.blade.php +++ b/resources/views/admin/api/create.blade.php @@ -6,13 +6,15 @@
-

Application API

+

{{__('Application API')}}

    -
  1. Dashboard
    2. -
  2. Application API
    3. -
  3. Create +
  4. {{__('Dashboard')}}
    5. +
  5. {{__('Application API')}} +
    6. +
  6. {{__('Create')}}
@@ -33,7 +35,7 @@ @csrf
- + @error('memo') @@ -45,7 +47,7 @@
diff --git a/resources/views/admin/api/edit.blade.php b/resources/views/admin/api/edit.blade.php index 62f82d02..f99e0b27 100644 --- a/resources/views/admin/api/edit.blade.php +++ b/resources/views/admin/api/edit.blade.php @@ -6,13 +6,15 @@
-

Application API

+

{{__('Application API')}}

    -
  1. Dashboard
    2. -
  2. Application API
    3. -
  3. Edit +
  4. {{__('Dashboard')}}
    5. +
  5. {{__('Application API')}} +
    6. +
  6. {{__('Edit')}}
@@ -34,7 +36,7 @@ @method('PATCH')
- + @error('memo') @@ -46,7 +48,7 @@
diff --git a/resources/views/admin/api/index.blade.php b/resources/views/admin/api/index.blade.php index 6c56fcf8..694f3473 100644 --- a/resources/views/admin/api/index.blade.php +++ b/resources/views/admin/api/index.blade.php @@ -6,12 +6,12 @@
-

Application API

+

{{__('Application API')}}

    -
  1. Dashboard
    2. -
  2. Application API
    3. +
  3. {{__('Dashboard')}}
    4. +
  4. {{__('Application API')}}
@@ -27,9 +27,9 @@
-
Application API
+
{{__('Application API')}}
Create new + class="fas fa-plus mr-1">{{__('Create new')}}
@@ -38,9 +38,9 @@
PriceTypeDescription{{__('Price')}}{{__('Type')}}{{__('Description')}}
- - - + + + @@ -59,7 +59,7 @@
TokenMemoLast used{{__('Token')}}{{__('Memo')}}{{__('Last used')}}