From 030776db37672953f22ca65b68a348a3279e4d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 6 Jun 2023 21:28:16 +0200 Subject: [PATCH] Add alert to warn about tagging deviation messages on stops only --- package-lock.json | 97 +++++++++++++++++++++++++++++ package.json | 1 + src/components/messages/register.js | 12 ++++ src/style/index.css | 4 +- 4 files changed, 113 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 62b66d968..987494baa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1670,6 +1670,50 @@ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, + "@entur/alert": { + "version": "0.14.3", + "resolved": "https://registry.npmjs.org/@entur/alert/-/alert-0.14.3.tgz", + "integrity": "sha512-eEPPuwNs60mNhIDVASscBJsf64+KeNdDQE4BGZwFGVuGtJuZybRKLCtMDlwmSbOyfyka8M/h2QUpoqFmJo936g==", + "requires": { + "@entur/expand": "^3.4.1", + "@entur/icons": "^6.3.0", + "@entur/tokens": "^3.9.0", + "@entur/typography": "^1.8.0", + "@entur/utils": "^0.9.0", + "classnames": "^2.3.1", + "copy-text-to-clipboard": "^2.2" + }, + "dependencies": { + "@entur/icons": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-6.3.0.tgz", + "integrity": "sha512-QO31nm4E0BMpqla+IJngRG8oMUH5WEaxOL/VV+2Vyookbe9UBJaB3qv0EQLWFoNRsg05Rz6wfST7snUnCwH+qA==", + "requires": { + "@entur/tokens": "^3.9.0" + } + }, + "@entur/typography": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.0.tgz", + "integrity": "sha512-ArhnnJ2f4OdPi9ztI41LVMJ8vo0Tv8AR8z5annZK4J1OYoF1LJ5q7jpNaPCjjarBFvMSc7dPVW4dD1xZlX30TQ==", + "requires": { + "@entur/icons": "6.3.0", + "@entur/tokens": "^3.9.0", + "@entur/utils": "^0.9.0", + "classnames": "^2.3.1", + "normalize-scss": "^7.0.1" + } + }, + "@entur/utils": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.9.0.tgz", + "integrity": "sha512-VIOkXgjM5ERSDhEpJnNR2AsPnc4WZpAQ2+YFL1tYI4cHKLSyZPt0BGOlfDIwd4CCXIesUHiNyTyJxQ91mmQ+Xw==", + "requires": { + "tiny-warning": "^1.0.3" + } + } + } + }, "@entur/auth-provider": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@entur/auth-provider/-/auth-provider-1.1.1.tgz", @@ -1728,6 +1772,49 @@ } } }, + "@entur/expand": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/@entur/expand/-/expand-3.4.1.tgz", + "integrity": "sha512-uGdZjdVOMsgKUyrFWEmhNMNSp5HPFhdcxuLv2VdlcYH4IM0gZqN4bFFQHTmPW/+kHPWwVOA5dlfs9v0R+IXaYg==", + "requires": { + "@entur/icons": "^6.3.0", + "@entur/tokens": "^3.9.0", + "@entur/typography": "^1.8.0", + "@entur/utils": "^0.9.0", + "classnames": "^2.3.1", + "react-collapse": "^5.1.0" + }, + "dependencies": { + "@entur/icons": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-6.3.0.tgz", + "integrity": "sha512-QO31nm4E0BMpqla+IJngRG8oMUH5WEaxOL/VV+2Vyookbe9UBJaB3qv0EQLWFoNRsg05Rz6wfST7snUnCwH+qA==", + "requires": { + "@entur/tokens": "^3.9.0" + } + }, + "@entur/typography": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.8.0.tgz", + "integrity": "sha512-ArhnnJ2f4OdPi9ztI41LVMJ8vo0Tv8AR8z5annZK4J1OYoF1LJ5q7jpNaPCjjarBFvMSc7dPVW4dD1xZlX30TQ==", + "requires": { + "@entur/icons": "6.3.0", + "@entur/tokens": "^3.9.0", + "@entur/utils": "^0.9.0", + "classnames": "^2.3.1", + "normalize-scss": "^7.0.1" + } + }, + "@entur/utils": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.9.0.tgz", + "integrity": "sha512-VIOkXgjM5ERSDhEpJnNR2AsPnc4WZpAQ2+YFL1tYI4cHKLSyZPt0BGOlfDIwd4CCXIesUHiNyTyJxQ91mmQ+Xw==", + "requires": { + "tiny-warning": "^1.0.3" + } + } + } + }, "@entur/form": { "version": "5.4.20", "resolved": "https://registry.npmjs.org/@entur/form/-/form-5.4.20.tgz", @@ -6169,6 +6256,11 @@ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "dev": true }, + "copy-text-to-clipboard": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-2.2.0.tgz", + "integrity": "sha512-WRvoIdnTs1rgPMkgA2pUOa/M4Enh2uzCwdKsOMYNAJiz/4ZvEJgmbF4OmninPmlFdAWisfeh0tH+Cpf7ni3RqQ==" + }, "core-js": { "version": "3.26.1", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.1.tgz", @@ -12674,6 +12766,11 @@ } } }, + "react-collapse": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/react-collapse/-/react-collapse-5.1.1.tgz", + "integrity": "sha512-k6cd7csF1o9LBhQ4AGBIdxB60SUEUMQDAnL2z1YvYNr9KoKr+nDkhN6FK7uGaBd/rYrYfrMpzpmJEIeHRYogBw==" + }, "react-datepicker": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.8.0.tgz", diff --git a/package.json b/package.json index 880b3d04f..d87965c27 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { + "@entur/alert": "^0.14.3", "@entur/auth-provider": "1.1.1", "@entur/button": "2.10.15", "@entur/datepicker": "3.0.10", diff --git a/src/components/messages/register.js b/src/components/messages/register.js index 89ae28f99..a24c6f70c 100644 --- a/src/components/messages/register.js +++ b/src/components/messages/register.js @@ -7,6 +7,7 @@ import { } from '@entur/button'; import { Contrast } from '@entur/layout'; import { DatePicker } from '@entur/datepicker'; +import { BannerAlertBox } from '@entur/alert'; import { lightFormat, isBefore } from 'date-fns'; import LinePicker from '../line-picker'; import StopPicker from '../stop-picker'; @@ -523,7 +524,17 @@ class Register extends React.Component { )} {this.state.type === 'stop' && this.state.stops && ( +
+

+ + Du er i ferd med å lage en avviksmelding som treffer all rutegående trafikk som passerer de(n) valgte holdeplassen(e) + på tvers av operatører. Hvis du ønsker å lage en avviksmelding som kun treffer enkelte linjer (og stopp), velg "Linje" i stedet. + +



+ )} )} diff --git a/src/style/index.css b/src/style/index.css index a3b364db8..fbad4f0fb 100644 --- a/src/style/index.css +++ b/src/style/index.css @@ -7,6 +7,7 @@ @import '~@entur/tooltip/dist/styles.css'; @import '~@entur/loader/dist/styles.css'; @import '~@entur/tab/dist/styles.css'; +@import '@entur/alert/dist/styles.css'; .hidden { opacity: 0; @@ -61,6 +62,7 @@ span { top: 130px; background-color: rgba(23, 28, 86, 1); min-width: 55%; + max-width:65%; min-height: 40; padding: 3%; padding-bottom: 5%; @@ -85,7 +87,7 @@ span { @media only screen and (max-width: 991px) { .register_box { min-width: 100%; - max-width: 100%; + max-width: 80%; min-height: calc(100% - 100px); background-color: rgba(23, 28, 86, 0.7); left: 0;