diff --git a/cypress/cypress.config.js b/cypress/cypress.config.js index db8308557..2a41e11a8 100644 --- a/cypress/cypress.config.js +++ b/cypress/cypress.config.js @@ -39,6 +39,8 @@ module.exports = defineConfig({ supportFile: "cypress/support/e2e.js", retries: 0, video: false, + viewportHeight: 720, + viewportWidth: 1290, setupNodeEvents, }, env: parsed diff --git a/cypress/support/step_definitions/common/I_click_the_checkbox_show_donations_progress_bar_and_save.js b/cypress/support/step_definitions/common/I_click_the_checkbox_show_donations_progress_bar_and_save.js index 1806af807..257b2b556 100644 --- a/cypress/support/step_definitions/common/I_click_the_checkbox_show_donations_progress_bar_and_save.js +++ b/cypress/support/step_definitions/common/I_click_the_checkbox_show_donations_progress_bar_and_save.js @@ -1,6 +1,8 @@ import { Then } from "@badeball/cypress-cucumber-preprocessor"; +import 'cypress-network-idle'; Then("I click the checkbox show donations progress bar and save", () => { cy.get("#showDonations").click() cy.get(".donations-info-button").click() + cy.waitForNetworkIdle(2000) }) diff --git a/package-lock.json b/package-lock.json index 01b51ab9b..d1694f921 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "auto-changelog": "^2.3.0", "bcryptjs": "^2.4.3", "cross-env": "^7.0.3", - "cypress": "^13.6.3", + "cypress": "^13.6.4", "cypress-network-idle": "^1.14.2", "date-fns": "^2.25.0", "dotenv": "^16.3.1", @@ -28,7 +28,7 @@ "import": "^0.0.6", "jsonwebtoken": "^9.0.2", "mock-socket": "^9.0.3", - "multiple-cucumber-html-reporter": "^3.6.0", + "multiple-cucumber-html-reporter": "^3.6.1", "neo4j-driver": "^4.3.4", "neode": "^0.4.8", "rosie": "^2.1.0", @@ -6261,9 +6261,9 @@ "optional": true }, "node_modules/cypress": { - "version": "13.6.3", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.3.tgz", - "integrity": "sha512-d/pZvgwjAyZsoyJ3FOsJT5lDsqnxQ/clMqnNc++rkHjbkkiF2h9s0JsZSyyH4QXhVFW3zPFg82jD25roFLOdZA==", + "version": "13.6.4", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.4.tgz", + "integrity": "sha512-pYJjCfDYB+hoOoZuhysbbYhEmNW7DEDsqn+ToCLwuVowxUXppIWRr7qk4TVRIU471ksfzyZcH+mkoF0CQUKnpw==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -9935,9 +9935,9 @@ "devOptional": true }, "node_modules/multiple-cucumber-html-reporter": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/multiple-cucumber-html-reporter/-/multiple-cucumber-html-reporter-3.6.0.tgz", - "integrity": "sha512-rXi4Cws4h2YylogD5rtbrwco+ytXK+yZuSxNCl6dfHG8m95JsD86Eu+4NEXn6gwoDC0X3OpZ2RTg54CooGqXXA==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/multiple-cucumber-html-reporter/-/multiple-cucumber-html-reporter-3.6.1.tgz", + "integrity": "sha512-Y4nu7PSl91yVKTQrCZt2WW98SoHVPldpv+ZOcdG9nMZhWa+IvpclECtmlUY/CatbCRRar/IMEcUYrJfjTgn8yg==", "dev": true, "dependencies": { "find": "^0.3.0", diff --git a/package.json b/package.json index 2ce6ee3d8..9b1c07ca8 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "auto-changelog": "^2.3.0", "bcryptjs": "^2.4.3", "cross-env": "^7.0.3", - "cypress": "^13.6.3", + "cypress": "^13.6.4", "cypress-network-idle": "^1.14.2", "date-fns": "^2.25.0", "dotenv": "^16.3.1", @@ -52,7 +52,7 @@ "import": "^0.0.6", "jsonwebtoken": "^9.0.2", "mock-socket": "^9.0.3", - "multiple-cucumber-html-reporter": "^3.6.0", + "multiple-cucumber-html-reporter": "^3.6.1", "neo4j-driver": "^4.3.4", "neode": "^0.4.8", "rosie": "^2.1.0", diff --git a/webapp/components/DateTimeRange/DateTimeRange.vue b/webapp/components/DateTimeRange/DateTimeRange.vue index de9b442c5..726eb1823 100644 --- a/webapp/components/DateTimeRange/DateTimeRange.vue +++ b/webapp/components/DateTimeRange/DateTimeRange.vue @@ -1,6 +1,6 @@ @@ -109,6 +119,7 @@ import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon' import DateTimeRange from '~/components/DateTimeRange/DateTimeRange' import HcRibbon from '~/components/Ribbon' import LocationTeaser from '~/components/LocationTeaser/LocationTeaser' +import RelativeDateTime from '~/components/RelativeDateTime' import UserTeaser from '~/components/UserTeaser/UserTeaser' import { mapGetters } from 'vuex' import PostMutations from '~/graphql/PostMutations' @@ -123,6 +134,7 @@ export default { DateTimeRange, HcRibbon, LocationTeaser, + RelativeDateTime, UserTeaser, }, props: { @@ -251,6 +263,7 @@ export default { flex-direction: column; overflow: visible; height: 100%; + padding-bottom: $space-x-small; > .hero-image { border-top-left-radius: 5px; @@ -266,12 +279,6 @@ export default { margin-bottom: $space-small; } - & .event-info { - display: flex; - align-items: center; - gap: 2px; - } - > .footer { display: flex; justify-content: space-between; @@ -301,5 +308,21 @@ export default { .user-teaser { margin-bottom: $space-small; } + > .date-row { + display: flex; + justify-content: flex-end; + margin-top: $space-small; + > .text { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: $text-color-soft; + font-size: $font-size-small; + + > .ds-text { + display: inline; + } + } + } } diff --git a/webapp/components/UserTeaser/UserTeaser.vue b/webapp/components/UserTeaser/UserTeaser.vue index 99ec1b35c..a9e556bf4 100644 --- a/webapp/components/UserTeaser/UserTeaser.vue +++ b/webapp/components/UserTeaser/UserTeaser.vue @@ -14,12 +14,12 @@ {{ userSlug }} - {{ userName }} + {{ userName }} {{ userSlug }} - {{ userName }} + {{ userName }}   @@ -34,12 +34,11 @@ - + - {{ userName }} diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue index 884ddb6c2..1e9622c13 100644 --- a/webapp/pages/post/_id/_slug/index.vue +++ b/webapp/pages/post/_id/_slug/index.vue @@ -405,12 +405,6 @@ export default { filter: blur($blur-radius); } - & .event-info { - display: flex; - align-items: center; - gap: 2px; - } - .blur-toggle { position: absolute; bottom: 0; diff --git a/yarn.lock b/yarn.lock index 6deb6ecf1..f7789f2d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3665,7 +3665,7 @@ cypress-network-idle@^1.14.2: resolved "https://registry.yarnpkg.com/cypress-network-idle/-/cypress-network-idle-1.14.2.tgz#0837100861feeb5a18f4c2d9815be079f8590f4d" integrity sha512-xAdR8dH58KFPv8eCDWjviScITrJOcUpuMXYfYTc175nk2/NvnJ+I6ylSn1CM7yZmoV/gLbFa36QLiH5NfNEaLQ== -cypress@^13.6.3: +cypress@^13.6.4: version "13.6.4" resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.6.4.tgz#42c88d3ee0342f1681abfacabf9c1f082676bc53" integrity sha512-pYJjCfDYB+hoOoZuhysbbYhEmNW7DEDsqn+ToCLwuVowxUXppIWRr7qk4TVRIU471ksfzyZcH+mkoF0CQUKnpw== @@ -5710,10 +5710,10 @@ ms@2.1.3, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multiple-cucumber-html-reporter@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/multiple-cucumber-html-reporter/-/multiple-cucumber-html-reporter-3.6.0.tgz#a41d3b69caa1a269b85d5783363a03579591875d" - integrity sha512-rXi4Cws4h2YylogD5rtbrwco+ytXK+yZuSxNCl6dfHG8m95JsD86Eu+4NEXn6gwoDC0X3OpZ2RTg54CooGqXXA== +multiple-cucumber-html-reporter@^3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/multiple-cucumber-html-reporter/-/multiple-cucumber-html-reporter-3.6.1.tgz#400ad89a8a5e873b295dd1fee543cb98274bab4e" + integrity sha512-Y4nu7PSl91yVKTQrCZt2WW98SoHVPldpv+ZOcdG9nMZhWa+IvpclECtmlUY/CatbCRRar/IMEcUYrJfjTgn8yg== dependencies: find "^0.3.0" fs-extra "^11.2.0"