From a8d366ea0c17adfb56d9ec1451582b06c4709e36 Mon Sep 17 00:00:00 2001 From: Aron Novak Date: Mon, 3 Jun 2024 10:10:45 +0200 Subject: [PATCH 1/5] bump to latest ddev --- .ddev/.gitignore | 1 - .ddev/config.yaml | 20 +++++++++++++------- ci-scripts/install_ddev.sh | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.ddev/.gitignore b/.ddev/.gitignore index 28b8609f1d..48243b7529 100644 --- a/.ddev/.gitignore +++ b/.ddev/.gitignore @@ -7,7 +7,6 @@ /.dbimageExtra /.ddev-docker-*.yaml /.*downloads -/.global_commands /.homeadditions /.importdb* /.sshimageBuild diff --git a/.ddev/config.yaml b/.ddev/config.yaml index edf47cb99b..d52b8bba07 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -15,19 +15,22 @@ use_dns_when_possible: true composer_version: "1" web_environment: [] nodejs_version: "16" +corepack_enable: false +ddev_version_constraint: '>= 1.23' # Key features of DDEV's config.yaml: # name: # Name of the project, automatically provides # http://projectname.ddev.site and https://projectname.ddev.site -# type: # backdrop, craftcms, django4, drupal6/7/8/9/10, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress -# See https://ddev.readthedocs.io/en/latest/users/quickstart/ for more +# type: # backdrop, craftcms, django4, drupal, drupal6, drupal7, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress +# See https://ddev.readthedocs.io/en/stable/users/quickstart/ for more # information on the different project types +# "drupal" covers recent Drupal 8+ # docroot: # Relative path to the directory containing index.php. -# php_version: "8.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" +# php_version: "8.2" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" # You can explicitly specify the webimage but this # is not recommended, as the images are often closely tied to DDEV's' behavior, @@ -37,7 +40,7 @@ nodejs_version: "16" # database: # type: # mysql, mariadb, postgres -# version: # database version, like "10.4" or "8.0" +# version: # database version, like "10.11" or "8.0" # MariaDB versions can be 5.5-10.8 and 10.11, MySQL versions can be 5.5-8.0 # PostgreSQL versions can be 9-16. @@ -78,7 +81,7 @@ nodejs_version: "16" # Alternatively, an explicit Composer version may be specified, for example "2.2.18". # To reinstall Composer after the image was built, run "ddev debug refresh". -# nodejs_version: "18" +# nodejs_version: "20" # change from the default system Node.js version to any other version. # Numeric version numbers can be complete (i.e. 18.15.0) or # incomplete (18, 17.2, 16). 'lts' and 'latest' can be used as well along with @@ -87,6 +90,9 @@ nodejs_version: "16" # Note that you can continue using 'ddev nvm' or nvm inside the web container # to change the project's installed node version if you need to. +# corepack_enable: false +# Change to 'true' to 'corepack enable' and gain access to latest versions of yarn/pnpm + # additional_hostnames: # - somename # - someothername @@ -144,8 +150,8 @@ nodejs_version: "16" # - "mutagen": enables Mutagen for this project. # - "nfs": enables NFS for this project. # -# See https://ddev.readthedocs.io/en/latest/users/install/performance/#nfs -# See https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen +# See https://ddev.readthedocs.io/en/stable/users/install/performance/#nfs +# See https://ddev.readthedocs.io/en/stable/users/install/performance/#mutagen # fail_on_hook_fail: False # Decide whether 'ddev start' should be interrupted by a failing hook diff --git a/ci-scripts/install_ddev.sh b/ci-scripts/install_ddev.sh index 67f780b4bd..a7c4e3ee50 100755 --- a/ci-scripts/install_ddev.sh +++ b/ci-scripts/install_ddev.sh @@ -13,7 +13,7 @@ then fi echo "Install ddev." -curl -s -L https://raw.githubusercontent.com/drud/ddev/master/scripts/install_ddev.sh | bash -s v1.22.7 +curl -s -L https://raw.githubusercontent.com/drud/ddev/master/scripts/install_ddev.sh | bash -s v1.23.1 echo "Configuring ddev." mkdir ~/.ddev From 5dbec3d6e46b5b89cdc82b6b09b02a247a2603eb Mon Sep 17 00:00:00 2001 From: Aron Novak Date: Mon, 3 Jun 2024 10:20:37 +0200 Subject: [PATCH 2/5] add python 2.7 back --- .ddev/web-build/Dockerfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.ddev/web-build/Dockerfile b/.ddev/web-build/Dockerfile index 0f3c9174e7..6f2b06fd32 100644 --- a/.ddev/web-build/Dockerfile +++ b/.ddev/web-build/Dockerfile @@ -1,7 +1,19 @@ ARG BASE_IMAGE FROM $BASE_IMAGE -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::="--force-confold" --no-install-recommends --no-install-suggests inotify-tools python2.7 build-essential +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::="--force-confold" --no-install-recommends --no-install-suggests inotify-tools build-essential mime-support + +# Download and install Python 2.7 and dependencies from Debian 11 (Bullseye) +ADD https://deb.debian.org/debian/pool/main/libf/libffi/libffi7_3.3-6_amd64.deb /tmp/ +ADD https://deb.debian.org/debian/pool/main/o/openssl/libssl1.1_1.1.1w-0+deb11u1_amd64.deb /tmp/ +ADD https://deb.debian.org/debian/pool/main/p/python2.7/libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb /tmp/ +ADD https://deb.debian.org/debian/pool/main/p/python2.7/python2.7-minimal_2.7.18-8+deb11u1_amd64.deb /tmp/ +ADD https://deb.debian.org/debian/pool/main/p/python2.7/libpython2.7-stdlib_2.7.18-8+deb11u1_amd64.deb /tmp/ +ADD https://deb.debian.org/debian/pool/main/p/python2.7/python2.7_2.7.18-8+deb11u1_amd64.deb /tmp/ + +# Install the downloaded packages +RUN dpkg -i /tmp/*.deb && rm /tmp/*.deb + RUN update-alternatives --install /usr/bin/python python /usr/bin/python2.7 1 # Elm - directly downloading the binary. RUN wget https://github.com/elm/compiler/releases/download/0.19.1/binary-for-linux-64-bit.gz From d633d98029049039e79e5e831633b15ec5ee52a6 Mon Sep 17 00:00:00 2001 From: Aron Novak Date: Mon, 3 Jun 2024 10:47:59 +0200 Subject: [PATCH 3/5] fixes --- .ddev/commands/web/client-install | 1 + .ddev/commands/web/gulp | 1 + 2 files changed, 2 insertions(+) diff --git a/.ddev/commands/web/client-install b/.ddev/commands/web/client-install index 3bd603c519..4ab5cdbe10 100755 --- a/.ddev/commands/web/client-install +++ b/.ddev/commands/web/client-install @@ -9,3 +9,4 @@ npm install -g bower cd ../../client npm install --no-audit --no-fund bower install +npm rebuild node-sass diff --git a/.ddev/commands/web/gulp b/.ddev/commands/web/gulp index 0b2b12b8b0..00433700b6 100755 --- a/.ddev/commands/web/gulp +++ b/.ddev/commands/web/gulp @@ -33,4 +33,5 @@ then cp ../../eheza-infra/elm/${EHEZA_SITE}/Config.Deploy.elm ${CLIENT_PATH}/src/elm/ fi +export TZ=Europe/Budapest cd ../../client && gulp $@ From 41148537015d28fcbde9f663988d62d724555af0 Mon Sep 17 00:00:00 2001 From: Amitai Burstein Date: Wed, 5 Jun 2024 16:53:08 +0300 Subject: [PATCH 4/5] Update elm packages --- client/elm.json | 46 +++++++++++++++++++++++----------------- client/package-lock.json | 10 ++++----- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/client/elm.json b/client/elm.json index 7bc1042093..b2e6f92818 100644 --- a/client/elm.json +++ b/client/elm.json @@ -9,11 +9,11 @@ "direct": { "Gizra/elm-all-set": "1.0.1", "Gizra/elm-debouncer": "2.0.0", - "NoRedInk/elm-json-decode-pipeline": "1.0.0", + "NoRedInk/elm-json-decode-pipeline": "1.0.1", "avh4/elm-color": "1.0.0", "ccapndave/elm-update-extra": "4.0.0", - "elm/browser": "1.0.1", - "elm/core": "1.0.0", + "elm/browser": "1.0.2", + "elm/core": "1.0.5", "elm/html": "1.0.0", "elm/http": "1.0.0", "elm/json": "1.1.3", @@ -21,22 +21,22 @@ "elm/svg": "1.0.1", "elm/time": "1.0.0", "elm/url": "1.0.0", - "elm-community/json-extra": "4.0.0", - "elm-community/list-extra": "8.1.0", + "elm-community/json-extra": "4.3.0", + "elm-community/list-extra": "8.7.0", "elm-community/maybe-extra": "5.3.0", "elm-community/string-extra": "4.0.1", - "elm-community/typed-svg": "5.1.0", - "elm-explorations/test": "1.2.1", + "elm-community/typed-svg": "7.0.0", + "elm-explorations/test": "1.2.2", "etaque/elm-form": "4.0.0", - "folkertdev/one-true-path-experiment": "4.0.3", - "gampleman/elm-visualization": "2.0.1", - "hecrj/html-parser": "2.3.4", + "folkertdev/one-true-path-experiment": "6.0.0", + "gampleman/elm-visualization": "2.4.1", + "hecrj/html-parser": "2.4.0", "ianmackenzie/elm-float-extra": "1.1.0", - "justinmimbs/date": "3.2.1", - "justinmimbs/time-extra": "1.1.0", + "justinmimbs/date": "4.1.0", + "justinmimbs/time-extra": "1.2.0", "krisajenkins/remotedata": "5.0.0", "lukewestby/elm-http-builder": "6.0.0", - "myrho/elm-round": "1.0.4", + "myrho/elm-round": "1.0.5", "stoeffel/editable": "2.0.1", "truqu/elm-base64": "2.0.4", "truqu/elm-md5": "1.1.0", @@ -45,16 +45,22 @@ "indirect": { "elm/parser": "1.1.0", "elm/random": "1.0.0", - "elm/virtual-dom": "1.0.2", + "elm/virtual-dom": "1.0.3", + "elmcraft/core-extra": "2.0.0", "folkertdev/elm-deque": "3.0.1", - "folkertdev/svg-path-lowlevel": "3.0.0", - "ianmackenzie/elm-geometry": "1.2.1", - "ianmackenzie/elm-interval": "1.0.1", - "ianmackenzie/elm-triangular-mesh": "1.0.2", + "folkertdev/svg-path-lowlevel": "4.0.1", + "gampleman/elm-rosetree": "1.1.0", + "ianmackenzie/elm-1d-parameter": "1.0.1", + "ianmackenzie/elm-geometry": "3.11.0", + "ianmackenzie/elm-interval": "3.1.0", + "ianmackenzie/elm-triangular-mesh": "1.1.0", + "ianmackenzie/elm-units": "2.10.0", + "ianmackenzie/elm-units-interval": "3.2.0", + "ianmackenzie/elm-units-prefixed": "2.8.0", "pzp1997/assoc-list": "1.0.0", "rtfeldman/elm-hex": "1.0.0", - "rtfeldman/elm-iso8601-date-strings": "1.1.3", - "ryannhg/date-format": "2.3.0", + "rtfeldman/elm-iso8601-date-strings": "1.1.4", + "ryan-haskell/date-format": "1.0.0", "zwilias/elm-utf-tools": "2.0.1" } }, diff --git a/client/package-lock.json b/client/package-lock.json index 1d789a8795..a874d2efdb 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1261,7 +1261,7 @@ } }, "string-width-cjs": { - "version": "npm:string-width@4.2.3", + "version": "npm:string-width-cjs@4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, @@ -1304,7 +1304,7 @@ } }, "strip-ansi-cjs": { - "version": "npm:strip-ansi@6.0.1", + "version": "npm:strip-ansi-cjs@6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, @@ -1332,7 +1332,7 @@ } }, "wrap-ansi-cjs": { - "version": "npm:wrap-ansi@7.0.0", + "version": "npm:wrap-ansi-cjs@7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, @@ -9736,7 +9736,7 @@ "is-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==" + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" }, "is-object": { "version": "1.0.1", @@ -9816,7 +9816,7 @@ "is-regexp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==" + "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=" }, "is-relative": { "version": "1.0.0", From 2def87a6da4e2eeaec38798fc6b0cd1ff99d5c9c Mon Sep 17 00:00:00 2001 From: Amitai Burstein Date: Wed, 5 Jun 2024 17:00:06 +0300 Subject: [PATCH 5/5] Fill is now Paint --- client/src/elm/Pages/Dashboard/View.elm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/elm/Pages/Dashboard/View.elm b/client/src/elm/Pages/Dashboard/View.elm index 8112b87ee6..b4e165ff9d 100644 --- a/client/src/elm/Pages/Dashboard/View.elm +++ b/client/src/elm/Pages/Dashboard/View.elm @@ -84,7 +84,7 @@ import Translate exposing (Language, TranslationId, translate, translateText, tr import TypedSvg exposing (g, svg) import TypedSvg.Attributes as Explicit exposing (fill, transform, viewBox) import TypedSvg.Core exposing (Svg) -import TypedSvg.Types exposing (Fill(..), Transform(..)) +import TypedSvg.Types exposing (Paint(..), Transform(..)) import Utils.Html exposing (spinner, viewModal) import Utils.NominalDate exposing (sortByDateDesc) @@ -2302,7 +2302,7 @@ annular colors signs pieData = makeSlice index datum = Path.element (Shape.arc { datum | innerRadius = radius - 60 }) - [ fill <| Fill <| getColor index ] + [ fill <| Paint <| getColor index ] in g [ transform [ Translate (3 * radius + 20) radius ] ] [ g [] <| List.indexedMap makeSlice pieData @@ -2337,7 +2337,7 @@ viewPieChartLegend language translateFunc colorFunc signs = in div [ class "legend-item" ] [ svg [ Svg.Attributes.width "12", Svg.Attributes.height "12", viewBox 0 0 100 100 ] - [ Svg.circle [ cx "50", cy "50", r "40", fill <| Fill <| colorFunc sign ] [] + [ Svg.circle [ cx "50", cy "50", r "40", fill <| Paint <| colorFunc sign ] [] ] , span [] [ text <| label ++ " (" ++ normalizedPercentage ++ "%)" ] ]