From 2ea0a192c0e2799907b85c6b630eceb250f16b05 Mon Sep 17 00:00:00 2001 From: Gnedov Pavel Date: Thu, 22 Jun 2023 13:22:40 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B4=D0=B0=D1=82?= =?UTF-8?q?=D1=8B=20=D0=B8=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8?= =?UTF-8?q?=D0=B5=D0=B2=20=D0=B2=20=D0=BE=D0=BA=D0=BD=D0=B5=20=D1=81=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D1=80=D0=BE=D0=B1=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8F=D0=BC=D0=B8=20=D0=BE=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package-lock.json | 29 +++++++++++++++++++ frontend/package.json | 4 +++ .../issue-details-dialog.module.css | 5 ++++ .../misc-components/issue-details-dialog.tsx | 6 ++-- 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e3655d0..f2feaa5 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -16,6 +16,7 @@ "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11", "axios": "^1.4.0", + "luxon": "^3.3.0", "mobx": "^6.9.0", "mobx-react-lite": "^3.4.3", "mobx-state-tree": "^5.1.8", @@ -25,6 +26,9 @@ "react-scripts": "5.0.1", "typescript": "^4.9.5", "web-vitals": "^2.1.4" + }, + "devDependencies": { + "@types/luxon": "^3.3.0" } }, "node_modules/@adobe/css-tools": { @@ -3890,6 +3894,12 @@ "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==" }, + "node_modules/@types/luxon": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.0.tgz", + "integrity": "sha512-uKRI5QORDnrGFYgcdAVnHvEIvEZ8noTpP/Bg+HeUzZghwinDlIS87DEenV5r1YoOF9G4x600YsUXLWZ19rmTmg==", + "dev": true + }, "node_modules/@types/mime": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", @@ -11629,6 +11639,14 @@ "yallist": "^3.0.2" } }, + "node_modules/luxon": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", + "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==", + "engines": { + "node": ">=12" + } + }, "node_modules/lz-string": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", @@ -19713,6 +19731,12 @@ "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==" }, + "@types/luxon": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.0.tgz", + "integrity": "sha512-uKRI5QORDnrGFYgcdAVnHvEIvEZ8noTpP/Bg+HeUzZghwinDlIS87DEenV5r1YoOF9G4x600YsUXLWZ19rmTmg==", + "dev": true + }, "@types/mime": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", @@ -25368,6 +25392,11 @@ "yallist": "^3.0.2" } }, + "luxon": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", + "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==" + }, "lz-string": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 908c135..d5577bd 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,6 +11,7 @@ "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11", "axios": "^1.4.0", + "luxon": "^3.3.0", "mobx": "^6.9.0", "mobx-react-lite": "^3.4.3", "mobx-state-tree": "^5.1.8", @@ -44,5 +45,8 @@ "last 1 firefox version", "last 1 safari version" ] + }, + "devDependencies": { + "@types/luxon": "^3.3.0" } } diff --git a/frontend/src/misc-components/issue-details-dialog.module.css b/frontend/src/misc-components/issue-details-dialog.module.css index 79c262a..2f24e96 100644 --- a/frontend/src/misc-components/issue-details-dialog.module.css +++ b/frontend/src/misc-components/issue-details-dialog.module.css @@ -35,4 +35,9 @@ /* Opera 7 */ word-wrap: break-word; /* Internet Explorer 5.5+ */ +} + +.dateField { + font-size: 7pt; + font-weight: normal; } \ No newline at end of file diff --git a/frontend/src/misc-components/issue-details-dialog.tsx b/frontend/src/misc-components/issue-details-dialog.tsx index 956b091..e30cecd 100644 --- a/frontend/src/misc-components/issue-details-dialog.tsx +++ b/frontend/src/misc-components/issue-details-dialog.tsx @@ -7,6 +7,7 @@ import Css from './issue-details-dialog.module.css'; import * as UnreadedFlagNs from '../misc-components/unreaded-flag'; import { SetIssueReadingTimestamp } from '../utils/unreaded-provider'; import axios from 'axios'; +import * as Luxon from 'luxon'; export const Store = types.model({ visible: types.boolean, @@ -87,7 +88,6 @@ export const Comments = (props: {details?: RedmineTypes.Journal[], issue: Redmin if (!comments) { return <>No comments } - console.debug(`Comments: details=${JSON.stringify(props.details)}`); // DEBUG const list = comments.map((detail) => { const key = `issueid_${props.issue.id}_commentid_${detail.id}`; return @@ -98,10 +98,10 @@ export const Comments = (props: {details?: RedmineTypes.Journal[], issue: Redmin } export const Comment = (props: {data: RedmineTypes.Journal}): JSX.Element => { - console.debug(`Comment: data=${JSON.stringify(props.data)}`); // DEBUG + const date = Luxon.DateTime.fromISO(props.data.created_on).toFormat("dd.MM.yyyy HH:mm"); return ( <> -

{props.data.user.name}:

+

{date} {props.data.user.name}:

 					{props.data.notes || '-'}