From b034fdbe194d5eb72a4441620b35a194fe1c93a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCr=20G=C3=B6rg=C3=BCl=C3=BC?= Date: Mon, 17 Jul 2023 01:17:47 +0300 Subject: [PATCH] konsol-vergisi-hesaplayici: normalize texts, URLs and file names --- ...i-hesaplayici-microsoft-xbox-series-s.psd} | Bin ...i-hesaplayici-microsoft-xbox-series-x.psd} | Bin ...ergisi-hesaplayici-sony-playstation-5.psd} | Bin ...gisi-hesaplayici-sony-playstation-vr2.psd} | Bin ...i-hesaplayici-microsoft-xbox-series-s.jpg} | Bin ...i-hesaplayici-microsoft-xbox-series-x.jpg} | Bin ...ergisi-hesaplayici-sony-playstation-5.jpg} | Bin ...gisi-hesaplayici-sony-playstation-vr2.jpg} | Bin .../data/presets.js | 44 +++++++++--------- .../konsol-vergisi-hesaplayici/utils.js | 13 ++++-- create-firebase-json.js | 21 +++++++++ .../konsol-vergisi-hesaplayici-slug.page.js | 6 ++- 12 files changed, 56 insertions(+), 28 deletions(-) rename .assets/og/{konsol-vergisi-hesaplayici-xbox-series-s.psd => konsol-vergisi-hesaplayici-microsoft-xbox-series-s.psd} (100%) rename .assets/og/{konsol-vergisi-hesaplayici-xbox-series-x.psd => konsol-vergisi-hesaplayici-microsoft-xbox-series-x.psd} (100%) rename .assets/og/{konsol-vergisi-hesaplayici-playstation-5.psd => konsol-vergisi-hesaplayici-sony-playstation-5.psd} (100%) rename .assets/og/{konsol-vergisi-hesaplayici-playstation-vr2.psd => konsol-vergisi-hesaplayici-sony-playstation-vr2.psd} (100%) rename assets/og/{konsol-vergisi-hesaplayici-xbox-series-s.jpg => konsol-vergisi-hesaplayici-microsoft-xbox-series-s.jpg} (100%) rename assets/og/{konsol-vergisi-hesaplayici-xbox-series-x.jpg => konsol-vergisi-hesaplayici-microsoft-xbox-series-x.jpg} (100%) rename assets/og/{konsol-vergisi-hesaplayici-playstation-5.jpg => konsol-vergisi-hesaplayici-sony-playstation-5.jpg} (100%) rename assets/og/{konsol-vergisi-hesaplayici-playstation-vr2.jpg => konsol-vergisi-hesaplayici-sony-playstation-vr2.jpg} (100%) diff --git a/.assets/og/konsol-vergisi-hesaplayici-xbox-series-s.psd b/.assets/og/konsol-vergisi-hesaplayici-microsoft-xbox-series-s.psd similarity index 100% rename from .assets/og/konsol-vergisi-hesaplayici-xbox-series-s.psd rename to .assets/og/konsol-vergisi-hesaplayici-microsoft-xbox-series-s.psd diff --git a/.assets/og/konsol-vergisi-hesaplayici-xbox-series-x.psd b/.assets/og/konsol-vergisi-hesaplayici-microsoft-xbox-series-x.psd similarity index 100% rename from .assets/og/konsol-vergisi-hesaplayici-xbox-series-x.psd rename to .assets/og/konsol-vergisi-hesaplayici-microsoft-xbox-series-x.psd diff --git a/.assets/og/konsol-vergisi-hesaplayici-playstation-5.psd b/.assets/og/konsol-vergisi-hesaplayici-sony-playstation-5.psd similarity index 100% rename from .assets/og/konsol-vergisi-hesaplayici-playstation-5.psd rename to .assets/og/konsol-vergisi-hesaplayici-sony-playstation-5.psd diff --git a/.assets/og/konsol-vergisi-hesaplayici-playstation-vr2.psd b/.assets/og/konsol-vergisi-hesaplayici-sony-playstation-vr2.psd similarity index 100% rename from .assets/og/konsol-vergisi-hesaplayici-playstation-vr2.psd rename to .assets/og/konsol-vergisi-hesaplayici-sony-playstation-vr2.psd diff --git a/assets/og/konsol-vergisi-hesaplayici-xbox-series-s.jpg b/assets/og/konsol-vergisi-hesaplayici-microsoft-xbox-series-s.jpg similarity index 100% rename from assets/og/konsol-vergisi-hesaplayici-xbox-series-s.jpg rename to assets/og/konsol-vergisi-hesaplayici-microsoft-xbox-series-s.jpg diff --git a/assets/og/konsol-vergisi-hesaplayici-xbox-series-x.jpg b/assets/og/konsol-vergisi-hesaplayici-microsoft-xbox-series-x.jpg similarity index 100% rename from assets/og/konsol-vergisi-hesaplayici-xbox-series-x.jpg rename to assets/og/konsol-vergisi-hesaplayici-microsoft-xbox-series-x.jpg diff --git a/assets/og/konsol-vergisi-hesaplayici-playstation-5.jpg b/assets/og/konsol-vergisi-hesaplayici-sony-playstation-5.jpg similarity index 100% rename from assets/og/konsol-vergisi-hesaplayici-playstation-5.jpg rename to assets/og/konsol-vergisi-hesaplayici-sony-playstation-5.jpg diff --git a/assets/og/konsol-vergisi-hesaplayici-playstation-vr2.jpg b/assets/og/konsol-vergisi-hesaplayici-sony-playstation-vr2.jpg similarity index 100% rename from assets/og/konsol-vergisi-hesaplayici-playstation-vr2.jpg rename to assets/og/konsol-vergisi-hesaplayici-sony-playstation-vr2.jpg diff --git a/calculators/konsol-vergisi-hesaplayici/data/presets.js b/calculators/konsol-vergisi-hesaplayici/data/presets.js index 13a706c8..c3fb1764 100644 --- a/calculators/konsol-vergisi-hesaplayici/data/presets.js +++ b/calculators/konsol-vergisi-hesaplayici/data/presets.js @@ -5,54 +5,54 @@ export default [ id: 14, brandId: 3, title: "PlayStation 5", - slug: "playstation-5", + slug: "sony-playstation-5", releaseDate: new Date("2020-11-12"), thumbnail: "konsol-vergisi-hesaplayici/img/sony-playstation-5.png", - url: buildUrl("playstation-5"), - ogImageName: "konsol-vergisi-hesaplayici-playstation-5.jpg", - pageTitle: "PlayStation 5'in vergisi ne kadar?", - pageDescription: "Satın aldığınız bir PlayStation 5'in yurt içi ve yurt dışı fiyatlarına ne kadar vergi uygulandığını hesaplayın." + url: buildUrl("sony-playstation-5"), + ogImageName: "konsol-vergisi-hesaplayici-sony-playstation-5.jpg", + pageTitle: "Sony PlayStation 5'in vergisi ne kadar?", + pageDescription: "Satın aldığınız bir Sony PlayStation 5'in yurt içi ve yurt dışı fiyatlarına ne kadar vergi uygulandığını hesaplayın." }, { id: 15, brandId: 3, title: "PlayStation VR2", - slug: "playstation-vr2", - releaseDate: new Date("2022-02-22"), + slug: "sony-playstation-vr2", + releaseDate: new Date("2023-02-22"), thumbnail: "konsol-vergisi-hesaplayici/img/sony-playstation-vr2.png", - url: buildUrl("playstation-vr2"), - ogImageName: "konsol-vergisi-hesaplayici-playstation-vr2.jpg", - pageTitle: "PlayStation VR2'nin vergisi ne kadar?", - pageDescription: "Satın aldığınız bir PlayStation VR2'nin yurt içi ve yurt dışı fiyatlarına ne kadar vergi uygulandığını hesaplayın." + url: buildUrl("sony-playstation-vr2"), + ogImageName: "konsol-vergisi-hesaplayici-sony-playstation-vr2.jpg", + pageTitle: "Sony PlayStation VR2'nin vergisi ne kadar?", + pageDescription: "Satın aldığınız bir Sony PlayStation VR2'nin yurt içi ve yurt dışı fiyatlarına ne kadar vergi uygulandığını hesaplayın." }, { id: 16, brandId: 4, title: "Xbox Series S", - slug: "xbox-series-s", + slug: "microsoft-xbox-series-s", releaseDate: new Date("2020-11-10"), thumbnail: "konsol-vergisi-hesaplayici/img/microsoft-xbox-series-s.png", - url: buildUrl("xbox-series-s"), - ogImageName: "konsol-vergisi-hesaplayici-xbox-series-s.jpg", - pageTitle: "Xbox Series S'nin vergisi ne kadar?", - pageDescription: "Satın aldığınız bir Xbox Series S'nin yurt içi ve yurt dışı fiyatlarına ne kadar vergi uygulandığını hesaplayın." + url: buildUrl("microsoft-xbox-series-s"), + ogImageName: "konsol-vergisi-hesaplayici-microsoft-xbox-series-s.jpg", + pageTitle: "Microsoft Xbox Series S'nin vergisi ne kadar?", + pageDescription: "Satın aldığınız bir Microsoft Xbox Series S'nin yurt içi ve yurt dışı fiyatlarına ne kadar vergi uygulandığını hesaplayın." }, { id: 17, brandId: 4, title: "Xbox Series X", - slug: "xbox-series-x", + slug: "microsoft-xbox-series-x", releaseDate: new Date("2020-11-10"), thumbnail: "konsol-vergisi-hesaplayici/img/microsoft-xbox-series-x.png", - url: buildUrl("xbox-series-x"), - ogImageName: "konsol-vergisi-hesaplayici-xbox-series-x.jpg", - pageTitle: "Xbox Series X'in vergisi ne kadar?", - pageDescription: "Satın aldığınız bir Xbox Series X'in yurt içi ve yurt dışı fiyatlarına ne kadar vergi uygulandığını hesaplayın." + url: buildUrl("microsoft-xbox-series-x"), + ogImageName: "konsol-vergisi-hesaplayici-microsoft-xbox-series-x.jpg", + pageTitle: "Microsoft Xbox Series X'in vergisi ne kadar?", + pageDescription: "Satın aldığınız bir Microsoft Xbox Series X'in yurt içi ve yurt dışı fiyatlarına ne kadar vergi uygulandığını hesaplayın." }, { id: 18, brandId: 5, - title: "Nintendo Switch", + title: "Switch", slug: "nintendo-switch", releaseDate: new Date("2017-03-03"), thumbnail: "konsol-vergisi-hesaplayici/img/nintendo-switch.png", diff --git a/calculators/konsol-vergisi-hesaplayici/utils.js b/calculators/konsol-vergisi-hesaplayici/utils.js index 5c2832cc..9fe2e8e8 100644 --- a/calculators/konsol-vergisi-hesaplayici/utils.js +++ b/calculators/konsol-vergisi-hesaplayici/utils.js @@ -2,25 +2,30 @@ import brands from "@/calculators/konsol-vergisi-hesaplayici/data/brands.js"; import presets from "@/calculators/konsol-vergisi-hesaplayici/data/presets.js"; import presetOptions from "@/calculators/konsol-vergisi-hesaplayici/data/preset-options.js"; -const findPresetsByBrandId = (brandId, presets) => { +const findBrandById = brandId => { + return brands.find(brand => brand.id === brandId); +}; + +const findPresetsByBrandId = brandId => { return presets.filter(preset => preset.brandId === brandId); }; -const findPresetOptionsByPresetId = (presetId, presetOptions) => { +const findPresetOptionsByPresetId = presetId => { return presetOptions.filter(presetOption => presetOption.presetId === presetId); }; const buildCalculations = () => { return brands.map(brand => ({ brand, - presets: findPresetsByBrandId(brand.id, presets).map(preset => ({ + presets: findPresetsByBrandId(brand.id).map(preset => ({ ...preset, - options: findPresetOptionsByPresetId(preset.id, presetOptions) + options: findPresetOptionsByPresetId(preset.id) })) })); }; export { + findBrandById, findPresetsByBrandId, findPresetOptionsByPresetId, buildCalculations diff --git a/create-firebase-json.js b/create-firebase-json.js index eae6ee88..3791af33 100644 --- a/create-firebase-json.js +++ b/create-firebase-json.js @@ -112,6 +112,27 @@ const firebaseJson = { source: "/konsol-vergisi-hesaplayici/apple-vision-pro/", destination: "/telefon-vergisi-hesaplayici/apple-vision-pro/", type: 301 + }, + + { + source: "/konsol-vergisi-hesaplayici/playstation-5/", + destination: "/konsol-vergisi-hesaplayici/sony-playstation-5/", + type: 301 + }, + { + source: "/konsol-vergisi-hesaplayici/playstation-vr2/", + destination: "/konsol-vergisi-hesaplayici/sony-playstation-vr2/", + type: 301 + }, + { + source: "/konsol-vergisi-hesaplayici/xbox-series-s/", + destination: "/konsol-vergisi-hesaplayici/microsoft-xbox-series-s/", + type: 301 + }, + { + source: "/konsol-vergisi-hesaplayici/xbox-series-x/", + destination: "/konsol-vergisi-hesaplayici/microsoft-xbox-series-x/", + type: 301 } ] }, diff --git a/data/pages/konsol-vergisi-hesaplayici/konsol-vergisi-hesaplayici-slug.page.js b/data/pages/konsol-vergisi-hesaplayici/konsol-vergisi-hesaplayici-slug.page.js index dd9c873c..3023d883 100644 --- a/data/pages/konsol-vergisi-hesaplayici/konsol-vergisi-hesaplayici-slug.page.js +++ b/data/pages/konsol-vergisi-hesaplayici/konsol-vergisi-hesaplayici-slug.page.js @@ -3,7 +3,7 @@ import KonsolVergisiHesaplayici from "@/data/pages/konsol-vergisi-hesaplayici/ko import { findCalculatorPresetBySlug } from "@/utils/find-calculator-preset-by-slug.js"; import presets from "@/calculators/konsol-vergisi-hesaplayici/data/presets.js"; -import { findPresetOptionsByPresetId } from "@/calculators/konsol-vergisi-hesaplayici/utils.js"; +import { findPresetOptionsByPresetId, findBrandById } from "@/calculators/konsol-vergisi-hesaplayici/utils.js"; import presetOptions from "@/calculators/konsol-vergisi-hesaplayici/data/preset-options.js"; export default slug => { @@ -12,6 +12,8 @@ export default slug => { return false; } + const brand = findBrandById(preset.brandId); + const title = preset.pageTitle; const url = preset.url; const description = preset.pageDescription; @@ -22,7 +24,7 @@ export default slug => { }); const breadcrumbs = [ ...KonsolVergisiHesaplayici.breadcrumbs, - { title: preset.title, url } + { title: `${brand.title} ${preset.title}`, url } ]; const options = findPresetOptionsByPresetId(preset.id, presetOptions);