From f6201469baebfb0630ef630aba1541182aefe759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Mare=C5=A1?= Date: Mon, 6 Nov 2023 13:06:40 +0100 Subject: [PATCH] Unify default port to 8080 --- app/src/main/resources/application.properties | 2 +- .../resources/application-inttest.properties | 4 +- frontend/src/main.js | 40 +++++++++---------- mvnw | 0 4 files changed, 23 insertions(+), 23 deletions(-) mode change 100644 => 100755 mvnw diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index d79dff2..2900156 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.port=8081 +server.port=8080 spring.datasource.initialization-mode=always spring.datasource.url=jdbc:h2:file:~/H2_flightlog;DB_CLOSE_ON_EXIT=FALSE;IFEXISTS=FALSE;DB_CLOSE_DELAY=-1; diff --git a/app/src/test/resources/application-inttest.properties b/app/src/test/resources/application-inttest.properties index e31c51d..d6efecd 100644 --- a/app/src/test/resources/application-inttest.properties +++ b/app/src/test/resources/application-inttest.properties @@ -1,6 +1,6 @@ # application url for selenium -server.port=8081 -application.url=http://localhost:8081 +server.port=8080 +application.url=http://localhost:8080 spring.datasource.initialization-mode=always spring.datasource.url=jdbc:h2:file:~/H2_flightlog;DB_CLOSE_ON_EXIT=FALSE;IFEXISTS=FALSE;DB_CLOSE_DELAY=-1;MODE=PostgreSQL; diff --git a/frontend/src/main.js b/frontend/src/main.js index 079f915..f3e999b 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -1,7 +1,7 @@ import environment from './environment'; -import {PLATFORM} from 'aurelia-pal'; +import { PLATFORM } from 'aurelia-pal'; import * as Bluebird from 'bluebird'; -import {HttpClient} from 'aurelia-fetch-client'; +import { HttpClient } from 'aurelia-fetch-client'; // remove out if you don't want a Promise polyfill (remove also from webpack.config.js) @@ -17,24 +17,24 @@ export function configure(aurelia) { let http = new HttpClient(); http.configure(config => { config - .useStandardConfiguration() - .withBaseUrl('http://localhost:8081/') - .withDefaults({ - headers: { - 'Accept': 'application/json' - } - }) - .withInterceptor({ - request(request) { - console.log(`Requesting ${request.method} ${request.url}`); - return request; - }, - response(response) { - console.log(`Received ${response.status} ${response.url}`); - return response; - } - }); -}); + .useStandardConfiguration() + .withBaseUrl('http://localhost:8080/') + .withDefaults({ + headers: { + 'Accept': 'application/json' + } + }) + .withInterceptor({ + request(request) { + console.log(`Requesting ${request.method} ${request.url}`); + return request; + }, + response(response) { + console.log(`Received ${response.status} ${response.url}`); + return response; + } + }); + }); container.registerInstance(HttpClient, http); diff --git a/mvnw b/mvnw old mode 100644 new mode 100755