Skip to content
Snippets Groups Projects
Unverified Commit 4379fe08 authored by Bekerle, Patrizio's avatar Bekerle, Patrizio :fire:
Browse files

Move getAPiUrl() from utils.js to a new file

parent f66d0bc0
No related branches found
No related tags found
No related merge requests found
Pipeline #16202 passed
...@@ -4,6 +4,7 @@ import {ScopedElementsMixin} from '@open-wc/scoped-elements'; ...@@ -4,6 +4,7 @@ import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import {CheckInPlaceSelect} from './check-in-place-select.js'; import {CheckInPlaceSelect} from './check-in-place-select.js';
import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth';
import * as commonUtils from '@dbp-toolkit/common/utils'; 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'; import * as commonStyles from '@dbp-toolkit/common/styles';
export class CheckInPlaceSelectDemo extends ScopedElementsMixin(LitElement) { export class CheckInPlaceSelectDemo extends ScopedElementsMixin(LitElement) {
...@@ -71,13 +72,13 @@ export class CheckInPlaceSelectDemo extends ScopedElementsMixin(LitElement) { ...@@ -71,13 +72,13 @@ export class CheckInPlaceSelectDemo extends ScopedElementsMixin(LitElement) {
<div class="field"> <div class="field">
<label class="label">Check-In-Place 1</label> <label class="label">Check-In-Place 1</label>
<div class="control"> <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> </div>
<div class="field"> <div class="field">
<label class="label">Check-In-Place 2</label> <label class="label">Check-In-Place 2</label>
<div class="control"> <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>
</div> </div>
</form> </form>
......
import {expect, assert} from 'chai'; import {expect, assert} from 'chai';
import * as utils from '../utils'; import * as utils from '../utils';
import * as tugUtils from '../tug-utils';
import * as styles from '../styles'; import * as styles from '../styles';
import '../jsonld.js'; import '../jsonld.js';
...@@ -35,7 +36,7 @@ suite('utils', () => { ...@@ -35,7 +36,7 @@ suite('utils', () => {
}); });
test('getAPiUrl', () => { test('getAPiUrl', () => {
assert(utils.getAPiUrl().startsWith("http")); assert(tugUtils.getAPiUrl().startsWith("http"));
}); });
test('getAssetURL', () => { test('getAssetURL', () => {
......
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;
};
import environment from 'consts:environment';
/** /**
* Parses a link header * Parses a link header
* *
...@@ -30,30 +28,6 @@ export const parseLinkHeader = (header) => { ...@@ -30,30 +28,6 @@ export const parseLinkHeader = (header) => {
return links; 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 * Parses the base url from an url
* *
......
...@@ -5,6 +5,7 @@ import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; ...@@ -5,6 +5,7 @@ import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth';
import {KnowledgeBaseWebPageElementView} from './knowledge-base-web-page-element-view.js'; import {KnowledgeBaseWebPageElementView} from './knowledge-base-web-page-element-view.js';
import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as commonStyles from '@dbp-toolkit/common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import * as tugUtils from '@dbp-toolkit/common/tug-utils';
export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(LitElement) { export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(LitElement) {
constructor() { constructor() {
...@@ -82,12 +83,12 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(Lit ...@@ -82,12 +83,12 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(Lit
<div class="container"> <div class="container">
<h2 class="subtitle">Deutsch</h2> <h2 class="subtitle">Deutsch</h2>
<p>Ein erster Schritt</p> <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>
<div class="container"> <div class="container">
<h2 class="subtitle">Englisch</h2> <h2 class="subtitle">Englisch</h2>
<p>A first step</p> <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> </div>
<hr> <hr>
<div class="container"> <div class="container">
......
...@@ -6,6 +6,7 @@ import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element'; ...@@ -6,6 +6,7 @@ import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element';
import {PersonProfile} from './index.js'; import {PersonProfile} from './index.js';
import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as commonStyles from '@dbp-toolkit/common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import * as tugUtils from '@dbp-toolkit/common/tug-utils';
import $ from 'jquery'; import $ from 'jquery';
import {PersonSelect} from '@dbp-toolkit/person-select'; import {PersonSelect} from '@dbp-toolkit/person-select';
...@@ -85,7 +86,7 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) { ...@@ -85,7 +86,7 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) {
<h1 class="title">Person-Profile-Demo</h1> <h1 class="title">Person-Profile-Demo</h1>
</div> </div>
<div class="container"> <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> </div>
</section> </section>
<section class="section"> <section class="section">
...@@ -93,10 +94,10 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) { ...@@ -93,10 +94,10 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) {
<h1 class="title">Select-Profile-Demo</h1> <h1 class="title">Select-Profile-Demo</h1>
</div> </div>
<div class="container"> <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>
<div class="container"> <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> </div>
</section> </section>
`; `;
......
...@@ -5,6 +5,7 @@ import {PersonSelect} from './person-select.js'; ...@@ -5,6 +5,7 @@ import {PersonSelect} from './person-select.js';
import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth';
import * as commonUtils from '@dbp-toolkit/common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as commonStyles from '@dbp-toolkit/common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import * as tugUtils from '@dbp-toolkit/common/tug-utils';
export class PersonSelectDemo extends ScopedElementsMixin(LitElement) { export class PersonSelectDemo extends ScopedElementsMixin(LitElement) {
constructor() { constructor() {
...@@ -71,13 +72,13 @@ export class PersonSelectDemo extends ScopedElementsMixin(LitElement) { ...@@ -71,13 +72,13 @@ export class PersonSelectDemo extends ScopedElementsMixin(LitElement) {
<div class="field"> <div class="field">
<label class="label">Person 1</label> <label class="label">Person 1</label>
<div class="control"> <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> </div>
<div class="field"> <div class="field">
<label class="label">Person 2</label> <label class="label">Person 2</label>
<div class="control"> <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>
</div> </div>
</form> </form>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment