[develop]: Add release script and command in order to create zip. Add banner in app component. Update version to 1.0.0

This commit is contained in:
Konstantinos Triantafyllou 2024-06-26 14:46:18 +03:00
parent 0f7500daea
commit f7302ff615
5 changed files with 50 additions and 14 deletions

View File

@ -14,6 +14,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- *Fixed (for any bug fixes)* - *Fixed (for any bug fixes)*
- *Security (in case of vulnerabilities)* - *Security (in case of vulnerabilities)*
## v1.0.0 - 26.06.2024 - Official Release
### Added
Add banner for announcements. Disabled by default.
Add guide text in researcher search bar for more accurate results.
### Removed
Remove final release text from footer.
### Changed
Improvements in User Interface of browse RPOs/RFOs pages.
## v0.1.5 - 19.6.2024 ## v0.1.5 - 19.6.2024
### Added ### Added
Add open access indicator in browse pages. Add open access indicator in browse pages.
@ -125,7 +136,7 @@ Improve performance in search pages.
* Add info floating button to all pages and link to terminology page. * Add info floating button to all pages and link to terminology page.
### Changed ### Changed
* Change OA Routed to Access Routes. * Change OA Routes to Access Routes.
* Make contact-us full screen modal. * Make contact-us full screen modal.
* Move floating message button to root components. * Move floating message button to root components.

View File

@ -1,6 +1,6 @@
{ {
"name": "irish-monitor", "name": "irish-monitor",
"version": "0.1.5", "version": "1.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --port 5500 --disable-host-check --host 0.0.0.0", "start": "ng serve --port 5500 --disable-host-check --host 0.0.0.0",
@ -15,7 +15,8 @@
"build:ssr-beta": "npm run build-beta && ng run irish-monitor:server:beta", "build:ssr-beta": "npm run build-beta && ng run irish-monitor:server:beta",
"build:ssr-prod": "npm run build-prod && ng run irish-monitor:server:production", "build:ssr-prod": "npm run build-prod && ng run irish-monitor:server:production",
"prerender": "ng run irish-monitor:prerender", "prerender": "ng run irish-monitor:prerender",
"after-build-clean": "rm -rf dist/irish-monitor/browser/assets/common-assets/.git src/app/openaireLibrary/.git node_modules .angular src/assets/common-assets/.git .git" "release": "chmod +x release.sh && ./release.sh",
"after-build-clean": "rm -rf release.sh .vscode dist/irish-monitor/browser/assets/common-assets/.git* src/app/openaireLibrary/.git* node_modules .angular src/assets/common-assets/.git* .git*"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {

16
release.sh Executable file
View File

@ -0,0 +1,16 @@
rm -f release.zip
git clone https://code-repo.d4science.org/MaDgIK/irish-monitor.git
cd irish-monitor
git checkout master
git submodule update --init --recursive
cd src/app/openaireLibrary
git checkout master
cd ../../assets/common-assets
git checkout master
cd ../openaire-theme
git checkout master
cd ../../../
npm run after-build-clean
cd ../
zip -r release.zip irish-monitor
rm -rf irish-monitor

View File

@ -16,11 +16,15 @@ import {SearchOrcidService} from "./openaireLibrary/claims/claim-utils/service/s
import {SearchResearchResultsService} from "./openaireLibrary/services/searchResearchResults.service"; import {SearchResearchResultsService} from "./openaireLibrary/services/searchResearchResults.service";
import {Identifier} from "./openaireLibrary/utils/string-utils.class"; import {Identifier} from "./openaireLibrary/utils/string-utils.class";
import {ConnectHelper} from "./openaireLibrary/connect/connectHelper"; import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
import {HelperService} from "./openaireLibrary/utils/helper/helper.service";
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
template: ` template: `
<div class="uk-background-default"> <div class="uk-background-default">
<div *ngIf="divContents['banner']" class="uk-tile uk-tile-default uk-padding uk-border-bottom">
<helper [texts]="divContents['banner']"></helper>
</div>
<navbar *ngIf="hasHeader" portal="irish_monitor" [menuItems]="menuItems" [showMenu]="true" <navbar *ngIf="hasHeader" portal="irish_monitor" [menuItems]="menuItems" [showMenu]="true"
[header]="header" [user]="user" [userMenuItems]="userMenuItems"></navbar> [header]="header" [user]="user" [userMenuItems]="userMenuItems"></navbar>
<div *ngIf="loading"> <div *ngIf="loading">
@ -43,12 +47,11 @@ import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
<footer id="bottom" class="uk-text-center uk-text-small uk-border-top"> <footer id="bottom" class="uk-text-center uk-text-small uk-border-top">
<div class="uk-tile-default"> <div class="uk-tile-default">
<div class="uk-section uk-container"> <div class="uk-section uk-container">
<div class="uk-flex uk-flex-middle uk-flex-center"> <div class="uk-flex uk-flex-middle uk-flex-center uk-margin-medium-bottom">
<img src="assets/logo/small.svg" alt="National Open Access Monitor Ireland" style="width: 40px;"/> <img src="assets/logo/small.svg" alt="National Open Access Monitor Ireland" style="width: 40px;"/>
<div class="uk-margin-small-left"> <div class="uk-margin-small-left">
Platform in <span class="uk-text-bold">Pilot</span> Phase - Final Release June 2024 Platform in <span class="uk-text-bold">Pilot</span> Phase
</div> </div>
</div> </div>
<div class="uk-margin-medium-bottom"> <div class="uk-margin-medium-bottom">
<a href="https://graph.openaire.eu" target="_blank" class="uk-width-1-1 uk-width-auto@m"> <a href="https://graph.openaire.eu" target="_blank" class="uk-width-1-1 uk-width-auto@m">
@ -103,6 +106,7 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
compactMenuItems: boolean = false; compactMenuItems: boolean = false;
hasHelpPopUp: boolean = true; hasHelpPopUp: boolean = true;
isBottomIntersecting: boolean = false; isBottomIntersecting: boolean = false;
divContents: any;
constructor(protected _route: ActivatedRoute, constructor(protected _route: ActivatedRoute,
protected _router: Router, protected _router: Router,
@ -113,12 +117,11 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
private customFilterService: CustomFilterService, private customFilterService: CustomFilterService,
private userManagementService: UserManagementService, private userManagementService: UserManagementService,
private userProfileService: UserProfileService, private userProfileService: UserProfileService,
private helper: HelperService,
protected _searchOrcidService: SearchOrcidService, protected _searchOrcidService: SearchOrcidService,
protected _searchResearchResultsService: SearchResearchResultsService protected _searchResearchResultsService: SearchResearchResultsService
) { ) {
super(); super();
// this.configurationService.initStaticPortal(this.irish.portal);
// this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
this.setProperties(this.properties.adminToolsCommunity, this.properties.adminToolsPortalType); this.setProperties(this.properties.adminToolsCommunity, this.properties.adminToolsPortalType);
this.userManagementService.fixRedirectURL = this.properties.afterLoginRedirectLink; this.userManagementService.fixRedirectURL = this.properties.afterLoginRedirectLink;
this.userManagementService.allowDoubleRedirectToFixAndCurrentPage = true; this.userManagementService.allowDoubleRedirectToFixAndCurrentPage = true;
@ -170,6 +173,7 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
} }
this.initialize(); this.initialize();
})); }));
this.getDivContents();
} }
ngAfterViewInit() { ngAfterViewInit() {
@ -289,6 +293,12 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
} }
} }
private getDivContents() {
this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'irish', '/').subscribe(contents => {
this.divContents = contents;
}));
}
setProperties(id, type = null) { setProperties(id, type = null) {
this.properties.adminToolsCommunity = id; this.properties.adminToolsCommunity = id;
if (type) { if (type) {
@ -307,10 +317,6 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
this.windowWidth = window.innerWidth; this.windowWidth = window.innerWidth;
let mBreakpoint = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--uk-breakpoint-m')); let mBreakpoint = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--uk-breakpoint-m'));
let xlBreakpoint = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--uk-breakpoint-xl')); let xlBreakpoint = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--uk-breakpoint-xl'));
if(this.windowWidth > mBreakpoint && this.windowWidth <= xlBreakpoint) { this.compactMenuItems = this.windowWidth > mBreakpoint && this.windowWidth <= xlBreakpoint;
this.compactMenuItems = true;
} else {
this.compactMenuItems = false;
}
} }
} }

View File

@ -20,6 +20,7 @@ import {SearchOrcidServiceModule} from "./openaireLibrary/claims/claim-utils/ser
import {HelpPopUpModule} from './shared/help-pop-up/help-pop-up.module'; import {HelpPopUpModule} from './shared/help-pop-up/help-pop-up.module';
import {RouteReuseStrategy} from '@angular/router'; import {RouteReuseStrategy} from '@angular/router';
import {CustomRouteReuseStrategy} from './openaireLibrary/shared/custom-route-reuse-strategy'; import {CustomRouteReuseStrategy} from './openaireLibrary/shared/custom-route-reuse-strategy';
import {HelperModule} from "./openaireLibrary/utils/helper/helper.module";
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -38,7 +39,8 @@ import {CustomRouteReuseStrategy} from './openaireLibrary/shared/custom-route-re
CookieLawModule, CookieLawModule,
SearchResearchResultsServiceModule, SearchResearchResultsServiceModule,
SearchOrcidServiceModule, SearchOrcidServiceModule,
HelpPopUpModule HelpPopUpModule,
HelperModule
], ],
providers: [ providers: [
SearchOrcidService, SearchOrcidService,