diff --git a/docker-compose.yml b/docker-compose.yml index c553725..8d00032 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: web: build: . - image: umrechner:v1.0.4 + image: umrechner:v1.0.5 restart: unless-stopped environment: - POCKETBASE_URL={$POCKETBASE_URL} diff --git a/hugo/data/datenspeicher.json b/hugo/data/datenspeicher.json index 82cca7e..d36b733 100644 --- a/hugo/data/datenspeicher.json +++ b/hugo/data/datenspeicher.json @@ -1,19 +1,69 @@ { "slug": "datenspeicher", "name": "Datenspeicher", + "unitOrder": [ + "bits", + "bytes", + "kilobytes_si", + "kilobytes_binaer", + "megabytes_si", + "megabytes_binaer", + "gigabytes_si", + "gigabytes_binaer", + "terabytes_si", + "terabytes_binaer", + "petabytes_si", + "petabytes_binaer" + ], "conversion_engine": "linear", "units": { - "bits": { "name": "Bits", "factor": "0.000000125" }, - "bytes": { "name": "Bytes", "factor": "0.000001" }, - "kilobytes_si": { "name": "Kilobytes (SI)", "factor": "0.001" }, - "kilobytes_binaer": { "name": "Kilobytes (binär)", "factor": "0.001024" }, - "megabytes_si": { "name": "Megabytes (SI)", "factor": "1" }, - "megabytes_binaer": { "name": "Megabytes (binär)", "factor": "1.048576" }, - "gigabytes_si": { "name": "Gigabytes (SI)", "factor": "1000" }, - "gigabytes_binaer": { "name": "Gigabytes (binär)", "factor": "1073.741824" }, - "terabytes_si": { "name": "Terabytes (SI)", "factor": "1000000" }, - "terabytes_binaer": { "name": "Terabytes (binär)", "factor": "1099511.627776" }, - "petabytes_si": { "name": "Petabytes (SI)", "factor": "1000000000" }, - "petabytes_binaer": { "name": "Petabytes (binär)", "factor": "1125899.906842624" } + "bits": { + "name": "Bits", + "factor": "0.000000125" + }, + "bytes": { + "name": "Bytes", + "factor": "0.000001" + }, + "kilobytes_si": { + "name": "Kilobytes (SI)", + "factor": "0.001" + }, + "kilobytes_binaer": { + "name": "Kilobytes (binär)", + "factor": "0.001024" + }, + "megabytes_si": { + "name": "Megabytes (SI)", + "factor": "1" + }, + "megabytes_binaer": { + "name": "Megabytes (binär)", + "factor": "1.048576" + }, + "gigabytes_si": { + "name": "Gigabytes (SI)", + "factor": "1000" + }, + "gigabytes_binaer": { + "name": "Gigabytes (binär)", + "factor": "1073.741824" + }, + "terabytes_si": { + "name": "Terabytes (SI)", + "factor": "1000000" + }, + "terabytes_binaer": { + "name": "Terabytes (binär)", + "factor": "1099511.627776" + }, + "petabytes_si": { + "name": "Petabytes (SI)", + "factor": "1000000000" + }, + "petabytes_binaer": { + "name": "Petabytes (binär)", + "factor": "1125899.906842624" + } } } diff --git a/hugo/data/druecke.json b/hugo/data/druecke.json index 96ee47a..f9edc5e 100644 --- a/hugo/data/druecke.json +++ b/hugo/data/druecke.json @@ -1,15 +1,49 @@ { "slug": "druecke", "name": "Drücke", + "unitOrder": [ + "pascal", + "hektopascal", + "kilopascal", + "pfund_pro_quadratzoll", + "bar", + "atmosphaeren", + "torr", + "millimeter_quecksilbersaeule" + ], "conversion_engine": "linear", "units": { - "pascal": { "name": "Pascal", "factor": "1" }, - "hektopascal": { "name": "Hektopascal", "factor": "100" }, - "kilopascal": { "name": "Kilopascal", "factor": "1000" }, - "pfund_pro_quadratzoll": { "name": "Pfund pro Quadratzoll", "factor": "6894.75729" }, - "bar": { "name": "Bar", "factor": "100000" }, - "atmosphaeren": { "name": "Atmosphären", "factor": "101325" }, - "torr": { "name": "Torr", "factor": "133.3223684" }, - "millimeter_quecksilbersaeule": { "name": "Millimeter Quecksilbersäule", "factor": "133.3223684" } + "pascal": { + "name": "Pascal", + "factor": "1" + }, + "hektopascal": { + "name": "Hektopascal", + "factor": "100" + }, + "kilopascal": { + "name": "Kilopascal", + "factor": "1000" + }, + "pfund_pro_quadratzoll": { + "name": "Pfund pro Quadratzoll", + "factor": "6894.75729" + }, + "bar": { + "name": "Bar", + "factor": "100000" + }, + "atmosphaeren": { + "name": "Atmosphären", + "factor": "101325" + }, + "torr": { + "name": "Torr", + "factor": "133.3223684" + }, + "millimeter_quecksilbersaeule": { + "name": "Millimeter Quecksilbersäule", + "factor": "133.3223684" + } } } diff --git a/hugo/data/energie.json b/hugo/data/energie.json index d9b1003..5323ee9 100644 --- a/hugo/data/energie.json +++ b/hugo/data/energie.json @@ -1,14 +1,44 @@ { "slug": "energie", "name": "Energie", + "unitOrder": [ + "joule", + "kilojoule", + "kalorien_naehrwert", + "kalorien_thermisch", + "kilowattstunden", + "foot_pounds", + "britische_waermeeinheiten" + ], "conversion_engine": "linear", "units": { - "joule": { "name": "Joule", "factor": "1" }, - "kilojoule": { "name": "Kilojoule", "factor": "1000" }, - "kalorien_naehrwert": { "name": "Kalorien (nährwert)", "factor": "4184" }, - "kalorien_thermisch": { "name": "Kalorien (thermisch)", "factor": "4.184" }, - "kilowattstunden": { "name": "Kilowattstunden", "factor": "3600000" }, - "foot_pounds": { "name": "Foot-Pound", "factor": "1.3558179483314" }, - "britische_waermeeinheiten": { "name": "Britische Wärmeeinheiten", "factor": "1055.05585262" } + "joule": { + "name": "Joule", + "factor": "1" + }, + "kilojoule": { + "name": "Kilojoule", + "factor": "1000" + }, + "kalorien_naehrwert": { + "name": "Kalorien (nährwert)", + "factor": "4184" + }, + "kalorien_thermisch": { + "name": "Kalorien (thermisch)", + "factor": "4.184" + }, + "kilowattstunden": { + "name": "Kilowattstunden", + "factor": "3600000" + }, + "foot_pounds": { + "name": "Foot-Pound", + "factor": "1.3558179483314" + }, + "britische_waermeeinheiten": { + "name": "Britische Wärmeeinheiten", + "factor": "1055.05585262" + } } } diff --git a/hugo/data/flaechen.json b/hugo/data/flaechen.json index 3e4097d..4af58e4 100644 --- a/hugo/data/flaechen.json +++ b/hugo/data/flaechen.json @@ -1,13 +1,39 @@ { "slug": "flaechen", "name": "Flächen", + "unitOrder": [ + "quadratmeter", + "quadratkilometer", + "quadratmeilen", + "quadratfuss", + "acres", + "hektar" + ], "conversion_engine": "linear", "units": { - "quadratmeter": { "name": "Quadratmeter", "factor": "1" }, - "quadratkilometer": { "name": "Quadratkilometer", "factor": "1000000" }, - "quadratmeilen": { "name": "Quadratmeilen", "factor": "2589988.11" }, - "quadratfuss": { "name": "Quadratfuß", "factor": "0.092903" }, - "acres": { "name": "Acres", "factor": "4046.86" }, - "hektar": { "name": "Hektar", "factor": "10000" } + "quadratmeter": { + "name": "Quadratmeter", + "factor": "1" + }, + "quadratkilometer": { + "name": "Quadratkilometer", + "factor": "1000000" + }, + "quadratmeilen": { + "name": "Quadratmeilen", + "factor": "2589988.11" + }, + "quadratfuss": { + "name": "Quadratfuß", + "factor": "0.092903" + }, + "acres": { + "name": "Acres", + "factor": "4046.86" + }, + "hektar": { + "name": "Hektar", + "factor": "10000" + } } } diff --git a/hugo/data/geschwindigkeiten.json b/hugo/data/geschwindigkeiten.json index 6b10221..1a169b2 100644 --- a/hugo/data/geschwindigkeiten.json +++ b/hugo/data/geschwindigkeiten.json @@ -1,14 +1,44 @@ { "slug": "geschwindigkeiten", "name": "Geschwindigkeiten", + "unitOrder": [ + "meter_pro_sekunde", + "kilometer_pro_stunde", + "fuss_pro_sekunde", + "meilen_pro_stunde", + "knoten", + "mach", + "lichtgeschwindigkeit" + ], "conversion_engine": "linear", "units": { - "meter_pro_sekunde": { "name": "Meter pro Sekunde", "factor": "1" }, - "kilometer_pro_stunde": { "name": "Kilometer pro Stunde", "factor": "0.277778" }, - "fuss_pro_sekunde": { "name": "Fuß pro Sekunde", "factor": "0.3048" }, - "meilen_pro_stunde": { "name": "Meilen pro Stunde", "factor": "0.44704" }, - "knoten": { "name": "Knoten", "factor": "0.514444" }, - "mach": { "name": "Mach", "factor": "343" }, - "lichtgeschwindigkeit": { "name": "Lichtgeschwindigkeit", "factor": "299792458" } + "meter_pro_sekunde": { + "name": "Meter pro Sekunde", + "factor": "1" + }, + "kilometer_pro_stunde": { + "name": "Kilometer pro Stunde", + "factor": "0.277778" + }, + "fuss_pro_sekunde": { + "name": "Fuß pro Sekunde", + "factor": "0.3048" + }, + "meilen_pro_stunde": { + "name": "Meilen pro Stunde", + "factor": "0.44704" + }, + "knoten": { + "name": "Knoten", + "factor": "0.514444" + }, + "mach": { + "name": "Mach", + "factor": "343" + }, + "lichtgeschwindigkeit": { + "name": "Lichtgeschwindigkeit", + "factor": "299792458" + } } } diff --git a/hugo/data/gewichte.json b/hugo/data/gewichte.json index 6c728dd..94647ff 100644 --- a/hugo/data/gewichte.json +++ b/hugo/data/gewichte.json @@ -1,18 +1,64 @@ { "slug": "gewichte", "name": "Gewichte", + "unitOrder": [ + "gramm", + "kilogramm", + "pfund", + "unzen", + "metrische_tonnen", + "kurze_tonnen", + "karat", + "milligramm", + "mikrogramm", + "stone", + "gran" + ], "conversion_engine": "linear", "units": { - "gramm": { "name": "Gramm", "factor": "1" }, - "kilogramm": { "name": "Kilogramm", "factor": "1000" }, - "pfund": { "name": "Pfund", "factor": "453.59237" }, - "unzen": { "name": "Unzen", "factor": "28.349523125" }, - "metrische_tonnen": { "name": "Metrische Tonnen", "factor": "1000000" }, - "kurze_tonnen": { "name": "Kurze Tonnen", "factor": "907184.74" }, - "karat": { "name": "Karat", "factor": "0.2" }, - "milligramm": { "name": "Milligramm", "factor": "0.001" }, - "mikrogramm": { "name": "Mikrogramm", "factor": "0.000001" }, - "stone": { "name": "Stone", "factor": "6350.29318" }, - "gran": { "name": "Gran", "factor": "0.06479891" } + "gramm": { + "name": "Gramm", + "factor": "1" + }, + "kilogramm": { + "name": "Kilogramm", + "factor": "1000" + }, + "pfund": { + "name": "Pfund", + "factor": "453.59237" + }, + "unzen": { + "name": "Unzen", + "factor": "28.349523125" + }, + "metrische_tonnen": { + "name": "Metrische Tonnen", + "factor": "1000000" + }, + "kurze_tonnen": { + "name": "Kurze Tonnen", + "factor": "907184.74" + }, + "karat": { + "name": "Karat", + "factor": "0.2" + }, + "milligramm": { + "name": "Milligramm", + "factor": "0.001" + }, + "mikrogramm": { + "name": "Mikrogramm", + "factor": "0.000001" + }, + "stone": { + "name": "Stone", + "factor": "6350.29318" + }, + "gran": { + "name": "Gran", + "factor": "0.06479891" + } } } diff --git a/hugo/data/laengen.json b/hugo/data/laengen.json index 8f32e91..fdd21a6 100644 --- a/hugo/data/laengen.json +++ b/hugo/data/laengen.json @@ -1,21 +1,79 @@ { "slug": "laengen", "name": "Längen", + "unitOrder": [ + "meter", + "kilometer", + "zentimeter", + "millimeter", + "mikrometer", + "nanometer", + "meilen", + "yard", + "fuss", + "zoll", + "seemeilen", + "lichtjahre", + "parsec", + "astronomische_einheiten" + ], "conversion_engine": "linear", "units": { - "meter": { "name": "Meter", "factor": "1" }, - "kilometer": { "name": "Kilometer", "factor": "1000" }, - "zentimeter": { "name": "Zentimeter", "factor": "0.01" }, - "millimeter": { "name": "Millimeter", "factor": "0.001" }, - "mikrometer": { "name": "Mikrometer", "factor": "0.000001" }, - "nanometer": { "name": "Nanometer", "factor": "0.000000001" }, - "meilen": { "name": "Meilen", "factor": "1609.34" }, - "yard": { "name": "Yard", "factor": "0.9144" }, - "fuss": { "name": "Fuß", "factor": "0.3048" }, - "zoll": { "name": "Zoll", "factor": "0.0254" }, - "seemeilen": { "name": "Seemeilen", "factor": "1852" }, - "lichtjahre": { "name": "Lichtjahre", "factor": "9460730472580800" }, - "parsec": { "name": "Parsec", "factor": "30856775814913673" }, - "astronomische_einheiten": { "name": "Astronomische Einheiten", "factor": "149597870700" } + "meter": { + "name": "Meter", + "factor": "1" + }, + "kilometer": { + "name": "Kilometer", + "factor": "1000" + }, + "zentimeter": { + "name": "Zentimeter", + "factor": "0.01" + }, + "millimeter": { + "name": "Millimeter", + "factor": "0.001" + }, + "mikrometer": { + "name": "Mikrometer", + "factor": "0.000001" + }, + "nanometer": { + "name": "Nanometer", + "factor": "0.000000001" + }, + "meilen": { + "name": "Meilen", + "factor": "1609.34" + }, + "yard": { + "name": "Yard", + "factor": "0.9144" + }, + "fuss": { + "name": "Fuß", + "factor": "0.3048" + }, + "zoll": { + "name": "Zoll", + "factor": "0.0254" + }, + "seemeilen": { + "name": "Seemeilen", + "factor": "1852" + }, + "lichtjahre": { + "name": "Lichtjahre", + "factor": "9460730472580800" + }, + "parsec": { + "name": "Parsec", + "factor": "30856775814913673" + }, + "astronomische_einheiten": { + "name": "Astronomische Einheiten", + "factor": "149597870700" + } } } diff --git a/hugo/data/mehrwertsteuer.json b/hugo/data/mehrwertsteuer.json index 15cfe12..465b1dd 100644 --- a/hugo/data/mehrwertsteuer.json +++ b/hugo/data/mehrwertsteuer.json @@ -1,10 +1,24 @@ { "slug": "mehrwertsteuer", "name": "Mehrwertsteuer", + "unitOrder": [ + "brutto", + "netto_allgemein", + "netto_grundbedarf" + ], "conversion_engine": "linear", "units": { - "brutto": { "name": "Brutto", "factor": "1" }, - "netto_allgemein": { "name": "Netto Allgemein (19%)", "factor": "1.19" }, - "netto_grundbedarf": { "name": "Netto Grundbedarf (7%)", "factor": "1.07" } + "brutto": { + "name": "Brutto", + "factor": "1" + }, + "netto_allgemein": { + "name": "Netto Allgemein (19%)", + "factor": "1.19" + }, + "netto_grundbedarf": { + "name": "Netto Grundbedarf (7%)", + "factor": "1.07" + } } } diff --git a/hugo/data/temperaturen.json b/hugo/data/temperaturen.json index a53185d..686720f 100644 --- a/hugo/data/temperaturen.json +++ b/hugo/data/temperaturen.json @@ -1,15 +1,15 @@ { "slug": "temperaturen", "name": "Temperaturen", + "unitOrder": [ + "celsius", + "fahrenheit", + "kelvin", + "rankine", + "reaumur" + ], "conversion_engine": "intermediate", "intermediate_unit": "celsius", - "units": { - "celsius": { "name": "Celsius" }, - "fahrenheit": { "name": "Fahrenheit" }, - "kelvin": { "name": "Kelvin" }, - "rankine": { "name": "Rankine" }, - "reaumur": { "name": "Réaumur" } - }, "to_intermediate": { "fahrenheit": "(v - 32) * 5/9", "kelvin": "v - 273.15", @@ -21,5 +21,22 @@ "kelvin": "v + 273.15", "rankine": "(v + 273.15) * 9/5", "reaumur": "v * 4/5" + }, + "units": { + "celsius": { + "name": "Celsius" + }, + "fahrenheit": { + "name": "Fahrenheit" + }, + "kelvin": { + "name": "Kelvin" + }, + "rankine": { + "name": "Rankine" + }, + "reaumur": { + "name": "Réaumur" + } } } diff --git a/hugo/data/volumen.json b/hugo/data/volumen.json index 836f61c..4423135 100644 --- a/hugo/data/volumen.json +++ b/hugo/data/volumen.json @@ -1,28 +1,114 @@ { "slug": "volumen", "name": "Volumen", + "unitOrder": [ + "kubikmeter", + "kubikfuss", + "kubikzoll", + "liter", + "milliliter", + "gallonen_us", + "gallonen_uk", + "barrels_us", + "barrels_uk", + "fluidunzen_us", + "fluidunzen_uk", + "cups_us", + "cups_uk", + "pints_us", + "pints_uk", + "quarts_us", + "quarts_uk", + "drams_us", + "drams_uk", + "essloeffel", + "teeloeffel" + ], "conversion_engine": "linear", "units": { - "kubikmeter": { "name": "Kubikmeter", "factor": "1000" }, - "kubikfuss": { "name": "Kubikfuß", "factor": "28.316846592" }, - "kubikzoll": { "name": "Kubikzoll", "factor": "0.016387064" }, - "liter": { "name": "Liter", "factor": "1" }, - "milliliter": { "name": "Milliliter", "factor": "0.001" }, - "gallonen_us": { "name": "Gallonen (US)", "factor": "3.785411784" }, - "gallonen_uk": { "name": "Gallonen (UK)", "factor": "4.54609188" }, - "barrels_us": { "name": "Barrels (US)", "factor": "158.987294928" }, - "barrels_uk": { "name": "Barrels (UK)", "factor": "163.65923999999998" }, - "fluidunzen_us": { "name": "Fluidunzen (US)", "factor": "0.0295735295625" }, - "fluidunzen_uk": { "name": "Fluidunzen (UK)", "factor": "0.0284130625" }, - "cups_us": { "name": "Cups (US)", "factor": "0.2365882365" }, - "cups_uk": { "name": "Cups (UK)", "factor": "0.284130625" }, - "pints_us": { "name": "Pints (US)", "factor": "0.473176473" }, - "pints_uk": { "name": "Pints (UK)", "factor": "0.56826125" }, - "quarts_us": { "name": "Quarts (US)", "factor": "0.946352946" }, - "quarts_uk": { "name": "Quarts (UK)", "factor": "1.1365225" }, - "drams_us": { "name": "Drams (US)", "factor": "0.0036966911953125" }, - "drams_uk": { "name": "Drams (UK)", "factor": "0.0035516328125" }, - "essloeffel": { "name": "Esslöffel", "factor": "0.01478676478125" }, - "teeloeffel": { "name": "Teelöffel", "factor": "0.00492892159375" } + "kubikmeter": { + "name": "Kubikmeter", + "factor": "1000" + }, + "kubikfuss": { + "name": "Kubikfuß", + "factor": "28.316846592" + }, + "kubikzoll": { + "name": "Kubikzoll", + "factor": "0.016387064" + }, + "liter": { + "name": "Liter", + "factor": "1" + }, + "milliliter": { + "name": "Milliliter", + "factor": "0.001" + }, + "gallonen_us": { + "name": "Gallonen (US)", + "factor": "3.785411784" + }, + "gallonen_uk": { + "name": "Gallonen (UK)", + "factor": "4.54609188" + }, + "barrels_us": { + "name": "Barrels (US)", + "factor": "158.987294928" + }, + "barrels_uk": { + "name": "Barrels (UK)", + "factor": "163.65923999999998" + }, + "fluidunzen_us": { + "name": "Fluidunzen (US)", + "factor": "0.0295735295625" + }, + "fluidunzen_uk": { + "name": "Fluidunzen (UK)", + "factor": "0.0284130625" + }, + "cups_us": { + "name": "Cups (US)", + "factor": "0.2365882365" + }, + "cups_uk": { + "name": "Cups (UK)", + "factor": "0.284130625" + }, + "pints_us": { + "name": "Pints (US)", + "factor": "0.473176473" + }, + "pints_uk": { + "name": "Pints (UK)", + "factor": "0.56826125" + }, + "quarts_us": { + "name": "Quarts (US)", + "factor": "0.946352946" + }, + "quarts_uk": { + "name": "Quarts (UK)", + "factor": "1.1365225" + }, + "drams_us": { + "name": "Drams (US)", + "factor": "0.0036966911953125" + }, + "drams_uk": { + "name": "Drams (UK)", + "factor": "0.0035516328125" + }, + "essloeffel": { + "name": "Esslöffel", + "factor": "0.01478676478125" + }, + "teeloeffel": { + "name": "Teelöffel", + "factor": "0.00492892159375" + } } } diff --git a/hugo/data/waehrungen.json b/hugo/data/waehrungen.json index 69d0a38..4a62ac1 100644 --- a/hugo/data/waehrungen.json +++ b/hugo/data/waehrungen.json @@ -1,37 +1,129 @@ { "slug": "waehrungen", "name": "Währungen", + "unitOrder": [ + "eur", + "usd", + "gbp", + "chf", + "jpy", + "cad", + "aud", + "cny", + "inr", + "brl", + "rub", + "zar", + "mxn", + "sgd", + "hkd", + "nzd", + "sek", + "nok", + "dkk", + "pln", + "czk", + "huf", + "try", + "aed", + "sar", + "thb", + "idr", + "krw", + "php", + "egp" + ], "conversion_engine": "runtime", "units": { - "eur": { "name": "Euro" }, - "usd": { "name": "US-Dollar" }, - "gbp": { "name": "Britisches Pfund" }, - "chf": { "name": "Schweizer Franken" }, - "jpy": { "name": "Japanischer Yen" }, - "cad": { "name": "Kanadischer Dollar" }, - "aud": { "name": "Australischer Dollar" }, - "cny": { "name": "Chinesischer Yuan" }, - "inr": { "name": "Indische Rupie" }, - "brl": { "name": "Brasilianischer Real" }, - "rub": { "name": "Russischer Rubel" }, - "zar": { "name": "Südafrikanischer Rand" }, - "mxn": { "name": "Mexikanischer Peso" }, - "sgd": { "name": "Singapur-Dollar" }, - "hkd": { "name": "Hongkong-Dollar" }, - "nzd": { "name": "Neuseeland-Dollar" }, - "sek": { "name": "Schwedische Krone" }, - "nok": { "name": "Norwegische Krone" }, - "dkk": { "name": "Dänische Krone" }, - "pln": { "name": "Polnischer Zloty" }, - "czk": { "name": "Tschechische Krone" }, - "huf": { "name": "Ungarischer Forint" }, - "try": { "name": "Türkische Lira" }, - "aed": { "name": "VAE-Dirham" }, - "sar": { "name": "Saudi-Riyal" }, - "thb": { "name": "Thailändischer Baht" }, - "idr": { "name": "Indonesische Rupiah" }, - "krw": { "name": "Südkoreanischer Won" }, - "php": { "name": "Philippinischer Peso" }, - "egp": { "name": "Ägyptisches Pfund" } + "eur": { + "name": "Euro" + }, + "usd": { + "name": "US-Dollar" + }, + "gbp": { + "name": "Britisches Pfund" + }, + "chf": { + "name": "Schweizer Franken" + }, + "jpy": { + "name": "Japanischer Yen" + }, + "cad": { + "name": "Kanadischer Dollar" + }, + "aud": { + "name": "Australischer Dollar" + }, + "cny": { + "name": "Chinesischer Yuan" + }, + "inr": { + "name": "Indische Rupie" + }, + "brl": { + "name": "Brasilianischer Real" + }, + "rub": { + "name": "Russischer Rubel" + }, + "zar": { + "name": "Südafrikanischer Rand" + }, + "mxn": { + "name": "Mexikanischer Peso" + }, + "sgd": { + "name": "Singapur-Dollar" + }, + "hkd": { + "name": "Hongkong-Dollar" + }, + "nzd": { + "name": "Neuseeland-Dollar" + }, + "sek": { + "name": "Schwedische Krone" + }, + "nok": { + "name": "Norwegische Krone" + }, + "dkk": { + "name": "Dänische Krone" + }, + "pln": { + "name": "Polnischer Zloty" + }, + "czk": { + "name": "Tschechische Krone" + }, + "huf": { + "name": "Ungarischer Forint" + }, + "try": { + "name": "Türkische Lira" + }, + "aed": { + "name": "VAE-Dirham" + }, + "sar": { + "name": "Saudi-Riyal" + }, + "thb": { + "name": "Thailändischer Baht" + }, + "idr": { + "name": "Indonesische Rupiah" + }, + "krw": { + "name": "Südkoreanischer Won" + }, + "php": { + "name": "Philippinischer Peso" + }, + "egp": { + "name": "Ägyptisches Pfund" + } } } diff --git a/hugo/data/winkel.json b/hugo/data/winkel.json index 037f266..87dab5e 100644 --- a/hugo/data/winkel.json +++ b/hugo/data/winkel.json @@ -1,10 +1,24 @@ { "slug": "winkel", "name": "Winkel", + "unitOrder": [ + "grad", + "bogenmass", + "gon" + ], "conversion_engine": "linear", "units": { - "grad": { "name": "Grad", "factor": "0.017453292519943295" }, - "bogenmass": { "name": "Bogenmaß", "factor": "1" }, - "gon": { "name": "Gon", "factor": "0.015707963267948966" } + "grad": { + "name": "Grad", + "factor": "0.017453292519943295" + }, + "bogenmass": { + "name": "Bogenmaß", + "factor": "1" + }, + "gon": { + "name": "Gon", + "factor": "0.015707963267948966" + } } } diff --git a/hugo/data/zeiten.json b/hugo/data/zeiten.json index 692f5ae..40b72ed 100644 --- a/hugo/data/zeiten.json +++ b/hugo/data/zeiten.json @@ -1,17 +1,59 @@ { "slug": "zeiten", "name": "Zeiten", + "unitOrder": [ + "sekunden", + "minuten", + "stunden", + "tage", + "wochen", + "monate", + "jahre", + "millisekunden", + "mikrosekunden", + "nanosekunden" + ], "conversion_engine": "linear", "units": { - "sekunden": { "name": "Sekunden", "factor": "0.0002777777777777778" }, - "minuten": { "name": "Minuten", "factor": "0.016666666666666666" }, - "stunden": { "name": "Stunden", "factor": "1" }, - "tage": { "name": "Tage", "factor": "24" }, - "wochen": { "name": "Wochen", "factor": "168" }, - "monate": { "name": "Monate", "factor": "730.485" }, - "jahre": { "name": "Jahre", "factor": "8765.82" }, - "millisekunden": { "name": "Millisekunden", "factor": "0.00000027777777777777777777777777777778" }, - "mikrosekunden": { "name": "Mikrosekunden", "factor": "0.00000000027777777777777777777777777778" }, - "nanosekunden": { "name": "Nanosekunden", "factor": "0.00000000000027777777777777777777777778" } + "sekunden": { + "name": "Sekunden", + "factor": "0.0002777777777777778" + }, + "minuten": { + "name": "Minuten", + "factor": "0.016666666666666666" + }, + "stunden": { + "name": "Stunden", + "factor": "1" + }, + "tage": { + "name": "Tage", + "factor": "24" + }, + "wochen": { + "name": "Wochen", + "factor": "168" + }, + "monate": { + "name": "Monate", + "factor": "730.485" + }, + "jahre": { + "name": "Jahre", + "factor": "8765.82" + }, + "millisekunden": { + "name": "Millisekunden", + "factor": "0.00000027777777777777777777777777777778" + }, + "mikrosekunden": { + "name": "Mikrosekunden", + "factor": "0.00000000027777777777777777777777777778" + }, + "nanosekunden": { + "name": "Nanosekunden", + "factor": "0.00000000000027777777777777777777777778" + } } } diff --git a/hugo/layouts/conversion/single.html b/hugo/layouts/conversion/single.html index 2079bc7..f43c10c 100644 --- a/hugo/layouts/conversion/single.html +++ b/hugo/layouts/conversion/single.html @@ -82,11 +82,12 @@ @change="navigateWithValue( $event.target.value)" class="select mt-1 block w-full"> - {{ range $unit, $unitData := $availableUnits }} - {{ if ne $unit $.Params.to }} + {{ range $catData.unitOrder }} + {{ $unitData := index $availableUnits . }} + {{ if and $unitData (ne . $.Params.to) }} @@ -127,11 +128,12 @@ @change="navigateWithValue( $event.target.value)" class="select mt-1 block w-full"> - {{ range $unit, $unitData := $availableUnits }} - {{ if ne $unit $.Params.from }} + {{ range $catData.unitOrder }} + {{ $unitData := index $availableUnits . }} + {{ if and $unitData (ne . $.Params.from) }} diff --git a/hugo/layouts/partials/category-url.html b/hugo/layouts/partials/category-url.html index 51dd01c..241a666 100644 --- a/hugo/layouts/partials/category-url.html +++ b/hugo/layouts/partials/category-url.html @@ -1 +1 @@ -{{- $category := .category }}{{ $units := .units }}{{ $available := partial "available-units.html" (dict "category" $category "units" $units) }}{{ $url := "" }}{{ if gt (len $available) 0 }}{{ $firstUnit := "" }}{{ $secondUnit := "" }}{{ range $u, $_ := $available }}{{ if eq $firstUnit "" }}{{ $firstUnit = $u }}{{ else if eq $secondUnit "" }}{{ $secondUnit = $u }}{{ end }}{{ end }}{{ $url = printf "/%s-in-%s/" $firstUnit $secondUnit }}{{ end }}{{- $url -}} +{{- $category := .category }}{{ $units := .units }}{{ $available := partial "available-units.html" (dict "category" $category "units" $units) }}{{ $url := "" }}{{ if gt (len $available) 0 }}{{ $catData := index hugo.Data $category }}{{ $firstUnit := "" }}{{ $secondUnit := "" }}{{ range $catData.unitOrder }}{{ $unitData := index $available . }}{{ if $unitData }}{{ if eq $firstUnit "" }}{{ $firstUnit = . }}{{ else if eq $secondUnit "" }}{{ $secondUnit = . }}{{ end }}{{ end }}{{ end }}{{ $url = printf "/%s-in-%s/" $firstUnit $secondUnit }}{{ end }}{{- $url -}} diff --git a/hugo/layouts/partials/footer.html b/hugo/layouts/partials/footer.html index 4c2f7fe..91e5af3 100644 --- a/hugo/layouts/partials/footer.html +++ b/hugo/layouts/partials/footer.html @@ -9,12 +9,14 @@
{{ $data.name }}