Merge branch 'uat'

.github/workflows/deploy2prod.yml

@@ -8,15 +8,15 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
-        node-version: '19.8.1'
+        node-version: '20.3.0'
 
     - name: Cache node_modules
       id: cache-npm
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
           cache-name: cache-node-modules
       with:

.github/workflows/deploy2uat.yml

@@ -8,15 +8,15 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
-        node-version: '19.8.1'
+        node-version: '20.3.0'
 
     - name: Cache node_modules
       id: cache-npm
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       env:
         cache-name: cache-node-modules
       with:

package.json

@@ -65,6 +65,7 @@
   "scripts": {
     "generate-meta-tag": "node ./node_modules/react-cache-buster/dist/generate-meta-tag.js",
     "start": "webpack serve --mode development --port 3000 --open --hot --progress --host localhost --static .",
+    "start-remote-api": "webpack serve --config webpack.config_uat.js --mode development --port 3000 --open --hot --progress --host localhost --static .",
     "build": "npm run generate-meta-tag && npm run build-app",
     "build-app": "webpack --config webpack.config_prod.js",
     "test": "react-scripts test",

src/axios.js

@@ -2,7 +2,7 @@ var axios = require("axios");
 export const baseURL =
   // "https://www2.zuugle.at/api";
   window.location.host.indexOf("localhost") >= 0
-    ? "http://localhost:8080/api"
+    ? process.env.REACT_APP_API_URL
     : `${window.location.protocol}//${window.location.host}/api`;
 
 let axiosInstance = axios.create({

src/components/DomainMenu/index.js

@@ -33,6 +33,11 @@ if(process.env.NODE_ENV === "development") {
 			},
 			{
 				id: 3,
+				name: "Zuugle.it",
+				url: "https://www.zuugle.it",
+			},
+			{
+				id: 4,
 				name: "Zuugle.si",
 				url: "https://www.zuugle.si",
 			},
@@ -55,6 +60,11 @@ if (host.indexOf("www.zuugle.at") >= 0) {
 		},
 		{
 			id: 2,
+			name: "Zuugle.it",
+			url: "https://www.zuugle.it",
+		},
+		{
+			id: 3,
 			name: "Zuugle.si",
 			url: "https://www.zuugle.si",
 		},
@@ -75,6 +85,11 @@ else if (host.indexOf("www.zuugle.de") >= 0) {
 		},
 		{
 			id: 2,
+			name: "Zuugle.it",
+			url: "https://www.zuugle.it",
+		},
+		{
+			id: 3,
 			name: "Zuugle.si",
 			url: "https://www.zuugle.si",
 		},
@@ -94,14 +109,41 @@ else if (host.indexOf("www.zuugle.si") >= 0) {
 			url: "https://www.zuugle.at",
 		},
 		{
+			id: 2,
 			name: "Zuugle.de",
 			url: "https://www.zuugle.de",
 		},
+		{
+			id: 3,
+			name: "Zuugle.it",
+			url: "https://www.zuugle.it",
+		},
 	];
 }
 else if (host.indexOf("www.zuugle.it") >= 0) {
 	domain = 'www.zuugle.it';
-
+	listOfDomains = [
+		{
+			id: 0,
+			name: "Zuugle.it",
+			url: "https://www.zuugle.it",
+		},
+		{
+			id: 1,
+			name: "Zuugle.at",
+			url: "https://www.zuugle.at",
+		},
+		{
+			id: 2,
+			name: "Zuugle.de",
+			url: "https://www.zuugle.de",
+		},
+		{
+			id: 3,
+			name: "Zuugle.si",
+			url: "https://www.zuugle.si",
+		},
+	];
 }
 else if (host.indexOf("www.zuugle.ch") >= 0) {
 	domain = 'www.zuugle.ch';
@@ -125,6 +167,12 @@ if (host.indexOf("www2.zuugle.at") >= 0) {
 			url: "https://www2.zuugle.de",
 		},
 		{
+			id: 2,
+			name: "UAT Zuugle.it",
+			url: "https://www2.zuugle.it",
+		},
+		{
+			id: 3,
 			name: "UAT Zuugle.si",
 			url: "https://www2.zuugle.si",
 		},
@@ -144,6 +192,12 @@ else if (host.indexOf("www2.zuugle.de") >= 0) {
 			url: "https://www2.zuugle.at",
 		},
 		{
+			id: 2,
+			name: "UAT Zuugle.it",
+			url: "https://www2.zuugle.it",
+		},
+		{
+			id: 3,
 			name: "UAT Zuugle.si",
 			url: "https://www2.zuugle.si",
 		},
@@ -163,14 +217,41 @@ else if (host.indexOf("www2.zuugle.si") >= 0) {
 			url: "https://www2.zuugle.at",
 		},
 		{
+			id: 2,
 			name: "UAT Zuugle.de",
 			url: "https://www2.zuugle.de",
 		},
+		{
+			id: 3,
+			name: "UAT Zuugle.it",
+			url: "https://www2.zuugle.it",
+		},
 	];
 }
 else if (host.indexOf("www2.zuugle.it") >= 0) {
 	domain = 'www2.zuugle.it';
-
+	listOfDomains = [
+		{
+			id: 0,
+			name: "UAT Zuugle.it",
+			url: "https://www2.zuugle.it",
+		},
+		{
+			id: 1,
+			name: "UAT Zuugle.at",
+			url: "https://www2.zuugle.at",
+		},
+		{
+			id: 2,
+			name: "UAT Zuugle.de",
+			url: "https://www2.zuugle.de",
+		},
+		{
+			id: 3,
+			name: "UAT Zuugle.si",
+			url: "https://www2.zuugle.si",
+		},
+	];
 }
 else if (host.indexOf("www2.zuugle.ch") >= 0) {
 	domain = 'www2.zuugle.ch';
@@ -183,7 +264,7 @@ else if (host.indexOf("www2.zuugle.fr") >= 0) {
 
 
 const secondMenu = [
-	{ id: 0, name: "Über Zuugle", url: "https://www.bahnzumberg.at/" },
+	{ id: 0, name: "Über Zuugle", url: "https://verein.bahn-zum-berg.at/" },
 	{ id: 1, name: "Impressum", url: "https://" + domain + "/imprint" },
 	{ id: 2, name: "Datenschutz", url: "https://" + domain + "/privacy" },
 ];

src/components/Search/CityInput.js

@@ -50,7 +50,7 @@ export default function CityInput({
     } else if (host.indexOf("zuugle.si") >= 0) {
       return "Ljubljana, Maribor,...";
     } else if (host.indexOf("zuugle.it") >= 0) {
-      return "Bozen, ...";
+      return "Milano, Bozen, ...";
     } else {
       return "Wien, Graz, ...";
     }

webpack.config.js

@@ -96,7 +96,7 @@ module.exports = {
 			attributes: {},
 		}),
 		new webpack.DefinePlugin({
-			"process.env.API_URL": JSON.stringify("http://localhost:8080/api"),
+			"process.env.REACT_APP_API_URL": JSON.stringify("http://localhost:8080/api"),
 		}),
 	],
 };

webpack.config_uat.js

@@ -0,0 +1,102 @@
+const webpack = require("webpack");
+const path = require("path");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+
+const BUILD_DIR = path.resolve(__dirname, "build");
+
+module.exports = {
+	mode: "development",
+	output: {
+		path: BUILD_DIR,
+		filename: "./app_static/[name].bundle.js",
+	},
+
+	devServer: {
+		static: BUILD_DIR,
+		// directory: BUILD_DIR,
+		// staticOptions: {
+		//   setHeaders: (res, path) => {
+		//     if (path.endsWith('.json')) {
+		//       res.setHeader('Content-Type', 'application/javascript');
+		//     }
+		//   },
+		// },
+		// staticOptions: {
+		//   setHeaders: (res, path) => {
+		//     if (path.endsWith('.json')) {
+		//       res.setHeader('Content-Type', 'text/html');
+		//     }
+		//   },
+		// },
+
+		compress: true,
+		open: true,
+		historyApiFallback: true,
+	},
+	module: {
+		rules: [
+			{
+				test: /\.(js|jsx)$/,
+				exclude: /node_modules/,
+				use: {
+					loader: "babel-loader",
+					options: {
+						presets: [["@babel/preset-env", { targets: "defaults" }]],
+					},
+				},
+			},
+			{
+				test: /\.html$/,
+				loader: "html-loader",
+			},
+			{
+				test: /\.(scss)$/,
+				loader: "css-loader",
+			},
+			{
+				test: /\.css$/i,
+				use: [MiniCssExtractPlugin.loader, "css-loader"],
+			},
+			{
+				test: /\.svg$/i,
+				issuer: /\.[jt]sx?$/,
+				use: ["@svgr/webpack", "url-loader"],
+			},
+			{
+				test: /\.(png|jpg|jpeg|gif|ico)$/,
+				use: [
+					{
+						loader: "file-loader",
+						options: {
+							name: "./img/[name].[hash].[ext]",
+						},
+					},
+				],
+			},
+			{
+				test: /\.js$/,
+				enforce: "pre",
+				use: ["source-map-loader"],
+			},
+		],
+	},
+	plugins: [
+		new webpack.HotModuleReplacementPlugin(),
+		new HtmlWebpackPlugin({
+			inject: true,
+			template: "./public/index.html",
+		}),
+		new CopyWebpackPlugin({
+			patterns: [{ from: "./public", to: "app_static" }],
+		}),
+		new MiniCssExtractPlugin({
+			filename: "./app_static/[name].styles.css",
+			attributes: {},
+		}),
+		new webpack.DefinePlugin({
+			"process.env.REACT_APP_API_URL": JSON.stringify("https://www2.zuugle.at/api"),
+		}),
+	],
+};