MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 14 Wiki Activity

Merge remote-tracking branch 'origin/develop' into angular-16

This commit is contained in:
Konstantinos Triantafyllou 2023-10-11 12:56:07 +03:00
parent fba2d9161f cc5d3cbdb3
commit 31f7375e7d
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app.component.ts
View File

@ -88,7 +88,7 @@ import {Meta} from "@angular/platform-browser";
</div> </div>
<div id="joinAndInviteBtn" *ngIf="isClient && communityId && community"> <div id="joinAndInviteBtn" *ngIf="isClient && communityId && community">
<subscribe *ngIf="community.isOpen()" [communityId]="community.communityId"></subscribe> <subscribe *ngIf="community.isOpen()" [communityId]="community.communityId"></subscribe>
<invite *ngIf="isManager && community.isOpen()" [longView]="false"></invite> <invite *ngIf="isManager" [longView]="false" [communityId]="communityId" [isOpen]="community.isOpen()"></invite>
</div> </div>
<!--feedback *ngIf= "isClient && properties" portalName="Connect" [feedbackQuestionaire]=properties.feedbackQuestionaire></feedback--> <!--feedback *ngIf= "isClient && properties" portalName="Connect" [feedbackQuestionaire]=properties.feedbackQuestionaire></feedback-->
<cookie-law *ngIf="isClient" position="bottom"> <cookie-law *ngIf="isClient" position="bottom">

6
src/app/utils/subscribe/invite/invite.component.html
View File

@ -30,8 +30,12 @@
</div> </div>
</div> </div>
<div *ngIf="!longView" class="uk-margin-top"> <div *ngIf="!longView" class="uk-margin-top">
<a id="invite" routerLink="/invite" class="uk-button uk-flex uk-flex-middle uk-flex-center"> <a *ngIf="isOpen" id="invite" routerLink="/invite" class="uk-button uk-flex uk-flex-middle uk-flex-center">
<icon name="person_add" [flex]="true"></icon> <icon name="person_add" [flex]="true"></icon>
<span class="uk-margin-small-left">Invite users</span> <span class="uk-margin-small-left">Invite users</span>
</a> </a>
<a *ngIf="!isOpen" id="invite" [href]="this.adminInviteURL" target="_blank" class="uk-button uk-flex uk-flex-middle uk-flex-center">
<icon name="person_add" [flex]="true"></icon>
<span class="uk-margin-small-left">Invite members</span>
</a>
</div> </div>

9
src/app/utils/subscribe/invite/invite.component.ts
View File

@ -21,6 +21,7 @@ declare var UIkit;
export class InviteComponent implements OnInit { export class InviteComponent implements OnInit {
@Input() longView: boolean = true; @Input() longView: boolean = true;
@Input() communityId = null; @Input() communityId = null;
@Input() isOpen: boolean = true;
public properties: EnvProperties = properties; public properties: EnvProperties = properties;
public pageTitle: string = "Invite"; public pageTitle: string = "Invite";
public user: User; public user: User;
@ -44,9 +45,9 @@ export class InviteComponent implements OnInit {
user => { user => {
this.user = user; this.user = user;
})); }));
this.getPageContents();
this.url = this.properties.domain + this._router.url;
if(this.longView) { if(this.longView) {
this.url = this.properties.domain + this._router.url;
this.getPageContents();
this.seoService.createLinkForCanonicalURL(this.url); this.seoService.createLinkForCanonicalURL(this.url);
this.updateUrl(this.url); this.updateUrl(this.url);
this.updateTitle(this.pageTitle); this.updateTitle(this.pageTitle);
@ -89,6 +90,10 @@ export class InviteComponent implements OnInit {
this._meta.updateTag({content: url}, "property='og:url'"); this._meta.updateTag({content: url}, "property='og:url'");
} }
get adminInviteURL() {
return this.properties.adminPortalURL + '/' + this.communityId + '/users/member';
}
close(element) { close(element) {
UIkit.dropdown(element).hide(); UIkit.dropdown(element).hide();
} }

2
src/assets/community.less
View File

@ -20,7 +20,7 @@
#joinAndInviteBtn #join, #joinAndInviteBtn #join,
#joinAndInviteBtn #member, #joinAndInviteBtn #member,
#joinAndInviteBtn #invite { #joinAndInviteBtn #invite {
width: 140px; width: 160px;
line-height: 60px; line-height: 60px;
height: 60px; height: 60px;
padding: 0 20px; padding: 0 20px;