From 28a83400e78ddf143c3b3d20eb0e4214ac94e9fe Mon Sep 17 00:00:00 2001
From: ccardot <ccardot@evolis.com>
Date: Tue, 16 Aug 2022 14:21:45 +0200
Subject: [PATCH 1/4] Feature: display default branch automatically

---
 src/components/project-card.vue | 42 +++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/components/project-card.vue b/src/components/project-card.vue
index dba107f..6b5ed53 100644
--- a/src/components/project-card.vue
+++ b/src/components/project-card.vue
@@ -1,9 +1,10 @@
 <template>
   <div v-if="(showPipelinesOnly ? (pipelineCount > 0) : true) && showProjectOnlyOn" :class="['project-card', status]">
     <div class="content">
-      <div class="title small">{{ project !== null ? project.namespace.name : '...' }} /</div>
+      <div class="title small">{{ project !== null ? project.name_with_namespace.replace(project.name, "") : '...' }}</div>
       <a class="title" target="_blank" rel="noopener noreferrer" :href="project !== null ? project.web_url : '#'">
         {{ project !== null ? project.name : 'Loading project...' }}
+        <img :src="'http://11.1.1.140/api/v4/projects/' + project.id + '/repository/files/logo.png/raw?ref='+ project.default_branch +'&access_token=' + privateToken" alt="">
       </a>
       <div class="pipeline-container">
         <em v-if="pipelines !== null && pipelineCount === 0" class="no-pipelines">
@@ -145,23 +146,35 @@
           }
 
           // Process alert sounds
-          if (pipelines && this.project && this.config.soundAlerts.soundUrl !== null) {
+          if (pipelines && this.project && this.config.soundAlerts.soundUrlFail !== null && this.config.soundAlerts.soundUrlSuccess !== null) {
             const pipelinesWithSoundAlertsEnabled = Object.keys(pipelines).filter(branchName => {
               return !!branchName.match(new RegExp(this.config.soundAlerts.include)) &&
                 (!this.config.soundAlerts.exclude || !branchName.match(new RegExp(this.config.soundAlerts.exclude)))
             })
 
-            let alert = false
+            let alertFail = false
+            let alertSuccess = false
+
             for (const branch of pipelinesWithSoundAlertsEnabled) {
               const newFailedPipelines = pipelines[branch].filter(p => p.status === 'failed' && !this.alertSoundPlayedForPipelines.includes(p.id))
               for (const pipeline of newFailedPipelines) {
                 this.alertSoundPlayedForPipelines.push(pipeline.id)
-                alert = true
+                alertFail = true
               }
+              //Add Success Alert
+              const newSuccedPipelines = pipelines[branch].filter(p => p.status === 'success' && !this.alertSoundPlayedForPipelines.includes(p.id))
+              for (const pipeline of newFailedPipelines) {
+                this.alertSoundPlayedForPipelines.push(pipeline.id)
+                alertSuccess = true
+              }
+            }
+
+            if (alertFail) {
+              this.playSound(this.config.soundAlerts.soundUrlFail)
             }
 
-            if (alert) {
-              this.playSound(this.config.soundAlerts.soundUrl)
+            if (alertSuccess) {
+              this.playSound(this.config.soundAlerts.soundUrlSuccess)
             }
           }
         }
@@ -193,7 +206,7 @@
       },
       async fetchProject() {
         this.loading = true
-
+        this.privateToken = Config.root.privateToken
         this.project = await this.$api(`/projects/${this.projectId}`)
         this.$emit('input', this.project.last_activity_at)
 
@@ -214,13 +227,13 @@
         let refNamesAdditional = {}
 
         const branches = await this.$api(`/projects/${this.projectId}/repository/branches`, {
-          per_page: fetchCount > 100 ? 100 : fetchCount
+          per_page: 100
         }, { follow_next_page_links: fetchCount > 100 })
         const branchNames = branches.filter(branch => showMerged ? true : !branch.merged)
           .sort((a, b) => new Date(b.commit.committed_date).getTime() - new Date(a.commit.committed_date).getTime()).reverse()
           .map(branch => branch.name)
           .filter(branchName => {
-            return !!branchName.match(new RegExp(this.config.include)) &&
+            return !!branchName.match(new RegExp(this.config.include)) || !!branchName.match(new RegExp(this.project.default_branch)) &&
               (!this.config.exclude || !branchName.match(new RegExp(this.config.exclude)))
           })
         let tags = []
@@ -407,16 +420,25 @@
 
       .title {
         white-space: nowrap;
-        font-size: 16px;
+        font-size: 25px;
         font-weight: bold;
         text-shadow: 1.5px 1.5px rgba(0, 0, 0, 0.4);
         text-decoration: none;
         color: inherit;
+        //Add Logo's Project
+        display: flex;
+        align-items: center;
 
         &.small {
           font-size: 12px;
           line-height: 0.6;
         }
+
+        //Add Logo's Project 
+        img {
+          height: 3rem;
+          margin-left: 2rem;
+        }
       }
 
       .pipeline-container {

From d1b708e953c405b51bc8bfa896b2fe7a355825eb Mon Sep 17 00:00:00 2001
From: ccardot <ccardot@evolis.com>
Date: Tue, 16 Aug 2022 14:25:35 +0200
Subject: [PATCH 2/4] Feature: add auto display default branch

---
 src/components/project-card.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/project-card.vue b/src/components/project-card.vue
index 6b5ed53..51af602 100644
--- a/src/components/project-card.vue
+++ b/src/components/project-card.vue
@@ -233,7 +233,7 @@
           .sort((a, b) => new Date(b.commit.committed_date).getTime() - new Date(a.commit.committed_date).getTime()).reverse()
           .map(branch => branch.name)
           .filter(branchName => {
-            return !!branchName.match(new RegExp(this.config.include)) || !!branchName.match(new RegExp(this.project.default_branch)) &&
+            return !!branchName.match(new RegExp(this.config.include)) || !!branchName.match(this.project.default_branch) &&
               (!this.config.exclude || !branchName.match(new RegExp(this.config.exclude)))
           })
         let tags = []

From fdfe41a8b2fbe7d0515b0dcd2bf07e6bc907c5b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20CARDOT?=
 <30419015+Clement-Cardot@users.noreply.github.com>
Date: Tue, 16 Aug 2022 14:37:01 +0200
Subject: [PATCH 3/4] Update config.default.json

---
 src/config.default.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/config.default.json b/src/config.default.json
index 03f7e58..1ad2c26 100644
--- a/src/config.default.json
+++ b/src/config.default.json
@@ -46,7 +46,8 @@
       "hideSkippedPipelines": false,
       "hideSuccessfulPipelines": false,
       "soundAlerts": {
-        "soundUrl": null,
+        "soundUrlSuccess": null,  
+        "soundUrlFail": null,
         "include": ".*",
         "exclude": null
       }

From e4d249b123e3e01208133f7509d193c16e635066 Mon Sep 17 00:00:00 2001
From: ccardot <ccardot@evolis.com>
Date: Tue, 16 Aug 2022 15:07:17 +0200
Subject: [PATCH 4/4] fix

---
 src/components/project-card.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/project-card.vue b/src/components/project-card.vue
index 51af602..b4c07c2 100644
--- a/src/components/project-card.vue
+++ b/src/components/project-card.vue
@@ -4,7 +4,7 @@
       <div class="title small">{{ project !== null ? project.name_with_namespace.replace(project.name, "") : '...' }}</div>
       <a class="title" target="_blank" rel="noopener noreferrer" :href="project !== null ? project.web_url : '#'">
         {{ project !== null ? project.name : 'Loading project...' }}
-        <img :src="'http://11.1.1.140/api/v4/projects/' + project.id + '/repository/files/logo.png/raw?ref='+ project.default_branch +'&access_token=' + privateToken" alt="">
+        <img :src="GitLabApi + '/projects/' + project.id + '/repository/files/logo.png/raw?ref='+ project.default_branch +'&access_token=' + privateToken" alt="">
       </a>
       <div class="pipeline-container">
         <em v-if="pipelines !== null && pipelineCount === 0" class="no-pipelines">
@@ -207,6 +207,7 @@
       async fetchProject() {
         this.loading = true
         this.privateToken = Config.root.privateToken
+        this.GitLabApi = Config.root.gitlabApi
         this.project = await this.$api(`/projects/${this.projectId}`)
         this.$emit('input', this.project.last_activity_at)