Merge pull request #64 from Ampernic/main

Незначительные общие правки

.vitepress/config.mts

@@ -7,7 +7,6 @@ import markdownItImplicitFigures from 'markdown-it-implicit-figures'
 
 import { nav, sidebar } from './data/navigations'
 import { telegram, gitflic, vk } from './data/icons'
-import { normalize } from './utils'
 
 import * as config from './config.json'
 
@@ -33,7 +32,7 @@ export default defineConfigWithTheme({
       GitChangelog({
         maxGitLogCount: gitMaxCommits,
         repoURL: () => gitRepository,
-        rewritePaths: gitRewritePath,
+        rewritePathsBy: gitRewritePath,
       }),
       GitChangelogMarkdownSection({
         getChangelogTitle: (_, __, { helpers }): string => {
@@ -225,7 +224,7 @@ export default defineConfigWithTheme({
       ['meta', { name: 'og:title', content: pageData.title + config.head.titleSeponator + config.title }],
     )
     if (pageData.frontmatter.layout !== 'home') {
-      pageData.description = `Cтатья написанная простым языком: «${pageData.title}» для ${config.title}. Последнее обновление ${config.title}: ${new Date(pageData.lastUpdated).toLocaleString(config.lang)}`
+      pageData.description = `Cтатья написанная простым языком: «${pageData.title}» для ${config.title}. Последнее обновление ${config.title}: ${ new Date( pageData.lastUpdated ?? new Date()).toLocaleString(config.lang)}`
     }
   }
 })

.vitepress/data/sponsors.ts

@@ -1,3 +1,5 @@
+import { title } from "process";
+
 export const sponsors = [
     {
         tier: 'Организационная структура',
@@ -14,5 +16,26 @@ export const sponsors = [
                 url: 'https://www.basealt.ru'
             }
         ]
+    },
+    {
+        tier: 'Товарищи по цеху VitePress',
+        size: 'big',
+        items: [
+            {
+                name: 'MODX Pro',
+                img: './modx.svg',
+                url: 'https://docs.modx.pro/'
+            },
+            {
+                name: 'IT WIKI',
+                img: './logo_for_friends_horizontal.svg',
+                url: 'https://it-wiki.com.ru/'
+            },
+            {
+                name: 'Nólëbase',
+                img: './nolebase-logo.svg',
+                url: 'https://nolebase.ayaka.io/'
+            },
+        ]
     }
 ]

.vitepress/theme/components/AKWAsideMetaKeyword.vue

@@ -5,7 +5,7 @@ export interface Keywords {
 }
 
 const props = defineProps<{
-    keywords: Keywords[]
+    keywords?: Keywords[]
 }>();
 
 </script>

.vitepress/theme/components/AKWAsideMetaLink.vue

@@ -9,7 +9,7 @@ export interface Links {
 }
 
 const props = defineProps<{
-    links: Links[]
+    links?: Object
 }>();
 
 </script>

.vitepress/theme/components/AKWAsideMetaList.vue

@@ -9,7 +9,7 @@ export interface Lists {
 }
 
 const props = defineProps<{
-    lists: Lists[]
+    lists?: Object
 }>();
 
 </script>

.vitepress/theme/components/AKWDocsAsideMeta.vue

@@ -9,7 +9,6 @@ import { popular_developers } from '../../data/popular_developers'
 import AKWAsideMetaList from './AKWAsideMetaList.vue'
 import AKWAsideMetaLink from './AKWAsideMetaLink.vue'
 import AKWAsideMetaKeyword from './AKWAsideMetaKeyword.vue'
-import { isValidUrl } from '../composables/link';
 
 const { frontmatter, theme } = useData()
 const route = useRoute() 
@@ -39,8 +38,8 @@ const props = computed(() => {
             ...{
                 avatar: (Object.keys(popular_developers).includes(developer.name)) ?
                             {
-                                src: assetImage(popular_developers[developer.name], path),
-                                alt: popular_developers[developer.name].alt
+                                src: assetImage(popular_developers[developer.name]?.src, path),
+                                alt: popular_developers[developer.name]?.alt
                             }:
                             {
                                 src: assetImage(developer?.avatar?.src, path) ?? assetImage(developer?.avatar, path),

.vitepress/theme/composables/image.ts

@@ -5,7 +5,7 @@ export const assetImage = (url: string, path: string) => {
     if (!url) return
     if (isValidUrl(url) != false) return url
 
-    return (String(url).slice(0, 2) === './') ? new URL(`/${path.slice(1) + url.slice(2)}`, import.meta.url).href : url
+    return (url.slice(0, 2) === './') ? new URL(`/${path.slice(1) + url.slice(2)}`, import.meta.url).href : url
 
 }
 

.vitepress/theme/index.ts

@@ -1,5 +1,5 @@
 // https://vitepress.dev/guide/custom-theme
-import { h, Suspense } from 'vue'
+import { h } from 'vue'
 import type { Theme } from 'vitepress'
 import {defineClientComponent} from 'vitepress'
 import DefaultTheme from 'vitepress/theme'

docs/apps/keepassxc/index.md

@@ -6,7 +6,7 @@ aggregation:
 appstream:
     id: org.keepassxc.KeePassXC
     name: KeePassXC
-    icon: ./img/org.keepassxc.KeePassXC.png
+    icon: ./img/keepassxc-logo.svg
     summary: Кроссплатформенный менеджер паролей с открытым исходным кодом.
     developer:
         name: KeePassXC Team

docs/apps/qbittorrent/index.md

@@ -6,7 +6,7 @@ aggregation:
 appstream:
     id: org.qbittorrent.qBittorrent
     name: qBittorrent
-    icon: ./img/org.qbittorrent.qBittorrent.png
+    icon: ./img/qbittorrent-logo.svg
     summary: Cвободный кроссплатформенный клиент файлообменной сети BitTorrent.
     developer: 
         name: qBittorrent Community