From d9deee78e700740ac98622a4301f635c19c1a159 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Tue, 6 Apr 2021 16:55:17 +0200
Subject: [PATCH 01/10] replace global.scss by _variables.scss & remove hard
 comments

---
 app/src/scss/_variables.scss | 72 +++++++++++++++++++-----------------
 app/src/scss/globals.scss    | 25 -------------
 app/vue.config.js            |  2 +-
 3 files changed, 39 insertions(+), 60 deletions(-)
 delete mode 100644 app/src/scss/globals.scss

diff --git a/app/src/scss/_variables.scss b/app/src/scss/_variables.scss
index e1b64fb3..09ef312e 100644
--- a/app/src/scss/_variables.scss
+++ b/app/src/scss/_variables.scss
@@ -1,16 +1,27 @@
-/*
 
-  ╭─────────────────────────────╮
-  │ ┌─╮╭─╮╭─╮╶┬╴╭─╴╶┬╴┌─╮╭─┐┌─╮ │
-  │ │╶┤│ ││ │ │ ╰─╮ │ ├┬╯├─┤├─╯ │
-  │ └─╯╰─╯╰─╯ ╵ ╶─╯ ╵ ╵ ╰╵ ╵╵   │
-  ╰─────────────────────────────╯
+//   ╭─────────────────────────────────────────────────────────────────╮
+//   │                                                                 │
+//   │   /!\ DO NOT IMPORT OR DEFINE ACTUAL RULES INTO THIS FILE /!\   │
+//   │                                                                 │
+//   │  Only things that disappear after scss compilation is allowed.  │
+//   │                                                                 │
+//   ╰─────────────────────────────────────────────────────────────────╯
+//
+//   This file is magically imported into every components so that scss variables,
+//   functions and mixins can be accessed.
+//   But if some rules are defined here, they will be copied into the final build as many
+//   times as there are components…
 
-  Bootstrap and BootstrapVue overrides.
-  Bootstrap default: `app/node_modules/bootstrap/scss/_variables.scss`
-  BootstrapVue default: `app/node_modules/bootstrap-vue/src/_variables.scss`
 
-*/
+//  ╭─────────────────────────────╮
+//  │ ┌─╮╭─╮╭─╮╶┬╴╭─╴╶┬╴┌─╮╭─┐┌─╮ │
+//  │ │╶┤│ ││ │ │ ╰─╮ │ ├┬╯├─┤├─╯ │
+//  │ └─╯╰─╯╰─╯ ╵ ╶─╯ ╵ ╵ ╰╵ ╵╵   │
+//  ╰─────────────────────────────╯
+//
+//  Bootstrap and BootstrapVue overrides.
+//  Bootstrap default: `app/node_modules/bootstrap/scss/_variables.scss`
+//  BootstrapVue default: `app/node_modules/bootstrap-vue/src/_variables.scss`
 
 // TODO: add a feature so the user can set some css variables to change the global aspects ?
 // For exemple, turning rounding of elements off, the bases colors, etc.
@@ -49,44 +60,37 @@ $alert-padding-x: 1rem;
 $card-spacer-y: .6rem;
 $card-spacer-x: 1rem;
 
+
+// Import default variables after the above setup to compute all other variables.
 @import '~bootstrap/scss/functions.scss';
 @import '~bootstrap/scss/variables';
 @import '~bootstrap/scss/mixins.scss';
+@import '~bootstrap-vue/src/variables';
 
-// Overwrite list-group-item variants to lighter ones (used in diagnosis for example)
-@each $color, $value in $theme-colors {
-  @include list-group-item-variant($color, theme-color-level($color, -11), theme-color-level($color, 6));
-}
 
-// Add breakpoints for w-*
-@each $breakpoint in map-keys($grid-breakpoints) {
-  @each $size, $length in $sizes {
-    @include media-breakpoint-up($breakpoint) {
-      .w-#{$breakpoint}-#{$size} {
-        width: $length !important;
-      }
-    }
-  }
-}
 
-/*
 
-  ╭──────────────────────────────────────╮
-  │ ┌─╴╭─╮┌─╮╷ ╭   ╭─┐╷╷╷┌─╴╭─╴╭─╮╭╮╮┌─╴ │
-  │ ├─╴│ │├┬╯├┴╮╶─╴├─┤│││├─╴╰─╮│ ││││├─╴ │
-  │ ╵  ╰─╯╵ ╰╵ ╵   ╵ ╵╰╯╯╰─╴╶─╯╰─╯╵╵╵╰─╴ │
-  ╰──────────────────────────────────────╯
 
-  Fork-awesome variable overrides.
-  default: `app/node_modules/fork-awesome/scss/_variables.scss`
-
-*/
+//  ╭──────────────────────────────────────╮
+//  │ ┌─╴╭─╮┌─╮╷ ╭   ╭─┐╷╷╷┌─╴╭─╴╭─╮╭╮╮┌─╴ │
+//  │ ├─╴│ │├┬╯├┴╮╶─╴├─┤│││├─╴╰─╮│ ││││├─╴ │
+//  │ ╵  ╰─╯╵ ╰╵ ╵   ╵ ╵╰╯╯╰─╴╶─╯╰─╯╵╵╵╰─╴ │
+//  ╰──────────────────────────────────────╯
+//
+//  Fork-awesome variable overrides.
+//  default: `app/node_modules/fork-awesome/scss/_variables.scss`
 
 $fa-font-path: '~fork-awesome/fonts';
 $fa-font-size-base: 1rem;
 
+@import '~fork-awesome/scss/variables';
 
 
 $thin-border: 1px solid #eee;
+//  ╭────────────────────╮
+//  │ ╭─╴╷ ╷╭─╴╶┬╴╭─╮╭╮╮ │
+//  │ │  │ │╰─╮ │ │ ││││ │
+//  │ ╰─╴╰─╯╶─╯ ╵ ╰─╯╵╵╵ │
+//  ╰────────────────────╯
 
 $skeleton-color: #eaeaea;
diff --git a/app/src/scss/globals.scss b/app/src/scss/globals.scss
deleted file mode 100644
index 358e04d6..00000000
--- a/app/src/scss/globals.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-  ╭─────────────────────────────────────────────────────────────────╮
-  │                                                                 │
-  │   /!\ DO NOT IMPORT OR DEFINE ACTUAL RULES INTO THIS FILE /!\   │
-  │                                                                 │
-  │  Only things that disappear after scss compilation is allowed.  │
-  │                                                                 │
-  ╰─────────────────────────────────────────────────────────────────╯
-
-  This file is magically imported into every components so that scss variables and
-  mixins can be accessed.
-  But if some rules are defined here, they will be copied into the final build as many
-  times as there are components…
-
-*/
-
-@import 'variables';
-
-@import '~bootstrap/scss/functions';
-@import '~bootstrap/scss/variables';
-@import '~bootstrap/scss/mixins';
-
-@import '~bootstrap-vue/src/variables';
-
-@import '~fork-awesome/scss/variables';
diff --git a/app/vue.config.js b/app/vue.config.js
index e1b3aa4f..30657c7a 100644
--- a/app/vue.config.js
+++ b/app/vue.config.js
@@ -48,7 +48,7 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        prependData: '@import "@/scss/globals.scss";'
+        prependData: '@import "@/scss/_variables.scss";'
       }
     }
   },

From 5f1ae012222b0af89895f4ed308aa173c3ea77ba Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Tue, 6 Apr 2021 16:57:06 +0200
Subject: [PATCH 02/10] use variables instead of hardcoded styles

---
 app/src/App.vue                 |  2 +-
 app/src/api/api.js              |  2 +-
 app/src/scss/_variables.scss    | 11 ++++++---
 app/src/scss/main.scss          | 43 ++++++++++++++-------------------
 app/src/views/Home.vue          |  2 +-
 app/src/views/app/AppInfo.vue   |  2 +-
 app/src/views/tool/ToolList.vue |  2 +-
 app/src/views/user/UserInfo.vue |  2 +-
 8 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/app/src/App.vue b/app/src/App.vue
index d0ac5b5c..4325545a 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -210,7 +210,7 @@ main {
 }
 
 footer {
-  border-top: 1px solid #eee;
+  border-top: $thin-border;
   font-size: $font-size-sm;
   margin-top: 2rem;
 
diff --git a/app/src/api/api.js b/app/src/api/api.js
index d199dccb..88b6e827 100644
--- a/app/src/api/api.js
+++ b/app/src/api/api.js
@@ -58,7 +58,7 @@ export default {
   async fetch (method, uri, data = {}, { wait = true, websocket = true, initial = false, asFormData = false } = {}) {
     // `await` because Vuex actions returns promises by default.
     const request = await store.dispatch('INIT_REQUEST', { method, uri, initial, wait, websocket })
-
+    console.log(JSON.parse(JSON.stringify(request)), data)
     if (websocket) {
       await openWebSocket(request)
     }
diff --git a/app/src/scss/_variables.scss b/app/src/scss/_variables.scss
index 09ef312e..f55160eb 100644
--- a/app/src/scss/_variables.scss
+++ b/app/src/scss/_variables.scss
@@ -60,6 +60,9 @@ $alert-padding-x: 1rem;
 $card-spacer-y: .6rem;
 $card-spacer-x: 1rem;
 
+$input-btn-padding-y: .45rem;
+
+$list-group-item-padding-x: 1rem;
 
 // Import default variables after the above setup to compute all other variables.
 @import '~bootstrap/scss/functions.scss';
@@ -68,8 +71,11 @@ $card-spacer-x: 1rem;
 @import '~bootstrap-vue/src/variables';
 
 
+$body-color: $gray-800;
 
+$hr-border-color: $gray-200;
 
+$list-group-action-color: $gray-800;
 
 //  ╭──────────────────────────────────────╮
 //  │ ┌─╴╭─╮┌─╮╷ ╭   ╭─┐╷╷╷┌─╴╭─╴╭─╮╭╮╮┌─╴ │
@@ -81,16 +87,15 @@ $card-spacer-x: 1rem;
 //  default: `app/node_modules/fork-awesome/scss/_variables.scss`
 
 $fa-font-path: '~fork-awesome/fonts';
-$fa-font-size-base: 1rem;
+$fa-font-size-base: $font-size-base;
 
 @import '~fork-awesome/scss/variables';
 
 
-$thin-border: 1px solid #eee;
 //  ╭────────────────────╮
 //  │ ╭─╴╷ ╷╭─╴╶┬╴╭─╮╭╮╮ │
 //  │ │  │ │╰─╮ │ │ ││││ │
 //  │ ╰─╴╰─╯╶─╯ ╵ ╰─╯╵╵╵ │
 //  ╰────────────────────╯
 
-$skeleton-color: #eaeaea;
+$thin-border: $hr-border-width solid $hr-border-color;
diff --git a/app/src/scss/main.scss b/app/src/scss/main.scss
index bf4b974b..c33992bf 100644
--- a/app/src/scss/main.scss
+++ b/app/src/scss/main.scss
@@ -25,8 +25,6 @@ body {
   overflow-x: hidden;
   min-height: 100vh;
   margin: 0;
-  color: #333;
-  font-size: 14px;
 }
 
 #app {
@@ -37,29 +35,29 @@ body {
 
 .menu-list {
   .list-group-item {
-    padding: 0.75rem 0;
+    padding: $list-group-item-padding-y 0;
     display: flex;
     align-items: center;
   }
-
-  h2 {
-    font-size: 1.25rem;
-    font-weight: 400;
-    margin: 0;
-  }
 }
 
-.font-weight-bold {
-    font-weight: 500 !important;
-}
 
 // Bootstrap overrides
 
-.list-group-item {
-  padding: 0.75rem 1rem;
+// Overwrite list-group-item variants to lighter ones (used in diagnosis for example)
+@each $color, $value in $theme-colors {
+  @include list-group-item-variant($color, theme-color-level($color, -11), theme-color-level($color, 6));
 }
-.list-group-item-action {
-  color: #333;
+
+// Add breakpoints for w-*
+@each $breakpoint in map-keys($grid-breakpoints) {
+  @each $size, $length in $sizes {
+    @include media-breakpoint-up($breakpoint) {
+      .w-#{$breakpoint}-#{$size} {
+        width: $length !important;
+      }
+    }
+  }
 }
 
 // Allow state of input group to be displayed under the group
@@ -94,15 +92,15 @@ body {
   margin-top: 0;
 }
 
-.card {
+.card, .list-group-item {
   h1, h2, h3, h4, h5, h6 {
     margin: 0;
   }
 }
 
-.card-header {
+.card-header, .list-group-item {
   h1, h2, h3, h4, h5, h6 {
-    font-weight: 400;
+    font-weight: $font-weight-normal;
   }
 }
 
@@ -117,7 +115,7 @@ body {
 }
 
 .list-group-item .icon {
-    margin-left: 0.3em;
+  margin-left: 0.3rem;
 }
 
 // Fork-awesome overrides
@@ -141,8 +139,3 @@ code {
   padding: 1rem;
   background-color: $light;
 }
-
-.btn {
-  font-size: 1em;
-  line-height: 1.7;
-}
diff --git a/app/src/views/Home.vue b/app/src/views/Home.vue
index 81855609..f784fa13 100644
--- a/app/src/views/Home.vue
+++ b/app/src/views/Home.vue
@@ -7,7 +7,7 @@
         :to="{ name: item.routeName }"
       >
         <icon :iname="item.icon" class="lg" />
-        <h2>{{ $t(item.translation) }}</h2>
+        <h4>{{ $t(item.translation) }}</h4>
         <icon iname="chevron-right" class="lg fs-sm ml-auto" />
       </b-list-group-item>
     </b-list-group>
diff --git a/app/src/views/app/AppInfo.vue b/app/src/views/app/AppInfo.vue
index 82a1a6e6..314c6b78 100644
--- a/app/src/views/app/AppInfo.vue
+++ b/app/src/views/app/AppInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <view-base :queries="queries" @queries-response="onQueriesResponse" ref="view">
     <!-- BASIC INFOS -->
-    <card v-if="infos" :title="`${infos.label}`" icon="cube">
+    <card v-if="infos" :title="infos.label" icon="cube">
       <b-row
         v-for="(value, prop) in infos" :key="prop"
         no-gutters class="row-line"
diff --git a/app/src/views/tool/ToolList.vue b/app/src/views/tool/ToolList.vue
index 95b3800d..d2551875 100644
--- a/app/src/views/tool/ToolList.vue
+++ b/app/src/views/tool/ToolList.vue
@@ -7,7 +7,7 @@
       :to="{name: item.routeName}"
     >
       <icon :iname="item.icon" class="lg" />
-      <h2>{{ $t(item.translation) }}</h2>
+      <h4>{{ $t(item.translation) }}</h4>
       <icon iname="chevron-right" class="lg fs-sm ml-auto" />
     </b-list-group-item>
   </b-list-group>
diff --git a/app/src/views/user/UserInfo.vue b/app/src/views/user/UserInfo.vue
index ff8d1163..0fcf4505 100644
--- a/app/src/views/user/UserInfo.vue
+++ b/app/src/views/user/UserInfo.vue
@@ -126,7 +126,7 @@ export default {
 
 .row {
   + .row {
-      border-top: 1px solid #eee;
+      border-top: $thin-border;
   }
 
   padding: .5rem;

From 66e2742c94ec84b2d549f0167d72af1233641ec2 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Tue, 6 Apr 2021 16:58:44 +0200
Subject: [PATCH 03/10] forbid small assets to be encoded as base64 (fix pacman
 not present in build)

---
 app/src/api/api.js | 2 +-
 app/vue.config.js  | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/api/api.js b/app/src/api/api.js
index 88b6e827..d199dccb 100644
--- a/app/src/api/api.js
+++ b/app/src/api/api.js
@@ -58,7 +58,7 @@ export default {
   async fetch (method, uri, data = {}, { wait = true, websocket = true, initial = false, asFormData = false } = {}) {
     // `await` because Vuex actions returns promises by default.
     const request = await store.dispatch('INIT_REQUEST', { method, uri, initial, wait, websocket })
-    console.log(JSON.parse(JSON.stringify(request)), data)
+
     if (websocket) {
       await openWebSocket(request)
     }
diff --git a/app/vue.config.js b/app/vue.config.js
index 30657c7a..253e4509 100644
--- a/app/vue.config.js
+++ b/app/vue.config.js
@@ -37,6 +37,13 @@ module.exports = {
       )
     ]
   },
+  chainWebpack: config => {
+    config.module
+      .rule('images')
+        .use('url-loader')
+          .loader('url-loader')
+          .tap(options => Object.assign(options, { limit: 0 }))
+  },
   pluginOptions: {
     i18n: {
       locale: 'en',

From 8d77b0ffc1c56015cc8e48e1326956a4d34dc273 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Tue, 6 Apr 2021 17:40:15 +0200
Subject: [PATCH 04/10] fix doc link to dns config not opening a new tab

---
 app/src/i18n/locales/ar.json               | 2 +-
 app/src/i18n/locales/ca.json               | 2 +-
 app/src/i18n/locales/de.json               | 2 +-
 app/src/i18n/locales/en.json               | 2 +-
 app/src/i18n/locales/eo.json               | 2 +-
 app/src/i18n/locales/es.json               | 2 +-
 app/src/i18n/locales/fr.json               | 2 +-
 app/src/i18n/locales/it.json               | 2 +-
 app/src/i18n/locales/nl.json               | 2 +-
 app/src/i18n/locales/oc.json               | 2 +-
 app/src/i18n/locales/pt.json               | 2 +-
 app/src/i18n/locales/ru.json               | 2 +-
 app/src/i18n/locales/sv.json               | 2 +-
 app/src/views/_partials/WaitingDisplay.vue | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/i18n/locales/ar.json b/app/src/i18n/locales/ar.json
index f68933c3..67f39af6 100644
--- a/app/src/i18n/locales/ar.json
+++ b/app/src/i18n/locales/ar.json
@@ -54,7 +54,7 @@
     "disable": "تعطيل",
     "dns": "خدمة أسماء النطاقات",
     "domain_add": "إضافة نطاق",
-    "domain_add_dns_doc": "… و قد قُمتُ  <a href='//yunohost.org/dns_config'>بإعداد خدمة أسماء النطاقات بصورة صحيحة</a>.",
+    "domain_add_dns_doc": "… و قد قُمتُ  <a href='//yunohost.org/dns_config' target='_blank'>بإعداد خدمة أسماء النطاقات بصورة صحيحة</a>.",
     "domain_add_dyndns_doc": "... و إني أريد الحصول على خدمة أسماء النطاقات الديناميكي.",
     "domain_add_panel_with_domain": "عندي إسم نطاق …",
     "domain_add_panel_without_domain": "لا أمتلك إسم نطاق …",
diff --git a/app/src/i18n/locales/ca.json b/app/src/i18n/locales/ca.json
index 0325b995..97b01e2f 100644
--- a/app/src/i18n/locales/ca.json
+++ b/app/src/i18n/locales/ca.json
@@ -55,7 +55,7 @@
     "disable": "Desactivar",
     "dns": "DNS",
     "domain_add": "Afegir domini",
-    "domain_add_dns_doc": "... i he <a href='//yunohost.org/dns_config'> configurat el meu DNS correctament</a>.",
+    "domain_add_dns_doc": "... i he <a href='//yunohost.org/dns_config' target='_blank'> configurat el meu DNS correctament</a>.",
     "domain_add_dyndns_doc": "... i vull uns servei de DNS dinàmic.",
     "domain_add_panel_with_domain": "Ja tinc un nom de domini…",
     "domain_add_panel_without_domain": "No tinc un nom de domini…",
diff --git a/app/src/i18n/locales/de.json b/app/src/i18n/locales/de.json
index fe2493bb..6398e528 100644
--- a/app/src/i18n/locales/de.json
+++ b/app/src/i18n/locales/de.json
@@ -35,7 +35,7 @@
     "description": "Beschreibung",
     "disable": "Deaktivieren",
     "domain_add": "Domain hinzufügen",
-    "domain_add_dns_doc": "... und ich habe <a href='//yunohost.org/dns_config'>meine DNS Einstellung richtig hinterlegt</a>.",
+    "domain_add_dns_doc": "... und ich habe <a href='//yunohost.org/dns_config' target='_blank'>meine DNS Einstellung richtig hinterlegt</a>.",
     "domain_add_dyndns_doc": "... und ich möchte einen Dienst für dynamisches DNS nutzen.",
     "domain_add_panel_with_domain": "Ich habe schon eine Domain…",
     "domain_add_panel_without_domain": "Ich habe keine Domain…",
diff --git a/app/src/i18n/locales/en.json b/app/src/i18n/locales/en.json
index 2e96b476..61edb4cd 100644
--- a/app/src/i18n/locales/en.json
+++ b/app/src/i18n/locales/en.json
@@ -131,7 +131,7 @@
     "disabled": "Disabled",
     "dns": "DNS",
     "domain_add": "Add domain",
-    "domain_add_dns_doc": "… and I have <a href='//yunohost.org/dns_config'>set my DNS correctly</a>.",
+    "domain_add_dns_doc": "… and I have <a href='//yunohost.org/dns_config' target='_blank'>set my DNS correctly</a>.",
     "domain_add_dyndns_doc": "… and I want a dynamic DNS service.",
     "domain_add_dyndns_forbidden": "You have already subscribed to a DynDNS domain, you can ask to remove your current DynDNS domain on the forum <a href='//forum.yunohost.org/t/nohost-domain-recovery-suppression-de-domaine-en-nohost-me-noho-st-et-ynh-fr/442'>in the dedicated thread</a>.",
     "domain_add_panel_with_domain": "I already have a domain name…",
diff --git a/app/src/i18n/locales/eo.json b/app/src/i18n/locales/eo.json
index 38a2ad66..55014c37 100644
--- a/app/src/i18n/locales/eo.json
+++ b/app/src/i18n/locales/eo.json
@@ -64,7 +64,7 @@
     "mailbox_quota_placeholder": "Lasu malplenan aŭ agordi al 0 por malaktivigi.",
     "domain_default_desc": "La defaŭlta domajno estas la konekta domajno, kie uzantoj ensalutas.",
     "domain_dns_longdesc": "Vidu DNS-agordon",
-    "domain_add_dns_doc": "... kaj mi <a href='//yunohost.org/dns_config'> agordis mian DNS ĝuste </a>.",
+    "domain_add_dns_doc": "... kaj mi <a href='//yunohost.org/dns_config' target='_blank'> agordis mian DNS ĝuste </a>.",
     "confirm_update_apps": "Ĉu vi certas, ke vi volas ĝisdatigi ĉiujn aplikojn ?",
     "confirm_install_custom_app": "AVERTO! Instali aplikojn de tria partio eble kompromitos la integrecon kaj sekurecon de via sistemo. Vi probable ne devas instali ĝin krom se vi scias kion vi faras. Ĉu vi pretas riski tion?",
     "add": "Aldoni",
diff --git a/app/src/i18n/locales/es.json b/app/src/i18n/locales/es.json
index a7b2b770..6d1ed0a8 100644
--- a/app/src/i18n/locales/es.json
+++ b/app/src/i18n/locales/es.json
@@ -40,7 +40,7 @@
     "disable": "Inhabilitar",
     "dns": "DNS",
     "domain_add": "Añadir dominio",
-    "domain_add_dns_doc": "... y tengo <a href='//yunohost.org/dns_config'>mi DNS correctamente configurado</a>.",
+    "domain_add_dns_doc": "... y tengo <a href='//yunohost.org/dns_config' target='_blank'>mi DNS correctamente configurado</a>.",
     "domain_add_dyndns_doc": "…y quiero un servicio de DNS dinámico.",
     "domain_add_panel_with_domain": "Ya tengo un nombre de dominio…",
     "domain_add_panel_without_domain": "No tengo un nombre de dominio…",
diff --git a/app/src/i18n/locales/fr.json b/app/src/i18n/locales/fr.json
index 306e7b16..f386e932 100644
--- a/app/src/i18n/locales/fr.json
+++ b/app/src/i18n/locales/fr.json
@@ -40,7 +40,7 @@
     "disable": "Désactiver",
     "dns": "DNS",
     "domain_add": "Ajouter un domaine",
-    "domain_add_dns_doc": "… et j'ai <a href='//yunohost.org/dns_config'>configuré mes DNS correctement</a>.",
+    "domain_add_dns_doc": "… et j'ai <a href='//yunohost.org/dns_config' target='_blank'>configuré mes DNS correctement</a>.",
     "domain_add_dyndns_doc": "… et je souhaite ajouter un service DNS dynamique.",
     "domain_add_panel_with_domain": "J'ai déjà un nom de domaine …",
     "domain_add_panel_without_domain": "Je n'ai pas de nom de domaine …",
diff --git a/app/src/i18n/locales/it.json b/app/src/i18n/locales/it.json
index 251b01ff..f6cbecce 100644
--- a/app/src/i18n/locales/it.json
+++ b/app/src/i18n/locales/it.json
@@ -29,7 +29,7 @@
     "description": "Descrizione",
     "disable": "Disabilita",
     "domain_add": "Aggiungi dominio",
-    "domain_add_dns_doc": "… e ho <a href='//yunohost.org/dns_config'>correttamente impostato il mio DNS</a>.",
+    "domain_add_dns_doc": "… e ho <a href='//yunohost.org/dns_config' target='_blank'>correttamente impostato il mio DNS</a>.",
     "domain_add_dyndns_doc": "... e voglio un servizio DNS dinamico.",
     "domain_add_panel_with_domain": "Ho già un nome di domino…",
     "domain_add_panel_without_domain": "Non ho un nome di domino…",
diff --git a/app/src/i18n/locales/nl.json b/app/src/i18n/locales/nl.json
index dfa490bf..e9fd2e9c 100644
--- a/app/src/i18n/locales/nl.json
+++ b/app/src/i18n/locales/nl.json
@@ -35,7 +35,7 @@
     "description": "Beschrijving",
     "disable": "Uitschakelen",
     "domain_add": "Domeinnaam toevoegen",
-    "domain_add_dns_doc": "... en ik heb <a href='//yunohost.org/dns_config'>mijn DNS correct ingesteld</a>.",
+    "domain_add_dns_doc": "... en ik heb <a href='//yunohost.org/dns_config' target='_blank'>mijn DNS correct ingesteld</a>.",
     "domain_add_dyndns_doc": "... en ik wil een dynamische DNS-dienst (Dynamic DNS).",
     "domain_add_panel_with_domain": "Ik heb al een domeinnaam…",
     "domain_add_panel_without_domain": "Ik heb nog geen domeinnaam…",
diff --git a/app/src/i18n/locales/oc.json b/app/src/i18n/locales/oc.json
index c85403b4..f3f7c298 100644
--- a/app/src/i18n/locales/oc.json
+++ b/app/src/i18n/locales/oc.json
@@ -54,7 +54,7 @@
     "disable": "Desactivar",
     "dns": "DNS",
     "domain_add": "Ajustar un domeni",
-    "domain_add_dns_doc": "… e ai <a href='//yunohost.org/dns_config'>>corrèctament configurat mos DNS</a>.",
+    "domain_add_dns_doc": "… e ai <a href='//yunohost.org/dns_config' target='_blank'>>corrèctament configurat mos DNS</a>.",
     "domain_add_dyndns_doc": "… e desiri un nom de domeni preconfigurat.",
     "domain_add_panel_with_domain": "Ai ja mon nom de domeni…",
     "domain_add_panel_without_domain": "Ai pas de nom de domeni…",
diff --git a/app/src/i18n/locales/pt.json b/app/src/i18n/locales/pt.json
index e6e91cce..5467ec12 100644
--- a/app/src/i18n/locales/pt.json
+++ b/app/src/i18n/locales/pt.json
@@ -23,7 +23,7 @@
     "description": "Descrição",
     "disable": "Desativar",
     "domain_add": "Adicionar domínio",
-    "domain_add_dns_doc": "… coloco <a href='//yunohost.org/dns_config'>para definir o meu DNS</a>.",
+    "domain_add_dns_doc": "… coloco <a href='//yunohost.org/dns_config' target='_blank'>para definir o meu DNS</a>.",
     "domain_add_dyndns_doc": "... quero um serviço DNS dinâmico.",
     "domain_add_panel_with_domain": "Já tenho um domínio registado…",
     "domain_add_panel_without_domain": "Ainda não registei um domínio…",
diff --git a/app/src/i18n/locales/ru.json b/app/src/i18n/locales/ru.json
index ff32ff31..c30ca321 100644
--- a/app/src/i18n/locales/ru.json
+++ b/app/src/i18n/locales/ru.json
@@ -138,7 +138,7 @@
     "manually_renew_letsencrypt_message": "Сертификат будет автоматически обновлён в последние 15 дней своего действия. Вы может вручную обновить его, если хотите. (Не рекомендуется).",
     "manually_renew_letsencrypt": "Теперь обновить вручную",
     "confirm_postinstall": "Вы начинаете процесс конфигурации домена {domain}. Это займёт несколько минут, *не прерывайте процесс*.",
-    "domain_add_dns_doc": "… я <a href='//yunohost.org/dns_config'>set my DNS установил мой DNS правильно</a>.",
+    "domain_add_dns_doc": "… я <a href='//yunohost.org/dns_config' target='_blank'>set my DNS установил мой DNS правильно</a>.",
     "tools": "Инструменты",
     "tools_adminpw": "Смените пароль администратора",
     "tools_adminpw_current": "Действующий пароль",
diff --git a/app/src/i18n/locales/sv.json b/app/src/i18n/locales/sv.json
index eb0ef8f4..41d1ca6c 100644
--- a/app/src/i18n/locales/sv.json
+++ b/app/src/i18n/locales/sv.json
@@ -73,7 +73,7 @@
     "logs_path": "Sökväg",
     "add": "Lägg till",
     "install_name": "Installera {id}",
-    "domain_add_dns_doc": "… och jag har <a href='//yunohost.org/dns_config'>konfigurerat min DNS korrekt</a>.",
+    "domain_add_dns_doc": "… och jag har <a href='//yunohost.org/dns_config' target='_blank'>konfigurerat min DNS korrekt</a>.",
     "error_server_unexpected": "Oväntat serverfel",
     "previous": "Föregående",
     "save": "Spara",
diff --git a/app/src/views/_partials/WaitingDisplay.vue b/app/src/views/_partials/WaitingDisplay.vue
index 1dc76fb7..37a3e04c 100644
--- a/app/src/views/_partials/WaitingDisplay.vue
+++ b/app/src/views/_partials/WaitingDisplay.vue
@@ -5,7 +5,7 @@
 
     <!-- PROGRESS BAR -->
     <b-progress
-      v-if="progress" class="mt-4"
+      v-if="progress" class="my-4"
       :max="progress.max" height=".5rem"
     >
       <b-progress-bar variant="success" :value="progress.values[0]" />

From ae485e4dd5ae325d2d250ee2f7c2e0aaad648858 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Thu, 8 Apr 2021 10:14:49 +0200
Subject: [PATCH 05/10] small fix font size and main permission label

---
 app/src/i18n/locales/en.json | 2 +-
 app/src/scss/_variables.scss | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/i18n/locales/en.json b/app/src/i18n/locales/en.json
index 61edb4cd..a3548f5e 100644
--- a/app/src/i18n/locales/en.json
+++ b/app/src/i18n/locales/en.json
@@ -314,7 +314,7 @@
     "logs_more": "Display more lines",
     "pending_migrations": "There are some pending migrations waiting to be ran. Please go to the <a href='#/tools/migrations'>Tools > Migrations</a> view to run them.",
     "permission_corresponding_url": "Corresponding URL",
-    "permission_main": "Main permission",
+    "permission_main": "Main label",
     "permission_show_tile_enabled": "Visible as tile in user portal",
     "port": "Port",
     "ports": "Ports",
diff --git a/app/src/scss/_variables.scss b/app/src/scss/_variables.scss
index f55160eb..4182d446 100644
--- a/app/src/scss/_variables.scss
+++ b/app/src/scss/_variables.scss
@@ -27,7 +27,7 @@
 // For exemple, turning rounding of elements off, the bases colors, etc.
 // $enable-rounded: false;
 
-$font-size-base: 1rem;
+$font-size-base: .9rem;
 $font-weight-bold: 500;
 
 $blue:   #2f7ed2;
@@ -60,8 +60,6 @@ $alert-padding-x: 1rem;
 $card-spacer-y: .6rem;
 $card-spacer-x: 1rem;
 
-$input-btn-padding-y: .45rem;
-
 $list-group-item-padding-x: 1rem;
 
 // Import default variables after the above setup to compute all other variables.

From f35b848bf6696f2be8e8f503d1fa6a47633e6e3a Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Thu, 8 Apr 2021 10:15:26 +0200
Subject: [PATCH 06/10] fix app info url

---
 app/src/views/app/AppInfo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/views/app/AppInfo.vue b/app/src/views/app/AppInfo.vue
index 314c6b78..f173f27a 100644
--- a/app/src/views/app/AppInfo.vue
+++ b/app/src/views/app/AppInfo.vue
@@ -59,7 +59,7 @@
             </b-input-group>
           </template>
 
-          <template #description>
+          <template v-if="perm.url" #description>
             {{ $t('permission_corresponding_url') }}:
             <b-link :href="'https:' + perm.url">
               https://{{ perm.url }}
@@ -234,7 +234,7 @@ export default {
         multi_instance: this.$i18n.t(app.manifest.multi_instance ? 'yes' : 'no'),
         install_time: readableDate(app.settings.install_time, true, true)
       }
-      if (app.settings.domain) {
+      if (app.settings.domain && app.settings.path) {
         this.infos.url = 'https://' + app.settings.domain + app.settings.path
         form.url = {
           domain: app.settings.domain,

From 016b49b94d780fcb55a3c0e7205fe1d70410c2e3 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Thu, 8 Apr 2021 10:50:04 +0200
Subject: [PATCH 07/10] turn highquality badge into a star

---
 app/src/views/app/AppCatalog.vue | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/views/app/AppCatalog.vue b/app/src/views/app/AppCatalog.vue
index 31ebf917..227c035d 100644
--- a/app/src/views/app/AppCatalog.vue
+++ b/app/src/views/app/AppCatalog.vue
@@ -66,15 +66,20 @@
     <b-card-group v-else deck>
       <b-card no-body v-for="app in filteredApps" :key="app.id">
         <b-card-body class="d-flex flex-column">
-          <b-card-title class="d-flex">
+          <b-card-title class="d-flex mb-2">
             {{ app.manifest.name }}
-            <small v-if="app.state !== 'working'" class="ml-2">
+            <small v-if="app.state !== 'working'" class="d-flex align-items-center ml-2">
               <b-badge
+                v-if="app.state !== 'highquality'"
                 :variant="(app.color === 'danger' && app.state === 'lowquality') ? 'warning' : app.color"
                 v-b-popover.hover.bottom="$t(`app_state_${app.state}_explanation`)"
               >
                 {{ $t('app_state_' + app.state) }}
               </b-badge>
+              <icon
+                v-else iname="star" class="star"
+                v-b-popover.hover.bottom="$t(`app_state_${app.state}_explanation`)"
+              />
             </small>
           </b-card-title>
 
@@ -268,7 +273,7 @@ export default {
       } else {
         filters.isDecentQuality = true
       }
-      if (app.high_quality && app.level > 7) {
+      if (app.level >= 8) {
         filters.state = 'highquality'
         filters.isHighQuality = true
       }
@@ -276,8 +281,7 @@ export default {
     },
 
     formatColor (app) {
-      if (app.isHighQuality) return 'best'
-      if (app.isDecentQuality) return 'success'
+      if (app.isDecentQuality || app.isHighQuality) return 'success'
       if (app.isWorking) return 'warning'
       return 'danger'
     },
@@ -389,6 +393,10 @@ export default {
     .alert-warning {
       font-size: .75em;
     }
+
+    .star {
+      color: goldenrod;
+    }
   }
 
   .category-card {

From 128f059724e6932f27b61c38e8864232892b17cb Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Thu, 8 Apr 2021 13:24:12 +0200
Subject: [PATCH 08/10] highlight error message & bigger h for history title

---
 app/src/components/QueryHeader.vue         | 1 +
 app/src/i18n/locales/en.json               | 3 +--
 app/src/views/_partials/ErrorDisplay.vue   | 5 +++--
 app/src/views/_partials/HistoryConsole.vue | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/components/QueryHeader.vue b/app/src/components/QueryHeader.vue
index 6d265e49..0109979f 100644
--- a/app/src/components/QueryHeader.vue
+++ b/app/src/components/QueryHeader.vue
@@ -98,6 +98,7 @@ div {
   height: 1.25rem;
   display: flex;
   align-items: center;
+  justify-content: center;
   min-width: 70px;
 }
 
diff --git a/app/src/i18n/locales/en.json b/app/src/i18n/locales/en.json
index a3548f5e..4025d01f 100644
--- a/app/src/i18n/locales/en.json
+++ b/app/src/i18n/locales/en.json
@@ -414,8 +414,7 @@
     "warnings": "{count} warnings",
     "words": {
         "collapse": "Collapse",
-        "default": "Default",
-        "dismiss": "Dismiss"
+        "default": "Default"
     },
     "wrong_password": "Wrong password",
     "yes": "Yes",
diff --git a/app/src/views/_partials/ErrorDisplay.vue b/app/src/views/_partials/ErrorDisplay.vue
index 344cdc0f..7ed16a4e 100644
--- a/app/src/views/_partials/ErrorDisplay.vue
+++ b/app/src/views/_partials/ErrorDisplay.vue
@@ -20,7 +20,8 @@
       </p>
 
       <p>
-        <strong v-t="'api_error.error_message'" /> <span v-html="error.message" />
+        <strong v-t="'api_error.error_message'" />
+        <b-alert class="mt-2" variant="danger" v-html="error.message" />
       </p>
 
       <template v-if="error.traceback">
@@ -42,7 +43,7 @@
       <!-- TODO add copy error ? -->
       <b-button
         variant="light" size="sm"
-        v-t="'words.dismiss'" @click="dismiss"
+        v-t="'ok'" @click="dismiss"
       />
     </b-card-footer>
   </div>
diff --git a/app/src/views/_partials/HistoryConsole.vue b/app/src/views/_partials/HistoryConsole.vue
index d7d58bb4..6d0a18ac 100644
--- a/app/src/views/_partials/HistoryConsole.vue
+++ b/app/src/views/_partials/HistoryConsole.vue
@@ -10,9 +10,9 @@
       @mousedown.left.prevent="onHistoryBarClick"
       @keyup.space.enter.prevent="onHistoryBarKey"
     >
-      <h6 class="m-0">
-        <icon iname="history" /> <span class="d-none d-sm-inline">{{ $t('history.title') }}</span>
-      </h6>
+      <h5 class="m-0">
+        <icon iname="history" /> <span class="d-none d-sm-inline font-weight-bold">{{ $t('history.title') }}</span>
+      </h5>
 
       <!-- CURRENT/LAST ACTION -->
       <b-button

From 59373045a883028603d5873eda0bfb800099825f Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Thu, 8 Apr 2021 15:37:13 +0200
Subject: [PATCH 09/10] remove peer review mention in high quality explanation

---
 app/src/i18n/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/i18n/locales/en.json b/app/src/i18n/locales/en.json
index 4025d01f..e527c71b 100644
--- a/app/src/i18n/locales/en.json
+++ b/app/src/i18n/locales/en.json
@@ -65,7 +65,7 @@
     "app_state_lowquality": "low quality",
     "app_state_lowquality_explanation": "This app may be functional, but may still contain issues, or is not fully integrated with YunoHost, or it does not respect the good practices.",
     "app_state_highquality": "high quality",
-    "app_state_highquality_explanation": "This app is well-integrated with YunoHost. It has been (and is!) peer-reviewed by the YunoHost app team. It can be expected to be safe and maintained on the long-term.",
+    "app_state_highquality_explanation": "This app is well-integrated with YunoHost since at least a year.",
     "app_state_working": "working",
     "app_state_working_explanation": "The maintainer of this app declared it as 'working'. It means that it should be functional (c.f. application level) but is not necessarily peer-reviewed, it may still contain issues or is not fully integrated with YunoHost.",
     "applications": "Applications",

From 982757244ff034c023d2768485b1f5b2d49b8cf4 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Thu, 8 Apr 2021 15:38:14 +0200
Subject: [PATCH 10/10] revert the limit on base64 image encoding

---
 app/vue.config.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/vue.config.js b/app/vue.config.js
index 253e4509..30657c7a 100644
--- a/app/vue.config.js
+++ b/app/vue.config.js
@@ -37,13 +37,6 @@ module.exports = {
       )
     ]
   },
-  chainWebpack: config => {
-    config.module
-      .rule('images')
-        .use('url-loader')
-          .loader('url-loader')
-          .tap(options => Object.assign(options, { limit: 0 }))
-  },
   pluginOptions: {
     i18n: {
       locale: 'en',