MaDgIK
/
aggregator
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

[Aggregator | new-theme]: Updated uikit paths | Re-added <app-root> in index.html | Removed RootMenuItem. 

1. app.component.ts: Removed deprecated RootMenuItem and used MenuItem instead.
2. index.html: [Bug fix] Re-added <app-root> which was accidentally deleted in previous commit.
3. package.json: Added in dependencies "uikit": "3.12.0".
4. angular.json: Updated uikit paths in scripts, to get them from node_modules.
This commit is contained in:
Konstantina Galouni 2022-09-21 01:05:21 +03:00
parent f5968ca7b5
commit 9b22660e8a
6 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
angular.json
View File

@ -50,8 +50,8 @@
"src/material.scss" "src/material.scss"
], ],
"scripts": [ "scripts": [
"src/assets/openaire-theme/js/uikit.min.js", "node_modules/uikit/dist/js/uikit.min.js",
"src/assets/openaire-theme/js/uikit-icons.min.js", "node_modules/uikit/dist/js/uikit-icons.min.js",
"node_modules/jquery/dist/jquery.js" "node_modules/jquery/dist/jquery.js"
] ]
}, },

1
package.json
View File

@ -43,6 +43,7 @@
"rxjs": "^6.5.1", "rxjs": "^6.5.1",
"ts-md5": "^1.2.0", "ts-md5": "^1.2.0",
"tslib": "^2.0.0", "tslib": "^2.0.0",
"uikit": "3.12.0",
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {

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

@ -1,6 +1,6 @@
import {Component, Inject, RendererFactory2, ViewEncapsulation} from '@angular/core'; import {Component, Inject, RendererFactory2, ViewEncapsulation} from '@angular/core';
import {EnvProperties} from './openaireLibrary/utils/properties/env-properties'; import {EnvProperties} from './openaireLibrary/utils/properties/env-properties';
import {MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu'; import {MenuItem} from './openaireLibrary/sharedComponents/menu';
import {AggregatorInfo, PortalAggregators} from "./utils/aggregators"; import {AggregatorInfo, PortalAggregators} from "./utils/aggregators";
import {UserManagementService} from "./openaireLibrary/services/user-management.service"; import {UserManagementService} from "./openaireLibrary/services/user-management.service";
import {User} from "./openaireLibrary/login/utils/helper.class"; import {User} from "./openaireLibrary/login/utils/helper.class";
@ -45,7 +45,7 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields"
}) })
export class AppComponent { export class AppComponent {
isClient: boolean = false; isClient: boolean = false;
menuItems: RootMenuItem [] = []; menuItems: MenuItem [] = [];
userMenuItems: MenuItem[] = []; userMenuItems: MenuItem[] = [];
community = null; community = null;
id: string = null; id: string = null;
@ -120,24 +120,17 @@ export class AppComponent {
private buildMenu() { private buildMenu() {
this.menuItems = [ this.menuItems = [
{rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []}, new MenuItem("home", "Home", "", "/", false, [], null, {}),
{ new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}), new MenuItem("deposit", "Deposit", "", "/participate/deposit/learn-how", false, [], ["/participate/deposit/learn-how"], {}),
items: [] new MenuItem("link", "Link", "", "/participate/claim", false, [], ["/participate/claim"], {},
}, null, null, null, null, "_blank", "internal", false,
{ [
rootItem: new MenuItem("deposit", "Deposit", "", "/participate/deposit/learn-how", false, [], ["/participate/deposit/learn-how"], {}), new MenuItem("", "Start linking", "", "/participate/claim", false, [], ["/participate/claim"], {}),
items: [] new MenuItem("", "Learn more", this.properties.claimsInformationLink, "", false, [], [], {})
}, ]
{ ),
rootItem: new MenuItem("link", "Link", "", "/participate/claim", false, [], ["/participate/claim"], {}), new MenuItem("develop", "Develop", "", "/develop", false, [], ["/develop"], {}),
items: [new MenuItem("", "Start linking", "", "/participate/claim", false, [], ["/participate/claim"], {}),
new MenuItem("", "Learn more", this.properties.claimsInformationLink, "", false, [], [], {})]
},
{
rootItem: new MenuItem("develop", "Develop", "", "/develop", false, [], ["/develop"], {}),
items: []
}
]; ];
let params = {}; let params = {};
// params[this.agg.queryFieldName] = this.agg.valueId; // params[this.agg.queryFieldName] = this.agg.valueId;

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 1e3c9d7cba92176af8a8d45f500bdaa97e1cdebc Subproject commit 4cec2907da5e1bf55cf59930c23dd9a45c569b89

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit eb5739ab8271aa71c8e58998ab88c61878f8788d Subproject commit f085a90973b216b89065848dba864e2d581acc84

3
src/index.html
View File

@ -44,6 +44,9 @@
</head> </head>
<body> <body>
<div class="uk-badge" style="border: 0px; border-radius: 0px; background-color: #bc2300 !important; position: absolute; z-index: 1000;">Beta instance</div> <div class="uk-badge" style="border: 0px; border-radius: 0px; background-color: #bc2300 !important; position: absolute; z-index: 1000;">Beta instance</div>
<div class="uk-offcanvas-content uk-height-viewport">
<app-root></app-root>
</div>
</body> </body>
<script type="text/javascript"> <script type="text/javascript">
function loadAltmetrics(e,t,n){ function loadAltmetrics(e,t,n){