diff --git a/portal-4cli-lib/.angular-cli.json b/explore/.angular-cli.json similarity index 100% rename from portal-4cli-lib/.angular-cli.json rename to explore/.angular-cli.json diff --git a/portal-4cli-lib/README.md b/explore/README.md similarity index 100% rename from portal-4cli-lib/README.md rename to explore/README.md diff --git a/portal-4cli-lib/deploy/beta-properties.json b/explore/deploy/beta-properties.json similarity index 100% rename from portal-4cli-lib/deploy/beta-properties.json rename to explore/deploy/beta-properties.json diff --git a/portal-4cli-lib/deploy/prepareBuild.sh b/explore/deploy/prepareBuild.sh similarity index 100% rename from portal-4cli-lib/deploy/prepareBuild.sh rename to explore/deploy/prepareBuild.sh diff --git a/portal-4cli-lib/deploy/prepareDeploy.sh b/explore/deploy/prepareDeploy.sh similarity index 100% rename from portal-4cli-lib/deploy/prepareDeploy.sh rename to explore/deploy/prepareDeploy.sh diff --git a/portal-4cli-lib/deploy/production-properties.json b/explore/deploy/production-properties.json similarity index 100% rename from portal-4cli-lib/deploy/production-properties.json rename to explore/deploy/production-properties.json diff --git a/portal-4cli-lib/deploy/test-properties.json b/explore/deploy/test-properties.json similarity index 100% rename from portal-4cli-lib/deploy/test-properties.json rename to explore/deploy/test-properties.json diff --git a/portal-4cli-lib/installOpenaireLib.sh b/explore/installOpenaireLib.sh similarity index 100% rename from portal-4cli-lib/installOpenaireLib.sh rename to explore/installOpenaireLib.sh diff --git a/portal-4cli-lib/package.json b/explore/package.json similarity index 100% rename from portal-4cli-lib/package.json rename to explore/package.json diff --git a/portal-4cli-lib/prerender.ts b/explore/prerender.ts similarity index 100% rename from portal-4cli-lib/prerender.ts rename to explore/prerender.ts diff --git a/portal-4cli-lib/server.ts b/explore/server.ts similarity index 100% rename from portal-4cli-lib/server.ts rename to explore/server.ts diff --git a/portal-4cli-lib/src/app/app-routing.module.ts b/explore/src/app/app-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/app-routing.module.ts rename to explore/src/app/app-routing.module.ts diff --git a/portal-4cli-lib/src/app/app.component.ts b/explore/src/app/app.component.ts similarity index 100% rename from portal-4cli-lib/src/app/app.component.ts rename to explore/src/app/app.component.ts diff --git a/portal-4cli-lib/src/app/app.module.ts b/explore/src/app/app.module.ts similarity index 100% rename from portal-4cli-lib/src/app/app.module.ts rename to explore/src/app/app.module.ts diff --git a/portal-4cli-lib/src/app/app.server.module.ts b/explore/src/app/app.server.module.ts similarity index 100% rename from portal-4cli-lib/src/app/app.server.module.ts rename to explore/src/app/app.server.module.ts diff --git a/portal-4cli-lib/src/app/claims/claim.module.ts b/explore/src/app/claims/claim.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/claim.module.ts rename to explore/src/app/claims/claim.module.ts diff --git a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts b/explore/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts rename to explore/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts diff --git a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.component.ts b/explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.component.ts rename to explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts diff --git a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.module.ts b/explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin.module.ts rename to explore/src/app/claims/claimsAdmin/claimsAdmin.module.ts diff --git a/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts b/explore/src/app/claims/claimsByToken/claimsByToken-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts rename to explore/src/app/claims/claimsByToken/claimsByToken-routing.module.ts diff --git a/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken.component.ts b/explore/src/app/claims/claimsByToken/claimsByToken.component.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken.component.ts rename to explore/src/app/claims/claimsByToken/claimsByToken.component.ts diff --git a/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken.module.ts b/explore/src/app/claims/claimsByToken/claimsByToken.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken.module.ts rename to explore/src/app/claims/claimsByToken/claimsByToken.module.ts diff --git a/portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts b/explore/src/app/claims/directLinking/directLinking-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts rename to explore/src/app/claims/directLinking/directLinking-routing.module.ts diff --git a/portal-4cli-lib/src/app/claims/directLinking/directLinking.component.ts b/explore/src/app/claims/directLinking/directLinking.component.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/directLinking/directLinking.component.ts rename to explore/src/app/claims/directLinking/directLinking.component.ts diff --git a/portal-4cli-lib/src/app/claims/directLinking/directLinking.module.ts b/explore/src/app/claims/directLinking/directLinking.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/directLinking/directLinking.module.ts rename to explore/src/app/claims/directLinking/directLinking.module.ts diff --git a/portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts b/explore/src/app/claims/linking/linking-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts rename to explore/src/app/claims/linking/linking-routing.module.ts diff --git a/portal-4cli-lib/src/app/claims/linking/linkingGeneric.component.ts b/explore/src/app/claims/linking/linkingGeneric.component.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/linking/linkingGeneric.component.ts rename to explore/src/app/claims/linking/linkingGeneric.component.ts diff --git a/portal-4cli-lib/src/app/claims/linking/linkingGeneric.module.ts b/explore/src/app/claims/linking/linkingGeneric.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/linking/linkingGeneric.module.ts rename to explore/src/app/claims/linking/linkingGeneric.module.ts diff --git a/portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts b/explore/src/app/claims/myClaims/myClaims-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts rename to explore/src/app/claims/myClaims/myClaims-routing.module.ts diff --git a/portal-4cli-lib/src/app/claims/myClaims/myClaims.component.ts b/explore/src/app/claims/myClaims/myClaims.component.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/myClaims/myClaims.component.ts rename to explore/src/app/claims/myClaims/myClaims.component.ts diff --git a/portal-4cli-lib/src/app/claims/myClaims/myClaims.module.ts b/explore/src/app/claims/myClaims/myClaims.module.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/myClaims/myClaims.module.ts rename to explore/src/app/claims/myClaims/myClaims.module.ts diff --git a/portal-4cli-lib/src/app/claims/myClaimsDemo.component.ts b/explore/src/app/claims/myClaimsDemo.component.ts similarity index 100% rename from portal-4cli-lib/src/app/claims/myClaimsDemo.component.ts rename to explore/src/app/claims/myClaimsDemo.component.ts diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositBySubject.component.ts b/explore/src/app/deposit/datasets/depositBySubject.component.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/datasets/depositBySubject.component.ts rename to explore/src/app/deposit/datasets/depositBySubject.component.ts diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts b/explore/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts rename to explore/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult.component.ts b/explore/src/app/deposit/datasets/depositBySubjectResult.component.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult.component.ts rename to explore/src/app/deposit/datasets/depositBySubjectResult.component.ts diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResults.module.ts b/explore/src/app/deposit/datasets/depositBySubjectResults.module.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResults.module.ts rename to explore/src/app/deposit/datasets/depositBySubjectResults.module.ts diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts b/explore/src/app/deposit/datasets/depositDatasets-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts rename to explore/src/app/deposit/datasets/depositDatasets-routing.module.ts diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasets.component.ts b/explore/src/app/deposit/datasets/depositDatasets.component.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/datasets/depositDatasets.component.ts rename to explore/src/app/deposit/datasets/depositDatasets.component.ts diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasets.module.ts b/explore/src/app/deposit/datasets/depositDatasets.module.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/datasets/depositDatasets.module.ts rename to explore/src/app/deposit/datasets/depositDatasets.module.ts diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResult.component.ts b/explore/src/app/deposit/datasets/depositDatasetsResult.component.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResult.component.ts rename to explore/src/app/deposit/datasets/depositDatasetsResult.component.ts diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts b/explore/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts rename to explore/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults.module.ts b/explore/src/app/deposit/datasets/depositDatasetsResults.module.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults.module.ts rename to explore/src/app/deposit/datasets/depositDatasetsResults.module.ts diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts b/explore/src/app/deposit/publications/depositPublications-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts rename to explore/src/app/deposit/publications/depositPublications-routing.module.ts diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublications.component.ts b/explore/src/app/deposit/publications/depositPublications.component.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/publications/depositPublications.component.ts rename to explore/src/app/deposit/publications/depositPublications.component.ts diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublications.module.ts b/explore/src/app/deposit/publications/depositPublications.module.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/publications/depositPublications.module.ts rename to explore/src/app/deposit/publications/depositPublications.module.ts diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts b/explore/src/app/deposit/publications/depositPublicationsResult-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts rename to explore/src/app/deposit/publications/depositPublicationsResult-routing.module.ts diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult.component.ts b/explore/src/app/deposit/publications/depositPublicationsResult.component.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult.component.ts rename to explore/src/app/deposit/publications/depositPublicationsResult.component.ts diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResults.module.ts b/explore/src/app/deposit/publications/depositPublicationsResults.module.ts similarity index 100% rename from portal-4cli-lib/src/app/deposit/publications/depositPublicationsResults.module.ts rename to explore/src/app/deposit/publications/depositPublicationsResults.module.ts diff --git a/portal-4cli-lib/src/app/error/errorPage.component.ts b/explore/src/app/error/errorPage.component.ts similarity index 100% rename from portal-4cli-lib/src/app/error/errorPage.component.ts rename to explore/src/app/error/errorPage.component.ts diff --git a/portal-4cli-lib/src/app/home/home-routing.module.ts b/explore/src/app/home/home-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/home/home-routing.module.ts rename to explore/src/app/home/home-routing.module.ts diff --git a/portal-4cli-lib/src/app/home/home.component.html b/explore/src/app/home/home.component.html similarity index 100% rename from portal-4cli-lib/src/app/home/home.component.html rename to explore/src/app/home/home.component.html diff --git a/portal-4cli-lib/src/app/home/home.component.ts b/explore/src/app/home/home.component.ts similarity index 100% rename from portal-4cli-lib/src/app/home/home.component.ts rename to explore/src/app/home/home.component.ts diff --git a/portal-4cli-lib/src/app/home/home.module.ts b/explore/src/app/home/home.module.ts similarity index 100% rename from portal-4cli-lib/src/app/home/home.module.ts rename to explore/src/app/home/home.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts rename to explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider.component.ts b/explore/src/app/landingPages/dataProvider/dataProvider.component.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider.component.ts rename to explore/src/app/landingPages/dataProvider/dataProvider.component.ts diff --git a/portal-4cli-lib/src/app/landingPages/dataProvider/libDataProvider.module.ts b/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/dataProvider/libDataProvider.module.ts rename to explore/src/app/landingPages/dataProvider/libDataProvider.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts b/explore/src/app/landingPages/dataset/dataset-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts rename to explore/src/app/landingPages/dataset/dataset-routing.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/dataset/dataset.component.ts b/explore/src/app/landingPages/dataset/dataset.component.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/dataset/dataset.component.ts rename to explore/src/app/landingPages/dataset/dataset.component.ts diff --git a/portal-4cli-lib/src/app/landingPages/dataset/libDataset.module.ts b/explore/src/app/landingPages/dataset/libDataset.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/dataset/libDataset.module.ts rename to explore/src/app/landingPages/dataset/libDataset.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts b/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts rename to explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/explore/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts rename to explore/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts diff --git a/portal-4cli-lib/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts b/explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts rename to explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/organization/libOrganization.module.ts b/explore/src/app/landingPages/organization/libOrganization.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/organization/libOrganization.module.ts rename to explore/src/app/landingPages/organization/libOrganization.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts b/explore/src/app/landingPages/organization/organization-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts rename to explore/src/app/landingPages/organization/organization-routing.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/organization/organization.component.ts b/explore/src/app/landingPages/organization/organization.component.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/organization/organization.component.ts rename to explore/src/app/landingPages/organization/organization.component.ts diff --git a/portal-4cli-lib/src/app/landingPages/orp/libOrp.module.ts b/explore/src/app/landingPages/orp/libOrp.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/orp/libOrp.module.ts rename to explore/src/app/landingPages/orp/libOrp.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/orp/orp-routing.module.ts b/explore/src/app/landingPages/orp/orp-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/orp/orp-routing.module.ts rename to explore/src/app/landingPages/orp/orp-routing.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/orp/orp.component.ts b/explore/src/app/landingPages/orp/orp.component.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/orp/orp.component.ts rename to explore/src/app/landingPages/orp/orp.component.ts diff --git a/portal-4cli-lib/src/app/landingPages/project/libProject.module.ts b/explore/src/app/landingPages/project/libProject.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/project/libProject.module.ts rename to explore/src/app/landingPages/project/libProject.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts b/explore/src/app/landingPages/project/project-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts rename to explore/src/app/landingPages/project/project-routing.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/project/project.component.ts b/explore/src/app/landingPages/project/project.component.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/project/project.component.ts rename to explore/src/app/landingPages/project/project.component.ts diff --git a/portal-4cli-lib/src/app/landingPages/publication/libPublication.module.ts b/explore/src/app/landingPages/publication/libPublication.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/publication/libPublication.module.ts rename to explore/src/app/landingPages/publication/libPublication.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts b/explore/src/app/landingPages/publication/publication-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts rename to explore/src/app/landingPages/publication/publication-routing.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/publication/publication.component.ts b/explore/src/app/landingPages/publication/publication.component.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/publication/publication.component.ts rename to explore/src/app/landingPages/publication/publication.component.ts diff --git a/portal-4cli-lib/src/app/landingPages/software/libSoftware.module.ts b/explore/src/app/landingPages/software/libSoftware.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/software/libSoftware.module.ts rename to explore/src/app/landingPages/software/libSoftware.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/software/software-routing.module.ts b/explore/src/app/landingPages/software/software-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/software/software-routing.module.ts rename to explore/src/app/landingPages/software/software-routing.module.ts diff --git a/portal-4cli-lib/src/app/landingPages/software/software.component.ts b/explore/src/app/landingPages/software/software.component.ts similarity index 100% rename from portal-4cli-lib/src/app/landingPages/software/software.component.ts rename to explore/src/app/landingPages/software/software.component.ts diff --git a/portal-4cli-lib/src/app/login/libUser.module.ts b/explore/src/app/login/libUser.module.ts similarity index 100% rename from portal-4cli-lib/src/app/login/libUser.module.ts rename to explore/src/app/login/libUser.module.ts diff --git a/portal-4cli-lib/src/app/login/user-routing.module.ts b/explore/src/app/login/user-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/login/user-routing.module.ts rename to explore/src/app/login/user-routing.module.ts diff --git a/portal-4cli-lib/src/app/login/user.component.ts b/explore/src/app/login/user.component.ts similarity index 100% rename from portal-4cli-lib/src/app/login/user.component.ts rename to explore/src/app/login/user.component.ts diff --git a/portal-4cli-lib/src/app/reload/libReload.module.ts b/explore/src/app/reload/libReload.module.ts similarity index 100% rename from portal-4cli-lib/src/app/reload/libReload.module.ts rename to explore/src/app/reload/libReload.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts rename to explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets.component.ts b/explore/src/app/searchPages/advanced/advancedSearchDatasets.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets.component.ts rename to explore/src/app/searchPages/advanced/advancedSearchDatasets.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts rename to explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrps.component.ts b/explore/src/app/searchPages/advanced/advancedSearchOrps.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrps.component.ts rename to explore/src/app/searchPages/advanced/advancedSearchOrps.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrps.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrps.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects.component.ts rename to explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects.module.ts b/explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications.component.ts b/explore/src/app/searchPages/advanced/advancedSearchPublications.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications.component.ts rename to explore/src/app/searchPages/advanced/advancedSearchPublications.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications.module.ts b/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts b/explore/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware.component.ts b/explore/src/app/searchPages/advanced/advancedSearchSoftware.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware.component.ts rename to explore/src/app/searchPages/advanced/advancedSearchSoftware.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware.module.ts b/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/advanced/advancedSearchSoftware.module.ts rename to explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts rename to explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts rename to explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts rename to explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts rename to explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts rename to explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts b/explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts rename to explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts rename to explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries.component.ts b/explore/src/app/searchPages/dataProviders/entityRegistries.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries.component.ts rename to explore/src/app/searchPages/dataProviders/entityRegistries.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistries.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries.module.ts rename to explore/src/app/searchPages/dataProviders/entityRegistries.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts rename to explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts b/explore/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts rename to explore/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts b/explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts rename to explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts b/explore/src/app/searchPages/dataProviders/journals-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts rename to explore/src/app/searchPages/dataProviders/journals-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journals.component.ts b/explore/src/app/searchPages/dataProviders/journals.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/journals.component.ts rename to explore/src/app/searchPages/dataProviders/journals.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journals.module.ts b/explore/src/app/searchPages/dataProviders/journals.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/journals.module.ts rename to explore/src/app/searchPages/dataProviders/journals.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts b/explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts rename to explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.component.ts b/explore/src/app/searchPages/dataProviders/journalsTable.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.component.ts rename to explore/src/app/searchPages/dataProviders/journalsTable.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.module.ts b/explore/src/app/searchPages/dataProviders/journalsTable.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable.module.ts rename to explore/src/app/searchPages/dataProviders/journalsTable.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/find/libSearch.module.ts b/explore/src/app/searchPages/find/libSearch.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/find/libSearch.module.ts rename to explore/src/app/searchPages/find/libSearch.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/find/mainSearch-routing.module.ts b/explore/src/app/searchPages/find/mainSearch-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/find/mainSearch-routing.module.ts rename to explore/src/app/searchPages/find/mainSearch-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/find/search.component.ts b/explore/src/app/searchPages/find/search.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/find/search.component.ts rename to explore/src/app/searchPages/find/search.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts rename to explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders.module.ts b/explore/src/app/searchPages/simple/searchDataProviders.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchDataProviders.module.ts rename to explore/src/app/searchPages/simple/searchDataProviders.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchDataproviders.component.ts b/explore/src/app/searchPages/simple/searchDataproviders.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchDataproviders.component.ts rename to explore/src/app/searchPages/simple/searchDataproviders.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts b/explore/src/app/searchPages/simple/searchDatasets-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts rename to explore/src/app/searchPages/simple/searchDatasets-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchDatasets.component.ts b/explore/src/app/searchPages/simple/searchDatasets.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchDatasets.component.ts rename to explore/src/app/searchPages/simple/searchDatasets.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchDatasets.module.ts b/explore/src/app/searchPages/simple/searchDatasets.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchDatasets.module.ts rename to explore/src/app/searchPages/simple/searchDatasets.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts rename to explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations.component.ts b/explore/src/app/searchPages/simple/searchOrganizations.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchOrganizations.component.ts rename to explore/src/app/searchPages/simple/searchOrganizations.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations.module.ts b/explore/src/app/searchPages/simple/searchOrganizations.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchOrganizations.module.ts rename to explore/src/app/searchPages/simple/searchOrganizations.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchOrps-routing.module.ts b/explore/src/app/searchPages/simple/searchOrps-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchOrps-routing.module.ts rename to explore/src/app/searchPages/simple/searchOrps-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchOrps.component.ts b/explore/src/app/searchPages/simple/searchOrps.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchOrps.component.ts rename to explore/src/app/searchPages/simple/searchOrps.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchOrps.module.ts b/explore/src/app/searchPages/simple/searchOrps.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchOrps.module.ts rename to explore/src/app/searchPages/simple/searchOrps.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts b/explore/src/app/searchPages/simple/searchProjects-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts rename to explore/src/app/searchPages/simple/searchProjects-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchProjects.component.ts b/explore/src/app/searchPages/simple/searchProjects.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchProjects.component.ts rename to explore/src/app/searchPages/simple/searchProjects.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchProjects.module.ts b/explore/src/app/searchPages/simple/searchProjects.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchProjects.module.ts rename to explore/src/app/searchPages/simple/searchProjects.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts b/explore/src/app/searchPages/simple/searchPublications-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts rename to explore/src/app/searchPages/simple/searchPublications-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchPublications.component.ts b/explore/src/app/searchPages/simple/searchPublications.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchPublications.component.ts rename to explore/src/app/searchPages/simple/searchPublications.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchPublications.module.ts b/explore/src/app/searchPages/simple/searchPublications.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchPublications.module.ts rename to explore/src/app/searchPages/simple/searchPublications.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchSoftware-routing.module.ts b/explore/src/app/searchPages/simple/searchSoftware-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchSoftware-routing.module.ts rename to explore/src/app/searchPages/simple/searchSoftware-routing.module.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchSoftware.component.ts b/explore/src/app/searchPages/simple/searchSoftware.component.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchSoftware.component.ts rename to explore/src/app/searchPages/simple/searchSoftware.component.ts diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchSoftware.module.ts b/explore/src/app/searchPages/simple/searchSoftware.module.ts similarity index 100% rename from portal-4cli-lib/src/app/searchPages/simple/searchSoftware.module.ts rename to explore/src/app/searchPages/simple/searchSoftware.module.ts diff --git a/portal-4cli-lib/src/app/shared/shared.module.ts b/explore/src/app/shared/shared.module.ts similarity index 100% rename from portal-4cli-lib/src/app/shared/shared.module.ts rename to explore/src/app/shared/shared.module.ts diff --git a/portal-4cli-lib/src/app/userEmailPreferences/mailPrefs-routing.module.ts b/explore/src/app/userEmailPreferences/mailPrefs-routing.module.ts similarity index 100% rename from portal-4cli-lib/src/app/userEmailPreferences/mailPrefs-routing.module.ts rename to explore/src/app/userEmailPreferences/mailPrefs-routing.module.ts diff --git a/portal-4cli-lib/src/app/userEmailPreferences/mailPrefs.component.ts b/explore/src/app/userEmailPreferences/mailPrefs.component.ts similarity index 100% rename from portal-4cli-lib/src/app/userEmailPreferences/mailPrefs.component.ts rename to explore/src/app/userEmailPreferences/mailPrefs.component.ts diff --git a/portal-4cli-lib/src/app/userEmailPreferences/mailPrefs.module.ts b/explore/src/app/userEmailPreferences/mailPrefs.module.ts similarity index 100% rename from portal-4cli-lib/src/app/userEmailPreferences/mailPrefs.module.ts rename to explore/src/app/userEmailPreferences/mailPrefs.module.ts diff --git a/portal-4cli-lib/src/assets/ask-explore.svg b/explore/src/assets/ask-explore.svg similarity index 100% rename from portal-4cli-lib/src/assets/ask-explore.svg rename to explore/src/assets/ask-explore.svg diff --git a/portal-4cli-lib/src/assets/env-properties.json b/explore/src/assets/env-properties.json similarity index 100% rename from portal-4cli-lib/src/assets/env-properties.json rename to explore/src/assets/env-properties.json diff --git a/portal-4cli-lib/src/assets/explore-custom.css b/explore/src/assets/explore-custom.css similarity index 100% rename from portal-4cli-lib/src/assets/explore-custom.css rename to explore/src/assets/explore-custom.css diff --git a/portal-4cli-lib/src/assets/explore.svg b/explore/src/assets/explore.svg similarity index 100% rename from portal-4cli-lib/src/assets/explore.svg rename to explore/src/assets/explore.svg diff --git a/portal-4cli-lib/src/assets/home.jpg b/explore/src/assets/home.jpg similarity index 100% rename from portal-4cli-lib/src/assets/home.jpg rename to explore/src/assets/home.jpg diff --git a/portal-4cli-lib/src/assets/link.svg b/explore/src/assets/link.svg similarity index 100% rename from portal-4cli-lib/src/assets/link.svg rename to explore/src/assets/link.svg diff --git a/portal-4cli-lib/src/assets/lock.svg b/explore/src/assets/lock.svg similarity index 100% rename from portal-4cli-lib/src/assets/lock.svg rename to explore/src/assets/lock.svg diff --git a/portal-4cli-lib/src/assets/logo-large-explore.png b/explore/src/assets/logo-large-explore.png similarity index 100% rename from portal-4cli-lib/src/assets/logo-large-explore.png rename to explore/src/assets/logo-large-explore.png diff --git a/portal-4cli-lib/src/assets/logo-small-explore.png b/explore/src/assets/logo-small-explore.png similarity index 100% rename from portal-4cli-lib/src/assets/logo-small-explore.png rename to explore/src/assets/logo-small-explore.png diff --git a/portal-4cli-lib/src/assets/share.svg b/explore/src/assets/share.svg similarity index 100% rename from portal-4cli-lib/src/assets/share.svg rename to explore/src/assets/share.svg diff --git a/portal-4cli-lib/src/assets/sitemap.xml b/explore/src/assets/sitemap.xml similarity index 100% rename from portal-4cli-lib/src/assets/sitemap.xml rename to explore/src/assets/sitemap.xml diff --git a/portal-4cli-lib/src/assets/sky_bw3.png b/explore/src/assets/sky_bw3.png similarity index 100% rename from portal-4cli-lib/src/assets/sky_bw3.png rename to explore/src/assets/sky_bw3.png diff --git a/portal-4cli-lib/src/assets/Εxplore-sub.jpg b/explore/src/assets/Εxplore-sub.jpg similarity index 100% rename from portal-4cli-lib/src/assets/Εxplore-sub.jpg rename to explore/src/assets/Εxplore-sub.jpg diff --git a/portal-4cli-lib/src/environments/environment.prod.ts b/explore/src/environments/environment.prod.ts similarity index 100% rename from portal-4cli-lib/src/environments/environment.prod.ts rename to explore/src/environments/environment.prod.ts diff --git a/portal-4cli-lib/src/environments/environment.ts b/explore/src/environments/environment.ts similarity index 100% rename from portal-4cli-lib/src/environments/environment.ts rename to explore/src/environments/environment.ts diff --git a/portal-4cli-lib/src/index.html b/explore/src/index.html similarity index 100% rename from portal-4cli-lib/src/index.html rename to explore/src/index.html diff --git a/portal-4cli-lib/src/main.server.ts b/explore/src/main.server.ts similarity index 100% rename from portal-4cli-lib/src/main.server.ts rename to explore/src/main.server.ts diff --git a/portal-4cli-lib/src/main.ts b/explore/src/main.ts similarity index 100% rename from portal-4cli-lib/src/main.ts rename to explore/src/main.ts diff --git a/portal-4cli-lib/src/polyfills.ts b/explore/src/polyfills.ts similarity index 100% rename from portal-4cli-lib/src/polyfills.ts rename to explore/src/polyfills.ts diff --git a/portal-4cli-lib/src/robots.txt b/explore/src/robots.txt similarity index 100% rename from portal-4cli-lib/src/robots.txt rename to explore/src/robots.txt diff --git a/portal-4cli-lib/src/sitemaps/sitemap.xml b/explore/src/sitemaps/sitemap.xml similarity index 100% rename from portal-4cli-lib/src/sitemaps/sitemap.xml rename to explore/src/sitemaps/sitemap.xml diff --git a/portal-4cli-lib/src/styles.css b/explore/src/styles.css similarity index 100% rename from portal-4cli-lib/src/styles.css rename to explore/src/styles.css diff --git a/portal-4cli-lib/src/tsconfig.app.json b/explore/src/tsconfig.app.json similarity index 100% rename from portal-4cli-lib/src/tsconfig.app.json rename to explore/src/tsconfig.app.json diff --git a/portal-4cli-lib/src/tsconfig.server.json b/explore/src/tsconfig.server.json similarity index 100% rename from portal-4cli-lib/src/tsconfig.server.json rename to explore/src/tsconfig.server.json diff --git a/portal-4cli-lib/static.paths.ts b/explore/static.paths.ts similarity index 100% rename from portal-4cli-lib/static.paths.ts rename to explore/static.paths.ts diff --git a/portal-4cli-lib/tsconfig.json b/explore/tsconfig.json similarity index 100% rename from portal-4cli-lib/tsconfig.json rename to explore/tsconfig.json diff --git a/portal-4cli-lib/webpack.server.config.js b/explore/webpack.server.config.js similarity index 100% rename from portal-4cli-lib/webpack.server.config.js rename to explore/webpack.server.config.js diff --git a/production-portal/.angular-cli.json b/production-portal/.angular-cli.json deleted file mode 100644 index 75d5696b..00000000 --- a/production-portal/.angular-cli.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "project": { - "name": "ng-universal-demo" - }, - "apps": [ - { - "root": "src", - "outDir": "dist/browser", - "assets": [ - "assets", - "robots.txt", - {"glob": "sitemap.xml", "input": "./sitemaps", "output": "./"}, - {"glob": "sitemap.xml", "input": "./sitemaps", "output": "./assets"}, - { "glob": "**/*", "input": "./sitemaps/publication", "output": "./" }, - { "glob": "**/*", "input": "./sitemaps/dataset", "output": "./" }, - { "glob": "**/*", "input": "./sitemaps/software", "output": "./" }, - { "glob": "**/*", "input": "./sitemaps/other", "output": "./" }, - { "glob": "**/*", "input": "./sitemaps/project", "output": "./" }, - { "glob": "**/*", "input": "./sitemaps/organization", "output": "./" }, - { "glob": "**/*", "input": "./sitemaps/dataprovider", "output": "./" } - ], - "index": "index.html", - "main": "main.ts", - "polyfills": "polyfills.ts", - "test": "test.ts", - "tsconfig": "tsconfig.app.json", - "testTsconfig": "tsconfig.spec.json", - "prefix": "app", - "styles": [ - "styles.css", - "../node_modules/datatables.net-dt/css/jquery.dataTables.css" - ], - "scripts": [ - "../node_modules/jquery/dist/jquery.js", - "../node_modules/datatables.net/js/jquery.dataTables.js" - ], - "environmentSource": "environments/environment.ts", - "environments": { - "dev": "environments/environment.ts", - "prod": "environments/environment.prod.ts" - } - }, - { - "platform": "server", - "root": "src", - "outDir": "dist/server", - "assets": [ - "assets", - "robots.txt", - {"glob": "sitemap.xml", "input": "./sitemaps", "output": "./"}, - {"glob": "sitemap.xml", "input": "./sitemaps", "output": "./assets"}, - { "glob": "**/*", "input": "./sitemaps/publication", "output": "./" } - ], - "index": "index.html", - "main": "main.server.ts", - "test": "test.ts", - "tsconfig": "tsconfig.server.json", - "testTsconfig": "tsconfig.spec.json", - "prefix": "app", - "styles": [ - "styles.css" - ], - "scripts": [], - "environmentSource": "environments/environment.ts", - "environments": { - "dev": "environments/environment.ts", - "prod": "environments/environment.prod.ts" - } - } - ], - "e2e": { - "protractor": { - "config": "./protractor.conf.js" - } - }, - "lint": [ - { - "project": "src/tsconfig.app.json", - "exclude": "**/node_modules/**" - }, - { - "project": "src/tsconfig.spec.json", - "exclude": "**/node_modules/**" - }, - { - "project": "e2e/tsconfig.e2e.json", - "exclude": "**/node_modules/**" - } - ], - "test": { - "karma": { - "config": "./karma.conf.js" - } - }, - "defaults": { - "styleExt": "css", - "component": { - "spec": false, - "inlineStyle": true, - "inlineTemplate": true - }, - "directive": { - "spec": false - }, - "class": { - "spec": false - }, - "guard": { - "spec": false - }, - "module": { - "spec": false - }, - "pipe": { - "spec": false - }, - "service": { - "spec": false - } - } - } diff --git a/production-portal/README.md b/production-portal/README.md deleted file mode 100644 index 96e55e90..00000000 --- a/production-portal/README.md +++ /dev/null @@ -1,54 +0,0 @@ -# Angular Universal & Anguar-CLI minimal starter - -> This demo is built following the [Angular-CLI Wiki guide](https://github.com/angular/angular-cli/wiki/stories-universal-rendering) - -We're utilizing packages from the [Angular Universal @nguniversal](https://github.com/angular/universal) repo, such as [ng-module-map-ngfactory-loader](https://github.com/angular/universal/tree/master/modules/module-map-ngfactory-loader) to enable Lazy Loading. - ---- - -## Static or Dynamic -This repo demonstrates the use of 2 different forms of Server Side Rendering. - -**Static** Also known as "prerendering" -* Happens at build time -* Renders your application and replaces the dist index.html with a version rendered at the route `/`. - -**Dynamic** -* Happens at runtime -* Uses `ngExpressEngine` to render you application on the fly at the requested url. - ---- - -## Installation -* `npm install` or `yarn` - ---- - -## Development (Client-side only rendering) -* run `npm run start` which will start `ng serve` (project served at the standard: localhost:4200) - ---- - -## Production - -Depending on whether you're publishing dynamic or static prerendering, run the build command, and then serve up your dist folder assets. - -> **NOTE**: To deploy your **Static** site to a static hosting platform you will have to deploy the *`dist/browser`* folder, rather than the usual *`dist`* - -ie: `npm run build:dynamic` or `npm run build:static`. All of the files that need to be served will be found within the `/dist` folder. - - - ---- - -## Testing Universal (dynamic or static) builds -Locally- - -**Dynamic** : **`npm run start:dynamic`** - -Compiles your application and spins up a Node Express to dynamically serve your Universal application on `http://localhost:4000`. - -**Static** : **`npm run start:static`** - -- Compiles your application and prerenders your applications files, spinning up a demo http-server so you can view it on `http://127.0.0.1:8080` - - diff --git a/production-portal/explore-production-properties.json b/production-portal/explore-production-properties.json deleted file mode 100644 index 52ae7fcf..00000000 --- a/production-portal/explore-production-properties.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "productionMode" : true, - "enablePiwikTrack" : true, - "enableHelper" : true, - "useCache" : true, - "metricsAPIURL" : "https://services.openaire.eu/usagestats/", - "framesAPIURL" : "https://www.openaire.eu/stats3/", - "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", - "statisticsFrameAPIURL":"https://www.openaire.eu/stats/", - "claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/", - "searchAPIURLLAst" : "https://services.openaire.eu/search/v2/api/", - "searchResourcesAPIURL" : "https://services.openaire.eu/search/v2/api/resources", - "csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports", - "searchCrossrefAPIURL" : "https://api.crossref.org/works", - "searchDataciteAPIURL" : "https://api.datacite.org/works", - "searchOrcidURL" : "https://pub.orcid.org/v2.1/", - "pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/", - "doiURL" : "https://dx.doi.org/", - "cordisURL" : "http://cordis.europa.eu/projects/", - "pmcURL" : "http://europepmc.org/articles/", - "handleURL" : "http://hdl.handle.net/", - "openDoarURL": "http://v2.sherpa.ac.uk/id/repository/", - "r3DataURL": "http://service.re3data.org/repository/", - "zenodo" : "https://zenodo.org/", - "openAccess" : "https://www.openaire.eu/support/faq#article-id-234", - "openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310", - "fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - "h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - "ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", - "helpdesk" : "https://www.openaire.eu/support/helpdesk", - "uploadService" : "https://explore.openaire.eu/upload/", - - "vocabulariesAPI" :"https://services.openaire.eu/provision/mvc/vocabularies/", - - "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", - "piwikSiteId" : "109", - "loginUrl" :"https://services.openaire.eu/uoa-user-management/openid_connect_login", - - "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", - - "cookieDomain" :".openaire.eu", - - "feedbackmail" :"feedback@openaire.eu", - - "cacheUrl" :"https://explore.openaire.eu/cache/get?url=", - - "datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/", - - "adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/", - - "adminToolsCommunity" :"openaire", - "contextsAPI":"https://services.openaire.eu/openaire/context", - "communityAPI": "https://services.openaire.eu/openaire/community/", - - "csvLimit": 2000, - "pagingLimit": 20, - "resultsPerPage": 10, - - "baseLink" : "https://explore.openaire.eu", - - "searchLinkToPublication" : "/search/publication?articleId=", - "searchLinkToProject" : "/search/project?projectId=", - "searchLinkToDataProvider" : "/search/dataprovider?datasourceId=", - "searchLinkToDataset" : "/search/dataset?datasetId=", - "searchLinkToOrp" : "/search/other?orpId=", - "searchLinkToOrganization" : "/search/organization?organizationId=", - - "searchLinkToPublications" : "/search/find/publications", - "searchLinkToDataProviders" : "/search/find/dataproviders", - "searchLinkToProjects" : "/search/find/projects", - "searchLinkToDatasets" : "/search/find/datasets", - "searchLinkToSoftware" : "/search/find/software", - "searchLinkToOrps" : "/search/find/other", - "searchLinkToOrganizations" : "/search/find/organizations", - "searchLinkToCompatibleDataProviders" : "/search/content-providers", - "searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table", - "searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries", - "searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table", - "searchLinkToJournals" : "/search/journals", - "searchLinkToJournalsTable" : "/search/journals-table", - - "searchLinkToAdvancedPublications" : "/search/advanced/publications", - "searchLinkToAdvancedProjects" : "/search/advanced/projects", - "searchLinkToAdvancedDatasets" : "/search/advanced/datasets", - "searchLinkToAdvancedSoftware" : "/search/advanced/software", - "searchLinkToAdvancedOrps" : "/search/advanced/other", - "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", - "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", - "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows", - "showLastIndexInformationLink" : true, - "widgetLink" : "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - "claimsInformationLink": "https://www.openaire.eu/linking" -} diff --git a/production-portal/explore-test-properties.json b/production-portal/explore-test-properties.json deleted file mode 100644 index 2fb0e7e8..00000000 --- a/production-portal/explore-test-properties.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "productionMode" : true, - "enablePiwikTrack" : true, - "enableHelper" : true, - "useCache" : true, - "metricsAPIURL" : "https://services.openaire.eu/usagestats/", - "framesAPIURL" : "https://test.openaire.eu/stats3/", - "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", - "statisticsFrameAPIURL":"https://test.openaire.eu/stats/", - "claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/", - "searchAPIURLLAst" : "http://services.openaire.eu:8480/shadowSearch/rest/v2/api/", - "searchResourcesAPIURL" : "http://services.openaire.eu:8480/shadowSearch/rest/v2/api/resources", - "csvAPIURL" : "http://services.openaire.eu:8480/shadowSearch/rest/v2/api/reports", - "searchCrossrefAPIURL" : "https://api.crossref.org/works", - "searchDataciteAPIURL" : "https://api.datacite.org/works", - "searchOrcidURL" : "https://pub.orcid.org/v2.1/", - "pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/", - "doiURL" : "https://dx.doi.org/", - "cordisURL" : "http://cordis.europa.eu/projects/", - "pmcURL" : "http://europepmc.org/articles/", - "handleURL" : "http://hdl.handle.net/", - "openDoarURL": "http://v2.sherpa.ac.uk/id/repository/", - "r3DataURL": "http://service.re3data.org/repository/", - "zenodo" : "https://zenodo.org/", - "openAccess" : "https://www.openaire.eu/support/faq#article-id-234", - "openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310", - "fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - "h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - "ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", - "helpdesk" : "https://www.openaire.eu/support/helpdesk", - "uploadService" : "https://explore.openaire.eu/upload/", - - "vocabulariesAPI" :"https://services.openaire.eu/provision/mvc/vocabularies/", - - "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", - "piwikSiteId" : "109", - "loginUrl" :"https://services.openaire.eu/uoa-user-management/openid_connect_login", - - "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", - - "cookieDomain" :".openaire.eu", - - "feedbackmail" :"feedback@openaire.eu", - - "cacheUrl" :"https://explore.openaire.eu/cache/get?url=", - - "datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/", - - "adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/", - - "adminToolsCommunity" :"openaire", - "contextsAPI":"https://services.openaire.eu/openaire/context", - "communityAPI": "https://services.openaire.eu/openaire/community/", - - "csvLimit": 2000, - "pagingLimit": 20, - "resultsPerPage": 10, - - "baseLink" : "https://test.explore.openaire.eu", - - "searchLinkToPublication" : "/search/publication?articleId=", - "searchLinkToProject" : "/search/project?projectId=", - "searchLinkToDataProvider" : "/search/dataprovider?datasourceId=", - "searchLinkToDataset" : "/search/dataset?datasetId=", - "searchLinkToOrp" : "/search/other?orpId=", - "searchLinkToOrganization" : "/search/organization?organizationId=", - - "searchLinkToPublications" : "/search/find/publications", - "searchLinkToDataProviders" : "/search/find/dataproviders", - "searchLinkToProjects" : "/search/find/projects", - "searchLinkToDatasets" : "/search/find/datasets", - "searchLinkToSoftware" : "/search/find/software", - "searchLinkToOrps" : "/search/find/other", - "searchLinkToOrganizations" : "/search/find/organizations", - "searchLinkToCompatibleDataProviders" : "/search/content-providers", - "searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table", - "searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries", - "searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table", - "searchLinkToJournals" : "/search/journals", - "searchLinkToJournalsTable" : "/search/journals-table", - - "searchLinkToAdvancedPublications" : "/search/advanced/publications", - "searchLinkToAdvancedProjects" : "/search/advanced/projects", - "searchLinkToAdvancedDatasets" : "/search/advanced/datasets", - "searchLinkToAdvancedSoftware" : "/search/advanced/software", - "searchLinkToAdvancedOrps" : "/search/advanced/other", - "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", - "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", - "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows", - "showLastIndexInformationLink" : false, - "widgetLink" : "https://test.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - "claimsInformationLink": "https://www.openaire.eu/linking" -} diff --git a/production-portal/installOpenaireLib.sh b/production-portal/installOpenaireLib.sh deleted file mode 100755 index f0724eb0..00000000 --- a/production-portal/installOpenaireLib.sh +++ /dev/null @@ -1,3 +0,0 @@ -rm -rf node_modules/ng-openaire-library/; -npm install /home/argirok/projects/openaire/uoa-services-library/trunk/ng-openaire-library/dist/ng-openaire-library-1.0.0.tgz; -npm start; diff --git a/production-portal/package.json b/production-portal/package.json deleted file mode 100644 index a29debbf..00000000 --- a/production-portal/package.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "name": "openaire-search", - "version": "1.0.0", - "license": "Openaire", - "contributors": [ - "Argiro Kokogiannaki ", - "Konstantina Galouni " - ], - "scripts": { - "ng": "ng", - "start": "ng serve --disable-host-check --host 0.0.0.0", - "start:dynamic": "npm run build:dynamic && npm run serve:dynamic", - "start:static": "npm run build:static && npm run serve:static", - "build": "ng build", - "build:client-and-server-bundles": "ng build --prod -sm --stats-json && ng build --prod --app 1 --output-hashing=false", - "build:static": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:static", - "build:dynamic": "npm run build:client-and-server-bundles && npm run webpack:server", - "generate:static": "cd dist && node prerender", - "webpack:server": "webpack --config webpack.server.config.js --progress --colors", - "serve:static": "cd dist/browser && http-server", - "serve:dynamic": "node dist/server" - }, - "private": true, - "dependencies": { - "@angular/animations": "^4.2.4", - "@angular/common": "^4.2.4", - "@angular/compiler": "^4.2.4", - "@angular/core": "^4.2.4", - "@angular/forms": "^4.2.4", - "@angular/http": "^4.2.4", - "@angular/platform-browser": "^4.2.4", - "@angular/platform-browser-dynamic": "^4.2.4", - "@angular/platform-server": "^4.2.4", - "@angular/router": "^4.2.4", - "@nguniversal/express-engine": "^1.0.0-beta.3", - "@nguniversal/module-map-ngfactory-loader": "^1.0.0-beta.3", - "angular-datatables": "^4.4.0", - "citation-js": "^0.3.4", - "clipboard": "^1.5.16", - "core-js": "^2.4.1", - "datatables.net": "^1.10.16", - "datatables.net-dt": "^1.10.16", - "jquery": "^3.2.1", - "ngx-json-ld": "0.1.6", - "rxjs": "^5.4.2", - "ts-md5": "^1.2.0", - "wikidata-sdk": "^5.2.9", - "zone.js": "^0.8.14" - }, - "devDependencies": { - "@angular/cli": "^1.3.0", - "@angular/compiler-cli": "^4.2.4", - "@angular/language-service": "^4.2.4", - "@types/datatables.net": "^1.10.8", - "@types/jquery": "^3.2.17", - "@types/node": "^8.0.30", - "cpy-cli": "^1.0.1", - "http-server": "^0.10.0", - "reflect-metadata": "^0.1.10", - "ts-loader": "^2.3.7", - "typescript": "~2.3.3" - } -} diff --git a/production-portal/prepareDeploy.sh b/production-portal/prepareDeploy.sh deleted file mode 100755 index e7fbfd7f..00000000 --- a/production-portal/prepareDeploy.sh +++ /dev/null @@ -1,38 +0,0 @@ -#ATTENTION -#DON'T run it in svn folder - it REMOVES files -#Copy project in another file "deploy-folder" -#cd "deploy-folder" -#run the script - -## cp the file according to the deploy environment -# cp explore-production-properties.json src/assets/env-properties.json; -# cp explore-test-properties.json src/assets/env-properties.json; -## uncommect from here--> -# rm -rf src/assets/common-assets/.svn/; -# rm -rf src/app/openaireLibrary/.svn/; -# pico src/app/openaireLibrary/utils/properties/environment-specific.service.ts; -echo 'For Production keep meta for bots'; -echo -n 'Check index.html: For test keep meta for noindex, for production remove noindex and keep meta for Search engines verification'; -echo -n "Press key:"; -read -n1 ans -echo -n "Pressed"; -# pico src/index.html; -echo -n 'Check Robots.txt: For test add "Diasallow /", for production remove it!'; -echo -n "Press key:"; -read -n1 ans -echo -n "Pressed"; -# pico src/robots.txt; - -# npm run build:dynamic; -# rm -rf src node_modules .idea/ connect-production-properties.json installOpenaireLib.sh explore-production-properties.json explore-test-properties.json; -# echo 'Ready!'; -# echo 'Now copy to the server!' -##<-- to here - -#copy "deploy-folder" in explore.openaire.eu -#coppies of previous deployments exist in "/home/argiro.kokogiannaki/portals/explore-YYYYMMDD" -#run "npm i" -#become nodejs user: "sudo su nodejs -s /bin/bash" -#go to "cd /srv/www/portal" -#cp files from "cp -r HOME_PATH/deploy-folder/* ." -#restart portal "pm2 restart openaire" diff --git a/production-portal/prerender.ts b/production-portal/prerender.ts deleted file mode 100644 index 5ddb8cd4..00000000 --- a/production-portal/prerender.ts +++ /dev/null @@ -1,45 +0,0 @@ -// Load zone.js for the server. -import 'zone.js/dist/zone-node'; -import 'reflect-metadata'; -import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs'; -import { join } from 'path'; - -import { enableProdMode } from '@angular/core'; -// Faster server renders w/ Prod mode (dev mode never needed) -enableProdMode(); - -// Express Engine -import { ngExpressEngine } from '@nguniversal/express-engine'; -// Import module map for lazy loading -import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader'; -import { renderModuleFactory } from '@angular/platform-server'; -import { ROUTES } from './static.paths'; - -// * NOTE :: leave this as require() since this file is built Dynamically from webpack -const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle'); - -const BROWSER_FOLDER = join(process.cwd(), 'browser'); - -// Load the index.html file containing referances to your application bundle. -const index = readFileSync(join('browser', 'index.html'), 'utf8'); - -let previousRender = Promise.resolve(); - -// Iterate each route path -ROUTES.forEach(route => { - var fullPath = join(BROWSER_FOLDER, route); - - // Make sure the directory structure is there - if(!existsSync(fullPath)){ - mkdirSync(fullPath); - } - - // Writes rendered HTML to index.html, replacing the file if it already exists. - previousRender = previousRender.then(_ => renderModuleFactory(AppServerModuleNgFactory, { - document: index, - url: route, - extraProviders: [ - provideModuleMap(LAZY_MODULE_MAP) - ] - })).then(html => writeFileSync(join(fullPath, 'index.html'), html)); -}); diff --git a/production-portal/server.ts b/production-portal/server.ts deleted file mode 100644 index 6aeb0faa..00000000 --- a/production-portal/server.ts +++ /dev/null @@ -1,58 +0,0 @@ -import 'zone.js/dist/zone-node'; -import 'reflect-metadata'; -import { renderModuleFactory } from '@angular/platform-server'; -import { enableProdMode } from '@angular/core'; - -import * as express from 'express'; -import { join } from 'path'; -import { readFileSync } from 'fs'; - -// Faster server renders w/ Prod mode (dev mode never needed) -enableProdMode(); - -// Express server -const app = express(); - -const PORT = process.env.PORT || 4000; -const DIST_FOLDER = join(process.cwd(), 'dist'); - -// Our index.html we'll use as our template -const template = readFileSync(join(DIST_FOLDER, 'browser', 'index.html')).toString(); - -// * NOTE :: leave this as require() since this file is built Dynamically from webpack -const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle'); - -// Express Engine -import { ngExpressEngine } from '@nguniversal/express-engine'; -// Import module map for lazy loading -import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader'; - -// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) -app.engine('html', ngExpressEngine({ - bootstrap: AppServerModuleNgFactory, - providers: [ - provideModuleMap(LAZY_MODULE_MAP) - ] -})); - -app.set('view engine', 'html'); -app.set('views', join(DIST_FOLDER, 'browser')); - -/* - Example Express Rest API endpoints - - app.get('/api/**', (req, res) => { }); -*/ - -// Server static files from /browser -app.get('*.*', express.static(join(DIST_FOLDER, 'browser'), { - maxAge: '1y' -})); - -// ALl regular routes use the Universal engine -app.get('*', (req, res) => { - res.render('index', { req }); -}); - -// Start up the Node server -app.listen(PORT, () => { - console.log(`Node Express server listening on http://localhost:${PORT}`); -}); diff --git a/production-portal/src/app/app-routing.module.ts b/production-portal/src/app/app-routing.module.ts deleted file mode 100644 index 66287bec..00000000 --- a/production-portal/src/app/app-routing.module.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - - -import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver'; -import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service'; - -import { OpenaireErrorPageComponent } from './error/errorPage.component'; - -const routes: Routes = [ - { path: '', loadChildren: './home/home.module#HomeModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'home', loadChildren: './home/home.module#HomeModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/publication', loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/dataset', loadChildren: './landingPages/dataset/libDataset.module#LibDatasetModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/software', loadChildren: './landingPages/software/libSoftware.module#LibSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/other', loadChildren: './landingPages/orp/libOrp.module#LibOrpModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/project', loadChildren: './landingPages/project/libProject.module#LibProjectModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/dataprovider', loadChildren: '././landingPages/dataProvider/libDataProvider.module#LibDataProviderModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'participate/deposit-datasets', loadChildren: './deposit/datasets/depositDatasets.module#LibDepositDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'participate/deposit-datasets-result', loadChildren: './deposit/datasets/depositDatasetsResults.module#LibDepositDatasetsResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'participate/deposit-subject-result', loadChildren: './deposit/datasets/depositBySubjectResults.module#LibDepositBySubjectResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'participate/deposit-publications', loadChildren: './deposit/publications/depositPublications.module#LibDepositPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'participate/deposit-publications-result', loadChildren: './deposit/publications/depositPublicationsResults.module#LibDepositPublicationsResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find', loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/publications', loadChildren: './searchPages/simple/searchPublications.module#LibSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/datasets', loadChildren: './searchPages/simple/searchDatasets.module#LibSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/software', loadChildren: './searchPages/simple/searchSoftware.module#LibSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/other', loadChildren: './searchPages/simple/searchOrps.module#LibSearchOrpsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/projects', loadChildren: './searchPages/simple/searchProjects.module#LibSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/content-providers', loadChildren: './searchPages/dataProviders/compatibleDataProviders.module#LibCompatibleDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/content-providers-table', loadChildren: './searchPages/dataProviders/compatibleDataProvidersTable.module#LibCompatibleDataProvidersTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/entity-registries', loadChildren: './searchPages/dataProviders/entityRegistries.module#LibEntityRegistriesModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/entity-registries-table', loadChildren: './searchPages/dataProviders/entityRegistriesTable.module#LibEntityRegistriesTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/journals', loadChildren: './searchPages/dataProviders/journals.module#LibJournalsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/journals-table', loadChildren: './searchPages/dataProviders/journalsTable.module#LibJournalsTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/publications', loadChildren: './searchPages/advanced/advancedSearchPublications.module#LibAdvancedSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/datasets', loadChildren: './searchPages/advanced/advancedSearchDatasets.module#LibAdvancedSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/software', loadChildren: './searchPages/advanced/advancedSearchSoftware.module#LibAdvancedSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/other', loadChildren: './searchPages/advanced/advancedSearchOrps.module#LibAdvancedSearchOrpsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/organizations', loadChildren: './searchPages/advanced/advancedSearchOrganizations.module#LibAdvancedSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/dataproviders', loadChildren: './searchPages/advanced/advancedSearchDataProviders.module#LibAdvancedSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/advanced/projects', loadChildren: './searchPages/advanced/advancedSearchProjects.module#LibAdvancedSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'project-report', loadChildren: './landingPages/htmlProjectReport/libHtmlProjectReport.module#LibHtmlProjectReportModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'myclaims', loadChildren: './claims/myClaims/myClaims.module#LibMyClaimsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'claims', loadChildren: './claims/claimsAdmin/claimsAdmin.module#LibClaimsAdminModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'participate/claim', loadChildren: './claims/linking/linkingGeneric.module#LibLinkingGenericModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'participate/direct-claim', loadChildren: './claims/directLinking/directLinking.module#LibDirectLinkingModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'claims-project-manager', loadChildren: './claims/claimsByToken/claimsByToken.module#LibClaimsByTokenModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'reload', loadChildren: './reload/libReload.module#LibReloadModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'user-info', loadChildren: './login/libUser.module#LibUserModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'error', component: OpenaireErrorPageComponent, resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: '**',pathMatch: 'full',component: OpenaireErrorPageComponent, resolve: { envSpecific: EnvironmentSpecificResolver }} -]; - -@NgModule({ - imports: [RouterModule.forRoot(routes)], - exports: [RouterModule], - providers: [EnvironmentSpecificResolver, EnvironmentSpecificService] -}) -export class AppRoutingModule { } diff --git a/production-portal/src/app/app.component.ts b/production-portal/src/app/app.component.ts deleted file mode 100644 index e7d0084d..00000000 --- a/production-portal/src/app/app.component.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { Component, Directive, ElementRef, Renderer, ChangeDetectionStrategy, ViewEncapsulation } from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {ActivatedRoute} from '@angular/router'; - -import { EnvProperties} from './openaireLibrary/utils/properties/env-properties'; -import{MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu'; -import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service'; - -import {Session} from './openaireLibrary/login/utils/helper.class'; - -@Component({ - //changeDetection: ChangeDetectionStrategy.Default, - //encapsulation: ViewEncapsulation.Emulated, - selector: 'app-root', - styles: [` - `], - template: ` - - -
-
- -
-
- - - OpenAIRE uses cookies in order to function properly.
- Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing experience possible. - By using the OpenAIRE portal you accept our use of cookies. Read more - - - - - -` - -}) -export class AppComponent { - isClient:boolean = false; - clientLoad = 0; - - userMenuItems:MenuItem[] = [ new MenuItem("","My profile","","",false,[],[],{}), - new MenuItem("","My links","","/myclaims",false,[],["/myclaims"],{}), - new MenuItem("","Manage all links","","/claims",true,[],["/claims"],{})] - - - menuItems:RootMenuItem [] = [ - {rootItem: new MenuItem("search","Search","","/search/find",false,[],["/search/find"],{}), - items: [new MenuItem("","Publications","","/search/find/publications",false,["publication"],["/search/find/publications"],{}), - new MenuItem("","Research Data","","/search/find/datasets",false,["dataset"],["/search/find/datasets"],{}), - new MenuItem("","Software","","/search/find/software",false,["software"],["/search/find/software"],{}), - new MenuItem("","Other Research Products","","/search/find/other",false,["orp"],["/search/find/other"],{}), - new MenuItem("","Projects","","/search/find/projects/",false,["project"],["/search/find/projects"],{}), - new MenuItem("","Content Providers","","/search/find/dataproviders",false,["datasource"],["/search/find/dataproviders"],{}), - new MenuItem("","Organizations","","/search/find/organizations/",false,["organization"],["/search/find/organizations"],{}) - ]}, - { - rootItem: new MenuItem("share","Share","","",false,[],["/participate/deposit-publications","/participate/deposit-datasets"],{}), - items: [new MenuItem("","Publications","","/participate/deposit-publications",false,["publication"],["/participate/deposit-publications"],{}), - new MenuItem("","Research Data","","/participate/deposit-datasets",false,["dataset"],["/participate/deposit-datasets"],{})] - }, - { - rootItem: new MenuItem("link","Link","","/participate/claim",false,[],["/participate/claim"],{}), - items: [] - }, - { - rootItem: new MenuItem("datasources","Content Providers","","",false,["datasource"],[],{}), - items: [//new MenuItem("","Data Policies","https://www.openaire.eu/oa-policies-mandates","",false,["datasource"],[""],{}), - new MenuItem("","Repositories","","/search/content-providers",false,["datasource"],["/search/content-providers"],{}), - new MenuItem("","Journals","","/search/journals",false,["datasource"],["/search/journals"],{}), - new MenuItem("","Registries","","/search/entity-registries",false,["datasource"],["/search/entity-registries"],{}), - new MenuItem("","Browse all","","/search/find/dataproviders",false,["datasource"],["/search/find/dataproviders"],{})] - } -]; -bottomMenuItems =[ - new MenuItem("","About","https://www.openaire.eu/about","",false,[],[],{}), - new MenuItem("","Services","http://catalogue.openaire.eu","",false,[],[],{}), - new MenuItem("","Support","https://www.openaire.eu/support","",false,[],[],{}), - new MenuItem("","News","https://www.openaire.eu/news","",false,[],[],{}), - new MenuItem("","Events","https://www.openaire.eu/events","",false,[],[],{}), - new MenuItem("","Documents","https://www.openaire.eu/documents","",false,[],[],{}), - ]; - - - - feedbackmail:string - properties:EnvProperties; - constructor( private route: ActivatedRoute, private propertiesService:EnvironmentSpecificService) { - } - - ngOnInit() { - - if (typeof document !== 'undefined') { - try{ - this.isClient = true; - if(Session.isPortalAdministrator()){ - this.userMenuItems.push(new MenuItem("","Manage helptexts","https://admin.explore.openaire.eu/dashboard?communityId=openaire","",true,[],[],{})) - } - }catch (e) { - } - - } - this.propertiesService.loadEnvironment() - .then(es => { - this.propertiesService.setEnvProperties(es); - this.properties = this.propertiesService.envSpecific; - this.feedbackmail = this.properties.feedbackmail; - console.log(this.properties.loginUrl); - }, error => { - console.log("App couldn't fetch properties"); - console.log(error); - - }); - } -} diff --git a/production-portal/src/app/app.module.ts b/production-portal/src/app/app.module.ts deleted file mode 100755 index 88095938..00000000 --- a/production-portal/src/app/app.module.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from './shared/shared.module'; -import { BrowserModule } from '@angular/platform-browser'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { APP_BASE_HREF, CommonModule } from '@angular/common'; -import { HttpModule } from '@angular/http'; -import { RouterModule } from '@angular/router'; -import { AppComponent } from './app.component'; - - -import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module'; -import { CookieLawModule } from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module'; - -import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module'; -import {FeedbackModule} from './openaireLibrary/sharedComponents/feedback/feedback.module'; -import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver'; - -import { ErrorModule} from './openaireLibrary/error/error.module'; - -import { OpenaireErrorPageComponent } from './error/errorPage.component'; -import { AppRoutingModule } from './app-routing.module'; - -@NgModule({ - - imports: [ - SharedModule, - NoopAnimationsModule, - CommonModule, - HttpModule, -ErrorModule, -NavigationBarModule, FeedbackModule, BottomModule, - CookieLawModule, - BrowserModule.withServerTransition({appId: 'my-app'}), - AppRoutingModule - ], - declarations: [ AppComponent, OpenaireErrorPageComponent], - exports: [ AppComponent ], - providers:[EnvironmentSpecificResolver ], - bootstrap: [AppComponent] -}) -// -export class AppModule {} diff --git a/production-portal/src/app/app.server.module.ts b/production-portal/src/app/app.server.module.ts deleted file mode 100644 index 79602ec8..00000000 --- a/production-portal/src/app/app.server.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import {NgModule} from '@angular/core'; -import {ServerModule} from '@angular/platform-server'; -import {ModuleMapLoaderModule} from '@nguniversal/module-map-ngfactory-loader'; - -import {AppModule} from './app.module'; -import {AppComponent} from './app.component'; - -@NgModule({ - imports: [ - // The AppServerModule should import your AppModule followed - // by the ServerModule from @angular/platform-server. - AppModule, - ServerModule, - ModuleMapLoaderModule, - ], - // Since the bootstrapped component is not inherited from your - // imported AppModule, it needs to be repeated here. - bootstrap: [AppComponent], -}) -export class AppServerModule {} diff --git a/production-portal/src/app/claims/claim.module.ts b/production-portal/src/app/claims/claim.module.ts deleted file mode 100644 index 113e8597..00000000 --- a/production-portal/src/app/claims/claim.module.ts +++ /dev/null @@ -1,68 +0,0 @@ -// import { NgModule} from '@angular/core'; -// import { CommonModule } from '@angular/common'; -// import { FormsModule } from '@angular/forms'; -// // -// import {UtilsModule} from '../utils/utils.module'; -// import {ServicesModule} from '../services/services.module'; -// -// import { ClaimsService} from '../services/claims.service'; -// //main -// import {ClaimComponent} from './claim/claim.component'; -// import {ClaimsAdminComponent} from './claims/claimsAdmin.component'; -// import {MyClaimsComponent} from './myClaims/myClaims.component'; -// import {LinkingHomeComponent} from './linking/linkingHome.component'; -// import {LinkingComponent} from './linking/linking.component'; -// import { BulkLinkingComponent } from './linking/bulkLinking.component'; -// -// import {BulkClaimComponent} from './linking/bulkClaim/bulkClaim.component'; -// import {ClaimsComponent} from './claim-utils/claims.component'; -// -// import {ClaimContextComponent} from './claim-utils/claimContext.component'; -// import {ClaimProjectsComponent} from './claim-utils/claimProject.component'; -// import {ClaimResultComponent} from './claim-utils/claimResult.component'; -// import {ClaimPublicationComponent} from './claim-utils/claimPublication.component'; -// import {ClaimDatasetComponent} from './claim-utils/claimDataset.component'; -// -// import {ClaimInsertComponent} from './linking/insertClaim/insertClaim.component'; -// -// import {ClaimSelectedContextsComponent} from './linking/selected/selectedContexts.component'; -// import {ClaimSelectedComponent} from './linking/selected/selected.component'; -// import {ClaimSelectedDatasetsComponent} from './linking/selected/selectedDatasets.component'; -// import {ClaimSelectedResultsComponent} from './linking/selected/selectedResults.component'; -// import {ClaimSelectedProjectsComponent} from './linking/selected/selectedProjects.component'; -// import {ClaimSelectedPublicationsComponent} from './linking/selected/selectedPublications.component'; -// -// import {LinkingGenericComponent} from './linking/linkingGeneric.component'; -// -// import {InlineClaimContextComponent} from './inlineClaims/inlineClaimContext.component'; -// import {InlineClaimProjectComponent} from './inlineClaims/inlineClaimProject.component'; -// import {InlineClaimResultComponent} from './inlineClaims/inlineClaimResult.component'; -// import {ClaimEntityFormatter} from '../utils/claimEntityFormatter.component'; -// -// import { Claim } from '../utils/entities/claim'; -// //helpers -// -// import { ClaimRoutingModule } from './claim-routing.module'; -// @NgModule({ -// imports: [ -// CommonModule, FormsModule, -// UtilsModule, -// ServicesModule, -// ClaimRoutingModule -// -// ], -// declarations: [ -// ClaimsAdminComponent, MyClaimsComponent, ClaimComponent, ClaimsComponent, -// BulkLinkingComponent, LinkingComponent, LinkingHomeComponent, LinkingGenericComponent, -// InlineClaimContextComponent, InlineClaimProjectComponent, InlineClaimResultComponent, ClaimSelectedComponent, -// ClaimContextComponent, ClaimSelectedContextsComponent, ClaimInsertComponent, ClaimProjectsComponent, ClaimSelectedProjectsComponent, -// ClaimResultComponent, ClaimSelectedPublicationsComponent, ClaimSelectedDatasetsComponent, ClaimSelectedResultsComponent, ClaimPublicationComponent, -// ClaimDatasetComponent, BulkClaimComponent, -// ClaimEntityFormatter -// ], -// providers: [ ClaimsService ], -// exports: [ -// InlineClaimContextComponent, InlineClaimProjectComponent, InlineClaimResultComponent -// ] -// }) -// export class ClaimModule { } diff --git a/production-portal/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts b/production-portal/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts deleted file mode 100644 index c7895353..00000000 --- a/production-portal/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { OpenaireClaimsAdminComponent } from './claimsAdmin.component'; -import{ AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireClaimsAdminComponent, canActivate: [IsRouteEnabled, AdminLoginGuard], - data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}]) - ] -}) -export class ClaimsAdminRoutingModule { } diff --git a/production-portal/src/app/claims/claimsAdmin/claimsAdmin.component.ts b/production-portal/src/app/claims/claimsAdmin/claimsAdmin.component.ts deleted file mode 100644 index dbac58fe..00000000 --- a/production-portal/src/app/claims/claimsAdmin/claimsAdmin.component.ts +++ /dev/null @@ -1,30 +0,0 @@ -import {Component, ViewChild, Input} from '@angular/core'; -import {Location} from '@angular/common'; -import {Observable} from 'rxjs/Observable'; -import {ActivatedRoute} from '@angular/router'; -import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; - -@Component({ - selector: 'openaire-claims-admin', - template: ` - - - - `, - -}) -export class OpenaireClaimsAdminComponent { - - claimsInfoURL:string; - - constructor (private route: ActivatedRoute) { - - } - public ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.claimsInfoURL = data.envSpecific.claimsInformationLink; - - }); - } -} diff --git a/production-portal/src/app/claims/claimsAdmin/claimsAdmin.module.ts b/production-portal/src/app/claims/claimsAdmin/claimsAdmin.module.ts deleted file mode 100644 index d4a4380b..00000000 --- a/production-portal/src/app/claims/claimsAdmin/claimsAdmin.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule } from '@angular/core'; - -import { SharedModule } from '../../shared/shared.module'; -import { OpenaireClaimsAdminComponent } from './claimsAdmin.component'; -import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module'; -import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module'; -import {AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - SharedModule, - ClaimsAdminRoutingModule, - ClaimsAdminModule - ], - providers:[AdminLoginGuard, PreviousRouteRecorder,IsRouteEnabled], - declarations: [ - OpenaireClaimsAdminComponent - ] -}) -export class LibClaimsAdminModule { } diff --git a/production-portal/src/app/claims/claimsByToken/claimsByToken-routing.module.ts b/production-portal/src/app/claims/claimsByToken/claimsByToken-routing.module.ts deleted file mode 100644 index c4835ae3..00000000 --- a/production-portal/src/app/claims/claimsByToken/claimsByToken-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { OpenaireClaimsByTokenComponent } from './claimsByToken.component'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireClaimsByTokenComponent, canActivate: [IsRouteEnabled, LoginGuard], - data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}]) - ] -}) -export class ClaimsByTokenRoutingModule { } diff --git a/production-portal/src/app/claims/claimsByToken/claimsByToken.component.ts b/production-portal/src/app/claims/claimsByToken/claimsByToken.component.ts deleted file mode 100644 index 79040aac..00000000 --- a/production-portal/src/app/claims/claimsByToken/claimsByToken.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-claims-project-manager', - template: ` - - `, - -}) -export class OpenaireClaimsByTokenComponent { -} diff --git a/production-portal/src/app/claims/claimsByToken/claimsByToken.module.ts b/production-portal/src/app/claims/claimsByToken/claimsByToken.module.ts deleted file mode 100644 index 10e6f868..00000000 --- a/production-portal/src/app/claims/claimsByToken/claimsByToken.module.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { SharedModule } from '../../shared/shared.module'; -import { OpenaireClaimsByTokenComponent } from './claimsByToken.component'; -import {ClaimsByTokenModule} from '../../openaireLibrary/claims/claimsByToken/claimsByToken.module'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import { ClaimsByTokenRoutingModule } from './claimsByToken-routing.module'; - - - -@NgModule({ - imports: [ - RouterModule, - SharedModule, - ClaimsByTokenModule, - ClaimsByTokenRoutingModule - ], - providers:[ - LoginGuard, PreviousRouteRecorder, IsRouteEnabled - ], - declarations: [ - OpenaireClaimsByTokenComponent - ], - exports: [ - OpenaireClaimsByTokenComponent - ] -}) -export class LibClaimsByTokenModule { } diff --git a/production-portal/src/app/claims/directLinking/directLinking-routing.module.ts b/production-portal/src/app/claims/directLinking/directLinking-routing.module.ts deleted file mode 100644 index fa63dd33..00000000 --- a/production-portal/src/app/claims/directLinking/directLinking-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireDirectLinkingComponent } from './directLinking.component'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder]}, - - ]) - ] -}) -export class DirectLinkingRoutingModule { } diff --git a/production-portal/src/app/claims/directLinking/directLinking.component.ts b/production-portal/src/app/claims/directLinking/directLinking.component.ts deleted file mode 100644 index afabe0a4..00000000 --- a/production-portal/src/app/claims/directLinking/directLinking.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import {Component, Input} from '@angular/core'; - -@Component({ - selector: 'openaire-directLinking', - template: `` -}) -export class OpenaireDirectLinkingComponent { -} diff --git a/production-portal/src/app/claims/directLinking/directLinking.module.ts b/production-portal/src/app/claims/directLinking/directLinking.module.ts deleted file mode 100644 index 34e279dc..00000000 --- a/production-portal/src/app/claims/directLinking/directLinking.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; - -import { SharedModule } from '../../shared/shared.module'; -import { OpenaireDirectLinkingComponent } from './directLinking.component'; -import{ DirectLinkingModule} from '../../openaireLibrary/claims/directLinking/directLinking.module'; -import {DirectLinkingRoutingModule} from './directLinking-routing.module'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - SharedModule, DirectLinkingModule, DirectLinkingRoutingModule - ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], - declarations: [ - OpenaireDirectLinkingComponent - ], exports:[OpenaireDirectLinkingComponent] -}) -export class LibDirectLinkingModule { } diff --git a/production-portal/src/app/claims/linking/linking-routing.module.ts b/production-portal/src/app/claims/linking/linking-routing.module.ts deleted file mode 100644 index cb1438d0..00000000 --- a/production-portal/src/app/claims/linking/linking-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { OpenaireLinkingComponent } from './linkingGeneric.component'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder]}, - - ]) - ] -}) -export class LinkingRoutingModule { } diff --git a/production-portal/src/app/claims/linking/linkingGeneric.component.ts b/production-portal/src/app/claims/linking/linkingGeneric.component.ts deleted file mode 100644 index ad2bd592..00000000 --- a/production-portal/src/app/claims/linking/linkingGeneric.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {ActivatedRoute, Router} from '@angular/router'; - -@Component({ - selector: 'openaire-linking-generic', - template: `` - -}) -export class OpenaireLinkingComponent { - -} diff --git a/production-portal/src/app/claims/linking/linkingGeneric.module.ts b/production-portal/src/app/claims/linking/linkingGeneric.module.ts deleted file mode 100644 index 95ae3edb..00000000 --- a/production-portal/src/app/claims/linking/linkingGeneric.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; - -import { SharedModule } from '../../shared/shared.module'; -import {OpenaireLinkingComponent} from './linkingGeneric.component'; -import {LinkingRoutingModule} from './linking-routing.module'; -import{ LinkingGenericModule} from '../../openaireLibrary/claims/linking/linkingGeneric.module'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - SharedModule, LinkingRoutingModule, LinkingGenericModule - ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], - declarations: [ - OpenaireLinkingComponent - ], exports:[ - OpenaireLinkingComponent ] -}) -export class LibLinkingGenericModule { } diff --git a/production-portal/src/app/claims/myClaims/myClaims-routing.module.ts b/production-portal/src/app/claims/myClaims/myClaims-routing.module.ts deleted file mode 100644 index 44adf9cb..00000000 --- a/production-portal/src/app/claims/myClaims/myClaims-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenaireMyClaimsComponent } from './myClaims.component'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireMyClaimsComponent, canActivate: [IsRouteEnabled, LoginGuard], - data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}]) - ] -}) -export class MyClaimsRoutingModule { } diff --git a/production-portal/src/app/claims/myClaims/myClaims.component.ts b/production-portal/src/app/claims/myClaims/myClaims.component.ts deleted file mode 100644 index bfbb69e8..00000000 --- a/production-portal/src/app/claims/myClaims/myClaims.component.ts +++ /dev/null @@ -1,29 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {ActivatedRoute} from '@angular/router'; -import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; - - - -@Component({ - selector: 'openaire-my-claims', - template: ` - - -` - -}) - export class OpenaireMyClaimsComponent { - claimsInfoURL:string; - - constructor (private route: ActivatedRoute) { - - } - public ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.claimsInfoURL = data.envSpecific.claimsInformationLink; - - }); - } -} diff --git a/production-portal/src/app/claims/myClaims/myClaims.module.ts b/production-portal/src/app/claims/myClaims/myClaims.module.ts deleted file mode 100644 index 8402be16..00000000 --- a/production-portal/src/app/claims/myClaims/myClaims.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule } from '@angular/core'; - -import { SharedModule } from '../../shared/shared.module'; -import { OpenaireMyClaimsComponent } from './myClaims.component'; -import { MyClaimsRoutingModule } from './myClaims-routing.module'; -import{ MyClaimsModule} from '../../openaireLibrary/claims/myClaims/myClaims.module'; -import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - SharedModule, - MyClaimsRoutingModule, - MyClaimsModule - - ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], - declarations: [ - OpenaireMyClaimsComponent - ] -}) -export class LibMyClaimsModule { } diff --git a/production-portal/src/app/claims/myClaimsDemo.component.ts b/production-portal/src/app/claims/myClaimsDemo.component.ts deleted file mode 100644 index 6490a59c..00000000 --- a/production-portal/src/app/claims/myClaimsDemo.component.ts +++ /dev/null @@ -1,51 +0,0 @@ -// import {Component, Input} from '@angular/core'; -// import {Observable} from 'rxjs/Observable'; -// import { Router } from '@angular/router'; -// -// -// -// @Component({ -// selector: 'my-claims-demo', -// template: ` -//
-//
-//

My Claims Demo

-//
-//
-//
Linking
-//
MyClaims
-//
Claims Admin
-//

Extra parameters for claims admin

-//
Claims By user
-//
Claims By project
-//
Claims By context
-// -// -//
Publication od_______908::3a5b2885656a91307156325644e73b92
-// -//
-//
-// -// -// -// ` -// //(click)="changeOrderby('target')" -// //od_______908::3a5b2885656a91307156325644e73b92 -// -// }) -// export class MyClaimsDemoComponent { -// constructor ( private _router: Router ) { -// } -// user:string="argirok@di.uoa.gr"; -// ngOnInit() { -// -// } -// goToPub(id: number){ -// this._router.navigate( ['Publication', { articleId: id}] ); -// } -// } diff --git a/production-portal/src/app/deposit/datasets/depositBySubject.component.ts b/production-portal/src/app/deposit/datasets/depositBySubject.component.ts deleted file mode 100644 index a0ad40d4..00000000 --- a/production-portal/src/app/deposit/datasets/depositBySubject.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -// import {Component, Input} from '@angular/core'; -// import {Observable} from 'rxjs/Observable'; -// import { Router } from '@angular/router'; -// -// -// -// @Component({ -// selector: 'openaire-deposit-by-subject', -// template: ` -// -// -// ` -// }) -// -// export class OpenaireDepositBySubjectComponent { -// -// } diff --git a/production-portal/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts b/production-portal/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts deleted file mode 100644 index 6045594f..00000000 --- a/production-portal/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireDepositBySubjectResultComponent } from './depositBySubjectResult.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireDepositBySubjectResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class DepositBySubjectResultsRoutingModule { } diff --git a/production-portal/src/app/deposit/datasets/depositBySubjectResult.component.ts b/production-portal/src/app/deposit/datasets/depositBySubjectResult.component.ts deleted file mode 100644 index 7a52c70b..00000000 --- a/production-portal/src/app/deposit/datasets/depositBySubjectResult.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; - - -@Component({ - selector: 'openaire-deposit-by-subject-result', - template:`` -}) - -export class OpenaireDepositBySubjectResultComponent { - -} diff --git a/production-portal/src/app/deposit/datasets/depositBySubjectResults.module.ts b/production-portal/src/app/deposit/datasets/depositBySubjectResults.module.ts deleted file mode 100644 index 63815f7f..00000000 --- a/production-portal/src/app/deposit/datasets/depositBySubjectResults.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { OpenaireDepositBySubjectResultComponent } from './depositBySubjectResult.component'; - -import {DepositBySubjectResultsRoutingModule} from './depositBySubjectResult-routing.module'; -import {DepositBySubjectResultsModule } from '../../openaireLibrary/deposit/datasets/depositBySubjectResults.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [ - CommonModule, FormsModule, - DepositBySubjectResultsModule, - DepositBySubjectResultsRoutingModule - ], - declarations: [ - - OpenaireDepositBySubjectResultComponent - - ], - exports: [ - OpenaireDepositBySubjectResultComponent - ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled] -}) -export class LibDepositBySubjectResultsModule { } diff --git a/production-portal/src/app/deposit/datasets/depositDatasets-routing.module.ts b/production-portal/src/app/deposit/datasets/depositDatasets-routing.module.ts deleted file mode 100644 index edf71a77..00000000 --- a/production-portal/src/app/deposit/datasets/depositDatasets-routing.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireDepositDatasetsComponent } from './depositDatasets.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireDepositDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class DepositDatasetsRoutingModule { } diff --git a/production-portal/src/app/deposit/datasets/depositDatasets.component.ts b/production-portal/src/app/deposit/datasets/depositDatasets.component.ts deleted file mode 100644 index acb3bcf8..00000000 --- a/production-portal/src/app/deposit/datasets/depositDatasets.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-deposit-datasets', - template: ` - - - - ` -}) - -export class OpenaireDepositDatasetsComponent { - -} diff --git a/production-portal/src/app/deposit/datasets/depositDatasets.module.ts b/production-portal/src/app/deposit/datasets/depositDatasets.module.ts deleted file mode 100644 index 257a1e3c..00000000 --- a/production-portal/src/app/deposit/datasets/depositDatasets.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { OpenaireDepositDatasetsComponent } from './depositDatasets.component'; - import {DepositDatasetsRoutingModule} from './depositDatasets-routing.module'; -import {DepositDatasetsModule} from '../../openaireLibrary/deposit/datasets/depositDatasets.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' -@NgModule({ - imports: [ - CommonModule, FormsModule, - DepositDatasetsModule, - DepositDatasetsRoutingModule - ], - declarations: [ - - OpenaireDepositDatasetsComponent - - ], - exports: [ - OpenaireDepositDatasetsComponent - ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled] -}) -export class LibDepositDatasetsModule { } diff --git a/production-portal/src/app/deposit/datasets/depositDatasetsResult.component.ts b/production-portal/src/app/deposit/datasets/depositDatasetsResult.component.ts deleted file mode 100644 index 46137124..00000000 --- a/production-portal/src/app/deposit/datasets/depositDatasetsResult.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-deposit-datasets-result', - template: ` - - - - ` -}) - -export class OpenaireDepositDatasetsResultComponent { - -} diff --git a/production-portal/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts b/production-portal/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts deleted file mode 100644 index 1d1a3bf8..00000000 --- a/production-portal/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { OpenaireDepositDatasetsResultComponent } from './depositDatasetsResult.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireDepositDatasetsResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class DepositDatasetsResultsRoutingModule { } diff --git a/production-portal/src/app/deposit/datasets/depositDatasetsResults.module.ts b/production-portal/src/app/deposit/datasets/depositDatasetsResults.module.ts deleted file mode 100644 index 1843d32a..00000000 --- a/production-portal/src/app/deposit/datasets/depositDatasetsResults.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { OpenaireDepositDatasetsResultComponent } from './depositDatasetsResult.component'; - -import {DepositDatasetsResultsRoutingModule} from './depositDatasetsResults-routing.module'; -import {DepositDatasetsResultsModule} from '../../openaireLibrary/deposit/datasets/depositDatasetsResults.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [ - CommonModule, FormsModule, - DepositDatasetsResultsModule, - DepositDatasetsResultsRoutingModule - ], - declarations: [ - - OpenaireDepositDatasetsResultComponent, - - ], - exports: [ - OpenaireDepositDatasetsResultComponent, - ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled] -}) -export class LibDepositDatasetsResultsModule { } diff --git a/production-portal/src/app/deposit/publications/depositPublications-routing.module.ts b/production-portal/src/app/deposit/publications/depositPublications-routing.module.ts deleted file mode 100644 index 3b3df71c..00000000 --- a/production-portal/src/app/deposit/publications/depositPublications-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { OpenaireDepositPublicationsComponent } from './depositPublications.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireDepositPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class DepositPublicationsRoutingModule { } diff --git a/production-portal/src/app/deposit/publications/depositPublications.component.ts b/production-portal/src/app/deposit/publications/depositPublications.component.ts deleted file mode 100644 index 5708fb0c..00000000 --- a/production-portal/src/app/deposit/publications/depositPublications.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-deposit-publications', - template: ` - - ` -}) - -export class OpenaireDepositPublicationsComponent { - } diff --git a/production-portal/src/app/deposit/publications/depositPublications.module.ts b/production-portal/src/app/deposit/publications/depositPublications.module.ts deleted file mode 100644 index b0196072..00000000 --- a/production-portal/src/app/deposit/publications/depositPublications.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { OpenaireDepositPublicationsComponent } from './depositPublications.component'; - -import {DepositPublicationsRoutingModule} from './depositPublications-routing.module'; -import {DepositPublicationsModule} from '../../openaireLibrary/deposit/publications/depositPublications.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' -@NgModule({ - imports: [ - CommonModule, FormsModule, - DepositPublicationsModule, - DepositPublicationsRoutingModule - ], - declarations: [ - OpenaireDepositPublicationsComponent - ], - exports: [ - OpenaireDepositPublicationsComponent, - ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled] -}) -export class LibDepositPublicationsModule { } diff --git a/production-portal/src/app/deposit/publications/depositPublicationsResult-routing.module.ts b/production-portal/src/app/deposit/publications/depositPublicationsResult-routing.module.ts deleted file mode 100644 index abd07d5b..00000000 --- a/production-portal/src/app/deposit/publications/depositPublicationsResult-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { OpenaireDepositPublicationsResultComponent } from './depositPublicationsResult.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireDepositPublicationsResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class DepositPublicationsResultRoutingModule { } diff --git a/production-portal/src/app/deposit/publications/depositPublicationsResult.component.ts b/production-portal/src/app/deposit/publications/depositPublicationsResult.component.ts deleted file mode 100644 index 0f7c1d6a..00000000 --- a/production-portal/src/app/deposit/publications/depositPublicationsResult.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {Component} from '@angular/core'; - -@Component({ - selector: 'openaire-deposit-publications-result', - template: ` - - ` -}) - -export class OpenaireDepositPublicationsResultComponent { - -} diff --git a/production-portal/src/app/deposit/publications/depositPublicationsResults.module.ts b/production-portal/src/app/deposit/publications/depositPublicationsResults.module.ts deleted file mode 100644 index b8411c88..00000000 --- a/production-portal/src/app/deposit/publications/depositPublicationsResults.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { OpenaireDepositPublicationsResultComponent } from './depositPublicationsResult.component'; - -import {DepositPublicationsResultRoutingModule} from './depositPublicationsResult-routing.module'; -import {DepositPublicationsResultsModule} from '../../openaireLibrary/deposit/publications/depositPublicationsResults.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' -@NgModule({ - imports: [ - CommonModule, FormsModule, - DepositPublicationsResultsModule, - DepositPublicationsResultRoutingModule - ], - declarations: [ - OpenaireDepositPublicationsResultComponent - ], - exports: [ - OpenaireDepositPublicationsResultComponent - ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled] -}) -export class LibDepositPublicationsResultsModule { } diff --git a/production-portal/src/app/error/errorPage.component.ts b/production-portal/src/app/error/errorPage.component.ts deleted file mode 100644 index e96d3dcb..00000000 --- a/production-portal/src/app/error/errorPage.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { Location } from '@angular/common'; - -@Component({ - selector: 'openaire-error', - template: ` - - ` -}) - -export class OpenaireErrorPageComponent { - -} diff --git a/production-portal/src/app/home/home-routing.module.ts b/production-portal/src/app/home/home-routing.module.ts deleted file mode 100644 index e372e73f..00000000 --- a/production-portal/src/app/home/home-routing.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{HomeComponent} from './home.component'; -import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: HomeComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class HomeRoutingModule { } diff --git a/production-portal/src/app/home/home.component.html b/production-portal/src/app/home/home.component.html deleted file mode 100644 index 8adcd8cc..00000000 --- a/production-portal/src/app/home/home.component.html +++ /dev/null @@ -1,549 +0,0 @@ - - - -
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-

- {{publicationsSize.number|number}} {{publicationsSize.size}} publications{{((showDatasets && datasetsSize)?",":"")}} - {{datasetsSize.number|number}} {{datasetsSize.size}} research data -
- from {{datasourcesSize.number |number}} {{datasourcesSize.size}} content providers - {{((showDataProviders && datasourcesSize)?" and ":" from ")}} {{fundersSize.number|number}} {{fundersSize.size}} funders - - linked together for an integrated research search - -

-
- - -
-
-
- -
-
-
- - - -
-
-
-
-
-
-
- - Explore -

- Explore -

-
Discover linked open research
-
Search for - publications, datasets, software and other research products. See how these - are linked together and how they are linked to funding and - organizations. -
- View statistics on projects and institutions. -
-
-
- -
-
- - Share - -

- Share -

-
Deposit in a repository of your choice
-
- Select an OpenAIRE compatible repository (2.0 +) so that your research is linked to your funding information. -
- Use ZENODO, - a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.) -
-
-
- - - -
-
- Link - - -

- Link -

-
Connect all your research
-
- If you can't find your research results in OpenAIRE, don't worry! -
- Use our LINK OUT service, - that reaches out to many external sources via APIs, to connect your research results and claim them to your project. -
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- -

Have more questions?

-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-

- Our community -

-
- -
- -
- -

- {{publicationsSize.count|number}} publications -

-

- {{datasetsSize.count|number}} research data -

- - - - -
- - -
- -
-
-

- {{datasourcesSize.number |number}} {{datasourcesSize.size}}
- content providers -

-

- {{fundersSize.number|number}} {{fundersSize.size}}
- Funders -

-

- {{projectsSize.count|number}}
- Projects -

-
- - - - - -
-
-
-
- -
- -

- Our data policies -

-
- -
    -
  • -
    Data acquisition
    -
    - How we retrieve data, how often, what processes it goes through (aggregating cleaning, transforming, inferring, de-duplicating), what are the quality checks along all  data processing stages. -
    -
    • -
  • -
    Data usage
    -
    - Who is able to retrieve our data, what are the licences, what about specific SLAs. -
    -
    • -
-
-
- - Learn more - -
-
-
- - -
-
-
-
- - - - - - - - - - - - - -
-
-
- -
-
-

- Content provider? -

-
- Join OpenAIRE, use our tools and make your content more visible around the world. -
-

- - OpenAIRE.PROVIDE - -

-
-
-
-
-

- Research community? -

-
- Use a trusted partner to share, link, disseminate and monitor your research. -
-

- - OpenAIRE.CONNECT - -

-
-
-
-
-

- Research manager? -

-
- Use our monitoring services and easily track all relevant research results. -
-

- - OpenAIRE.MONITOR - -

-
-
-
-
-

- Developer? -

-
- Get access to OpenAIRE data and capitalize on on Europe's open linked research -
-

- - OpenAIRE.DEVELOP - -

-
-
-
-
-
- - - diff --git a/production-portal/src/app/home/home.component.ts b/production-portal/src/app/home/home.component.ts deleted file mode 100644 index 283675ed..00000000 --- a/production-portal/src/app/home/home.component.ts +++ /dev/null @@ -1,195 +0,0 @@ -import {Component, Input, Output, EventEmitter, ViewChild, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {ActivatedRoute, Router} from '@angular/router'; -import {Location} from '@angular/common'; -import "rxjs/add/observable/zip"; -import {Title, Meta} from '@angular/platform-browser'; -import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; -import { SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service'; -import { FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class'; -import { SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service'; -import { SearchProjectsService} from '../openaireLibrary/services/searchProjects.service'; -import { SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service'; -import { SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service'; -import { RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service'; -import { SearchFields} from '../openaireLibrary/utils/properties/searchFields'; -import { NumberUtils} from '../openaireLibrary/utils/number-utils.class'; - -import { RouterHelper} from '../openaireLibrary/utils/routerHelper.class'; -import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; -import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; -import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; -import { SEOService } from '../openaireLibrary/sharedComponents/SEO/SEO.service'; - -@Component({ - selector: 'home', - templateUrl: 'home.component.html', -}) -export class HomeComponent { - public piwiksub: any; - public subfunders: any; - - public pageTitle = "OpenAIRE" - public keyword:string = ""; - - public searchFields:SearchFields = new SearchFields(); - public errorCodes:ErrorCodes = new ErrorCodes(); - public routerHelper:RouterHelper = new RouterHelper(); - - public publicationsSize:any = null; - public datasetsSize:any = null; - public fundersSize:any = null; - public projectsSize:any = null; - public datasourcesSize:any = null; - - private numResults: number = 2; - public fetchDataproviders : FetchDataproviders; - - showPublications:boolean= false; - showDatasets:boolean= false; - showProjects:boolean= false; - showDataProviders:boolean= false; - properties: EnvProperties; -public subPub;public subData;public subProjects;public subOrg; public subDataPr; - - constructor ( - private route: ActivatedRoute, - private _router: Router, - private _searchPublicationsService: SearchPublicationsService, - private _searchDataprovidersService: SearchDataprovidersService, - private _searchProjectsService: SearchProjectsService, - private _searchDatasetsService: SearchDatasetsService, - private _searchOrganizationsService: SearchOrganizationsService, - private _refineFieldResultsService:RefineFieldResultsService, - private location: Location, private _piwikService:PiwikService, - private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService - ) { - - var description = "openAIRE explore, open access, publications, research results, European commission, search"; - - var title = "OpenAIRE | Explore"; - - this._title.setTitle(title); - this._meta.updateTag({content:description},"name='description'"); - this._meta.updateTag({content:description},"property='og:description'"); - this._meta.updateTag({content:title},"property='og:title'"); - this.seoService.createLinkForCanonicalURL(false); - - - //this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); - } - - public ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - if(this.properties!=null){ - var url = this.properties.baseLink+this._router.url; - this._meta.updateTag({content:url},"property='og:url'"); - if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ - this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe(); - } - - this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity ).subscribe(data => { - var showEntity = {}; - for(var i=0; i< data.entities.length; i++){ - - showEntity[""+data.entities[i]["pid"]+""] = data.entities[i]["isEnabled"]; - } - this.showPublications = showEntity["publication"]; - this.showDatasets = showEntity["dataset"]; - this.showProjects = showEntity["project"]; - this.showDataProviders = showEntity["datasource"]; - this.getNumbers(); - // if(this.showDataProviders) { - // this.fetchDataproviders.getResultsForHome(this.numResults, this.properties); - // } - }); - } - }); - - } - public ngOnDestroy() { - if(this.piwiksub){ - this.piwiksub.unsubscribe(); - } - if(this.subfunders){ - this.subfunders.unsubscribe(); - } - if(this.subPub){ - this.subPub.unsubscribe(); - } - if(this.subData){ - this.subData.unsubscribe(); - } - // if(this.subProjects){ - // this.subProjects.unsubscribe(); - // } - // if(this.subOrg){ - // this.subOrg.unsubscribe(); - // } - if(this.subDataPr){ - this.subDataPr.unsubscribe(); - } - - } - - private getNumbers() { - if(this.showPublications){ - this.subPub = this._searchPublicationsService.numOfSearchPublications("", this.properties).subscribe( - data => { - if(data && data != null && data > 0 ){ - this.publicationsSize = NumberUtils.roundNumber(data); - - } - }, - err => { - console.log(err); - } - ); - } - if(this.showDatasets){ - this.subData = this._searchDatasetsService.numOfSearchDatasets("", this.properties).subscribe( - data => { - if(data && data != null && data > 0 ){ - this.datasetsSize = NumberUtils.roundNumber(data); - } - }, - err => { - console.log(err); - } - ); - } - if(this.showProjects){ - this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"],"project", this.properties).subscribe( - data => { - - - if(data[0] && data[0] > 0 ){ - this.projectsSize = NumberUtils.roundNumber(data[0]); - } - if(data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values ){ - this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length); - } - - }, - err => { - console.log(err); - }); - } - if(this.showDataProviders){ - this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties).subscribe( - data => { - if(data && data != null && data > 0 ){ - this.datasourcesSize = NumberUtils.roundNumber(data); - } - - }, - err => { - console.log(err); - - } - ); - } - } -} diff --git a/production-portal/src/app/home/home.module.ts b/production-portal/src/app/home/home.module.ts deleted file mode 100644 index c986f152..00000000 --- a/production-portal/src/app/home/home.module.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; - -import{HomeRoutingModule} from './home-routing.module'; -import{HomeComponent} from './home.component'; - -import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvidersService.module'; -import { DatasetsServiceModule} from '../openaireLibrary/services/datasetsService.module'; -import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module'; -import { PublicationsServiceModule} from '../openaireLibrary/services/publicationsService.module'; -import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module'; -import { SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module'; -import {PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module'; - -import {HelperModule} from '../openaireLibrary/utils/helper/helper.module'; - -import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module'; -import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; -import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {Schema2jsonldModule} from '../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module'; -import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module'; - -import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module'; - - @NgModule({ - imports: [ - CommonModule, FormsModule, RouterModule, - RefineFieldResultsServiceModule, - DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule, - PublicationsServiceModule, - OrganizationsServiceModule, - SearchFormModule, - PiwikServiceModule, - HomeRoutingModule, - HelperModule, - ErrorMessagesModule, - Schema2jsonldModule, SEOServiceModule - ], - declarations: [ - HomeComponent - ], - providers:[ - FreeGuard, PreviousRouteRecorder, ConfigurationService - ], - exports: [ - HomeComponent - ] -}) -export class HomeModule { } diff --git a/production-portal/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/production-portal/src/app/landingPages/dataProvider/dataProvider-routing.module.ts deleted file mode 100644 index c9e1d332..00000000 --- a/production-portal/src/app/landingPages/dataProvider/dataProvider-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireDataProviderComponent } from './dataProvider.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class DataProviderRoutingModule { } diff --git a/production-portal/src/app/landingPages/dataProvider/dataProvider.component.ts b/production-portal/src/app/landingPages/dataProvider/dataProvider.component.ts deleted file mode 100644 index b9d6af79..00000000 --- a/production-portal/src/app/landingPages/dataProvider/dataProvider.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; - -@Component({ - selector: 'openaire-dataprovider', - template: ``, - }) -export class OpenaireDataProviderComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/production-portal/src/app/landingPages/dataProvider/libDataProvider.module.ts b/production-portal/src/app/landingPages/dataProvider/libDataProvider.module.ts deleted file mode 100644 index e1b38198..00000000 --- a/production-portal/src/app/landingPages/dataProvider/libDataProvider.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module'; -import { OpenaireDataProviderComponent } from './dataProvider.component'; -import {DataProviderRoutingModule} from './dataProvider-routing.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [DataProviderModule, DataProviderRoutingModule], - declarations:[OpenaireDataProviderComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], - exports:[OpenaireDataProviderComponent] -}) -export class LibDataProviderModule { } diff --git a/production-portal/src/app/landingPages/dataset/dataset-routing.module.ts b/production-portal/src/app/landingPages/dataset/dataset-routing.module.ts deleted file mode 100644 index e5a53a5c..00000000 --- a/production-portal/src/app/landingPages/dataset/dataset-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireDatasetComponent } from './dataset.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class DatasetRoutingModule { } diff --git a/production-portal/src/app/landingPages/dataset/dataset.component.ts b/production-portal/src/app/landingPages/dataset/dataset.component.ts deleted file mode 100644 index 8bf5e065..00000000 --- a/production-portal/src/app/landingPages/dataset/dataset.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; - -@Component({ - selector: 'openaire-dataset', - template: ``, - }) -export class OpenaireDatasetComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/production-portal/src/app/landingPages/dataset/libDataset.module.ts b/production-portal/src/app/landingPages/dataset/libDataset.module.ts deleted file mode 100644 index f167d67b..00000000 --- a/production-portal/src/app/landingPages/dataset/libDataset.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import { DatasetModule } from '../../openaireLibrary/landingPages/dataset/dataset.module'; -import { OpenaireDatasetComponent } from './dataset.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import {DatasetRoutingModule} from './dataset-routing.module'; - @NgModule({ - imports: [DatasetModule, DatasetRoutingModule], - declarations:[OpenaireDatasetComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], - exports:[OpenaireDatasetComponent] -}) -export class LibDatasetModule { } diff --git a/production-portal/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts b/production-portal/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts deleted file mode 100644 index 7d3895a8..00000000 --- a/production-portal/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder]} - ]) -] -}) -export class HtmlProjectReportRoutingModule { } diff --git a/production-portal/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/production-portal/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts deleted file mode 100644 index e834441e..00000000 --- a/production-portal/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; - -@Component({ - selector: 'openaire-htmlProjectReport', - template: ``, - }) -export class OpenaireHtmlProjectReportComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/production-portal/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts b/production-portal/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts deleted file mode 100644 index 769370d8..00000000 --- a/production-portal/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import { HtmlProjectReportModule } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component'; -import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module'; - -@NgModule({ - imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule], - declarations:[OpenaireHtmlProjectReportComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], - exports:[OpenaireHtmlProjectReportComponent] -}) -export class LibHtmlProjectReportModule { } diff --git a/production-portal/src/app/landingPages/organization/libOrganization.module.ts b/production-portal/src/app/landingPages/organization/libOrganization.module.ts deleted file mode 100644 index 4fc9dfb2..00000000 --- a/production-portal/src/app/landingPages/organization/libOrganization.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import { OpenaireOrganizationComponent } from './organization.component'; -import {OrganizationRoutingModule} from './organization-routing.module'; - -@NgModule({ - imports: [OrganizationModule, OrganizationRoutingModule], - declarations:[OpenaireOrganizationComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], - exports:[OpenaireOrganizationComponent] -}) -export class LibOrganizationModule { } diff --git a/production-portal/src/app/landingPages/organization/organization-routing.module.ts b/production-portal/src/app/landingPages/organization/organization-routing.module.ts deleted file mode 100644 index a8d3e704..00000000 --- a/production-portal/src/app/landingPages/organization/organization-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireOrganizationComponent } from './organization.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class OrganizationRoutingModule { } diff --git a/production-portal/src/app/landingPages/organization/organization.component.ts b/production-portal/src/app/landingPages/organization/organization.component.ts deleted file mode 100644 index f3df57b7..00000000 --- a/production-portal/src/app/landingPages/organization/organization.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; - -@Component({ - selector: 'openaire-organization', - template: ``, - }) -export class OpenaireOrganizationComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/production-portal/src/app/landingPages/orp/libOrp.module.ts b/production-portal/src/app/landingPages/orp/libOrp.module.ts deleted file mode 100644 index 813c5e6f..00000000 --- a/production-portal/src/app/landingPages/orp/libOrp.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import { OrpModule } from '../../openaireLibrary/landingPages/orp/orp.module'; -import { OpenaireOrpComponent } from './orp.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import {OrpRoutingModule} from './orp-routing.module'; - @NgModule({ - imports: [OrpModule, OrpRoutingModule], - declarations:[OpenaireOrpComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], - exports:[OpenaireOrpComponent] -}) -export class LibOrpModule { } diff --git a/production-portal/src/app/landingPages/orp/orp-routing.module.ts b/production-portal/src/app/landingPages/orp/orp-routing.module.ts deleted file mode 100644 index 8ac82b7b..00000000 --- a/production-portal/src/app/landingPages/orp/orp-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireOrpComponent } from './orp.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class OrpRoutingModule { } diff --git a/production-portal/src/app/landingPages/orp/orp.component.ts b/production-portal/src/app/landingPages/orp/orp.component.ts deleted file mode 100644 index a63b6fa2..00000000 --- a/production-portal/src/app/landingPages/orp/orp.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; - -@Component({ - selector: 'openaire-orp', - template: ``, - }) -export class OpenaireOrpComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/production-portal/src/app/landingPages/project/libProject.module.ts b/production-portal/src/app/landingPages/project/libProject.module.ts deleted file mode 100644 index 8e2dbd96..00000000 --- a/production-portal/src/app/landingPages/project/libProject.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import { OpenaireProjectComponent } from './project.component'; -import {ProjectRoutingModule} from './project-routing.module'; - -@NgModule({ - imports: [ProjectModule, ProjectRoutingModule], - declarations:[OpenaireProjectComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], - exports:[OpenaireProjectComponent] -}) -export class LibProjectModule { } diff --git a/production-portal/src/app/landingPages/project/project-routing.module.ts b/production-portal/src/app/landingPages/project/project-routing.module.ts deleted file mode 100644 index 23d2efac..00000000 --- a/production-portal/src/app/landingPages/project/project-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { OpenaireProjectComponent } from './project.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) - ] -}) -export class ProjectRoutingModule { } diff --git a/production-portal/src/app/landingPages/project/project.component.ts b/production-portal/src/app/landingPages/project/project.component.ts deleted file mode 100644 index f4876bab..00000000 --- a/production-portal/src/app/landingPages/project/project.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; - -@Component({ - selector: 'openaire-project', - template: ``, - }) -export class OpenaireProjectComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/production-portal/src/app/landingPages/publication/libPublication.module.ts b/production-portal/src/app/landingPages/publication/libPublication.module.ts deleted file mode 100644 index 8a8eae27..00000000 --- a/production-portal/src/app/landingPages/publication/libPublication.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import { PublicationModule } from '../../openaireLibrary/landingPages/publication/publication.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import { OpenairePublicationComponent } from './publication.component'; -import {PublicationRoutingModule} from './publication-routing.module'; - -@NgModule({ - imports: [PublicationModule, PublicationRoutingModule], - declarations:[OpenairePublicationComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], - exports:[OpenairePublicationComponent] -}) -export class LibPublicationModule { } diff --git a/production-portal/src/app/landingPages/publication/publication-routing.module.ts b/production-portal/src/app/landingPages/publication/publication-routing.module.ts deleted file mode 100644 index 629d8467..00000000 --- a/production-portal/src/app/landingPages/publication/publication-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenairePublicationComponent } from './publication.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - },canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class PublicationRoutingModule { } diff --git a/production-portal/src/app/landingPages/publication/publication.component.ts b/production-portal/src/app/landingPages/publication/publication.component.ts deleted file mode 100644 index 41209509..00000000 --- a/production-portal/src/app/landingPages/publication/publication.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; - -@Component({ - selector: 'openaire-publication', - template: ``, - }) -export class OpenairePublicationComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/production-portal/src/app/landingPages/software/libSoftware.module.ts b/production-portal/src/app/landingPages/software/libSoftware.module.ts deleted file mode 100644 index 2d11fad7..00000000 --- a/production-portal/src/app/landingPages/software/libSoftware.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { RouterModule } from '@angular/router'; -import { SoftwareModule } from '../../openaireLibrary/landingPages/software/software.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import { OpenaireSoftwareComponent } from './software.component'; -import {SoftwareRoutingModule} from './software-routing.module'; -@NgModule({ - imports: [SoftwareModule, SoftwareRoutingModule], - declarations:[OpenaireSoftwareComponent], - providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], - exports:[OpenaireSoftwareComponent] -}) -export class LibSoftwareModule { } diff --git a/production-portal/src/app/landingPages/software/software-routing.module.ts b/production-portal/src/app/landingPages/software/software-routing.module.ts deleted file mode 100644 index 845f9fd3..00000000 --- a/production-portal/src/app/landingPages/software/software-routing.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenaireSoftwareComponent } from './software.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder] } - ]) -] -}) -export class SoftwareRoutingModule { } diff --git a/production-portal/src/app/landingPages/software/software.component.ts b/production-portal/src/app/landingPages/software/software.component.ts deleted file mode 100644 index b0730667..00000000 --- a/production-portal/src/app/landingPages/software/software.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; - -@Component({ - selector: 'openaire-software', - template: ``, - }) -export class OpenaireSoftwareComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/production-portal/src/app/login/libUser.module.ts b/production-portal/src/app/login/libUser.module.ts deleted file mode 100644 index b1040ceb..00000000 --- a/production-portal/src/app/login/libUser.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import {OpenaireUserComponent } from './user.component'; -import { UserRoutingModule } from './user-routing.module'; -import { UserModule} from '../openaireLibrary/login/user.module'; - -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - UserRoutingModule, UserModule - - ], - providers:[PreviousRouteRecorder], - declarations: [ -OpenaireUserComponent - -] -}) -export class LibUserModule { } diff --git a/production-portal/src/app/login/user-routing.module.ts b/production-portal/src/app/login/user-routing.module.ts deleted file mode 100644 index 1a8ad90c..00000000 --- a/production-portal/src/app/login/user-routing.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenaireUserComponent } from './user.component'; -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireUserComponent, canDeactivate: [PreviousRouteRecorder]}, - - ]) - ] -}) -export class UserRoutingModule { } diff --git a/production-portal/src/app/login/user.component.ts b/production-portal/src/app/login/user.component.ts deleted file mode 100644 index 0b7e1a32..00000000 --- a/production-portal/src/app/login/user.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Component, ElementRef} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; - -@Component({ - selector: 'openaire-user', - template: `` - }) - -export class OpenaireUserComponent { - -} diff --git a/production-portal/src/app/reload/libReload.module.ts b/production-portal/src/app/reload/libReload.module.ts deleted file mode 100644 index d982aaa9..00000000 --- a/production-portal/src/app/reload/libReload.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; - - import{ReloadModule} from '../openaireLibrary/reload/reload.module'; - - -@NgModule({ - imports: [ - CommonModule, FormsModule, RouterModule, ReloadModule - ], - declarations: [ - - ], - providers:[ - - ], - exports: [ - - ] -}) -export class LibReloadModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts deleted file mode 100644 index febdaa83..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class AdvancedSearchDataProvidersRoutingModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/production-portal/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts deleted file mode 100644 index f5cc238b..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - - -@Component({ - selector: 'openaire-advanced-search-dataprovider', - template: ` - - - - ` - }) - -export class OpenaireAdvancedSearchDataProvidersComponent { -} diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts deleted file mode 100644 index 03ab04be..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module'; -import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component'; -import {AdvancedSearchDataProvidersModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchDataProvidersRoutingModule, - AdvancedSearchDataProvidersModule - - ], - declarations: [ - OpenaireAdvancedSearchDataProvidersComponent - ], - providers:[FreeGuard, IsRouteEnabled], - exports: [ - OpenaireAdvancedSearchDataProvidersComponent - ] -}) -export class LibAdvancedSearchDataProvidersModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts deleted file mode 100644 index 9d6ac540..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class AdvancedSearchDatasetsRoutingModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchDatasets.component.ts b/production-portal/src/app/searchPages/advanced/advancedSearchDatasets.component.ts deleted file mode 100644 index 86e57d05..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchDatasets.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - - -@Component({ - selector: 'openaire-advanced-search-datasets', - template: ` - - - - ` - }) - -export class OpenaireAdvancedSearchDatasetsComponent { - - -} diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchDatasets.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchDatasets.module.ts deleted file mode 100644 index 3df2c856..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchDatasets.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module'; -import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; - - - import {AdvancedSearchDatasetsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDatasets.module'; - import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; - import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchDatasetsModule, - AdvancedSearchDatasetsRoutingModule - - ], - declarations: [ - OpenaireAdvancedSearchDatasetsComponent - ], - providers:[FreeGuard, IsRouteEnabled], - exports: [ - OpenaireAdvancedSearchDatasetsComponent - ] -}) -export class LibAdvancedSearchDatasetsModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts deleted file mode 100644 index 13ecad75..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - },canDeactivate: [PreviousRouteRecorder]} - - ]) - ] -}) -export class AdvancedSearchOrganizationsRoutingModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/production-portal/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts deleted file mode 100644 index cc9339ef..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - - -@Component({ - selector: 'openaire-advanced-search-organizations', - template: ` - - - - ` - }) - -export class OpenaireAdvancedSearchOrganizationsComponent { - - -} diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts deleted file mode 100644 index 6bccbcce..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module'; -import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - import { AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchOrganizationsModule, - AdvancedSearchOrganizationsRoutingModule - - ], - declarations: [ - OpenaireAdvancedSearchOrganizationsComponent - ], - providers:[FreeGuard, IsRouteEnabled], - exports: [ - OpenaireAdvancedSearchOrganizationsComponent - ] -}) -export class LibAdvancedSearchOrganizationsModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts deleted file mode 100644 index d131f70d..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class AdvancedSearchOrpsRoutingModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchOrps.component.ts b/production-portal/src/app/searchPages/advanced/advancedSearchOrps.component.ts deleted file mode 100644 index 262ab1b1..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchOrps.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - - -@Component({ - selector: 'openaire-advanced-search-orps', - template: ` - - - - ` - }) - -export class OpenaireAdvancedSearchOrpsComponent { - - -} diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchOrps.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchOrps.module.ts deleted file mode 100644 index 8d8d3137..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchOrps.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module'; -import { OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; - - - import {AdvancedSearchOrpsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchOrps.module'; - import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; - import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchOrpsModule, - AdvancedSearchOrpsRoutingModule - - ], - declarations: [ - OpenaireAdvancedSearchOrpsComponent - ], - providers:[FreeGuard, IsRouteEnabled], - exports: [ - OpenaireAdvancedSearchOrpsComponent - ] -}) -export class LibAdvancedSearchOrpsModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts deleted file mode 100644 index d1796128..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class AdvancedSearchProjectsRoutingModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/production-portal/src/app/searchPages/advanced/advancedSearchProjects.component.ts deleted file mode 100644 index 50bf7e49..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchProjects.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; -@Component({ - selector: 'openaire-advanced-search-projects', - template: ` - - - - ` - }) - -export class OpenaireAdvancedSearchProjectsComponent { - -} diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchProjects.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchProjects.module.ts deleted file mode 100644 index 4949aa83..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchProjects.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module'; -import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component'; - - - import {AdvancedSearchProjectsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module'; - import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; - import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchProjectsModule, - AdvancedSearchProjectsRoutingModule - - ], - declarations: [ - OpenaireAdvancedSearchProjectsComponent - ], - providers:[FreeGuard, IsRouteEnabled], - exports: [ - OpenaireAdvancedSearchProjectsComponent - ] -}) -export class LibAdvancedSearchProjectsModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts deleted file mode 100644 index b755d0a9..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class AdvancedSearchPublicationsRoutingModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchPublications.component.ts b/production-portal/src/app/searchPages/advanced/advancedSearchPublications.component.ts deleted file mode 100644 index 26e393d9..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchPublications.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - - -@Component({ - selector: 'openaire-advanced-search-publications', - template: ` - - - ` - }) - -export class OpenaireAdvancedSearchPublicationsComponent { -} diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchPublications.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchPublications.module.ts deleted file mode 100644 index 3b92f3dc..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchPublications.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module'; -import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; - - - import {AdvancedSearchPublicationsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchPublications.module'; - import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; - import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchPublicationsModule, - AdvancedSearchPublicationsRoutingModule - - ], - declarations: [ - OpenaireAdvancedSearchPublicationsComponent - ], - providers:[FreeGuard, IsRouteEnabled], - exports: [ - OpenaireAdvancedSearchPublicationsComponent - ] -}) -export class LibAdvancedSearchPublicationsModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts deleted file mode 100644 index e352163d..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireAdvancedSearchSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class AdvancedSearchSoftwareRoutingModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchSoftware.component.ts b/production-portal/src/app/searchPages/advanced/advancedSearchSoftware.component.ts deleted file mode 100644 index 4bc30c7a..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchSoftware.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - -@Component({ - selector: 'openaire-advanced-search-software', - template: ` - - - - ` - }) - -export class OpenaireAdvancedSearchSoftwareComponent { - - -} diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchSoftware.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchSoftware.module.ts deleted file mode 100644 index f379f3da..00000000 --- a/production-portal/src/app/searchPages/advanced/advancedSearchSoftware.module.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module'; -import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; - - - import {AdvancedSearchSoftwareModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchSoftware.module'; - import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; - import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [ - CommonModule, FormsModule, - AdvancedSearchSoftwareModule, - AdvancedSearchSoftwareRoutingModule - - ], - declarations: [ - OpenaireAdvancedSearchSoftwareComponent - ], - providers:[FreeGuard - ], - exports: [ - OpenaireAdvancedSearchSoftwareComponent - ] -}) -export class LibAdvancedSearchSoftwareModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts b/production-portal/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts deleted file mode 100644 index 6221c85d..00000000 --- a/production-portal/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class CompatibleDataProvidersRoutingModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts b/production-portal/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts deleted file mode 100644 index d74440b1..00000000 --- a/production-portal/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; -import { ActivatedRoute} from '@angular/router'; - -@Component({ - selector: 'openaire-search-content-providers', - template: ` - - - - - ` - -}) -export class OpenaireSearchCompatibleDataprovidersComponent { - -} diff --git a/production-portal/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts b/production-portal/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts deleted file mode 100644 index 8ce1cb9d..00000000 --- a/production-portal/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module'; -import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - -import { CompatibleDataProvidersModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProviders.module'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - CompatibleDataProvidersModule, - CompatibleDataProvidersRoutingModule - - ], - declarations: [ - OpenaireSearchCompatibleDataprovidersComponent - ], - providers:[FreeGuard, IsRouteEnabled], - exports: [ - OpenaireSearchCompatibleDataprovidersComponent - ] -}) -export class LibCompatibleDataProvidersModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts b/production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts deleted file mode 100644 index d3d7b170..00000000 --- a/production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class CompatibleDataProvidersTableRoutingModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts b/production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts deleted file mode 100644 index eb8908f5..00000000 --- a/production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - - -@Component({ - selector: 'openaire-search-content-providers-table', - template: ` - - - - ` - -}) -export class OpenaireSearchCompatibleDataprovidersTableComponent { -} diff --git a/production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts b/production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts deleted file mode 100644 index 495ccacf..00000000 --- a/production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component'; -import {CompatibleDataProvidersTableRoutingModule} from './compatibleDataProvidersTable-routing.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import { CompatibleDataProvidersTableModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProvidersTable.module'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - CompatibleDataProvidersTableModule, - CompatibleDataProvidersTableRoutingModule - - ], providers:[FreeGuard, IsRouteEnabled], - declarations: [ - OpenaireSearchCompatibleDataprovidersTableComponent - ], - exports: [ - OpenaireSearchCompatibleDataprovidersTableComponent - ] -}) -export class LibCompatibleDataProvidersTableModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts b/production-portal/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts deleted file mode 100644 index b1baff2a..00000000 --- a/production-portal/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class EntityRegistriesRoutingModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/entityRegistries.component.ts b/production-portal/src/app/searchPages/dataProviders/entityRegistries.component.ts deleted file mode 100644 index 82336f90..00000000 --- a/production-portal/src/app/searchPages/dataProviders/entityRegistries.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; -import { ActivatedRoute} from '@angular/router'; - -@Component({ - selector: 'openaire-search-entity-registries', - template: ` - - - - - ` - -}) -export class OpenaireSearchEntityRegistriesComponent { - -} diff --git a/production-portal/src/app/searchPages/dataProviders/entityRegistries.module.ts b/production-portal/src/app/searchPages/dataProviders/entityRegistries.module.ts deleted file mode 100644 index 8d81f190..00000000 --- a/production-portal/src/app/searchPages/dataProviders/entityRegistries.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module'; -import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - -import {EntityRegistriesModule } from '../../openaireLibrary/searchPages/dataProviders/entityRegistries.module'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - EntityRegistriesModule, EntityRegistriesRoutingModule - - ], - declarations: [ - OpenaireSearchEntityRegistriesComponent - ], - providers:[FreeGuard, IsRouteEnabled], - exports: [ - OpenaireSearchEntityRegistriesComponent - ] -}) -export class LibEntityRegistriesModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts b/production-portal/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts deleted file mode 100644 index d0f2250a..00000000 --- a/production-portal/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class EntityRegistriesTableRoutingModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts b/production-portal/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts deleted file mode 100644 index 108c28d0..00000000 --- a/production-portal/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component} from '@angular/core'; - - -@Component({ - selector: 'openaire-search-entity-registries-table', - template: ` - - - - - ` - -}) -export class OpenaireSearchEntityRegistriesTableComponent { - -} diff --git a/production-portal/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts b/production-portal/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts deleted file mode 100644 index 6cb59045..00000000 --- a/production-portal/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component'; - import {EntityRegistriesTableRoutingModule} from './entityRegistriesTable-routing.module'; -import { EntityRegistriesTableModule} from '../../openaireLibrary/searchPages/dataProviders/entityRegistriesTable.module'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - EntityRegistriesTableRoutingModule, - EntityRegistriesTableModule - - ], providers:[FreeGuard, IsRouteEnabled], - declarations: [ - OpenaireSearchEntityRegistriesTableComponent - ], - exports: [ - OpenaireSearchEntityRegistriesTableComponent - ] -}) -export class LibEntityRegistriesTableModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/journals-routing.module.ts b/production-portal/src/app/searchPages/dataProviders/journals-routing.module.ts deleted file mode 100644 index 5c433252..00000000 --- a/production-portal/src/app/searchPages/dataProviders/journals-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchJournalsComponent} from './journals.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class JournalsRoutingModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/journals.component.ts b/production-portal/src/app/searchPages/dataProviders/journals.component.ts deleted file mode 100644 index e54fae66..00000000 --- a/production-portal/src/app/searchPages/dataProviders/journals.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; -import { ActivatedRoute} from '@angular/router'; - -@Component({ - selector: 'openaire-search-journals', - template: ` - - - - ` - -}) -export class OpenaireSearchJournalsComponent { -} diff --git a/production-portal/src/app/searchPages/dataProviders/journals.module.ts b/production-portal/src/app/searchPages/dataProviders/journals.module.ts deleted file mode 100644 index db4d5953..00000000 --- a/production-portal/src/app/searchPages/dataProviders/journals.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ JournalsRoutingModule} from './journals-routing.module'; -import{OpenaireSearchJournalsComponent} from './journals.component'; -import { JournalsModule} from '../../openaireLibrary/searchPages/dataProviders/journals.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -@NgModule({ - imports: [ - CommonModule, FormsModule, JournalsRoutingModule, JournalsModule - - ], - declarations: [ - OpenaireSearchJournalsComponent - ], - providers:[FreeGuard, IsRouteEnabled], - exports: [ - OpenaireSearchJournalsComponent - ] -}) -export class LibJournalsModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/journalsTable-routing.module.ts b/production-portal/src/app/searchPages/dataProviders/journalsTable-routing.module.ts deleted file mode 100644 index 6f3aaf79..00000000 --- a/production-portal/src/app/searchPages/dataProviders/journalsTable-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchJournalsTableComponent} from './journalsTable.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - } , canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class JournalsTableRoutingModule { } diff --git a/production-portal/src/app/searchPages/dataProviders/journalsTable.component.ts b/production-portal/src/app/searchPages/dataProviders/journalsTable.component.ts deleted file mode 100644 index 7d4f066f..00000000 --- a/production-portal/src/app/searchPages/dataProviders/journalsTable.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component } from '@angular/core'; - - -@Component({ - selector: 'openaire-search-journals-table', - template: ` - - - - ` - -}) -export class OpenaireSearchJournalsTableComponent { - -} diff --git a/production-portal/src/app/searchPages/dataProviders/journalsTable.module.ts b/production-portal/src/app/searchPages/dataProviders/journalsTable.module.ts deleted file mode 100644 index c821bd2b..00000000 --- a/production-portal/src/app/searchPages/dataProviders/journalsTable.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{OpenaireSearchJournalsTableComponent} from './journalsTable.component'; - -import {JournalsTableRoutingModule} from './journalsTable-routing.module'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; -import { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProviders/journalsTable.module'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - JournalsTableModule, JournalsTableRoutingModule - - ], providers:[FreeGuard, IsRouteEnabled], - declarations: [ - OpenaireSearchJournalsTableComponent - ], - exports: [ - OpenaireSearchJournalsTableComponent - ] -}) -export class LibJournalsTableModule { } diff --git a/production-portal/src/app/searchPages/find/libSearch.module.ts b/production-portal/src/app/searchPages/find/libSearch.module.ts deleted file mode 100644 index 84fef82a..00000000 --- a/production-portal/src/app/searchPages/find/libSearch.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import {MainSearchModule} from '../../openaireLibrary/searchPages/find/mainSearch.module'; - -import { OpenaireSearchComponent } from './search.component'; -import { MainSearchRoutingModule } from './mainSearch-routing.module'; - -@NgModule({ - imports: [ MainSearchRoutingModule, MainSearchModule], - declarations:[OpenaireSearchComponent], - exports:[OpenaireSearchComponent] -}) -export class LibMainSearchModule { } diff --git a/production-portal/src/app/searchPages/find/mainSearch-routing.module.ts b/production-portal/src/app/searchPages/find/mainSearch-routing.module.ts deleted file mode 100644 index 193e0c1f..00000000 --- a/production-portal/src/app/searchPages/find/mainSearch-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchComponent} from './search.component'; -// import {FreeGuard} from'../../login/freeGuard.guard'; -// import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchComponent } - // { path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class MainSearchRoutingModule { } diff --git a/production-portal/src/app/searchPages/find/search.component.ts b/production-portal/src/app/searchPages/find/search.component.ts deleted file mode 100644 index bfa55ace..00000000 --- a/production-portal/src/app/searchPages/find/search.component.ts +++ /dev/null @@ -1,20 +0,0 @@ -import {Component, ViewChild, ElementRef} from '@angular/core'; - -@Component({ - selector: 'openaire-search-find', - template: ` - - - `, - }) -export class OpenaireSearchComponent{ - constructor ( ) { - - } - - ngOnInit() { -} - - - -} diff --git a/production-portal/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/production-portal/src/app/searchPages/simple/searchDataProviders-routing.module.ts deleted file mode 100644 index 1da07378..00000000 --- a/production-portal/src/app/searchPages/simple/searchDataProviders-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class SearchDataProvidersRoutingModule { } diff --git a/production-portal/src/app/searchPages/simple/searchDataProviders.module.ts b/production-portal/src/app/searchPages/simple/searchDataProviders.module.ts deleted file mode 100644 index fbfaf1ea..00000000 --- a/production-portal/src/app/searchPages/simple/searchDataProviders.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component'; -import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' -import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/simple/searchDataProviders.module'; -@NgModule({ - imports: [ - CommonModule, FormsModule, -SearchDataProvidersModule, SearchDataProvidersRoutingModule - - ], - declarations: [ - OpenaireSearchDataprovidersComponent - ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], - exports: [ - OpenaireSearchDataprovidersComponent - ] -}) -export class LibSearchDataProvidersModule { } diff --git a/production-portal/src/app/searchPages/simple/searchDataproviders.component.ts b/production-portal/src/app/searchPages/simple/searchDataproviders.component.ts deleted file mode 100644 index d71593a9..00000000 --- a/production-portal/src/app/searchPages/simple/searchDataproviders.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - -@Component({ - selector: 'openaire-search-dataproviders', - template: ` - - - - - ` -}) -export class OpenaireSearchDataprovidersComponent { - -} diff --git a/production-portal/src/app/searchPages/simple/searchDatasets-routing.module.ts b/production-portal/src/app/searchPages/simple/searchDatasets-routing.module.ts deleted file mode 100644 index 8edc0a76..00000000 --- a/production-portal/src/app/searchPages/simple/searchDatasets-routing.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchDatasetsComponent} from './searchDatasets.component'; -import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }}, - - ]) - ] -}) -export class SearchDatasetsRoutingModule { } diff --git a/production-portal/src/app/searchPages/simple/searchDatasets.component.ts b/production-portal/src/app/searchPages/simple/searchDatasets.component.ts deleted file mode 100644 index 8a0231f2..00000000 --- a/production-portal/src/app/searchPages/simple/searchDatasets.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - -@Component({ - selector: 'openaire-search-datasets', - template: ` - - - - ` -}) - -export class OpenaireSearchDatasetsComponent { - -} diff --git a/production-portal/src/app/searchPages/simple/searchDatasets.module.ts b/production-portal/src/app/searchPages/simple/searchDatasets.module.ts deleted file mode 100644 index 3116a599..00000000 --- a/production-portal/src/app/searchPages/simple/searchDatasets.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ SearchDatasetsRoutingModule} from './searchDatasets-routing.module'; -import{OpenaireSearchDatasetsComponent} from './searchDatasets.component'; - -import {SearchDatasetsModule} from '../../openaireLibrary/searchPages/simple/searchDatasets.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - CommonModule, FormsModule, - SearchDatasetsModule , SearchDatasetsRoutingModule - - ], - declarations: [ - OpenaireSearchDatasetsComponent - ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], - exports: [ - OpenaireSearchDatasetsComponent - ] -}) -export class LibSearchDatasetsModule { } diff --git a/production-portal/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/production-portal/src/app/searchPages/simple/searchOrganizations-routing.module.ts deleted file mode 100644 index 7e3a7096..00000000 --- a/production-portal/src/app/searchPages/simple/searchOrganizations-routing.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class SearchOrganizationsRoutingModule { } diff --git a/production-portal/src/app/searchPages/simple/searchOrganizations.component.ts b/production-portal/src/app/searchPages/simple/searchOrganizations.component.ts deleted file mode 100644 index a61a20d9..00000000 --- a/production-portal/src/app/searchPages/simple/searchOrganizations.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - -@Component({ - selector: 'openaire-search-organizations', - template: ` - - - - - ` - -}) -export class OpenaireSearchOrganizationsComponent { - -} diff --git a/production-portal/src/app/searchPages/simple/searchOrganizations.module.ts b/production-portal/src/app/searchPages/simple/searchOrganizations.module.ts deleted file mode 100644 index f56c7c43..00000000 --- a/production-portal/src/app/searchPages/simple/searchOrganizations.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module'; -import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simple/searchOrganizations.module'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - SearchOrganizationsRoutingModule, SearchOrganizationsModule - - ], - declarations: [ - OpenaireSearchOrganizationsComponent - ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], - exports: [ - OpenaireSearchOrganizationsComponent - ] -}) -export class LibSearchOrganizationsModule { } diff --git a/production-portal/src/app/searchPages/simple/searchOrps-routing.module.ts b/production-portal/src/app/searchPages/simple/searchOrps-routing.module.ts deleted file mode 100644 index ff122a51..00000000 --- a/production-portal/src/app/searchPages/simple/searchOrps-routing.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchOrpsComponent} from './searchOrps.component'; -import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }}, - - ]) - ] -}) -export class SearchOrpsRoutingModule { } diff --git a/production-portal/src/app/searchPages/simple/searchOrps.component.ts b/production-portal/src/app/searchPages/simple/searchOrps.component.ts deleted file mode 100644 index f9a21119..00000000 --- a/production-portal/src/app/searchPages/simple/searchOrps.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - -@Component({ - selector: 'openaire-search-orps', - template: ` - - - - ` -}) - -export class OpenaireSearchOrpsComponent { - -} diff --git a/production-portal/src/app/searchPages/simple/searchOrps.module.ts b/production-portal/src/app/searchPages/simple/searchOrps.module.ts deleted file mode 100644 index dcbdf007..00000000 --- a/production-portal/src/app/searchPages/simple/searchOrps.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ SearchOrpsRoutingModule} from './searchOrps-routing.module'; -import{OpenaireSearchOrpsComponent} from './searchOrps.component'; - -import {SearchOrpsModule} from '../../openaireLibrary/searchPages/simple/searchOrps.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - CommonModule, FormsModule, - SearchOrpsModule , SearchOrpsRoutingModule - - ], - declarations: [ - OpenaireSearchOrpsComponent - ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], - exports: [ - OpenaireSearchOrpsComponent - ] -}) -export class LibSearchOrpsModule { } diff --git a/production-portal/src/app/searchPages/simple/searchProjects-routing.module.ts b/production-portal/src/app/searchPages/simple/searchProjects-routing.module.ts deleted file mode 100644 index 1855ae07..00000000 --- a/production-portal/src/app/searchPages/simple/searchProjects-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchProjectsComponent} from './searchProjects.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class SearchProjectsRoutingModule { } diff --git a/production-portal/src/app/searchPages/simple/searchProjects.component.ts b/production-portal/src/app/searchPages/simple/searchProjects.component.ts deleted file mode 100644 index 3617885e..00000000 --- a/production-portal/src/app/searchPages/simple/searchProjects.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - -@Component({ - selector: 'openaire-search-projects', - template: ` - - - - ` - -}) -export class OpenaireSearchProjectsComponent { - -} diff --git a/production-portal/src/app/searchPages/simple/searchProjects.module.ts b/production-portal/src/app/searchPages/simple/searchProjects.module.ts deleted file mode 100644 index b526ef9d..00000000 --- a/production-portal/src/app/searchPages/simple/searchProjects.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ SearchProjectsRoutingModule} from './searchProjects-routing.module'; -import{OpenaireSearchProjectsComponent} from './searchProjects.component'; - -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' -import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module'; -@NgModule({ - imports: [ - CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule - - ], - declarations: [ - OpenaireSearchProjectsComponent - ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], - exports: [ - OpenaireSearchProjectsComponent - ] -}) -export class LibSearchProjectsModule { } diff --git a/production-portal/src/app/searchPages/simple/searchPublications-routing.module.ts b/production-portal/src/app/searchPages/simple/searchPublications-routing.module.ts deleted file mode 100644 index 93ee9d16..00000000 --- a/production-portal/src/app/searchPages/simple/searchPublications-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { - redirect: '/error', community : 'openaire' - }, canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class SearchPublicationsRoutingModule { } diff --git a/production-portal/src/app/searchPages/simple/searchPublications.component.ts b/production-portal/src/app/searchPages/simple/searchPublications.component.ts deleted file mode 100644 index d5051da5..00000000 --- a/production-portal/src/app/searchPages/simple/searchPublications.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - -@Component({ - selector: 'openaire-search-publications', - template: ` - - - - - ` - -}) -export class OpenaireSearchPublicationsComponent { - - -} diff --git a/production-portal/src/app/searchPages/simple/searchPublications.module.ts b/production-portal/src/app/searchPages/simple/searchPublications.module.ts deleted file mode 100644 index 0209c7ca..00000000 --- a/production-portal/src/app/searchPages/simple/searchPublications.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ SearchPublicationsRoutingModule} from './searchPublications-routing.module'; -import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; - -import { SearchPublicationsModule} from '../../openaireLibrary/searchPages/simple/searchPublications.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [ - CommonModule, FormsModule, SearchPublicationsModule, - - SearchPublicationsRoutingModule - - ], - declarations: [ - OpenaireSearchPublicationsComponent - ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], - exports: [ - OpenaireSearchPublicationsComponent - ] -}) -export class LibSearchPublicationsModule { } diff --git a/production-portal/src/app/searchPages/simple/searchSoftware-routing.module.ts b/production-portal/src/app/searchPages/simple/searchSoftware-routing.module.ts deleted file mode 100644 index 87bfd841..00000000 --- a/production-portal/src/app/searchPages/simple/searchSoftware-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import {OpenaireSearchSoftwareComponent} from './searchSoftware.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] } - - ]) - ] -}) -export class SearchSoftwareRoutingModule { } diff --git a/production-portal/src/app/searchPages/simple/searchSoftware.component.ts b/production-portal/src/app/searchPages/simple/searchSoftware.component.ts deleted file mode 100644 index da673ffd..00000000 --- a/production-portal/src/app/searchPages/simple/searchSoftware.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, Input, ViewChild} from '@angular/core'; - -@Component({ - selector: 'openaire-search-software', - template: ` - - - - ` -}) - -export class OpenaireSearchSoftwareComponent { - -} diff --git a/production-portal/src/app/searchPages/simple/searchSoftware.module.ts b/production-portal/src/app/searchPages/simple/searchSoftware.module.ts deleted file mode 100644 index aef096f5..00000000 --- a/production-portal/src/app/searchPages/simple/searchSoftware.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import{ SearchSoftwareRoutingModule} from './searchSoftware-routing.module'; -import{OpenaireSearchSoftwareComponent} from './searchSoftware.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' - - -import { SearchSoftwareModule} from '../../openaireLibrary/searchPages/simple/searchSoftware.module'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, SearchSoftwareModule, SearchSoftwareRoutingModule - ], - declarations: [ - OpenaireSearchSoftwareComponent - ], - providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled - ], - exports: [ - OpenaireSearchSoftwareComponent - ] -}) -export class LibSearchSoftwareModule { } diff --git a/production-portal/src/app/shared/shared.module.ts b/production-portal/src/app/shared/shared.module.ts deleted file mode 100644 index f0ce0d20..00000000 --- a/production-portal/src/app/shared/shared.module.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { RouterModule } from '@angular/router'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - - -const MODULES = [ - // Do NOT include UniversalModule, HttpModule, or JsonpModule here - CommonModule, - RouterModule, - FormsModule, - ReactiveFormsModule -]; - -const PIPES = [ - // put pipes here -]; - -const COMPONENTS = [ - // put shared components here -]; - - - -@NgModule({ - imports: [ - ...MODULES - ], - declarations: [ - ...PIPES, - ...COMPONENTS - ], - exports: [ - ...MODULES, - ...PIPES, - ...COMPONENTS - ] -}) -export class SharedModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: SharedModule, - }; - } -} diff --git a/production-portal/src/assets/ask-explore.svg b/production-portal/src/assets/ask-explore.svg deleted file mode 100644 index c1a04931..00000000 --- a/production-portal/src/assets/ask-explore.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/production-portal/src/assets/env-properties.json b/production-portal/src/assets/env-properties.json deleted file mode 100644 index 6a48e183..00000000 --- a/production-portal/src/assets/env-properties.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "productionMode" : false, - "enablePiwikTrack" : false, - "enableHelper" : true, - "useCache" : false, - "metricsAPIURL" : "https://services.openaire.eu/usagestats/", - "framesAPIURL" : "https://beta.openaire.eu/stats3/", - "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/", - "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", - "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", - "searchAPIURLLAst" : "https://services.openaire.eu/search/v2/api/", - "searchResourcesAPIURL" : "https://services.openaire.eu/search/v2/api/resources", - "csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports", - "searchCrossrefAPIURL" : "https://api.crossref.org/works", - "searchDataciteAPIURL" : "https://api.datacite.org/works", - - "searchOrcidURL" : "https://pub.orcid.org/v2.1/", - - "pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/", - "doiURL" : "https://dx.doi.org/", - "cordisURL" : "http://cordis.europa.eu/projects/", - "pmcURL" : "http://europepmc.org/articles/", - "handleURL" : "http://hdl.handle.net/", - "openDoarURL": "http://v2.sherpa.ac.uk/id/repository/", - "r3DataURL": "http://service.re3data.org/repository/", - "zenodo" : "https://zenodo.org/", - "openAccess" : "https://www.openaire.eu/support/faq#article-id-234", - "openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310", - "fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - "h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - "ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", - "helpdesk" : "https://www.openaire.eu/support/helpdesk", - "uploadService" : "http://scoobydoo.di.uoa.gr:8000/upload", - - "vocabulariesAPI" :"https://services.openaire.eu/provision/mvc/vocabularies/", - - "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", - "piwikSiteId" : "6", - - "loginUrl" :"http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login", - - "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", - - "cookieDomain" :".di.uoa.gr", - - "feedbackmail" :"openaire.test@gmail.com", - - "helperPageUrl" :"http://scoobydoo.di.uoa.gr:16000/api/page/route", - - "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=", - - "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools/", - - "adminToolsCommunity" :"openaire", - - "datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/", - "contextsAPI":"https://dev-openaire.d4science.org/openaire/context", - "communityAPI": "https://dev-openaire.d4science.org/openaire/community/", - - "csvLimit": 2000, - "pagingLimit": 20, - "resultsPerPage": 10, - - "baseLink" : "https://explore.openaire.eu", - - "searchLinkToPublication" : "/search/publication?articleId=", - "searchLinkToProject" : "/search/project?projectId=", - "searchLinkToDataProvider" : "/search/dataprovider?datasourceId=", - "searchLinkToDataset" : "/search/dataset?datasetId=", - "searchLinkToOrp" : "/search/other?orpId=", - "searchLinkToOrganization" : "/search/organization?organizationId=", - - "searchLinkToPublications" : "/search/find/publications", - "searchLinkToDataProviders" : "/search/find/dataproviders", - "searchLinkToProjects" : "/search/find/projects", - "searchLinkToDatasets" : "/search/find/datasets", - "searchLinkToSoftware" : "/search/find/software", - "searchLinkToOrps" : "/search/find/other", - "searchLinkToOrganizations" : "/search/find/organizations", - "searchLinkToCompatibleDataProviders" : "/search/content-providers", - "searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table", - "searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries", - "searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table", - "searchLinkToJournals" : "/search/journals", - "searchLinkToJournalsTable" : "/search/journals-table", - - "searchLinkToAdvancedPublications" : "/search/advanced/publications", - "searchLinkToAdvancedProjects" : "/search/advanced/projects", - "searchLinkToAdvancedDatasets" : "/search/advanced/datasets", - "searchLinkToAdvancedSoftware" : "/search/advanced/software", - "searchLinkToAdvancedOrps" : "/search/advanced/other", - "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", - "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", - "searchLinkToAdvancedPeople" : "/search/advanced/people", - - "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows", - "showLastIndexInformationLink" : true, - - "widgetLink" : "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=" -} diff --git a/production-portal/src/assets/explore-custom.css b/production-portal/src/assets/explore-custom.css deleted file mode 100644 index 9d7969ad..00000000 --- a/production-portal/src/assets/explore-custom.css +++ /dev/null @@ -1,126 +0,0 @@ -:root { - --portal-main-color: #D95F2D; - --portal-main-contrast: white; - --portal-dark-color: #4687E6; - --openaire-main-color: #313179; - - --explore-portal-color: #D95F2D; - --provide-portal-color: #37C7E9; - --monitor-portal-color: #9ABB55; - --connect-portal-color: #EBB13E; - --develop-portal-color: #DA65AB; - - --explore-portal-lower-tone: #a0462c; - --provide-portal-lower-tone: #3A8FA3; - --monitor-portal-lower-tone: #7c9144; - --connect-portal-lower-tone: #b48536; - --develop-portal-lower-tone: #9f4e7e; -} - - -.tm-toolbar .uk-subnav-line .custom-explore-li { - background:var(--portal-main-color) !important; -} -/* .custom-explore-toolbar ul.uk-subnav.uk-subnav-line{ - background-color: var(--portal-main-color) !important; - } -.custom-explore-toolbar ul.uk-subnav.uk-subnav-line{ - background-color: var(--portal-main-color) !important; -} - .custom-explore-toolbar .inner { - background-color: var(--portal-main-color) !important; - } - - .custom-explore-toolbar{ - border-top-color:var(--portal-main-color) !important; - } */ -.mainPageSearchForm{ - background-image: /*linear-gradient(rgba(255, 255, 255, 0.5),rgba(255, 255, 255, 0.5)),*/ url('home.jpg'); - -} -.firstPageNumbers{ - /* font-weight: 600 !important; */ - /* color: var(--portal-main-color) !important; */ -} - - - -.explore-numbers { - } - -.mainPageBottomInfo{ - background: linear-gradient( rgba(255, 255, 255, 0.5),rgba(255, 255, 255, 0.5)), url('home.jpg'); - background-attachment: scroll, scroll; - background-size: auto auto, auto auto; - background-size: cover; - background-attachment: fixed; - box-sizing: border-box; - min-height: calc(100vh - 412.767px); -} -.box-links .uk-card-header:hover { - text-decoration: underline; - text-decoration-color: currentcolor; - text-decoration-color: #90929D; -} - -.searchForm, .generalSearchForm, -.publicationsSearchForm, -.projectsSearchForm, .projectsTableSearchForm, -.organizationsSearchForm, -.datasetsSearchForm, -.softwareSearchForm, -.orpsSearchForm, -.datasourcesSearchForm, .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm, - .journalsSearchForm, .journalsTableSearchForm, -.entityRegistriesSearchForm, .entityRegistriesTableSearchForm { - - background: url('./Εxplore-sub.jpg') right !important; - -} - -.ask-explore.uk-grid-divider > :not(.uk-first-column)::before { - border-left: 1px solid var(--portal-main-color) ; -} - -.questions .tm-child-list-divider > ul > li:nth-child(n+2), .questions .uk-list-divider > li:nth-child(n+2) { - border-top: 1px solid #c5c5c5; -} - -.questions { - font-size: 15px; - font-weight: bold; - color: #4687E6; -} - -.uk-card-explore { - background-color: var(--portal-main-color); - color: #fff !important; -} - -.uk-card-explore .uk-h3 { - color: #fff !important; -} - -.uk-card-explore .uk-h6 a { - color: #fff !important; - text-decoration: underline; -} - -.uk-card-explore .uk-h5 { - color: #fff !important; - text-transform: uppercase; - font-size: 15px; - font-weight: bolder; -} - -.emphasis { - color: #000; - font-size: 17px; - font-weight: bold; -} - -.portal-color.emphasis { - color: #37C7E9; - font-size: 60px; - font-weight: 300; -} diff --git a/production-portal/src/assets/explore.svg b/production-portal/src/assets/explore.svg deleted file mode 100644 index c41bb4d3..00000000 --- a/production-portal/src/assets/explore.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/production-portal/src/assets/home.jpg b/production-portal/src/assets/home.jpg deleted file mode 100644 index b0fae781..00000000 Binary files a/production-portal/src/assets/home.jpg and /dev/null differ diff --git a/production-portal/src/assets/link.svg b/production-portal/src/assets/link.svg deleted file mode 100644 index b88f9df2..00000000 --- a/production-portal/src/assets/link.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/production-portal/src/assets/lock.svg b/production-portal/src/assets/lock.svg deleted file mode 100644 index 3e7671d8..00000000 --- a/production-portal/src/assets/lock.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/production-portal/src/assets/logo-large-explore.png b/production-portal/src/assets/logo-large-explore.png deleted file mode 100644 index d225e6f4..00000000 Binary files a/production-portal/src/assets/logo-large-explore.png and /dev/null differ diff --git a/production-portal/src/assets/logo-small-explore.png b/production-portal/src/assets/logo-small-explore.png deleted file mode 100644 index 20a16039..00000000 Binary files a/production-portal/src/assets/logo-small-explore.png and /dev/null differ diff --git a/production-portal/src/assets/share.svg b/production-portal/src/assets/share.svg deleted file mode 100644 index 3e22c5a2..00000000 --- a/production-portal/src/assets/share.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/production-portal/src/assets/sky_bw3.png b/production-portal/src/assets/sky_bw3.png deleted file mode 100644 index efff4140..00000000 Binary files a/production-portal/src/assets/sky_bw3.png and /dev/null differ diff --git a/production-portal/src/assets/Εxplore-sub.jpg b/production-portal/src/assets/Εxplore-sub.jpg deleted file mode 100644 index 78d4e8d9..00000000 Binary files a/production-portal/src/assets/Εxplore-sub.jpg and /dev/null differ diff --git a/production-portal/src/environments/environment.prod.ts b/production-portal/src/environments/environment.prod.ts deleted file mode 100644 index 3612073b..00000000 --- a/production-portal/src/environments/environment.prod.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const environment = { - production: true -}; diff --git a/production-portal/src/environments/environment.ts b/production-portal/src/environments/environment.ts deleted file mode 100644 index b7f639ae..00000000 --- a/production-portal/src/environments/environment.ts +++ /dev/null @@ -1,8 +0,0 @@ -// The file contents for the current environment will overwrite these during build. -// The build system defaults to the dev environment which uses `environment.ts`, but if you do -// `ng build --env=prod` then `environment.prod.ts` will be used instead. -// The list of which env maps to which file can be found in `.angular-cli.json`. - -export const environment = { - production: false -}; diff --git a/production-portal/src/index.html b/production-portal/src/index.html deleted file mode 100644 index 3d07b9e3..00000000 --- a/production-portal/src/index.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Search OpenAIRE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - - - diff --git a/production-portal/src/main.server.ts b/production-portal/src/main.server.ts deleted file mode 100644 index d7c01cde..00000000 --- a/production-portal/src/main.server.ts +++ /dev/null @@ -1 +0,0 @@ -export { AppServerModule } from './app/app.server.module'; diff --git a/production-portal/src/main.ts b/production-portal/src/main.ts deleted file mode 100644 index 9e8c381d..00000000 --- a/production-portal/src/main.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { enableProdMode } from '@angular/core'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; - -import { AppModule } from './app/app.module'; -import { environment } from './environments/environment'; - -if (environment.production) { - enableProdMode(); -} - -document.addEventListener('DOMContentLoaded', () => { - platformBrowserDynamic().bootstrapModule(AppModule); -}); diff --git a/production-portal/src/polyfills.ts b/production-portal/src/polyfills.ts deleted file mode 100644 index 98fd8412..00000000 --- a/production-portal/src/polyfills.ts +++ /dev/null @@ -1,72 +0,0 @@ -/** - * This file includes polyfills needed by Angular and is loaded before the app. - * You can add your own extra polyfills to this file. - * - * This file is divided into 2 sections: - * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers. - * 2. Application imports. Files imported after ZoneJS that should be loaded before your main - * file. - * - * The current setup is for so-called "evergreen" browsers; the last versions of browsers that - * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), - * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. - * - * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html - */ - -/*************************************************************************************************** - * BROWSER POLYFILLS - */ - -/** IE9, IE10 and IE11 requires all of the following polyfills. **/ -import 'core-js/es6/symbol'; -import 'core-js/es6/object'; -import 'core-js/es6/function'; -import 'core-js/es6/parse-int'; -import 'core-js/es6/parse-float'; -import 'core-js/es6/number'; -import 'core-js/es6/math'; -import 'core-js/es6/string'; -import 'core-js/es6/date'; -import 'core-js/es6/array'; -import 'core-js/es6/regexp'; -import 'core-js/es6/map'; -import 'core-js/es6/weak-map'; -import 'core-js/es6/set'; - -/** IE10 and IE11 requires the following for NgClass support on SVG elements */ -// import 'classlist.js'; // Run `npm install --save classlist.js`. - -/** Evergreen browsers require these. **/ -import 'core-js/es6/reflect'; -import 'core-js/es7/reflect'; - - -/** - * Required to support Web Animations `@angular/animation`. - * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation - **/ -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. - - - -/*************************************************************************************************** - * Zone JS is required by Angular itself. - */ -import 'zone.js/dist/zone'; // Included with Angular CLI. - - - -/*************************************************************************************************** - * APPLICATION IMPORTS - */ - -/** - * Date, currency, decimal and percent pipes. - * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 - */ -// import 'intl'; // Run `npm install --save intl`. -/** - * Need to import at least one locale-data with intl. - */ -// import 'intl/locale-data/jsonp/en'; diff --git a/production-portal/src/robots.txt b/production-portal/src/robots.txt deleted file mode 100644 index 386929df..00000000 --- a/production-portal/src/robots.txt +++ /dev/null @@ -1,14 +0,0 @@ -User-Agent: * -Disallow: /cache -Disallow: /upload -#Disallow: / - - -Sitemap: https://explore.openaire.eu/sitemap.xml -Sitemap: https://explore.openaire.eu/publicationSitemap.xml -Sitemap: https://explore.openaire.eu/datasetSitemap.xml -Sitemap: https://explore.openaire.eu/softwareSitemap.xml -Sitemap: https://explore.openaire.eu/otherSitemap.xml -Sitemap: https://explore.openaire.eu/projectSitemap.xml -Sitemap: https://explore.openaire.eu/organizationSitemap.xml -Sitemap: https://explore.openaire.eu/dataproviderSitemap.xml diff --git a/production-portal/src/sitemaps/publication/publicationsSitemap.xml b/production-portal/src/sitemaps/publication/publicationsSitemap.xml deleted file mode 100644 index 9798805e..00000000 --- a/production-portal/src/sitemaps/publication/publicationsSitemap.xml +++ /dev/null @@ -1,1922 +0,0 @@ - - - -https://explore.openaire.eu/sitemap1.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap2.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap3.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap4.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap5.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap6.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap7.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap8.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap9.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap10.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap11.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap12.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap13.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap14.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap15.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap16.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap17.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap18.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap19.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap20.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap21.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap22.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap23.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap24.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap25.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap26.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap27.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap28.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap29.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap30.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap31.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap32.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap33.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap34.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap35.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap36.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap37.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap38.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap39.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap40.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap41.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap42.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap43.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap44.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap45.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap46.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap47.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap48.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap49.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap50.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap51.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap52.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap53.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap54.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap55.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap56.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap57.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap58.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap59.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap60.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap61.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap62.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap63.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap64.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap65.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap66.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap67.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap68.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap69.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap70.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap71.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap72.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap73.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap74.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap75.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap76.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap77.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap78.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap79.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap80.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap81.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap82.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap83.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap84.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap85.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap86.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap87.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap88.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap89.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap90.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap91.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap92.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap93.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap94.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap95.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap96.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap97.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap98.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap99.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap100.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap101.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap102.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap103.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap104.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap105.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap106.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap107.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap108.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap109.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap110.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap111.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap112.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap113.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap114.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap115.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap116.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap117.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap118.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap119.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap120.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap121.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap122.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap123.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap124.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap125.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap126.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap127.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap128.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap129.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap130.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap131.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap132.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap133.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap134.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap135.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap136.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap137.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap138.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap139.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap140.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap141.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap142.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap143.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap144.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap145.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap146.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap147.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap148.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap149.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap150.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap151.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap152.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap153.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap154.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap155.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap156.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap157.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap158.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap159.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap160.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap161.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap162.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap163.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap164.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap165.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap166.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap167.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap168.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap169.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap170.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap171.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap172.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap173.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap174.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap175.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap176.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap177.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap178.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap179.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap180.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap181.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap182.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap183.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap184.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap185.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap186.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap187.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap188.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap189.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap190.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap191.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap192.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap193.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap194.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap195.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap196.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap197.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap198.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap199.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap200.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap201.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap202.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap203.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap204.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap205.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap206.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap207.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap208.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap209.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap210.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap211.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap212.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap213.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap214.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap215.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap216.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap217.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap218.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap219.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap220.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap221.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap222.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap223.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap224.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap225.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap226.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap227.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap228.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap229.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap230.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap231.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap232.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap233.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap234.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap235.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap236.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap237.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap238.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap239.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap240.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap241.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap242.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap243.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap244.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap245.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap246.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap247.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap248.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap249.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap250.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap251.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap252.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap253.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap254.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap255.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap256.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap257.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap258.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap259.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap260.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap261.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap262.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap263.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap264.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap265.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap266.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap267.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap268.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap269.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap270.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap271.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap272.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap273.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap274.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap275.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap276.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap277.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap278.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap279.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap280.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap281.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap282.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap283.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap284.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap285.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap286.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap287.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap288.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap289.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap290.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap291.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap292.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap293.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap294.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap295.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap296.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap297.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap298.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap299.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap300.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap301.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap302.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap303.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap304.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap305.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap306.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap307.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap308.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap309.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap310.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap311.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap312.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap313.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap314.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap315.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap316.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap317.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap318.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap319.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap320.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap321.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap322.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap323.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap324.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap325.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap326.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap327.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap328.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap329.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap330.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap331.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap332.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap333.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap334.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap335.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap336.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap337.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap338.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap339.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap340.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap341.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap342.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap343.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap344.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap345.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap346.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap347.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap348.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap349.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap350.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap351.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap352.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap353.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap354.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap355.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap356.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap357.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap358.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap359.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap360.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap361.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap362.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap363.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap364.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap365.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap366.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap367.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap368.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap369.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap370.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap371.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap372.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap373.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap374.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap375.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap376.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap377.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap378.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap379.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap380.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap381.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap382.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap383.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap384.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap385.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap386.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap387.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap388.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap389.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap390.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap391.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap392.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap393.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap394.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap395.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap396.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap397.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap398.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap399.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap400.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap401.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap402.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap403.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap404.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap405.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap406.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap407.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap408.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap409.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap410.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap411.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap412.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap413.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap414.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap415.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap416.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap417.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap418.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap419.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap420.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap421.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap422.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap423.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap424.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap425.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap426.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap427.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap428.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap429.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap430.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap431.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap432.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap433.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap434.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap435.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap436.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap437.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap438.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap439.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap440.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap441.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap442.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap443.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap444.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap445.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap446.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap447.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap448.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap449.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap450.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap451.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap452.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap453.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap454.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap455.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap456.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap457.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap458.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap459.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap460.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap461.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap462.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap463.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap464.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap465.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap466.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap467.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap468.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap469.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap470.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap471.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap472.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap473.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap474.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap475.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap476.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap477.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap478.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap479.xml.gz -2018-11-08 - - -https://explore.openaire.eu/sitemap480.xml.gz - - \ No newline at end of file diff --git a/production-portal/src/sitemaps/sitemap.xml b/production-portal/src/sitemaps/sitemap.xml deleted file mode 100644 index c9379c60..00000000 --- a/production-portal/src/sitemaps/sitemap.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - weekly - 1 - - - - weekly - 0.9 - - - - weekly - 1 - - - - weekly - 0.9 - - - - weekly - 0.9 - - - - weekly - 0.9 - - - - weekly - 0.9 - - - - weekly - 0.9 - - - - weekly - 0.9 - - - - weekly - 0.9 - - - - weekly - 0.8 - - - - weekly - 0.8 - - - - weekly - 0.8 - - - - weekly - 0.8 - - - - weekly - 0.8 - - - - weekly - 0.8 - - - - weekly - 0.8 - - - - weekly - 0.7 - - - - weekly - 0.7 - - - - weekly - 0.7 - - - - weekly - 0.8 - - - - weekly - 0.8 - - diff --git a/production-portal/src/styles.css b/production-portal/src/styles.css deleted file mode 100644 index 90d4ee00..00000000 --- a/production-portal/src/styles.css +++ /dev/null @@ -1 +0,0 @@ -/* You can add global styles to this file, and also import other style files */ diff --git a/production-portal/src/tsconfig.app.json b/production-portal/src/tsconfig.app.json deleted file mode 100644 index 16b78476..00000000 --- a/production-portal/src/tsconfig.app.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "baseUrl": "./", - "module": "es2015", - "types": [ - "node" - ] - }, - "exclude": [ - "test.ts", - "**/*.spec.ts" - ] -} diff --git a/production-portal/src/tsconfig.server.json b/production-portal/src/tsconfig.server.json deleted file mode 100644 index 7e559946..00000000 --- a/production-portal/src/tsconfig.server.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "baseUrl": "./", - // Set the module format to "commonjs": - "module": "commonjs", - "types": [ - "node" - ] - }, - "exclude": [ - "test.ts", - "**/*.spec.ts" - ], - // Add "angularCompilerOptions" with the AppServerModule you wrote - // set as the "entryModule". - "angularCompilerOptions": { - "entryModule": "app/app.server.module#AppServerModule" - } -} diff --git a/production-portal/static.paths.ts b/production-portal/static.paths.ts deleted file mode 100644 index 0dbbd240..00000000 --- a/production-portal/static.paths.ts +++ /dev/null @@ -1,12 +0,0 @@ -export const ROUTES = [ - '/', - '/search/find/publications','/search/find/projects','/search/find/datasets','/search/find/dataproviders','/search/find/organizations', - '/search/advanced/publications','/search/advanced/projects','/search/advanced/datasets','/search/advanced/dataproviders','/search/advanced/organizations', - '/participate/deposit-publications','/participate/deposit-datasets','/participate/deposit-publications-result','/participate/deposit-datasets-result','/participate/deposit-subject-result', - '/search/content-providers','/search/content-providers-table','/search/entity-registries','/search/entity-registries-table','/search/journals','/search/journals-table', - '/project-report','/claims','/myclaims','/participate/claim','/participate/direct-claim','/claims-project-manager', - '/test','/user-info', - '/search/publication','/search/project','/search/dataset','/search/dataprovider','/search/organization','search/other','search/software', - '/search/find', - '/error', '/*path' -]; diff --git a/production-portal/tsconfig.json b/production-portal/tsconfig.json deleted file mode 100644 index a6c016bf..00000000 --- a/production-portal/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "compileOnSave": false, - "compilerOptions": { - "outDir": "./dist/out-tsc", - "sourceMap": true, - "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "target": "es5", - "typeRoots": [ - "node_modules/@types" - ], - "lib": [ - "es2017", - "dom" - ] - } -} diff --git a/production-portal/webpack.server.config.js b/production-portal/webpack.server.config.js deleted file mode 100644 index 626690cc..00000000 --- a/production-portal/webpack.server.config.js +++ /dev/null @@ -1,42 +0,0 @@ -// Work around for https://github.com/angular/angular-cli/issues/7200 - -const path = require('path'); -const webpack = require('webpack'); - -module.exports = { - entry: { - // This is our Express server for Dynamic universal - server: './server.ts', - // This is an example of Static prerendering (generative) - prerender: './prerender.ts' - }, - target: 'node', - resolve: { extensions: ['.ts', '.js'] }, - // Make sure we include all node_modules etc - externals: [/(node_modules|main\..*\.js)/,], - output: { - // Puts the output at the root of the dist folder - path: path.join(__dirname, 'dist'), - filename: '[name].js' - }, - module: { - rules: [ - { test: /\.ts$/, loader: 'ts-loader' } - ] - }, - plugins: [ - new webpack.ContextReplacementPlugin( - // fixes WARNING Critical dependency: the request of a dependency is an expression - /(.+)?angular(\\|\/)core(.+)?/, - path.join(__dirname, 'src'), // location of your src - {} // a map of your routes - ), - new webpack.ContextReplacementPlugin( - // fixes WARNING Critical dependency: the request of a dependency is an expression - /(.+)?express(\\|\/)(.+)?/, - path.join(__dirname, 'src'), - {} - ) - ] -} - \ No newline at end of file diff --git a/sample-components/sampleComponent-2/.editorconfig b/sample-components/sampleComponent-2/.editorconfig deleted file mode 100644 index f1cc3ad3..00000000 --- a/sample-components/sampleComponent-2/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# http://editorconfig.org - -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true - -[*.md] -insert_final_newline = false -trim_trailing_whitespace = false diff --git a/sample-components/sampleComponent-2/.gitignore b/sample-components/sampleComponent-2/.gitignore deleted file mode 100644 index 9e17510b..00000000 --- a/sample-components/sampleComponent-2/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -/__build__ -/__server_build__ -/node_modules -/typings -/tsd_typings/ -npm-debug.log - -/dist/ - -.idea - -.DS_Store diff --git a/sample-components/sampleComponent-2/README.md b/sample-components/sampleComponent-2/README.md deleted file mode 100644 index b1c84a93..00000000 --- a/sample-components/sampleComponent-2/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# Angular 2 Universal Starter [![Universal Angular 2](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal) -> Server-Side Rendering for Angular 2 - -A minimal Angular 2 starter for Universal JavaScript using TypeScript 2 and Webpack 2 - -> If you're looking for the Angular Universal repo go to [angular/universal](https://github.com/angular/universal) - -[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) - -## Installation - -* `npm install` - -## Serve - -* `npm start` to build your client app and start a web server -* `npm run build` to prepare a distributable bundle - -## Development -* run `npm start` and `npm run watch` in two separate terminals to build your client app, start a web server, and allow file changes to update in realtime - -## Watch files -* `npm run watch` to build your client app and start a web server diff --git a/sample-components/sampleComponent-2/app.json b/sample-components/sampleComponent-2/app.json deleted file mode 100644 index 1762bb6b..00000000 --- a/sample-components/sampleComponent-2/app.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "Angular 2 Universal Starter", - "description": "Angular 2 Universal starter kit by @AngularClass", - "repository": "https://github.com/angular/universal-starter", - "logo": "https://cloud.githubusercontent.com/assets/1016365/10639063/138338bc-7806-11e5-8057-d34c75f3cafc.png", - "env": { - "NPM_CONFIG_PRODUCTION": { - "description": "Install `webpack` and other development modules when deploying to allow full builds.", - "value": "false" - } - } -} diff --git a/sample-components/sampleComponent-2/nodemon.json b/sample-components/sampleComponent-2/nodemon.json deleted file mode 100644 index 97a836fb..00000000 --- a/sample-components/sampleComponent-2/nodemon.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "watch": [ - "dist", - "src/index.html" - ], - "ext" : "js ts json html" -} diff --git a/sample-components/sampleComponent-2/package.json b/sample-components/sampleComponent-2/package.json deleted file mode 100644 index 92395a75..00000000 --- a/sample-components/sampleComponent-2/package.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "name": "universal-starter", - "version": "2.0.0", - "description": "Angular 2 Universal starter kit by @AngularClass", - "repository": { - "type": "git", - "url": "https://github.com/angular/universal-starter.git" - }, - "scripts": { - "watch": "webpack --watch", - "prebuild": "rimraf dist", - "build": "webpack", - "build:prod": "webpack --progress -p", - "prestart": "npm run build", - "server": "nodemon dist/server/index.js", - "debug:server": "node-nightly --inspect --debug-brk dist/server/index.js", - "start": "npm run server", - "debug:start": "npm run build && npm run debug:server", - "predebug": "npm run build", - "debug:build": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js", - "debug": "node --debug-brk dist/server/index.js" - }, - "license": "MIT", - "contributors": [ - "AngularClass ", - "PatrickJS ", - "Jeff Whelpley ", - "Jeff Cross ", - "Mark Pieszak " - ], - "dependencies": { - "@angular/common": "2.0.0", - "@angular/compiler": "2.0.0", - "@angular/core": "2.0.0", - "@angular/forms": "2.0.0", - "@angular/http": "2.0.0", - "@angular/platform-browser": "2.0.0", - "@angular/platform-browser-dynamic": "2.0.0", - "@angular/platform-server": "2.0.0", - "@angular/router": "3.0.0", - "angular2-express-engine": "~2.0.11", - "angular2-platform-node": "~2.0.11", - "angular2-universal": "~2.0.11", - "angular2-universal-polyfills": "~2.0.11", - "body-parser": "^1.15.2", - "express": "^4.14.0", - "jquery": "^3.1.1", - "methods": "~1.1.2", - "rxjs": "5.0.0-beta.12", - "uikit": "^3.0.0-beta.18", - "zone.js": "0.6.21" - }, - "devDependencies": { - "@angularclass/resolve-angular-routes": "^1.0.9", - "@types/body-parser": "0.0.29", - "@types/compression": "0.0.29", - "@types/cookie-parser": "^1.3.29", - "@types/express": "^4.0.32", - "@types/express-serve-static-core": "^4.0.33", - "@types/hammerjs": "^2.0.32", - "@types/mime": "0.0.28", - "@types/node": "^6.0.38", - "@types/serve-static": "^1.7.27", - "angular2-template-loader": "^0.4.0", - "cookie-parser": "^1.4.3", - "imports-loader": "^0.6.5", - "json-loader": "^0.5.4", - "nodemon": "^1.10.0", - "raw-loader": "^0.5.1", - "rimraf": "^2.5.4", - "string-replace-loader": "github:gdi2290/string-replace-loader", - "ts-loader": "^0.8.2", - "ts-node": "^1.3.0", - "typescript": "2.0.0", - "webpack": "^2.1.0-beta.22", - "webpack-dev-middleware": "^1.6.1", - "webpack-dev-server": "^2.1.0-beta.0", - "webpack-merge": "^0.13.0" - } -} diff --git a/sample-components/sampleComponent-2/src/app/app.routing.ts b/sample-components/sampleComponent-2/src/app/app.routing.ts deleted file mode 100644 index 77f1061f..00000000 --- a/sample-components/sampleComponent-2/src/app/app.routing.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import {ClaimsAdminComponent} from './claimPages/claims/claimsAdmin.component'; -import {HomeComponent} from './home/home.component'; -const appRoutes: Routes = [ - { path: 'claims', component: ClaimsAdminComponent }, - { path: 'home', component: HomeComponent }, - { path: '', component: HomeComponent, pathMatch: 'full' } - -]; - - -// , -// { -// path: 'heroes', -// component: HeroListComponent, -// data: { -// title: 'Heroes List' -// } -// }, -// { path: 'hero/:id', component: HeroDetailComponent }, -// { path: '**', component: PageNotFoundComponent } -// export const appRoutingProviders: any[] = [ -// -// ]; - -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); diff --git a/sample-components/sampleComponent-2/src/app/app.ts b/sample-components/sampleComponent-2/src/app/app.ts deleted file mode 100644 index 895a87ba..00000000 --- a/sample-components/sampleComponent-2/src/app/app.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { Component } from '@angular/core'; -// import UIkit from 'uikit'; -// import Icons from 'uikit/dist/js/uikit-icons'; - - -import 'rxjs/Rx'; -@Component({ - selector: 'app', - template: ` -
- - -
- -
- -
` - -}) -export class App { - - constructor() { - // loads the Icon plugin - if(typeof document !== undefined) { - - // UIkit.use(Icons); - // - // // components can be called from the imported UIkit reference - // UIkit.notification('Hello world.'); - } - } - -} diff --git a/sample-components/sampleComponent-2/src/app/claimPages/claims/claims.component.html b/sample-components/sampleComponent-2/src/app/claimPages/claims/claims.component.html deleted file mode 100644 index 4518b03f..00000000 --- a/sample-components/sampleComponent-2/src/app/claimPages/claims/claims.component.html +++ /dev/null @@ -1,107 +0,0 @@ -
-
-
-
- -
Claims related to
- -
-

- -

-

- -

-

- -

-

- -

-

- -

-
-
-
- - -
- - - diff --git a/sample-components/sampleComponent-2/src/app/claimPages/claims/claims.component.ts b/sample-components/sampleComponent-2/src/app/claimPages/claims/claims.component.ts deleted file mode 100644 index 5b122258..00000000 --- a/sample-components/sampleComponent-2/src/app/claimPages/claims/claims.component.ts +++ /dev/null @@ -1,490 +0,0 @@ -import {Component, ViewChild, Input} from '@angular/core'; -import {Location} from '@angular/common'; -import {Observable} from 'rxjs/Observable'; -import {ActivatedRoute, Router} from '@angular/router'; -import {ClaimsService} from '../../services/claims.service'; -import {Loading} from '../../common/modal/loading.component'; -import {Alert} from '../../common/modal/alert'; - - -@Component({ - selector: 'claims', - templateUrl: 'claims.component.html', - providers:[ ClaimsService] - -}) -export class ClaimsComponent { - constructor (private _claimService: ClaimsService, private route: ActivatedRoute, private _router:Router, private location: Location) { - } - - ngOnInit() { - this.sub = this.route.queryParams.subscribe(params => { - - // var params = []; - if( this.myClaims == 'true' ){ - this.fetchBy = "User"; - }else{ - - this.fetchBy = params['fetchBy']; - this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All'; - this.fetchId = params['fetchId']; - this.fetchId=this.fetchId?this.fetchId:''; - - } - - let page = (params['page']=== undefined)?1:+params['page']; - let size = (params['size']=== undefined)?10:+params['size']; - - this.keyword = (params['keyword']?params['keyword']:""); - this.inputkeyword = this.keyword; - this.page = ( page <= 0 ) ? 1 : page; - this.size = ( size <= 0 ) ? 10 : size; - this.entityTypes = [];//(params['types']?params['types']:[]); - this.setTypes(params['types']); // check the appropriate checkboxes - // this.setSortby(params['sort']); - this.getClaims(); - - }); - // this.sub = this.route.params.subscribe(params => { - // console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId); - // if( this.myClaims == 'true' ){ - // console.info("Is myclaims"); - // this.fetchBy = "User"; - // }else{ - // console.info("Is admin"); - // - // console.info(this.isAdmin); - // - // this.fetchBy = params['fetchBy']; - // this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All'; - // this.fetchId = params['fetchId']; - // console.info("Fetch by:"+this.fetchBy+"Fetch id:"+this.fetchId); - // this.fetchId=this.fetchId?this.fetchId:''; - // - // } - // - // console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId); - // let page = (params['page']=== undefined)?1:+params['page']; - // let size = (params['size']=== undefined)?10:+params['size']; - // - // this.keyword = (params['keyword']?params['keyword']:""); - // this.inputkeyword = this.keyword; - // this.page = ( page <= 0 ) ? 1 : page; - // this.size = ( size <= 0 ) ? 10 : size; - // this.entityTypes = []//(params['types']?params['types']:[]); - // this.setTypes(params['types']); // check the appropriate checkboxes - // this.setSortby(params['sort']); - // this.getClaims(); - // console.info("params: "+params['page']+" page "+page +" this.page: "+this.page ); - // }); - } - ngOnDestroy() { - this.sub.unsubscribe(); - } - sub: any; - //string because comes as input from component directive - @Input() enableDelete: string = 'false'; - @Input() myClaims: string= 'false' ; - @Input() isAdmin:string = 'false'; - page : number; - size:number; - keyword:string; // the keyword string to give to the request as parameter - inputkeyword:string; // the string written in the input field (keyword=inputkeyword when its length is bigger than 3 and the user stops typing) - lengths = [10,20,30,50]; - types = ["All","Project","Context","Result","User"]; - @Input() fetchBy:string; - @Input() fetchId:string; - - navigateTo: string = "Claims"; - resultsNum: number ; - claims: string[]; - - @ViewChild (Loading) loading : Loading ; - - //checkboxes: - publicationCB = false; - datasetCB = false; - contextCB = false; - projectCB = false; - entityTypes : string[] =[] ; - - descending = true; - sortby = "date"; - - selected=[]; - deleteMessage:string = ""; - showErrorMessage:boolean = false; - - //params for pagingFormatter to use when navigate to page - params; - @ViewChild(Alert) alert; - - claimsDeleted:number = 0; - - getClaims () { - this.selected=[]; - var types = ''; - this.showErrorMessage = false; - for (var type of this.entityTypes){ - types+=(types.length>0?'&':'')+"types="+type; - } - if(this.fetchBy =="Project" ){ - this._claimService.getClaimsByProject(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="User"){ - this._claimService.getClaimsByUser(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="Result"){ - this._claimService.getClaimsByResult(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="Context"){ - this._claimService.getClaimsBycontext(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= null; - this.resultsNum= data.total;//data.length; //TODO get the total results num - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else{ - this._claimService.getClaims(this.size,this.page,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum = null; - this.resultsNum= data.total;//data.length; //TODO get the total results num - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - } - } - - goToClaim(claimId: number){ - this._router.navigate( ['Claim', { id: claimId}] ); - } - goTo(page:number = 1){ - - this.page = page; - - this.location.go(location.pathname,this.getParametersString()); - this.getClaims(); - } - getParameters(){ - let params={ page: this.page, size: this.size, types: this.entityTypes, fetchBy: this.fetchBy, fetchId:this.fetchId, keyword : this.keyword, sort: this.getSortby() }; - return params; - } - getParametersString(){ - var params=''; - params+=(this.page==1?"":(params.length>0?'&':'')+"page="+this.page); - params+=(this.size==10?"":(params.length>0?'&':'')+"size="+this.size); - // params+=(this.entityTypes==''?"":(params.length>0?'&':'')+"types="+this.entityTypes); - var types=""; - for (var type of this.entityTypes){ - types+=(types.length>0?',':'')+type; - } - params+=(types.length>0)?"types="+types:""; - - if(this.isAdmin === 'true'){ - params+=(this.fetchBy=='All'?"":(params.length>0?'&':'')+"fetchBy="+this.fetchBy); - params+=(this.fetchId==''?"":(params.length>0?'&':'')+"fetchId="+this.fetchId); - } - params+=(this. getSortby()=='datedesc'?"":(params.length>0?'&':'')+"sort="+this. getSortby()); - params+=(this.keyword==''?"":(params.length>0?'&':'')+"keyword="+this.keyword); - return params; - } - changeLength(){ - this.goTo(); - } - clearFilters(){ - this.keyword = ''; - this.inputkeyword = ''; - this.publicationCB = false; - this.projectCB = false; - this.datasetCB = false; - this.contextCB = false; - this.entityTypes = []; - this.goTo(); - } - changeOrderby(sortby:string){ - if(sortby==this.sortby){ - this.descending = !this.descending; - }else{ - this.sortby = sortby; - this.descending = false; - } - this.goTo(); - } - setSortby(sortby:string){ - if(!sortby|| sortby == "datedesc"){ - this.descending = true; - this.sortby = "date"; - }else if(sortby == "dateasc"){ - this.descending = false; - this.sortby = "date"; - }else if(sortby == "userasc"){ - this.descending = false; - this.sortby = "user"; - }else if(sortby == "userdesc"){ - this.descending = true; - this.sortby = "user"; - }if(sortby =="sourceasc"){ - this.descending = false; - this.sortby = "source"; - }else if(sortby == "sourcedesc"){ - this.descending = true; - this.sortby = "source"; - }else if(sortby == "targetasc"){ - this.descending = false; - this.sortby = "target"; - }else if(sortby == "targetdesc"){ - this.descending = true; - this.sortby = "target"; - } - } - getSortby():string{ - if(this.descending){ - return this.sortby+"desc"; - }else{ - return this.sortby+"asc"; - } - - } - changeType(){ - this.entityTypes = []; - if(this.publicationCB){ - this.entityTypes.push('publication'); - } - if(this.datasetCB){ - this.entityTypes.push('dataset'); - } - if(this.projectCB){ - this.entityTypes.push('project'); - } - if(this.contextCB){ - this.entityTypes.push('context'); - } - - // if(this.publicationCB == true && this.datasetCB == true && this.contextCB == true && this.projectCB == true ){ - // this.entityTypes=""; - // }else{ - // this.entityTypes = ""; - // if(this.publicationCB == true){ - // this.entityTypes = "publication"; - // } - // if(this.datasetCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"dataset"; - // } - // if(this.contextCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"context"; - // } - // if(this.projectCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"project"; - // } - // } - // console.debug("Type changed: "+this.entityTypes+" "+this.publicationCB+ this.datasetCB + this.contextCB + this.projectCB); - this.goTo(); - } - setTypes(types:string){ - if(!types){ - return; - } - if(types.length > 0){ - this.entityTypes = []; - if(types.indexOf("publication")!=-1){ - this.publicationCB = true; - this.entityTypes.push("publication"); - } - if(types.indexOf("dataset")!=-1){ - this.datasetCB = true; - this.entityTypes.push("dataset"); - } - if(types.indexOf("project")!=-1){ - this.projectCB = true; - this.entityTypes.push("project"); - } - if(types.indexOf("context")!=-1){ - this.contextCB = true; - this.entityTypes.push("context"); - } - } - if(this.publicationCB && this.datasetCB && this.contextCB && this.projectCB){ - this.entityTypes=[]; - } - } - changekeyword(){ - - if(this.inputkeyword.length >= 3 || this.inputkeyword.length == 0 ){ - this.keyword = this.inputkeyword; - this.page = 1; - this.goTo(); - } - - } - select(item:any,event){ - this.deleteMessage=""; - var value = event.currentTarget.checked; - if(value){ - this.selected.push(item); - }else{ - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == item.id){ - this.selected.splice(_i, 1); - } - } - - - } - } - selectAll(){ - this.selected = []; - for (var _i = 0; _i < this.claims.length; _i++) { - let claim = this.claims[_i]; - this.selected.push(claim); - } - this.deleteMessage = ""; - } - deselectAll(){ - this.selected = []; - this.deleteMessage=""; - } - isSelected(id:string){ - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == id){ - return true; - } - } - return false; - } - - - confirmOpen(){ - if(this.selected.length <= 0){ - - }else{ - this.alert.cancelButton = true; - this.alert.okButton = true; - this.alert.alertTitle = "Delete "+this.selected.length+" claim(s)"; - this.alert.message = this.selected.length+" claims will be deleted. Do you want to proceed? "; - this.alert.okButtonText = "Yes"; - this.alert.cancelButtonText = "No"; - this.alert.open(); - } - } - confirmClose(data){ - this.delete(); - } - delete(){ - this.deleteMessage=""; - this.loading.open(); - this.claimsDeleted = 0; - var ids = []; - for (var i = 0; i < this.selected.length; i++){ - var id =this.selected[i].id; - ids.push(id); - // var selected =this.selected[i].id; - // console.warn("Deleting claim with id:"+id); - // this.deleteById(id); - //TODO for multiple concurrent - } - this.batchDeleteById(ids); - } - - deleteById(id:string){ - - console.warn("Deleting claim with id:"+id); - // this._claimService.deleteClaimById(id); - this._claimService.deleteClaimById(id).subscribe( - res => { - console.info('Delete response'+res.code ); - console.warn("Deleted claim with id:"+ id); - //remove this claim from the - let newClaims=this.claims; - for (var _i = 0; _i < this.claims.length; _i++) { - let claim = this.claims[_i]; - if(claim['id'] == id){ - newClaims.splice(_i, 1); - } - } - //TODO should call getClaims??? - this.claimsDeleted++; - this.claims = newClaims; - if(this.claimsDeleted == this.selected.length){ - this.resultsNum = this.resultsNum - this.selected.length; - this.loading.close(); - this.selected = []; - } - - - }); - } - batchDeleteById(ids:string[]){ - - console.warn("Deleting claim with ids:"+ids); - this._claimService.deleteBulk(ids).subscribe( - res => { - console.info('Delete response'+res.code ); - console.warn("Deleted ids:"+ res.deletedIds); - console.warn("Not found ids:"+ res.notFoundIds); - //remove this claim from the - let newClaims=this.claims; - for(var id of res.deletedIds){ - for (var _i = 0; _i < this.claims.length; _i++) { - let claim = this.claims[_i]; - if(claim['id'] == id){ - newClaims.splice(_i, 1); - } - } - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == id){ - this.selected.splice(_i, 1); - } - } - } - this.claims = newClaims; - this.resultsNum = this.resultsNum - res.deletedIds.length; - this.loading.close(); - if(res.deletedIds.length>0){ - this.deleteMessage=this.deleteMessage+'
'+res.deletedIds.length+' claim(s) successfully deleted.
'; - } - if(res.notFoundIds.length>0){ - this.deleteMessage=this.deleteMessage+'
'+res.notFoundIds.length+' claim(s) couldn\'t be deleted.
'; - } - }); - } - pageChange($event) { - var page:number = +$event.value - this.goTo(page); - } -} diff --git a/sample-components/sampleComponent-2/src/app/claimPages/claims/claimsAdmin.component.ts b/sample-components/sampleComponent-2/src/app/claimPages/claims/claimsAdmin.component.ts deleted file mode 100644 index a602bdc9..00000000 --- a/sample-components/sampleComponent-2/src/app/claimPages/claims/claimsAdmin.component.ts +++ /dev/null @@ -1,36 +0,0 @@ -import {Component, ViewChild, Input} from '@angular/core'; -import {Location} from '@angular/common'; -import {Observable} from 'rxjs/Observable'; - -@Component({ - selector: 'claims-admin', - template: ` -
-
-

Claims Administrator

-
- -
- - -
- TODO login -
- `, - -}) -export class ClaimsAdminComponent { - constructor ( ) { - - } -user:string="argirok@di.uoa.gr"; - ngOnInit() { - - - } - - -} diff --git a/sample-components/sampleComponent-2/src/app/common/claimEntityFormatter.component.ts b/sample-components/sampleComponent-2/src/app/common/claimEntityFormatter.component.ts deleted file mode 100644 index 093b1cd5..00000000 --- a/sample-components/sampleComponent-2/src/app/common/claimEntityFormatter.component.ts +++ /dev/null @@ -1,38 +0,0 @@ -import {Component, Input} from '@angular/core'; -// import {PublicationTitleFormatter} from './publicationTitleFormatter.component'; -// import {ProjectTitleFormatter} from './projectTitleFormatter.component'; - -//Usage Example " " - -//externalUrl -@Component({ - selector: 'claim-entity', - template: ` - -
- ({{type}}) - -
-
- (Project) - -
-
- (Context) -
{{entity.title}}
-
- ` -}) - -export class ClaimEntityFormatter { - @Input() entity: string[]; - @Input() type: string; - - constructor () {} - - ngOnInit() { - - } - - -} diff --git a/sample-components/sampleComponent-2/src/app/common/modal/alert.ts b/sample-components/sampleComponent-2/src/app/common/modal/alert.ts deleted file mode 100644 index bf5d1f60..00000000 --- a/sample-components/sampleComponent-2/src/app/common/modal/alert.ts +++ /dev/null @@ -1,110 +0,0 @@ -import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmitter, Output} from '@angular/core'; -// import { DynamicComponentLoader} from '@angular/core'; - -import {Open} from './open.component'; - -@Component({ - selector: 'alert', - template: ` - - `, - encapsulation: ViewEncapsulation.None, -}) -/** - * API to an open alert window. - */ -export class Alert{ - /** - * Caption for the title. - */ - public alertTitle:string; - /** - * Describes if the alert contains Ok Button. - * The default Ok button will close the alert and emit the callback. - * Defaults to true. - */ - public okButton:boolean = true; - /** - * Caption for the OK button. - * Default: Ok - */ - public okButtonText:string= 'Ok'; - /** - * Describes if the alert contains cancel Button. - * The default Cancelbutton will close the alert. - * Defaults to true. - */ - public cancelButton:boolean = true; - /** - * Caption for the Cancel button. - * Default: Cancel - */ - public cancelButtonText:string = 'Cancel'; - /** - * if the alertMessage is true it will show the contentString inside alert body. - */ - public alertMessage:boolean = true; - /** - * Some message/content can be set in message which will be shown in alert body. - */ - public message:string; - /** - * if the value is true alert footer will be visible or else it will be hidden. - */ - public alertFooter:boolean= true; - /** - * shows alert header if the value is true. - */ - public alertHeader:boolean = true; - /** - * if the value is true alert will be visible or else it will be hidden. - */ - public isOpen:boolean=false; - /** - * Emitted when a ok button was clicked - * or when Ok method is called. - */ - @Output() public alertOutput:EventEmitter = new EventEmitter(); - constructor( public _elementRef: ElementRef){} - /** - * Opens a alert window creating backdrop. - */ - open(){ - this.isOpen= true; - } - /** - * ok method closes the modal and emits modalOutput. - */ - ok(){ - this.isOpen = false; - this.alertOutput.emit(true); - } - /** - * cancel method closes the moda. - */ - cancel(){ - this.isOpen = false; - } -} diff --git a/sample-components/sampleComponent-2/src/app/common/modal/loading.component.ts b/sample-components/sampleComponent-2/src/app/common/modal/loading.component.ts deleted file mode 100644 index c046feae..00000000 --- a/sample-components/sampleComponent-2/src/app/common/modal/loading.component.ts +++ /dev/null @@ -1,49 +0,0 @@ -import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmitter, Output} from '@angular/core'; - -@Component({ - selector: 'loading', - template: ` - - `, - encapsulation: ViewEncapsulation.None, -}) -/** - * API to an open alert window. - */ -export class Loading{ - -@Input() public message:string ="Loading"; - - /** - * if the value is true alert will be visible or else it will be hidden. - */ - public isOpen:boolean=false; - /** - * Emitted when a ok button was clicked - * or when Ok method is called. - */ - @Output() public alertOutput:EventEmitter = new EventEmitter(); - constructor( public _elementRef: ElementRef){} - /** - * Opens a alert window creating backdrop. - */ - open(){ - this.isOpen= true; - } - - close(){ - this.isOpen = false; - } -} diff --git a/sample-components/sampleComponent-2/src/app/common/modal/open.component.ts b/sample-components/sampleComponent-2/src/app/common/modal/open.component.ts deleted file mode 100644 index 95add08d..00000000 --- a/sample-components/sampleComponent-2/src/app/common/modal/open.component.ts +++ /dev/null @@ -1,55 +0,0 @@ -import {Directive, Input, HostBinding} from '@angular/core'; - -// todo: add animate -// todo: add init and on change -@Directive({selector: '[open]'}) -export class Open { - @HostBinding('style.display') - private display:string; - @HostBinding('class.in') - @HostBinding('attr.aria-expanded') - private isExpanded:boolean = true; - - @Input() - private set open(value:boolean) { - this.isExpanded = value; - this.toggle(); - } - - private get open():boolean { - return this.isExpanded; - } - - constructor() { - } - init() { - this.isExpanded = false; - this.display = 'none'; - } - toggle() { - if (this.isExpanded) { - this.hide(); - } else { - this.show(); - } - } - - hide() { - this.isExpanded = false; - this.display = 'none'; - if (typeof document !== 'undefined') { - let backDrop = document.getElementsByClassName("modal-backdrop"); - if(backDrop.length>0){ - document.body.removeChild(backDrop[0]); - } - } - } - - show() { - let backDrop = document.createElement('div'); - backDrop.className="modal-backdrop fade in"; - document.body.appendChild(backDrop); - this.isExpanded = true; - this.display = 'block'; - } -} diff --git a/sample-components/sampleComponent-2/src/app/common/pagingFormatterNoLoad.component.ts b/sample-components/sampleComponent-2/src/app/common/pagingFormatterNoLoad.component.ts deleted file mode 100644 index 42534afd..00000000 --- a/sample-components/sampleComponent-2/src/app/common/pagingFormatterNoLoad.component.ts +++ /dev/null @@ -1,75 +0,0 @@ -import {Component, Input, Output, EventEmitter} from '@angular/core'; - - -//Usage Example - -@Component({ - selector: 'paging-no-load', - template: ` - - ` -}) - -export class pagingFormatterNoLoad { - @Input() currentPage: number = 1; - @Input() navigateTo: string; - @Input() term: string=''; - @Input() size: number=10; - @Input() totalResults: number = 10; - @Input() params; - - @Output() pageChange = new EventEmitter(); - - constructor () { - } - - ngOnInit() { - console.info("In paging -- CurrentPage:"+this.currentPage+" "+"total Pages = "+this.getTotalPages() +" Results num:"+this.totalResults); - } - getTotalPages(){ - var i= this.totalResults/this.size; - var integerI=parseInt(''+i); - return parseInt(''+((i==integerI)?i:i+1)); - } - onPrev(){ - this.currentPage=this.currentPage-1; - this.pageChange.emit({ - value: this.currentPage - }); - - } - - onNext(){ - - this.currentPage=this.currentPage+1; - this.pageChange.emit({ - value: this.currentPage - }); - } - onPage(pageNum: number){ - - this.currentPage=pageNum; - this.pageChange.emit({ - value: this.currentPage - }); - } -} diff --git a/sample-components/sampleComponent-2/src/app/common/projectTitleFormatter.component.ts b/sample-components/sampleComponent-2/src/app/common/projectTitleFormatter.component.ts deleted file mode 100644 index 5917768e..00000000 --- a/sample-components/sampleComponent-2/src/app/common/projectTitleFormatter.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {OpenaireProperties} from '../openaireProperties'; - -//Usage Example " " - -@Component({ - selector: 'project-title', - template: ` -
-
{{project.name}} ({{project.funderName}})
-
- ` -}) - -export class ProjectTitleFormatter { - @Input() project: string[]; - private url:string; - constructor () {} - - ngOnInit() { - this.url = OpenaireProperties.getsearchLinkToProject() + "?projectId=" + this.project["openaireId"]; - } -} diff --git a/sample-components/sampleComponent-2/src/app/common/publicationTitleFormatter.component.ts b/sample-components/sampleComponent-2/src/app/common/publicationTitleFormatter.component.ts deleted file mode 100644 index 2c87c50a..00000000 --- a/sample-components/sampleComponent-2/src/app/common/publicationTitleFormatter.component.ts +++ /dev/null @@ -1,26 +0,0 @@ -import {Component, Input} from '@angular/core'; - -//Usage Example " " - -@Component({ - selector: 'publication-title', - template: ` -
-
{{title}}
-
{{title}}
-
- ` -}) - -export class PublicationTitleFormatter { - @Input() title: string[]; - @Input() url: string[]; - - constructor () {} - - ngOnInit() { - - } - - -} diff --git a/sample-components/sampleComponent-2/src/app/entities/claim.ts b/sample-components/sampleComponent-2/src/app/entities/claim.ts deleted file mode 100644 index b5378c5f..00000000 --- a/sample-components/sampleComponent-2/src/app/entities/claim.ts +++ /dev/null @@ -1,15 +0,0 @@ -export class Claim { - id: string; - sourceType: string; - targetType: string; - sourceId: string; - targetId: string; - date: string; - DOI: string; - project: Project - userMail: string; - -} -export class Project{ - -} diff --git a/sample-components/sampleComponent-2/src/app/home/home.component.html b/sample-components/sampleComponent-2/src/app/home/home.component.html deleted file mode 100644 index e738e5c2..00000000 --- a/sample-components/sampleComponent-2/src/app/home/home.component.html +++ /dev/null @@ -1,24 +0,0 @@ - -
-
-
-
-
- - - - -
-
-
-
-
- -
- - -
-
- {{citation}} diff --git a/sample-components/sampleComponent-2/src/app/home/home.component.ts b/sample-components/sampleComponent-2/src/app/home/home.component.ts deleted file mode 100644 index 89d7e5b8..00000000 --- a/sample-components/sampleComponent-2/src/app/home/home.component.ts +++ /dev/null @@ -1,108 +0,0 @@ -import {Component} from '@angular/core'; -import {Router} from '@angular/router'; -import {Observable} from 'rxjs/Observable'; -import {Location} from '@angular/common'; -declare var Cite:CiteType; -declare var fs:any; -declare var module:any; -declare var child_process:any; -declare var simpleSys:Function; - -interface CiteType { - set:Function; - get:Function; - setOptions:Function; -} -@Component({ - selector: 'home', - templateUrl: 'home.component.html', - }) - -export class HomeComponent { - - - styles:string[]=["bibtex","chicago","ieee","science","apa","cell","harvard","mla","nature","acm"]; - selectedStyle:string = "bibtex"; - - citation:string=""; - constructor ( private _router: Router, private location: Location) { - // var fs = require('fs'); -// if(typeof document !== undefined) { -// var citeproc = require("citeproc-js-node"); -// -// var sys = citeproc.simpleSys(); -// // Wherever your locale and style files are. None are included with the package. -// var enUS = ' This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2015-10-10T23:31:02+00:00 accessed and and others anonymous anon. at available at by circa c. cited edition editions ed. et al. forthcoming from ibid. in in press internet interview letter no date n.d. online presented at the reference references ref. refs. retrieved scale version AD BC “ ” ‘ ’ – th st nd rd th th th first second third fourth fifth sixth seventh eighth ninth tenth book books chapter chapters column columns figure figures folio folios number numbers line lines note notes opus opera page pages page pages paragraph paragraphs part parts section sections sub verbo sub verbis verse verses volume volumes bk. bks. chap. chaps. col. cols. fig. figs. fol. fols. no. nos. l. ll. n. nn. op. opp. p. pp. p. pp. para. paras. pt. pts. sec. secs. s.v. s.vv. v. vv. vol. vols. ¶¶ § §§ director directors editor editors editor editors illustrator illustrators translator translators editor & translator editors & translators dir. dirs. ed. eds. ed. eds. ill. ills. tran. trans. ed. & tran. eds. & trans. by directed by edited by edited by illustrated by interview by to by translated by edited & translated by dir. by ed. by ed. by illus. by trans. by ed. & trans. by January February March April May June July August September October November December Jan. Feb. Mar. Apr. May Jun. Jul. Aug. Sep. Oct. Nov. Dec. Spring Summer Autumn Winter ';//fs.readFileSync('../home/locales-en-US.xml', 'utf8'); -// sys.addLocale('en-US', enUS); -// var styleString = ' ';//fs.readFileSync('../home/bibtex.csl', 'utf8'); -// var engine = sys.newEngine(styleString, 'en-US', null); -// -// var items = {"14058/RN9M5BF3":{"accessed":{"month":"9","year":"2010","day":"10"},"id":"14058/RN9M5BF3","author":[{"given":"Adel","family":"Hendaoui"},{"given":"Moez","family":"Limayem"},{"given":"Craig W.","family":"Thompson"}],"title":"3D Social Virtual Worlds: Research Issues and Challenges","type":"article-journal","versionNumber":6816},"14058/NSBERGDK":{"accessed":{"month":"9","year":"2010","day":"10"},"issued":{"month":"6","year":"2009"},"event-place":"Istanbul","type":"paper-conference","DOI":"10.1109/DEST.2009.5276761","page-first":"151","id":"14058/NSBERGDK","title-short":"3D virtual worlds as collaborative communities enriching human endeavours","publisher-place":"Istanbul","author":[{"given":"C.","family":"Dreher"},{"given":"T.","family":"Reiners"},{"given":"N.","family":"Dreher"},{"given":"H.","family":"Dreher"}],"title":"3D virtual worlds as collaborative communities enriching human endeavours: Innovative applications in e-Learning","shortTitle":"3D virtual worlds as collaborative communities enriching human endeavours","page":"151-156","event":"2009 3rd IEEE International Conference on Digital Ecosystems and Technologies (DEST)","URL":"http://ieeexplore.ieee.org/lpdocs/epic03/wrapper.htm?arnumber=5276761","versionNumber":1}}; -// -// sys.items = items; -// -// var clusters = [ -// { -// citationItems: ["14058/RN9M5BF3"], -// properties: { -// note:0 -// } -// }, -// { -// citationItems: ["14058/NSBERGDK"], -// properties: { -// note:0 -// } -// }, -// ]; -// -// engine.updateItems(Object.keys(items)); -// var bib = engine.makeBibliography(); -// console.log(bib[1]); -// this.citation =bib[1]; -// } - - - - var data= '[ { "id": "Q23571040", "type": "article-journal", "title": "Correlation of the Base Strengths of Amines 1", "DOI": "10.1021/ja01577a030", "author": [ { "given": "H. K.", "family": "Hall" } ], "issued": [ { "date-parts": [ "1957", "1", "1" ] } ], "container-title": "Journal of the American Chemical Society", "volume": "79", "issue": "20", "page": "5441-5444" } ]'; - var Cite = require('../home/citation-0.2.js'); - var opt = { - format: 'string', - type : 'string', - style : 'citation-apa', - lang : 'en-US' - }; - // var Cite = require('citation-js'); - var cite = new Cite(data, opt); - console.log("APA:"+cite.get()); - - opt = { - format: 'string', - type : 'string', - style : 'citation-harvard1', - lang : 'en-US' - }; - cite = new Cite(data, opt); - // cite.set(data); - console.log("harvard1: "+cite.get()); - - - - var opt_template = { - format: 'string', - type : 'string', - style : 'citation-ieee', - lang : 'en-US', - template : ' ' - }; - - // var opt = { format: 'string', type : 'string', style : 'citation-', lang : 'en-US', template : }; - var cite_template = new Cite(data, opt_template); - cite_template.set(data); - console.log("IEEE: "+cite_template.get()); - - - } - bibtex:string =` `; - ieee_csl:string =` `; -} diff --git a/sample-components/sampleComponent-2/src/app/openaireProperties.ts b/sample-components/sampleComponent-2/src/app/openaireProperties.ts deleted file mode 100644 index 796973ae..00000000 --- a/sample-components/sampleComponent-2/src/app/openaireProperties.ts +++ /dev/null @@ -1,89 +0,0 @@ -export class OpenaireProperties { - //landing Pages - private static baseSearchLink="/" - private static searchLinkToPublication = "publication?articleId="; - private static searchLinkToProject = "project?projectId="; - private static searchLinkToPerson = "person?personId="; - private static searchLinkToDataProvider = "https://beta.openaire.eu/search/dataprovider?datasourceId="; - private static searchLinkToDataset = "dataset?datasetId="; - private static searchLinkToOrganization = "organization?organizationId="; - - // Services - APIs - - // public claimsAPIURL = "http://rudie.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/" - private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8181/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/"; - - private static searchAPIURL = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - // private searchAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - // private searchAPIURL = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - - private static searchServiveURL = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/"; - // private static searchServiveURL = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/"; - // private static searchServiveURL = "http://services.openaire.eu:8380/search/"; - //private static searchServiveURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/"; - - private static searchCrossrefAPIURL = "http://api.crossref.org/works"; - private static searchDataciteAPIURL = "http://search.datacite.org/api"; - private static searchOrcidURL = "https://pub.orcid.org/"; - - // Identifiers - private static pmidURL = "http://www.ncbi.nlm.nih.gov/pubmed/"; - private static doiURL = "http://dx.doi.org/"; - private static cordisURL = "http://cordis.europa.eu/projects/"; - private static pmcURL = "http://europepmc.org/articles/"; - - - //landing Pages' getters - public static getsearchLinkToPublication():string{ - return this.baseSearchLink + this.searchLinkToPublication; - } - public static getsearchLinkToDataset():string{ - return this.baseSearchLink + this.searchLinkToDataset; - } - public static getsearchLinkToProject():string{ - return this.baseSearchLink + this.searchLinkToProject; - } - public static getsearchLinkToPerson():string{ - return this.baseSearchLink + this.searchLinkToPerson; - } - public static getsearchLinkToOrganization():string{ - return this.searchLinkToOrganization; - } - public static getsearchLinkToDataProvider():string{ - return this.searchLinkToDataProvider; - } - - // Services - APIs' getters - public static getSearchAPIURL():string{ - return this.searchAPIURL; - } - public static getSearchServiceURL():string{ - return this.searchServiveURL; - } - public static getClaimsAPIURL():string{ - return this.claimsAPIURL; - } - public static getSearchCrossrefAPIURL():string{ - return this.searchCrossrefAPIURL; - } - public static getSearchDataciteAPIURL():string{ - return this.searchDataciteAPIURL; - } - public static getSearchOrcidURL():string{ - return this.searchOrcidURL; - } - - // Identifiers' getters - public static getPmidURL():string{ - return this.pmidURL; - } - public static getDoiURL():string{ - return this.doiURL; - } - public static getCordisURL():string{ - return this.cordisURL; - } - public static getPmcURL():string{ - return this.pmcURL; - } -} diff --git a/sample-components/sampleComponent-2/src/app/services/claims.service.ts b/sample-components/sampleComponent-2/src/app/services/claims.service.ts deleted file mode 100644 index 43c6abce..00000000 --- a/sample-components/sampleComponent-2/src/app/services/claims.service.ts +++ /dev/null @@ -1,131 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Jsonp, URLSearchParams,ResponseOptions, RequestOptions, Headers} from '@angular/http'; -import {Http, Response} from '@angular/http'; -import {Observable} from 'rxjs/Observable'; -import {Claim} from '../entities/claim'; -import {OpenaireProperties} from '../openaireProperties'; - -@Injectable() -export class ClaimsService { - private baseUrl; - constructor(private jsonp: Jsonp, private http: Http) { - this.baseUrl = OpenaireProperties.getClaimsAPIURL(); - } - - private getClaimRequest(size : number, page : number, url :string):any { - console.info('ClaimsService: Claims request: '+url); - return this.http.get( url) - .map(request => request.json()) - .do(request => console.info("Get claims: offset = "+(size*(page-1)) + " limit ="+size )) - .catch(this.handleError); - } - getClaims( size : number, page : number, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims ' ); - console.info('ClaimsService: Types : '+types ); - let url = this.baseUrl +"claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByUser( size : number, page : number, user:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for user : '+user); - let url = this.baseUrl +"users/"+user+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsBycontext( size : number, page : number, contextId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for context : '+contextId); - let url = this.baseUrl +"contexts/"+contextId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByResult( size : number, page : number, resultId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for result : '+resultId); - let url = this.baseUrl +"results/"+resultId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByProject( size : number, page : number, projectId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for project : '+projectId); - let url = this.baseUrl +"projects/"+projectId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - } - - deleteClaimById(claimId:string):any{ - console.warn('Trying to delete claim with id : '+claimId); - let url = this.baseUrl +"claims/"+claimId; - console.warn('Delete url: '+url); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete( url, options).map(request => request.json()) - .do(request => console.info("After delete" )) - .catch(this.handleError); - - } - deleteBulk(claimIds:string[]):any{ - - console.warn('Trying to delete claims with ids : '+claimIds); - var url = ""; - - for(var claimId of claimIds){ - url=url+(url.length >0 ?"&":"")+"claimId="+claimId; - } - url= this.baseUrl +"claims/bulk?"+url; - console.warn('Delete url: '+url); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete( url, options).map(request => request.json()) - .do(request => console.info("After delete" )) - .catch(this.handleError); - - } - insertBulkClaims(claims):any{ - console.warn('Trying toinsert claims : '+claims); - let url = this.baseUrl +"claims/bulk"; - let body = JSON.stringify( claims ); - console.warn('Json body: : '+body); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, body, options) - .map(res => res.json()) - .do(request => console.info("Insert Response:"+request.status) ) - .catch(this.handleError); - - } - insertClaim(claim):any{ - console.warn('Trying toinsert claim : '+claim); - let url = this.baseUrl +"claims"; - let body = JSON.stringify( claim ); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, body, options) - .map(res => res.json()) - .do(request => console.info("Insert Response:"+request.status) ) - .catch(this.handleError); - - } - - private handleError (error: Response) { - // in a real world app, we may send the error to some remote logging infrastructure - // instead of just logging it to the console - console.error(error); - return Observable.throw(error || 'Server error'); - } - - getClaim(id:string):any { - let url = this.baseUrl+"claims/"+id; - return new Promise((resolve, reject) => { - this.http.get(url) - .map(res => res.json()) - .subscribe( - data => { - resolve(data.data); - }, - err => { - reject(err); - } - ) - ; - }); - } - -} diff --git a/sample-components/sampleComponent-2/src/assets/logo.png b/sample-components/sampleComponent-2/src/assets/logo.png deleted file mode 100644 index afea237f..00000000 Binary files a/sample-components/sampleComponent-2/src/assets/logo.png and /dev/null differ diff --git a/sample-components/sampleComponent-2/src/backend/api.ts b/sample-components/sampleComponent-2/src/backend/api.ts deleted file mode 100644 index d8f4f517..00000000 --- a/sample-components/sampleComponent-2/src/backend/api.ts +++ /dev/null @@ -1,24 +0,0 @@ -// Our API for demos only -import {fakeDataBase} from './db'; -import {fakeDemoRedisCache} from './cache'; - -// you would use cookies/token etc -var USER_ID = 'f9d98cf1-1b96-464e-8755-bcc2a5c09077'; // hardcoded as an example - -// Our API for demos only -export function serverApi(req, res) { - let key = USER_ID + '/data.json'; - let cache = fakeDemoRedisCache.get(key); - if (cache !== undefined) { - console.log('/data.json Cache Hit'); - return res.json(cache); - } - console.log('/data.json Cache Miss'); - - fakeDataBase.get() - .then(data => { - fakeDemoRedisCache.set(key, data); - return data; - }) - .then(data => res.json(data)); -} diff --git a/sample-components/sampleComponent-2/src/backend/cache.ts b/sample-components/sampleComponent-2/src/backend/cache.ts deleted file mode 100644 index 490a3561..00000000 --- a/sample-components/sampleComponent-2/src/backend/cache.ts +++ /dev/null @@ -1,17 +0,0 @@ - - -var _fakeLRUcount = 0; -export const fakeDemoRedisCache = { - _cache: {}, - get: (key) => { - let cache = fakeDemoRedisCache._cache[key]; - _fakeLRUcount++; - if (_fakeLRUcount >= 10) { - fakeDemoRedisCache.clear(); - _fakeLRUcount = 0; - } - return cache; - }, - set: (key, data) => fakeDemoRedisCache._cache[key] = data, - clear: () => fakeDemoRedisCache._cache = {} -}; diff --git a/sample-components/sampleComponent-2/src/backend/db.ts b/sample-components/sampleComponent-2/src/backend/db.ts deleted file mode 100644 index 3ba8ea3d..00000000 --- a/sample-components/sampleComponent-2/src/backend/db.ts +++ /dev/null @@ -1,7 +0,0 @@ -// Our API for demos only -export const fakeDataBase = { - get() { - let res = { data: 'This fake data came from the db on the server.' }; - return Promise.resolve(res); - } -}; diff --git a/sample-components/sampleComponent-2/src/client.ts b/sample-components/sampleComponent-2/src/client.ts deleted file mode 100644 index 4b89d28d..00000000 --- a/sample-components/sampleComponent-2/src/client.ts +++ /dev/null @@ -1,20 +0,0 @@ -// the polyfills must be the first thing imported -import 'angular2-universal-polyfills'; - -// Angular 2 -import { enableProdMode} from '@angular/core'; -import { platformUniversalDynamic } from 'angular2-universal'; - -// enable prod for faster renders -enableProdMode(); - -import { MainModule } from './main.browser'; - -const platformRef = platformUniversalDynamic(); - -// on document ready bootstrap Angular 2 -document.addEventListener('DOMContentLoaded', () => { - - platformRef.bootstrapModule(MainModule); - -}); diff --git a/sample-components/sampleComponent-2/src/index.html b/sample-components/sampleComponent-2/src/index.html deleted file mode 100644 index 070f971b..00000000 --- a/sample-components/sampleComponent-2/src/index.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - OpenAIRE - - - - - - - - - - - - - - - - - - - - Loading Universal ... - - - - - diff --git a/sample-components/sampleComponent-2/src/main.browser.ts b/sample-components/sampleComponent-2/src/main.browser.ts deleted file mode 100644 index 074b673b..00000000 --- a/sample-components/sampleComponent-2/src/main.browser.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; - -import { UniversalModule } from 'angular2-universal'; - -import { App } from './app/app'; -//for routing: -import {ClaimsAdminComponent} from './app/claimPages/claims/claimsAdmin.component'; -import { routing } from './app/app.routing'; -import {Routes, RouterModule} from "@angular/router"; - -import {Open} from './app/common/modal/open.component'; - -import {Alert} from './app/common/modal/alert'; -import {Loading} from './app/common/modal/loading.component'; -import {ClaimsComponent} from './app/claimPages/claims/claims.component'; -import {ClaimsService} from './app/services/claims.service'; -import {Claim} from './app/entities/claim'; -import {pagingFormatterNoLoad} from './app/common/pagingFormatterNoLoad.component'; - -import {ClaimEntityFormatter} from './app/common/claimEntityFormatter.component'; -import {PublicationTitleFormatter} from './app/common/publicationTitleFormatter.component'; -import {ProjectTitleFormatter} from './app/common/projectTitleFormatter.component'; -import {HomeComponent} from './app/home/home.component'; - -@NgModule({ - bootstrap: [ App ], - declarations: [ App, ClaimsAdminComponent, ClaimsComponent, ClaimEntityFormatter,pagingFormatterNoLoad, Open, ProjectTitleFormatter, PublicationTitleFormatter,HomeComponent, Loading, Alert], - imports: [ - UniversalModule, // BrowserModule, HttpModule, and JsonpModule are included - FormsModule, - routing - ], - providers: [ ClaimsService ] -}) -export class MainModule { - -} diff --git a/sample-components/sampleComponent-2/src/main.node.ts b/sample-components/sampleComponent-2/src/main.node.ts deleted file mode 100644 index 22542512..00000000 --- a/sample-components/sampleComponent-2/src/main.node.ts +++ /dev/null @@ -1,59 +0,0 @@ -// import { NgModule } from '@angular/core'; -// import { FormsModule } from '@angular/forms'; -// import { RouterModule } from '@angular/router'; -// import { UniversalModule } from 'angular2-universal'; -// import { HomeComponent } from './app/home/home.component'; -// import { App } from './app/app'; -// -// @NgModule({ -// bootstrap: [ App ], -// declarations: [ App, HomeComponent ], -// imports: [ -// UniversalModule, // NodeModule, NodeHttpModule, and NodeJsonpModule are included -// FormsModule, -// RouterModule.forRoot([ -// { path: '', component: HomeComponent, pathMatch: 'full' } -// ]) -// ] -// }) -// export class MainModule { -// -// } -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; - -import { UniversalModule } from 'angular2-universal'; - -import { App } from './app/app'; -//for routing: -import {ClaimsAdminComponent} from './app/claimPages/claims/claimsAdmin.component'; -import { routing } from './app/app.routing'; -import {Routes, RouterModule} from "@angular/router"; - -import {Open} from './app/common/modal/open.component'; - -import {Alert} from './app/common/modal/alert'; -import {Loading} from './app/common/modal/loading.component'; -import {ClaimsComponent} from './app/claimPages/claims/claims.component'; -import {ClaimsService} from './app/services/claims.service'; -import {Claim} from './app/entities/claim'; -import {pagingFormatterNoLoad} from './app/common/pagingFormatterNoLoad.component'; - -import {ClaimEntityFormatter} from './app/common/claimEntityFormatter.component'; -import {PublicationTitleFormatter} from './app/common/publicationTitleFormatter.component'; -import {ProjectTitleFormatter} from './app/common/projectTitleFormatter.component'; -import {HomeComponent} from './app/home/home.component'; - -@NgModule({ - bootstrap: [ App ], - declarations: [ App, ClaimsAdminComponent, ClaimsComponent, ClaimEntityFormatter,pagingFormatterNoLoad, Open, ProjectTitleFormatter, PublicationTitleFormatter,HomeComponent, Loading, Alert], - imports: [ - UniversalModule, // BrowserModule, HttpModule, and JsonpModule are included - FormsModule, - routing - ], - providers: [ ClaimsService ] -}) -export class MainModule { - -} diff --git a/sample-components/sampleComponent-2/src/server.ts b/sample-components/sampleComponent-2/src/server.ts deleted file mode 100644 index 1601374e..00000000 --- a/sample-components/sampleComponent-2/src/server.ts +++ /dev/null @@ -1,70 +0,0 @@ -// the polyfills must be the first thing imported in node.js -import 'angular2-universal-polyfills'; - -import * as path from 'path'; -import * as express from 'express'; -import * as bodyParser from 'body-parser'; -import * as cookieParser from 'cookie-parser'; - -// Angular 2 -import { enableProdMode } from '@angular/core'; -// Angular 2 Universal -import { createEngine } from 'angular2-express-engine'; - -// App -import { MainModule } from './main.node'; - -// enable prod for faster renders -enableProdMode(); - -const app = express(); -const ROOT = path.join(path.resolve(__dirname, '..')); - -// Express View -app.engine('.html', createEngine({})); -app.set('views', __dirname); -app.set('view engine', 'html'); - -app.use(cookieParser('Angular 2 Universal')); -app.use(bodyParser.json()); - -// Serve static files -app.use('/assets', express.static(path.join(__dirname, 'assets'), {maxAge: 30})); -app.use(express.static(path.join(ROOT, 'dist/client'), {index: false})); -/* **AK** Add this path so that index.html can see files from node_modules folder (e.g. bootstrap files)*/ -app.use(express.static(path.join(ROOT, 'node_modules'), {index: false})); -// app.get('/bootstrap.css', express.static(path.join(ROOT, 'node_modules/bootstrap/dist/css/bootstrap.min.css'))); - -import { serverApi } from './backend/api'; -// Our API for demos only -app.get('/data.json', serverApi); - -function ngApp(req, res) { - res.render('index', { - req, - res, - ngModule: MainModule, - preboot: false, - baseUrl: '/', - requestUrl: req.originalUrl, - originUrl: 'http://localhost:3000' - }); -} -// Routes with html5pushstate -// ensure routes match client-side-app -app.get('/', ngApp); -app.get('/claims', ngApp); -app.get('/home', ngApp); - - -app.get('*', function(req, res) { - res.setHeader('Content-Type', 'application/json'); - var pojo = { status: 404, message: 'No Content' }; - var json = JSON.stringify(pojo, null, 2); - res.status(404).send(json); -}); - -// Server -let server = app.listen(process.env.PORT || 3000, () => { - console.log(`Listening on: http://localhost:${server.address().port}`); -}); diff --git a/sample-components/sampleComponent-2/src/typings.d.ts b/sample-components/sampleComponent-2/src/typings.d.ts deleted file mode 100644 index 89020e14..00000000 --- a/sample-components/sampleComponent-2/src/typings.d.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Custom Type Definitions - * When including 3rd party modules you also need to include the type definition for the module - * if they don't provide one within the module. You can try to install it with typings -typings install node --save - * If you can't find the type definition in the registry we can make an ambient definition in - * this file for now. For example -declare module "my-module" { - export function doesSomething(value: string): string; -} - * - * If you're prototying and you will fix the types later you can also declare it as type any - * -declare var assert: any; - * - * If you're importing a module that uses Node.js modules which are CommonJS you need to import as - * -import * as _ from 'lodash' - * You can include your type definitions in this file until you create one for the typings registry - * see https://github.com/typings/registry - * - */ - - -// Extra variables that live on Global that will be replaced by webpack DefinePlugin -declare var ENV: string; -declare var HMR: boolean; -interface GlobalEnvironment { - ENV; - HMR; -} - -interface WebpackModule { - hot: { - data?: any, - idle: any, - accept(dependencies?: string | string[], callback?: (updatedDependencies?: any) => void): void; - decline(dependencies?: string | string[]): void; - dispose(callback?: (data?: any) => void): void; - addDisposeHandler(callback?: (data?: any) => void): void; - removeDisposeHandler(callback?: (data?: any) => void): void; - check(autoApply?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void; - apply(options?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void; - status(callback?: (status?: string) => void): void | string; - removeStatusHandler(callback?: (status?: string) => void): void; - }; -} - -interface WebpackRequire { - context(file: string, flag?: boolean, exp?: RegExp): any; -} - -// Extend typings -interface NodeRequire extends WebpackRequire {} -interface NodeModule extends WebpackModule {} -interface Global extends GlobalEnvironment {} diff --git a/sample-components/sampleComponent-2/tsconfig.json b/sample-components/sampleComponent-2/tsconfig.json deleted file mode 100644 index 28216892..00000000 --- a/sample-components/sampleComponent-2/tsconfig.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "compilerOptions": { - "declaration": false, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "module": "commonjs", - "moduleResolution": "node", - "outDir": "dist", - "sourceMap": true, - "sourceRoot": "src", - "target": "es5", - "lib": ["es6", "dom"], - "types": [ - "body-parser", - "compression", - "cookie-parser", - "express", - "express-serve-static-core", - "mime", - "node", - "serve-static", - "hammerjs" - ] - }, - "exclude": [ - "node_modules" - ], - "compileOnSave": false, - "buildOnSave": false, - "atom": { "rewriteTsconfig": false } -} diff --git a/sample-components/sampleComponent-2/webpack.config.ts b/sample-components/sampleComponent-2/webpack.config.ts deleted file mode 100644 index 50e7578e..00000000 --- a/sample-components/sampleComponent-2/webpack.config.ts +++ /dev/null @@ -1,146 +0,0 @@ -var webpack = require('webpack'); -var path = require('path'); -var resolveNgRoute = require('@angularclass/resolve-angular-routes'); - - -var commonConfig = { - resolve: { - extensions: ['', '.ts', '.js', '.json'] - }, - module: { - loaders: [ - // TypeScript - { test: /\.ts$/, loaders: ['ts-loader', 'angular2-template-loader'] }, - { test: /\.html$/, loader: 'raw-loader' }, - { test: /\.css$/, loader: 'raw-loader' }, - { test: /\.json$/, loader: 'json-loader' } - ], - }, - plugins: [ - new webpack.ContextReplacementPlugin( - // The (\\|\/) piece accounts for path separators in *nix and Windows - /angular(\\|\/)core(\\|\/)src(\\|\/)linker/, - root('./src'), - resolveNgRoute(root('./src')) - ) - ] - -}; - - -var clientConfig = { - target: 'web', - entry: './src/client', - output: { - path: root('dist/client') - }, - node: { - global: true, - __dirname: true, - __filename: true, - process: true, - Buffer: false, - fs: "empty", - module: "empty", - child_process: "empty", - net: "empty", - tls: "empty" - - } -}; - - -var serverConfig = { - target: 'node', - entry: './src/server', // use the entry file of the node server if everything is ts rather than es5 - output: { - path: root('dist/server'), - libraryTarget: 'commonjs2' - }, - module: { - preLoaders: [ - { test: /angular2-material/, loader: "imports-loader?window=>global" } - ], - }, - externals: includeClientPackages([ - // include these client packages so we can transform their source with webpack loaders - '@angular2-material/button', - '@angular2-material/button', - '@angular2-material/card', - '@angular2-material/checkbox', - '@angular2-material/core', - '@angular2-material/grid', - '@angular2-material/icon', - '@angular2-material/input', - '@angular2-material/list', - '@angular2-material/menu', - '@angular2-material/progress', - '@angular2-material/progress', - '@angular2-material/radio', - '@angular2-material/sidenav', - '@angular2-material/slider', - '@angular2-material/slide', - '@angular2-material/tabs', - '@angular2-material/toolbar', - '@angular2-material/tooltip' - ]), - node: { - global: true, - __dirname: true, - __filename: true, - process: true, - Buffer: true, - fs: "empty", - module: "empty", - child_process: "empty", - net: "empty", - tls: "empty" - - } -}; - - - -// Default config -var defaultConfig = { - context: __dirname, - resolve: { - root: root('/src') - }, - output: { - publicPath: path.resolve(__dirname), - filename: 'index.js' - } -}; - - - -var webpackMerge = require('webpack-merge'); -module.exports = [ - // Client - webpackMerge({}, defaultConfig, commonConfig, clientConfig), - - // Server - webpackMerge({}, defaultConfig, commonConfig, serverConfig) -]; - -function includeClientPackages(packages) { - return function(context, request, cb) { - if (packages && packages.indexOf(request) !== -1) { - return cb(); - } - return checkNodeImport(context, request, cb); - }; -} -// Helpers -function checkNodeImport(context, request, cb) { - if (!path.isAbsolute(request) && request.charAt(0) !== '.') { - cb(null, 'commonjs ' + request); return; - } - cb(); -} - -function root(args) { - args = Array.prototype.slice.call(arguments, 0); - return path.join.apply(path, [__dirname].concat(args)); -} diff --git a/sample-components/sampleComponent-rc4/nodemon.json b/sample-components/sampleComponent-rc4/nodemon.json deleted file mode 100644 index 97a836fb..00000000 --- a/sample-components/sampleComponent-rc4/nodemon.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "watch": [ - "dist", - "src/index.html" - ], - "ext" : "js ts json html" -} diff --git a/sample-components/sampleComponent-rc4/package.json b/sample-components/sampleComponent-rc4/package.json deleted file mode 100644 index c9a9d2fb..00000000 --- a/sample-components/sampleComponent-rc4/package.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "test-portal", - "version": "1.0.0-rc4", - "description": "Open Access Infrastructure for Research in Europe ", - "scripts": { - "postinstall": "typings install", - "watch": "webpack --watch", - "prebuild": "rimraf dist", - "build": "webpack", - "build:prod": "webpack --progress -p", - "prestart": "npm run build", - "server": "nodemon dist/server/index.js", - "start": "npm run server", - "predebug": "npm run build", - "debug": "node --debug-brk dist/server/index.js" - }, - "license": "UOA", - "dependencies": { - "@angular/common": "2.0.0-rc.4", - "@angular/compiler": "2.0.0-rc.4", - "@angular/core": "2.0.0-rc.4", - "@angular/forms": "0.2.0", - "@angular/http": "2.0.0-rc.4", - "@angular/platform-browser": "2.0.0-rc.4", - "@angular/platform-browser-dynamic": "2.0.0-rc.4", - "@angular/platform-server": "2.0.0-rc.4", - "@angular/router": "3.0.0-beta.1", - "angular2-universal": "~0.104.5", - "body-parser": "^1.15.1", - "bootstrap": "^3.3.6", - "express": "^4.14.0", - "methods": "~1.1.2", - "parse5": "^1.5.0", - "preboot": "^2.1.2", - "rxjs": "5.0.0-beta.6" - }, - "devDependencies": { - "angular2-template-loader": "^0.4.0", - "cookie-parser": "^1.4.3", - "nodemon": "^1.9.2", - "raw-loader": "^0.5.1", - "rimraf": "^2.5.2", - "source-map-loader": "^0.1.5", - "ts-loader": "^0.8.2", - "typescript": "^1.8.9", - "typings": "~1.0.5", - "webpack": "^1.13.1", - "webpack-dev-server": "^1.14.0", - "webpack-merge": "^0.13.0" - } -} diff --git a/sample-components/sampleComponent-rc4/src/app/app.component.ts b/sample-components/sampleComponent-rc4/src/app/app.component.ts deleted file mode 100644 index 52b8e4db..00000000 --- a/sample-components/sampleComponent-rc4/src/app/app.component.ts +++ /dev/null @@ -1,116 +0,0 @@ -import {Component, Directive, ElementRef, Renderer} from '@angular/core'; -import {RouterConfig, ROUTER_DIRECTIVES } from '@angular/router'; -import {Http} from '@angular/http'; -// import {SearchComponent} from './searchPages/search.component'; -// import {ClaimComponent} from './claimPages/claim/claim.component'; -import {ClaimsAdminComponent} from './claimPages/claims/claimsAdmin.component'; -import {HomeComponent} from './home/home.component'; -// import {LinkingComponent} from './claimPages/linking/linking.component'; -// import {LinkingHomeComponent} from './claimPages/linking/linkingHome.component'; -// import {MyClaimsComponent} from './claimPages/myClaims/myClaims.component'; -// import {ProjectComponent} from './landingPages/project/project.component'; -// import {DatasetComponent} from './landingPages/dataset/dataset.component'; -// import {PersonComponent} from './landingPages/person/person.component'; -// import {PublicationComponent} from './landingPages/publication/publication.component'; -// import {OrganizationComponent} from './landingPages/organization/organization.component'; -// import {MyClaimsDemoComponent} from './claimPages/myClaimsDemo.component'; -// import {SearchPublicationsComponent} from './searchPages/searchPublications.component'; -// import {AdvancedSearchPublicationsComponent} from './searchPages/advancedSearchPublications.component'; -// import {UploadComponent} from './upload.component'; -// import {BulkLinkingComponent} from './claimPages/linking/bulkLinking.component'; -// import {DepositComponent} from './deposit/deposit.component'; -import 'rxjs/Rx'; - - - -@Component({ - selector: 'app', - directives: [ - ...ROUTER_DIRECTIVES - ], - precompile: [ ClaimsAdminComponent, HomeComponent], - styles: [` - .router-link-active { - background-color: lightgray; - } - `], - template: ` -
- - -
- -
- -
- ` -}) - - - - -export class App { - name: string = 'Angular 2'; - data = {}; - server; - - constructor(public http: Http ) { - - } - - - ngOnInit() { - setTimeout(() => { - this.server = 'Rendered on the Server'; - }, 10); - - } - -} - -export const routes: RouterConfig = [ - { path: '', - pathMatch: 'full', - redirectTo: 'home' }, - { path: 'home', component: HomeComponent }, - { path: 'claims', component: ClaimsAdminComponent } ]; -// , -// { path: 'claim', component: ClaimComponent }, -// { path: 'search', component: SearchComponent }, -// { path: 'linking', component: LinkingComponent }, -// { path: 'my-claims', component: MyClaimsComponent }, -// { path: 'demo', component: MyClaimsDemoComponent }, -// { path: 'project', component: ProjectComponent}, -// { path: 'publication', component: PublicationComponent }, -// { path: 'dataset', component: DatasetComponent}, -// { path: 'person', component: PersonComponent }, -// { path: 'organization', component: OrganizationComponent }, -// { path: 'up', component: UploadComponent}, -// { path: 'bulk-linking', component: BulkLinkingComponent}, -// { path: 'search-publications', component: SearchPublicationsComponent }, -// { path: 'advanced-search-publications', component: AdvancedSearchPublicationsComponent }, -// { path: 'deposit', component: DepositComponent} -// -// ]; diff --git a/sample-components/sampleComponent-rc4/src/app/claimPages/claims/claims.component.html b/sample-components/sampleComponent-rc4/src/app/claimPages/claims/claims.component.html deleted file mode 100644 index 0ebd0692..00000000 --- a/sample-components/sampleComponent-rc4/src/app/claimPages/claims/claims.component.html +++ /dev/null @@ -1,107 +0,0 @@ -
-
-
-
- -
Claims related to
- -
-

- -

-

- -

-

- -

-

- -

-

- -

-
-
-
- - -
- diff --git a/sample-components/sampleComponent-rc4/src/app/claimPages/claims/claims.component.ts b/sample-components/sampleComponent-rc4/src/app/claimPages/claims/claims.component.ts deleted file mode 100644 index 8532fc6d..00000000 --- a/sample-components/sampleComponent-rc4/src/app/claimPages/claims/claims.component.ts +++ /dev/null @@ -1,491 +0,0 @@ -import {Component, ViewChild, Input} from '@angular/core'; -import {JSONP_PROVIDERS} from '@angular/http'; -import {Location} from '@angular/common'; -import {Observable} from 'rxjs/Observable'; -import {ROUTER_DIRECTIVES,ActivatedRoute, Router} from '@angular/router'; -import {ClaimsService} from '../../services/claims.service'; -import {Claim} from '../../entities/claim'; -import {pagingFormatterNoLoad} from '../../common/pagingFormatterNoLoad.component'; - -import {ClaimEntityFormatter} from '../../common/claimEntityFormatter.component'; - -@Component({ - selector: 'claims', - directives: [...ROUTER_DIRECTIVES,ClaimEntityFormatter,pagingFormatterNoLoad ], - templateUrl: 'claims.component.html', - providers:[ ClaimsService, JSONP_PROVIDERS] - -}) -export class ClaimsComponent { - constructor (private _claimService: ClaimsService, private route: ActivatedRoute, private _router:Router, private location: Location) { - } - - ngOnInit() { - this.sub = this._router.routerState.queryParams.subscribe(params => { - if( this.myClaims == 'true' ){ - this.fetchBy = "User"; - }else{ - - this.fetchBy = params['fetchBy']; - this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All'; - this.fetchId = params['fetchId']; - this.fetchId=this.fetchId?this.fetchId:''; - - } - - let page = (params['page']=== undefined)?1:+params['page']; - let size = (params['size']=== undefined)?10:+params['size']; - - this.keyword = (params['keyword']?params['keyword']:""); - this.inputkeyword = this.keyword; - this.page = ( page <= 0 ) ? 1 : page; - this.size = ( size <= 0 ) ? 10 : size; - this.entityTypes = []//(params['types']?params['types']:[]); - this.setTypes(params['types']); // check the appropriate checkboxes - this.setSortby(params['sort']); - this.getClaims(); - - }); - // this.sub = this.route.params.subscribe(params => { - // console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId); - // if( this.myClaims == 'true' ){ - // console.info("Is myclaims"); - // this.fetchBy = "User"; - // }else{ - // console.info("Is admin"); - // - // console.info(this.isAdmin); - // - // this.fetchBy = params['fetchBy']; - // this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All'; - // this.fetchId = params['fetchId']; - // console.info("Fetch by:"+this.fetchBy+"Fetch id:"+this.fetchId); - // this.fetchId=this.fetchId?this.fetchId:''; - // - // } - // - // console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId); - // let page = (params['page']=== undefined)?1:+params['page']; - // let size = (params['size']=== undefined)?10:+params['size']; - // - // this.keyword = (params['keyword']?params['keyword']:""); - // this.inputkeyword = this.keyword; - // this.page = ( page <= 0 ) ? 1 : page; - // this.size = ( size <= 0 ) ? 10 : size; - // this.entityTypes = []//(params['types']?params['types']:[]); - // this.setTypes(params['types']); // check the appropriate checkboxes - // this.setSortby(params['sort']); - // this.getClaims(); - // console.info("params: "+params['page']+" page "+page +" this.page: "+this.page ); - // }); - } - ngOnDestroy() { - this.sub.unsubscribe(); - } - sub: any; - //string because comes as input from component directive - @Input() enableDelete: string = 'false'; - @Input() myClaims: string= 'false' ; - @Input() isAdmin:string = 'false'; - page : number; - size:number; - keyword:string; // the keyword string to give to the request as parameter - inputkeyword:string; // the string written in the input field (keyword=inputkeyword when its length is bigger than 3 and the user stops typing) - lengths = [10,20,30,50]; - types = ["All","Project","Context","Result","User"]; - @Input() fetchBy:string; - @Input() fetchId:string; - - navigateTo: string = "Claims"; - resultsNum: number ; - claims: string[]; - - // @ViewChild (Loading) loading : Loading ; - - //checkboxes: - publicationCB = false; - datasetCB = false; - contextCB = false; - projectCB = false; - entityTypes : string[] =[] ; - - descending = true; - sortby = "date"; - - selected=[]; - deleteMessage:string = ""; - showErrorMessage:boolean = false; - - //params for pagingFormatter to use when navigate to page - params; - // @ViewChild(Alert) alert; - - claimsDeleted:number = 0; - - getClaims () { - this.selected=[]; - var types = ''; - this.showErrorMessage = false; - for (var type of this.entityTypes){ - types+=(types.length>0?'&':'')+"types="+type; - } - if(this.fetchBy =="Project" ){ - this._claimService.getClaimsByProject(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="User"){ - this._claimService.getClaimsByUser(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="Result"){ - this._claimService.getClaimsByResult(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="Context"){ - this._claimService.getClaimsBycontext(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= null; - this.resultsNum= data.total;//data.length; //TODO get the total results num - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else{ - this._claimService.getClaims(this.size,this.page,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum = null; - this.resultsNum= data.total;//data.length; //TODO get the total results num - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - } - } - - goToClaim(claimId: number){ - this._router.navigate( ['Claim', { id: claimId}] ); - } - goTo(page:number = 1){ - - this.page = page; - - this.location.go(location.pathname,this.getParametersString()); - this.getClaims(); - } - getParameters(){ - let params={ page: this.page, size: this.size, types: this.entityTypes, fetchBy: this.fetchBy, fetchId:this.fetchId, keyword : this.keyword, sort: this.getSortby() }; - return params; - } - getParametersString(){ - var params=''; - params+=(this.page==1?"":(params.length>0?'&':'')+"page="+this.page); - params+=(this.size==10?"":(params.length>0?'&':'')+"size="+this.size); - // params+=(this.entityTypes==''?"":(params.length>0?'&':'')+"types="+this.entityTypes); - var types=""; - for (var type of this.entityTypes){ - types+=(types.length>0?',':'')+type; - } - params+=(types.length>0)?"types="+types:""; - - if(this.isAdmin === 'true'){ - params+=(this.fetchBy=='All'?"":(params.length>0?'&':'')+"fetchBy="+this.fetchBy); - params+=(this.fetchId==''?"":(params.length>0?'&':'')+"fetchId="+this.fetchId); - } - params+=(this. getSortby()=='datedesc'?"":(params.length>0?'&':'')+"sort="+this. getSortby()); - params+=(this.keyword==''?"":(params.length>0?'&':'')+"keyword="+this.keyword); - return params; - } - changeLength(){ - this.goTo(); - } - clearFilters(){ - this.keyword = ''; - this.inputkeyword = ''; - this.publicationCB = false; - this.projectCB = false; - this.datasetCB = false; - this.contextCB = false; - this.entityTypes = []; - this.goTo(); - } - changeOrderby(sortby:string){ - if(sortby==this.sortby){ - this.descending = !this.descending; - }else{ - this.sortby = sortby; - this.descending = false; - } - this.goTo(); - } - setSortby(sortby:string){ - if(!sortby|| sortby == "datedesc"){ - this.descending = true; - this.sortby = "date"; - }else if(sortby == "dateasc"){ - this.descending = false; - this.sortby = "date"; - }else if(sortby == "userasc"){ - this.descending = false; - this.sortby = "user"; - }else if(sortby == "userdesc"){ - this.descending = true; - this.sortby = "user"; - }if(sortby =="sourceasc"){ - this.descending = false; - this.sortby = "source"; - }else if(sortby == "sourcedesc"){ - this.descending = true; - this.sortby = "source"; - }else if(sortby == "targetasc"){ - this.descending = false; - this.sortby = "target"; - }else if(sortby == "targetdesc"){ - this.descending = true; - this.sortby = "target"; - } - } - getSortby():string{ - if(this.descending){ - return this.sortby+"desc"; - }else{ - return this.sortby+"asc"; - } - - } - changeType(){ - this.entityTypes = []; - if(this.publicationCB){ - this.entityTypes.push('publication'); - } - if(this.datasetCB){ - this.entityTypes.push('dataset'); - } - if(this.projectCB){ - this.entityTypes.push('project'); - } - if(this.contextCB){ - this.entityTypes.push('context'); - } - - // if(this.publicationCB == true && this.datasetCB == true && this.contextCB == true && this.projectCB == true ){ - // this.entityTypes=""; - // }else{ - // this.entityTypes = ""; - // if(this.publicationCB == true){ - // this.entityTypes = "publication"; - // } - // if(this.datasetCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"dataset"; - // } - // if(this.contextCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"context"; - // } - // if(this.projectCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"project"; - // } - // } - // console.debug("Type changed: "+this.entityTypes+" "+this.publicationCB+ this.datasetCB + this.contextCB + this.projectCB); - this.goTo(); - } - setTypes(types:string){ - if(!types){ - return; - } - if(types.length > 0){ - this.entityTypes = []; - if(types.indexOf("publication")!=-1){ - this.publicationCB = true; - this.entityTypes.push("publication"); - } - if(types.indexOf("dataset")!=-1){ - this.datasetCB = true; - this.entityTypes.push("dataset"); - } - if(types.indexOf("project")!=-1){ - this.projectCB = true; - this.entityTypes.push("project"); - } - if(types.indexOf("context")!=-1){ - this.contextCB = true; - this.entityTypes.push("context"); - } - } - if(this.publicationCB && this.datasetCB && this.contextCB && this.projectCB){ - this.entityTypes=[]; - } - } - changekeyword(){ - - if(this.inputkeyword.length >= 3 || this.inputkeyword.length == 0 ){ - this.keyword = this.inputkeyword; - this.page = 1; - this.goTo(); - } - - } - select(item:any,event){ - this.deleteMessage=""; - var value = event.currentTarget.checked; - if(value){ - this.selected.push(item); - }else{ - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == item.id){ - this.selected.splice(_i, 1); - } - } - - - } - } - selectAll(){ - this.selected = []; - for (var _i = 0; _i < this.claims.length; _i++) { - let claim = this.claims[_i]; - this.selected.push(claim); - } - this.deleteMessage = ""; - } - deselectAll(){ - this.selected = []; - this.deleteMessage=""; - } - isSelected(id:string){ - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == id){ - return true; - } - } - return false; - } - - - // confirmOpen(){ - // if(this.selected.length <= 0){ - // - // }else{ - // this.alert.cancelButton = true; - // this.alert.okButton = true; - // this.alert.alertTitle = "Delete "+this.selected.length+" claim(s)"; - // this.alert.message = this.selected.length+" claims will be deleted. Do you want to proceed? "; - // this.alert.okButtonText = "Yes"; - // this.alert.cancelButtonText = "No"; - // this.alert.open(); - // } - // } - // confirmClose(data){ - // this.delete(); - // } - // delete(){ - // this.deleteMessage=""; - // this.loading.open(); - // this.claimsDeleted = 0; - // var ids = []; - // for (var i = 0; i < this.selected.length; i++){ - // var id =this.selected[i].id; - // ids.push(id); - // // var selected =this.selected[i].id; - // // console.warn("Deleting claim with id:"+id); - // // this.deleteById(id); - // //TODO for multiple concurrent - // } - // this.batchDeleteById(ids); - // } - - // deleteById(id:string){ - // - // console.warn("Deleting claim with id:"+id); - // // this._claimService.deleteClaimById(id); - // this._claimService.deleteClaimById(id).subscribe( - // res => { - // console.info('Delete response'+res.code ); - // console.warn("Deleted claim with id:"+ id); - // //remove this claim from the - // let newClaims=this.claims; - // for (var _i = 0; _i < this.claims.length; _i++) { - // let claim = this.claims[_i]; - // if(claim['id'] == id){ - // newClaims.splice(_i, 1); - // } - // } - // //TODO should call getClaims??? - // this.claimsDeleted++; - // this.claims = newClaims; - // if(this.claimsDeleted == this.selected.length){ - // this.resultsNum = this.resultsNum - this.selected.length; - // this.loading.close(); - // this.selected = []; - // } - // - // - // }); - // } - // batchDeleteById(ids:string[]){ - // - // console.warn("Deleting claim with ids:"+ids); - // this._claimService.deleteBulk(ids).subscribe( - // res => { - // console.info('Delete response'+res.code ); - // console.warn("Deleted ids:"+ res.deletedIds); - // console.warn("Not found ids:"+ res.notFoundIds); - // //remove this claim from the - // let newClaims=this.claims; - // for(var id of res.deletedIds){ - // for (var _i = 0; _i < this.claims.length; _i++) { - // let claim = this.claims[_i]; - // if(claim['id'] == id){ - // newClaims.splice(_i, 1); - // } - // } - // for (var _i = 0; _i < this.selected.length; _i++) { - // let claim = this.selected[_i]; - // if(claim['id'] == id){ - // this.selected.splice(_i, 1); - // } - // } - // } - // this.claims = newClaims; - // this.resultsNum = this.resultsNum - res.deletedIds.length; - // this.loading.close(); - // if(res.deletedIds.length>0){ - // this.deleteMessage=this.deleteMessage+'
'+res.deletedIds.length+' claim(s) successfully deleted.
'; - // } - // if(res.notFoundIds.length>0){ - // this.deleteMessage=this.deleteMessage+'
'+res.notFoundIds.length+' claim(s) couldn\'t be deleted.
'; - // } - // }); - // } - pageChange($event) { - var page:number = +$event.value - this.goTo(page); - } -} diff --git a/sample-components/sampleComponent-rc4/src/app/claimPages/claims/claimsAdmin.component.ts b/sample-components/sampleComponent-rc4/src/app/claimPages/claims/claimsAdmin.component.ts deleted file mode 100644 index 19d231b3..00000000 --- a/sample-components/sampleComponent-rc4/src/app/claimPages/claims/claimsAdmin.component.ts +++ /dev/null @@ -1,40 +0,0 @@ -import {Component, ViewChild, Input} from '@angular/core'; -import {JSONP_PROVIDERS} from '@angular/http'; -import {Location} from '@angular/common'; -import {Observable} from 'rxjs/Observable'; -import {ROUTER_DIRECTIVES } from '@angular/router'; -import {ClaimsComponent} from './claims.component'; - -@Component({ - selector: 'claims', - directives: [...ROUTER_DIRECTIVES , ClaimsComponent], - template: ` -
-
-

Claims Administrator

-
- -
- - -
- TODO login -
- `, - -}) -export class ClaimsAdminComponent { - constructor ( ) { - - } -user:string="argirok@di.uoa.gr"; - ngOnInit() { - - - } - - -} diff --git a/sample-components/sampleComponent-rc4/src/app/common/claimEntityFormatter.component.ts b/sample-components/sampleComponent-rc4/src/app/common/claimEntityFormatter.component.ts deleted file mode 100644 index b38ea128..00000000 --- a/sample-components/sampleComponent-rc4/src/app/common/claimEntityFormatter.component.ts +++ /dev/null @@ -1,39 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {PublicationTitleFormatter} from './publicationTitleFormatter.component'; -import {ProjectTitleFormatter} from './projectTitleFormatter.component'; - -//Usage Example " " - -//externalUrl -@Component({ - selector: 'claim-entity', - template: ` - -
- ({{type}}) - -
-
- (Project) - -
-
- (Context) -
{{entity.title}}
-
- `, - directives: [PublicationTitleFormatter,ProjectTitleFormatter] -}) - -export class ClaimEntityFormatter { - @Input() entity: string[]; - @Input() type: string; - - constructor () {} - - ngOnInit() { - - } - - -} diff --git a/sample-components/sampleComponent-rc4/src/app/common/modal/alert.ts b/sample-components/sampleComponent-rc4/src/app/common/modal/alert.ts deleted file mode 100644 index d9f84fd2..00000000 --- a/sample-components/sampleComponent-rc4/src/app/common/modal/alert.ts +++ /dev/null @@ -1,111 +0,0 @@ -import {Component, ViewEncapsulation, ComponentRef, DynamicComponentLoader,ElementRef, Input, EventEmitter, Output} from '@angular/core'; -import {Open} from './open.component'; - -@Component({ - selector: 'alert', - template: ` - - `, - providers: [], - directives: [Open], - encapsulation: ViewEncapsulation.None, - pipes: [] -}) -/** - * API to an open alert window. - */ -export class Alert{ - /** - * Caption for the title. - */ - public alertTitle:string; - /** - * Describes if the alert contains Ok Button. - * The default Ok button will close the alert and emit the callback. - * Defaults to true. - */ - public okButton:boolean = true; - /** - * Caption for the OK button. - * Default: Ok - */ - public okButtonText:string= 'Ok'; - /** - * Describes if the alert contains cancel Button. - * The default Cancelbutton will close the alert. - * Defaults to true. - */ - public cancelButton:boolean = true; - /** - * Caption for the Cancel button. - * Default: Cancel - */ - public cancelButtonText:string = 'Cancel'; - /** - * if the alertMessage is true it will show the contentString inside alert body. - */ - public alertMessage:boolean = true; - /** - * Some message/content can be set in message which will be shown in alert body. - */ - public message:string; - /** - * if the value is true alert footer will be visible or else it will be hidden. - */ - public alertFooter:boolean= true; - /** - * shows alert header if the value is true. - */ - public alertHeader:boolean = true; - /** - * if the value is true alert will be visible or else it will be hidden. - */ - public isOpen:boolean=false; - /** - * Emitted when a ok button was clicked - * or when Ok method is called. - */ - @Output() public alertOutput:EventEmitter = new EventEmitter(); - constructor(public dcl:DynamicComponentLoader, public _elementRef: ElementRef){} - /** - * Opens a alert window creating backdrop. - */ - open(){ - this.isOpen= true; - } - /** - * ok method closes the modal and emits modalOutput. - */ - ok(){ - this.isOpen = false; - this.alertOutput.emit(true); - } - /** - * cancel method closes the moda. - */ - cancel(){ - this.isOpen = false; - } -} diff --git a/sample-components/sampleComponent-rc4/src/app/common/modal/loading.component.ts b/sample-components/sampleComponent-rc4/src/app/common/modal/loading.component.ts deleted file mode 100644 index 18722dbe..00000000 --- a/sample-components/sampleComponent-rc4/src/app/common/modal/loading.component.ts +++ /dev/null @@ -1,53 +0,0 @@ -import {Component, ViewEncapsulation, ComponentRef, DynamicComponentLoader,ElementRef, Input, EventEmitter, Output} from '@angular/core'; -import {Open} from './open.component'; - -@Component({ - selector: 'loading', - template: ` - - `, - providers: [], - directives: [Open], - encapsulation: ViewEncapsulation.None, - pipes: [] -}) -/** - * API to an open alert window. - */ -export class Loading{ - -@Input() public message:string ="Loading"; - - /** - * if the value is true alert will be visible or else it will be hidden. - */ - public isOpen:boolean=false; - /** - * Emitted when a ok button was clicked - * or when Ok method is called. - */ - @Output() public alertOutput:EventEmitter = new EventEmitter(); - constructor(public dcl:DynamicComponentLoader, public _elementRef: ElementRef){} - /** - * Opens a alert window creating backdrop. - */ - open(){ - this.isOpen= true; - } - - close(){ - this.isOpen = false; - } -} diff --git a/sample-components/sampleComponent-rc4/src/app/common/modal/open.component.ts b/sample-components/sampleComponent-rc4/src/app/common/modal/open.component.ts deleted file mode 100644 index 95add08d..00000000 --- a/sample-components/sampleComponent-rc4/src/app/common/modal/open.component.ts +++ /dev/null @@ -1,55 +0,0 @@ -import {Directive, Input, HostBinding} from '@angular/core'; - -// todo: add animate -// todo: add init and on change -@Directive({selector: '[open]'}) -export class Open { - @HostBinding('style.display') - private display:string; - @HostBinding('class.in') - @HostBinding('attr.aria-expanded') - private isExpanded:boolean = true; - - @Input() - private set open(value:boolean) { - this.isExpanded = value; - this.toggle(); - } - - private get open():boolean { - return this.isExpanded; - } - - constructor() { - } - init() { - this.isExpanded = false; - this.display = 'none'; - } - toggle() { - if (this.isExpanded) { - this.hide(); - } else { - this.show(); - } - } - - hide() { - this.isExpanded = false; - this.display = 'none'; - if (typeof document !== 'undefined') { - let backDrop = document.getElementsByClassName("modal-backdrop"); - if(backDrop.length>0){ - document.body.removeChild(backDrop[0]); - } - } - } - - show() { - let backDrop = document.createElement('div'); - backDrop.className="modal-backdrop fade in"; - document.body.appendChild(backDrop); - this.isExpanded = true; - this.display = 'block'; - } -} diff --git a/sample-components/sampleComponent-rc4/src/app/common/pagingFormatterNoLoad.component.ts b/sample-components/sampleComponent-rc4/src/app/common/pagingFormatterNoLoad.component.ts deleted file mode 100644 index 42534afd..00000000 --- a/sample-components/sampleComponent-rc4/src/app/common/pagingFormatterNoLoad.component.ts +++ /dev/null @@ -1,75 +0,0 @@ -import {Component, Input, Output, EventEmitter} from '@angular/core'; - - -//Usage Example - -@Component({ - selector: 'paging-no-load', - template: ` - - ` -}) - -export class pagingFormatterNoLoad { - @Input() currentPage: number = 1; - @Input() navigateTo: string; - @Input() term: string=''; - @Input() size: number=10; - @Input() totalResults: number = 10; - @Input() params; - - @Output() pageChange = new EventEmitter(); - - constructor () { - } - - ngOnInit() { - console.info("In paging -- CurrentPage:"+this.currentPage+" "+"total Pages = "+this.getTotalPages() +" Results num:"+this.totalResults); - } - getTotalPages(){ - var i= this.totalResults/this.size; - var integerI=parseInt(''+i); - return parseInt(''+((i==integerI)?i:i+1)); - } - onPrev(){ - this.currentPage=this.currentPage-1; - this.pageChange.emit({ - value: this.currentPage - }); - - } - - onNext(){ - - this.currentPage=this.currentPage+1; - this.pageChange.emit({ - value: this.currentPage - }); - } - onPage(pageNum: number){ - - this.currentPage=pageNum; - this.pageChange.emit({ - value: this.currentPage - }); - } -} diff --git a/sample-components/sampleComponent-rc4/src/app/common/projectTitleFormatter.component.ts b/sample-components/sampleComponent-rc4/src/app/common/projectTitleFormatter.component.ts deleted file mode 100644 index 5917768e..00000000 --- a/sample-components/sampleComponent-rc4/src/app/common/projectTitleFormatter.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {OpenaireProperties} from '../openaireProperties'; - -//Usage Example " " - -@Component({ - selector: 'project-title', - template: ` -
-
{{project.name}} ({{project.funderName}})
-
- ` -}) - -export class ProjectTitleFormatter { - @Input() project: string[]; - private url:string; - constructor () {} - - ngOnInit() { - this.url = OpenaireProperties.getsearchLinkToProject() + "?projectId=" + this.project["openaireId"]; - } -} diff --git a/sample-components/sampleComponent-rc4/src/app/common/publicationTitleFormatter.component.ts b/sample-components/sampleComponent-rc4/src/app/common/publicationTitleFormatter.component.ts deleted file mode 100644 index 2c87c50a..00000000 --- a/sample-components/sampleComponent-rc4/src/app/common/publicationTitleFormatter.component.ts +++ /dev/null @@ -1,26 +0,0 @@ -import {Component, Input} from '@angular/core'; - -//Usage Example " " - -@Component({ - selector: 'publication-title', - template: ` -
-
{{title}}
-
{{title}}
-
- ` -}) - -export class PublicationTitleFormatter { - @Input() title: string[]; - @Input() url: string[]; - - constructor () {} - - ngOnInit() { - - } - - -} diff --git a/sample-components/sampleComponent-rc4/src/app/entities/claim.ts b/sample-components/sampleComponent-rc4/src/app/entities/claim.ts deleted file mode 100644 index b5378c5f..00000000 --- a/sample-components/sampleComponent-rc4/src/app/entities/claim.ts +++ /dev/null @@ -1,15 +0,0 @@ -export class Claim { - id: string; - sourceType: string; - targetType: string; - sourceId: string; - targetId: string; - date: string; - DOI: string; - project: Project - userMail: string; - -} -export class Project{ - -} diff --git a/sample-components/sampleComponent-rc4/src/app/home/home.component.html b/sample-components/sampleComponent-rc4/src/app/home/home.component.html deleted file mode 100644 index fa7f4167..00000000 --- a/sample-components/sampleComponent-rc4/src/app/home/home.component.html +++ /dev/null @@ -1,15 +0,0 @@ - -
-
-
-
-
- - - - -
-
-
-
-
diff --git a/sample-components/sampleComponent-rc4/src/app/home/home.component.ts b/sample-components/sampleComponent-rc4/src/app/home/home.component.ts deleted file mode 100644 index 4d8cba35..00000000 --- a/sample-components/sampleComponent-rc4/src/app/home/home.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {Component} from '@angular/core'; -import { ROUTER_DIRECTIVES, Router} from '@angular/router'; -import {JSONP_PROVIDERS} from '@angular/http'; -import {Observable} from 'rxjs/Observable'; -import {Location} from '@angular/common'; - -@Component({ - selector: 'home', - templateUrl: 'home.component.html', - directives: [ ...ROUTER_DIRECTIVES ], -}) - -export class HomeComponent { - constructor ( private _router: Router, private location: Location) {} - - -} diff --git a/sample-components/sampleComponent-rc4/src/app/openaireProperties.ts b/sample-components/sampleComponent-rc4/src/app/openaireProperties.ts deleted file mode 100644 index 796973ae..00000000 --- a/sample-components/sampleComponent-rc4/src/app/openaireProperties.ts +++ /dev/null @@ -1,89 +0,0 @@ -export class OpenaireProperties { - //landing Pages - private static baseSearchLink="/" - private static searchLinkToPublication = "publication?articleId="; - private static searchLinkToProject = "project?projectId="; - private static searchLinkToPerson = "person?personId="; - private static searchLinkToDataProvider = "https://beta.openaire.eu/search/dataprovider?datasourceId="; - private static searchLinkToDataset = "dataset?datasetId="; - private static searchLinkToOrganization = "organization?organizationId="; - - // Services - APIs - - // public claimsAPIURL = "http://rudie.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/" - private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8181/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/"; - - private static searchAPIURL = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - // private searchAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - // private searchAPIURL = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - - private static searchServiveURL = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/"; - // private static searchServiveURL = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/"; - // private static searchServiveURL = "http://services.openaire.eu:8380/search/"; - //private static searchServiveURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/"; - - private static searchCrossrefAPIURL = "http://api.crossref.org/works"; - private static searchDataciteAPIURL = "http://search.datacite.org/api"; - private static searchOrcidURL = "https://pub.orcid.org/"; - - // Identifiers - private static pmidURL = "http://www.ncbi.nlm.nih.gov/pubmed/"; - private static doiURL = "http://dx.doi.org/"; - private static cordisURL = "http://cordis.europa.eu/projects/"; - private static pmcURL = "http://europepmc.org/articles/"; - - - //landing Pages' getters - public static getsearchLinkToPublication():string{ - return this.baseSearchLink + this.searchLinkToPublication; - } - public static getsearchLinkToDataset():string{ - return this.baseSearchLink + this.searchLinkToDataset; - } - public static getsearchLinkToProject():string{ - return this.baseSearchLink + this.searchLinkToProject; - } - public static getsearchLinkToPerson():string{ - return this.baseSearchLink + this.searchLinkToPerson; - } - public static getsearchLinkToOrganization():string{ - return this.searchLinkToOrganization; - } - public static getsearchLinkToDataProvider():string{ - return this.searchLinkToDataProvider; - } - - // Services - APIs' getters - public static getSearchAPIURL():string{ - return this.searchAPIURL; - } - public static getSearchServiceURL():string{ - return this.searchServiveURL; - } - public static getClaimsAPIURL():string{ - return this.claimsAPIURL; - } - public static getSearchCrossrefAPIURL():string{ - return this.searchCrossrefAPIURL; - } - public static getSearchDataciteAPIURL():string{ - return this.searchDataciteAPIURL; - } - public static getSearchOrcidURL():string{ - return this.searchOrcidURL; - } - - // Identifiers' getters - public static getPmidURL():string{ - return this.pmidURL; - } - public static getDoiURL():string{ - return this.doiURL; - } - public static getCordisURL():string{ - return this.cordisURL; - } - public static getPmcURL():string{ - return this.pmcURL; - } -} diff --git a/sample-components/sampleComponent-rc4/src/app/pipes/claimTextFilter.pipe.ts b/sample-components/sampleComponent-rc4/src/app/pipes/claimTextFilter.pipe.ts deleted file mode 100644 index e1d402f0..00000000 --- a/sample-components/sampleComponent-rc4/src/app/pipes/claimTextFilter.pipe.ts +++ /dev/null @@ -1,21 +0,0 @@ -import {Pipe, PipeTransform} from '@angular/core'; - -@Pipe({ - name: 'claimTextFilter' -}) -export class ClaimTextFilterPipe implements PipeTransform { - - transform(value: any, filter: string): any { - console.info('ClaimTextFilterPipe word to filter : '+filter); - filter = filter?filter.toLocaleLowerCase():''; - return filter ? value.filter(claim=> ( - claim.sourceType.toLocaleLowerCase().indexOf(filter)!=-1|| //sourceType - claim.targetType.toLocaleLowerCase().indexOf(filter)!=-1|| //targetType - claim.userMail.toLocaleLowerCase().indexOf(filter)!=-1|| //mail - ((claim.source.title && claim.source.title.toLocaleLowerCase().indexOf(filter)!=-1)||(claim.source.name && claim.source.name.toLocaleLowerCase().indexOf(filter)!=-1))|| //source title - ((claim.target.title && claim.target.title.toLocaleLowerCase().indexOf(filter)!=-1)||(claim.target.name && claim.target.name.toLocaleLowerCase().indexOf(filter)!=-1))|| //target title - ((claim.source.funderName && claim.source.funderName.toLocaleLowerCase().indexOf(filter)!=-1)||(claim.source.funderName && claim.source.funderName.toLocaleLowerCase().indexOf(filter)!=-1))|| //source funder name - ((claim.target.funderName && claim.target.funderName.toLocaleLowerCase().indexOf(filter)!=-1)||(claim.target.funderName && claim.target.funderName.toLocaleLowerCase().indexOf(filter)!=-1)) //target funder name - )) : value; - } -} diff --git a/sample-components/sampleComponent-rc4/src/app/pipes/claimTypeFilter.pipe.ts b/sample-components/sampleComponent-rc4/src/app/pipes/claimTypeFilter.pipe.ts deleted file mode 100644 index 0c386c76..00000000 --- a/sample-components/sampleComponent-rc4/src/app/pipes/claimTypeFilter.pipe.ts +++ /dev/null @@ -1,35 +0,0 @@ - -import {Pipe, PipeTransform} from '@angular/core'; - -@Pipe({name: 'claimTypeFilter'}) -export class ClaimTypeFilterPipe implements PipeTransform { - transform(value: any, publication:boolean,dataset:boolean,project:boolean,context:boolean) : any { - let filter = publication; - console.info('ClaimTypeFilterPipe types to show : '+(publication?'publication ':' ')+(dataset?'dataset ':' ')+(project?'project ':' ')+(context?'context ':' ')); - return (value)?value.filter((claim) =>{ - let filter =publication; - if(publication||dataset||project||context) { - let filter = publication - if(filter && (claim.sourceType.toLocaleLowerCase().indexOf('publication')!=-1 || claim.targetType.toLocaleLowerCase().indexOf('publication')!=-1 )) { - return true; - } - filter = dataset; - if(filter && (claim.sourceType.toLocaleLowerCase().indexOf('dataset')!=-1 || claim.targetType.toLocaleLowerCase().indexOf('dataset')!=-1 )) { - return true; - } - filter = project; - if(filter && (claim.sourceType.toLocaleLowerCase().indexOf('project')!=-1 || claim.targetType.toLocaleLowerCase().indexOf('project')!=-1 )) { - return true; - } - filter = context; - if(filter && (claim.sourceType.toLocaleLowerCase().indexOf('context')!=-1 || claim.targetType.toLocaleLowerCase().indexOf('context')!=-1 )) { - return true; - } - return false; - }else{ - return true; - } - }):value; - } - -} diff --git a/sample-components/sampleComponent-rc4/src/app/services/claims.service.ts b/sample-components/sampleComponent-rc4/src/app/services/claims.service.ts deleted file mode 100644 index 43c6abce..00000000 --- a/sample-components/sampleComponent-rc4/src/app/services/claims.service.ts +++ /dev/null @@ -1,131 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Jsonp, URLSearchParams,ResponseOptions, RequestOptions, Headers} from '@angular/http'; -import {Http, Response} from '@angular/http'; -import {Observable} from 'rxjs/Observable'; -import {Claim} from '../entities/claim'; -import {OpenaireProperties} from '../openaireProperties'; - -@Injectable() -export class ClaimsService { - private baseUrl; - constructor(private jsonp: Jsonp, private http: Http) { - this.baseUrl = OpenaireProperties.getClaimsAPIURL(); - } - - private getClaimRequest(size : number, page : number, url :string):any { - console.info('ClaimsService: Claims request: '+url); - return this.http.get( url) - .map(request => request.json()) - .do(request => console.info("Get claims: offset = "+(size*(page-1)) + " limit ="+size )) - .catch(this.handleError); - } - getClaims( size : number, page : number, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims ' ); - console.info('ClaimsService: Types : '+types ); - let url = this.baseUrl +"claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByUser( size : number, page : number, user:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for user : '+user); - let url = this.baseUrl +"users/"+user+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsBycontext( size : number, page : number, contextId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for context : '+contextId); - let url = this.baseUrl +"contexts/"+contextId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByResult( size : number, page : number, resultId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for result : '+resultId); - let url = this.baseUrl +"results/"+resultId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByProject( size : number, page : number, projectId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for project : '+projectId); - let url = this.baseUrl +"projects/"+projectId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - } - - deleteClaimById(claimId:string):any{ - console.warn('Trying to delete claim with id : '+claimId); - let url = this.baseUrl +"claims/"+claimId; - console.warn('Delete url: '+url); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete( url, options).map(request => request.json()) - .do(request => console.info("After delete" )) - .catch(this.handleError); - - } - deleteBulk(claimIds:string[]):any{ - - console.warn('Trying to delete claims with ids : '+claimIds); - var url = ""; - - for(var claimId of claimIds){ - url=url+(url.length >0 ?"&":"")+"claimId="+claimId; - } - url= this.baseUrl +"claims/bulk?"+url; - console.warn('Delete url: '+url); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete( url, options).map(request => request.json()) - .do(request => console.info("After delete" )) - .catch(this.handleError); - - } - insertBulkClaims(claims):any{ - console.warn('Trying toinsert claims : '+claims); - let url = this.baseUrl +"claims/bulk"; - let body = JSON.stringify( claims ); - console.warn('Json body: : '+body); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, body, options) - .map(res => res.json()) - .do(request => console.info("Insert Response:"+request.status) ) - .catch(this.handleError); - - } - insertClaim(claim):any{ - console.warn('Trying toinsert claim : '+claim); - let url = this.baseUrl +"claims"; - let body = JSON.stringify( claim ); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, body, options) - .map(res => res.json()) - .do(request => console.info("Insert Response:"+request.status) ) - .catch(this.handleError); - - } - - private handleError (error: Response) { - // in a real world app, we may send the error to some remote logging infrastructure - // instead of just logging it to the console - console.error(error); - return Observable.throw(error || 'Server error'); - } - - getClaim(id:string):any { - let url = this.baseUrl+"claims/"+id; - return new Promise((resolve, reject) => { - this.http.get(url) - .map(res => res.json()) - .subscribe( - data => { - resolve(data.data); - }, - err => { - reject(err); - } - ) - ; - }); - } - -} diff --git a/sample-components/sampleComponent-rc4/src/client.ts b/sample-components/sampleComponent-rc4/src/client.ts deleted file mode 100644 index 73d9212f..00000000 --- a/sample-components/sampleComponent-rc4/src/client.ts +++ /dev/null @@ -1,20 +0,0 @@ -// the polyfills must be the first thing imported -import 'angular2-universal/polyfills'; - -// Angular 2 -import {enableProdMode} from '@angular/core'; -// Angular 2 Universal -import {prebootComplete} from 'angular2-universal'; - -// enable prod for faster renders -enableProdMode(); - -import {ngApp} from './main.browser'; - -// on document ready bootstrap Angular 2 -document.addEventListener('DOMContentLoaded', () => { - - ngApp() - .then(prebootComplete); - -}); diff --git a/sample-components/sampleComponent-rc4/src/index.html b/sample-components/sampleComponent-rc4/src/index.html deleted file mode 100644 index 8bd68c09..00000000 --- a/sample-components/sampleComponent-rc4/src/index.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - OpenAIRE - - - - - - - - - - - - - - - - - Loading Universal ... - - - - - diff --git a/sample-components/sampleComponent-rc4/src/logo.png b/sample-components/sampleComponent-rc4/src/logo.png deleted file mode 100644 index afea237f..00000000 Binary files a/sample-components/sampleComponent-rc4/src/logo.png and /dev/null differ diff --git a/sample-components/sampleComponent-rc4/src/main.browser.ts b/sample-components/sampleComponent-rc4/src/main.browser.ts deleted file mode 100644 index 71e2e701..00000000 --- a/sample-components/sampleComponent-rc4/src/main.browser.ts +++ /dev/null @@ -1,21 +0,0 @@ -// Angular 2 Universal -import { bootstrap } from '@angular/platform-browser-dynamic'; -import { provideRouter } from '@angular/router'; -import { HTTP_PROVIDERS } from '@angular/http'; -import { disableDeprecatedForms, provideForms} from '@angular/forms'; -// Application -import {App, routes} from './app/app.component'; -// import {routes} from './app/app.routes'; - -// you must return bootstrap for client.ts -export function ngApp() { - return bootstrap(App, [ - ...HTTP_PROVIDERS, - // FORM_DIRECTIVES, - // FORM_PROVIDERS, - disableDeprecatedForms(), - - provideForms(), - provideRouter(routes) - ]); -} diff --git a/sample-components/sampleComponent-rc4/src/main.node.ts b/sample-components/sampleComponent-rc4/src/main.node.ts deleted file mode 100644 index cab5c3cd..00000000 --- a/sample-components/sampleComponent-rc4/src/main.node.ts +++ /dev/null @@ -1,46 +0,0 @@ -// the polyfills must be the first thing imported in node.js -// import 'angular2-universal/polyfills'; // polyfills are moved to server.ts - - -// Angular 2 Universal -import { - REQUEST_URL, - ORIGIN_URL, - NODE_LOCATION_PROVIDERS, - NODE_HTTP_PROVIDERS, - ExpressEngineConfig -} from 'angular2-universal'; - -import { provideRouter } from '@angular/router'; -import { APP_BASE_HREF } from '@angular/common'; - -// Application -import {App,routes} from './app/app.component'; -import { disableDeprecatedForms, provideForms} from '@angular/forms'; - -export function ngApp(req, res) { - let baseUrl = '/'; - let url = req.originalUrl || '/'; - - let config: ExpressEngineConfig = { - directives: [ - App - ], - platformProviders: [ - {provide: ORIGIN_URL, useValue: 'http://localhost:3000'}, - {provide: APP_BASE_HREF, useValue: baseUrl}, - ], - providers: [ - {provide: REQUEST_URL, useValue: url}, - NODE_HTTP_PROVIDERS, - provideRouter(routes), - disableDeprecatedForms(), - provideForms(), - NODE_LOCATION_PROVIDERS - ], - async: true, - preboot: false // { appRoot: 'app' } // your top level app component selector - }; - - res.render('index', config); -} diff --git a/sample-components/sampleComponent-rc4/src/server.ts b/sample-components/sampleComponent-rc4/src/server.ts deleted file mode 100644 index 26101e13..00000000 --- a/sample-components/sampleComponent-rc4/src/server.ts +++ /dev/null @@ -1,79 +0,0 @@ -// the polyfills must be the first thing imported in node.js -import 'angular2-universal/polyfills'; - -import * as path from 'path'; -import * as express from 'express'; -import * as bodyParser from 'body-parser'; -import * as cookieParser from 'cookie-parser'; - -// Angular 2 -import { enableProdMode } from '@angular/core'; -// Angular 2 Universal -import { expressEngine } from 'angular2-universal'; - -// enable prod for faster renders -enableProdMode(); - -const app = express(); -const ROOT = path.join(path.resolve(__dirname, '..')); - -// Express View -app.engine('.html', expressEngine); -app.set('views', __dirname); -app.set('view engine', 'html'); - -app.use(cookieParser('Angular 2 Universal')); -app.use(bodyParser.json()); - -// Serve static files -app.use('/assets', express.static(path.join(__dirname, 'assets'), {maxAge: 30})); -app.use(express.static(path.join(ROOT, 'dist/client'), {index: false})); -/* **AK** Add this path so that index.html can see files from node_modules folder (e.g. bootstrap files)*/ -app.use(express.static(path.join(ROOT, 'node_modules'), {index: false})); - - - -// import { serverApi } from './backend/api'; -// // Our API for demos only -// app.get('/data.json', serverApi); - -import { ngApp } from './main.node'; -// Routes with html5pushstate -// ensure routes match client-side-app -app.get('/', ngApp); -app.get('/claims', ngApp); -app.get('/claim', ngApp); -app.get('/home', ngApp); -app.get('/search', ngApp); -app.get('/search-publications', ngApp); -app.get('/advanced-search-publications', ngApp); -app.get('/my-claims', ngApp); -app.get('/linking', ngApp); -app.get('/demo-up', ngApp); -app.get('/up', ngApp); -app.get('/bulk-linking', ngApp); -app.get('/publication', ngApp); -app.get('/project', ngApp); -app.get('/person', ngApp); -app.get('/dataset', ngApp); -app.get('/organization', ngApp); -app.get('/deposit', ngApp); - -// use indexFile over ngApp only when there is too much load on the server -function indexFile(req, res) { - // when there is too much load on the server just send - // the index.html without prerendering for client-only - res.sendFile('/index.html', {root: __dirname}); -} - -app.get('*', function(req, res) { - res.setHeader('Content-Type', 'application/json'); - var pojo = { status: 404, message: 'No Content' }; - var json = JSON.stringify(pojo, null, 2); - res.status(404).send(json); -}); - -// Server -app.listen(3000, () => { - console.log('Listening on: http://localhost:3000'); -}); diff --git a/sample-components/sampleComponent-rc4/src/typings.d.ts b/sample-components/sampleComponent-rc4/src/typings.d.ts deleted file mode 100644 index bf633427..00000000 --- a/sample-components/sampleComponent-rc4/src/typings.d.ts +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Custom Type Definitions - * When including 3rd party modules you also need to include the type definition for the module - * if they don't provide one within the module. You can try to install it with typings -typings install node --save - * If you can't find the type definition in the registry we can make an ambient definition in - * this file for now. For example -declare module "my-module" { - export function doesSomething(value: string): string; -} - * - * If you're prototying and you will fix the types later you can also declare it as type any - * -declare var assert: any; - * - * If you're importing a module that uses Node.js modules which are CommonJS you need to import as - * -import * as _ from 'lodash' - * You can include your type definitions in this file until you create one for the typings registry - * see https://github.com/typings/registry - * - */ - - -// Extra variables that live on Global that will be replaced by webpack DefinePlugin -declare var ENV: string; -declare var HMR: boolean; -interface GlobalEnvironment { - ENV; - HMR; -} - -interface WebpackModule { - hot: { - data?: any, - idle: any, - accept(dependencies?: string | string[], callback?: (updatedDependencies?: any) => void): void; - decline(dependencies?: string | string[]): void; - dispose(callback?: (data?: any) => void): void; - addDisposeHandler(callback?: (data?: any) => void): void; - removeDisposeHandler(callback?: (data?: any) => void): void; - check(autoApply?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void; - apply(options?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void; - status(callback?: (status?: string) => void): void | string; - removeStatusHandler(callback?: (status?: string) => void): void; - }; -} - -interface WebpackRequire { - context(file: string, flag?: boolean, exp?: RegExp): any; -} - - -interface ErrorStackTraceLimit { - stackTraceLimit: number; -} - - -// Extend typings -interface NodeRequire extends WebpackRequire {} -interface ErrorConstructor extends ErrorStackTraceLimit {} -interface NodeModule extends WebpackModule {} -interface Global extends GlobalEnvironment {} - - -interface Thenable { - then( - onFulfilled?: (value: T) => U | Thenable, - onRejected?: (error: any) => U | Thenable): Thenable; - then( - onFulfilled?: (value: T) => U | Thenable, - onRejected?: (error: any) => void): Thenable; - catch(onRejected?: (error: any) => U | Thenable): Thenable; -} diff --git a/sample-components/sampleComponent-rc4/tsconfig.json b/sample-components/sampleComponent-rc4/tsconfig.json deleted file mode 100644 index a6757c02..00000000 --- a/sample-components/sampleComponent-rc4/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "compilerOptions": { - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "target": "es5", - "module": "commonjs", - "removeComments": true, - "sourceMap": true - }, - "exclude": [ - "typings/main.d.ts", - "typings/main", - "node_modules" - ], - "compileOnSave": false, - "buildOnSave": false, - "atom": { "rewriteTsconfig": false } -} diff --git a/sample-components/sampleComponent-rc4/typings.json b/sample-components/sampleComponent-rc4/typings.json deleted file mode 100644 index 67b4d1a4..00000000 --- a/sample-components/sampleComponent-rc4/typings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "globalDependencies": { - "body-parser": "registry:dt/body-parser#0.0.0+20160317120654", - "compression": "registry:dt/compression#0.0.0+20160501162003", - "cookie-parser": "registry:dt/cookie-parser#1.3.4+20160316155526", - "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654", - "express": "registry:dt/express#4.0.0+20160317120654", - "express-serve-static-core": "registry:dt/express-serve-static-core#0.0.0+20160322035842", - "mime": "registry:dt/mime#0.0.0+20160316155526", - "node": "registry:dt/node#4.0.0+20160412142033", - "serve-static": "registry:dt/serve-static#0.0.0+20160317120654" - } -} diff --git a/sample-components/sampleComponent-rc4/webpack.config.js b/sample-components/sampleComponent-rc4/webpack.config.js deleted file mode 100644 index 4ad523b0..00000000 --- a/sample-components/sampleComponent-rc4/webpack.config.js +++ /dev/null @@ -1,97 +0,0 @@ -var webpack = require('webpack'); -var path = require('path'); - -var commonConfig = { - resolve: { - extensions: ['', '.ts', '.js', '.json'] - }, - module: { - loaders: [ - // TypeScript - { test: /\.ts$/, loaders: ['ts-loader', 'angular2-template-loader'] }, - { test: /\.html$/, loader: 'raw-loader' }, - { test: /\.css$/, loader: 'raw-loader' }, - { test: /\.json$/, loader: 'raw-loader' } - ], - preLoaders: [ - // needed to lower the filesize of angular due to inline source-maps - { test: /\.js$/, loader: 'source-map-loader' } - ], - }, - plugins: [ - new webpack.optimize.OccurenceOrderPlugin(true) - ] - -}; - - -var clientConfig = { - target: 'web', - entry: './src/client', - output: { - path: root('dist/client') - }, - node: { - global: true, - __dirname: true, - __filename: true, - process: true, - Buffer: false - } -}; - - -var serverConfig = { - target: 'node', - entry: './src/server', // use the entry file of the node server if everything is ts rather than es5 - output: { - path: root('dist/server'), - libraryTarget: 'commonjs2' - }, - externals: checkNodeImport, - node: { - global: true, - __dirname: true, - __filename: true, - process: true, - Buffer: true - } -}; - - - -// Default config -var defaultConfig = { - context: __dirname, - resolve: { - root: root('/src') - }, - output: { - publicPath: path.resolve(__dirname), - filename: 'index.js' - } -} - - - -var webpackMerge = require('webpack-merge'); -module.exports = [ - // Client - webpackMerge({}, defaultConfig, commonConfig, clientConfig), - - // Server - webpackMerge({}, defaultConfig, commonConfig, serverConfig) -] - -// Helpers -function checkNodeImport(context, request, cb) { - if (!path.isAbsolute(request) && request.charAt(0) !== '.') { - cb(null, 'commonjs ' + request); return; - } - cb(); -} - -function root(args) { - args = Array.prototype.slice.call(arguments, 0); - return path.join.apply(path, [__dirname].concat(args)); -} diff --git a/sample-components/sampleComponent-rc6/.editorconfig b/sample-components/sampleComponent-rc6/.editorconfig deleted file mode 100644 index f1cc3ad3..00000000 --- a/sample-components/sampleComponent-rc6/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# http://editorconfig.org - -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true - -[*.md] -insert_final_newline = false -trim_trailing_whitespace = false diff --git a/sample-components/sampleComponent-rc6/.gitignore b/sample-components/sampleComponent-rc6/.gitignore deleted file mode 100644 index 9e17510b..00000000 --- a/sample-components/sampleComponent-rc6/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -/__build__ -/__server_build__ -/node_modules -/typings -/tsd_typings/ -npm-debug.log - -/dist/ - -.idea - -.DS_Store diff --git a/sample-components/sampleComponent-rc6/.vscode/launch.json b/sample-components/sampleComponent-rc6/.vscode/launch.json deleted file mode 100644 index f2449acd..00000000 --- a/sample-components/sampleComponent-rc6/.vscode/launch.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "Launch", - "type": "node", - "request": "launch", - "program": "${workspaceRoot}/dist/server/index.js", - "stopOnEntry": false, - "args": [], - "cwd": "${workspaceRoot}", - "preLaunchTask": null, - "runtimeExecutable": null, - "runtimeArgs": [ - "--nolazy" - ], - "env": { - "NODE_ENV": "development" - }, - "externalConsole": false, - "sourceMaps": false, - "outDir": null - }, - { - "name": "Attach", - "type": "node", - "request": "attach", - "port": 5858, - "address": "localhost", - "restart": false, - "sourceMaps": false, - "outDir": null, - "localRoot": "${workspaceRoot}", - "remoteRoot": null - }, - { - "name": "Attach to Process", - "type": "node", - "request": "attach", - "processId": "${command.PickProcess}", - "port": 5858, - "sourceMaps": false, - "outDir": null - } - ] -} \ No newline at end of file diff --git a/sample-components/sampleComponent-rc6/README.md b/sample-components/sampleComponent-rc6/README.md deleted file mode 100644 index 8e3dbcc7..00000000 --- a/sample-components/sampleComponent-rc6/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# Angular 2 Universal Starter [![Universal Angular 2](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal) - -A minimal Angular 2 starter for Universal JavaScript using TypeScript and Webpack - -> If you're looking for the repo from the AngularConnect talk look in the [angular-connect branch](https://github.com/angular/universal-starter/tree/angular-connect) -If you're looking for a SystemJS version of the repo look in the [systemjs branch](https://github.com/angular/universal-starter/tree/systemjs) - -[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) - -## Installation - -* `npm install` - -## Serve - -* `npm start` to build your client app and start a web server -* `npm run build` to prepare a distributable bundle - -## Development -* run `npm start` and `npm run watch` in two separate terminals to build your client app, start a web server, and allow file changes to update in realtime - -## Watch files -* `npm run watch` to build your client app and start a web server diff --git a/sample-components/sampleComponent-rc6/app.json b/sample-components/sampleComponent-rc6/app.json deleted file mode 100644 index 1762bb6b..00000000 --- a/sample-components/sampleComponent-rc6/app.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "Angular 2 Universal Starter", - "description": "Angular 2 Universal starter kit by @AngularClass", - "repository": "https://github.com/angular/universal-starter", - "logo": "https://cloud.githubusercontent.com/assets/1016365/10639063/138338bc-7806-11e5-8057-d34c75f3cafc.png", - "env": { - "NPM_CONFIG_PRODUCTION": { - "description": "Install `webpack` and other development modules when deploying to allow full builds.", - "value": "false" - } - } -} diff --git a/sample-components/sampleComponent-rc6/nodemon.json b/sample-components/sampleComponent-rc6/nodemon.json deleted file mode 100644 index 97a836fb..00000000 --- a/sample-components/sampleComponent-rc6/nodemon.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "watch": [ - "dist", - "src/index.html" - ], - "ext" : "js ts json html" -} diff --git a/sample-components/sampleComponent-rc6/package.json b/sample-components/sampleComponent-rc6/package.json deleted file mode 100644 index d8a56916..00000000 --- a/sample-components/sampleComponent-rc6/package.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "name": "universal-starter", - "version": "2.0.0", - "description": "Angular 2 Universal starter kit by @AngularClass", - "repository": { - "type": "git", - "url": "https://github.com/angular/universal-starter.git" - }, - "scripts": { - "watch": "webpack --watch", - "prebuild": "rimraf dist", - "build": "webpack", - "build:prod": "webpack --progress -p", - "prestart": "npm run build", - "server": "nodemon dist/server/index.js", - "start": "npm run server", - "predebug": "npm run build", - "debug:build": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js", - "debug": "node --debug-brk dist/server/index.js" - }, - "license": "MIT", - "contributors": [ - "AngularClass ", - "PatrickJS ", - "Jeff Whelpley ", - "Jeff Cross ", - "Mark Pieszak " - ], - "dependencies": { - "@angular/common": "2.0.0-rc.6", - "@angular/compiler": "2.0.0-rc.6", - "@angular/core": "2.0.0-rc.6", - "@angular/forms": "2.0.0-rc.6", - "@angular/http": "2.0.0-rc.6", - "@angular/platform-browser": "2.0.0-rc.6", - "@angular/platform-browser-dynamic": "2.0.0-rc.6", - "@angular/platform-server": "2.0.0-rc.6", - "@angular/router": "3.0.0-rc.2", - "angular2-platform-node": "~1.0.4", - "angular2-universal": "~1.0.4", - "angular2-universal-polyfills": "~1.0.4", - "angular2-express-engine": "~1.0.4", - "body-parser": "^1.15.2", - "express": "^4.14.0", - "methods": "~1.1.2", - "rxjs": "5.0.0-beta.11", - "zone.js": "0.6.17" - }, - "devDependencies": { - "@types/body-parser": "0.0.29", - "@types/compression": "0.0.29", - "@types/cookie-parser": "^1.3.29", - "@types/express": "^4.0.29", - "@types/express-serve-static-core": "^4.0.29", - "@types/mime": "0.0.28", - "@types/node": "^4.0.30", - "@types/serve-static": "^1.7.27", - "angular2-template-loader": "^0.4.0", - "cookie-parser": "^1.4.3", - "nodemon": "^1.10.0", - "raw-loader": "^0.5.1", - "rimraf": "^2.5.4", - "ts-loader": "^0.8.2", - "typescript": "2.0.0", - "webpack": "^2.1.0-beta.22", - "webpack-dev-middleware": "^1.6.1", - "webpack-dev-server": "^2.1.0-beta.0", - "webpack-merge": "^0.13.0" - } -} diff --git a/sample-components/sampleComponent-rc6/src/app/app.routing.ts b/sample-components/sampleComponent-rc6/src/app/app.routing.ts deleted file mode 100644 index 9386b275..00000000 --- a/sample-components/sampleComponent-rc6/src/app/app.routing.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import {ClaimsAdminComponent} from './claimPages/claims/claimsAdmin.component'; -import {HomeComponent} from './home/home.component'; -const appRoutes: Routes = [ - { path: '', - pathMatch: 'full', - redirectTo: 'home' }, - { path: 'claims', component: ClaimsAdminComponent }, - { path: 'home', component: HomeComponent } - -]; - - -// , -// { -// path: 'heroes', -// component: HeroListComponent, -// data: { -// title: 'Heroes List' -// } -// }, -// { path: 'hero/:id', component: HeroDetailComponent }, -// { path: '**', component: PageNotFoundComponent } -// export const appRoutingProviders: any[] = [ -// -// ]; - -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); diff --git a/sample-components/sampleComponent-rc6/src/app/app.ts b/sample-components/sampleComponent-rc6/src/app/app.ts deleted file mode 100644 index 636737c7..00000000 --- a/sample-components/sampleComponent-rc6/src/app/app.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { Component } from '@angular/core'; - -import 'rxjs/Rx'; -@Component({ - selector: 'app', - template: ` -
- - -
- -
- -
` -}) -export class App { - -} diff --git a/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claims.component.html b/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claims.component.html deleted file mode 100644 index 4518b03f..00000000 --- a/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claims.component.html +++ /dev/null @@ -1,107 +0,0 @@ -
-
-
-
- -
Claims related to
- -
-

- -

-

- -

-

- -

-

- -

-

- -

-
-
-
- - -
- - - diff --git a/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claims.component.ts b/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claims.component.ts deleted file mode 100644 index b8151b44..00000000 --- a/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claims.component.ts +++ /dev/null @@ -1,490 +0,0 @@ -import {Component, ViewChild, Input} from '@angular/core'; -import {Location} from '@angular/common'; -import {Observable} from 'rxjs/Observable'; -import {ActivatedRoute, Router} from '@angular/router'; -import {ClaimsService} from '../../services/claims.service'; -import {Loading} from '../../common/modal/loading.component'; -import {Alert} from '../../common/modal/alert'; - - -@Component({ - selector: 'claims', - templateUrl: 'claims.component.html', - providers:[ ClaimsService] - -}) -export class ClaimsComponent { - constructor (private _claimService: ClaimsService, private route: ActivatedRoute, private _router:Router, private location: Location) { - } - - ngOnInit() { - // this.sub = this.route.queryParams.subscribe(params => { - - var params = []; - if( this.myClaims == 'true' ){ - this.fetchBy = "User"; - }else{ - - this.fetchBy = params['fetchBy']; - this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All'; - this.fetchId = params['fetchId']; - this.fetchId=this.fetchId?this.fetchId:''; - - } - - let page = (params['page']=== undefined)?1:+params['page']; - let size = (params['size']=== undefined)?10:+params['size']; - - this.keyword = (params['keyword']?params['keyword']:""); - this.inputkeyword = this.keyword; - this.page = ( page <= 0 ) ? 1 : page; - this.size = ( size <= 0 ) ? 10 : size; - this.entityTypes = []//(params['types']?params['types']:[]); - this.setTypes(params['types']); // check the appropriate checkboxes - // this.setSortby(params['sort']); - this.getClaims(); - - // }); - // this.sub = this.route.params.subscribe(params => { - // console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId); - // if( this.myClaims == 'true' ){ - // console.info("Is myclaims"); - // this.fetchBy = "User"; - // }else{ - // console.info("Is admin"); - // - // console.info(this.isAdmin); - // - // this.fetchBy = params['fetchBy']; - // this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All'; - // this.fetchId = params['fetchId']; - // console.info("Fetch by:"+this.fetchBy+"Fetch id:"+this.fetchId); - // this.fetchId=this.fetchId?this.fetchId:''; - // - // } - // - // console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId); - // let page = (params['page']=== undefined)?1:+params['page']; - // let size = (params['size']=== undefined)?10:+params['size']; - // - // this.keyword = (params['keyword']?params['keyword']:""); - // this.inputkeyword = this.keyword; - // this.page = ( page <= 0 ) ? 1 : page; - // this.size = ( size <= 0 ) ? 10 : size; - // this.entityTypes = []//(params['types']?params['types']:[]); - // this.setTypes(params['types']); // check the appropriate checkboxes - // this.setSortby(params['sort']); - // this.getClaims(); - // console.info("params: "+params['page']+" page "+page +" this.page: "+this.page ); - // }); - } - ngOnDestroy() { - this.sub.unsubscribe(); - } - sub: any; - //string because comes as input from component directive - @Input() enableDelete: string = 'false'; - @Input() myClaims: string= 'false' ; - @Input() isAdmin:string = 'false'; - page : number; - size:number; - keyword:string; // the keyword string to give to the request as parameter - inputkeyword:string; // the string written in the input field (keyword=inputkeyword when its length is bigger than 3 and the user stops typing) - lengths = [10,20,30,50]; - types = ["All","Project","Context","Result","User"]; - @Input() fetchBy:string; - @Input() fetchId:string; - - navigateTo: string = "Claims"; - resultsNum: number ; - claims: string[]; - - @ViewChild (Loading) loading : Loading ; - - //checkboxes: - publicationCB = false; - datasetCB = false; - contextCB = false; - projectCB = false; - entityTypes : string[] =[] ; - - descending = true; - sortby = "date"; - - selected=[]; - deleteMessage:string = ""; - showErrorMessage:boolean = false; - - //params for pagingFormatter to use when navigate to page - params; - @ViewChild(Alert) alert; - - claimsDeleted:number = 0; - - getClaims () { - this.selected=[]; - var types = ''; - this.showErrorMessage = false; - for (var type of this.entityTypes){ - types+=(types.length>0?'&':'')+"types="+type; - } - if(this.fetchBy =="Project" ){ - this._claimService.getClaimsByProject(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="User"){ - this._claimService.getClaimsByUser(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="Result"){ - this._claimService.getClaimsByResult(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="Context"){ - this._claimService.getClaimsBycontext(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= null; - this.resultsNum= data.total;//data.length; //TODO get the total results num - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else{ - this._claimService.getClaims(this.size,this.page,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum = null; - this.resultsNum= data.total;//data.length; //TODO get the total results num - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - } - } - - goToClaim(claimId: number){ - this._router.navigate( ['Claim', { id: claimId}] ); - } - goTo(page:number = 1){ - - this.page = page; - - this.location.go(location.pathname,this.getParametersString()); - this.getClaims(); - } - getParameters(){ - let params={ page: this.page, size: this.size, types: this.entityTypes, fetchBy: this.fetchBy, fetchId:this.fetchId, keyword : this.keyword, sort: this.getSortby() }; - return params; - } - getParametersString(){ - var params=''; - params+=(this.page==1?"":(params.length>0?'&':'')+"page="+this.page); - params+=(this.size==10?"":(params.length>0?'&':'')+"size="+this.size); - // params+=(this.entityTypes==''?"":(params.length>0?'&':'')+"types="+this.entityTypes); - var types=""; - for (var type of this.entityTypes){ - types+=(types.length>0?',':'')+type; - } - params+=(types.length>0)?"types="+types:""; - - if(this.isAdmin === 'true'){ - params+=(this.fetchBy=='All'?"":(params.length>0?'&':'')+"fetchBy="+this.fetchBy); - params+=(this.fetchId==''?"":(params.length>0?'&':'')+"fetchId="+this.fetchId); - } - params+=(this. getSortby()=='datedesc'?"":(params.length>0?'&':'')+"sort="+this. getSortby()); - params+=(this.keyword==''?"":(params.length>0?'&':'')+"keyword="+this.keyword); - return params; - } - changeLength(){ - this.goTo(); - } - clearFilters(){ - this.keyword = ''; - this.inputkeyword = ''; - this.publicationCB = false; - this.projectCB = false; - this.datasetCB = false; - this.contextCB = false; - this.entityTypes = []; - this.goTo(); - } - changeOrderby(sortby:string){ - if(sortby==this.sortby){ - this.descending = !this.descending; - }else{ - this.sortby = sortby; - this.descending = false; - } - this.goTo(); - } - setSortby(sortby:string){ - if(!sortby|| sortby == "datedesc"){ - this.descending = true; - this.sortby = "date"; - }else if(sortby == "dateasc"){ - this.descending = false; - this.sortby = "date"; - }else if(sortby == "userasc"){ - this.descending = false; - this.sortby = "user"; - }else if(sortby == "userdesc"){ - this.descending = true; - this.sortby = "user"; - }if(sortby =="sourceasc"){ - this.descending = false; - this.sortby = "source"; - }else if(sortby == "sourcedesc"){ - this.descending = true; - this.sortby = "source"; - }else if(sortby == "targetasc"){ - this.descending = false; - this.sortby = "target"; - }else if(sortby == "targetdesc"){ - this.descending = true; - this.sortby = "target"; - } - } - getSortby():string{ - if(this.descending){ - return this.sortby+"desc"; - }else{ - return this.sortby+"asc"; - } - - } - changeType(){ - this.entityTypes = []; - if(this.publicationCB){ - this.entityTypes.push('publication'); - } - if(this.datasetCB){ - this.entityTypes.push('dataset'); - } - if(this.projectCB){ - this.entityTypes.push('project'); - } - if(this.contextCB){ - this.entityTypes.push('context'); - } - - // if(this.publicationCB == true && this.datasetCB == true && this.contextCB == true && this.projectCB == true ){ - // this.entityTypes=""; - // }else{ - // this.entityTypes = ""; - // if(this.publicationCB == true){ - // this.entityTypes = "publication"; - // } - // if(this.datasetCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"dataset"; - // } - // if(this.contextCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"context"; - // } - // if(this.projectCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"project"; - // } - // } - // console.debug("Type changed: "+this.entityTypes+" "+this.publicationCB+ this.datasetCB + this.contextCB + this.projectCB); - this.goTo(); - } - setTypes(types:string){ - if(!types){ - return; - } - if(types.length > 0){ - this.entityTypes = []; - if(types.indexOf("publication")!=-1){ - this.publicationCB = true; - this.entityTypes.push("publication"); - } - if(types.indexOf("dataset")!=-1){ - this.datasetCB = true; - this.entityTypes.push("dataset"); - } - if(types.indexOf("project")!=-1){ - this.projectCB = true; - this.entityTypes.push("project"); - } - if(types.indexOf("context")!=-1){ - this.contextCB = true; - this.entityTypes.push("context"); - } - } - if(this.publicationCB && this.datasetCB && this.contextCB && this.projectCB){ - this.entityTypes=[]; - } - } - changekeyword(){ - - if(this.inputkeyword.length >= 3 || this.inputkeyword.length == 0 ){ - this.keyword = this.inputkeyword; - this.page = 1; - this.goTo(); - } - - } - select(item:any,event){ - this.deleteMessage=""; - var value = event.currentTarget.checked; - if(value){ - this.selected.push(item); - }else{ - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == item.id){ - this.selected.splice(_i, 1); - } - } - - - } - } - selectAll(){ - this.selected = []; - for (var _i = 0; _i < this.claims.length; _i++) { - let claim = this.claims[_i]; - this.selected.push(claim); - } - this.deleteMessage = ""; - } - deselectAll(){ - this.selected = []; - this.deleteMessage=""; - } - isSelected(id:string){ - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == id){ - return true; - } - } - return false; - } - - - confirmOpen(){ - if(this.selected.length <= 0){ - - }else{ - this.alert.cancelButton = true; - this.alert.okButton = true; - this.alert.alertTitle = "Delete "+this.selected.length+" claim(s)"; - this.alert.message = this.selected.length+" claims will be deleted. Do you want to proceed? "; - this.alert.okButtonText = "Yes"; - this.alert.cancelButtonText = "No"; - this.alert.open(); - } - } - confirmClose(data){ - this.delete(); - } - delete(){ - this.deleteMessage=""; - this.loading.open(); - this.claimsDeleted = 0; - var ids = []; - for (var i = 0; i < this.selected.length; i++){ - var id =this.selected[i].id; - ids.push(id); - // var selected =this.selected[i].id; - // console.warn("Deleting claim with id:"+id); - // this.deleteById(id); - //TODO for multiple concurrent - } - this.batchDeleteById(ids); - } - - deleteById(id:string){ - - console.warn("Deleting claim with id:"+id); - // this._claimService.deleteClaimById(id); - this._claimService.deleteClaimById(id).subscribe( - res => { - console.info('Delete response'+res.code ); - console.warn("Deleted claim with id:"+ id); - //remove this claim from the - let newClaims=this.claims; - for (var _i = 0; _i < this.claims.length; _i++) { - let claim = this.claims[_i]; - if(claim['id'] == id){ - newClaims.splice(_i, 1); - } - } - //TODO should call getClaims??? - this.claimsDeleted++; - this.claims = newClaims; - if(this.claimsDeleted == this.selected.length){ - this.resultsNum = this.resultsNum - this.selected.length; - this.loading.close(); - this.selected = []; - } - - - }); - } - batchDeleteById(ids:string[]){ - - console.warn("Deleting claim with ids:"+ids); - this._claimService.deleteBulk(ids).subscribe( - res => { - console.info('Delete response'+res.code ); - console.warn("Deleted ids:"+ res.deletedIds); - console.warn("Not found ids:"+ res.notFoundIds); - //remove this claim from the - let newClaims=this.claims; - for(var id of res.deletedIds){ - for (var _i = 0; _i < this.claims.length; _i++) { - let claim = this.claims[_i]; - if(claim['id'] == id){ - newClaims.splice(_i, 1); - } - } - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == id){ - this.selected.splice(_i, 1); - } - } - } - this.claims = newClaims; - this.resultsNum = this.resultsNum - res.deletedIds.length; - this.loading.close(); - if(res.deletedIds.length>0){ - this.deleteMessage=this.deleteMessage+'
'+res.deletedIds.length+' claim(s) successfully deleted.
'; - } - if(res.notFoundIds.length>0){ - this.deleteMessage=this.deleteMessage+'
'+res.notFoundIds.length+' claim(s) couldn\'t be deleted.
'; - } - }); - } - pageChange($event) { - var page:number = +$event.value - this.goTo(page); - } -} diff --git a/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claims.module.ts b/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claims.module.ts deleted file mode 100644 index 11d9002b..00000000 --- a/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claims.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import {ClaimsComponent} from './claims.component'; -import {ClaimsService} from '../../services/claims.service'; -import {Claim} from '../../entities/claim'; -import {pagingFormatterNoLoad} from '../../common/pagingFormatterNoLoad.component'; - -// import {ClaimEntityFormatterModule} from '../../common/claimEntityFormatter.module'; -import {ClaimEntityFormatter} from '../../common/claimEntityFormatter.component'; -import {PublicationTitleFormatter} from '../../common/publicationTitleFormatter.component'; -import {ProjectTitleFormatter} from '../../common/projectTitleFormatter.component'; - -import {LoadingModule} from '../../common/modal/loading.module'; -// import {Loading} from '../../common/modal/loading.component'; - -@NgModule({ - imports: [ CommonModule, FormsModule, LoadingModule ], - declarations: [ ClaimsComponent, pagingFormatterNoLoad, ClaimEntityFormatter,PublicationTitleFormatter,ProjectTitleFormatter], - providers: [ ClaimsService ] -}) - -// exports: [ ContactComponent ], -// providers: [ ContactService ] -export class ClaimsModule { } diff --git a/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claimsAdmin.component.ts b/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claimsAdmin.component.ts deleted file mode 100644 index a602bdc9..00000000 --- a/sample-components/sampleComponent-rc6/src/app/claimPages/claims/claimsAdmin.component.ts +++ /dev/null @@ -1,36 +0,0 @@ -import {Component, ViewChild, Input} from '@angular/core'; -import {Location} from '@angular/common'; -import {Observable} from 'rxjs/Observable'; - -@Component({ - selector: 'claims-admin', - template: ` -
-
-

Claims Administrator

-
- -
- - -
- TODO login -
- `, - -}) -export class ClaimsAdminComponent { - constructor ( ) { - - } -user:string="argirok@di.uoa.gr"; - ngOnInit() { - - - } - - -} diff --git a/sample-components/sampleComponent-rc6/src/app/common/claimEntityFormatter.component.ts b/sample-components/sampleComponent-rc6/src/app/common/claimEntityFormatter.component.ts deleted file mode 100644 index f2611255..00000000 --- a/sample-components/sampleComponent-rc6/src/app/common/claimEntityFormatter.component.ts +++ /dev/null @@ -1,36 +0,0 @@ -import {Component, Input} from '@angular/core'; - -//Usage Example " " - -//externalUrl -@Component({ - selector: 'claim-entity', - template: ` - -
- ({{type}}) - -
-
- (Project) - -
-
- (Context) -
{{entity.title}}
-
- ` -}) - -export class ClaimEntityFormatter { - @Input() entity: string[]; - @Input() type: string; - - constructor () {} - - ngOnInit() { - - } - - -} diff --git a/sample-components/sampleComponent-rc6/src/app/common/claimEntityFormatter.module.ts b/sample-components/sampleComponent-rc6/src/app/common/claimEntityFormatter.module.ts deleted file mode 100644 index d75245c5..00000000 --- a/sample-components/sampleComponent-rc6/src/app/common/claimEntityFormatter.module.ts +++ /dev/null @@ -1,12 +0,0 @@ - -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import {PublicationTitleFormatter} from './publicationTitleFormatter.component'; -import {ProjectTitleFormatter} from './projectTitleFormatter.component'; -@NgModule({ - imports: [ CommonModule, FormsModule ], - declarations: [ PublicationTitleFormatter,ProjectTitleFormatter ] -}) - -export class ClaimEntityFormatterModule { } diff --git a/sample-components/sampleComponent-rc6/src/app/common/modal/alert.module.ts b/sample-components/sampleComponent-rc6/src/app/common/modal/alert.module.ts deleted file mode 100644 index ef4e2b52..00000000 --- a/sample-components/sampleComponent-rc6/src/app/common/modal/alert.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import {Open} from './open.component'; - -@NgModule({ - imports: [ CommonModule, FormsModule ], - declarations: [ Open] -}) - -// exports: [ ContactComponent ], -// providers: [ ContactService ] -export class AlertModule { } diff --git a/sample-components/sampleComponent-rc6/src/app/common/modal/alert.ts b/sample-components/sampleComponent-rc6/src/app/common/modal/alert.ts deleted file mode 100644 index bf5d1f60..00000000 --- a/sample-components/sampleComponent-rc6/src/app/common/modal/alert.ts +++ /dev/null @@ -1,110 +0,0 @@ -import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmitter, Output} from '@angular/core'; -// import { DynamicComponentLoader} from '@angular/core'; - -import {Open} from './open.component'; - -@Component({ - selector: 'alert', - template: ` - - `, - encapsulation: ViewEncapsulation.None, -}) -/** - * API to an open alert window. - */ -export class Alert{ - /** - * Caption for the title. - */ - public alertTitle:string; - /** - * Describes if the alert contains Ok Button. - * The default Ok button will close the alert and emit the callback. - * Defaults to true. - */ - public okButton:boolean = true; - /** - * Caption for the OK button. - * Default: Ok - */ - public okButtonText:string= 'Ok'; - /** - * Describes if the alert contains cancel Button. - * The default Cancelbutton will close the alert. - * Defaults to true. - */ - public cancelButton:boolean = true; - /** - * Caption for the Cancel button. - * Default: Cancel - */ - public cancelButtonText:string = 'Cancel'; - /** - * if the alertMessage is true it will show the contentString inside alert body. - */ - public alertMessage:boolean = true; - /** - * Some message/content can be set in message which will be shown in alert body. - */ - public message:string; - /** - * if the value is true alert footer will be visible or else it will be hidden. - */ - public alertFooter:boolean= true; - /** - * shows alert header if the value is true. - */ - public alertHeader:boolean = true; - /** - * if the value is true alert will be visible or else it will be hidden. - */ - public isOpen:boolean=false; - /** - * Emitted when a ok button was clicked - * or when Ok method is called. - */ - @Output() public alertOutput:EventEmitter = new EventEmitter(); - constructor( public _elementRef: ElementRef){} - /** - * Opens a alert window creating backdrop. - */ - open(){ - this.isOpen= true; - } - /** - * ok method closes the modal and emits modalOutput. - */ - ok(){ - this.isOpen = false; - this.alertOutput.emit(true); - } - /** - * cancel method closes the moda. - */ - cancel(){ - this.isOpen = false; - } -} diff --git a/sample-components/sampleComponent-rc6/src/app/common/modal/loading.component.ts b/sample-components/sampleComponent-rc6/src/app/common/modal/loading.component.ts deleted file mode 100644 index c046feae..00000000 --- a/sample-components/sampleComponent-rc6/src/app/common/modal/loading.component.ts +++ /dev/null @@ -1,49 +0,0 @@ -import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmitter, Output} from '@angular/core'; - -@Component({ - selector: 'loading', - template: ` - - `, - encapsulation: ViewEncapsulation.None, -}) -/** - * API to an open alert window. - */ -export class Loading{ - -@Input() public message:string ="Loading"; - - /** - * if the value is true alert will be visible or else it will be hidden. - */ - public isOpen:boolean=false; - /** - * Emitted when a ok button was clicked - * or when Ok method is called. - */ - @Output() public alertOutput:EventEmitter = new EventEmitter(); - constructor( public _elementRef: ElementRef){} - /** - * Opens a alert window creating backdrop. - */ - open(){ - this.isOpen= true; - } - - close(){ - this.isOpen = false; - } -} diff --git a/sample-components/sampleComponent-rc6/src/app/common/modal/loading.module.ts b/sample-components/sampleComponent-rc6/src/app/common/modal/loading.module.ts deleted file mode 100644 index a1ad036a..00000000 --- a/sample-components/sampleComponent-rc6/src/app/common/modal/loading.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import {Open} from './open.component'; - -@NgModule({ - imports: [ CommonModule, FormsModule ], - declarations: [ Open] -}) - -// exports: [ ContactComponent ], -// providers: [ ContactService ] -export class LoadingModule { } diff --git a/sample-components/sampleComponent-rc6/src/app/common/modal/open.component.ts b/sample-components/sampleComponent-rc6/src/app/common/modal/open.component.ts deleted file mode 100644 index 95add08d..00000000 --- a/sample-components/sampleComponent-rc6/src/app/common/modal/open.component.ts +++ /dev/null @@ -1,55 +0,0 @@ -import {Directive, Input, HostBinding} from '@angular/core'; - -// todo: add animate -// todo: add init and on change -@Directive({selector: '[open]'}) -export class Open { - @HostBinding('style.display') - private display:string; - @HostBinding('class.in') - @HostBinding('attr.aria-expanded') - private isExpanded:boolean = true; - - @Input() - private set open(value:boolean) { - this.isExpanded = value; - this.toggle(); - } - - private get open():boolean { - return this.isExpanded; - } - - constructor() { - } - init() { - this.isExpanded = false; - this.display = 'none'; - } - toggle() { - if (this.isExpanded) { - this.hide(); - } else { - this.show(); - } - } - - hide() { - this.isExpanded = false; - this.display = 'none'; - if (typeof document !== 'undefined') { - let backDrop = document.getElementsByClassName("modal-backdrop"); - if(backDrop.length>0){ - document.body.removeChild(backDrop[0]); - } - } - } - - show() { - let backDrop = document.createElement('div'); - backDrop.className="modal-backdrop fade in"; - document.body.appendChild(backDrop); - this.isExpanded = true; - this.display = 'block'; - } -} diff --git a/sample-components/sampleComponent-rc6/src/app/common/pagingFormatterNoLoad.component.ts b/sample-components/sampleComponent-rc6/src/app/common/pagingFormatterNoLoad.component.ts deleted file mode 100644 index 42534afd..00000000 --- a/sample-components/sampleComponent-rc6/src/app/common/pagingFormatterNoLoad.component.ts +++ /dev/null @@ -1,75 +0,0 @@ -import {Component, Input, Output, EventEmitter} from '@angular/core'; - - -//Usage Example - -@Component({ - selector: 'paging-no-load', - template: ` - - ` -}) - -export class pagingFormatterNoLoad { - @Input() currentPage: number = 1; - @Input() navigateTo: string; - @Input() term: string=''; - @Input() size: number=10; - @Input() totalResults: number = 10; - @Input() params; - - @Output() pageChange = new EventEmitter(); - - constructor () { - } - - ngOnInit() { - console.info("In paging -- CurrentPage:"+this.currentPage+" "+"total Pages = "+this.getTotalPages() +" Results num:"+this.totalResults); - } - getTotalPages(){ - var i= this.totalResults/this.size; - var integerI=parseInt(''+i); - return parseInt(''+((i==integerI)?i:i+1)); - } - onPrev(){ - this.currentPage=this.currentPage-1; - this.pageChange.emit({ - value: this.currentPage - }); - - } - - onNext(){ - - this.currentPage=this.currentPage+1; - this.pageChange.emit({ - value: this.currentPage - }); - } - onPage(pageNum: number){ - - this.currentPage=pageNum; - this.pageChange.emit({ - value: this.currentPage - }); - } -} diff --git a/sample-components/sampleComponent-rc6/src/app/common/projectTitleFormatter.component.ts b/sample-components/sampleComponent-rc6/src/app/common/projectTitleFormatter.component.ts deleted file mode 100644 index 5917768e..00000000 --- a/sample-components/sampleComponent-rc6/src/app/common/projectTitleFormatter.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {OpenaireProperties} from '../openaireProperties'; - -//Usage Example " " - -@Component({ - selector: 'project-title', - template: ` -
-
{{project.name}} ({{project.funderName}})
-
- ` -}) - -export class ProjectTitleFormatter { - @Input() project: string[]; - private url:string; - constructor () {} - - ngOnInit() { - this.url = OpenaireProperties.getsearchLinkToProject() + "?projectId=" + this.project["openaireId"]; - } -} diff --git a/sample-components/sampleComponent-rc6/src/app/common/publicationTitleFormatter.component.ts b/sample-components/sampleComponent-rc6/src/app/common/publicationTitleFormatter.component.ts deleted file mode 100644 index 2c87c50a..00000000 --- a/sample-components/sampleComponent-rc6/src/app/common/publicationTitleFormatter.component.ts +++ /dev/null @@ -1,26 +0,0 @@ -import {Component, Input} from '@angular/core'; - -//Usage Example " " - -@Component({ - selector: 'publication-title', - template: ` -
-
{{title}}
-
{{title}}
-
- ` -}) - -export class PublicationTitleFormatter { - @Input() title: string[]; - @Input() url: string[]; - - constructor () {} - - ngOnInit() { - - } - - -} diff --git a/sample-components/sampleComponent-rc6/src/app/entities/claim.ts b/sample-components/sampleComponent-rc6/src/app/entities/claim.ts deleted file mode 100644 index b5378c5f..00000000 --- a/sample-components/sampleComponent-rc6/src/app/entities/claim.ts +++ /dev/null @@ -1,15 +0,0 @@ -export class Claim { - id: string; - sourceType: string; - targetType: string; - sourceId: string; - targetId: string; - date: string; - DOI: string; - project: Project - userMail: string; - -} -export class Project{ - -} diff --git a/sample-components/sampleComponent-rc6/src/app/home/home.component.html b/sample-components/sampleComponent-rc6/src/app/home/home.component.html deleted file mode 100644 index fa7f4167..00000000 --- a/sample-components/sampleComponent-rc6/src/app/home/home.component.html +++ /dev/null @@ -1,15 +0,0 @@ - -
-
-
-
-
- - - - -
-
-
-
-
diff --git a/sample-components/sampleComponent-rc6/src/app/home/home.component.ts b/sample-components/sampleComponent-rc6/src/app/home/home.component.ts deleted file mode 100644 index 03253360..00000000 --- a/sample-components/sampleComponent-rc6/src/app/home/home.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component} from '@angular/core'; -import {Router} from '@angular/router'; -import {Observable} from 'rxjs/Observable'; -import {Location} from '@angular/common'; - -@Component({ - selector: 'home', - templateUrl: 'home.component.html', - }) - -export class HomeComponent { - constructor ( private _router: Router, private location: Location) {} - - -} diff --git a/sample-components/sampleComponent-rc6/src/app/openaireProperties.ts b/sample-components/sampleComponent-rc6/src/app/openaireProperties.ts deleted file mode 100644 index 796973ae..00000000 --- a/sample-components/sampleComponent-rc6/src/app/openaireProperties.ts +++ /dev/null @@ -1,89 +0,0 @@ -export class OpenaireProperties { - //landing Pages - private static baseSearchLink="/" - private static searchLinkToPublication = "publication?articleId="; - private static searchLinkToProject = "project?projectId="; - private static searchLinkToPerson = "person?personId="; - private static searchLinkToDataProvider = "https://beta.openaire.eu/search/dataprovider?datasourceId="; - private static searchLinkToDataset = "dataset?datasetId="; - private static searchLinkToOrganization = "organization?organizationId="; - - // Services - APIs - - // public claimsAPIURL = "http://rudie.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/" - private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8181/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/"; - - private static searchAPIURL = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - // private searchAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - // private searchAPIURL = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - - private static searchServiveURL = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/"; - // private static searchServiveURL = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/"; - // private static searchServiveURL = "http://services.openaire.eu:8380/search/"; - //private static searchServiveURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/"; - - private static searchCrossrefAPIURL = "http://api.crossref.org/works"; - private static searchDataciteAPIURL = "http://search.datacite.org/api"; - private static searchOrcidURL = "https://pub.orcid.org/"; - - // Identifiers - private static pmidURL = "http://www.ncbi.nlm.nih.gov/pubmed/"; - private static doiURL = "http://dx.doi.org/"; - private static cordisURL = "http://cordis.europa.eu/projects/"; - private static pmcURL = "http://europepmc.org/articles/"; - - - //landing Pages' getters - public static getsearchLinkToPublication():string{ - return this.baseSearchLink + this.searchLinkToPublication; - } - public static getsearchLinkToDataset():string{ - return this.baseSearchLink + this.searchLinkToDataset; - } - public static getsearchLinkToProject():string{ - return this.baseSearchLink + this.searchLinkToProject; - } - public static getsearchLinkToPerson():string{ - return this.baseSearchLink + this.searchLinkToPerson; - } - public static getsearchLinkToOrganization():string{ - return this.searchLinkToOrganization; - } - public static getsearchLinkToDataProvider():string{ - return this.searchLinkToDataProvider; - } - - // Services - APIs' getters - public static getSearchAPIURL():string{ - return this.searchAPIURL; - } - public static getSearchServiceURL():string{ - return this.searchServiveURL; - } - public static getClaimsAPIURL():string{ - return this.claimsAPIURL; - } - public static getSearchCrossrefAPIURL():string{ - return this.searchCrossrefAPIURL; - } - public static getSearchDataciteAPIURL():string{ - return this.searchDataciteAPIURL; - } - public static getSearchOrcidURL():string{ - return this.searchOrcidURL; - } - - // Identifiers' getters - public static getPmidURL():string{ - return this.pmidURL; - } - public static getDoiURL():string{ - return this.doiURL; - } - public static getCordisURL():string{ - return this.cordisURL; - } - public static getPmcURL():string{ - return this.pmcURL; - } -} diff --git a/sample-components/sampleComponent-rc6/src/app/services/claims.service.ts b/sample-components/sampleComponent-rc6/src/app/services/claims.service.ts deleted file mode 100644 index 43c6abce..00000000 --- a/sample-components/sampleComponent-rc6/src/app/services/claims.service.ts +++ /dev/null @@ -1,131 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Jsonp, URLSearchParams,ResponseOptions, RequestOptions, Headers} from '@angular/http'; -import {Http, Response} from '@angular/http'; -import {Observable} from 'rxjs/Observable'; -import {Claim} from '../entities/claim'; -import {OpenaireProperties} from '../openaireProperties'; - -@Injectable() -export class ClaimsService { - private baseUrl; - constructor(private jsonp: Jsonp, private http: Http) { - this.baseUrl = OpenaireProperties.getClaimsAPIURL(); - } - - private getClaimRequest(size : number, page : number, url :string):any { - console.info('ClaimsService: Claims request: '+url); - return this.http.get( url) - .map(request => request.json()) - .do(request => console.info("Get claims: offset = "+(size*(page-1)) + " limit ="+size )) - .catch(this.handleError); - } - getClaims( size : number, page : number, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims ' ); - console.info('ClaimsService: Types : '+types ); - let url = this.baseUrl +"claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByUser( size : number, page : number, user:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for user : '+user); - let url = this.baseUrl +"users/"+user+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsBycontext( size : number, page : number, contextId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for context : '+contextId); - let url = this.baseUrl +"contexts/"+contextId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByResult( size : number, page : number, resultId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for result : '+resultId); - let url = this.baseUrl +"results/"+resultId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByProject( size : number, page : number, projectId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for project : '+projectId); - let url = this.baseUrl +"projects/"+projectId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - } - - deleteClaimById(claimId:string):any{ - console.warn('Trying to delete claim with id : '+claimId); - let url = this.baseUrl +"claims/"+claimId; - console.warn('Delete url: '+url); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete( url, options).map(request => request.json()) - .do(request => console.info("After delete" )) - .catch(this.handleError); - - } - deleteBulk(claimIds:string[]):any{ - - console.warn('Trying to delete claims with ids : '+claimIds); - var url = ""; - - for(var claimId of claimIds){ - url=url+(url.length >0 ?"&":"")+"claimId="+claimId; - } - url= this.baseUrl +"claims/bulk?"+url; - console.warn('Delete url: '+url); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete( url, options).map(request => request.json()) - .do(request => console.info("After delete" )) - .catch(this.handleError); - - } - insertBulkClaims(claims):any{ - console.warn('Trying toinsert claims : '+claims); - let url = this.baseUrl +"claims/bulk"; - let body = JSON.stringify( claims ); - console.warn('Json body: : '+body); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, body, options) - .map(res => res.json()) - .do(request => console.info("Insert Response:"+request.status) ) - .catch(this.handleError); - - } - insertClaim(claim):any{ - console.warn('Trying toinsert claim : '+claim); - let url = this.baseUrl +"claims"; - let body = JSON.stringify( claim ); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, body, options) - .map(res => res.json()) - .do(request => console.info("Insert Response:"+request.status) ) - .catch(this.handleError); - - } - - private handleError (error: Response) { - // in a real world app, we may send the error to some remote logging infrastructure - // instead of just logging it to the console - console.error(error); - return Observable.throw(error || 'Server error'); - } - - getClaim(id:string):any { - let url = this.baseUrl+"claims/"+id; - return new Promise((resolve, reject) => { - this.http.get(url) - .map(res => res.json()) - .subscribe( - data => { - resolve(data.data); - }, - err => { - reject(err); - } - ) - ; - }); - } - -} diff --git a/sample-components/sampleComponent-rc6/src/assets/logo.png b/sample-components/sampleComponent-rc6/src/assets/logo.png deleted file mode 100644 index afea237f..00000000 Binary files a/sample-components/sampleComponent-rc6/src/assets/logo.png and /dev/null differ diff --git a/sample-components/sampleComponent-rc6/src/backend/api.ts b/sample-components/sampleComponent-rc6/src/backend/api.ts deleted file mode 100644 index d8f4f517..00000000 --- a/sample-components/sampleComponent-rc6/src/backend/api.ts +++ /dev/null @@ -1,24 +0,0 @@ -// Our API for demos only -import {fakeDataBase} from './db'; -import {fakeDemoRedisCache} from './cache'; - -// you would use cookies/token etc -var USER_ID = 'f9d98cf1-1b96-464e-8755-bcc2a5c09077'; // hardcoded as an example - -// Our API for demos only -export function serverApi(req, res) { - let key = USER_ID + '/data.json'; - let cache = fakeDemoRedisCache.get(key); - if (cache !== undefined) { - console.log('/data.json Cache Hit'); - return res.json(cache); - } - console.log('/data.json Cache Miss'); - - fakeDataBase.get() - .then(data => { - fakeDemoRedisCache.set(key, data); - return data; - }) - .then(data => res.json(data)); -} diff --git a/sample-components/sampleComponent-rc6/src/backend/cache.ts b/sample-components/sampleComponent-rc6/src/backend/cache.ts deleted file mode 100644 index 490a3561..00000000 --- a/sample-components/sampleComponent-rc6/src/backend/cache.ts +++ /dev/null @@ -1,17 +0,0 @@ - - -var _fakeLRUcount = 0; -export const fakeDemoRedisCache = { - _cache: {}, - get: (key) => { - let cache = fakeDemoRedisCache._cache[key]; - _fakeLRUcount++; - if (_fakeLRUcount >= 10) { - fakeDemoRedisCache.clear(); - _fakeLRUcount = 0; - } - return cache; - }, - set: (key, data) => fakeDemoRedisCache._cache[key] = data, - clear: () => fakeDemoRedisCache._cache = {} -}; diff --git a/sample-components/sampleComponent-rc6/src/backend/db.ts b/sample-components/sampleComponent-rc6/src/backend/db.ts deleted file mode 100644 index 3ba8ea3d..00000000 --- a/sample-components/sampleComponent-rc6/src/backend/db.ts +++ /dev/null @@ -1,7 +0,0 @@ -// Our API for demos only -export const fakeDataBase = { - get() { - let res = { data: 'This fake data came from the db on the server.' }; - return Promise.resolve(res); - } -}; diff --git a/sample-components/sampleComponent-rc6/src/client.ts b/sample-components/sampleComponent-rc6/src/client.ts deleted file mode 100644 index d92fc324..00000000 --- a/sample-components/sampleComponent-rc6/src/client.ts +++ /dev/null @@ -1,18 +0,0 @@ -// the polyfills must be the first thing imported -import 'angular2-universal-polyfills'; - -// Angular 2 -import { enableProdMode} from '@angular/core'; -import { platformUniversalDynamic } from 'angular2-universal'; - -// enable prod for faster renders -enableProdMode(); - -import { main } from './main.browser'; - -// on document ready bootstrap Angular 2 -document.addEventListener('DOMContentLoaded', () => { - - platformUniversalDynamic().bootstrapModule(main()); - -}); diff --git a/sample-components/sampleComponent-rc6/src/index.html b/sample-components/sampleComponent-rc6/src/index.html deleted file mode 100644 index 8bd68c09..00000000 --- a/sample-components/sampleComponent-rc6/src/index.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - OpenAIRE - - - - - - - - - - - - - - - - - Loading Universal ... - - - - - diff --git a/sample-components/sampleComponent-rc6/src/main.browser.ts b/sample-components/sampleComponent-rc6/src/main.browser.ts deleted file mode 100644 index c4f7b5c7..00000000 --- a/sample-components/sampleComponent-rc6/src/main.browser.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; - -import { UniversalModule } from 'angular2-universal'; - -import { App } from './app/app'; -/* Feature Modules */ -import { LoadingModule } from './app/common/modal/loading.module'; -import {ClaimEntityFormatterModule } from './app/common/claimEntityFormatter.module'; -// -import {ClaimsModule } from './app/claimPages/claims/claims.module'; -//for routing: -import {ClaimsAdminComponent} from './app/claimPages/claims/claimsAdmin.component'; -import { routing } from './app/app.routing'; -import {Routes, RouterModule} from "@angular/router"; - - - -import {Open} from './app/common/modal/open.component'; - -import {Alert} from './app/common/modal/alert'; -import {Loading} from './app/common/modal/loading.component'; -import {ClaimsComponent} from './app/claimPages/claims/claims.component'; -import {ClaimsService} from './app/services/claims.service'; -import {Claim} from './app/entities/claim'; -import {pagingFormatterNoLoad} from './app/common/pagingFormatterNoLoad.component'; - -import {ClaimEntityFormatter} from './app/common/claimEntityFormatter.component'; -import {PublicationTitleFormatter} from './app/common/publicationTitleFormatter.component'; -import {ProjectTitleFormatter} from './app/common/projectTitleFormatter.component'; -import {HomeComponent} from './app/home/home.component'; -export function main() { - @NgModule({ - bootstrap: [ App ], - declarations: [ App, ClaimsAdminComponent, ClaimsComponent, ClaimEntityFormatter,pagingFormatterNoLoad, Open, ProjectTitleFormatter, PublicationTitleFormatter,HomeComponent, Loading, Alert], - imports: [ - UniversalModule, - FormsModule, - routing - ], - - providers: [ ClaimsService ] - - }) - - - - - -// -// //OpenModule, ClaimEntityFormatterModule,ClaimEntityFormatter, -// //ClaimsService -// export function main() { -// @NgModule({ -// bootstrap: [ App ], -// declarations: [ App, ClaimsAdminComponent], -// imports: [ -// UniversalModule, -// FormsModule, -// ClaimsModule, -// LoadingModule, -// -// routing -// ], -// -// providers: [ ] -// -// }) - class MainModule { - } - return MainModule; -} diff --git a/sample-components/sampleComponent-rc6/src/main.node.ts b/sample-components/sampleComponent-rc6/src/main.node.ts deleted file mode 100644 index e5838609..00000000 --- a/sample-components/sampleComponent-rc6/src/main.node.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule, Component } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { UniversalModule } from 'angular2-universal'; - -import { App } from './app/app'; - -export function main(config) { - - @NgModule({ - bootstrap: [ App ], - declarations: [ App ], - imports: [ - UniversalModule.withConfig({ - document: config.document, - originUrl: 'http://localhost:3000', - baseUrl: '/', - requestUrl: '/', - // preboot: false, - preboot: { appRoot: ['app'], uglify: true }, - }), - FormsModule - ] - }) - class MainModule {} - - return MainModule -}; diff --git a/sample-components/sampleComponent-rc6/src/server.ts b/sample-components/sampleComponent-rc6/src/server.ts deleted file mode 100644 index ab56fc8d..00000000 --- a/sample-components/sampleComponent-rc6/src/server.ts +++ /dev/null @@ -1,58 +0,0 @@ -// the polyfills must be the first thing imported in node.js -import 'angular2-universal-polyfills'; - -import * as path from 'path'; -import * as express from 'express'; -import * as bodyParser from 'body-parser'; -import * as cookieParser from 'cookie-parser'; - -// Angular 2 -import { enableProdMode } from '@angular/core'; -// Angular 2 Universal -import { createEngine } from 'angular2-express-engine'; - -// enable prod for faster renders -enableProdMode(); - -const app = express(); -const ROOT = path.join(path.resolve(__dirname, '..')); - -// Express View -import { main } from './main.node'; -app.engine('.html', createEngine({ main })); -app.set('views', __dirname); -app.set('view engine', 'html'); - -app.use(cookieParser('Angular 2 Universal')); -app.use(bodyParser.json()); - -// Serve static files -app.use('/assets', express.static(path.join(__dirname, 'assets'), {maxAge: 30})); -app.use(express.static(path.join(ROOT, 'dist/client'), {index: false})); -/* **AK** Add this path so that index.html can see files from node_modules folder (e.g. bootstrap files)*/ -app.use(express.static(path.join(ROOT, 'node_modules'), {index: false})); - - - -import { serverApi } from './backend/api'; -// Our API for demos only -app.get('/data.json', serverApi); - -// Routes with html5pushstate -// ensure routes match client-side-app -app.get('/', (req, res) => res.render('index', {req, res})); -app.get('/claims', (req, res) => res.render('index', {req, res})); -app.get('/home', (req, res) => res.render('index', {req, res})); - - -app.get('*', function(req, res) { - res.setHeader('Content-Type', 'application/json'); - var pojo = { status: 404, message: 'No Content' }; - var json = JSON.stringify(pojo, null, 2); - res.status(404).send(json); -}); - -// Server -let server = app.listen(process.env.PORT || 3000, () => { - console.log(`Listening on: http://localhost:${server.address().port}`); -}); diff --git a/sample-components/sampleComponent-rc6/src/typings.d.ts b/sample-components/sampleComponent-rc6/src/typings.d.ts deleted file mode 100644 index 1c62346c..00000000 --- a/sample-components/sampleComponent-rc6/src/typings.d.ts +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Custom Type Definitions - * When including 3rd party modules you also need to include the type definition for the module - * if they don't provide one within the module. You can try to install it with typings -typings install node --save - * If you can't find the type definition in the registry we can make an ambient definition in - * this file for now. For example -declare module "my-module" { - export function doesSomething(value: string): string; -} - * - * If you're prototying and you will fix the types later you can also declare it as type any - * -declare var assert: any; - * - * If you're importing a module that uses Node.js modules which are CommonJS you need to import as - * -import * as _ from 'lodash' - * You can include your type definitions in this file until you create one for the typings registry - * see https://github.com/typings/registry - * - */ - - -// Extra variables that live on Global that will be replaced by webpack DefinePlugin -declare var ENV: string; -declare var HMR: boolean; -interface GlobalEnvironment { - ENV; - HMR; -} - -interface WebpackModule { - hot: { - data?: any, - idle: any, - accept(dependencies?: string | string[], callback?: (updatedDependencies?: any) => void): void; - decline(dependencies?: string | string[]): void; - dispose(callback?: (data?: any) => void): void; - addDisposeHandler(callback?: (data?: any) => void): void; - removeDisposeHandler(callback?: (data?: any) => void): void; - check(autoApply?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void; - apply(options?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void; - status(callback?: (status?: string) => void): void | string; - removeStatusHandler(callback?: (status?: string) => void): void; - }; -} - -interface WebpackRequire { - context(file: string, flag?: boolean, exp?: RegExp): any; -} - - -interface ErrorStackTraceLimit { - //stackTraceLimit: number; - stackTraceLimit(limit: number): void -} - - -// Extend typings -interface NodeRequire extends WebpackRequire {} -interface ErrorConstructor extends ErrorStackTraceLimit {} -interface NodeModule extends WebpackModule {} -interface Global extends GlobalEnvironment {} - - -interface Thenable { - then( - onFulfilled?: (value: T) => U | Thenable, - onRejected?: (error: any) => U | Thenable): Thenable; - then( - onFulfilled?: (value: T) => U | Thenable, - onRejected?: (error: any) => void): Thenable; - catch(onRejected?: (error: any) => U | Thenable): Thenable; -} diff --git a/sample-components/sampleComponent-rc6/tsconfig.json b/sample-components/sampleComponent-rc6/tsconfig.json deleted file mode 100644 index 96d822e5..00000000 --- a/sample-components/sampleComponent-rc6/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "declaration": false, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "module": "commonjs", - "moduleResolution": "node", - "outDir": "dist", - "sourceMap": true, - "sourceRoot": "src", - "target": "es5", - "lib": ["es6", "dom"] - }, - "exclude": [ - "node_modules" - ], - "compileOnSave": false, - "buildOnSave": false, - "atom": { "rewriteTsconfig": false } -} diff --git a/sample-components/sampleComponent-rc6/webpack.config.js b/sample-components/sampleComponent-rc6/webpack.config.js deleted file mode 100644 index bfbbd742..00000000 --- a/sample-components/sampleComponent-rc6/webpack.config.js +++ /dev/null @@ -1,92 +0,0 @@ -var webpack = require('webpack'); -var path = require('path'); - -var commonConfig = { - resolve: { - extensions: ['', '.ts', '.js', '.json'] - }, - module: { - loaders: [ - // TypeScript - { test: /\.ts$/, loaders: ['ts-loader', 'angular2-template-loader'] }, - { test: /\.html$/, loader: 'raw-loader' }, - { test: /\.css$/, loader: 'raw-loader' }, - { test: /\.json$/, loader: 'raw-loader' } - ], - }, - plugins: [ - ] - -}; - - -var clientConfig = { - target: 'web', - entry: './src/client', - output: { - path: root('dist/client') - }, - node: { - global: true, - __dirname: true, - __filename: true, - process: true, - Buffer: false - } -}; - - -var serverConfig = { - target: 'node', - entry: './src/server', // use the entry file of the node server if everything is ts rather than es5 - output: { - path: root('dist/server'), - libraryTarget: 'commonjs2' - }, - externals: checkNodeImport, - node: { - global: true, - __dirname: true, - __filename: true, - process: true, - Buffer: true - } -}; - - - -// Default config -var defaultConfig = { - context: __dirname, - resolve: { - root: root('/src') - }, - output: { - publicPath: path.resolve(__dirname), - filename: 'index.js' - } -} - - - -var webpackMerge = require('webpack-merge'); -module.exports = [ - // Client - webpackMerge({}, defaultConfig, commonConfig, clientConfig), - - // Server - webpackMerge({}, defaultConfig, commonConfig, serverConfig) -] - -// Helpers -function checkNodeImport(context, request, cb) { - if (!path.isAbsolute(request) && request.charAt(0) !== '.') { - cb(null, 'commonjs ' + request); return; - } - cb(); -} - -function root(args) { - args = Array.prototype.slice.call(arguments, 0); - return path.join.apply(path, [__dirname].concat(args)); -} diff --git a/sample-components/sampleComponent-rc7/.editorconfig b/sample-components/sampleComponent-rc7/.editorconfig deleted file mode 100644 index f1cc3ad3..00000000 --- a/sample-components/sampleComponent-rc7/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# http://editorconfig.org - -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true - -[*.md] -insert_final_newline = false -trim_trailing_whitespace = false diff --git a/sample-components/sampleComponent-rc7/.gitignore b/sample-components/sampleComponent-rc7/.gitignore deleted file mode 100644 index 9e17510b..00000000 --- a/sample-components/sampleComponent-rc7/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -/__build__ -/__server_build__ -/node_modules -/typings -/tsd_typings/ -npm-debug.log - -/dist/ - -.idea - -.DS_Store diff --git a/sample-components/sampleComponent-rc7/README.md b/sample-components/sampleComponent-rc7/README.md deleted file mode 100644 index 8e3dbcc7..00000000 --- a/sample-components/sampleComponent-rc7/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# Angular 2 Universal Starter [![Universal Angular 2](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal) - -A minimal Angular 2 starter for Universal JavaScript using TypeScript and Webpack - -> If you're looking for the repo from the AngularConnect talk look in the [angular-connect branch](https://github.com/angular/universal-starter/tree/angular-connect) -If you're looking for a SystemJS version of the repo look in the [systemjs branch](https://github.com/angular/universal-starter/tree/systemjs) - -[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) - -## Installation - -* `npm install` - -## Serve - -* `npm start` to build your client app and start a web server -* `npm run build` to prepare a distributable bundle - -## Development -* run `npm start` and `npm run watch` in two separate terminals to build your client app, start a web server, and allow file changes to update in realtime - -## Watch files -* `npm run watch` to build your client app and start a web server diff --git a/sample-components/sampleComponent-rc7/app.json b/sample-components/sampleComponent-rc7/app.json deleted file mode 100644 index 1762bb6b..00000000 --- a/sample-components/sampleComponent-rc7/app.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "Angular 2 Universal Starter", - "description": "Angular 2 Universal starter kit by @AngularClass", - "repository": "https://github.com/angular/universal-starter", - "logo": "https://cloud.githubusercontent.com/assets/1016365/10639063/138338bc-7806-11e5-8057-d34c75f3cafc.png", - "env": { - "NPM_CONFIG_PRODUCTION": { - "description": "Install `webpack` and other development modules when deploying to allow full builds.", - "value": "false" - } - } -} diff --git a/sample-components/sampleComponent-rc7/nodemon.json b/sample-components/sampleComponent-rc7/nodemon.json deleted file mode 100644 index 97a836fb..00000000 --- a/sample-components/sampleComponent-rc7/nodemon.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "watch": [ - "dist", - "src/index.html" - ], - "ext" : "js ts json html" -} diff --git a/sample-components/sampleComponent-rc7/package.json b/sample-components/sampleComponent-rc7/package.json deleted file mode 100644 index 90c115bb..00000000 --- a/sample-components/sampleComponent-rc7/package.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "name": "universal-starter", - "version": "2.0.0", - "description": "Angular 2 Universal starter kit by @AngularClass", - "repository": { - "type": "git", - "url": "https://github.com/angular/universal-starter.git" - }, - "scripts": { - "watch": "webpack --watch", - "prebuild": "rimraf dist", - "build": "webpack", - "build:prod": "webpack --progress -p", - "prestart": "npm run build", - "server": "nodemon dist/server/index.js", - "start": "npm run server", - "predebug": "npm run build", - "debug:build": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js", - "debug": "node --debug-brk dist/server/index.js" - }, - "license": "MIT", - "contributors": [ - "AngularClass ", - "PatrickJS ", - "Jeff Whelpley ", - "Jeff Cross ", - "Mark Pieszak " - ], - "dependencies": { - "@angular/common": "2.0.0-rc.7", - "@angular/compiler": "2.0.0-rc.7", - "@angular/core": "2.0.0-rc.7", - "@angular/forms": "2.0.0-rc.7", - "@angular/http": "2.0.0-rc.7", - "@angular/platform-browser": "2.0.0-rc.7", - "@angular/platform-browser-dynamic": "2.0.0-rc.7", - "@angular/platform-server": "2.0.0-rc.7", - "@angular/router": "3.0.0-rc.3", - "angular2-platform-node": "~1.0.5", - "angular2-universal": "~1.0.5", - "angular2-universal-polyfills": "~1.0.5", - "angular2-express-engine": "~1.0.5", - "body-parser": "^1.15.2", - "express": "^4.14.0", - "methods": "~1.1.2", - "rxjs": "5.0.0-beta.12", - "zone.js": "~0.6.21" - }, - "devDependencies": { - "@angularclass/resolve-angular-routes": "^1.0.9", - "@types/body-parser": "0.0.29", - "@types/compression": "0.0.29", - "@types/cookie-parser": "^1.3.29", - "@types/express": "^4.0.29", - "@types/express-serve-static-core": "^4.0.29", - "@types/mime": "0.0.28", - "@types/node": "^4.0.30", - "@types/serve-static": "^1.7.27", - "angular2-template-loader": "^0.4.0", - "cookie-parser": "^1.4.3", - "nodemon": "^1.10.0", - "raw-loader": "^0.5.1", - "rimraf": "^2.5.4", - "ts-loader": "^0.8.2", - "ts-node": "^1.3.0", - "typescript": "2.0.0", - "webpack": "^2.1.0-beta.22", - "webpack-dev-middleware": "^1.6.1", - "webpack-dev-server": "^2.1.0-beta.0", - "webpack-merge": "^0.13.0" - } -} diff --git a/sample-components/sampleComponent-rc7/src/app/app.routing.ts b/sample-components/sampleComponent-rc7/src/app/app.routing.ts deleted file mode 100644 index 9386b275..00000000 --- a/sample-components/sampleComponent-rc7/src/app/app.routing.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import {ClaimsAdminComponent} from './claimPages/claims/claimsAdmin.component'; -import {HomeComponent} from './home/home.component'; -const appRoutes: Routes = [ - { path: '', - pathMatch: 'full', - redirectTo: 'home' }, - { path: 'claims', component: ClaimsAdminComponent }, - { path: 'home', component: HomeComponent } - -]; - - -// , -// { -// path: 'heroes', -// component: HeroListComponent, -// data: { -// title: 'Heroes List' -// } -// }, -// { path: 'hero/:id', component: HeroDetailComponent }, -// { path: '**', component: PageNotFoundComponent } -// export const appRoutingProviders: any[] = [ -// -// ]; - -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); diff --git a/sample-components/sampleComponent-rc7/src/app/app.ts b/sample-components/sampleComponent-rc7/src/app/app.ts deleted file mode 100644 index 636737c7..00000000 --- a/sample-components/sampleComponent-rc7/src/app/app.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { Component } from '@angular/core'; - -import 'rxjs/Rx'; -@Component({ - selector: 'app', - template: ` -
- - -
- -
- -
` -}) -export class App { - -} diff --git a/sample-components/sampleComponent-rc7/src/app/claimPages/claims/claims.component.html b/sample-components/sampleComponent-rc7/src/app/claimPages/claims/claims.component.html deleted file mode 100644 index 4518b03f..00000000 --- a/sample-components/sampleComponent-rc7/src/app/claimPages/claims/claims.component.html +++ /dev/null @@ -1,107 +0,0 @@ -
-
-
-
- -
Claims related to
- -
-

- -

-

- -

-

- -

-

- -

-

- -

-
-
-
- - -
- - - diff --git a/sample-components/sampleComponent-rc7/src/app/claimPages/claims/claims.component.ts b/sample-components/sampleComponent-rc7/src/app/claimPages/claims/claims.component.ts deleted file mode 100644 index b8151b44..00000000 --- a/sample-components/sampleComponent-rc7/src/app/claimPages/claims/claims.component.ts +++ /dev/null @@ -1,490 +0,0 @@ -import {Component, ViewChild, Input} from '@angular/core'; -import {Location} from '@angular/common'; -import {Observable} from 'rxjs/Observable'; -import {ActivatedRoute, Router} from '@angular/router'; -import {ClaimsService} from '../../services/claims.service'; -import {Loading} from '../../common/modal/loading.component'; -import {Alert} from '../../common/modal/alert'; - - -@Component({ - selector: 'claims', - templateUrl: 'claims.component.html', - providers:[ ClaimsService] - -}) -export class ClaimsComponent { - constructor (private _claimService: ClaimsService, private route: ActivatedRoute, private _router:Router, private location: Location) { - } - - ngOnInit() { - // this.sub = this.route.queryParams.subscribe(params => { - - var params = []; - if( this.myClaims == 'true' ){ - this.fetchBy = "User"; - }else{ - - this.fetchBy = params['fetchBy']; - this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All'; - this.fetchId = params['fetchId']; - this.fetchId=this.fetchId?this.fetchId:''; - - } - - let page = (params['page']=== undefined)?1:+params['page']; - let size = (params['size']=== undefined)?10:+params['size']; - - this.keyword = (params['keyword']?params['keyword']:""); - this.inputkeyword = this.keyword; - this.page = ( page <= 0 ) ? 1 : page; - this.size = ( size <= 0 ) ? 10 : size; - this.entityTypes = []//(params['types']?params['types']:[]); - this.setTypes(params['types']); // check the appropriate checkboxes - // this.setSortby(params['sort']); - this.getClaims(); - - // }); - // this.sub = this.route.params.subscribe(params => { - // console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId); - // if( this.myClaims == 'true' ){ - // console.info("Is myclaims"); - // this.fetchBy = "User"; - // }else{ - // console.info("Is admin"); - // - // console.info(this.isAdmin); - // - // this.fetchBy = params['fetchBy']; - // this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All'; - // this.fetchId = params['fetchId']; - // console.info("Fetch by:"+this.fetchBy+"Fetch id:"+this.fetchId); - // this.fetchId=this.fetchId?this.fetchId:''; - // - // } - // - // console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId); - // let page = (params['page']=== undefined)?1:+params['page']; - // let size = (params['size']=== undefined)?10:+params['size']; - // - // this.keyword = (params['keyword']?params['keyword']:""); - // this.inputkeyword = this.keyword; - // this.page = ( page <= 0 ) ? 1 : page; - // this.size = ( size <= 0 ) ? 10 : size; - // this.entityTypes = []//(params['types']?params['types']:[]); - // this.setTypes(params['types']); // check the appropriate checkboxes - // this.setSortby(params['sort']); - // this.getClaims(); - // console.info("params: "+params['page']+" page "+page +" this.page: "+this.page ); - // }); - } - ngOnDestroy() { - this.sub.unsubscribe(); - } - sub: any; - //string because comes as input from component directive - @Input() enableDelete: string = 'false'; - @Input() myClaims: string= 'false' ; - @Input() isAdmin:string = 'false'; - page : number; - size:number; - keyword:string; // the keyword string to give to the request as parameter - inputkeyword:string; // the string written in the input field (keyword=inputkeyword when its length is bigger than 3 and the user stops typing) - lengths = [10,20,30,50]; - types = ["All","Project","Context","Result","User"]; - @Input() fetchBy:string; - @Input() fetchId:string; - - navigateTo: string = "Claims"; - resultsNum: number ; - claims: string[]; - - @ViewChild (Loading) loading : Loading ; - - //checkboxes: - publicationCB = false; - datasetCB = false; - contextCB = false; - projectCB = false; - entityTypes : string[] =[] ; - - descending = true; - sortby = "date"; - - selected=[]; - deleteMessage:string = ""; - showErrorMessage:boolean = false; - - //params for pagingFormatter to use when navigate to page - params; - @ViewChild(Alert) alert; - - claimsDeleted:number = 0; - - getClaims () { - this.selected=[]; - var types = ''; - this.showErrorMessage = false; - for (var type of this.entityTypes){ - types+=(types.length>0?'&':'')+"types="+type; - } - if(this.fetchBy =="Project" ){ - this._claimService.getClaimsByProject(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="User"){ - this._claimService.getClaimsByUser(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="Result"){ - this._claimService.getClaimsByResult(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= data.total; - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else if(this.fetchBy =="Context"){ - this._claimService.getClaimsBycontext(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum= null; - this.resultsNum= data.total;//data.length; //TODO get the total results num - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - }else{ - this._claimService.getClaims(this.size,this.page,this.keyword,this.sortby,this.descending, types).subscribe( - data => { - this.claims = data.data; - this.resultsNum = null; - this.resultsNum= data.total;//data.length; //TODO get the total results num - }, - err => { - console.error(err); - this.showErrorMessage = true; - } - ); - } - } - - goToClaim(claimId: number){ - this._router.navigate( ['Claim', { id: claimId}] ); - } - goTo(page:number = 1){ - - this.page = page; - - this.location.go(location.pathname,this.getParametersString()); - this.getClaims(); - } - getParameters(){ - let params={ page: this.page, size: this.size, types: this.entityTypes, fetchBy: this.fetchBy, fetchId:this.fetchId, keyword : this.keyword, sort: this.getSortby() }; - return params; - } - getParametersString(){ - var params=''; - params+=(this.page==1?"":(params.length>0?'&':'')+"page="+this.page); - params+=(this.size==10?"":(params.length>0?'&':'')+"size="+this.size); - // params+=(this.entityTypes==''?"":(params.length>0?'&':'')+"types="+this.entityTypes); - var types=""; - for (var type of this.entityTypes){ - types+=(types.length>0?',':'')+type; - } - params+=(types.length>0)?"types="+types:""; - - if(this.isAdmin === 'true'){ - params+=(this.fetchBy=='All'?"":(params.length>0?'&':'')+"fetchBy="+this.fetchBy); - params+=(this.fetchId==''?"":(params.length>0?'&':'')+"fetchId="+this.fetchId); - } - params+=(this. getSortby()=='datedesc'?"":(params.length>0?'&':'')+"sort="+this. getSortby()); - params+=(this.keyword==''?"":(params.length>0?'&':'')+"keyword="+this.keyword); - return params; - } - changeLength(){ - this.goTo(); - } - clearFilters(){ - this.keyword = ''; - this.inputkeyword = ''; - this.publicationCB = false; - this.projectCB = false; - this.datasetCB = false; - this.contextCB = false; - this.entityTypes = []; - this.goTo(); - } - changeOrderby(sortby:string){ - if(sortby==this.sortby){ - this.descending = !this.descending; - }else{ - this.sortby = sortby; - this.descending = false; - } - this.goTo(); - } - setSortby(sortby:string){ - if(!sortby|| sortby == "datedesc"){ - this.descending = true; - this.sortby = "date"; - }else if(sortby == "dateasc"){ - this.descending = false; - this.sortby = "date"; - }else if(sortby == "userasc"){ - this.descending = false; - this.sortby = "user"; - }else if(sortby == "userdesc"){ - this.descending = true; - this.sortby = "user"; - }if(sortby =="sourceasc"){ - this.descending = false; - this.sortby = "source"; - }else if(sortby == "sourcedesc"){ - this.descending = true; - this.sortby = "source"; - }else if(sortby == "targetasc"){ - this.descending = false; - this.sortby = "target"; - }else if(sortby == "targetdesc"){ - this.descending = true; - this.sortby = "target"; - } - } - getSortby():string{ - if(this.descending){ - return this.sortby+"desc"; - }else{ - return this.sortby+"asc"; - } - - } - changeType(){ - this.entityTypes = []; - if(this.publicationCB){ - this.entityTypes.push('publication'); - } - if(this.datasetCB){ - this.entityTypes.push('dataset'); - } - if(this.projectCB){ - this.entityTypes.push('project'); - } - if(this.contextCB){ - this.entityTypes.push('context'); - } - - // if(this.publicationCB == true && this.datasetCB == true && this.contextCB == true && this.projectCB == true ){ - // this.entityTypes=""; - // }else{ - // this.entityTypes = ""; - // if(this.publicationCB == true){ - // this.entityTypes = "publication"; - // } - // if(this.datasetCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"dataset"; - // } - // if(this.contextCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"context"; - // } - // if(this.projectCB == true){ - // this.entityTypes += (this.entityTypes.length > 0?",":"")+"project"; - // } - // } - // console.debug("Type changed: "+this.entityTypes+" "+this.publicationCB+ this.datasetCB + this.contextCB + this.projectCB); - this.goTo(); - } - setTypes(types:string){ - if(!types){ - return; - } - if(types.length > 0){ - this.entityTypes = []; - if(types.indexOf("publication")!=-1){ - this.publicationCB = true; - this.entityTypes.push("publication"); - } - if(types.indexOf("dataset")!=-1){ - this.datasetCB = true; - this.entityTypes.push("dataset"); - } - if(types.indexOf("project")!=-1){ - this.projectCB = true; - this.entityTypes.push("project"); - } - if(types.indexOf("context")!=-1){ - this.contextCB = true; - this.entityTypes.push("context"); - } - } - if(this.publicationCB && this.datasetCB && this.contextCB && this.projectCB){ - this.entityTypes=[]; - } - } - changekeyword(){ - - if(this.inputkeyword.length >= 3 || this.inputkeyword.length == 0 ){ - this.keyword = this.inputkeyword; - this.page = 1; - this.goTo(); - } - - } - select(item:any,event){ - this.deleteMessage=""; - var value = event.currentTarget.checked; - if(value){ - this.selected.push(item); - }else{ - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == item.id){ - this.selected.splice(_i, 1); - } - } - - - } - } - selectAll(){ - this.selected = []; - for (var _i = 0; _i < this.claims.length; _i++) { - let claim = this.claims[_i]; - this.selected.push(claim); - } - this.deleteMessage = ""; - } - deselectAll(){ - this.selected = []; - this.deleteMessage=""; - } - isSelected(id:string){ - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == id){ - return true; - } - } - return false; - } - - - confirmOpen(){ - if(this.selected.length <= 0){ - - }else{ - this.alert.cancelButton = true; - this.alert.okButton = true; - this.alert.alertTitle = "Delete "+this.selected.length+" claim(s)"; - this.alert.message = this.selected.length+" claims will be deleted. Do you want to proceed? "; - this.alert.okButtonText = "Yes"; - this.alert.cancelButtonText = "No"; - this.alert.open(); - } - } - confirmClose(data){ - this.delete(); - } - delete(){ - this.deleteMessage=""; - this.loading.open(); - this.claimsDeleted = 0; - var ids = []; - for (var i = 0; i < this.selected.length; i++){ - var id =this.selected[i].id; - ids.push(id); - // var selected =this.selected[i].id; - // console.warn("Deleting claim with id:"+id); - // this.deleteById(id); - //TODO for multiple concurrent - } - this.batchDeleteById(ids); - } - - deleteById(id:string){ - - console.warn("Deleting claim with id:"+id); - // this._claimService.deleteClaimById(id); - this._claimService.deleteClaimById(id).subscribe( - res => { - console.info('Delete response'+res.code ); - console.warn("Deleted claim with id:"+ id); - //remove this claim from the - let newClaims=this.claims; - for (var _i = 0; _i < this.claims.length; _i++) { - let claim = this.claims[_i]; - if(claim['id'] == id){ - newClaims.splice(_i, 1); - } - } - //TODO should call getClaims??? - this.claimsDeleted++; - this.claims = newClaims; - if(this.claimsDeleted == this.selected.length){ - this.resultsNum = this.resultsNum - this.selected.length; - this.loading.close(); - this.selected = []; - } - - - }); - } - batchDeleteById(ids:string[]){ - - console.warn("Deleting claim with ids:"+ids); - this._claimService.deleteBulk(ids).subscribe( - res => { - console.info('Delete response'+res.code ); - console.warn("Deleted ids:"+ res.deletedIds); - console.warn("Not found ids:"+ res.notFoundIds); - //remove this claim from the - let newClaims=this.claims; - for(var id of res.deletedIds){ - for (var _i = 0; _i < this.claims.length; _i++) { - let claim = this.claims[_i]; - if(claim['id'] == id){ - newClaims.splice(_i, 1); - } - } - for (var _i = 0; _i < this.selected.length; _i++) { - let claim = this.selected[_i]; - if(claim['id'] == id){ - this.selected.splice(_i, 1); - } - } - } - this.claims = newClaims; - this.resultsNum = this.resultsNum - res.deletedIds.length; - this.loading.close(); - if(res.deletedIds.length>0){ - this.deleteMessage=this.deleteMessage+'
'+res.deletedIds.length+' claim(s) successfully deleted.
'; - } - if(res.notFoundIds.length>0){ - this.deleteMessage=this.deleteMessage+'
'+res.notFoundIds.length+' claim(s) couldn\'t be deleted.
'; - } - }); - } - pageChange($event) { - var page:number = +$event.value - this.goTo(page); - } -} diff --git a/sample-components/sampleComponent-rc7/src/app/claimPages/claims/claimsAdmin.component.ts b/sample-components/sampleComponent-rc7/src/app/claimPages/claims/claimsAdmin.component.ts deleted file mode 100644 index a602bdc9..00000000 --- a/sample-components/sampleComponent-rc7/src/app/claimPages/claims/claimsAdmin.component.ts +++ /dev/null @@ -1,36 +0,0 @@ -import {Component, ViewChild, Input} from '@angular/core'; -import {Location} from '@angular/common'; -import {Observable} from 'rxjs/Observable'; - -@Component({ - selector: 'claims-admin', - template: ` -
-
-

Claims Administrator

-
- -
- - -
- TODO login -
- `, - -}) -export class ClaimsAdminComponent { - constructor ( ) { - - } -user:string="argirok@di.uoa.gr"; - ngOnInit() { - - - } - - -} diff --git a/sample-components/sampleComponent-rc7/src/app/common/claimEntityFormatter.component.ts b/sample-components/sampleComponent-rc7/src/app/common/claimEntityFormatter.component.ts deleted file mode 100644 index 093b1cd5..00000000 --- a/sample-components/sampleComponent-rc7/src/app/common/claimEntityFormatter.component.ts +++ /dev/null @@ -1,38 +0,0 @@ -import {Component, Input} from '@angular/core'; -// import {PublicationTitleFormatter} from './publicationTitleFormatter.component'; -// import {ProjectTitleFormatter} from './projectTitleFormatter.component'; - -//Usage Example " " - -//externalUrl -@Component({ - selector: 'claim-entity', - template: ` - -
- ({{type}}) - -
-
- (Project) - -
-
- (Context) -
{{entity.title}}
-
- ` -}) - -export class ClaimEntityFormatter { - @Input() entity: string[]; - @Input() type: string; - - constructor () {} - - ngOnInit() { - - } - - -} diff --git a/sample-components/sampleComponent-rc7/src/app/common/modal/alert.ts b/sample-components/sampleComponent-rc7/src/app/common/modal/alert.ts deleted file mode 100644 index bf5d1f60..00000000 --- a/sample-components/sampleComponent-rc7/src/app/common/modal/alert.ts +++ /dev/null @@ -1,110 +0,0 @@ -import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmitter, Output} from '@angular/core'; -// import { DynamicComponentLoader} from '@angular/core'; - -import {Open} from './open.component'; - -@Component({ - selector: 'alert', - template: ` - - `, - encapsulation: ViewEncapsulation.None, -}) -/** - * API to an open alert window. - */ -export class Alert{ - /** - * Caption for the title. - */ - public alertTitle:string; - /** - * Describes if the alert contains Ok Button. - * The default Ok button will close the alert and emit the callback. - * Defaults to true. - */ - public okButton:boolean = true; - /** - * Caption for the OK button. - * Default: Ok - */ - public okButtonText:string= 'Ok'; - /** - * Describes if the alert contains cancel Button. - * The default Cancelbutton will close the alert. - * Defaults to true. - */ - public cancelButton:boolean = true; - /** - * Caption for the Cancel button. - * Default: Cancel - */ - public cancelButtonText:string = 'Cancel'; - /** - * if the alertMessage is true it will show the contentString inside alert body. - */ - public alertMessage:boolean = true; - /** - * Some message/content can be set in message which will be shown in alert body. - */ - public message:string; - /** - * if the value is true alert footer will be visible or else it will be hidden. - */ - public alertFooter:boolean= true; - /** - * shows alert header if the value is true. - */ - public alertHeader:boolean = true; - /** - * if the value is true alert will be visible or else it will be hidden. - */ - public isOpen:boolean=false; - /** - * Emitted when a ok button was clicked - * or when Ok method is called. - */ - @Output() public alertOutput:EventEmitter = new EventEmitter(); - constructor( public _elementRef: ElementRef){} - /** - * Opens a alert window creating backdrop. - */ - open(){ - this.isOpen= true; - } - /** - * ok method closes the modal and emits modalOutput. - */ - ok(){ - this.isOpen = false; - this.alertOutput.emit(true); - } - /** - * cancel method closes the moda. - */ - cancel(){ - this.isOpen = false; - } -} diff --git a/sample-components/sampleComponent-rc7/src/app/common/modal/loading.component.ts b/sample-components/sampleComponent-rc7/src/app/common/modal/loading.component.ts deleted file mode 100644 index c046feae..00000000 --- a/sample-components/sampleComponent-rc7/src/app/common/modal/loading.component.ts +++ /dev/null @@ -1,49 +0,0 @@ -import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmitter, Output} from '@angular/core'; - -@Component({ - selector: 'loading', - template: ` - - `, - encapsulation: ViewEncapsulation.None, -}) -/** - * API to an open alert window. - */ -export class Loading{ - -@Input() public message:string ="Loading"; - - /** - * if the value is true alert will be visible or else it will be hidden. - */ - public isOpen:boolean=false; - /** - * Emitted when a ok button was clicked - * or when Ok method is called. - */ - @Output() public alertOutput:EventEmitter = new EventEmitter(); - constructor( public _elementRef: ElementRef){} - /** - * Opens a alert window creating backdrop. - */ - open(){ - this.isOpen= true; - } - - close(){ - this.isOpen = false; - } -} diff --git a/sample-components/sampleComponent-rc7/src/app/common/modal/open.component.ts b/sample-components/sampleComponent-rc7/src/app/common/modal/open.component.ts deleted file mode 100644 index 95add08d..00000000 --- a/sample-components/sampleComponent-rc7/src/app/common/modal/open.component.ts +++ /dev/null @@ -1,55 +0,0 @@ -import {Directive, Input, HostBinding} from '@angular/core'; - -// todo: add animate -// todo: add init and on change -@Directive({selector: '[open]'}) -export class Open { - @HostBinding('style.display') - private display:string; - @HostBinding('class.in') - @HostBinding('attr.aria-expanded') - private isExpanded:boolean = true; - - @Input() - private set open(value:boolean) { - this.isExpanded = value; - this.toggle(); - } - - private get open():boolean { - return this.isExpanded; - } - - constructor() { - } - init() { - this.isExpanded = false; - this.display = 'none'; - } - toggle() { - if (this.isExpanded) { - this.hide(); - } else { - this.show(); - } - } - - hide() { - this.isExpanded = false; - this.display = 'none'; - if (typeof document !== 'undefined') { - let backDrop = document.getElementsByClassName("modal-backdrop"); - if(backDrop.length>0){ - document.body.removeChild(backDrop[0]); - } - } - } - - show() { - let backDrop = document.createElement('div'); - backDrop.className="modal-backdrop fade in"; - document.body.appendChild(backDrop); - this.isExpanded = true; - this.display = 'block'; - } -} diff --git a/sample-components/sampleComponent-rc7/src/app/common/pagingFormatterNoLoad.component.ts b/sample-components/sampleComponent-rc7/src/app/common/pagingFormatterNoLoad.component.ts deleted file mode 100644 index 42534afd..00000000 --- a/sample-components/sampleComponent-rc7/src/app/common/pagingFormatterNoLoad.component.ts +++ /dev/null @@ -1,75 +0,0 @@ -import {Component, Input, Output, EventEmitter} from '@angular/core'; - - -//Usage Example - -@Component({ - selector: 'paging-no-load', - template: ` - - ` -}) - -export class pagingFormatterNoLoad { - @Input() currentPage: number = 1; - @Input() navigateTo: string; - @Input() term: string=''; - @Input() size: number=10; - @Input() totalResults: number = 10; - @Input() params; - - @Output() pageChange = new EventEmitter(); - - constructor () { - } - - ngOnInit() { - console.info("In paging -- CurrentPage:"+this.currentPage+" "+"total Pages = "+this.getTotalPages() +" Results num:"+this.totalResults); - } - getTotalPages(){ - var i= this.totalResults/this.size; - var integerI=parseInt(''+i); - return parseInt(''+((i==integerI)?i:i+1)); - } - onPrev(){ - this.currentPage=this.currentPage-1; - this.pageChange.emit({ - value: this.currentPage - }); - - } - - onNext(){ - - this.currentPage=this.currentPage+1; - this.pageChange.emit({ - value: this.currentPage - }); - } - onPage(pageNum: number){ - - this.currentPage=pageNum; - this.pageChange.emit({ - value: this.currentPage - }); - } -} diff --git a/sample-components/sampleComponent-rc7/src/app/common/projectTitleFormatter.component.ts b/sample-components/sampleComponent-rc7/src/app/common/projectTitleFormatter.component.ts deleted file mode 100644 index 5917768e..00000000 --- a/sample-components/sampleComponent-rc7/src/app/common/projectTitleFormatter.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {OpenaireProperties} from '../openaireProperties'; - -//Usage Example " " - -@Component({ - selector: 'project-title', - template: ` -
-
{{project.name}} ({{project.funderName}})
-
- ` -}) - -export class ProjectTitleFormatter { - @Input() project: string[]; - private url:string; - constructor () {} - - ngOnInit() { - this.url = OpenaireProperties.getsearchLinkToProject() + "?projectId=" + this.project["openaireId"]; - } -} diff --git a/sample-components/sampleComponent-rc7/src/app/common/publicationTitleFormatter.component.ts b/sample-components/sampleComponent-rc7/src/app/common/publicationTitleFormatter.component.ts deleted file mode 100644 index 2c87c50a..00000000 --- a/sample-components/sampleComponent-rc7/src/app/common/publicationTitleFormatter.component.ts +++ /dev/null @@ -1,26 +0,0 @@ -import {Component, Input} from '@angular/core'; - -//Usage Example " " - -@Component({ - selector: 'publication-title', - template: ` -
-
{{title}}
-
{{title}}
-
- ` -}) - -export class PublicationTitleFormatter { - @Input() title: string[]; - @Input() url: string[]; - - constructor () {} - - ngOnInit() { - - } - - -} diff --git a/sample-components/sampleComponent-rc7/src/app/entities/claim.ts b/sample-components/sampleComponent-rc7/src/app/entities/claim.ts deleted file mode 100644 index b5378c5f..00000000 --- a/sample-components/sampleComponent-rc7/src/app/entities/claim.ts +++ /dev/null @@ -1,15 +0,0 @@ -export class Claim { - id: string; - sourceType: string; - targetType: string; - sourceId: string; - targetId: string; - date: string; - DOI: string; - project: Project - userMail: string; - -} -export class Project{ - -} diff --git a/sample-components/sampleComponent-rc7/src/app/home/home.component.html b/sample-components/sampleComponent-rc7/src/app/home/home.component.html deleted file mode 100644 index fa7f4167..00000000 --- a/sample-components/sampleComponent-rc7/src/app/home/home.component.html +++ /dev/null @@ -1,15 +0,0 @@ - -
-
-
-
-
- - - - -
-
-
-
-
diff --git a/sample-components/sampleComponent-rc7/src/app/home/home.component.ts b/sample-components/sampleComponent-rc7/src/app/home/home.component.ts deleted file mode 100644 index 03253360..00000000 --- a/sample-components/sampleComponent-rc7/src/app/home/home.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component} from '@angular/core'; -import {Router} from '@angular/router'; -import {Observable} from 'rxjs/Observable'; -import {Location} from '@angular/common'; - -@Component({ - selector: 'home', - templateUrl: 'home.component.html', - }) - -export class HomeComponent { - constructor ( private _router: Router, private location: Location) {} - - -} diff --git a/sample-components/sampleComponent-rc7/src/app/openaireProperties.ts b/sample-components/sampleComponent-rc7/src/app/openaireProperties.ts deleted file mode 100644 index 796973ae..00000000 --- a/sample-components/sampleComponent-rc7/src/app/openaireProperties.ts +++ /dev/null @@ -1,89 +0,0 @@ -export class OpenaireProperties { - //landing Pages - private static baseSearchLink="/" - private static searchLinkToPublication = "publication?articleId="; - private static searchLinkToProject = "project?projectId="; - private static searchLinkToPerson = "person?personId="; - private static searchLinkToDataProvider = "https://beta.openaire.eu/search/dataprovider?datasourceId="; - private static searchLinkToDataset = "dataset?datasetId="; - private static searchLinkToOrganization = "organization?organizationId="; - - // Services - APIs - - // public claimsAPIURL = "http://rudie.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/" - private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8181/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/"; - - private static searchAPIURL = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - // private searchAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - // private searchAPIURL = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/"; - - private static searchServiveURL = "http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/"; - // private static searchServiveURL = "http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/"; - // private static searchServiveURL = "http://services.openaire.eu:8380/search/"; - //private static searchServiveURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/"; - - private static searchCrossrefAPIURL = "http://api.crossref.org/works"; - private static searchDataciteAPIURL = "http://search.datacite.org/api"; - private static searchOrcidURL = "https://pub.orcid.org/"; - - // Identifiers - private static pmidURL = "http://www.ncbi.nlm.nih.gov/pubmed/"; - private static doiURL = "http://dx.doi.org/"; - private static cordisURL = "http://cordis.europa.eu/projects/"; - private static pmcURL = "http://europepmc.org/articles/"; - - - //landing Pages' getters - public static getsearchLinkToPublication():string{ - return this.baseSearchLink + this.searchLinkToPublication; - } - public static getsearchLinkToDataset():string{ - return this.baseSearchLink + this.searchLinkToDataset; - } - public static getsearchLinkToProject():string{ - return this.baseSearchLink + this.searchLinkToProject; - } - public static getsearchLinkToPerson():string{ - return this.baseSearchLink + this.searchLinkToPerson; - } - public static getsearchLinkToOrganization():string{ - return this.searchLinkToOrganization; - } - public static getsearchLinkToDataProvider():string{ - return this.searchLinkToDataProvider; - } - - // Services - APIs' getters - public static getSearchAPIURL():string{ - return this.searchAPIURL; - } - public static getSearchServiceURL():string{ - return this.searchServiveURL; - } - public static getClaimsAPIURL():string{ - return this.claimsAPIURL; - } - public static getSearchCrossrefAPIURL():string{ - return this.searchCrossrefAPIURL; - } - public static getSearchDataciteAPIURL():string{ - return this.searchDataciteAPIURL; - } - public static getSearchOrcidURL():string{ - return this.searchOrcidURL; - } - - // Identifiers' getters - public static getPmidURL():string{ - return this.pmidURL; - } - public static getDoiURL():string{ - return this.doiURL; - } - public static getCordisURL():string{ - return this.cordisURL; - } - public static getPmcURL():string{ - return this.pmcURL; - } -} diff --git a/sample-components/sampleComponent-rc7/src/app/services/claims.service.ts b/sample-components/sampleComponent-rc7/src/app/services/claims.service.ts deleted file mode 100644 index 43c6abce..00000000 --- a/sample-components/sampleComponent-rc7/src/app/services/claims.service.ts +++ /dev/null @@ -1,131 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Jsonp, URLSearchParams,ResponseOptions, RequestOptions, Headers} from '@angular/http'; -import {Http, Response} from '@angular/http'; -import {Observable} from 'rxjs/Observable'; -import {Claim} from '../entities/claim'; -import {OpenaireProperties} from '../openaireProperties'; - -@Injectable() -export class ClaimsService { - private baseUrl; - constructor(private jsonp: Jsonp, private http: Http) { - this.baseUrl = OpenaireProperties.getClaimsAPIURL(); - } - - private getClaimRequest(size : number, page : number, url :string):any { - console.info('ClaimsService: Claims request: '+url); - return this.http.get( url) - .map(request => request.json()) - .do(request => console.info("Get claims: offset = "+(size*(page-1)) + " limit ="+size )) - .catch(this.handleError); - } - getClaims( size : number, page : number, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims ' ); - console.info('ClaimsService: Types : '+types ); - let url = this.baseUrl +"claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByUser( size : number, page : number, user:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for user : '+user); - let url = this.baseUrl +"users/"+user+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsBycontext( size : number, page : number, contextId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for context : '+contextId); - let url = this.baseUrl +"contexts/"+contextId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByResult( size : number, page : number, resultId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for result : '+resultId); - let url = this.baseUrl +"results/"+resultId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - - } - getClaimsByProject( size : number, page : number, projectId:string, keyword:string, sortby: string, descending: boolean, types: string):any { - console.info('ClaimsService: getClaims for project : '+projectId); - let url = this.baseUrl +"projects/"+projectId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+""+types; - return this.getClaimRequest(size,page,url); - } - - deleteClaimById(claimId:string):any{ - console.warn('Trying to delete claim with id : '+claimId); - let url = this.baseUrl +"claims/"+claimId; - console.warn('Delete url: '+url); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete( url, options).map(request => request.json()) - .do(request => console.info("After delete" )) - .catch(this.handleError); - - } - deleteBulk(claimIds:string[]):any{ - - console.warn('Trying to delete claims with ids : '+claimIds); - var url = ""; - - for(var claimId of claimIds){ - url=url+(url.length >0 ?"&":"")+"claimId="+claimId; - } - url= this.baseUrl +"claims/bulk?"+url; - console.warn('Delete url: '+url); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.delete( url, options).map(request => request.json()) - .do(request => console.info("After delete" )) - .catch(this.handleError); - - } - insertBulkClaims(claims):any{ - console.warn('Trying toinsert claims : '+claims); - let url = this.baseUrl +"claims/bulk"; - let body = JSON.stringify( claims ); - console.warn('Json body: : '+body); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, body, options) - .map(res => res.json()) - .do(request => console.info("Insert Response:"+request.status) ) - .catch(this.handleError); - - } - insertClaim(claim):any{ - console.warn('Trying toinsert claim : '+claim); - let url = this.baseUrl +"claims"; - let body = JSON.stringify( claim ); - let headers = new Headers({ 'Content-Type': 'application/json' }); - let options = new RequestOptions({ headers: headers }); - return this.http.post(url, body, options) - .map(res => res.json()) - .do(request => console.info("Insert Response:"+request.status) ) - .catch(this.handleError); - - } - - private handleError (error: Response) { - // in a real world app, we may send the error to some remote logging infrastructure - // instead of just logging it to the console - console.error(error); - return Observable.throw(error || 'Server error'); - } - - getClaim(id:string):any { - let url = this.baseUrl+"claims/"+id; - return new Promise((resolve, reject) => { - this.http.get(url) - .map(res => res.json()) - .subscribe( - data => { - resolve(data.data); - }, - err => { - reject(err); - } - ) - ; - }); - } - -} diff --git a/sample-components/sampleComponent-rc7/src/assets/logo.png b/sample-components/sampleComponent-rc7/src/assets/logo.png deleted file mode 100644 index afea237f..00000000 Binary files a/sample-components/sampleComponent-rc7/src/assets/logo.png and /dev/null differ diff --git a/sample-components/sampleComponent-rc7/src/backend/api.ts b/sample-components/sampleComponent-rc7/src/backend/api.ts deleted file mode 100644 index d8f4f517..00000000 --- a/sample-components/sampleComponent-rc7/src/backend/api.ts +++ /dev/null @@ -1,24 +0,0 @@ -// Our API for demos only -import {fakeDataBase} from './db'; -import {fakeDemoRedisCache} from './cache'; - -// you would use cookies/token etc -var USER_ID = 'f9d98cf1-1b96-464e-8755-bcc2a5c09077'; // hardcoded as an example - -// Our API for demos only -export function serverApi(req, res) { - let key = USER_ID + '/data.json'; - let cache = fakeDemoRedisCache.get(key); - if (cache !== undefined) { - console.log('/data.json Cache Hit'); - return res.json(cache); - } - console.log('/data.json Cache Miss'); - - fakeDataBase.get() - .then(data => { - fakeDemoRedisCache.set(key, data); - return data; - }) - .then(data => res.json(data)); -} diff --git a/sample-components/sampleComponent-rc7/src/backend/cache.ts b/sample-components/sampleComponent-rc7/src/backend/cache.ts deleted file mode 100644 index 490a3561..00000000 --- a/sample-components/sampleComponent-rc7/src/backend/cache.ts +++ /dev/null @@ -1,17 +0,0 @@ - - -var _fakeLRUcount = 0; -export const fakeDemoRedisCache = { - _cache: {}, - get: (key) => { - let cache = fakeDemoRedisCache._cache[key]; - _fakeLRUcount++; - if (_fakeLRUcount >= 10) { - fakeDemoRedisCache.clear(); - _fakeLRUcount = 0; - } - return cache; - }, - set: (key, data) => fakeDemoRedisCache._cache[key] = data, - clear: () => fakeDemoRedisCache._cache = {} -}; diff --git a/sample-components/sampleComponent-rc7/src/backend/db.ts b/sample-components/sampleComponent-rc7/src/backend/db.ts deleted file mode 100644 index 3ba8ea3d..00000000 --- a/sample-components/sampleComponent-rc7/src/backend/db.ts +++ /dev/null @@ -1,7 +0,0 @@ -// Our API for demos only -export const fakeDataBase = { - get() { - let res = { data: 'This fake data came from the db on the server.' }; - return Promise.resolve(res); - } -}; diff --git a/sample-components/sampleComponent-rc7/src/client.ts b/sample-components/sampleComponent-rc7/src/client.ts deleted file mode 100644 index d92fc324..00000000 --- a/sample-components/sampleComponent-rc7/src/client.ts +++ /dev/null @@ -1,18 +0,0 @@ -// the polyfills must be the first thing imported -import 'angular2-universal-polyfills'; - -// Angular 2 -import { enableProdMode} from '@angular/core'; -import { platformUniversalDynamic } from 'angular2-universal'; - -// enable prod for faster renders -enableProdMode(); - -import { main } from './main.browser'; - -// on document ready bootstrap Angular 2 -document.addEventListener('DOMContentLoaded', () => { - - platformUniversalDynamic().bootstrapModule(main()); - -}); diff --git a/sample-components/sampleComponent-rc7/src/index.html b/sample-components/sampleComponent-rc7/src/index.html deleted file mode 100644 index 2e9be605..00000000 --- a/sample-components/sampleComponent-rc7/src/index.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - OpenAIRE - - - - - - - - - - - - - - - - - - - Loading Universal ... - - - - - diff --git a/sample-components/sampleComponent-rc7/src/main.browser.ts b/sample-components/sampleComponent-rc7/src/main.browser.ts deleted file mode 100644 index cda7573b..00000000 --- a/sample-components/sampleComponent-rc7/src/main.browser.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; - -import { UniversalModule } from 'angular2-universal'; - -import { App } from './app/app'; -//for routing: -import {ClaimsAdminComponent} from './app/claimPages/claims/claimsAdmin.component'; -import { routing } from './app/app.routing'; -import {Routes, RouterModule} from "@angular/router"; - - - -import {Open} from './app/common/modal/open.component'; - -import {Alert} from './app/common/modal/alert'; -import {Loading} from './app/common/modal/loading.component'; -import {ClaimsComponent} from './app/claimPages/claims/claims.component'; -import {ClaimsService} from './app/services/claims.service'; -import {Claim} from './app/entities/claim'; -import {pagingFormatterNoLoad} from './app/common/pagingFormatterNoLoad.component'; - -import {ClaimEntityFormatter} from './app/common/claimEntityFormatter.component'; -import {PublicationTitleFormatter} from './app/common/publicationTitleFormatter.component'; -import {ProjectTitleFormatter} from './app/common/projectTitleFormatter.component'; -import {HomeComponent} from './app/home/home.component'; -export function main() { - @NgModule({ - bootstrap: [ App ], - declarations: [ App, ClaimsAdminComponent, ClaimsComponent, ClaimEntityFormatter,pagingFormatterNoLoad, Open, ProjectTitleFormatter, PublicationTitleFormatter,HomeComponent, Loading, Alert], - imports: [ - UniversalModule, - FormsModule, - routing - ], - - providers: [ ClaimsService ] - - }) - class MainModule { - } - return MainModule; -} diff --git a/sample-components/sampleComponent-rc7/src/main.node.ts b/sample-components/sampleComponent-rc7/src/main.node.ts deleted file mode 100644 index e5838609..00000000 --- a/sample-components/sampleComponent-rc7/src/main.node.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule, Component } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { UniversalModule } from 'angular2-universal'; - -import { App } from './app/app'; - -export function main(config) { - - @NgModule({ - bootstrap: [ App ], - declarations: [ App ], - imports: [ - UniversalModule.withConfig({ - document: config.document, - originUrl: 'http://localhost:3000', - baseUrl: '/', - requestUrl: '/', - // preboot: false, - preboot: { appRoot: ['app'], uglify: true }, - }), - FormsModule - ] - }) - class MainModule {} - - return MainModule -}; diff --git a/sample-components/sampleComponent-rc7/src/server.ts b/sample-components/sampleComponent-rc7/src/server.ts deleted file mode 100644 index 11c47e41..00000000 --- a/sample-components/sampleComponent-rc7/src/server.ts +++ /dev/null @@ -1,55 +0,0 @@ -// the polyfills must be the first thing imported in node.js -import 'angular2-universal-polyfills'; - -import * as path from 'path'; -import * as express from 'express'; -import * as bodyParser from 'body-parser'; -import * as cookieParser from 'cookie-parser'; - -// Angular 2 -import { enableProdMode } from '@angular/core'; -// Angular 2 Universal -import { createEngine } from 'angular2-express-engine'; - -// enable prod for faster renders -enableProdMode(); - -const app = express(); -const ROOT = path.join(path.resolve(__dirname, '..')); - -// Express View -import { main } from './main.node'; -app.engine('.html', createEngine({ main })); -app.set('views', __dirname); -app.set('view engine', 'html'); - -app.use(cookieParser('Angular 2 Universal')); -app.use(bodyParser.json()); - -// Serve static files -app.use('/assets', express.static(path.join(__dirname, 'assets'), {maxAge: 30})); -app.use(express.static(path.join(ROOT, 'dist/client'), {index: false})); - - -import { serverApi } from './backend/api'; -// Our API for demos only -app.get('/data.json', serverApi); - -// Routes with html5pushstate -// ensure routes match client-side-app -app.get('/', (req, res) => res.render('index', {req, res})); -app.get('/claims', (req, res) => res.render('index', {req, res})); -app.get('/home', (req, res) => res.render('index', {req, res})); - - -app.get('*', function(req, res) { - res.setHeader('Content-Type', 'application/json'); - var pojo = { status: 404, message: 'No Content' }; - var json = JSON.stringify(pojo, null, 2); - res.status(404).send(json); -}); - -// Server -let server = app.listen(process.env.PORT || 3000, () => { - console.log(`Listening on: http://localhost:${server.address().port}`); -}); diff --git a/sample-components/sampleComponent-rc7/src/typings.d.ts b/sample-components/sampleComponent-rc7/src/typings.d.ts deleted file mode 100644 index 1c62346c..00000000 --- a/sample-components/sampleComponent-rc7/src/typings.d.ts +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Custom Type Definitions - * When including 3rd party modules you also need to include the type definition for the module - * if they don't provide one within the module. You can try to install it with typings -typings install node --save - * If you can't find the type definition in the registry we can make an ambient definition in - * this file for now. For example -declare module "my-module" { - export function doesSomething(value: string): string; -} - * - * If you're prototying and you will fix the types later you can also declare it as type any - * -declare var assert: any; - * - * If you're importing a module that uses Node.js modules which are CommonJS you need to import as - * -import * as _ from 'lodash' - * You can include your type definitions in this file until you create one for the typings registry - * see https://github.com/typings/registry - * - */ - - -// Extra variables that live on Global that will be replaced by webpack DefinePlugin -declare var ENV: string; -declare var HMR: boolean; -interface GlobalEnvironment { - ENV; - HMR; -} - -interface WebpackModule { - hot: { - data?: any, - idle: any, - accept(dependencies?: string | string[], callback?: (updatedDependencies?: any) => void): void; - decline(dependencies?: string | string[]): void; - dispose(callback?: (data?: any) => void): void; - addDisposeHandler(callback?: (data?: any) => void): void; - removeDisposeHandler(callback?: (data?: any) => void): void; - check(autoApply?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void; - apply(options?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void; - status(callback?: (status?: string) => void): void | string; - removeStatusHandler(callback?: (status?: string) => void): void; - }; -} - -interface WebpackRequire { - context(file: string, flag?: boolean, exp?: RegExp): any; -} - - -interface ErrorStackTraceLimit { - //stackTraceLimit: number; - stackTraceLimit(limit: number): void -} - - -// Extend typings -interface NodeRequire extends WebpackRequire {} -interface ErrorConstructor extends ErrorStackTraceLimit {} -interface NodeModule extends WebpackModule {} -interface Global extends GlobalEnvironment {} - - -interface Thenable { - then( - onFulfilled?: (value: T) => U | Thenable, - onRejected?: (error: any) => U | Thenable): Thenable; - then( - onFulfilled?: (value: T) => U | Thenable, - onRejected?: (error: any) => void): Thenable; - catch(onRejected?: (error: any) => U | Thenable): Thenable; -} diff --git a/sample-components/sampleComponent-rc7/tsconfig.json b/sample-components/sampleComponent-rc7/tsconfig.json deleted file mode 100644 index 96d822e5..00000000 --- a/sample-components/sampleComponent-rc7/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "declaration": false, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "module": "commonjs", - "moduleResolution": "node", - "outDir": "dist", - "sourceMap": true, - "sourceRoot": "src", - "target": "es5", - "lib": ["es6", "dom"] - }, - "exclude": [ - "node_modules" - ], - "compileOnSave": false, - "buildOnSave": false, - "atom": { "rewriteTsconfig": false } -} diff --git a/sample-components/sampleComponent-rc7/webpack.config.ts b/sample-components/sampleComponent-rc7/webpack.config.ts deleted file mode 100644 index b3aae5bb..00000000 --- a/sample-components/sampleComponent-rc7/webpack.config.ts +++ /dev/null @@ -1,102 +0,0 @@ -var webpack = require('webpack'); -var path = require('path'); -var resolveNgRoute = require('@angularclass/resolve-angular-routes'); - - -var commonConfig = { - resolve: { - extensions: ['', '.ts', '.js', '.json'] - }, - module: { - preLoaders: [ - ], - loaders: [ - // TypeScript - { test: /\.ts$/, loaders: ['ts-loader', 'angular2-template-loader'] }, - { test: /\.html$/, loader: 'raw-loader' }, - { test: /\.css$/, loader: 'raw-loader' }, - { test: /\.json$/, loader: 'raw-loader' } - ], - }, - plugins: [ - new webpack.ContextReplacementPlugin( - // The (\\|\/) piece accounts for path separators in *nix and Windows - /angular(\\|\/)core(\\|\/)src(\\|\/)linker/, - root('./src'), - resolveNgRoute(root('./src')) - ) - ] - -}; - - -var clientConfig = { - target: 'web', - entry: './src/client', - output: { - path: root('dist/client') - }, - node: { - global: true, - __dirname: true, - __filename: true, - process: true, - Buffer: false - } -}; - - -var serverConfig = { - target: 'node', - entry: './src/server', // use the entry file of the node server if everything is ts rather than es5 - output: { - path: root('dist/server'), - libraryTarget: 'commonjs2' - }, - externals: checkNodeImport, - node: { - global: true, - __dirname: true, - __filename: true, - process: true, - Buffer: true - } -}; - - - -// Default config -var defaultConfig = { - context: __dirname, - resolve: { - root: root('/src') - }, - output: { - publicPath: path.resolve(__dirname), - filename: 'index.js' - } -} - - - -var webpackMerge = require('webpack-merge'); -module.exports = [ - // Client - webpackMerge({}, defaultConfig, commonConfig, clientConfig), - - // Server - webpackMerge({}, defaultConfig, commonConfig, serverConfig) -] - -// Helpers -function checkNodeImport(context, request, cb) { - if (!path.isAbsolute(request) && request.charAt(0) !== '.') { - cb(null, 'commonjs ' + request); return; - } - cb(); -} - -function root(args) { - args = Array.prototype.slice.call(arguments, 0); - return path.join.apply(path, [__dirname].concat(args)); -}