-
-
-
-
+
- `,
- styleUrls: ['manage-communities.component.css']
+ `
})
export class ManageCommunitiesComponent implements OnInit, OnDestroy {
public properties: EnvProperties = properties;
public communities: CommunityInfo[] = [];
- public filteredCommunities: CommunityInfo[] = [];
+ public filteredCommunities: CommunityInfo[] = [];
public ris: CommunityInfo[] = [];
- public filteredRis: CommunityInfo[] = [];
+ public filteredRis: CommunityInfo[] = [];
public loading: boolean;
public user: User;
+ public stickyPageHeader: boolean = false;
public tab: Tab = "all";
private subscriptions: any[] = [];
- public communitySearchUtils: SearchUtilsClass = new SearchUtilsClass();
- public errorCodes: ErrorCodes;
-
- // Search
- @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent;
- filterForm: FormGroup;
- private searchText: string = '';
- public keyword: string = '';
+ public communitySearchUtils: SearchUtilsClass = new SearchUtilsClass();
+ public errorCodes: ErrorCodes;
+ // Search
+ @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent;
+ filterForm: FormGroup;
+ private searchText: string = '';
- constructor(private route: ActivatedRoute,
- private _fb: FormBuilder,
+ constructor(private route: ActivatedRoute,
+ private _fb: FormBuilder,
private communitiesService: CommunitiesService,
private title: Title,
private userManagementService: UserManagementService) {
- this.errorCodes = new ErrorCodes();
+ this.errorCodes = new ErrorCodes();
this.communitySearchUtils.status = this.errorCodes.LOADING;
}
ngOnInit() {
- this.communitySearchUtils.keyword = "";
-
+ this.communitySearchUtils.keyword = "";
+
this.filterForm = this._fb.group({
keyword: [''],
});
-
- this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => {
- this.searchText = value.toLowerCase();
- this.applyFilters();
+
+ this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => {
+ this.searchText = value ? value.toLowerCase() : '';
+ this.applyFilters();
}));
-
+
this.loading = true;
this.title.setTitle('Administrator Dashboard | Manage Communities');
this.subscriptions.push(this.route.fragment.subscribe((fragment: Tab) => {
@@ -151,22 +161,21 @@ export class ManageCommunitiesComponent implements OnInit, OnDestroy {
this.subscriptions.push(this.communitiesService.getCommunities(this.properties, this.properties.communityAPI + 'communities').subscribe(
communities => {
this.communities = [];
- this.filteredCommunities = [];
+ this.filteredCommunities = [];
this.ris = [];
- this.filteredRis = [];
+ this.filteredRis = [];
communities.forEach(community => {
if (Session.isPortalAdministrator(this.user) || Session.isCommunityCurator(this.user) || Session.isManager('community', community.communityId, this.user)) {
if (community.type === 'community') {
this.communities.push(community);
- this.filteredCommunities.push(community);
+ this.filteredCommunities.push(community);
} else {
this.ris.push(community);
- this.filteredRis.push(community);
+ this.filteredRis.push(community);
}
}
})
this.loading = false;
- this.keyword = '';
}));
}
}));
@@ -198,16 +207,16 @@ export class ManageCommunitiesComponent implements OnInit, OnDestroy {
return false;
}
}
-
- public applyFilters() {
+
+ public applyFilters() {
this.filteredCommunities = this.communities.filter(community => community.shortTitle.toLowerCase().includes(this.searchText) || community.title.toLowerCase().includes(this.searchText) || community.communityId.toLowerCase().includes(this.searchText));
- this.filteredRis = this.ris.filter(community => community.shortTitle.toLowerCase().includes(this.searchText) || community.title.toLowerCase().includes(this.searchText) || community.communityId.toLowerCase().includes(this.searchText));
+ this.filteredRis = this.ris.filter(community => community.shortTitle.toLowerCase().includes(this.searchText) || community.title.toLowerCase().includes(this.searchText) || community.communityId.toLowerCase().includes(this.searchText));
}
-
- public onSearchClose() {
+
+ public onSearchClose() {
this.communitySearchUtils.keyword = this.filterForm.get('keyword').value;
}
-
+
public resetInput() {
this.communitySearchUtils.keyword = null;
this.searchInputComponent.reset()
diff --git a/src/assets/common-assets b/src/assets/common-assets
index ee3a9a4..752859b 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit ee3a9a4868bbdeb26d7a9c5ed15dbf8b2b765b39
+Subproject commit 752859b10d3e110fdc9a4360bb7cb005ef6225ed
diff --git a/src/assets/css/connect-custom.css b/src/assets/css/connect-custom.css
deleted file mode 100644
index 5a33499..0000000
--- a/src/assets/css/connect-custom.css
+++ /dev/null
@@ -1,121 +0,0 @@
-:root {
- --portal-main-color: #FECA1D;
- --portal-main-contrast: #FFFFFF;
- --portal-dark-color: #b48536;
- --primary-color: var(--theme-secondary-color);
- --secondary-color: var(--theme-secondary-color);
-}
-
-.tm-toolbar .uk-subnav-line .custom-connect-li, .tm-toolbar .uk-subnav-line .custom-connect-admin-li {
- display: block;
- background: #DEAF50 !important;
- color: #fff !important;
-
-}
-
-.custom-connect-toolbar ul.uk-subnav.uk-subnav-line, .custom-connect-admin-toolbar ul.uk-subnav.uk-subnav-line {
- background-color: #FFC700 !important;
-}
-
-.custom-connect-toolbar .inner, .custom-connect-admin-toolbar .inner {
- background-color: #FFC700 !important;
-}
-
-.custom-connect-toolbar, .custom-connect-admin-toolbar {
- border-top-color: #FFC700 !important;
-}
-
-.red_color {
- color: #FF3030;
-}
-
-.red_background_color:hover {
- background-color: #FF3030;
- border-color: #FF3030;
- color: #767779 !important;
-}
-
-.green_color {
- color: lightgreen;
-}
-
-.green_background_color:hover {
- background-color: lightgreen;
- border-color: lightgreen;
- color: #767779 !important;
-}
-
-.wellcomePage {
- background: transparent linear-gradient(0deg, #FAFAFA 0%, #E2EEFA 100%) 0 0 no-repeat padding-box;
- min-height: calc(100vh - 412.767px);
-}
-
-.iframeContainer {
- overflow: hidden;
-
-}
-
-.iframeContainer iframe {
-
- width: 100%;
- height: 100%;
- border: 0;
-}
-
-/*Customization*/
-
-.customizationMenuPanel {
- /*background-color: #999999;*/
-}
-
-.customizationMenuPanel .customizationMenuItems {
- background-color: white;
- border: white solid 1px;
- border-radius: 14px;
-}
-/*#colorPickerInput {
- width: 15px;
- height: 15px;
- border: 1px solid #707070;
- border-radius: 50%;
- opacity: 1;
- cursor:pointer;
-
-}*/
-
-.colorPicker input {
- width: 35px;
- height: 15px;
- border: 1px solid #707070;
- border-radius: 2px;
- opacity: 1;
- cursor:pointer;
-}
-
-/* NEW CSS*/
-.login circle {
- fill: var(--primary-color);
-}
-
-.login:hover circle {
- fill: var(--secondary-color);
-}
-
-#sidebar_main .sidebar_main_header .portal-logo {
- background: url("/assets/common-assets/logo-large-connect.png") no-repeat;
- background-size: contain;
-}
-
-.sidebar_mini #sidebar_main .sidebar_main_header .portal-logo {
- background: url("/assets/common-assets/logo-small-connect.png") no-repeat;
- background-size: contain;
-}
-
-#sidebar_main #sidebar_content {
- border-right: 1px solid var(--portal-main-color);
-}
-
-#sidebar_switcher_toggle {
- border: 1px solid var(--portal-main-color);
- border-left: 0;
-}
diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme
index 5d7edb0..635d56f 160000
--- a/src/assets/dashboard-theme
+++ b/src/assets/dashboard-theme
@@ -1 +1 @@
-Subproject commit 5d7edb030d589492011316208ee45a1d2c54e764
+Subproject commit 635d56f198026c2d24a923ad58b813254591fa33
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index b2911ee..ec73c67 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit b2911eeaaf5f1a04a55353a3df5bf4d42a5fa7ca
+Subproject commit ec73c67c591eca9fe68f7a6c6f65ce4332852b2f
diff --git a/src/deprecated.css b/src/deprecated.css
new file mode 100644
index 0000000..84ce55b
--- /dev/null
+++ b/src/deprecated.css
@@ -0,0 +1,4 @@
+@import "assets/openaire-theme/css/structure/variables.css";
+@import "assets/openaire-theme/css/openaire.css";
+@import "assets/common-assets/library.css";
+@import "assets/dashboard-theme/main.css";
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index be0e788..622a654 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -6,7 +6,6 @@ export let properties: EnvProperties = {
adminToolsPortalType: "community",
enablePiwikTrack: false,
useCache: false,
- metricsAPIURL: "https://beta.services.openaire.eu/usagestats/",
framesAPIURL: "https://beta.openaire.eu/stats3/",
claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 3059466..afcfe95 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -6,7 +6,6 @@ export let properties: EnvProperties = {
adminToolsPortalType: "community",
enablePiwikTrack: false,
useCache: false,
- metricsAPIURL: "https://services.openaire.eu/usagestats/",
framesAPIURL: "https://www.openaire.eu/stats3/",
claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/",
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 641e667..fc7dfe2 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -11,7 +11,6 @@ export let properties: EnvProperties = {
adminToolsPortalType: "community",
enablePiwikTrack: false,
useCache: false,
- metricsAPIURL: 'https://beta.services.openaire.eu/usagestats/',
framesAPIURL: 'https://beta.openaire.eu/stats3/',
claimsAPIURL: 'http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/',
statisticsAPIURL: 'https://beta.services.openaire.eu/stats-api/',
diff --git a/src/index.html b/src/index.html
index 62500c7..02ef4da 100644
--- a/src/index.html
+++ b/src/index.html
@@ -22,9 +22,6 @@
-
-
-
diff --git a/src/material.scss b/src/material.scss
deleted file mode 100644
index b5fe85b..0000000
--- a/src/material.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@import '~@angular/material/theming';
-@include mat-core();
-$primary-color: (
- 0: var(--primary-color),
- contrast: (
- 50: var(--contrast-color)
- )
-);
-$secondary-color: (
- 0: var(--secondary-color),
- contrast: (
- 50: var(--contrast-color)
- )
-);
-$my-app-primary: mat-palette($primary-color, 0);
-$my-app-accent: mat-palette($secondary-color, 0);
-$my-app-theme: mat-light-theme($my-app-primary, $my-app-accent);
-
-@include angular-material-theme($my-app-theme);
-
-.cdk-global-overlay-wrapper, .cdk-overlay-container {
- z-index: 9999!important;
-}
diff --git a/src/styles.css b/src/styles.css
deleted file mode 100644
index b435524..0000000
--- a/src/styles.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* You can add global styles to this file, and also import other style files */
-@import "assets/common-assets/common/theme.css";
-@import "assets/common-assets/common/custom.css";
-@import "assets/common-assets/library.css";
-@import "assets/dashboard-theme/main.css";
-@import "assets/css/connect-custom.css";
diff --git a/src/styles.less b/src/styles.less
new file mode 100644
index 0000000..9cf5f1d
--- /dev/null
+++ b/src/styles.less
@@ -0,0 +1,2 @@
+/* You can add global styles to this file, and also import other style files */
+@import "~src/assets/openaire-theme/less/_import";
+