From 549f2f8305bab5d89d522f09ca041ae210c57220 Mon Sep 17 00:00:00 2001
From: Mikhail Ivanov <ya.ivanov-m2014@yandex.ru>
Date: Sat, 18 Jan 2025 20:07:07 +0100
Subject: [PATCH] date formatting and some fixes for filters

---
 frontend/src/components/FeedItem.vue |  6 ++++--
 frontend/src/main.ts                 |  2 ++
 frontend/src/services/intl.ts        | 25 +++++++++++++++++++++++++
 frontend/src/stores/feed.ts          |  5 ++++-
 frontend/src/utils/constants.ts      |  2 ++
 poetry.lock                          | 22 +++++++++++-----------
 6 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 frontend/src/services/intl.ts

diff --git a/frontend/src/components/FeedItem.vue b/frontend/src/components/FeedItem.vue
index 7632972..d845165 100644
--- a/frontend/src/components/FeedItem.vue
+++ b/frontend/src/components/FeedItem.vue
@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import { useFeedStore } from '@/stores/feed.ts'
-import { computed, onMounted, useTemplateRef } from 'vue'
+import { computed, inject, onMounted, useTemplateRef } from 'vue'
 import { useSubscriptionsStore } from '@/stores/subscriptions.ts'
 import { useRoute } from 'vue-router'
 import IconPaid from '@/components/icons/IconPaid.vue'
+import { Injection } from '@/utils/constants.ts'
 
 const emit = defineEmits(['appear'])
+const intlService = inject(Injection.Intl)
 
 const route = useRoute()
 const { id } = defineProps({ id: Number })
@@ -89,7 +91,7 @@ function stripTags(htmlString: string) {
         <small>{{ feed.title }}</small>
       </RouterLink>
       <small class="paragraph">
-        {{ feedItem.pub_date }}
+        {{ intlService.formatDate(new Date(feedItem.pub_date)) }}
       </small>
     </div>
     <RouterLink :to="getDetailLinkParams()" class="feed-links-list-item-link">
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 2648999..f272f16 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -6,11 +6,13 @@ import { createPinia } from 'pinia'
 import App from './App.vue'
 import router from './router'
 import { DialogsService } from '@/services/dialogs.ts'
+import { IntlService } from '@/services/intl'
 
 const app = createApp(App)
 
 app.use(createPinia())
 app.use(DialogsService.initPlugin())
+app.use(IntlService.initPlugin())
 app.use(router)
 
 app.mount('#app')
diff --git a/frontend/src/services/intl.ts b/frontend/src/services/intl.ts
new file mode 100644
index 0000000..8cfa182
--- /dev/null
+++ b/frontend/src/services/intl.ts
@@ -0,0 +1,25 @@
+import type { App as AppType, Plugin } from 'vue'
+import { Injection } from '@/utils/constants.ts'
+
+export class IntlService {
+  private readonly _datetime: Intl.DateTimeFormat
+  constructor() {
+    this._datetime = new Intl.DateTimeFormat(['en-GB'], {
+      month: 'short',
+      year: 'numeric',
+      day: 'numeric',
+    })
+  }
+
+  formatDate(date: Date): string {
+    return this._datetime.format(date)
+  }
+
+  static initPlugin(): Plugin {
+    return {
+      install: (app: AppType) => {
+        app.provide(Injection.Intl, new IntlService())
+      }
+    }
+  }
+}
diff --git a/frontend/src/stores/feed.ts b/frontend/src/stores/feed.ts
index 2c999a4..2f046af 100644
--- a/frontend/src/stores/feed.ts
+++ b/frontend/src/stores/feed.ts
@@ -67,7 +67,10 @@ export const useFeedStore = defineStore('feed', {
       this.items = items
     },
     setFilters(category: string, filters: Record<string, Filter>) {
-      this.filters[category] = filters
+      this.filters[category] = {
+        ...this.filters[category],
+        ...filters,
+      }
     },
     updateItem(id: number, update: Partial<FeedItem>) {
       this.items = this.items.map((item: FeedItem) => {
diff --git a/frontend/src/utils/constants.ts b/frontend/src/utils/constants.ts
index 3ca1f18..5c092a3 100644
--- a/frontend/src/utils/constants.ts
+++ b/frontend/src/utils/constants.ts
@@ -1,6 +1,8 @@
 import type { InjectionKey } from 'vue'
 import type { DialogsService } from '@/services/dialogs.ts'
+import type { IntlService } from '@/services/intl.ts'
 
 export const Injection = {
   DialogController: Symbol("dialogs-controller") as InjectionKey<DialogsService>,
+  Intl: Symbol("intl") as InjectionKey<IntlService>,
 }
diff --git a/poetry.lock b/poetry.lock
index 1d8cd32..d71062f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1267,23 +1267,23 @@ files = [
 
 [[package]]
 name = "rdflib"
-version = "7.1.2"
+version = "7.1.3"
 description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information."
 optional = false
-python-versions = "<4,>=3.9"
+python-versions = "<4.0.0,>=3.8.1"
 files = [
-    {file = "rdflib-7.1.2-py3-none-any.whl", hash = "sha256:5a694a64f48a751079999c37dccf91a6210077d845d09adf7c3ce23a876265a7"},
-    {file = "rdflib-7.1.2.tar.gz", hash = "sha256:4fc8f6d50b199dc38fbc5256370f038c1cedca6102ccbde4e37c0fd2b7f36e65"},
+    {file = "rdflib-7.1.3-py3-none-any.whl", hash = "sha256:5402310a9f0f3c07d453d73fd0ad6ba35616286fe95d3670db2b725f3f539673"},
+    {file = "rdflib-7.1.3.tar.gz", hash = "sha256:f3dcb4c106a8cd9e060d92f43d593d09ebc3d07adc244f4c7315856a12e383ee"},
 ]
 
 [package.dependencies]
 isodate = {version = ">=0.7.2,<1.0.0", markers = "python_version < \"3.11\""}
-pyparsing = ">=3.2.0,<4"
+pyparsing = ">=2.1.0,<4"
 
 [package.extras]
-berkeleydb = ["berkeleydb (>18.1.0)"]
-html = ["html5rdf (>=1.2.1,<2)"]
-lxml = ["lxml (>=4.8.0,<6.0)", "lxml (>=4.9.3,<6.0)"]
+berkeleydb = ["berkeleydb (>=18.1.0,<19.0.0)"]
+html = ["html5rdf (>=1.2,<2)"]
+lxml = ["lxml (>=4.3,<6.0)"]
 networkx = ["networkx (>=2,<4)"]
 orjson = ["orjson (>=3.9.14,<4)"]
 
@@ -1573,13 +1573,13 @@ files = [
 
 [[package]]
 name = "virtualenv"
-version = "20.29.0"
+version = "20.29.1"
 description = "Virtual Python Environment builder"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "virtualenv-20.29.0-py3-none-any.whl", hash = "sha256:c12311863497992dc4b8644f8ea82d3b35bb7ef8ee82e6630d76d0197c39baf9"},
-    {file = "virtualenv-20.29.0.tar.gz", hash = "sha256:6345e1ff19d4b1296954cee076baaf58ff2a12a84a338c62b02eda39f20aa982"},
+    {file = "virtualenv-20.29.1-py3-none-any.whl", hash = "sha256:4e4cb403c0b0da39e13b46b1b2476e505cb0046b25f242bee80f62bf990b2779"},
+    {file = "virtualenv-20.29.1.tar.gz", hash = "sha256:b8b8970138d32fb606192cb97f6cd4bb644fa486be9308fb9b63f81091b5dc35"},
 ]
 
 [package.dependencies]