diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 36a3ab9d8..7079ceec2 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -35,10 +35,10 @@ jobs: - run: yarn format-check - run: yarn tsc - run: yarn test - transitmux_checks: + travelmux_checks: defaults: run: - working-directory: services/transitmux + working-directory: services/travelmux runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -52,11 +52,11 @@ jobs: ~/.cargo/registry/index/ ~/.cargo/registry/cache/ ~/.cargo/git/db/ - services/transitmux/target/ + services/travelmux/target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - run: cargo fmt --all --check - run: cargo clippy --all-features - - run: cargo test --all-features + - run: cargo test --all-targets - run: cargo build --release gtfout: defaults: @@ -75,7 +75,7 @@ jobs: ~/.cargo/registry/index/ ~/.cargo/registry/cache/ ~/.cargo/git/db/ - services/transitmux/target/ + services/travelmux/target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - run: cargo fmt --all --check - run: cargo clippy --all-targets --all-features diff --git a/Earthfile b/Earthfile index caf6e51d4..62458ece7 100644 --- a/Earthfile +++ b/Earthfile @@ -180,7 +180,7 @@ images: FROM debian:bookworm-slim ARG tags="dev" ARG branding - BUILD +transitmux-serve-image --tags=${tags} + BUILD +travelmux-serve-image --tags=${tags} BUILD +otp-serve-image --tags=${tags} BUILD +valhalla-serve-image --tags=${tags} BUILD +web-serve-image --tags=${tags} --branding=${branding} @@ -585,47 +585,47 @@ otp-serve-image: SAVE IMAGE --push ghcr.io/headwaymaps/opentripplanner:${tag} END -build-transitmux: +build-travelmux: FROM rust:bookworm - WORKDIR transitmux + WORKDIR travelmux # This speeds up rebuilds of rust projectst by caching the prebuilt # dependencies in a separate docker layer. Without this, every change to # the source requires re-downloading and re-building all the project deps, # which takes a while. - COPY ./services/transitmux/Cargo.toml . - COPY ./services/transitmux/Cargo.lock . + COPY ./services/travelmux/Cargo.toml . + COPY ./services/travelmux/Cargo.lock . RUN mkdir src RUN echo 'fn main() { /* dummy main to get cargo to build deps */ }' > src/main.rs RUN cargo build --release RUN rm src/main.rs - COPY ./services/transitmux . + COPY ./services/travelmux . RUN cargo build --release - SAVE ARTIFACT target/release/transitmux-server /transitmux-server + SAVE ARTIFACT target/release/travelmux-server /travelmux-server -transitmux-serve-image: +travelmux-serve-image: FROM debian:bookworm-slim RUN apt-get update \ && apt-get install -y --no-install-recommends libssl3 \ && rm -rf /var/lib/apt/lists/* - RUN adduser --disabled-login transitmux --gecos "" - USER transitmux + RUN adduser --disabled-login travelmux --gecos "" + USER travelmux - WORKDIR /home/transitmux - COPY +build-transitmux/transitmux-server transitmux-server + WORKDIR /home/travelmux + COPY +build-travelmux/travelmux-server travelmux-server EXPOSE 8000 ENV RUST_LOG=info - ENTRYPOINT ["/home/transitmux/transitmux-server"] - CMD ["http://opentripplanner:8000/otp/routers"] + ENTRYPOINT ["/home/travelmux/travelmux-server"] + CMD ["http://valhalla:8002", "http://opentripplanner:8000/otp/routers"] ARG --required tags FOR tag IN ${tags} - SAVE IMAGE --push ghcr.io/headwaymaps/transitmux:${tag} + SAVE IMAGE --push ghcr.io/headwaymaps/travelmux:${tag} END ############################## @@ -825,8 +825,7 @@ web-serve-image: ENV HEADWAY_SHARED_VOL=/data ENV HEADWAY_HTTP_PORT=8080 ENV HEADWAY_RESOLVER=127.0.0.11 - ENV HEADWAY_TRANSITMUX_URL=http://transitmux:8000 - ENV HEADWAY_VALHALLA_URL=http://valhalla:8002 + ENV HEADWAY_TRAVELMUX_URL=http://travelmux:8000 ENV HEADWAY_TILESERVER_URL=http://tileserver:8000 ENV HEADWAY_PELIAS_URL=http://pelias-api:8080 # for escaping $ in nginx template diff --git a/bin/_headway_version.sh b/bin/_headway_version.sh index b83a7a0ba..e646af4c7 100644 --- a/bin/_headway_version.sh +++ b/bin/_headway_version.sh @@ -25,6 +25,10 @@ export HEADWAY_DATA_TAG=0.7.0 # # Schema change Log # +# ## DATA v0.7.0, CONTAINER v0.9.0 +# +# BREAKING CONTAINER: transitmux is now travelmux, and additionally fronts Valhalla, not just OTP +# # ## DATA v0.7.0, CONTAINER v0.8.0 # # BREAKING DATA: Updated Planetiler diff --git a/bin/publish-images b/bin/publish-images index a702b8a7a..a8f6019cc 100755 --- a/bin/publish-images +++ b/bin/publish-images @@ -35,7 +35,7 @@ images=( pelias-init tileserver tileserver-init - transitmux + travelmux valhalla valhalla-init ) diff --git a/bin/tag-published-images b/bin/tag-published-images index b030f4f4a..69286c344 100755 --- a/bin/tag-published-images +++ b/bin/tag-published-images @@ -22,7 +22,7 @@ NEW_TAG="$2" registry_root=ghcr.io/headwaymaps -images=( headway headway-init opentripplanner opentripplanner-init pelias-init tileserver tileserver-init transitmux valhalla valhalla-init ) +images=( headway headway-init opentripplanner opentripplanner-init pelias-init tileserver tileserver-init travelmux valhalla valhalla-init ) for image in "${images[@]}"; do docker pull "${registry_root}/${image}:${SRC_TAG}" diff --git a/docker-compose-with-transit.yaml b/docker-compose-with-transit.yaml index 8bf7251fa..1243ce19e 100644 --- a/docker-compose-with-transit.yaml +++ b/docker-compose-with-transit.yaml @@ -6,8 +6,8 @@ services: environment: AREAMAP_ARTIFACT_DEST: /data/${HEADWAY_AREA}.mbtiles AREAMAP_ARTIFACT_SOURCE: /bootstrap/${HEADWAY_AREA}.mbtiles - TERRAIN_ARTIFACT_DEST_PATH: /data/terrain.mbtiles - TERRAIN_ARTIFACT_SOURCE_PATH: /bootstrap/terrain.mbtiles + TERRAIN_ARTIFACT_DEST: /data/terrain.mbtiles + TERRAIN_ARTIFACT_SOURCE: /bootstrap/terrain.mbtiles LANDCOVER_ARTIFACT_DEST: /data/landcover.mbtiles LANDCOVER_ARTIFACT_SOURCE: /bootstrap/landcover.mbtiles volumes: @@ -46,17 +46,21 @@ services: opentripplanner-init: condition: service_completed_successfully networks: - - transit_backend - transitmux: - image: ghcr.io/headwaymaps/transitmux:latest + - otp_backend + # ports: + # - "9001:8000" + travelmux: + image: ghcr.io/headwaymaps/travelmux:latest restart: always env_file: .env depends_on: opentripplanner: condition: service_healthy networks: - - transit_backend - - transit_frontend + - travel_frontend + - otp_backend + - valhalla_backend + command: ["http://valhalla:8002", "http://opentripplanner:8000/otp/routers"] valhalla-init: image: ghcr.io/headwaymaps/valhalla-init:latest env_file: .env @@ -74,7 +78,7 @@ services: restart: always env_file: .env networks: - - valhalla_frontend + - valhalla_backend volumes: - "valhalla_data:/data/:ro" ulimits: @@ -84,6 +88,8 @@ services: depends_on: valhalla-init: condition: service_completed_successfully + # ports: + # - "9002:8002" frontend-init: image: ghcr.io/headwaymaps/headway-init:latest env_file: .env @@ -98,21 +104,19 @@ services: HEADWAY_RESOLVER: 127.0.0.11 HEADWAY_PELIAS_URL: http://pelias-api:4000 HEADWAY_TILESERVER_URL: http://tileserver:8000 - HEADWAY_TRANSITMUX_URL: http://transitmux:8000 - HEADWAY_VALHALLA_URL: http://valhalla:8002 + HEADWAY_TRAVELMUX_URL: http://travelmux:8000 ports: - "8080:8080" networks: - pelias_frontend - tileserver_frontend - - transit_frontend - - valhalla_frontend + - travel_frontend volumes: - "frontend_data:/data/:ro" depends_on: - "pelias-api" - "tileserver" - - "transitmux" + - "travelmux" - "valhalla" pelias-config-init: image: ghcr.io/headwaymaps/pelias-init:latest @@ -162,6 +166,8 @@ services: condition: service_healthy pelias-config-init: condition: service_completed_successfully + # ports: + # - "4000:4000" pelias-placeholder: image: pelias/placeholder:master restart: always @@ -205,9 +211,9 @@ networks: tileserver_frontend: pelias_frontend: pelias_backend: - valhalla_frontend: - transit_frontend: - transit_backend: + travel_frontend: + valhalla_backend: + otp_backend: volumes: pelias_config_data: pelias_placeholder_data: diff --git a/docker-compose.yaml b/docker-compose.yaml index 04b32c6d7..a8d9c3222 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -28,6 +28,14 @@ services: - "8000" networks: - tileserver_frontend + travelmux: + image: ghcr.io/headwaymaps/travelmux:latest + restart: always + env_file: .env + networks: + - travel_frontend + - valhalla_backend + command: ["http://valhalla:8002"] valhalla-init: image: ghcr.io/headwaymaps/valhalla-init:latest env_file: .env @@ -45,7 +53,7 @@ services: restart: always env_file: .env networks: - - valhalla_frontend + - valhalla_backend volumes: - "valhalla_data:/data/:ro" ulimits: @@ -55,6 +63,8 @@ services: depends_on: valhalla-init: condition: service_completed_successfully + # ports: + # - "9002:8002" frontend-init: image: ghcr.io/headwaymaps/headway-init:latest env_file: .env @@ -69,21 +79,19 @@ services: HEADWAY_RESOLVER: 127.0.0.11 HEADWAY_PELIAS_URL: http://pelias-api:4000 HEADWAY_TILESERVER_URL: http://tileserver:8000 - HEADWAY_TRANSITMUX_URL: http://transitmux:8000 - HEADWAY_VALHALLA_URL: http://valhalla:8002 + HEADWAY_TRAVELMUX_URL: http://travelmux:8000 ports: - "8080:8080" networks: - pelias_frontend - tileserver_frontend - - valhalla_frontend + - travel_frontend volumes: - "frontend_data:/data/:ro" - extra_hosts: - - "transitmux:0.0.0.0" depends_on: - - "tileserver" - "pelias-api" + - "tileserver" + - "travelmux" - "valhalla" pelias-config-init: image: ghcr.io/headwaymaps/pelias-init:latest @@ -176,7 +184,8 @@ networks: tileserver_frontend: pelias_frontend: pelias_backend: - valhalla_frontend: + travel_frontend: + valhalla_backend: volumes: pelias_config_data: pelias_placeholder_data: diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit index 2d6418602..3dac9be71 100755 --- a/git-hooks/pre-commit +++ b/git-hooks/pre-commit @@ -15,10 +15,10 @@ set -e yarn lint && yarn build) -(cd services/transitmux && +(cd services/travelmux && cargo fmt && cargo clippy --all-features -- -D warnings && - cargo test --all-features) + cargo test) (cd services/gtfs/gtfout && cargo fmt --all && diff --git a/k8s/_template/frontend-deployment.yaml.tpl b/k8s/_template/frontend-deployment.yaml.tpl index 3d1b5db16..ecc681764 100644 --- a/k8s/_template/frontend-deployment.yaml.tpl +++ b/k8s/_template/frontend-deployment.yaml.tpl @@ -83,8 +83,6 @@ spec: value: http://tileserver:8000 - name: HEADWAY_PELIAS_URL value: http://pelias-api:4000 - - name: HEADWAY_VALHALLA_URL - value: http://valhalla:8002 - name: HEADWAY_PUBLIC_URL valueFrom: configMapKeyRef: diff --git a/k8s/_template/transitmux-deployment.yaml.tpl b/k8s/_template/travelmux-deployment.yaml.tpl similarity index 85% rename from k8s/_template/transitmux-deployment.yaml.tpl rename to k8s/_template/travelmux-deployment.yaml.tpl index 8645d025e..f87f42bb8 100644 --- a/k8s/_template/transitmux-deployment.yaml.tpl +++ b/k8s/_template/travelmux-deployment.yaml.tpl @@ -1,20 +1,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: transitmux + name: travelmux spec: selector: matchLabels: - app: transitmux + app: travelmux replicas: 1 template: metadata: labels: - app: transitmux + app: travelmux spec: containers: - name: main - image: ghcr.io/headwaymaps/transitmux:${HEADWAY_CONTAINER_TAG} + image: ghcr.io/headwaymaps/travelmux:${HEADWAY_CONTAINER_TAG} imagePullPolicy: Always args: ${OTP_ENDPOINTS_JSON} ports: diff --git a/k8s/configs/planet/transitmux-service.yaml b/k8s/_template/travelmux-service.yaml.tpl similarity index 75% rename from k8s/configs/planet/transitmux-service.yaml rename to k8s/_template/travelmux-service.yaml.tpl index 5322d24b4..11669aecb 100644 --- a/k8s/configs/planet/transitmux-service.yaml +++ b/k8s/_template/travelmux-service.yaml.tpl @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: transitmux + name: travelmux spec: selector: - app: transitmux + app: travelmux ports: - protocol: TCP name: service diff --git a/k8s/bin/generate b/k8s/bin/generate index d2bc15271..b15db9090 100755 --- a/k8s/bin/generate +++ b/k8s/bin/generate @@ -65,16 +65,15 @@ rm -f "${OUTPUT_DIR}"/* function generate_transit() { local otp_endpoints="" - local separator="" + local separator=", " for headway_transit_area in $HEADWAY_TRANSIT_AREAS; do local otp_endpoint_name=$(generate_otp $headway_transit_area); otp_endpoints+="${separator}\"http://${otp_endpoint_name}:8000/otp/routers\"" - separator=", " done - export OTP_ENDPOINTS_JSON="[${otp_endpoints}]" - render_template "_template/transitmux-deployment.yaml.tpl" + export OTP_ENDPOINTS_JSON="[\"http://valhalla:8002\"${otp_endpoints}]" + render_template "_template/travelmux-deployment.yaml.tpl" } function log() { @@ -114,16 +113,16 @@ if [[ "$HEADWAY_ENABLE_TRANSIT_ROUTING" != 0 ]]; then generate_transit fi -# NOTE: we *do* want to enable the transitmux *service*, regardless +# NOTE: we *do* want to enable the travelmux *service*, regardless # of if transit routing is enabled - otherwise our nginx frontend will fail # to start up due to the inability to resolve DNS. A better solution might -# be to remove the transitmux section from nginx altogether when transit +# be to remove the travelmux section from nginx altogether when transit # routing is disabled, but that's beyond the capabilities of the simple # envsubst we're using. For now then, we copy in the service defintion. -render_template "_template/transitmux-service.yaml.tpl" +render_template "_template/travelmux-service.yaml.tpl" shopt -s extglob -for file in _template/!(opentripplanner*|transitmux*).tpl +for file in _template/!(opentripplanner*|travelmux*).tpl do render_template $file done diff --git a/k8s/configs/planet-dev/frontend-deployment.yaml b/k8s/configs/planet-dev/frontend-deployment.yaml index 4d98e729d..3d43978c9 100644 --- a/k8s/configs/planet-dev/frontend-deployment.yaml +++ b/k8s/configs/planet-dev/frontend-deployment.yaml @@ -83,8 +83,6 @@ spec: value: http://tileserver:8000 - name: HEADWAY_PELIAS_URL value: http://pelias-api:4000 - - name: HEADWAY_VALHALLA_URL - value: http://valhalla:8002 - name: HEADWAY_PUBLIC_URL valueFrom: configMapKeyRef: diff --git a/k8s/configs/planet/transitmux-deployment.yaml b/k8s/configs/planet-dev/travelmux-deployment.yaml similarity index 70% rename from k8s/configs/planet/transitmux-deployment.yaml rename to k8s/configs/planet-dev/travelmux-deployment.yaml index a83c874c7..d6774be79 100644 --- a/k8s/configs/planet/transitmux-deployment.yaml +++ b/k8s/configs/planet-dev/travelmux-deployment.yaml @@ -1,22 +1,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: transitmux + name: travelmux spec: selector: matchLabels: - app: transitmux + app: travelmux replicas: 1 template: metadata: labels: - app: transitmux + app: travelmux spec: containers: - name: main - image: ghcr.io/headwaymaps/transitmux:maps-earth-latest + image: ghcr.io/headwaymaps/travelmux:maps-earth-dev imagePullPolicy: Always - args: ["http://opentripplanner-barcelona:8000/otp/routers", "http://opentripplanner-losangeles:8000/otp/routers", "http://opentripplanner-pugetsound:8000/otp/routers"] + args: ["http://valhalla:8002", "http://opentripplanner-barcelona:8000/otp/routers", "http://opentripplanner-losangeles:8000/otp/routers", "http://opentripplanner-pugetsound:8000/otp/routers"] ports: - containerPort: 8000 resources: diff --git a/k8s/_template/transitmux-service.yaml.tpl b/k8s/configs/planet-dev/travelmux-service.yaml similarity index 75% rename from k8s/_template/transitmux-service.yaml.tpl rename to k8s/configs/planet-dev/travelmux-service.yaml index 5322d24b4..11669aecb 100644 --- a/k8s/_template/transitmux-service.yaml.tpl +++ b/k8s/configs/planet-dev/travelmux-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: transitmux + name: travelmux spec: selector: - app: transitmux + app: travelmux ports: - protocol: TCP name: service diff --git a/k8s/configs/planet/frontend-deployment.yaml b/k8s/configs/planet/frontend-deployment.yaml index 239361231..58b4642e7 100644 --- a/k8s/configs/planet/frontend-deployment.yaml +++ b/k8s/configs/planet/frontend-deployment.yaml @@ -83,8 +83,6 @@ spec: value: http://tileserver:8000 - name: HEADWAY_PELIAS_URL value: http://pelias-api:4000 - - name: HEADWAY_VALHALLA_URL - value: http://valhalla:8002 - name: HEADWAY_PUBLIC_URL valueFrom: configMapKeyRef: diff --git a/k8s/configs/planet-dev/transitmux-deployment.yaml b/k8s/configs/planet/travelmux-deployment.yaml similarity index 70% rename from k8s/configs/planet-dev/transitmux-deployment.yaml rename to k8s/configs/planet/travelmux-deployment.yaml index 404d8afe7..49625a7d5 100644 --- a/k8s/configs/planet-dev/transitmux-deployment.yaml +++ b/k8s/configs/planet/travelmux-deployment.yaml @@ -1,22 +1,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: transitmux + name: travelmux spec: selector: matchLabels: - app: transitmux + app: travelmux replicas: 1 template: metadata: labels: - app: transitmux + app: travelmux spec: containers: - name: main - image: ghcr.io/headwaymaps/transitmux:maps-earth-dev + image: ghcr.io/headwaymaps/travelmux:maps-earth-latest imagePullPolicy: Always - args: ["http://opentripplanner-barcelona:8000/otp/routers", "http://opentripplanner-losangeles:8000/otp/routers", "http://opentripplanner-pugetsound:8000/otp/routers"] + args: ["http://valhalla:8002", "http://opentripplanner-barcelona:8000/otp/routers", "http://opentripplanner-losangeles:8000/otp/routers", "http://opentripplanner-pugetsound:8000/otp/routers"] ports: - containerPort: 8000 resources: diff --git a/k8s/configs/seattle-dev/transitmux-service.yaml b/k8s/configs/planet/travelmux-service.yaml similarity index 75% rename from k8s/configs/seattle-dev/transitmux-service.yaml rename to k8s/configs/planet/travelmux-service.yaml index 5322d24b4..11669aecb 100644 --- a/k8s/configs/seattle-dev/transitmux-service.yaml +++ b/k8s/configs/planet/travelmux-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: transitmux + name: travelmux spec: selector: - app: transitmux + app: travelmux ports: - protocol: TCP name: service diff --git a/k8s/configs/seattle-dev/frontend-deployment.yaml b/k8s/configs/seattle-dev/frontend-deployment.yaml index 4d98e729d..3d43978c9 100644 --- a/k8s/configs/seattle-dev/frontend-deployment.yaml +++ b/k8s/configs/seattle-dev/frontend-deployment.yaml @@ -83,8 +83,6 @@ spec: value: http://tileserver:8000 - name: HEADWAY_PELIAS_URL value: http://pelias-api:4000 - - name: HEADWAY_VALHALLA_URL - value: http://valhalla:8002 - name: HEADWAY_PUBLIC_URL valueFrom: configMapKeyRef: diff --git a/k8s/configs/seattle-dev/transitmux-deployment.yaml b/k8s/configs/seattle-dev/travelmux-deployment.yaml similarity index 78% rename from k8s/configs/seattle-dev/transitmux-deployment.yaml rename to k8s/configs/seattle-dev/travelmux-deployment.yaml index e2317ab92..ece058903 100644 --- a/k8s/configs/seattle-dev/transitmux-deployment.yaml +++ b/k8s/configs/seattle-dev/travelmux-deployment.yaml @@ -1,22 +1,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: transitmux + name: travelmux spec: selector: matchLabels: - app: transitmux + app: travelmux replicas: 1 template: metadata: labels: - app: transitmux + app: travelmux spec: containers: - name: main - image: ghcr.io/headwaymaps/transitmux:maps-earth-dev + image: ghcr.io/headwaymaps/travelmux:maps-earth-dev imagePullPolicy: Always - args: ["http://opentripplanner-seattle:8000/otp/routers"] + args: ["http://valhalla:8002", "http://opentripplanner-seattle:8000/otp/routers"] ports: - containerPort: 8000 resources: diff --git a/k8s/configs/planet-dev/transitmux-service.yaml b/k8s/configs/seattle-dev/travelmux-service.yaml similarity index 75% rename from k8s/configs/planet-dev/transitmux-service.yaml rename to k8s/configs/seattle-dev/travelmux-service.yaml index 5322d24b4..11669aecb 100644 --- a/k8s/configs/planet-dev/transitmux-service.yaml +++ b/k8s/configs/seattle-dev/travelmux-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: transitmux + name: travelmux spec: selector: - app: transitmux + app: travelmux ports: - protocol: TCP name: service diff --git a/services/frontend/nginx.conf.template b/services/frontend/nginx.conf.template index 499e3cbe6..0a0bed39c 100644 --- a/services/frontend/nginx.conf.template +++ b/services/frontend/nginx.conf.template @@ -25,16 +25,8 @@ http { proxy_pass ${HEADWAY_PELIAS_URL}/; } - location ^~ /transitmux/ { - set $enable_transit_routing ${HEADWAY_ENABLE_TRANSIT_ROUTING}; - if ($enable_transit_routing != 1) { - return 404; - } - proxy_pass ${HEADWAY_TRANSITMUX_URL}/; - } - - location ^~ /valhalla/ { - proxy_pass ${HEADWAY_VALHALLA_URL}/; + location ^~ /travelmux/ { + proxy_pass ${HEADWAY_TRAVELMUX_URL}/; } location ^~ /tileserver/ { diff --git a/services/frontend/www-app/quasar.config.js b/services/frontend/www-app/quasar.config.js index f612fcc57..15aad52ac 100644 --- a/services/frontend/www-app/quasar.config.js +++ b/services/frontend/www-app/quasar.config.js @@ -56,6 +56,9 @@ module.exports = configure(function (/* ctx */) { }, vueRouterMode: 'history', // available values: 'hash', 'history' + // Dev: Use this where we don't have mod_rewrite, otherwise refreshing page with path 404's + // vueRouterMode: 'hash', + // vueRouterBase, // vueDevtools, // vueOptionsAPI: false, @@ -106,20 +109,14 @@ module.exports = configure(function (/* ctx */) { '/pelias': { target: HEADWAY_HOST, changeOrigin: true, + // target: 'http://0.0.0.0:4000', + // rewrite: (path) => path.replace(/^\/pelias/, ''), }, - '/otp': { - target: HEADWAY_HOST, - changeOrigin: true, - }, - '/valhalla': { + '/travelmux': { target: HEADWAY_HOST, changeOrigin: true, - }, - '/transitmux': { - changeOrigin: true, - target: HEADWAY_HOST, - // target: 'http://localhost:8003', - // rewrite: (path) => path.replace(/^\/transitmux/, ''), + // target: 'http://0.0.0.0:8000', + // rewrite: (path) => path.replace(/^\/travelmux/, ''), }, }, }, diff --git a/services/frontend/www-app/src/components/MultiModalListItem.vue b/services/frontend/www-app/src/components/MultiModalListItem.vue index 8ce55a534..6864eb022 100644 --- a/services/frontend/www-app/src/components/MultiModalListItem.vue +++ b/services/frontend/www-app/src/components/MultiModalListItem.vue @@ -1,9 +1,9 @@