Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.env.example
#	.github/ISSUE_TEMPLATE/bug.yml
#	LICENSE
#	README.md
#	app/Extensions/PaymentGateways/Mollie/MollieExtension.php
#	app/Extensions/PaymentGateways/Mollie/MollieSettings.php
#	app/Extensions/PaymentGateways/Mollie/web_routes.php
#	app/Extensions/PaymentGateways/PayPal/PayPalExtension.php
#	app/Extensions/PaymentGateways/PayPal/PayPalSettings.php
#	app/Extensions/PaymentGateways/PayPal/migrations/2023_03_04_135248_create_pay_pal_settings.php
#	app/Extensions/PaymentGateways/PayPal/web_routes.php
#	app/Extensions/PaymentGateways/Stripe/StripeExtension.php
#	app/Extensions/PaymentGateways/Stripe/StripeSettings.php
#	app/Extensions/PaymentGateways/Stripe/migrations/2023_03_04_181917_create_stripe_settings.php
#	app/Extensions/PaymentGateways/Stripe/web_routes.php
#	app/Helpers/ExtensionHelper.php
#	app/Http/Controllers/Admin/ApplicationApiController.php
#	app/Http/Controllers/Admin/OverViewController.php
#	app/Http/Controllers/Admin/PartnerController.php
#	app/Http/Controllers/Admin/PaymentController.php
#	app/Http/Controllers/Admin/ProductController.php
#	app/Http/Controllers/Admin/ServerController.php
#	app/Http/Controllers/Admin/SettingsController.php
#	app/Http/Controllers/Admin/ShopProductController.php
#	app/Http/Controllers/Admin/TicketsController.php
#	app/Http/Controllers/Admin/UsefulLinkController.php
#	app/Http/Controllers/Admin/UserController.php
#	app/Http/Controllers/Admin/VoucherController.php
#	app/Http/Controllers/Api/UserController.php
#	app/Http/Controllers/Auth/ForgotPasswordController.php
#	app/Http/Controllers/Auth/RegisterController.php
#	app/Http/Controllers/HomeController.php
#	app/Http/Controllers/ProductController.php
#	app/Http/Controllers/ProfileController.php
#	app/Http/Controllers/ServerController.php
#	app/Http/Controllers/TicketsController.php
#	app/Http/Middleware/GlobalNames.php
#	app/Listeners/UserPayment.php
#	app/Listeners/Verified.php
#	app/Models/Server.php
#	app/Models/User.php
#	app/Notifications/ReferralNotification.php
#	app/Providers/AppServiceProvider.php
#	app/Providers/EventServiceProvider.php
#	app/Settings/DiscordSettings.php
#	app/Settings/GeneralSettings.php
#	app/Settings/InvoiceSettings.php
#	app/Settings/LocaleSettings.php
#	app/Settings/MailSettings.php
#	app/Settings/PterodactylSettings.php
#	app/Settings/ReferralSettings.php
#	app/Settings/ServerSettings.php
#	app/Settings/TicketSettings.php
#	app/Settings/UserSettings.php
#	app/Settings/WebsiteSettings.php
#	app/Traits/Invoiceable.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/mail.php
#	config/settings.php
#	database/migrations/2023_04_03_231829_update_users_table.php
#	database/settings/2023_02_01_164731_create_general_settings.php
#	database/settings/2023_02_01_181334_create_pterodactyl_settings.php
#	database/settings/2023_02_01_181453_create_mail_settings.php
#	database/settings/2023_02_01_181925_create_user_settings.php
#	database/settings/2023_02_01_181950_create_server_settings.php
#	database/settings/2023_02_01_182021_create_invoice_settings.php
#	database/settings/2023_02_01_182043_create_discord_settings.php
#	database/settings/2023_02_01_182108_create_locale_settings.php
#	database/settings/2023_02_01_182135_create_referral_settings.php
#	database/settings/2023_02_01_182158_create_website_settings.php
#	database/settings/2023_02_04_181156_create_ticket_settings.php
#	docker/docker-compose.yml
#	docker/php/Dockerfile
#	lang/cs.json
#	lang/en.json
#	package-lock.json
#	public/install/forms.php
#	public/install/functions.php
#	public/install/index.php
#	public/installer/tailwind.config.js
#	public/installer/tailwind_styles.css
#	routes/web.php
#	themes/BlueInfinity/views/layouts/main.blade.php
#	themes/default/views/admin/activitylogs/index.blade.php
#	themes/default/views/admin/overview/index.blade.php
#	themes/default/views/admin/products/create.blade.php
#	themes/default/views/admin/products/edit.blade.php
#	themes/default/views/admin/servers/edit.blade.php
#	themes/default/views/admin/servers/index.blade.php
#	themes/default/views/admin/settings/index.blade.php
#	themes/default/views/admin/users/show.blade.php
#	themes/default/views/auth/login.blade.php
#	themes/default/views/auth/register.blade.php
#	themes/default/views/home.blade.php
#	themes/default/views/information/privacy-content.blade.php
#	themes/default/views/layouts/app.blade.php
#	themes/default/views/layouts/main.blade.php
#	themes/default/views/profile/index.blade.php
#	themes/default/views/servers/create.blade.php
#	themes/default/views/servers/index.blade.php
#	themes/default/views/servers/settings.blade.php
#	themes/default/views/store/checkout.blade.php
#	themes/default/views/store/index.blade.php
  • Loading branch information
IceToast committed Nov 24, 2024
2 parents 4358d07 + c26d81f commit 338a887
Show file tree
Hide file tree
Showing 320 changed files with 18,967 additions and 21,771 deletions.
25 changes: 23 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,34 @@ root = true
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_size = 2
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml}]
indent_size = 2

[docker-compose.yml]
indent_size = 2

[*.php]
indent_size = 4

[*.blade.php]
indent_size = 2

[*.js]
indent_size = 4

[*.jsx]
indent_size = 2

[*.tsx]
indent_size = 2

[*.json]
indent_size = 4
59 changes: 43 additions & 16 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,28 +1,54 @@
# ⚠️ CAUTION: Advanced Configuration ⚠️
#
# This file (.env) stores sensitive environment variables.
# Modifying these values can significantly impact your application's behavior.
#
# Proceed with caution:
# - Only edit if you have a clear understanding of the specific variable and its purpose.
# - Use the control panel or installer for most configuration changes whenever possible.
# - Keep a backup of this file before making any modifications.
#
# Need Help? Consult the documentation or contact support before making changes.

### --- App Settings --- ###
APP_NAME=Ctrlpanel.gg
APP_NAME=CtrlPanel.gg
APP_ENV=production
APP_KEY=
APP_DEBUG=false
APP_URL=http://localhost
# List with timezones https://www.php.net/manual/en/timezones.php
APP_TIMEZONE=UTC
### --- App Settings End --- ###

### --- DB Settings (required) --- ###
### --- Database Settings (required) --- ###
# SQL
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=dashboard
DB_USERNAME=dashboarduser
DB_PASSWORD=
### --- DB Settings End --- ###

### --- Discord Settings (required for Discord OAuth) --- ###
DISCORD_CLIENT_ID=
DISCORD_CLIENT_SECRET=

### --- Discord Settings End --- ###

# Google Recaptcha API Credentials - https://www.google.com/recaptcha/admin - reCaptcha V2 (not v3)
### --- Google Recaptcha Settings --- ###
RECAPTCHA_SITE_KEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
RECAPTCHA_SECRET_KEY=6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe
### --- Google Recaptcha Settings End --- ###

# No-SQL
MEMCACHED_HOST=127.0.0.1

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
### --- Database Settings End --- ###

# Mail Server Settings - (HOST -> SMTP Server)

### --- Mail Server Settings --- ###
MAIL_MAILER=smtp
MAIL_HOST=mailhog
MAIL_PORT=1025
Expand All @@ -31,25 +57,22 @@ MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS=null
MAIL_FROM_NAME="${APP_NAME}"
### --- Mail Server Settings End --- ###


# Laravel Logging Settings - https://laravel.com/docs/5.7/logging - Not needed to be changed
### --- Logging Settings --- ###
LOG_CHANNEL=stack
LOG_LEVEL=debug
### --- Logging Settings End --- ###

# Do not change anything below this line
BROADCAST_DRIVER=log
### --- Cache and Queue Settings --- ###
CACHE_DRIVER=file
QUEUE_CONNECTION=database
SESSION_DRIVER=file
SESSION_LIFETIME=120
SETTINGS_CACHE_ENABLED=true
### --- Cache and Queue Settings End --- ###

MEMCACHED_HOST=127.0.0.1

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

### --- External Services Credentials --- ###
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
Expand All @@ -62,3 +85,7 @@ PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

RECAPTCHA_SITE_KEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
RECAPTCHA_SECRET_KEY=6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe
### --- External Services Credentials End --- ###
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Automatically detect text files
* text=auto

# Vendored files for specific languages
*.css linguist-vendored
*.scss linguist-vendored
*.js linguist-vendored

# Ignore CHANGELOG.md when exporting
CHANGELOG.md export-ignore
22 changes: 22 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
## Code of Conduct

### 🤝 Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

### 🌟 Our Standards
Examples of behavior that contributes to creating a positive environment include:

- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

- The use of sexualized language or imagery and unwelcome sexual attention or advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a professional setting
37 changes: 37 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Contributing Guidelines

Thank you for considering contributing to this repository! Before making a contribution, please take a moment to review the following guidelines.

## 🕵️‍♂️ Finding Tasks

Check the open issues to see if there's something you can contribute to. If you have an idea or encounter a bug that's not already listed, feel free to create a new issue and wait for feedback from the development team.

## 🤝 Code of Conduct & Contributor License

Please adhere to our [Code of Conduct](https://github.com/Ctrlpanel-gg/panel/blob/main/.github/CODE_OF_CONDUCT.md) and our [Contributor License](https://github.com/Ctrlpanel-gg/panel/blob/main/CONTRIBUTOR_LICENSE_AGREEMENT.md) in all your interactions with the project.

## 🌍 Localization

Please read our [Localization Guide](https://github.com/Ctrlpanel-gg/panel/blob/main/lang/README.md) on how to manage and add localization to the project.

## 🚀 Pull Request Process

1. Provide a clear and descriptive title for your pull request (PR) summarizing the changes in this format : 'commit-norms-action: what-you-are-doing'.
2. If your PR is not yet finished, correctly mark it as a draft and mention any errors it's correcting.
3. The development team will review your code and offer feedback or approve/merge it as necessary.
4. Ensure that your PR adheres to our Code of Conduct and coding style guidelines.
5. Test your changes thoroughly to ensure they function as expected.
6. Include relevant documentation updates if applicable.
7. Address any review comments promptly to expedite the review process.

### 💻 Coding Style

We adhere to the PSR12 code standard for PHP.

- Follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) commit norms.
- Name your PR branch as [commit-norms-action]/what-you-are-doing.
- Make clear commits, one per action, and include comments.

⚠️ **Important Note:** The owner of the project has the final decision, and the development team of CtrlPanel reserves the right to close incorrect PRs. PRs that remain inactive or invalid for an extended period may also be subject to closure.

Thank you for your contributions! 🎉
5 changes: 2 additions & 3 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: "\U0001F41B Bug report"
description: Create a report to help us improve
title: "[Bug]: "
labels: ["bug"]
body:
- type: textarea
Expand Down Expand Up @@ -33,8 +32,8 @@ body:
- type: textarea
id: ctrlpanel-logs
attributes:
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`
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/ctrlpanel/storage/logs/laravel.log | nc pteropaste.com 99`
render: Shell
- type: textarea
id: additional-info
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ contact_links:
about: Please visit our Discord for help with your installation.
- name: ❓ General Question
url: https://discord.gg/4Y6HjD2uyU
about: Please visit our Discord for general questions about the ControlPanel.
about: Please visit our Discord for general questions about the CtrlPanel.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: "\U0001F680 Feature request"
description: Suggest a feature or idea for this project
title: "[Feature] "
labels: ["feature"]
body:
- type: textarea
Expand Down
37 changes: 37 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
✨ Thank you for your contribution to our project! Before you submit your pull request, please take a moment to review and complete the following

⚠️ Please modify this template below and if not already done, read our contributing rules in .github folder, Thanks!

Ensure that your pull request meets the following criteria:

- The code follows the style guidelines of this project
- You have performed a self-review of your own code and tested it
- You have commented your code, particularly in hard-to-understand areas
- Your changes generate no new warnings

Delete the above text and the following sections before submitting your pull request.

---

💡 **Description**

Briefly describe the purpose of your pull request, including any relevant issue numbers it addresses.

---

🛠️ **Type of Change**

Please select the appropriate type of change:

- Bug fix (non-breaking change which fixes an issue)
- User interface (UI) improvement
- New feature (non-breaking change which adds functionality)
- Breaking change (a fix or feature that would cause existing functionality to not work as expected)
- Other
- This change requires a documentation update

---

🖼️ **Screenshots (if applicable)**

If your pull request includes any visual changes, please provide screenshots here, do not use any external link.
17 changes: 17 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Security Policy

## Reporting a Vulnerability

🛡️ If you discover a security vulnerability, please report it to us via GitHub Advisories.

⚠️ Please refrain from using the public issue tracker or discussing the vulnerability in public channels, as it may exacerbate the issue.

## Acceptance of Bug Bounty Platforms

At this time, we only accept vulnerability reports through GitHub Advisories. We kindly ask that you do not submit reports via other third-party bug bounty platforms, as they will be disregarded.

## Supported Versions
- Latests

### CtrlPanel Versions
We strongly recommend using or upgrading to the latest version of CtrlPanel to ensure you have access to the latest security fixes and enhancements.
43 changes: 43 additions & 0 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Build and Push Docker Image

on:
push:
tags:
- '*'

jobs:
build-and-push-docker-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Log in to the Container registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
context: .
push: true
file: docker/standalone/Dockerfile
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
38 changes: 24 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
# Ignore dependencies and cache
/.idea
/node_modules
/vendor
/storage/*.key

# Ignore public assets
/public/hot
/public/storage
/storage/*.key
/vendor
/storage/credit_deduction_log
storage/debugbar
/storage/app/public/logo.png

# Ignore environment files and configuration
.env
.env.testing
.env.backup
.idea
.env.dev

# Ignore testing and debug logs
.phpunit.result.cache
docker-compose.override.yml
Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
yarn.lock

# Ignore Docker and Homestead configuration
docker-compose.override.yml
Homestead.json
Homestead.yaml

# Ignore gitignore itself
.gitignore
.env.dev
.env.testing
storage/invoices.zip
storage/app/public/logo.png
*vscode
- Kopie.env

# Ignore installation logs and locks
public/install/logs.txt
install.lock
public/install/logs/installer.log

/.idea
cpggdatabase.sql
Loading

0 comments on commit 338a887

Please sign in to comment.