improve deployment

- customer angular app: add base-href and deploy url

- botond_daily.sh : allow daily scripts

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

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"

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();
+}

customer/app/src/app/pages/login/login.component.html

@@ -2,7 +2,7 @@
   <div class="row h-100">
     <div class="col-lg-4 col-sm-12 offset-lg-4  p-3  ">
       <div class="d-flex align-items-center justify-content-center h-100 flex-column ">
-        <img class="mw2-sm-80 mw2-80" src="/assets/images/cutlercross-logo-dark.svg">
+        <img class="mw2-sm-80 mw2-80" [src]=" baseHref + '/assets/images/cutlercross-logo-dark.svg'">
         <h1 class="app-font-size-lg app-font-family-secondary mt-3">Bejelentkezés</h1>
         <form class="login-form w-100" [formGroup]="loginForm" (ngSubmit)="onSubmit()">
           <div class="form-group mt-2">
@@ -22,9 +22,9 @@
             </div>
           </div>
           <button [disabled]="loading" class="btn btn-primary mt-2 w-100 ">bejelentkezek</button>
-          <div class="w-100 text-center">
-            <button  type="button" class="btn btn-link text-dark text-center text-decoration-none">elfelejtett jelszó</button>
-          </div>
+<!--          <div class="w-100 text-center">-->
+<!--            <button  type="button" class="btn btn-link text-dark text-center text-decoration-none">elfelejtett jelszó</button>-->
+<!--          </div>-->
           <div *ngIf="error" class="alert alert-danger mt-2">{{error}}</div>
         </form>
       </div>

customer/app/src/app/pages/login/login.component.ts

@@ -1,9 +1,10 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, Inject, OnInit} from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from "@angular/forms";
 import {ActivatedRoute, Router} from "@angular/router";
 import {AuthenticationService} from "../../services/authentication.service";
 import { first } from 'rxjs/operators';
 import {ToastrService} from "ngx-toastr";
+import {APP_BASE_HREF} from "@angular/common";
 
 @Component({
   selector: 'app-login',
@@ -22,7 +23,8 @@ export class LoginComponent implements OnInit {
               private route: ActivatedRoute,
               private router: Router,
               private authenticationService: AuthenticationService,
-              private toastr: ToastrService
+              private toastr: ToastrService,
+              @Inject(APP_BASE_HREF) public baseHref:string
   ) { }
 
   ngOnInit() {

customer/app/src/styles.scss

@@ -61,7 +61,7 @@ html{
 body{
   min-height: 100%;
   height: 100%;
-  background: url("/assets/images/cutlercross-background.jpg");
+  background: url("~/assets/images/cutlercross-background.jpg");
   background-repeat: repeat-y;
 }
 

customer/app/src/styles/fonts.scss

@@ -1,12 +1,12 @@
 
 @font-face {
   font-family: "Roboto";
-  src: url("/assets/fonts/RobotoMono-VariableFont_wght.ttf") format("truetype");
+  src: url("~/assets/fonts/RobotoMono-VariableFont_wght.ttf") format("truetype");
 }
 
 @font-face {
   font-family: "dcc";
-  src: url("/assets/fonts/dcc_sharp_distress_black_by_dccanim.otf") format("truetype");
+  src: url("~/assets/fonts/dcc_sharp_distress_black_by_dccanim.otf") format("truetype");
   //font-weight: $font-weight-normal;
   //font-style: normal;
 }