From 9e8d2e621d1d4cd488e1ea0c029af25dc1935d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danyi=20D=C3=A1vid?= <danyi.david@gmail.com>
Date: Sat, 17 Nov 2018 22:43:46 +0100
Subject: [PATCH] * gitignore updated with correct dist folder * auth welcome
 message changed * deploy script fixed * paths changed for live auth page *
 nested set implementation in backend rewquired frontend indent change aswell

---
 .gitignore                                            |  2 +-
 README.md                                             |  8 +-------
 deploy.php                                            |  7 +++----
 src/app/auth/auth.module.ts                           |  2 +-
 src/app/auth/auth/auth.component.html                 |  4 ++--
 .../record-fault/record-fault.component.html          |  2 +-
 .../record-fault/record-fault.component.ts            | 11 +++++------
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b0d0c1..443f24d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist-beik
+/dist-gulbaba
 /tmp
 /out-tsc
 /semantic
diff --git a/README.md b/README.md
index aa048e9..829af3a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1 @@
-# webnaplo BEIK frontend
-
-modules
-* auth
-* fault
-* report
-* shared ?
+# webnaplo Gül-Baba frontend
diff --git a/deploy.php b/deploy.php
index 0130da7..5232907 100644
--- a/deploy.php
+++ b/deploy.php
@@ -5,7 +5,6 @@ require 'recipe/common.php';
 
 // Configuration
 
-// set('repository', 'git@domain.com:username/repository.git');
 set('shared_files', []);
 set('shared_dirs', []);
 set('writable_dirs', []);
@@ -16,17 +15,17 @@ set('default_stage', 'production');
 
 host('lxuz.hu')
     ->stage('production')
-    ->user('latuzcs_beik_frontend_access')
+    ->user('benkeg_gulbaba_frontend_access')
     ->forwardAgent()
     ->set('ng_target', 'production')
     ->set('ng_environment', 'gulbaba')
-    ->set('deploy_path', '/var/www/clients/client5/web19/deploy');
+    ->set('deploy_path', '/var/www/clients/client4/web37/deploy');
 
 // Tasks
 
 desc('Prepare release');
 task('deploy:ng-prepare', function() {
-    runLocally("ng build --target={{ng_target}} --environment=prod --output-path=dist-{{ng_environment}}");
+    runLocally("ng build frontend --prod --output-path=dist-{{ng_environment}}");
     runLocally("tar -C dist-{{ng_environment}} -cJf dist-{{ng_environment}}.tar.xz .");
 });
 
diff --git a/src/app/auth/auth.module.ts b/src/app/auth/auth.module.ts
index 926a720..a6947e5 100644
--- a/src/app/auth/auth.module.ts
+++ b/src/app/auth/auth.module.ts
@@ -21,7 +21,7 @@ export function tokenGetterFunctionWrapper() {
                 tokenGetter: tokenGetterFunctionWrapper,
                 whitelistedDomains: [
                     "localhost:8888",
-                    "api.beik.lxuz.hu",
+                    "api.gulbaba.bggeneral.hu",
                 ],
             },
         }),
diff --git a/src/app/auth/auth/auth.component.html b/src/app/auth/auth/auth.component.html
index d4b26aa..1c29afe 100644
--- a/src/app/auth/auth/auth.component.html
+++ b/src/app/auth/auth/auth.component.html
@@ -1,9 +1,9 @@
 <div class="ui middle aligned center aligned grid">
   <div class="column">
     <h2 class="ui teal image header">
-      <i class="circular inverted tiny olive file text icon"></i>
+      <i class="circular inverted tiny olive wrench icon"></i>
       <div class="content">
-        WN BEIK Bejelentkezés
+        WN GÜLBABA Bejelentkezés
       </div>
     </h2>
     <form (ngSubmit)="doSubmit()" class="ui large form" [class.error]="hasError" [class.loading]="isLoading">
diff --git a/src/app/fault-manager/record-fault/record-fault.component.html b/src/app/fault-manager/record-fault/record-fault.component.html
index beaba91..6d069da 100644
--- a/src/app/fault-manager/record-fault/record-fault.component.html
+++ b/src/app/fault-manager/record-fault/record-fault.component.html
@@ -13,7 +13,7 @@
                     <i class="dropdown icon"></i>
                     <div class="default text">Válasszon</div>
                     <div class="menu">
-                        <div class="item {{flClass(facilityLocation)}}" [class.disabled]="facilityLocation.level==2"
+                        <div class="item {{flClass(facilityLocation)}}" [class.disabled]="facilityLocation.level==1"
                              *ngFor="let facilityLocation of facilityLocations"
                              [attr.data-value]="facilityLocation?.id">
                             <strong>{{facilityLocation?.roomNumber}}</strong> - {{facilityLocation?.name}}
diff --git a/src/app/fault-manager/record-fault/record-fault.component.ts b/src/app/fault-manager/record-fault/record-fault.component.ts
index 4376b75..70e34ef 100644
--- a/src/app/fault-manager/record-fault/record-fault.component.ts
+++ b/src/app/fault-manager/record-fault/record-fault.component.ts
@@ -2,12 +2,11 @@
 import {finalize} from 'rxjs/operators';
 import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from "@angular/router";
-import { ErrorCategory } from "../shared/error-category";
-import { ErrorOrigin } from "../shared/error-origin";
-import { FacilityLocation } from "../shared/facility-location";
-import { SolutionTimeInterval } from "../shared/solution-time-interval";
+import { ErrorCategory } from "../shared";
+import { ErrorOrigin } from "../shared";
+import { FacilityLocation } from "../shared";
+import { SolutionTimeInterval } from "../shared";
 import { FaultManagerService } from "../fault-manager.service";
-import { Fault } from "../shared/fault";
 import { SimpleFault } from "../shared/simple-fault";
 import { Title } from "@angular/platform-browser";
 
@@ -77,7 +76,7 @@ export class RecordFaultComponent implements OnInit, AfterViewInit {
     }
 
     public flClass(fl: FacilityLocation) {
-        return 'depth' + (fl.level - 1).toString();
+        return 'depth' + (fl.level).toString();
     }
 
     public doSubmit() {