[Feat] Language additions
[Bug] ControlPanel leftovers changed to CtrlPanel
This commit is contained in:
parent
130a3b308b
commit
ca3d1b00a0
6
.github/ISSUE_TEMPLATE/bug.yml
vendored
6
.github/ISSUE_TEMPLATE/bug.yml
vendored
|
@ -31,10 +31,10 @@ body:
|
||||||
validations:
|
validations:
|
||||||
required: false
|
required: false
|
||||||
- type: textarea
|
- type: textarea
|
||||||
id: controlpanel-logs
|
id: ctrlpanel-logs
|
||||||
attributes:
|
attributes:
|
||||||
label: Controlpanel Logs
|
label: CtrlPanel Logs
|
||||||
description: Please copy and paste your laravel-log output. You may also provide a link to it using the following command `tail -n 100 /var/www/controlpanel/storage/logs/laravel.log | nc pteropaste.com 99`
|
description: Please copy and paste your laravel-log output. You may also provide a link to it using the following command `tail -n 100 /var/www/ctrlpanel/storage/logs/laravel.log | nc pteropaste.com 99`
|
||||||
render: Shell
|
render: Shell
|
||||||
- type: textarea
|
- type: textarea
|
||||||
id: additional-info
|
id: additional-info
|
||||||
|
|
4
.github/SECURITY.md
vendored
4
.github/SECURITY.md
vendored
|
@ -12,6 +12,6 @@ At this time, we only accept vulnerability reports through GitHub Advisories. We
|
||||||
|
|
||||||
## Supported Versions
|
## Supported Versions
|
||||||
|
|
||||||
### ControlPanel Versions
|
### CtrlPanel Versions
|
||||||
|
|
||||||
We strongly recommend using or upgrading to the latest version of ControlPanel to ensure you have access to the latest security fixes and enhancements.
|
We strongly recommend using or upgrading to the latest version of CtrlPanel to ensure you have access to the latest security fixes and enhancements.
|
||||||
|
|
|
@ -398,7 +398,7 @@ class ServerController extends Controller
|
||||||
|
|
||||||
// Remove the allocation property from the server object as it is not a column in the database
|
// Remove the allocation property from the server object as it is not a column in the database
|
||||||
unset($server->allocation);
|
unset($server->allocation);
|
||||||
// Update the server on controlpanel
|
// Update the server on CtrlPanel
|
||||||
$server->update([
|
$server->update([
|
||||||
'product_id' => $newProduct->id,
|
'product_id' => $newProduct->id,
|
||||||
'updated_at' => now(),
|
'updated_at' => now(),
|
||||||
|
|
|
@ -54,7 +54,7 @@ trait Invoiceable
|
||||||
|
|
||||||
|
|
||||||
$invoice = DailyInvoice::make()
|
$invoice = DailyInvoice::make()
|
||||||
->template('controlpanel')
|
->template('CtrlPanel')
|
||||||
->name(__("Invoice"))
|
->name(__("Invoice"))
|
||||||
->buyer($customer)
|
->buyer($customer)
|
||||||
->seller($seller)
|
->seller($seller)
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
cd into the project directory and run the following command: `sh bin/startdocker.sh`
|
cd into the project directory and run the following command: `sh bin/startdocker.sh`
|
||||||
This should start building the images and start the containers.
|
This should start building the images and start the containers.
|
||||||
|
|
||||||
After that you need to go into the controlpanel_php container and run some commands:
|
After that you need to go into the ctrlpanel_php container and run some commands:
|
||||||
|
|
||||||
Type `docker exec -it controlpanel_php ash` to go into the container and run the following commands:
|
Type `docker exec -it ctrlpanel_php ash` to go into the container and run the following commands:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
composer install
|
composer install
|
||||||
|
@ -17,7 +17,7 @@ php artisan migrate --seed --force
|
||||||
|
|
||||||
## Setting up testing environment
|
## Setting up testing environment
|
||||||
|
|
||||||
Create the .env.testing file to your needs. Then once done you need to go into your phpmyadmin to create a new database named __controlpanel_test__.
|
Create the .env.testing file to your needs. Then once done you need to go into your phpmyadmin to create a new database named __ctrlpanel_test__.
|
||||||
Visit http://127.0.0.1:8080/ and create your database.
|
Visit http://127.0.0.1:8080/ and create your database.
|
||||||
|
|
||||||
Now you're ready to run the following commands which switches to the testing config, migrates the test database and seeds it.
|
Now you're ready to run the following commands which switches to the testing config, migrates the test database and seeds it.
|
||||||
|
|
|
@ -8,7 +8,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: ../
|
context: ../
|
||||||
dockerfile: docker/nginx/Dockerfile
|
dockerfile: docker/nginx/Dockerfile
|
||||||
container_name: controlpanel_nginx
|
container_name: ctrlpanel_nginx
|
||||||
ports:
|
ports:
|
||||||
- 80:80
|
- 80:80
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -21,14 +21,14 @@ services:
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
image: mysql
|
image: mysql
|
||||||
container_name: controlpanel_mysql
|
container_name: ctrlpanel_mysql
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
tty: true
|
tty: true
|
||||||
ports:
|
ports:
|
||||||
- "3306:3306"
|
- "3306:3306"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_DATABASE: controlpanel
|
MYSQL_DATABASE: ctrlpanel
|
||||||
MYSQL_USER: controlpanel
|
MYSQL_USER: ctrlpanel
|
||||||
MYSQL_PASSWORD: root
|
MYSQL_PASSWORD: root
|
||||||
MYSQL_ROOT_PASSWORD: root
|
MYSQL_ROOT_PASSWORD: root
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -40,7 +40,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: ../
|
context: ../
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: docker/php/Dockerfile
|
||||||
container_name: controlpanel_php
|
container_name: ctrlpanel_php
|
||||||
volumes:
|
volumes:
|
||||||
- "../:/var/www/html"
|
- "../:/var/www/html"
|
||||||
networks:
|
networks:
|
||||||
|
@ -48,13 +48,13 @@ services:
|
||||||
|
|
||||||
phpmyadmin:
|
phpmyadmin:
|
||||||
image: phpmyadmin/phpmyadmin
|
image: phpmyadmin/phpmyadmin
|
||||||
container_name: controlpanel_phpmyadmin
|
container_name: ctrlpanel_phpmyadmin
|
||||||
depends_on:
|
depends_on:
|
||||||
- mysql
|
- mysql
|
||||||
ports:
|
ports:
|
||||||
- '8080:80'
|
- '8080:80'
|
||||||
environment:
|
environment:
|
||||||
- PMA_HOST=controlpanel_mysql
|
- PMA_HOST=ctrlpanel_mysql
|
||||||
- PMA_USER=root
|
- PMA_USER=root
|
||||||
- PMA_PASSWORD=root
|
- PMA_PASSWORD=root
|
||||||
- PMA_ARBITRARY=1
|
- PMA_ARBITRARY=1
|
||||||
|
@ -62,4 +62,4 @@ services:
|
||||||
- laravel
|
- laravel
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mysql:
|
mysql:
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Сървър за поддръжка",
|
"Support server": "Сървър за поддръжка",
|
||||||
"Documentation": "Документация",
|
"Documentation": "Документация",
|
||||||
"Github": "GitHub",
|
"Github": "GitHub",
|
||||||
"Support ControlPanel": "Подкрепете Control Panel",
|
"Support CtrlPanel": "Подкрепете CtrlPanel",
|
||||||
"Servers": "Сървъри",
|
"Servers": "Сървъри",
|
||||||
"Total": "Общо",
|
"Total": "Общо",
|
||||||
"Payments": "Плащания",
|
"Payments": "Плащания",
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
"Support server": "Support server",
|
"Support server": "Support server",
|
||||||
"Documentation": "Documentation",
|
"Documentation": "Documentation",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "Support ControlPanel",
|
"Support CtrlPanel": "Support CtrlPanel",
|
||||||
"Servers": "Servers",
|
"Servers": "Servers",
|
||||||
"Total": "Total",
|
"Total": "Total",
|
||||||
"Payments": "Payments",
|
"Payments": "Payments",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Server podpory",
|
"Support server": "Server podpory",
|
||||||
"Documentation": "Dokumentace",
|
"Documentation": "Dokumentace",
|
||||||
"Github": "GitHub",
|
"Github": "GitHub",
|
||||||
"Support ControlPanel": "Podpořit ControlPanel",
|
"Support CtrlPanel": "Podpořit CtrlPanel",
|
||||||
"Servers": "Servery",
|
"Servers": "Servery",
|
||||||
"Total": "Celkem",
|
"Total": "Celkem",
|
||||||
"Payments": "Platby",
|
"Payments": "Platby",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Discord Server",
|
"Support server": "Discord Server",
|
||||||
"Documentation": "Dokumentation",
|
"Documentation": "Dokumentation",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "Unterstütze CtrlPanel.gg",
|
"Support CtrlPanel": "Unterstütze CtrlPanel.gg",
|
||||||
"Servers": "Server",
|
"Servers": "Server",
|
||||||
"Total": "Gesamt",
|
"Total": "Gesamt",
|
||||||
"Payments": "Zahlungen",
|
"Payments": "Zahlungen",
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
"Support server": "Support server",
|
"Support server": "Support server",
|
||||||
"Documentation": "Documentation",
|
"Documentation": "Documentation",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "Support ControlPanel",
|
"Support CtrlPanel": "Support CtrlPanel",
|
||||||
"Servers": "Servers",
|
"Servers": "Servers",
|
||||||
"Total": "Total",
|
"Total": "Total",
|
||||||
"Payments": "Payments",
|
"Payments": "Payments",
|
||||||
|
@ -166,7 +166,7 @@
|
||||||
"You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.": "You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.",
|
"You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.": "You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.",
|
||||||
"You can do that in settings.": "You can do that in settings.",
|
"You can do that in settings.": "You can do that in settings.",
|
||||||
"Note": "Note",
|
"Note": "Note",
|
||||||
"If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on ControlPanel. Try clicking the button below.": "If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on ControlPanel. Try clicking the button below.",
|
"If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on CtrlPanel. Try clicking the button below.": "If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on CtrlPanel. Try clicking the button below.",
|
||||||
"Sync servers": "Sync servers",
|
"Sync servers": "Sync servers",
|
||||||
"Node": "Node",
|
"Node": "Node",
|
||||||
"Server count": "Server count",
|
"Server count": "Server count",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Servidor de Ayuda",
|
"Support server": "Servidor de Ayuda",
|
||||||
"Documentation": "Documentación",
|
"Documentation": "Documentación",
|
||||||
"Github": "GitHub",
|
"Github": "GitHub",
|
||||||
"Support ControlPanel": "Apoya ControlPanel",
|
"Support CtrlPanel": "Apoya CtrlPanel",
|
||||||
"Servers": "Servidores",
|
"Servers": "Servidores",
|
||||||
"Total": "Total",
|
"Total": "Total",
|
||||||
"Payments": "Pagos",
|
"Payments": "Pagos",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Serveur de support",
|
"Support server": "Serveur de support",
|
||||||
"Documentation": "Documentation",
|
"Documentation": "Documentation",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "ControlPanel Support",
|
"Support CtrlPanel": "CtrlPanel Support",
|
||||||
"Servers": "Serveurs",
|
"Servers": "Serveurs",
|
||||||
"Total": "Total",
|
"Total": "Total",
|
||||||
"Payments": "Paiments",
|
"Payments": "Paiments",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "שרת תמיכה",
|
"Support server": "שרת תמיכה",
|
||||||
"Documentation": "מדריך",
|
"Documentation": "מדריך",
|
||||||
"Github": "Github/גיטאהב",
|
"Github": "Github/גיטאהב",
|
||||||
"Support ControlPanel": "תמיכת ControlPanel",
|
"Support CtrlPanel": "תמיכת CtrlPanel",
|
||||||
"Servers": "שרתים",
|
"Servers": "שרתים",
|
||||||
"Total": "בסך הכל",
|
"Total": "בסך הכל",
|
||||||
"Payments": "תשלומים",
|
"Payments": "תשלומים",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "समर्थन सर्वर",
|
"Support server": "समर्थन सर्वर",
|
||||||
"Documentation": "प्रलेखन",
|
"Documentation": "प्रलेखन",
|
||||||
"Github": "गिटहब",
|
"Github": "गिटहब",
|
||||||
"Support ControlPanel": "समर्थन नियंत्रण पैनल",
|
"Support CtrlPanel": "CtrlPanel का समर्थन करें",
|
||||||
"Servers": "सर्वरस",
|
"Servers": "सर्वरस",
|
||||||
"Total": "कुल",
|
"Total": "कुल",
|
||||||
"Payments": "भुगतान",
|
"Payments": "भुगतान",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Szerver támogatása",
|
"Support server": "Szerver támogatása",
|
||||||
"Documentation": "Dokumentáció",
|
"Documentation": "Dokumentáció",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "ControlPanel támogatása",
|
"Support CtrlPanel": "CtrlPanel támogatása",
|
||||||
"Servers": "Szerverek",
|
"Servers": "Szerverek",
|
||||||
"Total": "Összesen",
|
"Total": "Összesen",
|
||||||
"Payments": "Fizetések",
|
"Payments": "Fizetések",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Server di supporto",
|
"Support server": "Server di supporto",
|
||||||
"Documentation": "Documentazione",
|
"Documentation": "Documentazione",
|
||||||
"Github": "GitHub",
|
"Github": "GitHub",
|
||||||
"Support ControlPanel": "Supporta ControlPanel",
|
"Support CtrlPanel": "Supporta CtrlPanel",
|
||||||
"Servers": "Servers",
|
"Servers": "Servers",
|
||||||
"Total": "Totale",
|
"Total": "Totale",
|
||||||
"Payments": "Pagamenti",
|
"Payments": "Pagamenti",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Ondersteuningsserver",
|
"Support server": "Ondersteuningsserver",
|
||||||
"Documentation": "Documentatie",
|
"Documentation": "Documentatie",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "Ondersteuning ControlPanel",
|
"Support CtrlPanel": "Ondersteuning CtrlPanel",
|
||||||
"Servers": "Servers",
|
"Servers": "Servers",
|
||||||
"Total": "Totaal",
|
"Total": "Totaal",
|
||||||
"Payments": "Betalingen",
|
"Payments": "Betalingen",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Serwer pomocy",
|
"Support server": "Serwer pomocy",
|
||||||
"Documentation": "Dokumentacja",
|
"Documentation": "Dokumentacja",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "Wesprzyj ControlPanel",
|
"Support CtrlPanel": "Wesprzyj CtrlPanel",
|
||||||
"Servers": "Serwery",
|
"Servers": "Serwery",
|
||||||
"Total": "Razem",
|
"Total": "Razem",
|
||||||
"Payments": "Płatności",
|
"Payments": "Płatności",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Servidor de suporte",
|
"Support server": "Servidor de suporte",
|
||||||
"Documentation": "Documentação",
|
"Documentation": "Documentação",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "Suporte para ControlPanel",
|
"Support CtrlPanel": "Suporte para CtrlPanel",
|
||||||
"Servers": "Servidores",
|
"Servers": "Servidores",
|
||||||
"Total": "Total",
|
"Total": "Total",
|
||||||
"Payments": "Pagamentos",
|
"Payments": "Pagamentos",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Support server",
|
"Support server": "Support server",
|
||||||
"Documentation": "Documentation",
|
"Documentation": "Documentation",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "Support ControlPanel",
|
"Support CtrlPanel": "Support CtrlPanel",
|
||||||
"Servers": "Servers",
|
"Servers": "Servers",
|
||||||
"Total": "Total",
|
"Total": "Total",
|
||||||
"Payments": "Payments",
|
"Payments": "Payments",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Сервер поддержки",
|
"Support server": "Сервер поддержки",
|
||||||
"Documentation": "Документация",
|
"Documentation": "Документация",
|
||||||
"Github": "GitHub",
|
"Github": "GitHub",
|
||||||
"Support ControlPanel": "Поддержка панели управления",
|
"Support CtrlPanel": "Поддержка CtrlPanel",
|
||||||
"Servers": "Серверы",
|
"Servers": "Серверы",
|
||||||
"Total": "Всего",
|
"Total": "Всего",
|
||||||
"Payments": "Оплаты",
|
"Payments": "Оплаты",
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
"Support server": "Support server",
|
"Support server": "Support server",
|
||||||
"Documentation": "Documentation",
|
"Documentation": "Documentation",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "Support ControlPanel",
|
"Support CtrlPanel": "Support CtrlPanel",
|
||||||
"Servers": "Servers",
|
"Servers": "Servers",
|
||||||
"Total": "Total",
|
"Total": "Total",
|
||||||
"Payments": "Payments",
|
"Payments": "Payments",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Server podpory",
|
"Support server": "Server podpory",
|
||||||
"Documentation": "Dokumentácia",
|
"Documentation": "Dokumentácia",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "Podporiť ControlPanel",
|
"Support CtrlPanel": "Podporiť CtrlPanel",
|
||||||
"Servers": "Servery",
|
"Servers": "Servery",
|
||||||
"Total": "Celkom",
|
"Total": "Celkom",
|
||||||
"Payments": "Platby",
|
"Payments": "Platby",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Server za podršku",
|
"Support server": "Server za podršku",
|
||||||
"Documentation": "Dokumentacija",
|
"Documentation": "Dokumentacija",
|
||||||
"Github": "GitHub",
|
"Github": "GitHub",
|
||||||
"Support ControlPanel": "Podrži ControlPanel",
|
"Support CtrlPanel": "Podrži CtrlPanel",
|
||||||
"Servers": "Serveri",
|
"Servers": "Serveri",
|
||||||
"Total": "Ukupno",
|
"Total": "Ukupno",
|
||||||
"Payments": "Plaćanja",
|
"Payments": "Plaćanja",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Stödservern",
|
"Support server": "Stödservern",
|
||||||
"Documentation": "Dokumentation",
|
"Documentation": "Dokumentation",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "Support ControlPanel",
|
"Support CtrlPanel": "Support CtrlPanel",
|
||||||
"Servers": "Servers",
|
"Servers": "Servers",
|
||||||
"Total": "Total",
|
"Total": "Total",
|
||||||
"Payments": "Payments",
|
"Payments": "Payments",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "Destek sunucusu",
|
"Support server": "Destek sunucusu",
|
||||||
"Documentation": "Dökümantasyon",
|
"Documentation": "Dökümantasyon",
|
||||||
"Github": "GitHub",
|
"Github": "GitHub",
|
||||||
"Support ControlPanel": "ContrılPanel'i destekle",
|
"Support CtrlPanel": "CtrlPanel'i destekle",
|
||||||
"Servers": "Sunucular",
|
"Servers": "Sunucular",
|
||||||
"Total": "Toplam",
|
"Total": "Toplam",
|
||||||
"Payments": "Ödemeler",
|
"Payments": "Ödemeler",
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
"Support server": "支持服务器",
|
"Support server": "支持服务器",
|
||||||
"Documentation": "文档",
|
"Documentation": "文档",
|
||||||
"Github": "Github",
|
"Github": "Github",
|
||||||
"Support ControlPanel": "支持我们",
|
"Support CtrlPanel": "支持我们",
|
||||||
"Servers": "服务器",
|
"Servers": "服务器",
|
||||||
"Total": "总数",
|
"Total": "总数",
|
||||||
"Payments": "支付费用",
|
"Payments": "支付费用",
|
||||||
|
|
2
package-lock.json
generated
2
package-lock.json
generated
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"name": "controlpanel",
|
"name": "CtrlPanel",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<env name="BCRYPT_ROUNDS" value="4"/>
|
<env name="BCRYPT_ROUNDS" value="4"/>
|
||||||
<env name="CACHE_DRIVER" value="array"/>
|
<env name="CACHE_DRIVER" value="array"/>
|
||||||
<env name="DB_CONNECTION" value="mysql"/>
|
<env name="DB_CONNECTION" value="mysql"/>
|
||||||
<env name="DB_DATABASE" value="controlpanel_test"/>
|
<env name="DB_DATABASE" value="ctrlpanel_test"/>
|
||||||
<env name="MAIL_MAILER" value="array"/>
|
<env name="MAIL_MAILER" value="array"/>
|
||||||
<env name="QUEUE_CONNECTION" value="sync"/>
|
<env name="QUEUE_CONNECTION" value="sync"/>
|
||||||
<env name="SESSION_DRIVER" value="array"/>
|
<env name="SESSION_DRIVER" value="array"/>
|
||||||
|
|
|
@ -87,7 +87,7 @@ if (isset($_POST['feedDB'])) {
|
||||||
header('LOCATION: index.php?step=3');
|
header('LOCATION: index.php?step=3');
|
||||||
} catch (\Throwable $th) {
|
} catch (\Throwable $th) {
|
||||||
wh_log('Feeding the Database failed', 'error');
|
wh_log('Feeding the Database failed', 'error');
|
||||||
header("LOCATION: index.php?step=2.5&message=" . $th->getMessage() . " <br>Please check the installer.log file in /var/www/controlpanel/storage/logs !");
|
header("LOCATION: index.php?step=2.5&message=" . $th->getMessage() . " <br>Please check the installer.log file in /var/www/ctrlpanel/storage/logs !");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -262,7 +262,7 @@ function wh_log(string $message, string $level = 'info', array $context = []): v
|
||||||
$stream = new StreamHandler(dirname(__FILE__, 3) . '/storage/logs/installer.log', Logger::DEBUG);
|
$stream = new StreamHandler(dirname(__FILE__, 3) . '/storage/logs/installer.log', Logger::DEBUG);
|
||||||
$stream->setFormatter($formatter);
|
$stream->setFormatter($formatter);
|
||||||
|
|
||||||
$log = new Logger('ControlPanel');
|
$log = new Logger('CtrlPanel');
|
||||||
$log->pushHandler($stream);
|
$log->pushHandler($stream);
|
||||||
|
|
||||||
switch (strtolower($level)) {
|
switch (strtolower($level)) {
|
||||||
|
|
|
@ -143,7 +143,7 @@ function cardStart($title, $subtitle = null)
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="flex flex-col mb-3">
|
<div class="flex flex-col mb-3">
|
||||||
<label for="databaseuser">Database User</label>
|
<label for="databaseuser">Database User</label>
|
||||||
<input x-model="databaseuser" id="databaseuser" name="databaseuser" type="text" required value="controlpaneluser" class="px-2 py-1 bg-[#1D2125] border-2 focus:border-sky-500 box-border rounded-md border-transparent outline-none">
|
<input x-model="databaseuser" id="databaseuser" name="databaseuser" type="text" required value="ctrlpanel" class="px-2 py-1 bg-[#1D2125] border-2 focus:border-sky-500 box-border rounded-md border-transparent outline-none">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
@ -156,7 +156,7 @@ function cardStart($title, $subtitle = null)
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<label for="database">Database</label>
|
<label for="database">Database</label>
|
||||||
<input x-model="database" id="database" name="database" type="text" required value="controlpanel" class="px-2 py-1 bg-[#1D2125] border-2 focus:border-sky-500 box-border rounded-md border-transparent outline-none">
|
<input x-model="database" id="database" name="database" type="text" required value="ctrlpanel" class="px-2 py-1 bg-[#1D2125] border-2 focus:border-sky-500 box-border rounded-md border-transparent outline-none">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta content="{{ config('SETTINGS::SYSTEM:SEO_TITLE') }}" property="og:title">
|
<meta content="{{ config('SETTINGS::SYSTEM:SEO_TITLE') }}" property="og:title">
|
||||||
<meta content="{{ config('SETTINGS::SYSTEM:SEO_DESCRIPTION') }}" property="og:description">
|
<meta content="{{ config('SETTINGS::SYSTEM:SEO_DESCRIPTION') }}" property="og:description">
|
||||||
<meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image">
|
<meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/ctrlpanel_logo.png') }}' property="og:image">
|
||||||
|
|
||||||
<!-- CSRF Token -->
|
<!-- CSRF Token -->
|
||||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<meta content="{{ $website_settings->seo_title }}" property="og:title">
|
<meta content="{{ $website_settings->seo_title }}" property="og:title">
|
||||||
<meta content="{{ $website_settings->seo_description }}" property="og:description">
|
<meta content="{{ $website_settings->seo_description }}" property="og:description">
|
||||||
<meta
|
<meta
|
||||||
content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}'
|
content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/ctrlpanel_logo.png') }}'
|
||||||
property="og:image">
|
property="og:image">
|
||||||
<title>{{ config('app.name', 'Laravel') }}</title>
|
<title>{{ config('app.name', 'Laravel') }}</title>
|
||||||
<link rel="icon"
|
<link rel="icon"
|
||||||
|
@ -201,7 +201,7 @@
|
||||||
<!-- Brand Logo -->
|
<!-- Brand Logo -->
|
||||||
<a href="{{ route('home') }}" class="brand-link">
|
<a href="{{ route('home') }}" class="brand-link">
|
||||||
<img width="64" height="64"
|
<img width="64" height="64"
|
||||||
src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/controlpanel_logo.png') }}"
|
src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/ctrlpanel_logo.png') }}"
|
||||||
alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle"
|
alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle"
|
||||||
style="opacity: .8">
|
style="opacity: .8">
|
||||||
<span class="brand-text font-weight-light">{{ config('app.name', 'CtrlPanel.gg') }}</span>
|
<span class="brand-text font-weight-light">{{ config('app.name', 'CtrlPanel.gg') }}</span>
|
||||||
|
|
|
@ -120,7 +120,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="ml-5 card" style="width: 18rem;">
|
<div class="ml-5 card" style="width: 18rem;">
|
||||||
<span class="text-center h3">{{ __('FavIcon') }} </span>
|
<span class="text-center h3">{{ __('FavIcon') }} </span>
|
||||||
<img src="{{ Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('images/controlpanel_logo.png') }}"
|
<img src="{{ Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('images/ctrlpanel_logo.png') }}"
|
||||||
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
|
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
|
||||||
class="card-img-top" alt="...">
|
class="card-img-top" alt="...">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
|
|
||||||
<div class="ml-5 card" style="width: 18rem;">
|
<div class="ml-5 card" style="width: 18rem;">
|
||||||
<span class="text-center h3">{{ __('Icon') }} </span>
|
<span class="text-center h3">{{ __('Icon') }} </span>
|
||||||
<img src="{{ Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/controlpanel_logo.png') }}"
|
<img src="{{ Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/ctrlpanel_logo.png') }}"
|
||||||
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
|
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
|
||||||
class="card-img-top" alt="...">
|
class="card-img-top" alt="...">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
@ -144,7 +144,7 @@
|
||||||
|
|
||||||
<div class="ml-5 card" style="width: 18rem;">
|
<div class="ml-5 card" style="width: 18rem;">
|
||||||
<span class="text-center h3">{{ __('Login-page Logo') }} </span>
|
<span class="text-center h3">{{ __('Login-page Logo') }} </span>
|
||||||
<img src="{{ Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}"
|
<img src="{{ Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/ctrlpanel_logo.png') }}"
|
||||||
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
|
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
|
||||||
class="card-img-top" alt="...">
|
class="card-img-top" alt="...">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<a href="{{ route('welcome') }}" class="h1 mb-2"><b
|
<a href="{{ route('welcome') }}" class="h1 mb-2"><b
|
||||||
class="mr-1">{{ config('app.name', 'Laravel') }}</b></a>
|
class="mr-1">{{ config('app.name', 'Laravel') }}</b></a>
|
||||||
@if ($website_settings->enable_login_logo)
|
@if ($website_settings->enable_login_logo)
|
||||||
<img src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}"
|
<img src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/ctrlpanel_logo.png') }}"
|
||||||
alt="{{ config('app.name', 'CtrlPanel.gg') }} Logo" style="opacity: .8; max-width:100%; height: 150px; margin-top: 10px;">
|
alt="{{ config('app.name', 'CtrlPanel.gg') }} Logo" style="opacity: .8; max-width:100%; height: 150px; margin-top: 10px;">
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta content="{{ $website_settings->seo_title }}" property="og:title">
|
<meta content="{{ $website_settings->seo_title }}" property="og:title">
|
||||||
<meta content="{{ $website_settings->seo_description }}" property="og:description">
|
<meta content="{{ $website_settings->seo_description }}" property="og:description">
|
||||||
<meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image">
|
<meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('/logo.png') : asset('images/ctrlpanel_logo.png') }}' property="og:image">
|
||||||
|
|
||||||
<!-- CSRF Token -->
|
<!-- CSRF Token -->
|
||||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<meta content="{{ $website_settings->seo_title }}" property="og:title">
|
<meta content="{{ $website_settings->seo_title }}" property="og:title">
|
||||||
<meta content="{{ $website_settings->seo_description }}" property="og:description">
|
<meta content="{{ $website_settings->seo_description }}" property="og:description">
|
||||||
<meta
|
<meta
|
||||||
content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}'
|
content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/ctrlpanel_logo.png') }}'
|
||||||
property="og:image">
|
property="og:image">
|
||||||
<title>{{ config('app.name', 'Laravel') }}</title>
|
<title>{{ config('app.name', 'Laravel') }}</title>
|
||||||
<link rel="icon"
|
<link rel="icon"
|
||||||
|
@ -201,7 +201,7 @@
|
||||||
<!-- Brand Logo -->
|
<!-- Brand Logo -->
|
||||||
<a href="{{ route('home') }}" class="brand-link">
|
<a href="{{ route('home') }}" class="brand-link">
|
||||||
<img width="64" height="64"
|
<img width="64" height="64"
|
||||||
src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/controlpanel_logo.png') }}"
|
src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/ctrlpanel_logo.png') }}"
|
||||||
alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle"
|
alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle"
|
||||||
style="opacity: .8">
|
style="opacity: .8">
|
||||||
<span class="brand-text font-weight-light">{{ config('app.name', 'CtrlPanel.gg') }}</span>
|
<span class="brand-text font-weight-light">{{ config('app.name', 'CtrlPanel.gg') }}</span>
|
||||||
|
|
Loading…
Reference in a new issue