diff --git a/botond_daily.sh b/botond_daily.sh index 83491a0..3cebaf0 100644 --- a/botond_daily.sh +++ b/botond_daily.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash php /home/fitnessa/public_html/fitness-web/yii ticket/index -#php /home/fitnessa/public_html/fitness-web/yii ticket/daily +php /home/fitnessa/public_html/fitness-web/yii ticket/daily diff --git a/customer/app/package.json b/customer/app/package.json index 3445aa7..7872653 100644 --- a/customer/app/package.json +++ b/customer/app/package.json @@ -7,7 +7,7 @@ "build": "ng build", "build:prod": "ng build --configuration production", "build:prod-cutler-gyor": "ng build --configuration cutler-gyor", - "build:prod-cutler-movar": "ng build --configuration cutler-movar --base-href group-training", + "build:prod-cutler-movar": "ng build --configuration cutler-movar --base-href /group-training/ --deploy-url /group-training/", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" diff --git a/customer/app/src/app/app.module.ts b/customer/app/src/app/app.module.ts index d1e674c..fe301ba 100644 --- a/customer/app/src/app/app.module.ts +++ b/customer/app/src/app/app.module.ts @@ -17,7 +17,7 @@ import {ReactiveFormsModule} from "@angular/forms"; import { EventsComponent } from './pages/events/events.component'; import { FitEventTypesComponent } from './components/fit-event-types/fit-event-types.component'; -import { registerLocaleData } from '@angular/common'; +import {APP_BASE_HREF, PlatformLocation, registerLocaleData} from '@angular/common'; import localeHu from '@angular/common/locales/hu'; import {FontAwesomeModule} from "@fortawesome/angular-fontawesome"; import { library } from '@fortawesome/fontawesome-svg-core'; @@ -90,7 +90,11 @@ registerLocaleData(localeHu, 'hu'); { provide: LOCALE_ID, useValue: "hu-hu" }, { provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true }, { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true }, - + { + provide: APP_BASE_HREF, + useFactory: getBaseHref, + deps: [PlatformLocation] + } // provider used to create fake backend // fakeBackendProvider ], @@ -103,3 +107,7 @@ export class AppModule { } } + +export function getBaseHref(platformLocation: PlatformLocation): string { + return platformLocation.getBaseHrefFromDOM(); +} diff --git a/customer/app/src/app/pages/login/login.component.html b/customer/app/src/app/pages/login/login.component.html index 99fb7a7..48761e5 100644 --- a/customer/app/src/app/pages/login/login.component.html +++ b/customer/app/src/app/pages/login/login.component.html @@ -2,7 +2,7 @@