Commit Graph

490 Commits

Author SHA1 Message Date
k.triantafyllou e741323577 [Library | Trunk]: Add new icons on preview
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60720 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-24 13:11:27 +00:00
argiro.kokogiannaki 7db2889aaa [Admin tool: NEW ui branch]
add icon "check_circle_outlined"


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60719 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-24 11:43:33 +00:00
konstantina.galouni ed8ea162b6 [new-UI | Library]: result-preview.component.html: Added <span> with class "custom-external" for external icon when "externalUrl" is set.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60699 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-23 17:00:13 +00:00
konstantina.galouni ed98b169f6 [new-UI | Library]:
1. result-preview.component.ts: Added property "@Input() externalUrl: string;" for external links in results.
2. result-preview.component.html: Link in results as they were when there is no "externalUrl", otherwise add:  target="_blank" [href]="externalUrl+result.id".


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60690 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-22 16:16:08 +00:00
k.triantafyllou 92852d0962 [Library | Trunk]: 1. Input fix bug with search control value. Remove selection of chip in autocomplete. 2. Search Input: Add truncate on selected value. 3. Full screen modal: Fix close method
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60688 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-22 15:10:18 +00:00
konstantina.galouni ec927e226c [new-UI | Library]: icons.ts: Removed "info" icon - will be used directly from uikit.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60685 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-22 13:37:49 +00:00
konstantina.galouni 4e5ccfa88b [new-UI | Library]:
1. no-load-paging.component.ts: [Bug fix] Added pipe "number" to totalPages.
2. searchProjects.service.ts: Nothing but removed a ";" which was double.
3. search-input.component.ts: 
	a. Added "bordered" class when input is focused (showSearch) or when a keyword exists (selected).
	b. Added "uk-visible@m" and "uk-padding-small" clases when showing selected keyword (padding is added so that border does not move).
4. icons.ts: Added icon "info" (from uikit).
5. string-utils.class.ts: Removed a console.log from "HTMLToString()" method.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60681 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-22 00:18:09 +00:00
k.triantafyllou 1f55667499 [Library | Trunk]: Full screen modal: Remove footer, move buttons on header, Make heading h4. User component: Redirect on error code 3
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60660 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-17 15:42:43 +00:00
argiro.kokogiannaki 50dda276c6 [Library|Trunk]
String utils: add function HTMLToString
create HTMLToStringPipe




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60647 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-12 14:49:12 +00:00
k.triantafyllou 372f33cb21 [Library | Trunk]: Fs modal: Fix esc key
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60642 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-12 12:49:01 +00:00
k.triantafyllou c9bc5dd980 [Library | Trunk]: Fs modal add a boolean for each button
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60636 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-12 10:29:58 +00:00
k.triantafyllou 3e14245cc0 [Library | Trunk]: Fs modal add disable on buttons
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60635 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-12 10:00:56 +00:00
k.triantafyllou b37a64809e [Library | Trunk]: Fs modal redesign
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60632 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-12 09:39:06 +00:00
argiro.kokogiannaki 39cd5682c9 [Library|Trunk]
fs-modal: add event emitter for close



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60629 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-11 16:27:28 +00:00
argiro.kokogiannaki 3d76b4dc22 [Library|Trunk]
fix reload issue: double encoding return 404 or error



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60626 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-11 14:11:23 +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 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 be0b3c8753 [Trunk | Library]: showAuthors.component.ts:
a. [Bug fix] When there is "author.orcid" and "author.ocid_pending" too, ignore "author.orcid_pending".
	b. [Bug fix] Increased the min-width of area where ORCID iD is shown from 250px to 280px.
	c. [Bug fix] Increased the min-width of dropdown box from 70px to 465px - sometimes copy and external buttons were cut to 2 or 3 lines.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60618 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-11 01:37:04 +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 cca8a3c7f3 [Library|Trunk]
Enermaps datasets: 
	apply changes in search  results components to be able to add custom title and add an image if available.



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60612 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-10 10:41:38 +00:00
argiro.kokogiannaki 90121cba60 [Library|Trunk]
comment claimsDatatable.pipe.ts as unused


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60611 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-09 11:33:24 +00:00
argiro.kokogiannaki 8f917a2e2e [Library|Trunk]
- remove search table view
- preview result: support projects urls with funder and grant id
- Search page changes:
	-clean up variables about showing graph info
 	- add variable about download results

Comment unused components that import datatables



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60605 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-08 15:32:33 +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 51aa0ba2fd [Library | Trunk]: Full screen modal: Add animation css
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60601 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-05 15:12:35 +00:00
k.triantafyllou 255510903a [Library | Trunk]: Full screen modal: Make keys optionals
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60599 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-05 13:51:09 +00:00
k.triantafyllou cfe3ab4fd0 [Library | Trunk]: Add full screen modal
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60597 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-05 13:31:54 +00:00
k.triantafyllou 91eb91f7f7 [Library | Trunk]: Add url prefix pipe
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60575 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-04 12:45:01 +00:00
k.triantafyllou 1bfbebeb65 [Library | Trunk]: Add url and logoURL on dashboard
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60568 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-03 18:04:53 +00:00
k.triantafyllou 8acc64fc10 [Library | Trunk]: 1. Role users disable remove button for members when a user is a manager. 2. Change email message for community managers invitation
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60545 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-02 10:08:19 +00:00
k.triantafyllou 39dada9c53 [Library | Trunk]: 1. Icons remove line-height. 2. Role-users: Fix UI
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60534 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-01 17:32:21 +00:00
k.triantafyllou 57d4983341 [Library | Trunk]: Change notification emails methods
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60529 d315682c-612b-4755-9ff5-7f18f6832af3
2021-03-01 16:05:37 +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 74eadebf48 [Trunk | Library]:
1. orcid-work.component.ts: Update orcid icons for landing.
2. showAuthors.component.ts: In popup shown for authors with orcid or orcid_pending info, show appropriate messages.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60519 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-26 13:42:44 +00:00
k.triantafyllou b2bec99ff4 [Library | Trunk]: 1. Change curator service. 2. Add icons preview
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60516 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-26 10:48:34 +00:00
k.triantafyllou 9737b45f07 [Library | Trunk]: Change admin URL on library
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60505 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-25 14:19:59 +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
k.triantafyllou 467d1a4ff1 [Library | Trunk]: Search input: Fix reset function and toggle on selected. Sidebar: fix route on active route
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60488 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-24 14:35:02 +00:00
konstantina.galouni ea56eda20d [Trunk | Library]:
1. searchResult.ts: Add field "relcanId" (will be set to OpenAIRE id. "id" now is set with pid if exists).
2. result-preview.ts: In class "ResultPreview", add field "relcanId".
3. searchMyOrcidResults.component.html, result-preview.component.html: [Bug fix] In <orcid-work>, set [resultId]="result.relcanId".


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60465 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-20 09:22:25 +00:00
konstantina.galouni f592e7943f [Trunk | Library]:
1. result-preview.ts: In interface "Author" add field "orcid_pending".
2. deletedByInference.service.ts, searchResearchResults.service.ts, resultLanding.service.ts:
	a. [Bug fix #6342]: On title parsing, set the title with classid = "main title" if exists.
	b. Add "orcid_pending" field to authors, to separate "orcid" from "orcid_pending".
	c. Only for resultLanding.service.ts: Add "orcid_pending" field to authors, to separate "orcid" from "orcid_pending".
3. open-aire-jsonld-converter.service.ts: [Bug fix #6342]: On title parsing, set the title with classid = "main title" if exists.
4. showAuthors.component.ts: Show black ORCID icon for authors with orcid_pending (and keep green icon for orcid).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60464 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-20 09:20:05 +00:00
k.triantafyllou 64e032ce0c [Library | Trunk]: Fix loading width
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60455 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-19 17:55:44 +00:00
k.triantafyllou e8774312f5 [Library | Trunk]: 1. Community Service refactor. 2. Subscribe service refactor. 3. Add service on role-verification
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60453 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-19 17:50:34 +00:00
k.triantafyllou 878ea565ad [Library | Trunk]: Some changes on input component
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60413 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-12 11:31:12 +00:00
argiro.kokogiannaki fd8a89ffe5 [Library|Trunk]
SEO updates: url in results preview:
	- use pid?  and the first valid pid if available
	- use the canonical id instead of dedup if available



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60410 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-11 10:20:10 +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
k.triantafyllou 9851bdeb19 [Library | Trunk]: 1. Fix chips css. 2. Stakeholder Service: Init is Upload after request
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60326 d315682c-612b-4755-9ff5-7f18f6832af3
2021-02-01 10:14:08 +00:00
k.triantafyllou 8ca5f8e411 [Library | Trunk]: Change admin tools pages to get portal from path param
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60294 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-26 16:21:55 +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 7d147b89e7 [Library | Trunk]: Create subscriber invite and subscribers components.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60274 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-21 15:15:53 +00:00
k.triantafyllou c63b03402e [Library | Trunk]: Fix invite message for covid-19 community
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60256 d315682c-612b-4755-9ff5-7f18f6832af3
2021-01-15 13:35:32 +00:00