diff --git a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js index 539baa5028726c382c2169ff5e0961e659d6001f..fa859a68c82884f5c9e76a0e2fc80c3c2e74f34b 100644 --- a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js +++ b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js @@ -4,6 +4,7 @@ import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {CheckInPlaceSelect} from './check-in-place-select.js'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; import * as commonUtils from '@dbp-toolkit/common/utils'; +import * as tugUtils from '@dbp-toolkit/common/tug-utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; export class CheckInPlaceSelectDemo extends ScopedElementsMixin(LitElement) { @@ -71,13 +72,13 @@ export class CheckInPlaceSelectDemo extends ScopedElementsMixin(LitElement) { <div class="field"> <label class="label">Check-In-Place 1</label> <div class="control"> - <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}"></dbp-check-in-place-select> + <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${tugUtils.getAPiUrl()}"></dbp-check-in-place-select> </div> </div> <div class="field"> <label class="label">Check-In-Place 2</label> <div class="control"> - <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}" show-reload-button reload-button-title="Click me"></dbp-check-in-place-select> + <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${tugUtils.getAPiUrl()}" show-reload-button reload-button-title="Click me"></dbp-check-in-place-select> </div> </div> </form> diff --git a/packages/common/test/unit.js b/packages/common/test/unit.js index abca165ba7dbb378ad5fe46dc92c2c6c6acf6f71..87323cc3bc6138a49f6e4043cc4ab8fe5cac45fc 100644 --- a/packages/common/test/unit.js +++ b/packages/common/test/unit.js @@ -1,5 +1,6 @@ import {expect, assert} from 'chai'; import * as utils from '../utils'; +import * as tugUtils from '../tug-utils'; import * as styles from '../styles'; import '../jsonld.js'; @@ -35,7 +36,7 @@ suite('utils', () => { }); test('getAPiUrl', () => { - assert(utils.getAPiUrl().startsWith("http")); + assert(tugUtils.getAPiUrl().startsWith("http")); }); test('getAssetURL', () => { diff --git a/packages/common/tug-utils.js b/packages/common/tug-utils.js new file mode 100644 index 0000000000000000000000000000000000000000..e537bc4fa7204a806007d0c1a0e9d8037e741895 --- /dev/null +++ b/packages/common/tug-utils.js @@ -0,0 +1,25 @@ +import environment from 'consts:environment'; + +export const getAPiUrl = (path = "") => { + let apiBaseUrl = ''; + + switch(environment) { + case "development": + apiBaseUrl = 'https://mw-dev.tugraz.at'; + break; + case "demo": + apiBaseUrl = 'https://api-demo.tugraz.at'; + break; + case "production": + apiBaseUrl = 'https://api.tugraz.at'; + break; + case "bs": + apiBaseUrl = 'http://bs-local.com:8000'; + break; + case "local": + default: + apiBaseUrl = 'http://127.0.0.1:8000'; + } + + return apiBaseUrl + path; +}; diff --git a/packages/common/utils.js b/packages/common/utils.js index e89776e6658e3e83068dad1ad14b15bae46138dc..2f8b4ade2c3743e2a08d8052a958517360c8a5e8 100644 --- a/packages/common/utils.js +++ b/packages/common/utils.js @@ -1,5 +1,3 @@ -import environment from 'consts:environment'; - /** * Parses a link header * @@ -30,30 +28,6 @@ export const parseLinkHeader = (header) => { return links; }; -export const getAPiUrl = (path = "") => { - let apiBaseUrl = ''; - - switch(environment) { - case "development": - apiBaseUrl = 'https://mw-dev.tugraz.at'; - break; - case "demo": - apiBaseUrl = 'https://api-demo.tugraz.at'; - break; - case "production": - apiBaseUrl = 'https://api.tugraz.at'; - break; - case "bs": - apiBaseUrl = 'http://bs-local.com:8000'; - break; - case "local": - default: - apiBaseUrl = 'http://127.0.0.1:8000'; - } - - return apiBaseUrl + path; -}; - /** * Parses the base url from an url * diff --git a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js index b7ca2271c44851fc4b65d04e196acbcf84f2e945..6f4d3eeefcec3848a39999e0ae3d99dfa2c2ba91 100644 --- a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js +++ b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js @@ -5,6 +5,7 @@ import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; import {KnowledgeBaseWebPageElementView} from './knowledge-base-web-page-element-view.js'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; +import * as tugUtils from '@dbp-toolkit/common/tug-utils'; export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(LitElement) { constructor() { @@ -82,12 +83,12 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(Lit <div class="container"> <h2 class="subtitle">Deutsch</h2> <p>Ein erster Schritt</p> - <dbp-knowledge-base-web-page-element-view lang="de" entry-point-url="${commonUtils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></dbp-knowledge-base-web-page-element-view> + <dbp-knowledge-base-web-page-element-view lang="de" entry-point-url="${tugUtils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></dbp-knowledge-base-web-page-element-view> </div> <div class="container"> <h2 class="subtitle">Englisch</h2> <p>A first step</p> - <dbp-knowledge-base-web-page-element-view lang="en" entry-point-url="${commonUtils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></dbp-knowledge-base-web-page-element-view> + <dbp-knowledge-base-web-page-element-view lang="en" entry-point-url="${tugUtils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></dbp-knowledge-base-web-page-element-view> </div> <hr> <div class="container"> diff --git a/packages/person-profile/src/dbp-person-profile-demo.js b/packages/person-profile/src/dbp-person-profile-demo.js index 40369cff010ac569811f1b88dfaabf43defbeeb3..424334ed02ff50acaaef06fc97dba916d2881905 100644 --- a/packages/person-profile/src/dbp-person-profile-demo.js +++ b/packages/person-profile/src/dbp-person-profile-demo.js @@ -6,6 +6,7 @@ import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element'; import {PersonProfile} from './index.js'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; +import * as tugUtils from '@dbp-toolkit/common/tug-utils'; import $ from 'jquery'; import {PersonSelect} from '@dbp-toolkit/person-select'; @@ -85,7 +86,7 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) { <h1 class="title">Person-Profile-Demo</h1> </div> <div class="container"> - <dbp-person-profile lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}" value="${this.person}"></dbp-person-profile> + <dbp-person-profile lang="${this.lang}" entry-point-url="${tugUtils.getAPiUrl()}" value="${this.person}"></dbp-person-profile> </div> </section> <section class="section"> @@ -93,10 +94,10 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) { <h1 class="title">Select-Profile-Demo</h1> </div> <div class="container"> - <dbp-person-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}"></dbp-person-select> + <dbp-person-select lang="${this.lang}" entry-point-url="${tugUtils.getAPiUrl()}"></dbp-person-select> </div> <div class="container"> - <dbp-person-profile lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}" value="${this.selectedPerson}"></dbp-person-profile> + <dbp-person-profile lang="${this.lang}" entry-point-url="${tugUtils.getAPiUrl()}" value="${this.selectedPerson}"></dbp-person-profile> </div> </section> `; diff --git a/packages/person-select/src/dbp-person-select-demo.js b/packages/person-select/src/dbp-person-select-demo.js index ff61f2a0e735e204c0c7d35a6e8e32a6ff57d29a..eb1f4e1c969c1eb9d46d5a95c6e1e5ae581d8772 100644 --- a/packages/person-select/src/dbp-person-select-demo.js +++ b/packages/person-select/src/dbp-person-select-demo.js @@ -5,6 +5,7 @@ import {PersonSelect} from './person-select.js'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonStyles from '@dbp-toolkit/common/styles'; +import * as tugUtils from '@dbp-toolkit/common/tug-utils'; export class PersonSelectDemo extends ScopedElementsMixin(LitElement) { constructor() { @@ -71,13 +72,13 @@ export class PersonSelectDemo extends ScopedElementsMixin(LitElement) { <div class="field"> <label class="label">Person 1</label> <div class="control"> - <dbp-person-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}"></dbp-person-select> + <dbp-person-select lang="${this.lang}" entry-point-url="${tugUtils.getAPiUrl()}"></dbp-person-select> </div> </div> <div class="field"> <label class="label">Person 2</label> <div class="control"> - <dbp-person-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}" show-reload-button reload-button-title="Click me"></dbp-person-select> + <dbp-person-select lang="${this.lang}" entry-point-url="${tugUtils.getAPiUrl()}" show-reload-button reload-button-title="Click me"></dbp-person-select> </div> </div> </form>