From e8fc895e51584839e06b87fd5949954170d67688 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 27 Feb 2023 09:19:59 -0800
Subject: [PATCH 1/9] "adds variables, but still not working"

---
 app/Http/Livewire/SlackSettingsForm.php       |  9 +++
 resources/lang/en/admin/settings/general.php  | 20 ++---
 .../livewire/slack-settings-form.blade.php    | 81 +++++++++++++++++--
 resources/views/settings/slack.blade.php      | 36 ++-------
 4 files changed, 100 insertions(+), 46 deletions(-)

diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
index cd34b450a..6df4bdeea 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -12,6 +12,12 @@ class SlackSettingsForm extends Component
     public $slack_channel;
     public $slack_botname;
     public $isDisabled ='disabled' ;
+    public $integration_app= 'WORKING';
+    public $webhook_link;
+    public $webhook_selected;
+    public $webhook_options= ['Slack'=>'fab fa-slack', 'Discord'=>'fab fa-discord', 'Rocket.Chat'=>'fab fa-rocketchat'];
+    public $webhook;
+    public $icon;
 
     public Setting $setting;
 
@@ -24,6 +30,8 @@ class SlackSettingsForm extends Component
     public function mount(){
 
         $this->setting = Setting::getSettings();
+        $this->icon ='';
+        $this->webhook = $this->webhook_selected;
         $this->slack_endpoint = $this->setting->slack_endpoint;
         $this->slack_channel = $this->setting->slack_channel;
         $this->slack_botname = $this->setting->slack_botname;
@@ -31,6 +39,7 @@ class SlackSettingsForm extends Component
     }
     public function updated($field){
 
+        $this->webhook = $this->webhook_selected;
         $this->validateOnly($field ,$this->rules);
     }
 
diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index 70c4932fd..d48714d7d 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -198,16 +198,16 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
-    'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. Click on the <strong>Test Slack Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'slack'                     => ':app',
+    'slack_title'               => 'Update :app Settings',
+    'slack_help'                => ':app settings',
+    'slack_botname'             => ':app Botname',
+    'slack_channel'             => ':app Channel',
+    'slack_endpoint'            => ':app Endpoint',
+    'slack_integration'         => ':app Settings',
+    'slack_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
+    'slack_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
+    'slack_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index 6d48220ca..4878998ec 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -1,4 +1,32 @@
+{{-- Page title --}}
+@section('title')
+    {{ trans('admin/settings/general.slack_title', ['app' => $integration_app ]) }}
+    @parent
+@stop
 
+@section('header_right')
+    <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
+@stop
+
+
+{{-- Page content --}}
+@section('content')
+
+<div class="row">
+    <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
+<div class="panel box box-default">
+    <div class="box-header with-border">
+        <h2 class="box-title">
+            <i class="{{$icon}}"></i> {{ trans('admin/settings/general.slack',['app' => $integration_app ]) }}
+        </h2>
+    </div>
+    <div class="box-body">
+        <div class="col-md-12">
+            <p>
+                {!! trans('admin/settings/general.slack_integration_help',array('slack_link' => $webhook_link, 'app' => $integration_app )) !!}
+            </p>
+            <br>
+        </div>
 
     <div class="col-md-12" style="border-top: 0px;">
         @if (session()->has('save'))
@@ -22,14 +50,32 @@
                 {{session('message')}}
             </div>
         @endif
-
+            <div class="form-group col-md-12">
+                <div class="col-md-3">
+                    <label>Integration Option</label>
+                </div>
+                <div class="col-md-6" >
+                    <select wire:model="webhook_selected"
+                            aria-label="webhook_selected"
+                            class="form-control "
+                    >
+                        <option value="">{{ trans('admin/settings/general.no_default_group') }}</option>
+                        @foreach ($webhook_options as $key => $webhook_option)
+                            <option value="{{$webhook_option}}" {{ $key ? 'selected' : '' }}>
+                                {{ $key }}
+                            </option>
+                        @endforeach
+                    </select>
+                    {{var_dump($webhook_selected)}}
+                </div><br><br><br>
+            </div>
         <form class="form-horizontal" role="form" wire:submit.prevent="submit">
         {{csrf_field()}}
 
         <!--slack endpoint-->
         <div class="form-group{{ $errors->has('slack_endpoint') ? ' error' : '' }}">
             <div class="col-md-2">
-                {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }}
+                {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint',['app' => $integration_app ])) }}
             </div>
             <div class="col-md-8 required">
                 @if (config('app.lock_passwords')===true)
@@ -45,7 +91,7 @@
         <!-- slack channel -->
         <div class="form-group{{ $errors->has('slack_channel') ? ' error' : '' }}">
             <div class="col-md-2">
-                {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }}
+                {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel',['app' => $integration_app ])) }}
             </div>
             <div class="col-md-8 required">
                 @if (config('app.lock_passwords')===true)
@@ -62,7 +108,7 @@
         <!-- slack botname -->
         <div class="form-group{{ $errors->has('slack_botname') ? ' error' : '' }}">
             <div class="col-md-2">
-                {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }}
+                {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname',['app' => $integration_app ])) }}
             </div>
             <div class="col-md-8">
                 @if (config('app.lock_passwords')===true)
@@ -80,7 +126,7 @@
             @if($slack_endpoint != null && $slack_channel != null)
         <div class="form-group">
                 <div class="col-md-offset-2 col-md-8">
-                    <a href="#" wire:click.prevent="testSlack" class="btn btn-default btn-sm pull-left"><span>{!! trans('admin/settings/general.slack_test') !!}</span></a>
+                    <a href="#" wire:click.prevent="testSlack" class="btn btn-default btn-sm pull-left"><span>{!! trans('admin/settings/general.slack_test',['app' => $integration_app ]) !!}</span></a>
                     <div wire:loading><span style="padding-left: 5px; font-size: 20px"><i class="fas fa-spinner fa-spin"></i></span></div>
                 </div>
         </div>
@@ -95,5 +141,30 @@
         </form>
 
     </div> <!-- /box -->
+    </div> <!-- /.col-md-8-->
+</div> <!-- /.row-->
+
+@stop
+
+@push('scripts')
+<script>
+    // function formatText (icon) {
+    //     return $('<span><i class="fab ' + $(icon.element).data('icon') + '"></i> ' + icon.text + '</span>');
+    // };
+    //
+    // $('.hook_options').select2({
+    //     width: "50%",
+    //     templateSelection: formatText,
+    //     templateResult: formatText
+    // });
+    // $(document).ready(function () {
+    //     $('.webhook_options').select2();
+    //     $('.webhook_options').on('change', function (e) {
+    //         let data = $('#select2').select2("val");
+    //         @this.set('webhook_option', data);
+    //     });
+    // });
 
 
+</script>
+@endpush
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index a5cbd8d0b..fac07c7cc 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -1,44 +1,18 @@
 @extends('layouts/default')
 
-{{-- Page title --}}
-@section('title')
-    {{ trans('admin/settings/general.slack_title') }}
-    @parent
-@stop
-
-@section('header_right')
-    <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
-@stop
 
 
-{{-- Page content --}}
-@section('content')
 
 
-    <div class="row">
-        <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
 
-            <div class="panel box box-default">
-                <div class="box-header with-border">
-                    <h2 class="box-title">
-                        <i class="fab fa-slack"></i> {{ trans('admin/settings/general.slack') }}
-                    </h2>
-                </div>
-                <div class="box-body">
-                    <div class="col-md-12">
-                        <p>
-                            {!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!}
-                        </p>
-                        <br>
-                    </div>
+
 
                     @livewire('slack-settings-form')
 
-        </div> <!-- /.col-md-8-->
-    </div> <!-- /.row-->
-
-
-@stop
+
+
+
+
 
 
 

From 354f04534e54540bf9566adf4692224940c6a66d Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 1 Mar 2023 12:30:32 -0800
Subject: [PATCH 2/9] add multi array, migration, still having issues

---
 app/Http/Livewire/SlackSettingsForm.php       |  71 ++--
 ..._adds_webhook_option_to_settings_table.php |  39 +++
 resources/lang/en/admin/settings/general.php  |  20 +-
 .../livewire/slack-settings-form.blade.php    | 306 +++++++++---------
 4 files changed, 256 insertions(+), 180 deletions(-)
 create mode 100644 database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php

diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
index 6df4bdeea..996a30e23 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -8,56 +8,74 @@ use App\Models\Setting;
 
 class SlackSettingsForm extends Component
 {
-    public $slack_endpoint;
-    public $slack_channel;
-    public $slack_botname;
+    public $webhook_endpoint;
+    public $webhook_channel;
+    public $webhook_botname;
     public $isDisabled ='disabled' ;
-    public $integration_app= 'WORKING';
     public $webhook_link;
     public $webhook_selected;
-    public $webhook_options= ['Slack'=>'fab fa-slack', 'Discord'=>'fab fa-discord', 'Rocket.Chat'=>'fab fa-rocketchat'];
-    public $webhook;
+    public $webhook_options = array(
+        array(
+            "name" => 'Slack',
+            "icon" => 'fab fa-slack',
+            "placeholder" => "https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX",
+            "link" => 'https://api.slack.com/messaging/webhooks'
+        ),
+        array(
+            "name" => 'Discord',
+            "icon" => 'fab fa-discord',
+            "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
+            "link" => 'https://support.discord.com/hc/en-us/articles/360045093012-Server-Integrations-Page'
+        ),
+        array(
+            "name" => 'Rocket Chat',
+            "icon" => 'fab fa-rocketchat',
+            "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
+            "link" => '',
+        ),
+    );
+    public $keys;
     public $icon;
 
     public Setting $setting;
 
     protected $rules = [
-        'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable',
-        'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
-        'slack_botname'                       => 'string|nullable',
+        'webhook_endpoint'                      => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable',
+        'webhook_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
+        'webhook_botname'                       => 'string|nullable',
     ];
 
     public function mount(){
 
         $this->setting = Setting::getSettings();
-        $this->icon ='';
-        $this->webhook = $this->webhook_selected;
-        $this->slack_endpoint = $this->setting->slack_endpoint;
-        $this->slack_channel = $this->setting->slack_channel;
-        $this->slack_botname = $this->setting->slack_botname;
+        $this->webhook_endpoint = $this->setting->webhook_endpoint;
+        $this->webhook_channel = $this->setting->webhook_channel;
+        $this->webhook_botname = $this->setting->webhook_botname;
+//        $this->webhook_options = $this->setting->webhook_selected;lma
+        $this->keys = array_column($this->webhook_options, 'name');
+
 
     }
     public function updated($field){
-
-        $this->webhook = $this->webhook_selected;
+        $this->webhook_selected = $this->webhook_options;
         $this->validateOnly($field ,$this->rules);
     }
 
     public function render()
     {
-        if(empty($this->slack_channel || $this->slack_endpoint)){
+        if(empty($this->webhook_channel || $this->webhook_endpoint)){
             $this->isDisabled= 'disabled';
         }
-        if(empty($this->slack_endpoint && $this->slack_channel)){
+        if(empty($this->webhook_endpoint && $this->webhook_channel)){
             $this->isDisabled= '';
         }
         return view('livewire.slack-settings-form');
     }
 
-    public function testSlack(){
+    public function testWebhook(){
 
         $slack = new Client([
-            'base_url' => e($this->slack_endpoint),
+            'base_url' => e($this->webhook_endpoint),
             'defaults' => [
                 'exceptions' => false,
             ],
@@ -65,14 +83,14 @@ class SlackSettingsForm extends Component
 
         $payload = json_encode(
             [
-                'channel'    => e($this->slack_channel),
+                'channel'    => e($this->webhook_channel),
                 'text'       => trans('general.slack_test_msg'),
-                'username'    => e($this->slack_botname),
+                'username'    => e($this->webhook_botname),
                 'icon_emoji' => ':heart:',
             ]);
 
         try {
-            $slack->post($this->slack_endpoint, ['body' => $payload]);
+            $slack->post($this->webhook_endpoint, ['body' => $payload]);
             $this->isDisabled='';
             return session()->flash('success' , 'Your Slack Integration works!');
 
@@ -91,9 +109,10 @@ class SlackSettingsForm extends Component
     {
         $this->validate($this->rules);
 
-        $this->setting->slack_endpoint = $this->slack_endpoint;
-        $this->setting->slack_channel = $this->slack_channel;
-        $this->setting->slack_botname = $this->slack_botname;
+        $this->setting->webhook_options = $this->webhook_options;
+        $this->setting->webhook_endpoint = $this->webhook_endpoint;
+        $this->setting->webhook_channel = $this->webhook_channel;
+        $this->setting->webhook_botname = $this->webhook_botname;
 
         $this->setting->save();
 
diff --git a/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
new file mode 100644
index 000000000..8f5928822
--- /dev/null
+++ b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddsWebhookOptionToSettingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+                $table->string('webhook_selected')->after('slack_botname')->nullable();
+                $table->renameColumn('slack_botname', 'webhook_botname');
+                $table->renameColumn('slack_endpoint', 'webhook_endpoint');
+                $table->renameColumn('slack_channel', 'webhook_channel');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('webhook_selected');
+            $table->renameColumn('webhook_botname', 'slack_botname');
+            $table->renameColumn('webhook_endpoint', 'slack_endpoint');
+            $table->renameColumn('webhook_channel', 'slack_channel');
+        });
+    }
+}
diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index d48714d7d..81d40792a 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -198,16 +198,16 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
-    'slack'                     => ':app',
-    'slack_title'               => 'Update :app Settings',
-    'slack_help'                => ':app settings',
-    'slack_botname'             => ':app Botname',
-    'slack_channel'             => ':app Channel',
-    'slack_endpoint'            => ':app Endpoint',
-    'slack_integration'         => ':app Settings',
-    'slack_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
-    'slack_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'webhook'                     => ':app',
+    'webhook_title'               => 'Update :app Settings',
+    'webhook_help'                => ':app settings',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app Channel',
+    'webhook_endpoint'            => ':app Endpoint',
+    'webhook_integration'         => ':app Settings',
+    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
+    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
+    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index 4878998ec..b863a0aae 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -1,6 +1,6 @@
 {{-- Page title --}}
 @section('title')
-    {{ trans('admin/settings/general.slack_title', ['app' => $integration_app ]) }}
+    {{ trans('admin/settings/general.webhook_title', ['app' => $webhook_selected->name ]) }}
     @parent
 @stop
 
@@ -12,159 +12,177 @@
 {{-- Page content --}}
 @section('content')
 
-<div class="row">
-    <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
-<div class="panel box box-default">
-    <div class="box-header with-border">
-        <h2 class="box-title">
-            <i class="{{$icon}}"></i> {{ trans('admin/settings/general.slack',['app' => $integration_app ]) }}
-        </h2>
-    </div>
-    <div class="box-body">
-        <div class="col-md-12">
-            <p>
-                {!! trans('admin/settings/general.slack_integration_help',array('slack_link' => $webhook_link, 'app' => $integration_app )) !!}
-            </p>
-            <br>
-        </div>
-
-    <div class="col-md-12" style="border-top: 0px;">
-        @if (session()->has('save'))
-        <div class="alert alert-success fade in">
-            {{session('save')}}
-        </div>
-        @endif
-
-        @if(session()->has('success'))
-            <div class="alert alert-success fade in">
-                {{session('success')}}
-            </div>
-        @endif
-        @if(session()->has('error'))
-            <div class="alert alert-danger fade in">
-                {{session('error')}}
-            </div>
-        @endif
-        @if(session()->has('message'))
-            <div class="alert alert-danger fade in">
-                {{session('message')}}
-            </div>
-        @endif
-            <div class="form-group col-md-12">
-                <div class="col-md-3">
-                    <label>Integration Option</label>
+    <div class="row">
+        <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
+            <div class="panel box box-default">
+                <div class="box-header with-border">
+                    <h2 class="box-title">
+                        <i class="{{$icon}}"></i> {{ trans('admin/settings/general.webhook',['app' => $webhook_selected->name ]) }}
+                    </h2>
                 </div>
-                <div class="col-md-6" >
-                    <select wire:model="webhook_selected"
-                            aria-label="webhook_selected"
-                            class="form-control "
-                    >
-                        <option value="">{{ trans('admin/settings/general.no_default_group') }}</option>
-                        @foreach ($webhook_options as $key => $webhook_option)
-                            <option value="{{$webhook_option}}" {{ $key ? 'selected' : '' }}>
-                                {{ $key }}
-                            </option>
-                        @endforeach
-                    </select>
-                    {{var_dump($webhook_selected)}}
-                </div><br><br><br>
-            </div>
-        <form class="form-horizontal" role="form" wire:submit.prevent="submit">
-        {{csrf_field()}}
+                <div class="box-body">
+                    <div class="col-md-12">
+                        <p>
+                            {!! trans('admin/settings/general.webhook_integration_help',array('webhook_link' => $webhook_link, 'app' => $webhook_selected )) !!}
+                        </p>
+                        <br>
+                    </div>
 
-        <!--slack endpoint-->
-        <div class="form-group{{ $errors->has('slack_endpoint') ? ' error' : '' }}">
-            <div class="col-md-2">
-                {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint',['app' => $integration_app ])) }}
-            </div>
-            <div class="col-md-8 required">
-                @if (config('app.lock_passwords')===true)
-                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                    <input type="text" wire:model="slack_endpoint" class= 'form-control' placeholder="https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX" {{old('slack_endpoint', $slack_endpoint)}}>
-                @else
-                    <input type="text" wire:model="slack_endpoint" class= 'form-control' placeholder="https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX" {{old('slack_endpoint', $slack_endpoint)}}>
-                @endif
-                {!! $errors->first('slack_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-            </div>
-        </div>
+                    <div class="col-md-12" style="border-top: 0px;">
+                        @if (session()->has('save'))
+                            <div class="alert alert-success fade in">
+                                {{session('save')}}
+                            </div>
+                        @endif
 
-        <!-- slack channel -->
-        <div class="form-group{{ $errors->has('slack_channel') ? ' error' : '' }}">
-            <div class="col-md-2">
-                {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel',['app' => $integration_app ])) }}
-            </div>
-            <div class="col-md-8 required">
-                @if (config('app.lock_passwords')===true)
-                    <input type="text" wire:model="slack_channel" class='form-control' placeholder="#IT-Ops" value="{{old('slack_channel', $slack_channel)}}">
-                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                        @if(session()->has('success'))
+                            <div class="alert alert-success fade in">
+                                {{session('success')}}
+                            </div>
+                        @endif
+                        @if(session()->has('error'))
+                            <div class="alert alert-danger fade in">
+                                {{session('error')}}
+                            </div>
+                        @endif
+                        @if(session()->has('message'))
+                            <div class="alert alert-danger fade in">
+                                {{session('message')}}
+                            </div>
+                        @endif
+                        <div class="form-group col-md-12">
+                            <div class="col-md-3">
+                                <label>Integration Option</label>
+                            </div>
+                            <div class="col-md-6">
+{{--                                <select wire:model="webhook_options"--}}
+{{--                                        aria-label="webhook_options"--}}
+{{--                                        class="form-control "--}}
+{{--                                >--}}
+{{--                                    <option>{{ trans('admin/settings/general.no_default_group') }}</option>--}}
+{{--                                    @foreach ($webhook_options[$keys] as $webhook_options)--}}
+{{--                                        <option value="{{$key}}" {{ $key ? 'selected' : '' }}>--}}
+{{--                                            {{ $key }}--}}
+{{--                                        </option>--}}
+{{--                                    @endforeach--}}
 
-                @else
-                    <input type="text" wire:model="slack_channel" class= 'form-control' placeholder="#IT-Ops" value="{{old('slack_channel', $slack_channel)}}">
-                @endif
-                {!! $errors->first('slack_channel', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-            </div>
-        </div>
+{{--                                </select>--}}
+                            </div>
+                            <br><br><br>
 
-        <!-- slack botname -->
-        <div class="form-group{{ $errors->has('slack_botname') ? ' error' : '' }}">
-            <div class="col-md-2">
-                {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname',['app' => $integration_app ])) }}
-            </div>
-            <div class="col-md-8">
-                @if (config('app.lock_passwords')===true)
-                    <input type="text" wire:model="slack_botname" class= 'form-control' placeholder="Snipe-Bot" {{old('slack_botname', $slack_botname)}}>
-                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                        </div>
+                        <form class="form-horizontal" role="form" wire:submit.prevent="submit">
+                            {{csrf_field()}}
 
-                @else
-                    <input type="text" wire:model="slack_botname" class= 'form-control' placeholder="Snipe-Bot" {{old('slack_botname', $slack_botname)}}>
-                @endif
-                {!! $errors->first('slack_botname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-            </div><!--col-md-10-->
-        </div>
+                            <!--Webhook endpoint-->
+                            <div class="form-group{{ $errors->has('webhook_endpoint') ? ' error' : '' }}">
+                                <div class="col-md-2">
+                                    {{ Form::label('webhook_endpoint', trans('admin/settings/general.webhook_endpoint',['app' => $webhook_selected ])) }}
+                                </div>
+                                <div class="col-md-8 required">
+                                    @if (config('app.lock_passwords')===true)
+                                        <p class="text-warning"><i
+                                                    class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                        <input type="text" wire:model="webhook_endpoint" class='form-control'
+                                               placeholder="https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX" {{old('webhook_endpoint', $webhook_endpoint)}}>
+                                    @else
+                                        <input type="text" wire:model="webhook_endpoint" class='form-control'
+                                               placeholder="https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX" {{old('webhook_endpoint', $webhook_endpoint)}}>
+                                    @endif
+                                    {!! $errors->first('webhook_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
 
-        <!--Slack Integration Test-->
-            @if($slack_endpoint != null && $slack_channel != null)
-        <div class="form-group">
-                <div class="col-md-offset-2 col-md-8">
-                    <a href="#" wire:click.prevent="testSlack" class="btn btn-default btn-sm pull-left"><span>{!! trans('admin/settings/general.slack_test',['app' => $integration_app ]) !!}</span></a>
-                    <div wire:loading><span style="padding-left: 5px; font-size: 20px"><i class="fas fa-spinner fa-spin"></i></span></div>
-                </div>
-        </div>
-            @endif
+                            <!-- Webhook channel -->
+                            <div class="form-group{{ $errors->has('webhook_channel') ? ' error' : '' }}">
+                                <div class="col-md-2">
+                                    {{ Form::label('webhook_channel', trans('admin/settings/general.webhook_channel',['app' => $webhook_selected ])) }}
+                                </div>
+                                <div class="col-md-8 required">
+                                    @if (config('app.lock_passwords')===true)
+                                        <input type="text" wire:model="webhook_channel" class='form-control'
+                                               placeholder="#IT-Ops"
+                                               value="{{old('webhook_channel', $webhook_channel)}}">
+                                        <p class="text-warning"><i
+                                                    class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
 
-        <div class="box-footer" style="margin-top: 45px;">
-            <div class="text-right col-md-12">
-                <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
-                <button type="submit" {{$isDisabled}} class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
-            </div>
-        </div><!--box-footer-->
-        </form>
+                                    @else
+                                        <input type="text" wire:model="webhook_channel" class='form-control'
+                                               placeholder="#IT-Ops"
+                                               value="{{old('webhook_channel', $webhook_channel)}}">
+                                    @endif
+                                    {!! $errors->first('webhook_channel', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
 
-    </div> <!-- /box -->
-    </div> <!-- /.col-md-8-->
-</div> <!-- /.row-->
+                            <!-- Webhook botname -->
+                            <div class="form-group{{ $errors->has('webhook_botname') ? ' error' : '' }}">
+                                <div class="col-md-2">
+                                    {{ Form::label('webhook_botname', trans('admin/settings/general.webhook_botname',['app' => $webhook_selected ])) }}
+                                </div>
+                                <div class="col-md-8">
+                                    @if (config('app.lock_passwords')===true)
+                                        <input type="text" wire:model="webhook_botname" class='form-control'
+                                               placeholder="Snipe-Bot" {{old('webhook_botname', $webhook_botname)}}>
+                                        <p class="text-warning"><i
+                                                    class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
 
-@stop
+                                    @else
+                                        <input type="text" wire:model="webhook_botname" class='form-control'
+                                               placeholder="Snipe-Bot" {{old('webhook_botname', $webhook_botname)}}>
+                                    @endif
+                                    {!! $errors->first('webhook_botname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div><!--col-md-10-->
+                            </div>
 
-@push('scripts')
-<script>
-    // function formatText (icon) {
-    //     return $('<span><i class="fab ' + $(icon.element).data('icon') + '"></i> ' + icon.text + '</span>');
-    // };
-    //
-    // $('.hook_options').select2({
-    //     width: "50%",
-    //     templateSelection: formatText,
-    //     templateResult: formatText
-    // });
-    // $(document).ready(function () {
-    //     $('.webhook_options').select2();
-    //     $('.webhook_options').on('change', function (e) {
-    //         let data = $('#select2').select2("val");
-    //         @this.set('webhook_option', data);
-    //     });
-    // });
+                            <!--Webhook Integration Test-->
+                            @if($webhook_endpoint != null && $webhook_channel != null)
+                                <div class="form-group">
+                                    <div class="col-md-offset-2 col-md-8">
+                                        <a href="#" wire:click.prevent="testWebhook"
+                                           class="btn btn-default btn-sm pull-left"><span>{!! trans('admin/settings/general.webhook_test',['app' => $webhook_selected ]) !!}</span></a>
+                                        <div wire:loading><span style="padding-left: 5px; font-size: 20px"><i
+                                                        class="fas fa-spinner fa-spin"></i></span></div>
+                                    </div>
+                                </div>
+                            @endif
+
+                            <div class="box-footer" style="margin-top: 45px;">
+                                <div class="text-right col-md-12">
+                                    <a class="btn btn-link text-left"
+                                       href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
+                                    <button type="submit" {{$isDisabled}} class="btn btn-primary"><i
+                                                class="fas fa-check icon-white"
+                                                aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                                </div>
+                            </div><!--box-footer-->
+                        </form>
+
+                    </div> <!-- /box -->
+                </div> <!-- /.col-md-8-->
+            </div> <!-- /.row-->
+
+            @stop
+
+            @push('scripts')
+                <script>
+                    // function formatText (icon) {
+                    //     return $('<span><i class="fab ' + $(icon.element).data('icon') + '"></i> ' + icon.text + '</span>');
+                    // };
+                    //
+                    // $('.hook_options').select2({
+                    //     width: "50%",
+                    //     templateSelection: formatText,
+                    //     templateResult: formatText
+                    // });
+                    // $(document).ready(function () {
+                    //     $('.webhook_options').select2();
+                    //     $('.webhook_options').on('change', function (e) {
+                    //         let data = $('#select2').select2("val");
+                    //         @this.set('webhook_option', data);
+                    //     });
+                    // });
 
 
-</script>
-@endpush
+                </script>
+    @endpush

From aae178a60652d61796cd99e277cebd7398924c8b Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 1 Mar 2023 17:10:10 -0800
Subject: [PATCH 3/9] gets select working, placeholders update dynamically

---
 app/Http/Livewire/SlackSettingsForm.php       | 55 +++++++++---------
 .../livewire/slack-settings-form.blade.php    | 58 +++++--------------
 resources/views/settings/slack.blade.php      | 36 ++++++++++--
 3 files changed, 73 insertions(+), 76 deletions(-)

diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
index 996a30e23..ac9474338 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -13,29 +13,9 @@ class SlackSettingsForm extends Component
     public $webhook_botname;
     public $isDisabled ='disabled' ;
     public $webhook_link;
+    public $webhook_placeholder;
+    public $webhook_icon;
     public $webhook_selected;
-    public $webhook_options = array(
-        array(
-            "name" => 'Slack',
-            "icon" => 'fab fa-slack',
-            "placeholder" => "https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX",
-            "link" => 'https://api.slack.com/messaging/webhooks'
-        ),
-        array(
-            "name" => 'Discord',
-            "icon" => 'fab fa-discord',
-            "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
-            "link" => 'https://support.discord.com/hc/en-us/articles/360045093012-Server-Integrations-Page'
-        ),
-        array(
-            "name" => 'Rocket Chat',
-            "icon" => 'fab fa-rocketchat',
-            "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
-            "link" => '',
-        ),
-    );
-    public $keys;
-    public $icon;
 
     public Setting $setting;
 
@@ -44,6 +24,23 @@ class SlackSettingsForm extends Component
         'webhook_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
         'webhook_botname'                       => 'string|nullable',
     ];
+    static $webhook_text= [
+        "Slack" => array(
+            "icon" => 'fab fa-slack',
+            "placeholder" => "https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX",
+            "link" => 'https://api.slack.com/messaging/webhooks'
+        ),
+        "Discord" => array(
+            "icon" => 'fab fa-discord',
+            "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
+            "link" => 'https://support.discord.com/hc/en-us/articles/360045093012-Server-Integrations-Page'
+        ),
+        "RocketChat"=> array(
+            "icon" => 'fab fa-rocketchat',
+            "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
+            "link" => '',
+        ),
+    ];
 
     public function mount(){
 
@@ -51,15 +48,21 @@ class SlackSettingsForm extends Component
         $this->webhook_endpoint = $this->setting->webhook_endpoint;
         $this->webhook_channel = $this->setting->webhook_channel;
         $this->webhook_botname = $this->setting->webhook_botname;
-//        $this->webhook_options = $this->setting->webhook_selected;lma
-        $this->keys = array_column($this->webhook_options, 'name');
+        $this->webhook_options = $this->setting->webhook_selected;
 
 
     }
     public function updated($field){
-        $this->webhook_selected = $this->webhook_options;
+//        $this->webhook_selected = $this->webhook_options;
         $this->validateOnly($field ,$this->rules);
     }
+    public function updatedWebhookSelected(){
+
+        $this->webhook_icon = self::$webhook_text[$this->webhook_selected]["icon"]; ;
+        $this->webhook_placeholder = self::$webhook_text[$this->webhook_selected]["placeholder"];
+        $this->webhook_link = self::$webhook_text[$this->webhook_selected]["link"];
+
+    }
 
     public function render()
     {
@@ -109,7 +112,7 @@ class SlackSettingsForm extends Component
     {
         $this->validate($this->rules);
 
-        $this->setting->webhook_options = $this->webhook_options;
+        $this->setting->webhook_selected = $this->webhwebhook_selected;
         $this->setting->webhook_endpoint = $this->webhook_endpoint;
         $this->setting->webhook_channel = $this->webhook_channel;
         $this->setting->webhook_botname = $this->webhook_botname;
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index b863a0aae..c435ae0c4 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -1,32 +1,4 @@
-{{-- Page title --}}
-@section('title')
-    {{ trans('admin/settings/general.webhook_title', ['app' => $webhook_selected->name ]) }}
-    @parent
-@stop
-
-@section('header_right')
-    <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
-@stop
-
-
-{{-- Page content --}}
-@section('content')
-
-    <div class="row">
-        <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
-            <div class="panel box box-default">
-                <div class="box-header with-border">
-                    <h2 class="box-title">
-                        <i class="{{$icon}}"></i> {{ trans('admin/settings/general.webhook',['app' => $webhook_selected->name ]) }}
-                    </h2>
-                </div>
-                <div class="box-body">
-                    <div class="col-md-12">
-                        <p>
-                            {!! trans('admin/settings/general.webhook_integration_help',array('webhook_link' => $webhook_link, 'app' => $webhook_selected )) !!}
-                        </p>
-                        <br>
-                    </div>
+<div>
 
                     <div class="col-md-12" style="border-top: 0px;">
                         @if (session()->has('save'))
@@ -50,23 +22,21 @@
                                 {{session('message')}}
                             </div>
                         @endif
+
                         <div class="form-group col-md-12">
                             <div class="col-md-3">
                                 <label>Integration Option</label>
                             </div>
                             <div class="col-md-6">
-{{--                                <select wire:model="webhook_options"--}}
-{{--                                        aria-label="webhook_options"--}}
-{{--                                        class="form-control "--}}
-{{--                                >--}}
-{{--                                    <option>{{ trans('admin/settings/general.no_default_group') }}</option>--}}
-{{--                                    @foreach ($webhook_options[$keys] as $webhook_options)--}}
-{{--                                        <option value="{{$key}}" {{ $key ? 'selected' : '' }}>--}}
-{{--                                            {{ $key }}--}}
-{{--                                        </option>--}}
-{{--                                    @endforeach--}}
-
-{{--                                </select>--}}
+                                <select wire:model="webhook_selected"
+                                        aria-label="webhook_selected"
+                                        class="form-control "
+                                >
+                                    <option>{{ trans('admin/settings/general.no_default_group') }}</option>
+                                    <option value="Slack">Slack</option>
+                                    <option value="Discord">Discord</option>
+                                    <option value="RocketChat">RocketChat</option>
+                                </select>
                             </div>
                             <br><br><br>
 
@@ -84,10 +54,10 @@
                                         <p class="text-warning"><i
                                                     class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                         <input type="text" wire:model="webhook_endpoint" class='form-control'
-                                               placeholder="https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX" {{old('webhook_endpoint', $webhook_endpoint)}}>
+                                               placeholder={{$webhook_placeholder}} {{old('webhook_endpoint', $webhook_endpoint)}}>
                                     @else
                                         <input type="text" wire:model="webhook_endpoint" class='form-control'
-                                               placeholder="https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX" {{old('webhook_endpoint', $webhook_endpoint)}}>
+                                               placeholder={{$webhook_placeholder}} {{old('webhook_endpoint', $webhook_endpoint)}}>
                                     @endif
                                     {!! $errors->first('webhook_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 </div>
@@ -160,9 +130,7 @@
 
                     </div> <!-- /box -->
                 </div> <!-- /.col-md-8-->
-            </div> <!-- /.row-->
 
-            @stop
 
             @push('scripts')
                 <script>
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index fac07c7cc..a5cbd8d0b 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -1,18 +1,44 @@
 @extends('layouts/default')
 
+{{-- Page title --}}
+@section('title')
+    {{ trans('admin/settings/general.slack_title') }}
+    @parent
+@stop
+
+@section('header_right')
+    <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
+@stop
 
 
+{{-- Page content --}}
+@section('content')
 
 
+    <div class="row">
+        <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
 
-
+            <div class="panel box box-default">
+                <div class="box-header with-border">
+                    <h2 class="box-title">
+                        <i class="fab fa-slack"></i> {{ trans('admin/settings/general.slack') }}
+                    </h2>
+                </div>
+                <div class="box-body">
+                    <div class="col-md-12">
+                        <p>
+                            {!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!}
+                        </p>
+                        <br>
+                    </div>
 
                     @livewire('slack-settings-form')
 
-
-
-
-
+        </div> <!-- /.col-md-8-->
+    </div> <!-- /.row-->
+
+
+@stop
 
 
 

From 35dd0d8def045b22cd87e558dbcfec24d226b378 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 7 Mar 2023 15:48:21 -0800
Subject: [PATCH 4/9] adds generalized webhooks, updates settings page,
 translations, validation

---
 app/Http/Livewire/SlackSettingsForm.php       | 50 +++++++++++-------
 ..._adds_webhook_option_to_settings_table.php |  2 +-
 resources/lang/en/admin/settings/general.php  |  8 +--
 resources/lang/en/admin/settings/message.php  |  2 +-
 resources/lang/en/general.php                 |  4 +-
 .../livewire/slack-settings-form.blade.php    | 51 +++++++++++++++----
 resources/views/settings/index.blade.php      |  6 +--
 resources/views/settings/slack.blade.php      | 32 ------------
 8 files changed, 84 insertions(+), 71 deletions(-)

diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
index ac9474338..0794aedd4 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -12,6 +12,7 @@ class SlackSettingsForm extends Component
     public $webhook_channel;
     public $webhook_botname;
     public $isDisabled ='disabled' ;
+    public $webhook_name;
     public $webhook_link;
     public $webhook_placeholder;
     public $webhook_icon;
@@ -20,31 +21,38 @@ class SlackSettingsForm extends Component
     public Setting $setting;
 
     protected $rules = [
-        'webhook_endpoint'                      => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable',
-        'webhook_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
+        'webhook_endpoint'                      => 'url|required_with:webhook_channel|starts_with:https://hooks.slack.com/services,https://discord.com/api/webhooks|nullable',
+        'webhook_channel'                       => 'required_with:webhook_endpoint|starts_with:#|nullable',
         'webhook_botname'                       => 'string|nullable',
     ];
     static $webhook_text= [
         "Slack" => array(
+            "name" => "Slack",
             "icon" => 'fab fa-slack',
             "placeholder" => "https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX",
-            "link" => 'https://api.slack.com/messaging/webhooks'
+            "link" => 'https://api.slack.com/messaging/webhooks',
         ),
         "Discord" => array(
+            "name" => "Discord",
             "icon" => 'fab fa-discord',
             "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
-            "link" => 'https://support.discord.com/hc/en-us/articles/360045093012-Server-Integrations-Page'
+            "link" => 'https://support.discord.com/hc/en-us/articles/360045093012-Server-Integrations-Page',
         ),
-        "RocketChat"=> array(
-            "icon" => 'fab fa-rocketchat',
-            "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
-            "link" => '',
+        "General"=> array(
+            "name" => "General",
+            "icon" => "fab fa-hashtag",
+            "placeholder" => "",
+            "link" => "",
         ),
     ];
 
     public function mount(){
 
         $this->setting = Setting::getSettings();
+        $this->webhook_selected = $this->setting->webhook_selected;
+        $this->webhook_placeholder = self::$webhook_text[$this->setting->webhook_selected]["placeholder"];
+        $this->webhook_name = self::$webhook_text[$this->setting->webhook_selected]["name"];
+        $this->webhook_icon = self::$webhook_text[$this->setting->webhook_selected]["icon"];
         $this->webhook_endpoint = $this->setting->webhook_endpoint;
         $this->webhook_channel = $this->setting->webhook_channel;
         $this->webhook_botname = $this->setting->webhook_botname;
@@ -53,11 +61,12 @@ class SlackSettingsForm extends Component
 
     }
     public function updated($field){
-//        $this->webhook_selected = $this->webhook_options;
-        $this->validateOnly($field ,$this->rules);
+        if($this->webhook_selected != 'General') {
+            $this->validateOnly($field, $this->rules);
+        }
     }
     public function updatedWebhookSelected(){
-
+        $this->webhook_name = self::$webhook_text[$this->webhook_selected]['name'];
         $this->webhook_icon = self::$webhook_text[$this->webhook_selected]["icon"]; ;
         $this->webhook_placeholder = self::$webhook_text[$this->webhook_selected]["placeholder"];
         $this->webhook_link = self::$webhook_text[$this->webhook_selected]["link"];
@@ -77,7 +86,7 @@ class SlackSettingsForm extends Component
 
     public function testWebhook(){
 
-        $slack = new Client([
+        $webhook = new Client([
             'base_url' => e($this->webhook_endpoint),
             'defaults' => [
                 'exceptions' => false,
@@ -87,36 +96,39 @@ class SlackSettingsForm extends Component
         $payload = json_encode(
             [
                 'channel'    => e($this->webhook_channel),
-                'text'       => trans('general.slack_test_msg'),
+                'text'       => trans('general.webhook_test_msg'),
                 'username'    => e($this->webhook_botname),
                 'icon_emoji' => ':heart:',
             ]);
 
         try {
-            $slack->post($this->webhook_endpoint, ['body' => $payload]);
+            $webhook->post($this->webhook_endpoint, ['body' => $payload]);
             $this->isDisabled='';
-            return session()->flash('success' , 'Your Slack Integration works!');
+            return session()->flash('success' , 'Your'.$this->webhook_name.' Integration works!');
 
         } catch (\Exception $e) {
             $this->isDisabled= 'disabled';
-            return session()->flash('error' , trans('admin/settings/message.slack.error', ['error_message' => $e->getMessage()]));
+            return session()->flash('error' , trans('admin/settings/message.webhook.error', ['error_message' => $e->getMessage()]));
         }
 
         //}
-        return session()->flash('message' , trans('admin/settings/message.slack.error_misc'));
+        return session()->flash('message' , trans('admin/settings/message.webhook.error_misc'));
 
 
 
     }
     public function submit()
     {
-        $this->validate($this->rules);
+        if($this->webhook_selected != 'General') {
+            $this->validate($this->rules);
+        }
 
-        $this->setting->webhook_selected = $this->webhwebhook_selected;
+        $this->setting->webhook_selected = $this->webhook_selected;
         $this->setting->webhook_endpoint = $this->webhook_endpoint;
         $this->setting->webhook_channel = $this->webhook_channel;
         $this->setting->webhook_botname = $this->webhook_botname;
 
+
         $this->setting->save();
 
         session()->flash('save',trans('admin/settings/message.update.success'));
diff --git a/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
index 8f5928822..02d7f5e4e 100644
--- a/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
+++ b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
@@ -14,7 +14,7 @@ class AddsWebhookOptionToSettingsTable extends Migration
     public function up()
     {
         Schema::table('settings', function (Blueprint $table) {
-                $table->string('webhook_selected')->after('slack_botname')->nullable();
+                $table->string('webhook_selected')->after('slack_botname')->default('Slack');nullable();
                 $table->renameColumn('slack_botname', 'webhook_botname');
                 $table->renameColumn('slack_endpoint', 'webhook_endpoint');
                 $table->renameColumn('slack_channel', 'webhook_channel');
diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index 81d40792a..401efd910 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -198,13 +198,15 @@ return [
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
-    'webhook'                     => ':app',
-    'webhook_title'               => 'Update :app Settings',
-    'webhook_help'                => ':app settings',
+    'integrations'               => 'Integrations',
+    'webhook'                   => ':app',
+    'webhook_title'               => 'Update Webhook Settings',
+    'webhook_help'                => 'Integration settings',
     'webhook_botname'             => ':app Botname',
     'webhook_channel'             => ':app Channel',
     'webhook_endpoint'            => ':app Endpoint',
     'webhook_integration'         => ':app Settings',
+    'webhook_test'                 =>':app test integration',
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
diff --git a/resources/lang/en/admin/settings/message.php b/resources/lang/en/admin/settings/message.php
index b0648d1c1..a4aba73ff 100644
--- a/resources/lang/en/admin/settings/message.php
+++ b/resources/lang/en/admin/settings/message.php
@@ -33,7 +33,7 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
-    'slack' => [
+    'webhook' => [
         'sending' => 'Sending Slack test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index cc7ee7fa1..fae0e9a58 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -249,8 +249,8 @@ return [
     'signature'             => 'Signature',
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
-    'slack_msg_note'        => 'A slack message will be sent',
-    'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
+    'webhook_msg_note'        => 'A :app message will be sent',
+    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index c435ae0c4..ea8262e1c 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -1,4 +1,34 @@
+
+    {{-- Page title --}}
+    @section('title')
+        {{ trans('admin/settings/general.webhook_title') }}
+        @parent
+    @stop
+
+    @section('header_right')
+        <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
+    @stop
+
+
+    {{-- Page content --}}
+    @section('content')
+
 <div>
+        <div class="row">
+            <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
+    <div class="panel box box-default">
+        <div class="box-header with-border">
+            <h2 class="box-title">
+                <i class="{{$webhook_icon}}"></i> {{ trans('admin/settings/general.webhook', ['app'=>$webhook_name] ) }}
+            </h2>
+        </div>
+        <div class="box-body">
+            <div class="col-md-12">
+                <p>
+                    {!! trans('admin/settings/general.webhook_integration_help',array('webhook_link' => $webhook_link, 'app' => $webhook_name)) !!}
+                </p>
+                <br>
+            </div>
 
                     <div class="col-md-12" style="border-top: 0px;">
                         @if (session()->has('save'))
@@ -32,10 +62,9 @@
                                         aria-label="webhook_selected"
                                         class="form-control "
                                 >
-                                    <option>{{ trans('admin/settings/general.no_default_group') }}</option>
                                     <option value="Slack">Slack</option>
                                     <option value="Discord">Discord</option>
-                                    <option value="RocketChat">RocketChat</option>
+                                    <option value="General">General Webhook</option>
                                 </select>
                             </div>
                             <br><br><br>
@@ -106,15 +135,17 @@
                             </div>
 
                             <!--Webhook Integration Test-->
-                            @if($webhook_endpoint != null && $webhook_channel != null)
-                                <div class="form-group">
-                                    <div class="col-md-offset-2 col-md-8">
-                                        <a href="#" wire:click.prevent="testWebhook"
-                                           class="btn btn-default btn-sm pull-left"><span>{!! trans('admin/settings/general.webhook_test',['app' => $webhook_selected ]) !!}</span></a>
-                                        <div wire:loading><span style="padding-left: 5px; font-size: 20px"><i
-                                                        class="fas fa-spinner fa-spin"></i></span></div>
+                            @if($webhook_selected == 'Slack' || $webhook_selected == 'Discord')
+                                @if($webhook_endpoint != null && $webhook_channel != null)
+                                    <div class="form-group">
+                                        <div class="col-md-offset-2 col-md-8">
+                                            <a href="#" wire:click.prevent="testWebhook"
+                                               class="btn btn-default btn-sm pull-left"><span><i class="{{$webhook_icon}}"></i>  {!! trans('admin/settings/general.webhook_test',['app' => $webhook_selected ]) !!}</span></a>
+                                            <div wire:loading><span style="padding-left: 5px; font-size: 20px"><i
+                                                            class="fas fa-spinner fa-spin"></i></span></div>
+                                        </div>
                                     </div>
-                                </div>
+                                @endif
                             @endif
 
                             <div class="box-footer" style="margin-top: 45px;">
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index f425dabd4..5b49e1c7e 100755
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -164,12 +164,12 @@
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.slack.index') }}" class="settings_button">
-                  <i class="fab fa-slack fa-4x" aria-hidden="true"></i>
+                  <i class="fa-regular fa-hashtag fa-4x" aria-hidden="true"></i>
                   <br><br>
-                  <span class="name">{{ trans('admin/settings/general.slack') }}</span>
+                  <span class="name">{{ trans('admin/settings/general.integrations') }}</span>
                 </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.slack_help') }}</p>
+              <p class="help-block">{{ trans('admin/settings/general.webhook_help') }}</p>
             </div>
           </div>
         </div>
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index a5cbd8d0b..a0e7eba69 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -1,39 +1,7 @@
 @extends('layouts/default')
 
-{{-- Page title --}}
-@section('title')
-    {{ trans('admin/settings/general.slack_title') }}
-    @parent
-@stop
-
-@section('header_right')
-    <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
-@stop
-
-
-{{-- Page content --}}
-@section('content')
-
-
-    <div class="row">
-        <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
-
-            <div class="panel box box-default">
-                <div class="box-header with-border">
-                    <h2 class="box-title">
-                        <i class="fab fa-slack"></i> {{ trans('admin/settings/general.slack') }}
-                    </h2>
-                </div>
-                <div class="box-body">
-                    <div class="col-md-12">
-                        <p>
-                            {!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!}
-                        </p>
-                        <br>
-                    </div>
 
                     @livewire('slack-settings-form')
-
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 

From 69944853f95498605e8b1a8294cba7e616a0f731 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 7 Mar 2023 15:57:58 -0800
Subject: [PATCH 5/9] more translations

---
 app/Http/Livewire/SlackSettingsForm.php      | 2 +-
 resources/lang/en/admin/settings/general.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
index 0794aedd4..7f88d7a5f 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -104,7 +104,7 @@ class SlackSettingsForm extends Component
         try {
             $webhook->post($this->webhook_endpoint, ['body' => $payload]);
             $this->isDisabled='';
-            return session()->flash('success' , 'Your'.$this->webhook_name.' Integration works!');
+            return session()->flash('success' , 'Your '.$this->webhook_name.' Integration works!');
 
         } catch (\Exception $e) {
             $this->isDisabled= 'disabled';
diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index 401efd910..e24d24f2a 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -206,7 +206,7 @@ return [
     'webhook_channel'             => ':app Channel',
     'webhook_endpoint'            => ':app Endpoint',
     'webhook_integration'         => ':app Settings',
-    'webhook_test'                 =>':app test integration',
+    'webhook_test'                 =>'Test :app integration',
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',

From 15c19a7ab72b96caaa3846b6cc97a5f34d3aaccb Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 8 Mar 2023 10:35:45 -0800
Subject: [PATCH 6/9] silenced Discord option and validation, more translations

---
 app/Http/Livewire/SlackSettingsForm.php            | 14 +++++++-------
 ...73527_adds_webhook_option_to_settings_table.php |  2 +-
 resources/lang/en/admin/settings/message.php       |  4 ++--
 .../views/livewire/slack-settings-form.blade.php   |  8 +++++---
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
index 7f88d7a5f..c28394140 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -32,12 +32,12 @@ class SlackSettingsForm extends Component
             "placeholder" => "https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX",
             "link" => 'https://api.slack.com/messaging/webhooks',
         ),
-        "Discord" => array(
-            "name" => "Discord",
-            "icon" => 'fab fa-discord',
-            "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
-            "link" => 'https://support.discord.com/hc/en-us/articles/360045093012-Server-Integrations-Page',
-        ),
+//        "Discord" => array(
+//            "name" => "Discord",
+//            "icon" => 'fab fa-discord',
+//            "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
+//            "link" => 'https://support.discord.com/hc/en-us/articles/360045093012-Server-Integrations-Page',
+//        ),
         "General"=> array(
             "name" => "General",
             "icon" => "fab fa-hashtag",
@@ -108,7 +108,7 @@ class SlackSettingsForm extends Component
 
         } catch (\Exception $e) {
             $this->isDisabled= 'disabled';
-            return session()->flash('error' , trans('admin/settings/message.webhook.error', ['error_message' => $e->getMessage()]));
+            return session()->flash('error' , trans('admin/settings/message.webhook.error', ['error_message' => $e->getMessage(), 'app' => $this->webhook_name]));
         }
 
         //}
diff --git a/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
index 02d7f5e4e..9e7a27872 100644
--- a/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
+++ b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
@@ -14,7 +14,7 @@ class AddsWebhookOptionToSettingsTable extends Migration
     public function up()
     {
         Schema::table('settings', function (Blueprint $table) {
-                $table->string('webhook_selected')->after('slack_botname')->default('Slack');nullable();
+                $table->string('webhook_selected')->after('slack_botname')->default('Slack')->nullable();
                 $table->renameColumn('slack_botname', 'webhook_botname');
                 $table->renameColumn('slack_endpoint', 'webhook_endpoint');
                 $table->renameColumn('slack_channel', 'webhook_channel');
diff --git a/resources/lang/en/admin/settings/message.php b/resources/lang/en/admin/settings/message.php
index a4aba73ff..48b42d120 100644
--- a/resources/lang/en/admin/settings/message.php
+++ b/resources/lang/en/admin/settings/message.php
@@ -34,11 +34,11 @@ return [
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
     'webhook' => [
-        'sending' => 'Sending Slack test message...',
+        'sending' => 'Sending :app test message...',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
         '500' => '500 Server Error.',
-        'error' => 'Something went wrong. Slack responded with: :error_message',
+        'error' => 'Something went wrong. :app responded with: :error_message',
         'error_misc' => 'Something went wrong. :( ',
     ]
 ];
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index ea8262e1c..e15cdf095 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -63,7 +63,7 @@
                                         class="form-control "
                                 >
                                     <option value="Slack">Slack</option>
-                                    <option value="Discord">Discord</option>
+{{--                                    <option value="Discord">Discord</option>--}}
                                     <option value="General">General Webhook</option>
                                 </select>
                             </div>
@@ -83,10 +83,12 @@
                                         <p class="text-warning"><i
                                                     class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                         <input type="text" wire:model="webhook_endpoint" class='form-control'
-                                               placeholder={{$webhook_placeholder}} {{old('webhook_endpoint', $webhook_endpoint)}}>
+                                               placeholder="{{$webhook_placeholder}}"
+                                                value="{{old('webhook_endpoint', $webhook_endpoint)}}">
                                     @else
                                         <input type="text" wire:model="webhook_endpoint" class='form-control'
-                                               placeholder={{$webhook_placeholder}} {{old('webhook_endpoint', $webhook_endpoint)}}>
+                                               placeholder="{{$webhook_placeholder}}"
+                                                value="{{old('webhook_endpoint', $webhook_endpoint)}}">
                                     @endif
                                     {!! $errors->first('webhook_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 </div>

From b6d105c4f468cb5124f78c8d70a26b89b54505dc Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 13 Mar 2023 10:49:41 -0700
Subject: [PATCH 7/9] removes help text from general integrations

---
 composer.json                                 |  5 +++-
 .../livewire/slack-settings-form.blade.php    | 25 ++-----------------
 resources/views/settings/index.blade.php      |  2 +-
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/composer.json b/composer.json
index abcf675b1..2f1007fa7 100644
--- a/composer.json
+++ b/composer.json
@@ -127,6 +127,9 @@
     "sort-packages": true,
     "optimize-autoloader": true,
     "discard-changes": true,
-    "process-timeout": 3000
+    "process-timeout": 3000,
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
   }
 }
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index e15cdf095..5bf501e22 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -24,9 +24,11 @@
         </div>
         <div class="box-body">
             <div class="col-md-12">
+                @if($webhook_selected != 'General')
                 <p>
                     {!! trans('admin/settings/general.webhook_integration_help',array('webhook_link' => $webhook_link, 'app' => $webhook_name)) !!}
                 </p>
+                @endif
                 <br>
             </div>
 
@@ -164,26 +166,3 @@
                     </div> <!-- /box -->
                 </div> <!-- /.col-md-8-->
 
-
-            @push('scripts')
-                <script>
-                    // function formatText (icon) {
-                    //     return $('<span><i class="fab ' + $(icon.element).data('icon') + '"></i> ' + icon.text + '</span>');
-                    // };
-                    //
-                    // $('.hook_options').select2({
-                    //     width: "50%",
-                    //     templateSelection: formatText,
-                    //     templateResult: formatText
-                    // });
-                    // $(document).ready(function () {
-                    //     $('.webhook_options').select2();
-                    //     $('.webhook_options').on('change', function (e) {
-                    //         let data = $('#select2').select2("val");
-                    //         @this.set('webhook_option', data);
-                    //     });
-                    // });
-
-
-                </script>
-    @endpush
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 5b49e1c7e..678233c93 100755
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -164,7 +164,7 @@
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.slack.index') }}" class="settings_button">
-                  <i class="fa-regular fa-hashtag fa-4x" aria-hidden="true"></i>
+                  <i class="fa-solid fa-hashtag fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.integrations') }}</span>
                 </a>

From 542332ea0c2a78112f1bcddc27aec5f6f6e08d31 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 13 Mar 2023 10:54:18 -0700
Subject: [PATCH 8/9] removes discord from rules

---
 app/Http/Livewire/SlackSettingsForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
index c28394140..dfbc3b17c 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -21,7 +21,7 @@ class SlackSettingsForm extends Component
     public Setting $setting;
 
     protected $rules = [
-        'webhook_endpoint'                      => 'url|required_with:webhook_channel|starts_with:https://hooks.slack.com/services,https://discord.com/api/webhooks|nullable',
+        'webhook_endpoint'                      => 'url|required_with:webhook_channel|starts_with:https://hooks.slack.com/services|nullable',
         'webhook_channel'                       => 'required_with:webhook_endpoint|starts_with:#|nullable',
         'webhook_botname'                       => 'string|nullable',
     ];

From 11bf3f52857687ae181639b8cc5ab067d4f77eee Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 13 Mar 2023 14:06:05 -0700
Subject: [PATCH 9/9] aligned inputs

---
 resources/views/livewire/slack-settings-form.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index 5bf501e22..cdfd03c8c 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -55,11 +55,11 @@
                             </div>
                         @endif
 
-                        <div class="form-group col-md-12">
-                            <div class="col-md-3">
+                        <div class="form-group" style="margin-left:-14px;">
+                            <div class="col-md-2">
                                 <label>Integration Option</label>
                             </div>
-                            <div class="col-md-6">
+                            <div class="col-md-8"style="margin-left: 2px;">
                                 <select wire:model="webhook_selected"
                                         aria-label="webhook_selected"
                                         class="form-control "