diff --git a/public/favicon/favicon.ico b/public/favicon/favicon.ico new file mode 100644 index 0000000..fb38cba Binary files /dev/null and b/public/favicon/favicon.ico differ diff --git a/public/favicon/icon-dark.ico b/public/favicon/icon-dark.ico deleted file mode 100644 index 5f61d82..0000000 Binary files a/public/favicon/icon-dark.ico and /dev/null differ diff --git a/public/favicon/icon-light.ico b/public/favicon/icon-light.ico deleted file mode 100644 index 32ce082..0000000 Binary files a/public/favicon/icon-light.ico and /dev/null differ diff --git a/src/i18n/languages/ru.ts b/src/i18n/languages/ru.ts index 13c2aa2..046715a 100644 --- a/src/i18n/languages/ru.ts +++ b/src/i18n/languages/ru.ts @@ -111,8 +111,8 @@ export const ru: Translation = { [Key.skillLevelAdvanced]: "Продвинутый", [Key.skillLevelExpert]: "Эксперт", [Key.skillExperience]: "Опыт", - [Key.skillYears]: "лет", - [Key.skillMonths]: "месяцев", + [Key.skillYears]: " г.", + [Key.skillMonths]: " мес.", [Key.skillsTotal]: "Всего навыков", [Key.skillsExpert]: "Экспертный уровень", [Key.skillsAdvanced]: "Продвинутый", diff --git a/src/pages/skills.astro b/src/pages/skills.astro index f7ecc5a..586addb 100644 --- a/src/pages/skills.astro +++ b/src/pages/skills.astro @@ -6,7 +6,6 @@ import { LinkPresets } from "@constants/link-presets"; import { LinkPreset } from "@/types/config"; import { UNCATEGORIZED } from "@constants/constants"; import { - getAdvancedSkills, getSkillStats, getSkillsByCategory, getTotalExperience, @@ -25,11 +24,14 @@ const subtitle = LinkPresets[LinkPreset.Skills].description; // 获取技能统计信息 const stats = getSkillStats(); -const advancedSkills = getAdvancedSkills(); const totalExperience = getTotalExperience(); -// 获取所有分类 -const categories = [...new Set(skillsData.map((skill) => skill.category))]; +// 定义分类顺序 +const categoryOrder = ["frontend", "backend", "devops", "ai", "native", "tools", "ide", "softskills", "others"]; + +// 获取所有分类并按指定顺序排序 +const allCategories = [...new Set(skillsData.map((skill) => skill.category))]; +const categories = categoryOrder.filter(cat => allCategories.includes(cat)); // 按分类获取技能 const skillsByCategory = categories.reduce( @@ -110,20 +112,6 @@ const allIcons = skillsData.map((skill) => skill.icon).filter(Boolean); - - {advancedSkills.length > 0 && ( -