From 5abadeed28508bae69d0ec8a2a83778df39ec762 Mon Sep 17 00:00:00 2001 From: manuwei <44226745+manuwei@users.noreply.github.com> Date: Wed, 9 Jun 2021 11:46:42 +0200 Subject: [PATCH 1/2] adapt ports --- src/environments/environment.prod.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 461c937a..917dc1de 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -14,7 +14,7 @@ export const environment = { PRODUCTION: true, - API_URL: 'http://localhost:8080', + API_URL: 'http://localhost:1977/', authorizeUrl: 'http://localhost:8081/oauth/authorize?', tokenUrl: 'http://localhost:8081/oauth/token', tokenRevokeUrl: 'http://localhost:8081/oauth/revoke_token', From dd699c011bc22bdd57cb17ff6cca8076d27d4dc9 Mon Sep 17 00:00:00 2001 From: manuwei <44226745+manuwei@users.noreply.github.com> Date: Wed, 9 Jun 2021 11:50:18 +0200 Subject: [PATCH 2/2] remove test log --- Dockerfile | 2 +- angular.json | 3 ++- docs/dev/index.md | 2 +- src/app/globals.ts | 2 +- src/assets/env.js | 2 +- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 4 ++-- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index d20e64bc..9a838670 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ FROM nginx:alpine COPY --from=builder /app/dist/* /usr/share/nginx/html/ ENV LATEX_RENDERER_HOST_NAME localhost -ENV LATEX_RENDERER_PORT 8083 +ENV LATEX_RENDERER_PORT 5030 ENV CONFIG_SERVER config-server ENV CONFIG_SERVER_PORT 2379 diff --git a/angular.json b/angular.json index 90744e47..c94c4e02 100644 --- a/angular.json +++ b/angular.json @@ -63,7 +63,8 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "pattern-pedia:build" + "browserTarget": "pattern-pedia:build", + "port": 1978 }, "configurations": { "production": { diff --git a/docs/dev/index.md b/docs/dev/index.md index b1226c63..8f07f623 100644 --- a/docs/dev/index.md +++ b/docs/dev/index.md @@ -8,7 +8,7 @@ ## Project Setup - Clone the repository - Install the dependencies using `yarn` or `yarn install` -- Start the project with `yarn start`. The application should run on http://localhost:4200 +- Start the project with `yarn start`. The application should run on http://localhost:1978 ### Linting Use `yarn lint` to run the linter. diff --git a/src/app/globals.ts b/src/app/globals.ts index 5b29f241..6aafe59e 100644 --- a/src/app/globals.ts +++ b/src/app/globals.ts @@ -17,7 +17,7 @@ export const globals = { iriPatternRepoInstance: 'https://purl.org/patternpedia#LinkedOpenPatterns', urlGithubAPI: 'https://api.github.com/repos/PatternPedia/patternpediacontent/contents', loadOntologyLocally: true, - repoEndpoint: 'http://localhost:8080/patternpedia', + repoEndpoint: 'http://localhost:1977/patternpedia', pathConstants: { patternLanguages: 'pattern-languages', patternLanguageId: 'pattern-language-id', diff --git a/src/assets/env.js b/src/assets/env.js index c87fe158..c22e80a2 100644 --- a/src/assets/env.js +++ b/src/assets/env.js @@ -8,5 +8,5 @@ window['env']['LATEX_RENDERER_HOST_NAME'] = 'localhost'; window['env']['PATTERN_ATLAS_HOST_NAME'] = 'localhost'; window['env']['CONFIG_SERVER_PORT'] = 2379; - window['env']['LATEX_RENDERER_PORT'] = 8083; + window['env']['LATEX_RENDERER_PORT'] = 5030; })(this); diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 917dc1de..c81942c0 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -14,7 +14,7 @@ export const environment = { PRODUCTION: true, - API_URL: 'http://localhost:1977/', + API_URL: 'http://localhost:1977', authorizeUrl: 'http://localhost:8081/oauth/authorize?', tokenUrl: 'http://localhost:8081/oauth/token', tokenRevokeUrl: 'http://localhost:8081/oauth/revoke_token', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ec2ae0dd..82aec75d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -21,12 +21,12 @@ export const environment = { API_URL: window['env'] && window['env']['PATTERN_ATLAS_API_HOST_NAME'] && window['env']['PATTERN_ATLAS_API_PORT'] ? `http://${window['env']['PATTERN_ATLAS_API_HOST_NAME']}:${window['env']['PATTERN_ATLAS_API_PORT']}/atlas` - : 'http://localhost:8080/patternpedia', + : 'http://localhost:1977/patternpedia', LATEX_RENDERER_API_URL: window['env'] && window['env']['LATEX_RENDERER_HOST_NAME'] && window['env']['LATEX_RENDERER_PORT'] ? `http://${window['env']['LATEX_RENDERER_HOST_NAME']}:${window['env']['LATEX_RENDERER_PORT']}` - : 'http://localhost:8083', + : 'http://localhost:5030', authorizeUrl: 'http://localhost:8081/oauth/authorize?', tokenUrl: 'http://localhost:8081/oauth/token', tokenRevokeUrl: 'http://localhost:8081/oauth/revoke_token',