@protacon/muster-booking-frontend 1.30.0 → 1.32.0

package/dist/styles.bundle.css

@@ -901,6 +901,13 @@ input[type='checkbox'] {
 	line-height: 19px;
 }
 
+.slot-price-original {
+	font-weight: 400;
+	margin-right: 8px;
+	text-decoration: line-through;
+	opacity: 0.6;
+}
+
 .slot-time {
 	font-weight: 700;
 	font-size: 16px;
@@ -975,6 +982,8 @@ input[type='checkbox'] {
 	top: 1em;
 	line-height: 1.7em;
 	border: 0.6em solid transparent;
+	height: 1vh;
+	width: 1vw;
 }
 .react-datepicker__navigation--previous {
 	border-right-color: #000;
@@ -1056,7 +1065,7 @@ input[type='checkbox'] {
 	flex-direction: column;
 	width: 50%;
 	height: 100%;
-	overflow-y: hidden;
+	overflow-y: auto;
 	padding-right: 32px;
 }
 @media (max-height: 991px) {
@@ -1149,7 +1158,13 @@ input[type='checkbox'] {
 }
 
 .book-here-btn {
-	padding-left: 4px;
+	margin-left: 4px;
+	color: #8ac100 !important;
+}
+
+.finalize-step-business-message {
+	font-size: 18px;
+	font-weight: 700;
 }
 
 .confirm-bookin-button {
@@ -1291,7 +1306,7 @@ input[type='checkbox'] {
 	padding-bottom: 10px;
 }
 .insurance .btn-secondary {
-	background-color: #1996ae;
+	background-color: #4ca7ba;
 	padding: 20px;
 }
 .insurance img {
@@ -1308,6 +1323,7 @@ input[type='checkbox'] {
 .insurency-button-container {
 	display: flex;
 }
+
 .visible-mobile-only {
 	display: none;
 }

package/docker/.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

package/docker/entrypoint.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+# Configuration from environment variables. For example FRONTEND_apiurl -> apiurl.
+if [ ! -f "$CONFIG_JS_PATH" ]; then
+    echo "Config file $CONFIG_JS_PATH not found! Set in env variable CONFIG_JS_PATH"
+    exit 1
+fi
+
+while IFS='' read -r line || [ -n "$line" ]; do
+    remainder="$line"
+    name="${remainder%%=*}"; remainder="${remainder#*=}"
+    value="${remainder}";
+
+    case $name in
+        "FRONTEND_"*)
+            echo "'$name' is FRONTEND configuration with value '$value', applying to config file."
+            field_name="${name#*_}"
+
+            sed -i "s|ENV_$field_name|$value|g" $CONFIG_JS_PATH
+            ;;
+        *) ;;
+    esac
+done <<EOF
+$(env)
+EOF
+
+nginx -g "daemon off;"

package/docker/nginx.conf

@@ -0,0 +1,49 @@
+map $sent_http_content_type $expires {
+    default                    off;
+    text/html                  epoch;
+    text/css                   max;
+    application/javascript     max;
+    ~image/                    max;
+}
+
+server {
+    listen       80;
+    server_name  localhost;
+    expires      $expires;
+    root         /usr/share/nginx/html;
+
+    if ($http_x_forwarded_proto = "http") {
+      return 301 https://$host$request_uri;
+    }
+
+    location ~ env.js {
+        expires -1;
+        add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+    }
+
+    location / {
+        index  index.html;
+        try_files $uri$args $uri$args/ $uri $uri/ /index.html =404;
+    }
+
+    gzip on;
+    gzip_disable "msie6";
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_buffers 16 8k;
+    gzip_http_version 1.1;
+    gzip_min_length 256;
+    gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript application/vnd.ms-fontobject application/x-font-ttf font/opentype image/svg+xml image/x-icon;
+
+    server_tokens off;
+    disable_symlinks off;
+
+    error_log /var/log/nginx/app_error.log;
+    access_log /var/log/nginx/app_access.log;
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}

package/package.json

@@ -4,7 +4,7 @@
   "author": "Muster by Pinja",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "/dist/index.bundle.js",
-  "version": "1.30.0",
+  "version": "1.32.0",
   "scripts": {
     "start": "webpack-dev-server",
     "build": "cross-env NODE_ENV=production OUTPUT=library webpack --progress",
@@ -16,17 +16,18 @@
     "copywebconfig": "cp web.config dist\\web.config"
   },
   "dependencies": {
-    "@react-google-maps/api": "^1.13.0",
-    "@types/react": "^16.14.5",
-    "@types/react-dom": "^16.9.12",
+    "@googlemaps/markerclusterer": "2.6.2",
+    "@types/react": "18.2.79",
+    "@types/react-dom": "18.2.25",
+    "@vis.gl/react-google-maps": "1.7.1",
     "immutable-ics": "^0.4.0",
     "js-sha256": "0.11.0",
     "mdi-react": "^5.6.0",
     "moment-timezone": "^0.5.40",
     "promise-polyfill": "^8.2.0",
     "react-bootstrap": "^1.5.2",
-    "react-datepicker": "2.16.0",
-    "react-select": "^3.2.0",
+    "react-datepicker": "4.25.0",
+    "react-select": "5.8.0",
     "redux": "^4.0.5",
     "whatwg-fetch": "^3.6.2"
   },
@@ -41,11 +42,13 @@
     "@babel/preset-react": "^7.12.13",
     "@babel/preset-typescript": "^7.13.0",
     "@babel/runtime": "^7.13.10",
+    "@babel/plugin-syntax-object-rest-spread": "7.8.3",
     "@eslint/js": "^9.23.0",
-    "@types/googlemaps": "^3.43.3",
+    "@types/google.maps": "3.58.1",
+    "@types/jasmine": "5.1.4",
     "@types/moment-timezone": "^0.5.30",
     "@types/react-redux": "^7.1.16",
-    "awesome-typescript-loader": "^5.2.1",
+    "ts-loader": "9.5.1",
     "babel-loader": "^8.2.2",
     "copy-webpack-plugin": "^9.0.0",
     "cross-env": "^5.2.1",

package/slack.json

@@ -3,16 +3,16 @@
   "actions": [
     {
       "type": "pull_request",
-      "channel": "#team-muster-dev",
+      "channel": "#team-muster-pings",
       "enabled": false
     },
     {
       "type": "review_request",
-      "channel": "#team-muster-dev"
+      "channel": "#team-muster-pings"
     },
     {
       "type": "review_status",
-      "channel": "#team-muster-dev"
+      "channel": "#team-muster-pings"
     }
   ]
 }