From 38d3a8be895699d216288608cc33331b66c21856 Mon Sep 17 00:00:00 2001 From: Open Source Developer Date: Sat, 11 Mar 2017 10:19:45 +0200 Subject: [PATCH] conflicts --- source/actions/logininfo.actions.ts | 2 +- source/app.settings.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/actions/logininfo.actions.ts b/source/actions/logininfo.actions.ts index 5720292..e8a1049 100644 --- a/source/actions/logininfo.actions.ts +++ b/source/actions/logininfo.actions.ts @@ -12,7 +12,7 @@ export class LoginInfoActions { private _hds: HelperDataService) {} - getloginInfo = (loginInfo) => { + getloginInfo = (loginInfo) => { return this._hds.getCurrentUser(loginInfo.auth_token, loginInfo.auth_role).then (loginInfos => { return this._ngRedux.dispatch({ type: LOGININFO_SAVE, diff --git a/source/app.settings.ts b/source/app.settings.ts index 426c25d..188729a 100644 --- a/source/app.settings.ts +++ b/source/app.settings.ts @@ -1,8 +1,8 @@ -export const API_ENDPOINT = 'http://localhost/drupal-8.2.5'; +export const API_ENDPOINT = 'http://localhost/angular/eepal-front/drupal'; export class AppSettings { public static get API_ENDPOINT(): string { - return 'http://localhost/drupal-8.2.5'; + return 'http://localhost/angular/eepal-front/drupal'; // return 'http://localhost/angular/eepal-front/drupal'; // return 'http://localhost/drupal'; // return 'http://localhost/angular/eepal-front/drupal'; -- GitLab