From 6688eff297ba51cec78cbe903c84b1282363ff9b Mon Sep 17 00:00:00 2001 From: "Begerad, Stefan" Date: Tue, 13 Feb 2024 23:07:40 +0100 Subject: [PATCH] feat(ui): rename app to src --- ui/config/webpack.common.js | 4 ++-- ui/package-lock.json | 3 +++ ui/package.json | 6 ++++-- ui/{app => src}/components/entities.jsx | 0 ui/{app => src}/components/fetch.jsx | 0 ui/{app => src}/components/header.jsx | 0 ui/{app => src}/components/icons/icon-default.js | 0 ui/{app => src}/components/map.jsx | 0 ui/{app => src}/components/map/entities-map.css | 0 ui/{app => src}/components/map/entities-map.jsx | 0 ui/{app => src}/components/map/entities-marker.jsx | 0 ui/{app => src}/components/map/entities-popup.jsx | 0 ui/{app => src}/components/state.jsx | 0 ui/{app => src}/components/table-entries.jsx | 0 ui/{app => src}/components/table-stop-names-entries.jsx | 0 ui/{app => src}/components/table-stop-names.jsx | 0 ui/{app => src}/components/table.jsx | 0 ui/{app => src}/index.jsx | 2 +- ui/{app/app.jsx => src/main.jsx} | 1 + ui/{app => src}/pages/home.jsx | 0 ui/{app => src}/pages/stop-names.jsx | 0 ui/{app => src}/pages/stops-non-conforming.jsx | 0 ui/{app => src}/pages/stops-refined.jsx | 6 ++---- ui/{app => src}/utils/api.js | 0 ui/{app => src}/utils/config.js | 0 ui/{app => src}/utils/limits.js | 0 ui/{app => src}/utils/request.js | 0 27 files changed, 13 insertions(+), 9 deletions(-) rename ui/{app => src}/components/entities.jsx (100%) rename ui/{app => src}/components/fetch.jsx (100%) rename ui/{app => src}/components/header.jsx (100%) rename ui/{app => src}/components/icons/icon-default.js (100%) rename ui/{app => src}/components/map.jsx (100%) rename ui/{app => src}/components/map/entities-map.css (100%) rename ui/{app => src}/components/map/entities-map.jsx (100%) rename ui/{app => src}/components/map/entities-marker.jsx (100%) rename ui/{app => src}/components/map/entities-popup.jsx (100%) rename ui/{app => src}/components/state.jsx (100%) rename ui/{app => src}/components/table-entries.jsx (100%) rename ui/{app => src}/components/table-stop-names-entries.jsx (100%) rename ui/{app => src}/components/table-stop-names.jsx (100%) rename ui/{app => src}/components/table.jsx (100%) rename ui/{app => src}/index.jsx (94%) rename ui/{app/app.jsx => src/main.jsx} (99%) rename ui/{app => src}/pages/home.jsx (100%) rename ui/{app => src}/pages/stop-names.jsx (100%) rename ui/{app => src}/pages/stops-non-conforming.jsx (100%) rename ui/{app => src}/pages/stops-refined.jsx (81%) rename ui/{app => src}/utils/api.js (100%) rename ui/{app => src}/utils/config.js (100%) rename ui/{app => src}/utils/limits.js (100%) rename ui/{app => src}/utils/request.js (100%) diff --git a/ui/config/webpack.common.js b/ui/config/webpack.common.js index 1ccec71..de32b7d 100644 --- a/ui/config/webpack.common.js +++ b/ui/config/webpack.common.js @@ -4,7 +4,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const path = require('path'); module.exports = { //bundle *.js from this entry point - entry: path.resolve(__dirname, '../app/index.jsx'), + entry: path.resolve(__dirname, '../src/index.jsx'), //create output file to be linked to index.html output: { filename: '[name].bundle.js', @@ -18,7 +18,7 @@ module.exports = { //test all *.jsx (e.g. React.js) using babel-loader test: /\.(js|jsx)$/, exclude: /node_modules/, - include: path.resolve(__dirname, '../app'), + include: path.resolve(__dirname, '../src'), use: ['babel-loader'], }, { diff --git a/ui/package-lock.json b/ui/package-lock.json index 19f78b1..8525b8e 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -32,6 +32,9 @@ "webpack-cli": "5.1.4", "webpack-dev-server": "4.15.1", "webpack-merge": "5.9.0" + }, + "engines": { + "node": ">=18.19.0" } }, "node_modules/@ampproject/remapping": { diff --git a/ui/package.json b/ui/package.json index 45d432a..c9a1564 100644 --- a/ui/package.json +++ b/ui/package.json @@ -9,11 +9,13 @@ "transport", "mobility", "delfi", - "react", - "webpack" + "react" ], "author": "Software Ingenieur Begerad ", "license": "GPL-3.0-or-later", + "engines": { + "node": ">=18.19.0" + }, "scripts": { "start": "webpack serve --config config/webpack.dev.js", "build": "webpack --config config/webpack.prod.js", diff --git a/ui/app/components/entities.jsx b/ui/src/components/entities.jsx similarity index 100% rename from ui/app/components/entities.jsx rename to ui/src/components/entities.jsx diff --git a/ui/app/components/fetch.jsx b/ui/src/components/fetch.jsx similarity index 100% rename from ui/app/components/fetch.jsx rename to ui/src/components/fetch.jsx diff --git a/ui/app/components/header.jsx b/ui/src/components/header.jsx similarity index 100% rename from ui/app/components/header.jsx rename to ui/src/components/header.jsx diff --git a/ui/app/components/icons/icon-default.js b/ui/src/components/icons/icon-default.js similarity index 100% rename from ui/app/components/icons/icon-default.js rename to ui/src/components/icons/icon-default.js diff --git a/ui/app/components/map.jsx b/ui/src/components/map.jsx similarity index 100% rename from ui/app/components/map.jsx rename to ui/src/components/map.jsx diff --git a/ui/app/components/map/entities-map.css b/ui/src/components/map/entities-map.css similarity index 100% rename from ui/app/components/map/entities-map.css rename to ui/src/components/map/entities-map.css diff --git a/ui/app/components/map/entities-map.jsx b/ui/src/components/map/entities-map.jsx similarity index 100% rename from ui/app/components/map/entities-map.jsx rename to ui/src/components/map/entities-map.jsx diff --git a/ui/app/components/map/entities-marker.jsx b/ui/src/components/map/entities-marker.jsx similarity index 100% rename from ui/app/components/map/entities-marker.jsx rename to ui/src/components/map/entities-marker.jsx diff --git a/ui/app/components/map/entities-popup.jsx b/ui/src/components/map/entities-popup.jsx similarity index 100% rename from ui/app/components/map/entities-popup.jsx rename to ui/src/components/map/entities-popup.jsx diff --git a/ui/app/components/state.jsx b/ui/src/components/state.jsx similarity index 100% rename from ui/app/components/state.jsx rename to ui/src/components/state.jsx diff --git a/ui/app/components/table-entries.jsx b/ui/src/components/table-entries.jsx similarity index 100% rename from ui/app/components/table-entries.jsx rename to ui/src/components/table-entries.jsx diff --git a/ui/app/components/table-stop-names-entries.jsx b/ui/src/components/table-stop-names-entries.jsx similarity index 100% rename from ui/app/components/table-stop-names-entries.jsx rename to ui/src/components/table-stop-names-entries.jsx diff --git a/ui/app/components/table-stop-names.jsx b/ui/src/components/table-stop-names.jsx similarity index 100% rename from ui/app/components/table-stop-names.jsx rename to ui/src/components/table-stop-names.jsx diff --git a/ui/app/components/table.jsx b/ui/src/components/table.jsx similarity index 100% rename from ui/app/components/table.jsx rename to ui/src/components/table.jsx diff --git a/ui/app/index.jsx b/ui/src/index.jsx similarity index 94% rename from ui/app/index.jsx rename to ui/src/index.jsx index ecfebd7..730ba96 100644 --- a/ui/app/index.jsx +++ b/ui/src/index.jsx @@ -1,6 +1,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import App from './app'; +import App from './main'; //TODO remove debugging if (process.env.NODE_ENV !== 'production') { diff --git a/ui/app/app.jsx b/ui/src/main.jsx similarity index 99% rename from ui/app/app.jsx rename to ui/src/main.jsx index 7182a95..61f8c0c 100644 --- a/ui/app/app.jsx +++ b/ui/src/main.jsx @@ -11,6 +11,7 @@ import { getGtfsStopsLastVacuum } from './utils/api'; + import packageInfo from '../package.json' const VERSION = packageInfo.version; diff --git a/ui/app/pages/home.jsx b/ui/src/pages/home.jsx similarity index 100% rename from ui/app/pages/home.jsx rename to ui/src/pages/home.jsx diff --git a/ui/app/pages/stop-names.jsx b/ui/src/pages/stop-names.jsx similarity index 100% rename from ui/app/pages/stop-names.jsx rename to ui/src/pages/stop-names.jsx diff --git a/ui/app/pages/stops-non-conforming.jsx b/ui/src/pages/stops-non-conforming.jsx similarity index 100% rename from ui/app/pages/stops-non-conforming.jsx rename to ui/src/pages/stops-non-conforming.jsx diff --git a/ui/app/pages/stops-refined.jsx b/ui/src/pages/stops-refined.jsx similarity index 81% rename from ui/app/pages/stops-refined.jsx rename to ui/src/pages/stops-refined.jsx index d8e2da8..71a9cb4 100644 --- a/ui/app/pages/stops-refined.jsx +++ b/ui/src/pages/stops-refined.jsx @@ -2,13 +2,11 @@ import React from 'react'; import Entities from '../components/entities'; -const StopsRefined = () => { +export default function StopsRefined() { return ( <>

Please feel free to browse through stops inside DE refined to be compliant with the Global ID.

); -} - -export default StopsRefined +}; diff --git a/ui/app/utils/api.js b/ui/src/utils/api.js similarity index 100% rename from ui/app/utils/api.js rename to ui/src/utils/api.js diff --git a/ui/app/utils/config.js b/ui/src/utils/config.js similarity index 100% rename from ui/app/utils/config.js rename to ui/src/utils/config.js diff --git a/ui/app/utils/limits.js b/ui/src/utils/limits.js similarity index 100% rename from ui/app/utils/limits.js rename to ui/src/utils/limits.js diff --git a/ui/app/utils/request.js b/ui/src/utils/request.js similarity index 100% rename from ui/app/utils/request.js rename to ui/src/utils/request.js