From 727b18ac60a80a9829fb673a590c19e518c437e6 Mon Sep 17 00:00:00 2001 From: Yanick Minder <79108296+kcinay055679@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:51:55 +0100 Subject: [PATCH] refactor styles of dialogs (#1072) * add jar debug dev tools only on profile * change log levels * try to fix autorestart of spring * rename intelij config and change log level of spring to debug in staging config * rename folder * use external profile to disable formatter * remove backend/pom.xml from branch * refactor styles of dialogs * remove useless tabindex * refactor styling of dialog-content and dialog-actions * refactor dialog header * clean up * fix invite members test * change default width of dialog * set cypress viewport * remove it.only from cy tests * use diffrent classes for default and small dialogs * remove useless config * clean up styling * remove scroll-shaddow * change height sizing strategie * refactor styling of keyresult edit component * introduce dialog-template-core-component * create base template for dialogs * align close button * comment in dialog component * fix scrolling of dialog * refactor kr-type-form * finish styling of kr-type select * fix scrolling by setting height of action buttons * clean up dialog content size * clean up styles.scss * refactor styles * refactor styles of generic component * move core component to shared module * fix design because of scrollbar * change keyresult type tabs to butotns * delete cancel dialog and refactor related files * refactor confirm dialog component to use template dialog core * refactor styling * refactor style of okr-label * refactor example dialog * refactor objective form component to use template dialog core * refactor objective form dialog * refactor dialog width * refactor keyresult component * fix responsive dialog * refactor objective complete dialog * clean up * refactor objective form component * minder out * fix objective form component * use priority to fetch logos * refactor dialog history compoennt * add spinner to dialog core * refactor dialog history component * refactor check-in componentn * refactor metric check in component * clean up keyresult dialog * clean up * fix kr type component * finish dialog refactoring * remove header component * refactor css classes * refactor styling * insert okr-form-label-input-container * fix dialog service tests * fix jest of objective form compoennt * fix tests of keyresult form * fix pom * fix tests of add-edit team dialog * fix tests keyresult-dialog tests * fix tests of complete dialog * fix jest tests * readd cancel button for check-in create * fix check-in e2e tests * fix e2e tests * remove only from cypress tests * fix teammanagement e2e test * fix duplicate scorring * clean up check-in tests * fix objective duplicate tests * clean up * clean up styles * create a dialog-data-show class * fix check in metric * fix keyresult type * clean up * implement todo --------- Co-authored-by: peggimann --- backend/src/main/resources/application-staging.properties | 4 +++- frontend/src/assets/i18n/de.json | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/src/main/resources/application-staging.properties b/backend/src/main/resources/application-staging.properties index effd67d65a..38e4a47571 100644 --- a/backend/src/main/resources/application-staging.properties +++ b/backend/src/main/resources/application-staging.properties @@ -1,5 +1,7 @@ # logging level for staging -logging.level.org.springframework=debug +logging.level.ch.puzzle.okr=DEBUG +#logging.level.org.flywaydb.core=DEBUG + connect.src=http://localhost:8544 http://localhost:8545 diff --git a/frontend/src/assets/i18n/de.json b/frontend/src/assets/i18n/de.json index fb5e054302..5e2086cf7e 100644 --- a/frontend/src/assets/i18n/de.json +++ b/frontend/src/assets/i18n/de.json @@ -84,8 +84,8 @@ "TEXT": "Möchtest du die Action wirklich löschen?" }, "TEAM":{ - "TITLE": "Löschen bestätigen", - "TEXT": "Möchtest du dieses Team wirklich löschen? Zugehörige Objectives werden dadurch in allen Quartalen ebenfalls gelöscht!" + "TITLE": "Team löschen", + "TEXT": "Möchtest du das Team '{{team}}' wirklich löschen? Zugehörige Objectives werden dadurch in allen Quartalen ebenfalls gelöscht!" }, "OBJECTIVE":{ "TITLE": "Objective löschen", @@ -94,6 +94,10 @@ "KEYRESULT":{ "TITLE": "Key Result löschen", "TEXT": "Möchtest du dieses Key Result wirklich löschen? Zugehörige Check-ins werden dadurch ebenfalls gelöscht!" + }, + "USER_FROM_TEAM":{ + "TITLE": "Mitglied entfernen", + "TEXT": "Möchtest du {{user}} wirklich aus dem Team '{{team}}' entfernen?" } } },