diff --git a/customer/app/src/app/_helpers/error.interceptor.ts b/customer/app/src/app/_helpers/error.interceptor.ts index 61e4bd3..38f27aa 100644 --- a/customer/app/src/app/_helpers/error.interceptor.ts +++ b/customer/app/src/app/_helpers/error.interceptor.ts @@ -26,7 +26,7 @@ All other errors are RE-THROWN to be caught by the calling service so an alert c this.authenticationService.logout(); this.navigationService.navigateToLogin(); // location.reload(true); - return EMPTY; + // return EMPTY; } // const error = err.error.message || err.statusText; // return throwError(error); diff --git a/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.html b/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.html index a648935..c28dfc7 100644 --- a/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.html +++ b/customer/app/src/app/components/month-calendar-day/month-calendar-day.component.html @@ -1,11 +1,11 @@
-
-
{{getMonthOfDay()}}.{{getDateOfDay()}}
-
{{getMonthOfDay()}}.
-
{{getDateOfDay()}}
-
+
+
{{getMonthOfDay()}}.{{getDateOfDay()}}
+
{{getMonthOfDay()}}.
+
{{getDateOfDay()}}
+
{{getDayOfWeekName()}}
-
diff --git a/customer/app/src/app/components/month-calendar-event/month-calendar-event.component.html b/customer/app/src/app/components/month-calendar-event/month-calendar-event.component.html index 7a7e292..e23e9fa 100644 --- a/customer/app/src/app/components/month-calendar-event/month-calendar-event.component.html +++ b/customer/app/src/app/components/month-calendar-event/month-calendar-event.component.html @@ -1,13 +1,13 @@ - - {{formatTime()}}:{{event.eventType.name}} +
{{formatTime()}}
+
{{event.eventType.name}}
-
- {{formatTrainer()}} +
{{formatTrainer()}}
 - +
diff --git a/customer/app/src/app/components/month-calendar/month-calendar.component.html b/customer/app/src/app/components/month-calendar/month-calendar.component.html index ba0ab37..d5d6967 100644 --- a/customer/app/src/app/components/month-calendar/month-calendar.component.html +++ b/customer/app/src/app/components/month-calendar/month-calendar.component.html @@ -1,13 +1,13 @@
-

Naptár

+

Naptár

-
- {{dayOfWeek.name}} + {{dayOfWeek.name}} {{dayOfWeek.shortName}}
diff --git a/customer/app/src/app/components/month-calendar/month-calendar.component.scss b/customer/app/src/app/components/month-calendar/month-calendar.component.scss index 8c32fd6..7845486 100644 --- a/customer/app/src/app/components/month-calendar/month-calendar.component.scss +++ b/customer/app/src/app/components/month-calendar/month-calendar.component.scss @@ -8,4 +8,8 @@ .day { min-height: 20vh; } + + h1{ + text-shadow: 0 0 5px #000000; + } } diff --git a/customer/app/src/app/layout/secured-layout/secured-layout.component.html b/customer/app/src/app/layout/secured-layout/secured-layout.component.html index 00f6057..684864e 100644 --- a/customer/app/src/app/layout/secured-layout/secured-layout.component.html +++ b/customer/app/src/app/layout/secured-layout/secured-layout.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/customer/app/src/app/pages/event-details/event-details.component.html b/customer/app/src/app/pages/event-details/event-details.component.html index f63d7f6..a6d3b6c 100644 --- a/customer/app/src/app/pages/event-details/event-details.component.html +++ b/customer/app/src/app/pages/event-details/event-details.component.html @@ -1,40 +1,42 @@ -
-

Jelentkezés

-
-
-
Edzés típusa
-
{{event.eventType.name}}
+ +
+ +
+

Jelentkezés

+
+
+
+
Edzés típusa
+
{{event.eventType.name}}
-
Edző
-
{{event?.trainer?.name}}
+
Edző
+
{{event?.trainer?.name}}
-
Edzés kezdési időpontja
-
{{event.start * 1000 | date:'yyyy.MM.dd HH:mm'}}
+
Edzés kezdési időpontja
+
{{event.start * 1000 | date:'yyyy.MM.dd HH:mm'}}
-
Edzés vége
-
{{event.end * 1000 | date:'yyyy.MM.dd HH:mm'}}
+
Edzés vége
+
{{event.end * 1000 | date:'yyyy.MM.dd HH:mm'}}
-
Férőhelyek száma
-
{{event.seat_count }}
+
Férőhelyek száma
+
{{event.seat_count }}
-
Terem
-
{{event?.room?.name }}
+
Terem
+
{{event?.room?.name }}
- -
-
- Foglalás - Lemondás - Már nincs szabad hely - Vissza -
-
-
+
+
+
+ Foglalás + Lemondás + Már nincs szabad hely + Vissza
- -
+
+ diff --git a/customer/app/src/app/pages/event-details/event-details.component.ts b/customer/app/src/app/pages/event-details/event-details.component.ts index 672ca45..dfdf2bf 100644 --- a/customer/app/src/app/pages/event-details/event-details.component.ts +++ b/customer/app/src/app/pages/event-details/event-details.component.ts @@ -59,7 +59,6 @@ export class EventDetailsComponent implements OnInit { let request: RegisterEventRequest = { idEvent: this.eventForm.value.idEvent, equipment: [] - }; this.eventService.register(request) diff --git a/customer/app/src/app/pages/login/login.component.html b/customer/app/src/app/pages/login/login.component.html index 5cf1588..99fb7a7 100644 --- a/customer/app/src/app/pages/login/login.component.html +++ b/customer/app/src/app/pages/login/login.component.html @@ -3,24 +3,28 @@
+

Bejelentkezés

diff --git a/customer/app/src/app/pages/registrations/registrations.component.html b/customer/app/src/app/pages/registrations/registrations.component.html index 032254d..9d47608 100644 --- a/customer/app/src/app/pages/registrations/registrations.component.html +++ b/customer/app/src/app/pages/registrations/registrations.component.html @@ -1,13 +1,15 @@ -
- - -
-
- {{(registration.event.start * 1000) | date:'yyyy.MM.dd HH:mm'}} - {{registration.event.eventType.name}} + + +
+
+ {{(registration.event.start * 1000) | date:'yyyy.MM.dd HH:mm'}} - {{registration.event.eventType.name}} +
+
+ Részletek
- -
+ diff --git a/customer/app/src/assets/images/cutlercross-background.jpg b/customer/app/src/assets/images/cutlercross-background.jpg index 1f689ba..ac1c106 100644 Binary files a/customer/app/src/assets/images/cutlercross-background.jpg and b/customer/app/src/assets/images/cutlercross-background.jpg differ diff --git a/customer/app/src/styles.scss b/customer/app/src/styles.scss index 7d83db5..4ae94f2 100644 --- a/customer/app/src/styles.scss +++ b/customer/app/src/styles.scss @@ -7,6 +7,7 @@ $font-size-md: 1.25rem; $font-size-lg: 2.5rem; $font-size-xl: 6.25rem; + // font weight $font-weight-normal: 400; $font-weight-medium: 500; @@ -18,9 +19,37 @@ $secondary: #D2D2D2 ; $light: #FFFFFF ; $dark: #3A3A39 ; +$border-radius-0: 0; +$border-radius-1: 0.5rem; + // bootstrap font override $font-family-sans-serif: Roboto, system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" ; + +/** +customize .form-control +important: total height must be 50(lineheight + padding + border) +**/ +$input-border-radius: $border-radius-0; +$input-border-width: 1px; +//$input-border-color: $primary; +// must be without rem +$input-line-height: 2; +$input-padding-y: 8px; + +$input-font-size: $font-size-md; + +/** +button +important: total height must be 50px (lineheight + padding + border) + */ +$btn-line-height: 2; +$btn-padding-y: 8px; +$btn-font-weight: $font-weight-bold; +$btn-font-size: $font-size-md; +$btn-border-radius: $border-radius-0; + + // regular style toast @import '~ngx-toastr/toastr'; @import "styles/bootstrap-custom"; diff --git a/customer/app/src/styles/bootstrap-custom.scss b/customer/app/src/styles/bootstrap-custom.scss index 69fae70..16ae0f3 100644 --- a/customer/app/src/styles/bootstrap-custom.scss +++ b/customer/app/src/styles/bootstrap-custom.scss @@ -23,6 +23,13 @@ $utilities: map-merge( class: mw2, values: ( 25: 25%, 50: 50%, 80: 80%, 100: 100%) ), + // scss-docs-start utils-vertical-align + "border-radius": ( + property: border-radius, + responsive: true, + class: border-radius, + values: ( 0: 0, 1: $border-radius-1 ) + ), ), $utilities ); diff --git a/customer/app/src/styles/fonts.scss b/customer/app/src/styles/fonts.scss index 98cce17..cd5df5e 100644 --- a/customer/app/src/styles/fonts.scss +++ b/customer/app/src/styles/fonts.scss @@ -2,8 +2,6 @@ @font-face { font-family: "Roboto"; src: url("/assets/fonts/RobotoMono-VariableFont_wght.ttf") format("truetype"); - //font-weight: $font-weight-normal; - //font-style: normal; } @font-face { @@ -49,3 +47,7 @@ .app-font-weight-bold { font-weight: $font-weight-bold; } + +.app-font-family-secondary{ + font-family: dcc, serif; +} diff --git a/customerapi/controllers/EventController.php b/customerapi/controllers/EventController.php index 7490ec1..7f0f45e 100644 --- a/customerapi/controllers/EventController.php +++ b/customerapi/controllers/EventController.php @@ -135,7 +135,6 @@ class EventController extends CustomerApiController /** @var Event $event */ $event = $query->one(); - $result = new EventDetailsView(); $result->id = $event->id; $result->start = $event->start; @@ -144,7 +143,7 @@ class EventController extends CustomerApiController $result->trainer = TrainerDetailsView::findOne($event->id_trainer); $result->room = RoomDetailsView::findOne($event->id_room); $result->eventType = EventTypeDetailsView::findOne($event->id_event_type); - $registrations = EventRegistrationView::find()->all(); + $registrations = EventRegistrationView::find()->andWhere(['id_event' => $event->id,'id_customer' => \Yii::$app->user->id])->all(); $allActiveRegistrations = EventRegistration::filterActive($registrations); $customerActiveRegistrations = EventRegistration::filterForCustomer($allActiveRegistrations,\Yii::$app->user->id); $result->reservationCount = count($allActiveRegistrations);