diff --git a/package.json b/package.json index 74f7e00..23d1e41 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "webpack:server": "webpack --config webpack.server.config.js --progress --colors", "serve:prerender": "cd dist/browser && http-server", "serve:ssr": "node dist/server", - "after-build-clean": "rm -rf src node_modules .idea/ installOpenaireLib.sh deploy dist/browser/assets/common-assets/.svn/ dist/browser/stats.json ; " + "after-build-clean": "rm -rf src node_modules .idea/ installOpenaireLib.sh deploy dist/browser/assets/common-assets/.svn/ dist/browser/stats.json ; " }, "private": true, "dependencies": { @@ -62,7 +62,7 @@ "wikidata-sdk": "^5.2.9", "zone.js": "^0.8.26", "ng-recaptcha": "^3.0.5", - "ng2-ckeditor": "1.1.9" + "ckeditor4-angular": "^1.2.2" }, "devDependencies": { "@angular-devkit/build-angular": "~0.13.0", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index bf8cfda..c536ab6 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -17,6 +17,7 @@ const routes: Routes = [ { path: 'about/faq', loadChildren: './learn-how/faqs/faqs.module#FaqsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'contact-us', loadChildren: './contact/contact.module#ContactModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'invite', loadChildren: './utils/subscribe/invite/invite.module#InviteModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'verify/:id', loadChildren: './verification-manager/verification-manager.module#VerificationManagerModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'content', loadChildren: './content/contentPage.module#ContentPageModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'organizations', loadChildren: './htmlPages/organizations/organizationsPage.module#OrganizationsPageModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'publications', loadChildren: './htmlPages/publications/publications-page.module#PublicationsPageModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, diff --git a/src/app/utils/subscribe/invite/inviteBasic.module.ts b/src/app/utils/subscribe/invite/inviteBasic.module.ts index 77104e8..b43adb3 100644 --- a/src/app/utils/subscribe/invite/inviteBasic.module.ts +++ b/src/app/utils/subscribe/invite/inviteBasic.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; -import {CKEditorModule} from 'ng2-ckeditor'; +import {CKEditorModule} from 'ckeditor4-angular'; import {InviteComponent} from './invite.component'; diff --git a/src/app/verification-manager/verification-manager-routing.module.ts b/src/app/verification-manager/verification-manager-routing.module.ts index b04bf8b..e415b27 100644 --- a/src/app/verification-manager/verification-manager-routing.module.ts +++ b/src/app/verification-manager/verification-manager-routing.module.ts @@ -1,13 +1,13 @@ -import { NgModule} from '@angular/core'; -import { RouterModule } from '@angular/router'; -import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {VerificationComponent} from "../openaireLibrary/verification/verification.component"; +import {VerificationGuard} from "../openaireLibrary/login/verification.guard"; +import {VerificationManagerComponent} from "./verification-manager.component"; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: VerificationComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder]} + { path: '', component: VerificationManagerComponent, canActivate: [VerificationGuard], canDeactivate: [PreviousRouteRecorder]} ]) ] }) diff --git a/src/app/verification-manager/verification-manager.component.ts b/src/app/verification-manager/verification-manager.component.ts index 871a941..d349659 100644 --- a/src/app/verification-manager/verification-manager.component.ts +++ b/src/app/verification-manager/verification-manager.component.ts @@ -1,9 +1,59 @@ -import {Component} from "@angular/core"; +import {Component, OnDestroy, OnInit} from "@angular/core"; +import {UserRegistryService} from "../openaireLibrary/services/user-registry.service"; +import {ActivatedRoute} from "@angular/router"; +import {Subscription} from "rxjs"; +import {CommunityService} from "../openaireLibrary/connect/community/community.service"; +import {properties} from "../../environments/environment"; @Component({ selector: 'verification-manager', - template: `