From 941272cccd1bd68a74d65cba1000ff5a2bd5c75d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 3 Aug 2020 13:22:51 +0530
Subject: [PATCH] Bugfix: Move integration logos out of public/assets (#1115)

---
 .../dashboard/settings/integrations/Index.vue       |   2 +-
 .../dashboard/settings/integrations/Integration.vue |   2 +-
 .../settings/integrations/ShowIntegration.vue       |   2 +-
 config/integration/apps.yml                         |   3 +--
 .../images}/integrations/cable.svg                  |   0
 .../images}/integrations/slack.png                  | Bin
 6 files changed, 4 insertions(+), 5 deletions(-)
 rename public/{assets/dashboard => dashboard/images}/integrations/cable.svg (100%)
 rename public/{assets/dashboard => dashboard/images}/integrations/slack.png (100%)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Index.vue
index 6d8ca1895..5bfeceac2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="column content-box">
     <div class="row">
-      <div class="small-8 columns integrations-wrap">
+      <div class="small-12 columns integrations-wrap">
         <div class="row integrations">
           <div
             v-for="item in integrationsList"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
index cdab7ceee..cf58f910b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="row">
     <div class="integration--image">
-      <img :src="'/assets/dashboard/integrations/' + integrationLogo" />
+      <img :src="'/dashboard/images/integrations/' + integrationLogo" />
     </div>
     <div class="column">
       <h3 class="integration--title">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/ShowIntegration.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/ShowIntegration.vue
index 3185f17b0..de270e388 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/ShowIntegration.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/ShowIntegration.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="column content-box">
     <div class="row">
-      <div class="small-8 columns integrations-wrap">
+      <div class="small-12 columns integrations-wrap">
         <div class="row integrations">
           <div v-if="integrationLoaded" class="small-12 columns integration">
             <integration
diff --git a/config/integration/apps.yml b/config/integration/apps.yml
index a63b5f606..e6b349698 100644
--- a/config/integration/apps.yml
+++ b/config/integration/apps.yml
@@ -4,10 +4,9 @@ slack:
   logo: slack.png
   description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
   action: https://slack.com/oauth/v2/authorize?scope=commands,chat:write,channels:read,channels:manage,channels:join,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize,channels:history,groups:history,mpim:history,im:history
-webhooks: 
+webhooks:
   id: webhook
   name: Webhooks
   logo: cable.svg
   description: Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks.
   action: /webhook
-   
\ No newline at end of file
diff --git a/public/assets/dashboard/integrations/cable.svg b/public/dashboard/images/integrations/cable.svg
similarity index 100%
rename from public/assets/dashboard/integrations/cable.svg
rename to public/dashboard/images/integrations/cable.svg
diff --git a/public/assets/dashboard/integrations/slack.png b/public/dashboard/images/integrations/slack.png
similarity index 100%
rename from public/assets/dashboard/integrations/slack.png
rename to public/dashboard/images/integrations/slack.png