= of();
+
+ constructor(route: ActivatedRoute, private readonly eventService: EventService) {
+ this.organizationId = route.snapshot.paramMap.get('id') as string;
+ }
+
+ ngOnInit(): void {
+ this.activeEvents$ = this.eventService.getActiveEvents(this.organizationId);
+ this.expiredEvents$ = this.eventService.getExpiredEvents(this.organizationId);
+ }
}
diff --git a/frontend-admin/src/app/dashboard/dashboard.module.ts b/frontend-admin/src/app/dashboard/dashboard.module.ts
index d6e7140439..bf1c5b26b5 100644
--- a/frontend-admin/src/app/dashboard/dashboard.module.ts
+++ b/frontend-admin/src/app/dashboard/dashboard.module.ts
@@ -2,16 +2,36 @@ import {NgModule} from "@angular/core";
import {NgbModule} from "@ng-bootstrap/ng-bootstrap";
import {DashboardComponent} from "./dashboard.component";
import {RouterModule} from "@angular/router";
+import {DashboardMenuComponent} from './dashboard-menu/dashboard-menu.component';
+import {OrganizationService} from "../shared/organization.service";
+import {CommonModule} from "@angular/common";
+import {EventService} from "../shared/event.service";
+import {OrganizationConfigurationComponent} from './organization-configuration/organization-configuration.component';
+import {provideSvgIcons, SvgIconComponent} from '@ngneat/svg-icon';
+import { TranslateModule } from '@ngx-translate/core'
+import { ICONS } from "../shared/icons";
@NgModule({
imports: [
+ TranslateModule.forChild(),
+ CommonModule,
NgbModule,
RouterModule.forChild([
- { path: '', component: DashboardComponent}
- ])
+ { path: '', component: DashboardComponent},
+ { path: '', component: DashboardMenuComponent, outlet: 'sidebar-content'},
+ { path: 'configuration', component: OrganizationConfigurationComponent }
+ ]),
+ SvgIconComponent,
],
declarations: [
- DashboardComponent
+ DashboardComponent,
+ DashboardMenuComponent,
+ OrganizationConfigurationComponent,
+ ],
+ providers: [
+ OrganizationService,
+ EventService,
+ provideSvgIcons(ICONS),
]
})
export class DashboardModule {}
diff --git a/frontend-admin/src/app/dashboard/organization-configuration/organization-configuration.component.html b/frontend-admin/src/app/dashboard/organization-configuration/organization-configuration.component.html
new file mode 100644
index 0000000000..b0dc87782d
--- /dev/null
+++ b/frontend-admin/src/app/dashboard/organization-configuration/organization-configuration.component.html
@@ -0,0 +1 @@
+organization-configuration works!
diff --git a/frontend-admin/src/app/dashboard/organization-configuration/organization-configuration.component.scss b/frontend-admin/src/app/dashboard/organization-configuration/organization-configuration.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frontend-admin/src/app/dashboard/organization-configuration/organization-configuration.component.ts b/frontend-admin/src/app/dashboard/organization-configuration/organization-configuration.component.ts
new file mode 100644
index 0000000000..7a2084022d
--- /dev/null
+++ b/frontend-admin/src/app/dashboard/organization-configuration/organization-configuration.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-organization-configuration',
+ templateUrl: './organization-configuration.component.html',
+ styleUrls: ['./organization-configuration.component.scss']
+})
+export class OrganizationConfigurationComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+}
diff --git a/frontend-admin/src/app/missing-org/missing-org.component.html b/frontend-admin/src/app/missing-org/missing-org.component.html
new file mode 100644
index 0000000000..cfd93db722
--- /dev/null
+++ b/frontend-admin/src/app/missing-org/missing-org.component.html
@@ -0,0 +1 @@
+missing-org works!
diff --git a/frontend-admin/src/app/missing-org/missing-org.component.scss b/frontend-admin/src/app/missing-org/missing-org.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frontend-admin/src/app/missing-org/missing-org.component.ts b/frontend-admin/src/app/missing-org/missing-org.component.ts
new file mode 100644
index 0000000000..672d02574c
--- /dev/null
+++ b/frontend-admin/src/app/missing-org/missing-org.component.ts
@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { firstValueFrom } from 'rxjs';
+import { OrganizationService } from '../shared/organization.service';
+
+@Component({
+ selector: 'app-missing-org',
+ templateUrl: './missing-org.component.html',
+ styleUrls: ['./missing-org.component.scss']
+})
+export class MissingOrgComponent implements OnInit {
+
+ constructor(
+ private readonly organizationService: OrganizationService,
+ private readonly router: Router
+ ) { }
+
+ ngOnInit(): void {
+ firstValueFrom(this.organizationService.getOrganizations()).then(orgs => {
+ if (orgs.length > 0) {
+ this.router.navigate(['organization', orgs[0].id]);
+ }
+ });
+ }
+
+}
diff --git a/frontend-admin/src/app/model/event.ts b/frontend-admin/src/app/model/event.ts
new file mode 100644
index 0000000000..c3246619db
--- /dev/null
+++ b/frontend-admin/src/app/model/event.ts
@@ -0,0 +1,23 @@
+export interface EventInfo {
+ id: number;
+ displayName: string;
+ status: string; // TODO: enum
+ shortName: string;
+ organizationId: number;
+ allowedPaymentProxies: string[]; // TODO: enum
+ expired: boolean;
+ notAllocatedTickets: number;
+ fileBlobId: string;
+ availableSeats: number;
+ checkedInTickets: number;
+ notSoldTickets: number;
+ soldTickets: number;
+ pendingTickets: number;
+ dynamicAllocation: number;
+ releasedTickets: number;
+ formattedEnd: string;
+ visibleForCurrentUser: boolean;
+ warningNeeded: boolean;
+ formattedBegin: string;
+ displayStatistics: boolean;
+}
diff --git a/frontend-admin/src/app/model/organization.ts b/frontend-admin/src/app/model/organization.ts
new file mode 100644
index 0000000000..46019c9227
--- /dev/null
+++ b/frontend-admin/src/app/model/organization.ts
@@ -0,0 +1,6 @@
+export interface Organization {
+ id: number;
+ name: string;
+ description: string;
+ email: string;
+}
diff --git a/frontend-admin/src/app/shared/event.service.ts b/frontend-admin/src/app/shared/event.service.ts
new file mode 100644
index 0000000000..8364f81355
--- /dev/null
+++ b/frontend-admin/src/app/shared/event.service.ts
@@ -0,0 +1,23 @@
+import { HttpClient } from "@angular/common/http";
+import { Injectable } from "@angular/core";
+import { map, Observable } from "rxjs";
+import { EventInfo } from "../model/event";
+
+@Injectable()
+export class EventService {
+ constructor(private httpClient: HttpClient) {
+ }
+
+ getActiveEvents(organizationId: string): Observable {
+ const orgId = parseInt(organizationId);
+ return this.httpClient.get('/admin/api/active-events')
+ .pipe(map(events => events.filter(e => e.organizationId === orgId)));
+ }
+
+
+ getExpiredEvents(organizationId: string): Observable {
+ const orgId = parseInt(organizationId);
+ return this.httpClient.get('/admin/api/expired-events')
+ .pipe(map(events => events.filter(e => e.organizationId == orgId)));
+ }
+}
diff --git a/frontend-admin/src/app/shared/i18n.service.ts b/frontend-admin/src/app/shared/i18n.service.ts
new file mode 100644
index 0000000000..494d6f62fd
--- /dev/null
+++ b/frontend-admin/src/app/shared/i18n.service.ts
@@ -0,0 +1,18 @@
+import { HttpClient } from "@angular/common/http";
+import { TranslateLoader } from "@ngx-translate/core";
+import { Observable, shareReplay } from "rxjs";
+
+const translationCache: {[key: string]: Observable} = {};
+
+export class CustomLoader implements TranslateLoader {
+
+ constructor(private http: HttpClient) {
+ }
+
+ getTranslation(lang: string): Observable {
+ if (!translationCache[lang]) {
+ translationCache[lang] = this.http.get(`/api/v2/admin/i18n/bundle/${lang}`).pipe(shareReplay(1));
+ }
+ return translationCache[lang];
+ }
+}
diff --git a/frontend-admin/src/app/shared/icons.ts b/frontend-admin/src/app/shared/icons.ts
new file mode 100644
index 0000000000..008c8d888e
--- /dev/null
+++ b/frontend-admin/src/app/shared/icons.ts
@@ -0,0 +1,3 @@
+import {checkIcon} from '../svg/check';
+
+export const ICONS = [checkIcon];
diff --git a/frontend-admin/src/app/shared/organization.service.ts b/frontend-admin/src/app/shared/organization.service.ts
new file mode 100644
index 0000000000..1dddfb059a
--- /dev/null
+++ b/frontend-admin/src/app/shared/organization.service.ts
@@ -0,0 +1,14 @@
+import { HttpClient } from "@angular/common/http";
+import { Injectable } from "@angular/core";
+import { Observable } from "rxjs";
+import { Organization } from "../model/organization";
+
+@Injectable()
+export class OrganizationService {
+ constructor(private httpClient: HttpClient) {
+ }
+
+ getOrganizations(): Observable {
+ return this.httpClient.get('/admin/api/organizations');
+ }
+}
diff --git a/frontend-admin/src/assets/alfio-logo.svg b/frontend-admin/src/assets/alfio-logo.svg
new file mode 100644
index 0000000000..f41522dd32
--- /dev/null
+++ b/frontend-admin/src/assets/alfio-logo.svg
@@ -0,0 +1,59 @@
+
+
diff --git a/frontend-admin/src/assets/svg/check.svg b/frontend-admin/src/assets/svg/check.svg
new file mode 100644
index 0000000000..f3ab4225ee
--- /dev/null
+++ b/frontend-admin/src/assets/svg/check.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/main/java/alfio/controller/api/v2/TranslationsApiController.java b/src/main/java/alfio/controller/api/v2/TranslationsApiController.java
index 02767b7238..335680b8bf 100644
--- a/src/main/java/alfio/controller/api/v2/TranslationsApiController.java
+++ b/src/main/java/alfio/controller/api/v2/TranslationsApiController.java
@@ -56,7 +56,10 @@ public Map getPublicTranslations(@PathVariable("lang") String la
@GetMapping("/admin/i18n/bundle/{lang}")
public Map getAdminTranslations(@PathVariable("lang") String lang,
@RequestParam(value = "withSystemOverride", defaultValue = "true", required = false) boolean withSystemOverride) {
- return messageSourceManager.getBundleAsMap("alfio.i18n.admin", withSystemOverride, lang);
+ var bundle = messageSourceManager.getBundleAsMap("alfio.i18n.public", withSystemOverride, lang);
+ return bundle.entrySet().stream()
+ .filter(kv -> kv.getKey().startsWith("admin."))
+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}
@GetMapping("/public/i18n/countries/{lang}")
diff --git a/src/main/resources/alfio/i18n/public.properties b/src/main/resources/alfio/i18n/public.properties
index d462cfb9a9..efb45d0cd5 100644
--- a/src/main/resources/alfio/i18n/public.properties
+++ b/src/main/resources/alfio/i18n/public.properties
@@ -600,3 +600,7 @@ online.check-in.waiting-room.event-started.contact-organizers=Please try again b
online.check-in.waiting-room.event-ended=Sorry, this event has ended.
qr.code=QR Code
link.new-tab=(Opens in a new tab)
+
+
+## admin related key
+admin.dashboard.my-events=My events
\ No newline at end of file
+
+
+