Commit Graph

89 Commits

Author SHA1 Message Date
argirok dccf62d445 Update Abstract to be an array - fix issue with B2Find missing information 2022-02-14 17:04:09 +02:00
Konstantina Galouni ae970394e9 [Library]: resultLanding.component.html & result-preview.component.html: [Bug fix] In accessmode label added class "uk-text-truncate" to cut text and show ellipsis when larger that the available space. 2022-01-07 18:35:45 +02:00
Konstantina Galouni e1c520d65f [Library]: Altmetrics bug fix (more checks for previous commit) (from landing page with identifiers to landing page without: ERROR) | Updated parsing of relations in result landing page #7231.
1. result-preview.component.ts: Display relationName (added in beforeTitlte).
2. resultLandingInfo.ts: Added field "relatedResults" (replaced other structures for relations) and "relatedClassFilters".
3. resultLanding.component.html:
	a. In tab "Related research" show all relations.
	b. [Bug fix] Added check when accessing resultLandingInfo.identifiers for altmetrics.
4. resultLanding.module.ts: Import MatFormFieldModule and MatSelectModule for filtering relations in tab which shows all relations.
5. result-preview.ts:
	a. Added in class RelationResult "percentageName" (e.g. trust) and "relationName" (e.g. IsSupplementedBy) fields.
	b. Added in class ResultPreview "relationName" field (e.g. IsSupplementedBy).
	c. In method "relationResultConvert()", removed "relation" from parameters (included in RelationResult).
6. resultLanding.service.ts:
	a. Updated parsing of relations (parse all relations for research results).
	b. Updated sorting of relations.
7. resultLanding.component.ts: Handle updated relations and show them in one tab all together.
8. parsingFunctions.class.ts: Updated parsing of relations - parse all relations for results and keep the relationName and the percentageName.
2022-01-07 12:16:23 +02:00
Alex Martzios 55f7167fb4 Change relatedTo and fundedBy component to match new mock - add dashboard links on resultLanding page 2021-11-23 10:44:36 +02:00
Alex Martzios cf08054ab5 connect links component visible only for dev enviroment 2021-11-11 12:11:45 +02:00
Alex Martzios cd3558f134 Modify component for the new connect gateway links card 2021-11-08 17:24:32 +02:00
argirok f854849462 Merge remote-tracking branch 'origin/master' 2021-10-06 16:24:23 +03:00
argirok a3299a3fe5 update urls for enermaps 2021-10-06 16:23:57 +03:00
Konstantina Galouni 532be0e568 [Trunk | Explore]: 1. assets/common-assets: Added "eosc-logo.png" & deleted "egi-fed.notebook.png". 2. resultLanding.component.ts: Removed local styles for "notebook-button" class. 3. resultLanding.component.html: Logo and name of button for egi notebook updated. 4. parsingFunctions.class.ts: When "eosc jupyter notebook" is in subjects, show as classified subject (vocabulary) "EOSC: EOSC Jupyter Notebook" [Paolo's request]. 2021-09-29 14:34:03 +03:00
Konstantina Galouni 3e3379d038 [Trunk | Explore]: 1. parsingFunctions.class.ts: created field "notebookKeyword" to be compared with subjects. 2. resultLanding.component.html: Property "egiNotebookLink" is used for Notebook button on top right section. 3. env-properties.ts: Added property "egiNotebookLink". 4. environment.beta.ts & environment.ts: Added property "egiNotebookLink". 2021-09-27 12:14:17 +03:00
Konstantina Galouni ef8c330f7c [Library | Trunk]: 1. showSubjects.component.ts: Nothing but aligning code 2. parsingFunctions.class.ts: Added field "notebookInSubjects", which is set to true when "notebook" is included in subjects. 3. resultLandingInfo.ts: [New] "showEgiNotebookButton" property added. 4. resultLanding.service.ts: Set resultLandingInfo.showEgiNotebookButton. 5. resultLanding.component.html: Added Egi Notebook button on top right section of page (for beta Explore only). 6. resultLanding.component.ts: Added styles (background color) for new class "notebook-button". 2021-09-23 17:49:41 +03:00
argirok 9d65eaab72 update metrics API: use the new stats tool for both numbers & charts 2021-09-08 15:21:30 +03:00
Konstantina Galouni d7c7a18f51 [Connect]: 1. resultLanding.service.ts: Enermaps details as string. 2. resultLanding.component.html: In enermaps details, show "words" starting with "http://" or "https://" as links. 2021-08-23 17:55:30 +03:00
argirok f51e47afa0 SEO - accessibility: more changes for accessibility, new manifest file 2021-08-11 13:59:50 +03:00
argirok 3d413cde2d SEO - accessibility: In images add alt, add specific width and height, in links add <span class="visually-hidden"></span> with descriptive text - not visible (add class in library.css) 2021-08-10 13:46:33 +03:00
k.triantafyllou 08bf703186 [Library]: Move angular 11 to trunk. Remove no needed files. Delete angular upgrade branches
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61381 d315682c-612b-4755-9ff5-7f18f6832af3
2021-07-14 11:19:57 +00:00
konstantina.galouni d79a202ed7 [Trunk | Library]: resultLanding.component.html: Added "uk-animation-fade" in enermaps details.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61030 d315682c-612b-4755-9ff5-7f18f6832af3
2021-05-20 14:11:35 +00:00
konstantina.galouni ac8381b004 [Trunk | Library]:
1. src/app/openaireLibrary/orcid/orcid-work.component.ts: [Bug fix] On ngOnInit() method, call getPutCode, only if(!this.givenPutCode && this.isLoggedIn).
2. src/app/openaireLibrary/utils/properties/env-properties.ts: Added field "enermapsAPIURL?: string".
3. src/app/openaireLibrary/utils/tabs/contents/search-tab.component.ts: Added <ng-content></ng-content> on top of <search-result>.
4. src/app/openaireLibrary/landingPages/project/project.component.html: Moved alert inside <search-tab> (was before it).
5. src/app/openaireLibrary/landingPages/result/resultLanding.service.ts: Added methods "getEnermapsDetails()" and "parseEnermapsDetails()" (hide "shared_id").
6. src/app/openaireLibrary/landingPages/result/resultLanding.component.ts: Added fields and methods to get enermpas details (only when properties.enermapsAPIURL is set).
7. src/app/openaireLibrary/landingPages/result/resultLanding.component.html: 
	a. [Bug fix] Capitalize first letter of title in "References" tab (in small tabs).
	b. When clicking on tab, call (selectedActiveTab)="onSelectActiveTab($event)".
	c. If available, show uk-list with enermaps details (key-value pairs).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61021 d315682c-612b-4755-9ff5-7f18f6832af3
2021-05-19 09:36:09 +00:00
konstantina.galouni a45915230c [Trunk | Library]: resultLanding.component.html & result-preview.component.html: [Bug fix] Remove check "&& properties.environment != 'production')" when "properties.adminToolsPortalType == 'community'".
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60939 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-21 11:09:40 +00:00
argiro.kokogiannaki 635df208d8 [Library|Trunk]
SEO: use canonical url for jsonld in result/organization landing



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60854 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-13 12:52:58 +00:00
k.triantafyllou 7533e7d3ff [Library | Trunk]: PIDs add title, fix truncate on 2 lines. Remove input properties
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60852 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-13 12:33:40 +00:00
argiro.kokogiannaki 8cdeb0e9ca [Library|Trunk]
Orcid: add orcid button also for community dashboards


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60837 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-12 13:43:33 +00:00
argiro.kokogiannaki a8a8ba4016 [Library|Trunk]
Metrics:
  add back the Openaire views

SEO:
 - Landing: encode pid in canonical url
 - result preview: single encoding in pid url

Enermaps Integration:
 - update landing tab
 - update look for tool url



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60826 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-09 15:39:42 +00:00
argiro.kokogiannaki e6d0721fb8 [Library|Trunk]
Tabs: 
 - use CustomClass directive instead of statistics
 - update it  in landing pages

Enermaps Integration:
 - Result LAnding at a new tab with enermaps tool
 - Image on the left of the result preview component



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60814 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-08 10:50:11 +00:00
argiro.kokogiannaki 3ef2e0168d [Library|Trunk]
Enermaps integration:
- parse enermaps id
- show in results and in landing (to be revised)
- add enermaps url property
- add function to query all results for community id/ context




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60783 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-02 09:17:00 +00:00
konstantina.galouni 127c489da4 [Trunk | Library]:
1. resultLanding.component.html & result-preview.component.html: Show orcid buttons in all environments (production too) | in <orcid-work> added "resultTitle" property.
2. myOrcidLinks.component.ts: Added "getPersonalDetails()" method and link to advanced research outcomes page, filtered by user's name (if personal details from ORCID fails, use name from AAI - getUserInfo).
3. searchMyOrcidResults.module.ts: Removed PagingModule and added NoLoadPaging.
4. searchMyOrcidResults.component.ts: Added method "totalPages()" to calculate pages in paging.
5. searchMyOrcidResults.component.html: 
	a. Added <no-load-paging> (instead of custom paging with <paging-no-load>).
	b. In <orcid-work> added "resultTitle" property.
	c. Fix widths of grid inside card for result preview and orcid buttons.
6. orcid-work.component.ts:
	a. Added "resultTitle" @Input property, to show it in notifications, instead of pids.
	b. Updated messages for errors and for multiple put-codes.
	c. Use "danger" notifications instead of "warning" when an error occurs.
	d. For search and my orcid links pages, in orcid buttons, use <icon> for icons | For landing page, updated icons in orcid buttons.
	e. Added message "The action will affect your real ORCID iD." in tooltips, when environment == 'beta'.
	f. Removed property "procedurePaused" and its usage replaced by "currentAction".
	g. [Bug fix] For search pages, added "uk-align-right", in order orcid button not to take width for the whole line.
	h. [Bug fix] In method "getOrcidWorks()" check "Session.isLoggedIn()" was missing.
7. orcid.component.ts: If personal details from ORCID fails, use name from AAI - getUserInfo.
8. orcid.module.ts: Added IconsModule and registered icons: add, remove, preview, refresh in IconsService.
9. searchResult.component.ts: Call "orcidService.getPutCodes()" in all environments (production too).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60619 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-11 01:40:53 +00:00
konstantina.galouni 584e3a0b16 [Trunk | Library]:
1. env-properties.ts: Added properties "orcidTokenURL", "orcidClientId".
2. orcid-work.component.ts & myOrcidLinks.component.ts: Set tokenUrl using properties.orcidTokenURL and properties.orcidClientId (not local strings).
3. searchMyOrcidResults.component.ts: Remove check for "development" environment (Menu is not added in production).
4. searchResult.component.ts: Parse previewResult.identifiers to set previewResult.orcidPutCodes only when environment is not "production" and portalType is "explore".
5. result-preview.component.html: Show ORCID dates or <orcid-work> only when environment is not "production" and portalType is "explore".
6. resultLanding.component.html: Show <orcid-work> only when environment is not "production" and portalType is "explore".


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60494 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-24 20:33:37 +00:00
argiro.kokogiannaki 8a315f3963 [Library|Trunk]
Track Downloads:
- add the type of report (filename) in the url - to separate the different actions
- Organization: add piwik track in 2 reports that was missing
- Add track download for citations



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60406 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-10 12:50:02 +00:00
konstantina.galouni ba229df685 [Trunk | Library]:
deletedByInference.component.ts: In <result-preview> add property "showOrcid" set to "false".
resultLanding.component.html: 
	a. Show <orcid-work> always (user is logged in or not and if there are no identifiers).
	b. Add class "half-opacity" in button and text for annotations when not user is logged in or there is no pid.
resultLanding.component.ts: Remove "loggedIn" field as it is duplicate (the other is "isLoggedIn").
advancedSearchForm.component.html: Show input form for filters with type "keyword" and [NEW] type "identifier".
loading.component.ts: Add boolean property "top_margin" to add or not class "uk-margin-small-top" on spinner.
result-preview.component.html: 
	a. Show <orcid-work> component even when user is not logged in.
	b. Fix widths for bottom line of result preview.
	c. Add "orcidCreationDates" and "orcidUpdateDates" in bottom line when available (in my orcid links page).
result-preview.component.ts: Add "showOrcid" property.
result-preview.ts: Add fields "orcidUpdateDates: string[]" and "orcidCreationDates: string[]".


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60393 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-10 09:05:37 +00:00
argiro.kokogiannaki ce1b7a2c86 [Library|Trunk]
Piwik: download give the current url instead of the blob url. Remove url parameter from trackDownload()

Metrics: add usage counts link in the logo


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60280 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-22 15:28:08 +00:00
k.triantafyllou 6574d8233a [Library | Trunk]: Add annotaton button always primary
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60276 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-22 09:27:31 +00:00
konstantina.galouni eb4a1f13f6 [Trunk | Library]:
1. error-interceptor.service.ts: Add "properties.orcidAPIURL" in UNAUTHORIZED_WHITELIST.
2. resultLanding.component.html: If result has identifiers and user is logged in, call <orcid-work>.
3. resultLanding.module.ts: Import OrcidModule.
4. searchResult.component.ts: If user is logged in, call "orcidService.getPutCodes()" and set orcidPutCodes of previewResults.
5. searchResults.module.ts: Add "OrcidService" in providers.
6. searchResearchResults.service.ts: In method "parseResults()", call "this.parsingFunctions.parseIdentifiers(resData['pid'])" to set identifiers.
7. customOptions.class.ts: Change method return type: "public static registryOptions(): any" --> public static registryOptions(): {}". (caused problem in return type of services (e.g. HttpEvent<string> instead of string).
8. searchResult.ts: Add field "identifiers: Map<string, string[]>".
9. env-properties.ts: Add field "orcidAPIURL".
10. result-preview.component.html: 
	a. If result has identifiers and user is logged in, call <orcid-work>.
	b. In bottom line with impact factors and orcid, add class "result-preview-bottom" (set color to #747474 (like muted text) when not on hover).
11. result-preview.component.ts: Add field "loggedIn" and check on init if user is logged in (via Session).
12. result-preview.module.ts: Import OrcidModule.
13. result-preview.ts: Add field "orcidPutCodes" | In method "searchResultConvert()", set resultPreview.identifiers with all identifiers (not only dois).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60231 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-13 18:30:25 +00:00
k.triantafyllou 31d164f8cd [Library | Trunk]: Remove getUserInfo from annotation component
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60222 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-13 13:00:41 +00:00
k.triantafyllou 454231e9c9 [Library | Trunk]: 1. Hide Annotations title if annotation list is empty. 2. Make more obvious when add annotation is disable
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60193 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-05 15:12:05 +00:00
k.triantafyllou a1cf4bcd15 [Library | Trunk]: Change b2note button position and change condition if b2note url propert exists
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60187 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-05 13:25:02 +00:00
k.triantafyllou 83061f3f16 [Library | Trunk]: Add b2note on beta explore and connect
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60178 d315682c-612b-4755-9ff5-7f18f6832af3
2020-12-22 17:36:29 +00:00
k.triantafyllou 3dfe33b5c7 [Library | Trunk]: Annotations add list of related annotations resources
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59962 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-25 16:09:36 +00:00
argiro.kokogiannaki fd31ff1556 [Library|Trunk]
- comment  second "no summary available when both primary and secondary info is not available"


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59961 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-25 14:32:56 +00:00
k.triantafyllou 7fc62a8117 [Library | Trunk]: Add graph link on landings
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59942 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-24 08:21:36 +00:00
argiro.kokogiannaki 8569010477 [Library|Trunk]
Search Filters fix:
- make them work for static filters (e.g datasource pages)
- make it work when new filter is substring of selected filter (e.g 'Registry'  & 'Registry of repositories')
- make it work with and without quotes

SEO:
- datasource landing add description in meta tags
- result landing make h2 the title in other versions (only one H1 per page)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59820 d315682c-612b-4755-9ff5-7f18f6832af3
2020-11-12 09:51:34 +00:00
k.triantafyllou 8b9af0edc2 [Library | Trunk]: Change headings on library
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59575 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-13 19:04:50 +00:00
k.triantafyllou 8f7d9a54d9 [Library | Trunk]: Landing remove Open on Power by message. Change metrics logo
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59560 d315682c-612b-4755-9ff5-7f18f6832af3
2020-10-13 12:07:16 +00:00
konstantina.galouni 8e50219489 [Trunk | Library]:
1. resultLanding.component.html: [Bug fix]: Remove input property [showAllAuthors]="false" from <landing-header> - "View all authors" button was never visible.
2. showAuthors.component.ts: Integrate orcid to production - Remove restrictions in html.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59445 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-22 10:34:06 +00:00
argiro.kokogiannaki 7526ef56e3 [Library|Trunk]
properties changes: 
	domain:
	  -is https://{explore,connect,monitor, etc}.openaire.eu 
	  -initialized in environment files
	  -reset for communities in EnvironmentSpecificService
	baseLink: is the prefix after the domain / or /dahsboard for monitor_dashboard
apply in all pages domain and baseLink changes

	


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59411 d315682c-612b-4755-9ff5-7f18f6832af3
2020-09-18 07:57:42 +00:00
k.triantafyllou 048e3b99b5 [Library | Trunk]: Fix types on landing header. Add message if result summary does not exist
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59150 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 09:17:50 +00:00
k.triantafyllou 716a8cb5af [Library | Trunk]: Update annotation list if something changes on the iframe
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59125 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-15 11:32:03 +00:00
k.triantafyllou 4ba22261aa [Library | Trunk]: Change organization parsing. Remove unknown countries
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59105 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-14 09:57:11 +00:00
k.triantafyllou 0c31508f7a [Library | Trunk]: Result Landing fix organization url
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59092 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-13 15:05:18 +00:00
k.triantafyllou 034a9e00a7 [Library | Trunk]: Replace static links with property url
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59090 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-13 14:42:34 +00:00
k.triantafyllou db7bd35f62 [Library | Trunk]: Changes for adding search and langing pages to monitor dashboard
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59060 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-10 08:37:17 +00:00