From b781dce5ce4bb187e8831dc8e08df6bb22359909 Mon Sep 17 00:00:00 2001
From: Kamila <kamila.lach1@gmail.com>
Date: Tue, 30 Jul 2024 15:07:37 +0200
Subject: [PATCH 1/7] adjust style of footer links

---
 admin/src/components/ContentFooter.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/ContentFooter.vue b/admin/src/components/ContentFooter.vue
index 5afda3280..be305f650 100644
--- a/admin/src/components/ContentFooter.vue
+++ b/admin/src/components/ContentFooter.vue
@@ -7,13 +7,17 @@
           {{ $t('footer.copyright.year', { year }) }}
           <a
             :href="`https://gradido.net/${$i18n.locale}`"
-            class="font-weight-bold ml-1"
+            class="fw-bold ml-1 link-underline link-underline-opacity-0 link-underline-opacity-100-hover"
             target="_blank"
           >
             {{ $t('footer.copyright.link') }}
           </a>
-          {{ $t('math.pipe', 1) }}
-          <a href="https://github.com/gradido/gradido/releases/latest" target="_blank">
+          |
+          <a
+            href="https://github.com/gradido/gradido/releases/latest"
+            target="_blank"
+            class="link-underline link-underline-opacity-0 link-underline-opacity-100-hover"
+          >
             {{ $t('footer.app_version', { version }) }}
           </a>
           <a

From 669b5ef354bdc858182291cd742d7d69d7b3a54e Mon Sep 17 00:00:00 2001
From: Kamila <kamila.lach1@gmail.com>
Date: Wed, 31 Jul 2024 09:01:11 +0200
Subject: [PATCH 2/7] remove additional margin

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

diff --git a/admin/src/components/ContentFooter.vue b/admin/src/components/ContentFooter.vue
index be305f650..4e10c29de 100644
--- a/admin/src/components/ContentFooter.vue
+++ b/admin/src/components/ContentFooter.vue
@@ -1,5 +1,5 @@
 <template>
-  <hr />
+  <hr class="mb-0" />
   <div class="content-footer">
     <BTr class="mt-4 mb-4 justify-content-lg-between">
       <BCol>

From ebf298adae1302ab2d6d99a3b32734319777dec2 Mon Sep 17 00:00:00 2001
From: Kamila <kamila.lach1@gmail.com>
Date: Wed, 31 Jul 2024 09:01:35 +0200
Subject: [PATCH 3/7] rework icons to have them looking more like on prod

---
 admin/public/img/envelope.png                 | Bin 0 -> 491 bytes
 .../src/components/Tables/SearchUserTable.vue |  44 ++++++++++--------
 2 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 admin/public/img/envelope.png

diff --git a/admin/public/img/envelope.png b/admin/public/img/envelope.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba6e484d976ad5369120c816d92bfa7eb54a24ea
GIT binary patch
literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00009a7bBm000XU
z000XU0RWnu7ytkPok>JNRCt{2*3C;)Q5eVZ=>^<Gxl@c;wdut`7{PF(g$uD-20`G?
z*|rpNBQy&U+)9u_e?ztDKQNNSRY;)`Z9=e6v2@W#E<V*|yfcn5FChNlz~!9ZdA`qi
zyXWL`r#kV%Vk=6{fl4Sgsgx4nA8>CIXSg>FUdH7nKs)g+4PL=2t~L;Q4Qs*r3+}@+
zY+#@P(0;7r1#YFmg)ltEPdut4^Z|A-i8Bf75IBsZ_>~yz08Iw6hp|*$HaHsZ;5+7U
z{y%`{FpEtLm$g*}hv5c3;|(qz19}0k@fAH8?S-n~Fm>U59D&XnpoxDe`gB$B6pjRk
zaR|TTC|s}NyNNI19jf9h)H32?Y_u6Xk9EIYA-Nxz$8_{59vh6d0Bz%8s{Tm?eTt4K
z$@eZM%8t-h#AvGtj6B}rBf2v(zK>7-DfzxvVRNoTtbA242JsEA(4I9_WeMhw@La;n
zh&h-Ej`d8YYzk*{byEDT#v}H4Id~y9&fR(eGZGkyyI>&={?N#qDFwe0S8(ee0;N_w
heHL5t*gMsU*FK|LX2uIhktP5D002ovPDHLkV1lg*(LMkG

literal 0
HcmV?d00001

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 0dc7a2e78..cace1b10c 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -17,27 +17,33 @@
       </template>
 
       <template #cell(status)="row">
-        <div class="text-right">
-          <BAvatar v-if="row.item.deletedAt" class="mr-3 test-deleted-icon" variant="light">
-            <!-- <b-iconstack font-scale="2"> -->
-            <div>
+        <div class="d-flex gap-3 justify-content-end align-items-center">
+          <div v-if="row.item.deletedAt" class="w-auto mr-3 test-deleted-icon" variant="light">
+            <!-- <div>
               <IOcticonPerson24 />
               <IOcticonCircleSlash24 style="color: #f5365c" />
-            </div>
-            <!-- </b-iconstack> -->
-          </BAvatar>
-          <span v-if="!row.item.deletedAt">
-            <IPhEnvelope
+            </div> -->
+          </div>
+          <span v-if="!row.item.deletedAt" class="d-flex gap-2">
+            <div
               v-if="!row.item.emailChecked"
-              style="color: #f5365c"
-              class="align-center mr-3"
-            />
-            <!-- <BAvatar
-              v-if="!row.item.hasElopage"
-              variant="danger"
-              class="mr-3"
-              src="img/elopage_favicon.png"
-            /> -->
+              class="mr-3 rounded-circle bg-red-dark position-relative"
+              style="background-color: #dc3545; width: 40px; height: 40px"
+            >
+              <img
+                src="/admin/public/img/envelope.png"
+                style="transform: translate(15%, 15%)"
+                class="position-absolute"
+              />
+            </div>
+            <div>
+              <img
+                v-if="!row.item.hasElopage"
+                class="mr-3 rounded-circle bg-red-dark"
+                src="/admin/public/img/elopage_favicon.png"
+                style="background-color: #dc3545; width: 40px; height: 40px"
+              />
+            </div>
           </span>
           <IPhCaretUpFill
             v-if="row.detailsShowing === 'caret-up-fill'"
@@ -114,7 +120,7 @@
 </template>
 <script setup>
 import { ref, nextTick, onMounted, watch, computed } from 'vue'
-import { BTable, BAvatar, BTab, BTabs, BCard, useModalController } from 'bootstrap-vue-next'
+import { BTable, BTab, BTabs, BCard, useModalController } from 'bootstrap-vue-next'
 import { useStore } from 'vuex'
 import { useI18n } from 'vue-i18n'
 import { useAppToast } from '@/composables/useToast'

From 17a0cb64ed23055cb00dd5e159ffd3a9909704bb Mon Sep 17 00:00:00 2001
From: Kamila <kamila.lach1@gmail.com>
Date: Wed, 31 Jul 2024 11:54:41 +0200
Subject: [PATCH 4/7] rework icons in the table

---
 admin/public/img/circle-slash.png             | Bin 0 -> 1022 bytes
 admin/public/img/person.png                   | Bin 0 -> 396 bytes
 .../src/components/Tables/SearchUserTable.vue |  20 ++++++++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 admin/public/img/circle-slash.png
 create mode 100644 admin/public/img/person.png

diff --git a/admin/public/img/circle-slash.png b/admin/public/img/circle-slash.png
new file mode 100644
index 0000000000000000000000000000000000000000..b57bf7fc82d0999a9eba6ec409156304946957a6
GIT binary patch
literal 1022
zcmV<a0|ESrP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000XU
z000XU0RWnu7ytkRut`KgRCt`-SW9aZK@e`ecu>@vUX_r8Vj@n}Mnwo@t0s$x-~)5;
z5WR^008a{v5D*^`1kqFCukaG_s74Pan1H+8V^nfnM0`Lbn33w~*=*RIWXGM|0Y6xl
z>7JhXrn(+qwNn2(7WxNw2A*H2czo6%Uob!y11O%6F`3JSlo{|ngEVe{<}~t(K@OY!
zWKJW!H^BD{5_FVQsMIEdd`bhqt-Tz0)&M^=;9t^6!<7OZE_*znu~@QWz>hWZ=T*}5
zS_7SI{`?!8HPRh}d_6U}0E@i_=!Ja=a8(1{DnoH^%j-QlV36+`q@VWVfS=c|x8#5(
zqvzB8l;r&L2Kk3US`uP&`v$kA{Jt83fuUWIYw)rG`mVtri7dwx5pkN7Yt<?=(lzU2
z!1Ef1_p6K$cy!DFFGfDfZ~mE_^R=mVtd@iY9NaDL61{__Q<0Nxbze7C=_zed86#Zd
zb6j=Ney&Aw#a`=k!1JB3Tv$g={+%Tk#V0omJex{vw9-<RK9@u;-d5+6%M#scJxHE&
zi*Knek&B^`AIMyQ{t1-?n}mU@Gkv^Ob&*`0f;7@E1N>4Ym#^%t7q&pI#=(|E4z)LY
zsBsc$T%svWg~*beAQ%|xb7|*J!=x?zz_Th_a!=DHVU7Gr1I?@%6j|gd#=|@;R}YQ!
zL?itPJlatk6a^9`P5+Y0$#O9a(q*T7R^^!pOc|^c*jG7OE{2tAk*Yae8?;K;I%n~S
z%E@vugoD$MqYVT_aH<^12{iae8wj?u#bE~9+H{MNPqiH+VTP8A5g=V@2$DF>NDq;h
z<zg75N5Z92C~aRm0W@cjzNnlm7ei#80eY8M2c^MLIasbvizbvhByi4oSLHxXV35b;
z*=6K|su^tGiu6mQPq)cc3Z?BD=xd_f5=c|+B51su<OCY{wtcrp$JKfe*)8&0WO%p8
zeJuF>2I;p(dbZ)sq6ejckw!)unog4oJldgw%NqIHhXU_uX_0jNPJUH8Nv_gU+9FMw
zyi2NC%M0B>&UD<jiX}T?IkS4+b2S~gcw3R*I7=?ZKADxz>1bP5+95X)UHc=>Czqu)
zY?gx3r4or&2?+j{YFh>N<f)0zN#NM%j<US8hWEq@DqV#bvw1Fh#<P|Kq8=LgrjSeu
z2x+P%k=7kZevuwRWV*;C5u5H;iljR|vb8n7ANbXVc`ge`-zxP|1J6o>v+fZv(2U%h
s#^TvWBN9jt;gtDkB!CGTB-8(hzcoEn?FoL*OaK4?07*qoM6N<$f)pv#(EtDd

literal 0
HcmV?d00001

diff --git a/admin/public/img/person.png b/admin/public/img/person.png
new file mode 100644
index 0000000000000000000000000000000000000000..06dd31b53778d806ead8f59ac4ff5bb35cdfd61c
GIT binary patch
literal 396
zcmV;70dxL|P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkPK1oDDRCt`dl08cUK@f&7g<AQUIFqyR1FS4X&_ePPQj3)~R@$rR
zkFXL&NM_E61`7?x&72nLHEOF}{>jM-r;y8$yA|@n!0!9bKFqS~IK$M87fb-jDUh~*
zishtu^)PM)a~rJ^u)HGce#sNp6p|hQ>B}5F7jpxV<q|pA>h*zi8(GgSfcoV`Q6UjT
zQ2|Ila|40&%_d6~uyky);Q^8LeWlqP?e&+>f-$=ZJvm0w!>s;bU35l(qy?T-W6P|K
zXEMh|z~P>$w0&+N%Mr5d{Oxtu>bkQOY$C}$l0Ht>+EcMV-|(k_)Hj*w89Y%<7Liqv
z^v3mMHLb5qPiv+JSwiG+sejY8zkn<s-~}65Z-N}In=@vRL<ppJ<$74j3i}<T9#(+m
qwjZz?zhdqp?IwY?u>XFgLHY*eaLZ_nLc@yy0000<MNUMnLSTa2`K=KE

literal 0
HcmV?d00001

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index cace1b10c..da0c59d51 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -18,21 +18,27 @@
 
       <template #cell(status)="row">
         <div class="d-flex gap-3 justify-content-end align-items-center">
-          <div v-if="row.item.deletedAt" class="w-auto mr-3 test-deleted-icon" variant="light">
-            <!-- <div>
-              <IOcticonPerson24 />
-              <IOcticonCircleSlash24 style="color: #f5365c" />
-            </div> -->
+          <div
+            v-if="row.item.deletedAt"
+            class="mr-3 test-deleted-icon position-relative rounded-circle"
+            style="width: 40px; height: 40px"
+          >
+            <img src="/admin/public/img/circle-slash.png" class="position-absolute" />
+            <img
+              src="/admin/public/img/person.png"
+              class="position-relative"
+              style="transform: translate(50%, 30%)"
+            />
           </div>
           <span v-if="!row.item.deletedAt" class="d-flex gap-2">
             <div
               v-if="!row.item.emailChecked"
-              class="mr-3 rounded-circle bg-red-dark position-relative"
+              class="mr-3 rounded-circle position-relative"
               style="background-color: #dc3545; width: 40px; height: 40px"
             >
               <img
                 src="/admin/public/img/envelope.png"
-                style="transform: translate(15%, 15%)"
+                style="transform: translate(30%, 30%); width: 25px; height: 25px"
                 class="position-absolute"
               />
             </div>

From e1d7a8efa141356d9fb70baaf6620c30d572fe7c Mon Sep 17 00:00:00 2001
From: Kamila <kamila.lach1@gmail.com>
Date: Wed, 31 Jul 2024 12:37:45 +0200
Subject: [PATCH 5/7] style adjustment

---
 admin/src/components/ConfirmRegisterMailFormular.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index d9c47c8ea..95f185e77 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -11,11 +11,9 @@
         <!-- Using components -->
         <BInputGroup :prepend="$t('unregister_mail.info')" class="mt-3">
           <BFormInput v-model="email" readonly />
-          <BInputGroupText>
-            <BButton variant="outline-success" class="test-button" @click="sendRegisterMail">
-              {{ $t('unregister_mail.button') }}
-            </BButton>
-          </BInputGroupText>
+          <BButton variant="outline-success" append class="test-button" @click="sendRegisterMail">
+            {{ $t('unregister_mail.button') }}
+          </BButton>
         </BInputGroup>
       </div>
     </div>
@@ -24,7 +22,7 @@
 <script setup>
 import { ref } from 'vue'
 import { sendActivationEmail } from '../graphql/sendActivationEmail'
-import { BButton, BFormInput, BInputGroup, BInputGroupText } from 'bootstrap-vue-next'
+import { BButton, BFormInput, BInputGroup } from 'bootstrap-vue-next'
 import { useI18n } from 'vue-i18n'
 import { useMutation } from '@vue/apollo-composable'
 import { useAppToast } from '@/composables/useToast'

From 09911663624c817ce7c3ea68111708cf97907be5 Mon Sep 17 00:00:00 2001
From: Kamila <kamila.lach1@gmail.com>
Date: Wed, 31 Jul 2024 12:38:10 +0200
Subject: [PATCH 6/7] add success toast for undeletion of user

---
 admin/src/components/Tables/SearchUserTable.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index da0c59d51..b8addad98 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -139,7 +139,7 @@ import ChangeUserRoleFormular from '../ChangeUserRoleFormular.vue'
 const { t } = useI18n()
 const { confirm } = useModalController()
 const store = useStore()
-const { toastError } = useAppToast()
+const { toastError, toastSuccess } = useAppToast()
 
 const props = defineProps({
   items: {
@@ -218,6 +218,7 @@ const showDeleteModal = async () => {
         deletedUserForm.value.deleteUserMutation()
       }
     })
+
     .catch((error) => {
       toastError(error.message)
     })
@@ -240,6 +241,7 @@ const showUndeleteModal = async () => {
     .then((ok) => {
       if (ok) {
         undeletedUserForm.value.undeleteUserMutation()
+        toastSuccess(t('user_recovered'))
       }
     })
     .catch((error) => {
@@ -277,11 +279,7 @@ const onRowClicked = async (item) => {
       obj._showDetails = false
     }
   })
-
   await nextTick()
-  if (!status && rowDetails.value) {
-    // rowDetails.value.focus()
-  }
 }
 
 watch(

From 139f9bbc36eda9557dfea6896fb7b06b3c60189f Mon Sep 17 00:00:00 2001
From: Kamila <kamila.lach1@gmail.com>
Date: Wed, 31 Jul 2024 14:20:22 +0200
Subject: [PATCH 7/7] move icons to assets folder

---
 admin/components.d.ts                               |   4 ----
 .../img => src/assets/icons}/circle-slash.png       | Bin
 .../img => src/assets/icons}/elopage_favicon.png    | Bin
 admin/{public/img => src/assets/icons}/envelope.png | Bin
 admin/{public/img => src/assets/icons}/person.png   | Bin
 admin/src/components/Tables/SearchUserTable.vue     |   8 ++++----
 6 files changed, 4 insertions(+), 8 deletions(-)
 rename admin/{public/img => src/assets/icons}/circle-slash.png (100%)
 rename admin/{public/img => src/assets/icons}/elopage_favicon.png (100%)
 rename admin/{public/img => src/assets/icons}/envelope.png (100%)
 rename admin/{public/img => src/assets/icons}/person.png (100%)

diff --git a/admin/components.d.ts b/admin/components.d.ts
index 827de2e78..297e28552 100644
--- a/admin/components.d.ts
+++ b/admin/components.d.ts
@@ -77,12 +77,8 @@ declare module 'vue' {
     IBiX: typeof import('~icons/bi/x')['default']
     IBiXCircle: typeof import('~icons/bi/x-circle')['default']
     IIcBaselineClose: typeof import('~icons/ic/baseline-close')['default']
-    IOcticonCircleSlash24: typeof import('~icons/octicon/circle-slash24')['default']
-    IOcticonPerson24: typeof import('~icons/octicon/person24')['default']
     IPhCaretDown: typeof import('~icons/ph/caret-down')['default']
     IPhCaretUpFill: typeof import('~icons/ph/caret-up-fill')['default']
-    IPhEnvelope: typeof import('~icons/ph/envelope')['default']
-    IPhXCircle: typeof import('~icons/ph/x-circle')['default']
     NavBar: typeof import('./src/components/NavBar.vue')['default']
     NotFoundPage: typeof import('./src/components/NotFoundPage.vue')['default']
     OpenCreationsTable: typeof import('./src/components/Tables/OpenCreationsTable.vue')['default']
diff --git a/admin/public/img/circle-slash.png b/admin/src/assets/icons/circle-slash.png
similarity index 100%
rename from admin/public/img/circle-slash.png
rename to admin/src/assets/icons/circle-slash.png
diff --git a/admin/public/img/elopage_favicon.png b/admin/src/assets/icons/elopage_favicon.png
similarity index 100%
rename from admin/public/img/elopage_favicon.png
rename to admin/src/assets/icons/elopage_favicon.png
diff --git a/admin/public/img/envelope.png b/admin/src/assets/icons/envelope.png
similarity index 100%
rename from admin/public/img/envelope.png
rename to admin/src/assets/icons/envelope.png
diff --git a/admin/public/img/person.png b/admin/src/assets/icons/person.png
similarity index 100%
rename from admin/public/img/person.png
rename to admin/src/assets/icons/person.png
diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 08f8daa65..b31ff0c1a 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -23,9 +23,9 @@
             class="mr-3 test-deleted-icon position-relative rounded-circle"
             style="width: 40px; height: 40px"
           >
-            <img src="/admin/public/img/circle-slash.png" class="position-absolute" />
+            <img src="../../assets/icons/circle-slash.png" class="position-absolute" />
             <img
-              src="/admin/public/img/person.png"
+              src="../../assets/icons/person.png"
               class="position-relative"
               style="transform: translate(50%, 30%)"
             />
@@ -37,7 +37,7 @@
               style="background-color: #dc3545; width: 40px; height: 40px"
             >
               <img
-                src="/admin/public/img/envelope.png"
+                src="../../assets/icons/envelope.png"
                 style="transform: translate(30%, 30%); width: 25px; height: 25px"
                 class="position-absolute"
               />
@@ -46,7 +46,7 @@
               <img
                 v-if="!row.item.hasElopage"
                 class="mr-3 rounded-circle bg-red-dark"
-                src="/admin/public/img/elopage_favicon.png"
+                src="../../assets/icons/elopage_favicon.png"
                 style="background-color: #dc3545; width: 40px; height: 40px"
               />
             </div>