|
- Ocupation
+ Occupation
|
{{day.nStands}}
diff --git a/src/app/admin/reservations/reservations.service.ts b/src/app/admin/reservations/reservations.service.ts
index 4efda87..e98c1f0 100644
--- a/src/app/admin/reservations/reservations.service.ts
+++ b/src/app/admin/reservations/reservations.service.ts
@@ -9,8 +9,8 @@ import { environment } from '../../../environments/environment';
import { StorageService } from '../../storage.service';
import { CompanyService } from 'src/app/company/company.service';
-import { Credentials } from '../login/credentials';
import { Reservation } from './reservation/reservation';
+import { LoginService } from '../login/login.service';
@Injectable({
providedIn: 'root'
@@ -28,17 +28,13 @@ export class ReservationsService {
constructor(
private http: HttpClient,
- private storage: StorageService,
+ private loginService: LoginService,
private companyService: CompanyService
) {
- const credentials = this.storage.getItem('credentials') as Credentials;
-
- this.headers = credentials
- ? new HttpHeaders({
- 'Authorization': `${credentials.user} ${credentials.token}`,
- 'Content-Type': 'application/json'
- })
- : null;
+ this.headers = new HttpHeaders({
+ 'Authorization': `Bearer ${this.loginService.getToken()}`,
+ 'Content-Type': 'application/json'
+ });
}
setReservations(reservations: Reservation[]) {
diff --git a/src/app/admin/venues/upload/upload.service.ts b/src/app/admin/venues/upload/upload.service.ts
index 5695213..080036c 100644
--- a/src/app/admin/venues/upload/upload.service.ts
+++ b/src/app/admin/venues/upload/upload.service.ts
@@ -3,8 +3,7 @@ import { HttpClient, HttpHeaders, HttpRequest, HttpEvent } from '@angular/common
import { Observable } from 'rxjs/internal/Observable';
import { environment } from '../../../../environments/environment';
-import { StorageService } from 'src/app/storage.service';
-import { Credentials } from '../../login/credentials';
+import { LoginService } from '../../login/login.service';
@Injectable({
providedIn: 'root'
@@ -14,10 +13,9 @@ export class UploadService {
corlief: String = environment.corlief;
headers: HttpHeaders;
- constructor(private http: HttpClient, private storage: StorageService) {
- const credentials = this.storage.getItem('credentials');
+ constructor(private http: HttpClient, private loginService: LoginService) {
this.headers = new HttpHeaders({
- Authorization: `${credentials.user} ${credentials.token}`
+ Authorization: `Bearer ${this.loginService.getToken()}`
});
}
diff --git a/src/app/admin/venues/venues.service.ts b/src/app/admin/venues/venues.service.ts
index 6206170..21fb186 100644
--- a/src/app/admin/venues/venues.service.ts
+++ b/src/app/admin/venues/venues.service.ts
@@ -5,14 +5,12 @@ import { ReplaySubject } from 'rxjs/internal/ReplaySubject';
import { environment } from '../../../environments/environment';
-import { StorageService } from '../../storage.service';
-
-import { Credentials } from '../login/credentials';
import { Venue, Availability } from './venue/venue';
import { Stand } from './venue/stand';
import { Company } from 'src/app/deck/company';
import { of } from 'rxjs';
import { Activity } from './venue/activity';
+import { LoginService } from '../login/login.service';
@Injectable({
providedIn: 'root'
@@ -34,12 +32,11 @@ export class VenuesService {
constructor(
private http: HttpClient,
- private storage: StorageService
+ private loginService: LoginService
) {
- const credentials = this.storage.getItem('credentials');
- this.headers = credentials ? new HttpHeaders({
- Authorization: `${credentials.user} ${credentials.token}`,
- }) : new HttpHeaders();
+ this.headers = new HttpHeaders({
+ Authorization: `Bearer ${this.loginService.getToken()}`,
+ });
}
// ------------ Venue ------------
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index ac5e108..1545c77 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -35,6 +35,7 @@ import { CanvasService } from 'src/app/admin/venues/venue/venue-image/canvas/can
import { CompanyService } from 'src/app/company/company.service';
import { ReservationsService } from 'src/app/admin/reservations/reservations.service';
import { DeckService } from 'src/app/deck/deck.service';
+import { JwtService } from './admin/login/jwt.service';
import { AppComponent } from './app.component';
import { LoginComponent } from './admin/login/login.component';
@@ -63,6 +64,8 @@ import { ActivityDialogComponent } from './admin/venues/venue/dialogs/activity-d
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MatButtonModule } from '@angular/material';
import { ActivityDisplayPipe } from './company/company-reservations/reservation-card/activity-display.pipe';
+import { InfosComponent } from './admin/infos/infos.component';
+import { CompanyInfosComponent } from './company/company-infos/company-infos.component';
library.add(fas);
@@ -98,6 +101,8 @@ library.add(fas);
StandsDisplayPipe,
ActivityDialogComponent,
ActivityDisplayPipe,
+ InfosComponent,
+ CompanyInfosComponent
],
imports: [
BrowserModule,
@@ -132,7 +137,8 @@ library.add(fas);
UploadService,
CanvasService,
CompanyService,
- ReservationsService
+ ReservationsService,
+ JwtService
],
bootstrap: [AppComponent],
entryComponents: [ActivityDialogComponent],
diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
index 246481e..15ff1af 100644
--- a/src/app/app.routes.ts
+++ b/src/app/app.routes.ts
@@ -14,6 +14,8 @@ import { UnauthorizedComponent } from 'src/app/unauthorized/unauthorized.compone
import { ReservationsComponent } from 'src/app/admin/reservations/reservations.component';
import { WelcomeComponent } from 'src/app/company/welcome/welcome.component';
import { CompanyReservationsComponent } from 'src/app/company/company-reservations/company-reservations.component';
+import { InfosComponent } from './admin/infos/infos.component';
+import { CompanyInfosComponent } from './company/company-infos/company-infos.component';
const appRoutes: Routes = [
{
@@ -40,6 +42,11 @@ const appRoutes: Routes = [
path: 'reservations',
component: ReservationsComponent,
canActivate: [AdminGuard]
+ },
+ {
+ path: 'infos',
+ component: InfosComponent,
+ canActivate: [AdminGuard]
}
]
},
@@ -63,6 +70,11 @@ const appRoutes: Routes = [
path: 'reservations',
component: CompanyReservationsComponent,
canActivate: [CompanyGuard]
+ },
+ {
+ path: 'infos',
+ component: CompanyInfosComponent,
+ canActivate: [CompanyGuard]
}
]
},
diff --git a/src/app/company/company-infos/company-infos.component.css b/src/app/company/company-infos/company-infos.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/company/company-infos/company-infos.component.html b/src/app/company/company-infos/company-infos.component.html
new file mode 100644
index 0000000..f8e16ac
--- /dev/null
+++ b/src/app/company/company-infos/company-infos.component.html
@@ -0,0 +1,104 @@
+
+
+ Company Information Form
+
+
+
+
+ {{ model }}
+
+
diff --git a/src/app/company/company.service.ts b/src/app/company/company.service.ts
index 78f5b27..d25677b 100644
--- a/src/app/company/company.service.ts
+++ b/src/app/company/company.service.ts
@@ -9,6 +9,8 @@ import { environment } from '../../environments/environment';
import { Credentials } from './credentials';
import { Availability } from '../admin/venues/venue/venue';
import { Reservation } from '../admin/reservations/reservation/reservation';
+import { Step } from './company';
+import { Info } from '../admin/infos/info';
@Injectable({
providedIn: 'root'
@@ -78,4 +80,17 @@ export class CompanyService {
cancelReservation(): Observable {
return this.http.delete(`${this.corlief}/reservation`, this.getHeaders());
}
+
+ getCompanyStep(): Observable {
+ return this.http.get(`${this.corlief}/step`, this.getHeaders());
+ }
+
+ submitInfo(companyInfo: Info): Observable {
+ return this.http.post(
+ `${this.corlief}/info`, {
+ info: companyInfo.info,
+ titles: companyInfo.titles
+ }, this.getHeaders()
+ );
+ }
}
diff --git a/src/app/company/company.ts b/src/app/company/company.ts
new file mode 100644
index 0000000..a6e0a8f
--- /dev/null
+++ b/src/app/company/company.ts
@@ -0,0 +1,3 @@
+export class Step {
+ step: String;
+}
\ No newline at end of file
diff --git a/src/app/company/welcome/welcome.component.css b/src/app/company/welcome/welcome.component.css
index 3e9bd7b..c52c2fe 100644
--- a/src/app/company/welcome/welcome.component.css
+++ b/src/app/company/welcome/welcome.component.css
@@ -48,13 +48,13 @@ b.days {
color: #00254a;
}
-.reservations-link a {
+.step-button-link a {
font-size: 3rem;
color: #00254a;
font-weight: 600;
}
-.reservations-link a:hover {
+.step-button-link a:hover {
text-decoration: none;
color: #4b5763;
}
diff --git a/src/app/company/welcome/welcome.component.html b/src/app/company/welcome/welcome.component.html
index 1f4ba25..325a8f8 100644
--- a/src/app/company/welcome/welcome.component.html
+++ b/src/app/company/welcome/welcome.component.html
@@ -14,7 +14,7 @@
- {{english ? (event.date | dateEn: event.duration) : (event.date | datePt: event.duration) }}
+ {{english ? (event.begin | dateEn: event.duration) : (event.begin | datePt: event.duration) }}
@@ -107,11 +107,17 @@
-
+
+
+
+
+
+
diff --git a/src/app/company/welcome/welcome.component.ts b/src/app/company/welcome/welcome.component.ts
index a25c9ce..6d271ab 100644
--- a/src/app/company/welcome/welcome.component.ts
+++ b/src/app/company/welcome/welcome.component.ts
@@ -30,6 +30,7 @@ export class WelcomeComponent implements OnInit {
private eventSubscription: Subscription;
private page: number;
private english: boolean;
+ private step: String;
ngOnInit() {
@@ -41,11 +42,19 @@ export class WelcomeComponent implements OnInit {
this.event = event;
});
+ this.companyService.getCompanyStep().subscribe(step => {
+ this.step = step.step;
+ });
+
this.translate.onLangChange.subscribe(LangChangeEvent => {
this.english = LangChangeEvent.lang === 'en';
});
}
+ currentStep() {
+ return this.step;
+ }
+
next() {
this.page === 2 ? this.page = 0 : this.page++;
}
diff --git a/src/app/deck/company.ts b/src/app/deck/company.ts
index 9da4d03..9baafc4 100644
--- a/src/app/deck/company.ts
+++ b/src/app/deck/company.ts
@@ -1,12 +1,26 @@
import { Link } from '../admin/links/link/link';
import { Event } from './event';
+export class Item {
+ name: String;
+ description: String;
+ type: String;
+ cost: Number;
+ vat: Number;
+}
+
+export class Package {
+ name: String;
+ items?: [Item];
+}
+
export class Participation {
event: String;
member: String;
status: String;
kind: String;
advertisementLvl: String;
+ partner: Boolean;
static getFromEvent(participations: [Participation], event: Event): Participation {
return Participation.getFromEdition(participations, event.id);
@@ -14,7 +28,7 @@ export class Participation {
static getFromEdition(participations: [Participation], edition: String): Participation {
for (const p of participations) {
- if (p.event === edition) { return p; }
+ if (p.event.toString() === edition) { return p; }
} return null;
}
}
@@ -22,28 +36,28 @@ export class Participation {
export class Company {
id: String;
img: String;
+ description: String;
name?: String;
- participations?: [Participation];
+ participation?: [Participation];
currentParticipation: Participation;
link?: Link;
static filter(company: Company, edition: String) {
- if (company.participations === undefined || !company.participations.length) {
+ if (company.participation === undefined || !company.participation.length) {
return false;
}
if (company.currentParticipation === undefined) {
- company.currentParticipation = Participation.getFromEdition(company.participations, edition);
+ company.currentParticipation = Participation.getFromEdition(company.participation, edition);
}
- if (company.currentParticipation === null || company.currentParticipation.kind === 'Partnership') {
+ if (company.currentParticipation === null || company.currentParticipation.partner) {
return false;
}
- return ['in-conversations', 'closed-deal', 'announced']
- .includes(company.currentParticipation.status as string);
+ return true;
}
static findById(id: String, companies: Company[]) {
diff --git a/src/app/deck/deck.service.ts b/src/app/deck/deck.service.ts
index 2cac3d7..455a55d 100644
--- a/src/app/deck/deck.service.ts
+++ b/src/app/deck/deck.service.ts
@@ -4,17 +4,15 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Observable } from 'rxjs/internal/Observable';
import { ReplaySubject } from 'rxjs/internal/ReplaySubject';
import { Subscription } from 'rxjs/internal/Subscription';
-import { of } from 'rxjs';
import { environment } from 'src/environments/environment';
import { VenuesService } from '../admin/venues/venues.service';
-import { StorageService } from '../storage.service';
-import { Credentials } from '../admin/login/credentials';
import { Event } from './event';
import { Venue } from '../admin/venues/venue/venue';
import { Company } from './company';
+import { LoginService } from '../admin/login/login.service';
@Injectable({
@@ -25,29 +23,21 @@ export class DeckService {
public events: [Event];
public event: Event;
private companies: Company[];
-
- private deck = `${environment.deck}/api`;
- private credentials: Credentials;
-
+ private deck = `${environment.deck}/api/public`;
private eventSubject: ReplaySubject = new ReplaySubject();
private deckCompaniesSubject: ReplaySubject = new ReplaySubject();
-
private venueSubscription: Subscription;
-
private headers: HttpHeaders;
constructor(
private http: HttpClient,
private venues: VenuesService,
- private storage: StorageService
+ private loginService: LoginService
) {
- const credentials = this.storage.getItem('credentials');
- this.credentials = credentials;
-
- this.headers = credentials ? new HttpHeaders({
+ this.headers = new HttpHeaders({
'Content-Type': 'application/json',
- 'Authorization': `${credentials.user} ${credentials.token}`
- }) : undefined;
+ 'Authorization': `Bearer ${this.loginService.getToken()}`
+ });
this.venueSubscription = this.venues.getVenueSubject()
.subscribe(venue => {
@@ -58,20 +48,11 @@ export class DeckService {
});
}
- private deckAuth(): Observable |