Commit 38d3a8be authored by Open Source Developer's avatar Open Source Developer

conflicts

parent 61c07e07
...@@ -12,7 +12,7 @@ export class LoginInfoActions { ...@@ -12,7 +12,7 @@ export class LoginInfoActions {
private _hds: HelperDataService) {} private _hds: HelperDataService) {}
getloginInfo = (loginInfo) => { getloginInfo = (loginInfo) => {
return this._hds.getCurrentUser(loginInfo.auth_token, loginInfo.auth_role).then (loginInfos => { return this._hds.getCurrentUser(loginInfo.auth_token, loginInfo.auth_role).then (loginInfos => {
return this._ngRedux.dispatch({ return this._ngRedux.dispatch({
type: LOGININFO_SAVE, type: LOGININFO_SAVE,
......
export const API_ENDPOINT = 'http://localhost/drupal-8.2.5'; export const API_ENDPOINT = 'http://localhost/angular/eepal-front/drupal';
export class AppSettings { export class AppSettings {
public static get API_ENDPOINT(): string { 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/angular/eepal-front/drupal';
// return 'http://localhost/drupal'; // return 'http://localhost/drupal';
// return 'http://localhost/angular/eepal-front/drupal'; // return 'http://localhost/angular/eepal-front/drupal';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment