diff --git a/app/Actions/Proxy/CheckProxy.php b/app/Actions/Proxy/CheckProxy.php index 99537e606..eab534ef9 100644 --- a/app/Actions/Proxy/CheckProxy.php +++ b/app/Actions/Proxy/CheckProxy.php @@ -102,7 +102,8 @@ public function handle(Server $server, $fromUI = false): bool foreach ($conflicts as $port => $conflict) { if ($conflict) { if ($fromUI) { - throw new \Exception("Port $port is in use.
You must stop the process using this port.

Docs: https://coolify.io/docs
Discord: https://coolify.io/discord"); + // MapleDeploy branding: support links + throw new \Exception("Port $port is in use.
You must stop the process using this port.

Support: https://mapledeploy.ca/contact"); } else { return false; } diff --git a/app/Http/Controllers/Api/OpenApi.php b/app/Http/Controllers/Api/OpenApi.php index 33d21ba5d..26b3ef519 100644 --- a/app/Http/Controllers/Api/OpenApi.php +++ b/app/Http/Controllers/Api/OpenApi.php @@ -4,8 +4,9 @@ use OpenApi\Attributes as OA; -#[OA\Info(title: 'Coolify', version: '0.1')] -#[OA\Server(url: 'https://app.coolify.io/api/v1', description: 'Coolify Cloud API. Change the host to your own instance if you are self-hosting.')] +// MapleDeploy branding: API documentation +#[OA\Info(title: 'MapleDeploy', version: '0.1')] +#[OA\Server(url: '/api/v1', description: 'MapleDeploy API. Powered by Coolify.')] #[OA\SecurityScheme( type: 'http', scheme: 'bearer', diff --git a/app/Http/Controllers/Api/OtherController.php b/app/Http/Controllers/Api/OtherController.php index f17a4e46b..8a8c9f07e 100644 --- a/app/Http/Controllers/Api/OtherController.php +++ b/app/Http/Controllers/Api/OtherController.php @@ -4,7 +4,6 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Http; use OpenApi\Attributes as OA; class OtherController extends Controller @@ -265,23 +264,6 @@ public function disable_mcp(Request $request) return response()->json(['message' => 'MCP server disabled.'], 200); } - public function feedback(Request $request) - { - $data = $request->validate([ - 'content' => ['required', 'string', 'min:10', 'max:2000'], - ]); - - $webhook_url = config('constants.webhooks.feedback_discord_webhook'); - if ($webhook_url) { - Http::timeout(5)->post($webhook_url, [ - 'content' => $data['content'], - 'allowed_mentions' => ['parse' => []], - ]); - } - - return response()->json(['message' => 'Feedback sent.'], 200); - } - #[OA\Get( summary: 'Healthcheck', description: 'Healthcheck endpoint.', diff --git a/app/Livewire/Help.php b/app/Livewire/Help.php deleted file mode 100644 index 421e50bcc..000000000 --- a/app/Livewire/Help.php +++ /dev/null @@ -1,58 +0,0 @@ -validate(); - $this->rateLimit(3, 30); - - $settings = instanceSettings(); - $mail = new MailMessage; - $mail->view( - 'emails.help', - [ - 'description' => $this->description, - ] - ); - $mail->subject("[HELP]: {$this->subject}"); - $type = set_transanctional_email_settings($settings); - - // Sending feedback through Cloud API - if (blank($type)) { - $url = 'https://app.coolify.io/api/feedback'; - Http::post($url, [ - 'content' => 'User: `'.auth()->user()?->email.'` with subject: `'.$this->subject.'` has the following problem: `'.$this->description.'`', - ]); - } else { - send_user_an_email($mail, auth()->user()?->email, 'feedback@coollabs.io'); - } - $this->dispatch('success', 'Feedback sent.', 'We will get in touch with you as soon as possible.'); - $this->reset('description', 'subject'); - } catch (\Throwable $e) { - return handleError($e, $this); - } - } - - public function render() - { - return view('livewire.help')->layout('layouts.app'); - } -} diff --git a/app/Livewire/Settings/Advanced.php b/app/Livewire/Settings/Advanced.php index 3a6237183..702ee395a 100644 --- a/app/Livewire/Settings/Advanced.php +++ b/app/Livewire/Settings/Advanced.php @@ -28,8 +28,7 @@ class Advanced extends Component public ?string $allowed_ips = null; - #[Validate('boolean')] - public bool $is_sponsorship_popup_enabled; + // MapleDeploy branding: is_sponsorship_popup_enabled removed (popup removed) #[Validate('boolean')] public bool $disable_two_step_confirmation; @@ -49,7 +48,6 @@ public function rules() 'custom_dns_servers' => ['nullable', 'string', new ValidDnsServers], 'is_api_enabled' => 'boolean', 'allowed_ips' => ['nullable', 'string', new ValidIpOrCidr], - 'is_sponsorship_popup_enabled' => 'boolean', 'disable_two_step_confirmation' => 'boolean', 'is_wire_navigate_enabled' => 'boolean', 'is_mcp_server_enabled' => 'boolean', @@ -69,7 +67,6 @@ public function mount() $this->is_dns_validation_enabled = $this->settings->is_dns_validation_enabled; $this->is_api_enabled = $this->settings->is_api_enabled; $this->disable_two_step_confirmation = $this->settings->disable_two_step_confirmation; - $this->is_sponsorship_popup_enabled = $this->settings->is_sponsorship_popup_enabled; $this->is_wire_navigate_enabled = $this->settings->is_wire_navigate_enabled ?? true; $this->is_mcp_server_enabled = $this->settings->is_mcp_server_enabled ?? false; } @@ -152,7 +149,6 @@ public function instantSave() $this->settings->custom_dns_servers = $this->custom_dns_servers; $this->settings->is_api_enabled = $this->is_api_enabled; $this->settings->allowed_ips = $this->allowed_ips; - $this->settings->is_sponsorship_popup_enabled = $this->is_sponsorship_popup_enabled; $this->settings->disable_two_step_confirmation = $this->disable_two_step_confirmation; $this->settings->is_wire_navigate_enabled = $this->is_wire_navigate_enabled; $this->settings->is_mcp_server_enabled = $this->is_mcp_server_enabled; diff --git a/config/app.php b/config/app.php index a94cfadd8..08b3bd88f 100644 --- a/config/app.php +++ b/config/app.php @@ -17,7 +17,7 @@ | */ - 'name' => env('APP_NAME', 'Coolify'), + 'name' => env('APP_NAME', 'MapleDeploy'), // MapleDeploy branding /* |-------------------------------------------------------------------------- diff --git a/public/mapledeploy-favicon.ico b/public/mapledeploy-favicon.ico new file mode 100644 index 000000000..8cc2c38c1 Binary files /dev/null and b/public/mapledeploy-favicon.ico differ diff --git a/resources/views/components/callout.blade.php b/resources/views/components/callout.blade.php index ec99729ef..8203d6735 100644 --- a/resources/views/components/callout.blade.php +++ b/resources/views/components/callout.blade.php @@ -48,7 +48,7 @@ {!! $icon !!}
-
+
{{ $title }}
diff --git a/resources/views/components/emails/footer.blade.php b/resources/views/components/emails/footer.blade.php index 199aa96c1..9e64d8bde 100644 --- a/resources/views/components/emails/footer.blade.php +++ b/resources/views/components/emails/footer.blade.php @@ -1,6 +1,7 @@ {{ Illuminate\Mail\Markdown::parse('---') }} Thank you,
-{{ config('app.name') ?? 'Coolify' }} +{{ config('app.name') ?? 'MapleDeploy' }} -{{ Illuminate\Mail\Markdown::parse('[Contact Support](https://coolify.io/docs/contact)') }} +{{-- MapleDeploy branding: support link --}} +{{ Illuminate\Mail\Markdown::parse('[Contact Support](https://mapledeploy.ca/contact)') }} diff --git a/resources/views/components/limit-reached.blade.php b/resources/views/components/limit-reached.blade.php index 1fc26bbe0..0295a9a97 100644 --- a/resources/views/components/limit-reached.blade.php +++ b/resources/views/components/limit-reached.blade.php @@ -1,5 +1,5 @@
- You have reached the limit of {{ $name }} you can create. + You have reached the limit of {{ $name }} you can create. Please upgrade your subscription to create more {{ $name }}. diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index ecd798cc2..cb92f1b30 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -103,16 +103,21 @@ }">
-
- Coolify - + {{-- MapleDeploy branding --}} +
+ + MapleDeploy + + + Powered by Coolify
+ {{-- MapleDeploy branding: collapsed-sidebar mark --}} @@ -324,20 +329,7 @@ class="{{ request()->is('team*') ? 'menu-item-active menu-item' : 'menu-item' }} Teams - @if (isCloud() && auth()->user()->isAdmin()) -
  • - - - - - Subscription - -
  • - @endif + {{-- MapleDeploy branding: Cloud subscription menu removed --}} @if (isInstanceAdmin())
  • @@ -357,20 +349,7 @@ class="{{ request()->is('settings*') ? 'menu-item-active menu-item' : 'menu-item
  • @endif - @if (isCloud() || isDev()) - @if (isInstanceAdmin() || session('impersonating')) -
  • - - - - - Admin - -
  • - @endif - @endif + {{-- MapleDeploy branding: Cloud admin menu removed --}}
  • @@ -454,39 +433,19 @@ class="{{ request()->is('onboarding*') ? 'menu-item-active menu-item' : 'menu-it Onboarding
  • --}} + {{-- MapleDeploy branding: AGPL source code link (license requirement) --}}
  • - - - - - - + + - Sponsor us + Source code
  • @endif - @if (!isSubscribed() && isCloud() && auth()->user()->teams()->get()->count() > 1) - - @endif -
  • - - - - - - -
  • @csrf diff --git a/resources/views/components/pricing-plans.blade.php b/resources/views/components/pricing-plans.blade.php index 67b97e2d1..101fa1d16 100644 --- a/resources/views/components/pricing-plans.blade.php +++ b/resources/views/components/pricing-plans.blade.php @@ -35,19 +35,21 @@ class="font-bold dark:text-warning">{{ config('constants.limits.trial_period') }
  • + {{-- MapleDeploy branding: link to Forgejo source repo --}}

    Unlimited Trial Get Started + href="https://forgejo.mapledeploy.ca/rosslh/coolify">Get Started

    Start self-hosting without limits with - our - OSS version. Same features as the paid version, but you have to manage by yourself.

    + the + open source version. Same features as the paid version, but you have to manage by yourself.

    + {{-- MapleDeploy branding: link to mapledeploy.ca --}}
    For the detailed list of features, please visit our landing page: coolify.io
    + class="font-bold underline dark:text-white" href="https://mapledeploy.ca">mapledeploy.ca
    diff --git a/resources/views/components/settings/navbar.blade.php b/resources/views/components/settings/navbar.blade.php index 565e485d0..6a25e9a98 100644 --- a/resources/views/components/settings/navbar.blade.php +++ b/resources/views/components/settings/navbar.blade.php @@ -1,6 +1,6 @@

    Settings

    -
    Instance wide settings for Coolify.
    +
    Instance wide settings for MapleDeploy.
    @endif \ No newline at end of file diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php index 26a404b17..8e0e786fc 100644 --- a/resources/views/livewire/dashboard.blade.php +++ b/resources/views/livewire/dashboard.blade.php @@ -1,12 +1,13 @@
    - Dashboard | Coolify + Dashboard | MapleDeploy @if (session('error')) @endif

    Dashboard

    -
    Your self-hosted infrastructure.
    + {{-- MapleDeploy branding --}} +
    Your deployment platform.
    diff --git a/resources/views/livewire/destination/index.blade.php b/resources/views/livewire/destination/index.blade.php index dcf317c2b..f771d0a64 100644 --- a/resources/views/livewire/destination/index.blade.php +++ b/resources/views/livewire/destination/index.blade.php @@ -1,6 +1,6 @@
    - Destinations | Coolify + Destinations | MapleDeploy

    Destinations

    diff --git a/resources/views/livewire/help.blade.php b/resources/views/livewire/help.blade.php deleted file mode 100644 index dea6ca46c..000000000 --- a/resources/views/livewire/help.blade.php +++ /dev/null @@ -1,11 +0,0 @@ -
    -
    Your feedback helps us to improve Coolify. Thank you! 💜
    - - - -
    - Send - -
    diff --git a/resources/views/livewire/layout-popups.blade.php b/resources/views/livewire/layout-popups.blade.php index 1aa533c03..26cb055f7 100644 --- a/resources/views/livewire/layout-popups.blade.php +++ b/resources/views/livewire/layout-popups.blade.php @@ -1,12 +1,10 @@
    WARNING: Cannot connect to real-time service + {{-- MapleDeploy branding: support links updated --}}
    This will cause unusual problems on the UI!

    - Please ensure that you have opened the - required ports or get - help on Discord. + Please contact MapleDeploy support for help.
    @@ -86,52 +82,7 @@ @endif @endauth - @if (instanceSettings()->is_sponsorship_popup_enabled && !isCloud()) - - - -
    - -
    -
    Love Coolify? Support our work. -
    -
    - We are already profitable thanks to YOU - but...
    We - would - like to - make - more cool features. -
    -
    - For this we need your help to support our work financially. -
    -
    -
    - GitHub - Sponsors - Open - Collective - Stripe -
    - Maybe next time -
    -
    -
    -
    -
    -
    - @endif + {{-- MapleDeploy branding: Coolify sponsorship popup removed --}} @if (request()->query->get('cancelled'))
    @@ -209,10 +160,7 @@ class="underline dark:text-white">/subscription to update your subscription @endif