Merge from Develop

src/app/app.component.ts

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

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 2a51657e5862bea5690d65bd664c6cb2e92f02f9
+Subproject commit 69bbccd0097df2aec4771c101be3e559e6c3d505

src/app/utils/subscribe/invite/invite-routing.module.ts

@@ -2,13 +2,13 @@ import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 
 import {InviteComponent} from './invite.component';
-import {LoginGuard} from '../../../openaireLibrary/login/loginGuard.guard';
 import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {ConnectAdminLoginGuard} from "../../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: InviteComponent, canActivate: [LoginGuard], canDeactivate: [PreviousRouteRecorder] }
+     	{ path: '', component: InviteComponent, canActivate: [ConnectAdminLoginGuard], canDeactivate: [PreviousRouteRecorder] }
 
     ])
   ]

src/app/utils/subscribe/invite/invite.component.ts

@@ -31,13 +31,11 @@ export class InviteComponent implements OnInit {
   private subs: Subscription[] = [];
   
   constructor(
-    private route: ActivatedRoute,
     private _router: Router,
     private _meta: Meta,
     private helper: HelperService,
     private _title: Title,
     private seoService: SEOService,
-    private _piwikService: PiwikService,
     private userManageService: UserManagementService) {
   }
   
@@ -93,6 +91,5 @@ export class InviteComponent implements OnInit {
   
   close(element) {
     UIkit.dropdown(element).hide();
-    this
   }
 }

src/app/utils/subscribe/invite/invite.module.ts

@@ -1,13 +1,12 @@
-import {NgModule}                   from '@angular/core';
+import {NgModule} from '@angular/core';
 
-import {InviteRoutingModule}        from './invite-routing.module';
-
-import {LoginGuard} from '../../../openaireLibrary/login/loginGuard.guard';
+import {InviteRoutingModule} from './invite-routing.module';
 import {InviteBasicModule} from "./inviteBasic.module";
+import {ConnectAdminLoginGuard} from "../../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
 
 @NgModule({
   imports: [InviteBasicModule, InviteRoutingModule],
-  providers: [LoginGuard]
+  providers: [ConnectAdminLoginGuard]
 })
 
 export class InviteModule { }

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit fe7394ea9ed4319a3234a00b0c8ce09023f50799
+Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6