Commit Graph

354 Commits

Author SHA1 Message Date
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 01edbef93c landing pages: update spam words list 2021-08-13 11:43:26 +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
Konstantina Galouni aea456942e [Library]: resultLanding.component.ts: In method "checkIfAllowed()", keep only "covid-19" in publicCommunitities array (no index only for covid-19 related results in Explore). 2021-08-10 12:49:23 +03:00
Konstantina Galouni b4b3e143bb [Explore Service]: resultLanding.component.ts: added "checkIfAllowed()" method to be called by sitemap script and by updated "addNoIndexFilter()" method | Added spam words in "title_authors_words" | Added "publicCommunities" array with public communities in production - no index results from these communities. 2021-08-06 14:10:42 +03:00
argirok 58b44c7bb0 strip HTML for research outcomes description (landing and search results), Update no-index filter (remove poor content filter, add filter for communities) 2021-07-26 13:05:36 +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 5227f96b3b [Trunk | Library]:
1. timeout-interceptor.service.ts: Added whitelist, so that urls included in the list are not cut by this timeout interceptor.
2. services/reports.service.ts & landingPages/htmlProjectReport/htmlProjectReport.service.ts: In calls for CSV and HTML reports, added timeout 10 in seconds.
3. organization.component.ts: Created array "innerReportSubscriptions" where inner request of "downloading research results of a funder" are added - on error, all innerReportSubscriptions are unsubscribed.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61262 d315682c-612b-4755-9ff5-7f18f6832af3
2021-06-22 08:04:38 +00:00
konstantina.galouni 8c92a7fcdb [Trunk | Library]: organization.component.ts & project.component.ts: [Bug fix] Close report modal when opening loading modal (after clicking on some download button).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61249 d315682c-612b-4755-9ff5-7f18f6832af3
2021-06-17 13:33:16 +00:00
konstantina.galouni c4e58f942c [Trunk | Library]:
1. env-properties.ts: Deleted property "enermapsAPIURL" (always used enermapsURL).
2. resultLanding.component.ts: Removed all usages of "enermapsAPIURL" and use "enermapsURL".
3. resultLanding.service.ts: In "getEnermapsDetails()" method, set url to properties.enermapsURL+"/api/datasets_full?shared_id=eq."+id;
4. parsingFunctions.class.ts: In "getEnermapsConceptId()" method, uncomment parsing of contexts to find enermaps id and commented a default id which was set.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61231 d315682c-612b-4755-9ff5-7f18f6832af3
2021-06-16 08:19:16 +00:00
konstantina.galouni 03e5cb0c4a [Trunk | Library]:
1. src/app/openaireLibrary/claims/claim-utils/service/contexts.service.ts & src/app/openaireLibrary/services/searchResearchResults.service.ts: 
	Added in constructor default value null for HttpClient.
2. src/app/openaireLibrary/landingPages/landing-utils/parsingFunctions.class.ts: 
	a. In method "parseIdentifiers()", concat quotes in pid.content to make it string always.
	b. In method "parseResults()" if "data" is null, return empty array.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61218 d315682c-612b-4755-9ff5-7f18f6832af3
2021-06-15 12:54:40 +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 64595c7382 [Trunk | Library]:
1. result-preview.ts: In Project interface, added optional boolean field "validated" (parsed in landing pages to show validated projects by funders).
2. parsingFunctions.class.ts: In method "parseFundingByProjects()" added parsing for "validated" field.   
3. fundedBy.component.ts: ticket #6228 - Show "Validated by funder" message if "validate" field is true.
4. dataProvider.component.ts: [Bug fix] In method "getDataProviderAggregationStatus()" set "aggregationStatusIsInitialized" to true on success and on error
        (not on complete, because after error it never completes and keeps on loading).
5. orcid.component.ts: [Bug fix]
        a. In method "getToken()" set "showLoading" to false on success and on error (after error there is no complete).
        b. In method "getPersonalDetails()" move "setTimeout" from complete to error.
6. showPublisher.component.ts: [Bug fix] Add "UTC" in pipe when showing published date ({{publishDate | date: 'dd MMM yyyy' : 'UTC'}}).
7. timeout-interceptor.service.ts: Timeout only GET requests.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61003 d315682c-612b-4755-9ff5-7f18f6832af3
2021-05-13 15:48:01 +00:00
argiro.kokogiannaki 6eed709019 [Library|Trunk]
- Remove inline argument for parsed contexts, projects, remove unused code with <mark> tag


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61002 d315682c-612b-4755-9ff5-7f18f6832af3
2021-05-13 15:21:46 +00:00
argiro.kokogiannaki b9af858885 [Library|Trunk]
Result landing: SEO fix: improve spam filter for authors (names that include 'nn')


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61000 d315682c-612b-4755-9ff5-7f18f6832af3
2021-05-13 09:51:46 +00:00
konstantina.galouni b3ea315393 [Trunk | Library]: dataProvider.service.ts & searchDataproviders.service.ts:
[Bug fix] #6678 ticket - In order to get "organizations related to a datasource" (at most one), parse rels.rel.to.class == "isProvidedBy" (instead of rels.rel.to.class == "provides").


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60994 d315682c-612b-4755-9ff5-7f18f6832af3
2021-05-12 15:00:19 +00:00
argiro.kokogiannaki d97a4d6f69 [Library | Trunk]
Search pages: 
	updating canonical url with filters
	update title with filter values



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60976 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-28 15:54:30 +00:00
argiro.kokogiannaki e34c5d4daa [Library|Trunk]
Checks for PIDs:
 - Landing page, ORCID page: add looser rule for pids (if not valid set it is a doi) 
 - String utils: Identifier.isValidDOI add generic rule doi starting with "10."



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60970 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-26 09:42:41 +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
k.triantafyllou 1e785e4fd9 [Library | Trunk]: Remove scroll to top from pages initiliazation
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60926 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-20 15:18:15 +00:00
k.triantafyllou 34ae3808d0 [Library | Trunk]: Fix html condition error on change detections
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60885 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-16 11:45:42 +00:00
argiro.kokogiannaki 78f6d85d45 [Library|Trunk]
- Result landing: allow get result from input instead of the service.
- FetchResearchResults class: getResultsForCommunity add check for current year when sorting on date
- Customization checkForObsoleteVersion: add extra check




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60883 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-16 09:59:54 +00:00
argiro.kokogiannaki b78a463c5e [Library|Trunk]
- My orcid links: add piwik module
- comment consoles in Result landing


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60859 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-13 14:37:28 +00:00
k.triantafyllou bd76f273da [Library | Trunk]: Fix pids bug with content id
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60858 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-13 14:25:51 +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 ba496417ce [Library|Trunk]
SEO - robots filter: check for empty values



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60842 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-12 15:38:21 +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 b204e808c1 [Library|Trunk]
Metrics: hide old charts for results/projects (they are empty)


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60803 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-06 08:19:54 +00:00
argiro.kokogiannaki 84f4ca48fa [Library|Trunk]
Metrics:
- comment Openaire views



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60789 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-05 10:49:47 +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 43cc10d32b [Trunk | Library]:
1. resultLandingInfo.ts: In "contexts" field add: "idContext": string, "idCategory": string, "idConcept": string (needed for enermaps).
2. parsingFunctions.class.ts: In method "parseContexts()", parse also these new id fields. 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60780 d315682c-612b-4755-9ff5-7f18f6832af3
2021-04-01 15:09:48 +00:00
k.triantafyllou d5d2589365 [Library | Trunk]: Notification form change condition if environment !== production
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60753 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-31 09:34:41 +00:00
k.triantafyllou 494ee446e7 [Library | Trunk]: Search results - Landing titles break line
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60751 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-30 12:04:52 +00:00
argiro.kokogiannaki 56081c33da [Library|Trunk]
- Cache Interceptor service: add explore home page search queries (stats numbers)
- Result Landing: enhance noindex filter (avoid common title/authors/abstract)
- Search module: remove unused module



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60750 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-30 11:50:15 +00:00
argiro.kokogiannaki 536f633de5 [Library | Landing]
Landing Metrics: make sure that iframes for metrics get the proper id (in case of pid parameter)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60669 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-18 15:25:02 +00:00
argiro.kokogiannaki eb314179d3 [Library|Trunk]
SEO: update list of words for no-index filter add check about abstract



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60668 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-18 15:19:22 +00:00
k.triantafyllou 97e10df7b7 [Library | Trunk]: Landing: Under curation tooltip add padding
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60641 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-12 12:15:47 +00:00
argiro.kokogiannaki 3f64157136 [Library|Trunk]
- piwik update: for result landing create custom url using the url format with the dedup id 
- result landing service: url encode pid for search service
- update message for orcid 



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60625 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-11 13:27:30 +00:00
konstantina.galouni 07b659525e [Trunk | Library]: deletedByInference.service.ts & resultLanding.service.ts & searchResearchResults.service.ts: [Bug fix] In parsing <creator> before setting orcid and orcid_pending fields call .toUpperCase().
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60623 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-11 12:16:13 +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
k.triantafyllou a9c25698dd [Library | Trunk]: Add dmps on project
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60614 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-10 13:24:19 +00:00
argiro.kokogiannaki 5791c1452a [Library|Trunk]
Organization + Result landing: 
	reset id with the dedup id (objidentifier) in case the parameters id was a pid or a canonical url. 
	this  fixes issues with related requests that need the dedup identifier

Result landing:
	- SEO no-index filter: add supplementary rules (title or authors contain spam record keywords e.g film, movie,hd, 4k,etc)
	- when the route is /result?id=  update url with pid if exists.



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60604 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-08 14:42:26 +00:00
k.triantafyllou fe7fa1298e [Library | Trunk]: Result preview: add hasLink param and check pid if result preview has been changed
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60520 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-26 14:30:10 +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