diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c935bc8dd56aac090c338b37d07e1c06fa9f23aa..2342c69e6cc0455c578a87f1101501346f5e7020 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,53 +1,55 @@ # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Python.gitlab-ci.yml include: - - 'https://gitlab.com/Cynerd/gitlab-ci-nix/-/raw/master/template.yml' + - local: .gitlab/build-year.yml + inputs: + year: 2025 + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - local: .gitlab/build-year.yml + inputs: + year: 2024 + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH stages: - build - comment -variables: - NIX_CACHE_HOME: "./nix-cache" - build: - extends: .nix + image: python:3-alpine + stage: build rules: - - if: $CI_PIPELINE_SOURCE == $CI_PIPELINE_SOURCE # Truly terrible syntax (otherwise, won’t run during MR as a side effect of the rule in comment ) - stage: "build" - cache: - key: nix-user-cache - paths: - - nix-cache + - when: always script: - - NIX_CACHE_HOME=$(pwd)/nix-cache - - "nix run --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs/25.05#python3 -- ./tools/merge_data.py ./entries atlas2024.json" - - "nix run --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs/25.05#python3 -- ./tools/merge_data.py ./entries2025 atlas2025.json" + - python ./tools/merge_data.py ./entries/2024 ./atlas2024.json + - python ./tools/merge_data.py ./entries/2025 ./atlas2025.json artifacts: - expire_in: "1 year" + expire_in: "1 hour" expose_as: "atlas_json" paths: - "atlas2024.json" - "atlas2025.json" comment: - extends: .nix + image: alpine stage: "comment" rules: - if: "$CI_PIPELINE_SOURCE == 'merge_request_event'" - cache: - key: nix-user-cache - paths: - - nix-cache + dependencies: + - build + needs: + - build + before_script: + - apk add curl jq script: # Here are the comments that will always be added # - DOCUMENTATION="Did you update the corresponding documentation?" # Here we parse them into URL # - DOCUMENTATION_PARSED=$(echo $DOCUMENTATION | sed 's/ /%20/g') - - NIX_CACHE_HOME=$(pwd)/nix-cache - ATLAS2024_JSON_URL=$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/artifacts/refs/merge-requests/$CI_MERGE_REQUEST_IID/head/raw/atlas2024.json?job=build - ATLAS2025_JSON_URL=$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/artifacts/refs/merge-requests/$CI_MERGE_REQUEST_IID/head/raw/atlas2025.json?job=build - - BODY="You can preview the data [here for 2024](https://atlas.mariusdavid.fr?atlas=$(nix --extra-experimental-features nix-command --extra-experimental-features flakes run nixpkgs/25.05#urlencode -- $ATLAS2024_JSON_URL)) and [here for 2025](https://atlas2025.mariusdavid.fr?atlas=$(nix --extra-experimental-features nix-command --extra-experimental-features flakes run nixpkgs/25.05#urlencode -- $ATLAS2025_JSON_URL))." + - BODY="You can preview the data [here for 2024](https://2024.canvas-atlas.fediverse.events?atlas=$(jq -rn --arg x "$ATLAS2024_JSON_URL" '$x|@uri')) and [here for 2025](https://2025.canvas-atlas.fediverse.events?atlas=$(jq -rn --arg x "$ATLAS2025_JSON_URL" '$x|@uri'))." - echo $BODY # And finally we post them on your merge request! - - 'curl --request POST --header "PRIVATE-TOKEN: ${GITLAB_CI_COMMENT_API_KEY}" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/merge_requests/$CI_MERGE_REQUEST_IID/notes" --data-urlencode "body=$BODY"' + - 'curl --fail --request POST --header "PRIVATE-TOKEN: ${GITLAB_CI_COMMENT_API_KEY}" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/merge_requests/$CI_MERGE_REQUEST_IID/notes" --data-urlencode "body=$BODY"' diff --git a/.gitlab/build-year.yml b/.gitlab/build-year.yml new file mode 100644 index 0000000000000000000000000000000000000000..86a2b4b0858364d8ece7a0292ad5808b13aa690b --- /dev/null +++ b/.gitlab/build-year.yml @@ -0,0 +1,41 @@ +spec: + inputs: + year: + type: string +--- +build $[[ inputs.year ]]: + image: python:3-alpine + stage: build + before_script: + - apk add git git-lfs + script: + - git lfs install && git lfs pull + - mkdir -p ./web/atlas + - python ./tools/merge_data.py ./entries/$[[ inputs.year ]] ./web/atlas/$[[ inputs.year ]].json + - python ./tools/pre_process.py $[[ inputs.year ]] ./web + - rm -f ./web/index_template.html + artifacts: + expire_in: 1 hour + expose_as: atlas_$[[ inputs.year ]] + paths: + - ./web + +deploy $[[ inputs.year ]]: + image: alpine + stage: deploy + dependencies: + - build $[[ inputs.year ]] + needs: + - build $[[ inputs.year ]] + before_script: + - apk add curl zip + script: + - | + # 📁 Creating zip + zip -r archive.zip web + - | + # ✨ Send artifact to deployer + curl -X POST --fail-with-body \ + -H "Authorization: Bearer $DEPLOY_KEY_$[[ inputs.year ]]" \ + -F "file=@archive.zip" \ + -s -o /dev/null -w "Deploy Status: %{http_code}" --fail https://deploy.sc07.company/deploy diff --git a/entries/.keep b/entries/2024/.keep similarity index 100% rename from entries/.keep rename to entries/2024/.keep diff --git a/entries/16_bit_mario_mario_kart_.json b/entries/2024/16_bit_mario_mario_kart_.json similarity index 100% rename from entries/16_bit_mario_mario_kart_.json rename to entries/2024/16_bit_mario_mario_kart_.json diff --git a/entries/502_bad_gateway.json b/entries/2024/502_bad_gateway.json similarity index 100% rename from entries/502_bad_gateway.json rename to entries/2024/502_bad_gateway.json diff --git a/entries/8_bit_link_the_legend_of_zelda_.json b/entries/2024/8_bit_link_the_legend_of_zelda_.json similarity index 100% rename from entries/8_bit_link_the_legend_of_zelda_.json rename to entries/2024/8_bit_link_the_legend_of_zelda_.json diff --git a/entries/8_bit_mario_super_mario_.json b/entries/2024/8_bit_mario_super_mario_.json similarity index 100% rename from entries/8_bit_mario_super_mario_.json rename to entries/2024/8_bit_mario_super_mario_.json diff --git a/entries/a_completly_accurate_depiction_of_a_irl_friend_of_mine_.json b/entries/2024/a_completly_accurate_depiction_of_a_irl_friend_of_mine_.json similarity index 100% rename from entries/a_completly_accurate_depiction_of_a_irl_friend_of_mine_.json rename to entries/2024/a_completly_accurate_depiction_of_a_irl_friend_of_mine_.json diff --git a/entries/alastor_from_hazbin_hotel.json b/entries/2024/alastor_from_hazbin_hotel.json similarity index 100% rename from entries/alastor_from_hazbin_hotel.json rename to entries/2024/alastor_from_hazbin_hotel.json diff --git a/entries/among_us_red_crewmate.json b/entries/2024/among_us_red_crewmate.json similarity index 100% rename from entries/among_us_red_crewmate.json rename to entries/2024/among_us_red_crewmate.json diff --git a/entries/android_bugdroid.json b/entries/2024/android_bugdroid.json similarity index 100% rename from entries/android_bugdroid.json rename to entries/2024/android_bugdroid.json diff --git a/entries/antifa_symbol.json b/entries/2024/antifa_symbol.json similarity index 100% rename from entries/antifa_symbol.json rename to entries/2024/antifa_symbol.json diff --git a/entries/aperture_science.json b/entries/2024/aperture_science.json similarity index 100% rename from entries/aperture_science.json rename to entries/2024/aperture_science.json diff --git a/entries/arch_linux_logo.json b/entries/2024/arch_linux_logo.json similarity index 100% rename from entries/arch_linux_logo.json rename to entries/2024/arch_linux_logo.json diff --git a/entries/arecibo_message.json b/entries/2024/arecibo_message.json similarity index 100% rename from entries/arecibo_message.json rename to entries/2024/arecibo_message.json diff --git a/entries/ariane_6.json b/entries/2024/ariane_6.json similarity index 100% rename from entries/ariane_6.json rename to entries/2024/ariane_6.json diff --git a/entries/australian_flag_.json b/entries/2024/australian_flag_.json similarity index 100% rename from entries/australian_flag_.json rename to entries/2024/australian_flag_.json diff --git a/entries/austria_flag.json b/entries/2024/austria_flag.json similarity index 100% rename from entries/austria_flag.json rename to entries/2024/austria_flag.json diff --git a/entries/balatro.json b/entries/2024/balatro.json similarity index 100% rename from entries/balatro.json rename to entries/2024/balatro.json diff --git a/entries/belgium_flag.json b/entries/2024/belgium_flag.json similarity index 100% rename from entries/belgium_flag.json rename to entries/2024/belgium_flag.json diff --git a/entries/bender_futurama_.json b/entries/2024/bender_futurama_.json similarity index 100% rename from entries/bender_futurama_.json rename to entries/2024/bender_futurama_.json diff --git a/entries/bigger_triforce.json b/entries/2024/bigger_triforce.json similarity index 100% rename from entries/bigger_triforce.json rename to entries/2024/bigger_triforce.json diff --git a/entries/biggest_triforce.json b/entries/2024/biggest_triforce.json similarity index 100% rename from entries/biggest_triforce.json rename to entries/2024/biggest_triforce.json diff --git a/entries/bisexual_flag.json b/entries/2024/bisexual_flag.json similarity index 100% rename from entries/bisexual_flag.json rename to entries/2024/bisexual_flag.json diff --git a/entries/blahaj_zone_mascot.json b/entries/2024/blahaj_zone_mascot.json similarity index 100% rename from entries/blahaj_zone_mascot.json rename to entries/2024/blahaj_zone_mascot.json diff --git a/entries/blinky_friends_vs_pacman.json b/entries/2024/blinky_friends_vs_pacman.json similarity index 100% rename from entries/blinky_friends_vs_pacman.json rename to entries/2024/blinky_friends_vs_pacman.json diff --git a/entries/blinky_pacman_.json b/entries/2024/blinky_pacman_.json similarity index 100% rename from entries/blinky_pacman_.json rename to entries/2024/blinky_pacman_.json diff --git a/entries/blobhaj_witch.json b/entries/2024/blobhaj_witch.json similarity index 100% rename from entries/blobhaj_witch.json rename to entries/2024/blobhaj_witch.json diff --git a/entries/block_o.json b/entries/2024/block_o.json similarity index 100% rename from entries/block_o.json rename to entries/2024/block_o.json diff --git a/entries/blue_butterfly.json b/entries/2024/blue_butterfly.json similarity index 100% rename from entries/blue_butterfly.json rename to entries/2024/blue_butterfly.json diff --git a/entries/brandon_sanderson_s_cosmere.json b/entries/2024/brandon_sanderson_s_cosmere.json similarity index 100% rename from entries/brandon_sanderson_s_cosmere.json rename to entries/2024/brandon_sanderson_s_cosmere.json diff --git a/entries/brown_chicken_stardew_valley_.json b/entries/2024/brown_chicken_stardew_valley_.json similarity index 100% rename from entries/brown_chicken_stardew_valley_.json rename to entries/2024/brown_chicken_stardew_valley_.json diff --git a/entries/bulgaria_flag.json b/entries/2024/bulgaria_flag.json similarity index 100% rename from entries/bulgaria_flag.json rename to entries/2024/bulgaria_flag.json diff --git a/entries/canvas_logo.json b/entries/2024/canvas_logo.json similarity index 100% rename from entries/canvas_logo.json rename to entries/2024/canvas_logo.json diff --git a/entries/cccac.json b/entries/2024/cccac.json similarity index 100% rename from entries/cccac.json rename to entries/2024/cccac.json diff --git a/entries/cece_s_otomo.json b/entries/2024/cece_s_otomo.json similarity index 100% rename from entries/cece_s_otomo.json rename to entries/2024/cece_s_otomo.json diff --git a/entries/chaosknoten.json b/entries/2024/chaosknoten.json similarity index 100% rename from entries/chaosknoten.json rename to entries/2024/chaosknoten.json diff --git a/entries/chicken_egg_stardew_valley_.json b/entries/2024/chicken_egg_stardew_valley_.json similarity index 100% rename from entries/chicken_egg_stardew_valley_.json rename to entries/2024/chicken_egg_stardew_valley_.json diff --git a/entries/chloe_price.json b/entries/2024/chloe_price.json similarity index 100% rename from entries/chloe_price.json rename to entries/2024/chloe_price.json diff --git a/entries/clyde_friends_vs_pacman.json b/entries/2024/clyde_friends_vs_pacman.json similarity index 100% rename from entries/clyde_friends_vs_pacman.json rename to entries/2024/clyde_friends_vs_pacman.json diff --git a/entries/coat_of_arms_of_agrunas.json b/entries/2024/coat_of_arms_of_agrunas.json similarity index 100% rename from entries/coat_of_arms_of_agrunas.json rename to entries/2024/coat_of_arms_of_agrunas.json diff --git a/entries/coat_of_arms_of_ukraine.json b/entries/2024/coat_of_arms_of_ukraine.json similarity index 100% rename from entries/coat_of_arms_of_ukraine.json rename to entries/2024/coat_of_arms_of_ukraine.json diff --git a/entries/couleur.json b/entries/2024/couleur.json similarity index 100% rename from entries/couleur.json rename to entries/2024/couleur.json diff --git a/entries/counter_strike_initials.json b/entries/2024/counter_strike_initials.json similarity index 100% rename from entries/counter_strike_initials.json rename to entries/2024/counter_strike_initials.json diff --git a/entries/croatia_flag.json b/entries/2024/croatia_flag.json similarity index 100% rename from entries/croatia_flag.json rename to entries/2024/croatia_flag.json diff --git a/entries/crux.json b/entries/2024/crux.json similarity index 100% rename from entries/crux.json rename to entries/2024/crux.json diff --git a/entries/czechia_flag.json b/entries/2024/czechia_flag.json similarity index 100% rename from entries/czechia_flag.json rename to entries/2024/czechia_flag.json diff --git a/entries/d_e_k_a.json b/entries/2024/d_e_k_a.json similarity index 100% rename from entries/d_e_k_a.json rename to entries/2024/d_e_k_a.json diff --git a/entries/dannebrog_danish_flag_.json b/entries/2024/dannebrog_danish_flag_.json similarity index 100% rename from entries/dannebrog_danish_flag_.json rename to entries/2024/dannebrog_danish_flag_.json diff --git a/entries/debian_logo.json b/entries/2024/debian_logo.json similarity index 100% rename from entries/debian_logo.json rename to entries/2024/debian_logo.json diff --git a/entries/dn42.json b/entries/2024/dn42.json similarity index 100% rename from entries/dn42.json rename to entries/2024/dn42.json diff --git a/entries/dominion.json b/entries/2024/dominion.json similarity index 100% rename from entries/dominion.json rename to entries/2024/dominion.json diff --git a/entries/donotsta_re.json b/entries/2024/donotsta_re.json similarity index 100% rename from entries/donotsta_re.json rename to entries/2024/donotsta_re.json diff --git a/entries/duck_stardew_valley_.json b/entries/2024/duck_stardew_valley_.json similarity index 100% rename from entries/duck_stardew_valley_.json rename to entries/2024/duck_stardew_valley_.json diff --git a/entries/duke.json b/entries/2024/duke.json similarity index 100% rename from entries/duke.json rename to entries/2024/duke.json diff --git a/entries/elden_ring.json b/entries/2024/elden_ring.json similarity index 100% rename from entries/elden_ring.json rename to entries/2024/elden_ring.json diff --git a/entries/elwood_s_dog_meat.json b/entries/2024/elwood_s_dog_meat.json similarity index 100% rename from entries/elwood_s_dog_meat.json rename to entries/2024/elwood_s_dog_meat.json diff --git a/entries/elwood_s_dog_meat_url.json b/entries/2024/elwood_s_dog_meat_url.json similarity index 100% rename from entries/elwood_s_dog_meat_url.json rename to entries/2024/elwood_s_dog_meat_url.json diff --git a/entries/esperanto_flag.json b/entries/2024/esperanto_flag.json similarity index 100% rename from entries/esperanto_flag.json rename to entries/2024/esperanto_flag.json diff --git a/entries/estonia_flag.json b/entries/2024/estonia_flag.json similarity index 100% rename from entries/estonia_flag.json rename to entries/2024/estonia_flag.json diff --git a/entries/eu_flag.json b/entries/2024/eu_flag.json similarity index 100% rename from entries/eu_flag.json rename to entries/2024/eu_flag.json diff --git a/entries/factorio.json b/entries/2024/factorio.json similarity index 100% rename from entries/factorio.json rename to entries/2024/factorio.json diff --git a/entries/fauna_s_sapling.json b/entries/2024/fauna_s_sapling.json similarity index 100% rename from entries/fauna_s_sapling.json rename to entries/2024/fauna_s_sapling.json diff --git a/entries/fediverse_logo_alternative.json b/entries/2024/fediverse_logo_alternative.json similarity index 100% rename from entries/fediverse_logo_alternative.json rename to entries/2024/fediverse_logo_alternative.json diff --git a/entries/fedora_logo.json b/entries/2024/fedora_logo.json similarity index 100% rename from entries/fedora_logo.json rename to entries/2024/fedora_logo.json diff --git a/entries/ferris.json b/entries/2024/ferris.json similarity index 100% rename from entries/ferris.json rename to entries/2024/ferris.json diff --git a/entries/finland_flag.json b/entries/2024/finland_flag.json similarity index 100% rename from entries/finland_flag.json rename to entries/2024/finland_flag.json diff --git a/entries/flag_of_brittany.json b/entries/2024/flag_of_brittany.json similarity index 100% rename from entries/flag_of_brittany.json rename to entries/2024/flag_of_brittany.json diff --git a/entries/flag_of_costa_rica.json b/entries/2024/flag_of_costa_rica.json similarity index 100% rename from entries/flag_of_costa_rica.json rename to entries/2024/flag_of_costa_rica.json diff --git a/entries/flag_of_tuvalu.json b/entries/2024/flag_of_tuvalu.json similarity index 100% rename from entries/flag_of_tuvalu.json rename to entries/2024/flag_of_tuvalu.json diff --git a/entries/flag_of_vepida.json b/entries/2024/flag_of_vepida.json similarity index 100% rename from entries/flag_of_vepida.json rename to entries/2024/flag_of_vepida.json diff --git a/entries/flower.json b/entries/2024/flower.json similarity index 100% rename from entries/flower.json rename to entries/2024/flower.json diff --git a/entries/france_flag.json b/entries/2024/france_flag.json similarity index 100% rename from entries/france_flag.json rename to entries/2024/france_flag.json diff --git a/entries/freecad_logo.json b/entries/2024/freecad_logo.json similarity index 100% rename from entries/freecad_logo.json rename to entries/2024/freecad_logo.json diff --git a/entries/fuck_afd.json b/entries/2024/fuck_afd.json similarity index 100% rename from entries/fuck_afd.json rename to entries/2024/fuck_afd.json diff --git a/entries/fuck_putin.json b/entries/2024/fuck_putin.json similarity index 100% rename from entries/fuck_putin.json rename to entries/2024/fuck_putin.json diff --git a/entries/game_of_life.json b/entries/2024/game_of_life.json similarity index 100% rename from entries/game_of_life.json rename to entries/2024/game_of_life.json diff --git a/entries/germany_flag.json b/entries/2024/germany_flag.json similarity index 100% rename from entries/germany_flag.json rename to entries/2024/germany_flag.json diff --git a/entries/godot_logo.json b/entries/2024/godot_logo.json similarity index 100% rename from entries/godot_logo.json rename to entries/2024/godot_logo.json diff --git a/entries/gog_com_logo.json b/entries/2024/gog_com_logo.json similarity index 100% rename from entries/gog_com_logo.json rename to entries/2024/gog_com_logo.json diff --git a/entries/grapheneos_logo.json b/entries/2024/grapheneos_logo.json similarity index 100% rename from entries/grapheneos_logo.json rename to entries/2024/grapheneos_logo.json diff --git a/entries/greg.json b/entries/2024/greg.json similarity index 100% rename from entries/greg.json rename to entries/2024/greg.json diff --git a/entries/grom_fight_lumity.json b/entries/2024/grom_fight_lumity.json similarity index 100% rename from entries/grom_fight_lumity.json rename to entries/2024/grom_fight_lumity.json diff --git a/entries/grub.json b/entries/2024/grub.json similarity index 100% rename from entries/grub.json rename to entries/2024/grub.json diff --git a/entries/grub_in_a_jar.json b/entries/2024/grub_in_a_jar.json similarity index 100% rename from entries/grub_in_a_jar.json rename to entries/2024/grub_in_a_jar.json diff --git a/entries/guybrush_threepwood.json b/entries/2024/guybrush_threepwood.json similarity index 100% rename from entries/guybrush_threepwood.json rename to entries/2024/guybrush_threepwood.json diff --git a/entries/half_life_lambda_logo.json b/entries/2024/half_life_lambda_logo.json similarity index 100% rename from entries/half_life_lambda_logo.json rename to entries/2024/half_life_lambda_logo.json diff --git a/entries/happy_mac.json b/entries/2024/happy_mac.json similarity index 100% rename from entries/happy_mac.json rename to entries/2024/happy_mac.json diff --git a/entries/haskell.json b/entries/2024/haskell.json similarity index 100% rename from entries/haskell.json rename to entries/2024/haskell.json diff --git a/entries/hello_internet_podcast.json b/entries/2024/hello_internet_podcast.json similarity index 100% rename from entries/hello_internet_podcast.json rename to entries/2024/hello_internet_podcast.json diff --git a/entries/hobbes_holding_a_bottle_of_wine.json b/entries/2024/hobbes_holding_a_bottle_of_wine.json similarity index 100% rename from entries/hobbes_holding_a_bottle_of_wine.json rename to entries/2024/hobbes_holding_a_bottle_of_wine.json diff --git a/entries/hong_kong_protests_logo.json b/entries/2024/hong_kong_protests_logo.json similarity index 100% rename from entries/hong_kong_protests_logo.json rename to entries/2024/hong_kong_protests_logo.json diff --git a/entries/hungary_flag.json b/entries/2024/hungary_flag.json similarity index 100% rename from entries/hungary_flag.json rename to entries/2024/hungary_flag.json diff --git a/entries/india.json b/entries/2024/india.json similarity index 100% rename from entries/india.json rename to entries/2024/india.json diff --git a/entries/ingress_enlightened_logo.json b/entries/2024/ingress_enlightened_logo.json similarity index 100% rename from entries/ingress_enlightened_logo.json rename to entries/2024/ingress_enlightened_logo.json diff --git a/entries/inky_friends_vs_pacman.json b/entries/2024/inky_friends_vs_pacman.json similarity index 100% rename from entries/inky_friends_vs_pacman.json rename to entries/2024/inky_friends_vs_pacman.json diff --git a/entries/inugami_korone_furball_.json b/entries/2024/inugami_korone_furball_.json similarity index 100% rename from entries/inugami_korone_furball_.json rename to entries/2024/inugami_korone_furball_.json diff --git a/entries/iron_axe_minecraft_.json b/entries/2024/iron_axe_minecraft_.json similarity index 100% rename from entries/iron_axe_minecraft_.json rename to entries/2024/iron_axe_minecraft_.json diff --git a/entries/iron_pickaxe_minecraft_.json b/entries/2024/iron_pickaxe_minecraft_.json similarity index 100% rename from entries/iron_pickaxe_minecraft_.json rename to entries/2024/iron_pickaxe_minecraft_.json diff --git a/entries/italy_flag.json b/entries/2024/italy_flag.json similarity index 100% rename from entries/italy_flag.json rename to entries/2024/italy_flag.json diff --git a/entries/itch_io_logo.json b/entries/2024/itch_io_logo.json similarity index 100% rename from entries/itch_io_logo.json rename to entries/2024/itch_io_logo.json diff --git a/entries/jlai_lu_logo.json b/entries/2024/jlai_lu_logo.json similarity index 100% rename from entries/jlai_lu_logo.json rename to entries/2024/jlai_lu_logo.json diff --git a/entries/jlailu_community.json b/entries/2024/jlailu_community.json similarity index 100% rename from entries/jlailu_community.json rename to entries/2024/jlailu_community.json diff --git a/entries/junimo_holding_a_stardrop.json b/entries/2024/junimo_holding_a_stardrop.json similarity index 100% rename from entries/junimo_holding_a_stardrop.json rename to entries/2024/junimo_holding_a_stardrop.json diff --git a/entries/kicad_logo.json b/entries/2024/kicad_logo.json similarity index 100% rename from entries/kicad_logo.json rename to entries/2024/kicad_logo.json diff --git a/entries/kiki.json b/entries/2024/kiki.json similarity index 100% rename from entries/kiki.json rename to entries/2024/kiki.json diff --git a/entries/konqi.json b/entries/2024/konqi.json similarity index 100% rename from entries/konqi.json rename to entries/2024/konqi.json diff --git a/entries/lemmy_logo_colored_with_the_dach_flags_.json b/entries/2024/lemmy_logo_colored_with_the_dach_flags_.json similarity index 100% rename from entries/lemmy_logo_colored_with_the_dach_flags_.json rename to entries/2024/lemmy_logo_colored_with_the_dach_flags_.json diff --git a/entries/lemmy_zip.json b/entries/2024/lemmy_zip.json similarity index 100% rename from entries/lemmy_zip.json rename to entries/2024/lemmy_zip.json diff --git a/entries/linux_mint_logo.json b/entries/2024/linux_mint_logo.json similarity index 100% rename from entries/linux_mint_logo.json rename to entries/2024/linux_mint_logo.json diff --git a/entries/listener_san.json b/entries/2024/listener_san.json similarity index 100% rename from entries/listener_san.json rename to entries/2024/listener_san.json diff --git a/entries/lithuania_flag.json b/entries/2024/lithuania_flag.json similarity index 100% rename from entries/lithuania_flag.json rename to entries/2024/lithuania_flag.json diff --git a/entries/loss_meme.json b/entries/2024/loss_meme.json similarity index 100% rename from entries/loss_meme.json rename to entries/2024/loss_meme.json diff --git a/entries/luxembourg_flag.json b/entries/2024/luxembourg_flag.json similarity index 100% rename from entries/luxembourg_flag.json rename to entries/2024/luxembourg_flag.json diff --git a/entries/madeline.json b/entries/2024/madeline.json similarity index 100% rename from entries/madeline.json rename to entries/2024/madeline.json diff --git a/entries/malenia_blade_of_miquella.json b/entries/2024/malenia_blade_of_miquella.json similarity index 100% rename from entries/malenia_blade_of_miquella.json rename to entries/2024/malenia_blade_of_miquella.json diff --git a/entries/map_of_belgium.json b/entries/2024/map_of_belgium.json similarity index 100% rename from entries/map_of_belgium.json rename to entries/2024/map_of_belgium.json diff --git a/entries/mastodon_logo.json b/entries/2024/mastodon_logo.json similarity index 100% rename from entries/mastodon_logo.json rename to entries/2024/mastodon_logo.json diff --git a/entries/max_sam_and_max_.json b/entries/2024/max_sam_and_max_.json similarity index 100% rename from entries/max_sam_and_max_.json rename to entries/2024/max_sam_and_max_.json diff --git a/entries/mega_man.json b/entries/2024/mega_man.json similarity index 100% rename from entries/mega_man.json rename to entries/2024/mega_man.json diff --git a/entries/mini_triforce.json b/entries/2024/mini_triforce.json similarity index 100% rename from entries/mini_triforce.json rename to entries/2024/mini_triforce.json diff --git a/entries/mr_squeaks.json b/entries/2024/mr_squeaks.json similarity index 100% rename from entries/mr_squeaks.json rename to entries/2024/mr_squeaks.json diff --git a/entries/nato_anniversary.json b/entries/2024/nato_anniversary.json similarity index 100% rename from entries/nato_anniversary.json rename to entries/2024/nato_anniversary.json diff --git a/entries/neco_arc_okayu.json b/entries/2024/neco_arc_okayu.json similarity index 100% rename from entries/neco_arc_okayu.json rename to entries/2024/neco_arc_okayu.json diff --git a/entries/neovim_community.json b/entries/2024/neovim_community.json similarity index 100% rename from entries/neovim_community.json rename to entries/2024/neovim_community.json diff --git a/entries/netherlands_flag.json b/entries/2024/netherlands_flag.json similarity index 100% rename from entries/netherlands_flag.json rename to entries/2024/netherlands_flag.json diff --git a/entries/new_lunar_republic_emblem.json b/entries/2024/new_lunar_republic_emblem.json similarity index 100% rename from entries/new_lunar_republic_emblem.json rename to entries/2024/new_lunar_republic_emblem.json diff --git a/entries/new_zealand.json b/entries/2024/new_zealand.json similarity index 100% rename from entries/new_zealand.json rename to entries/2024/new_zealand.json diff --git a/entries/new_zealand_lemmy.json b/entries/2024/new_zealand_lemmy.json similarity index 100% rename from entries/new_zealand_lemmy.json rename to entries/2024/new_zealand_lemmy.json diff --git a/entries/new_zealand_zone.json b/entries/2024/new_zealand_zone.json similarity index 100% rename from entries/new_zealand_zone.json rename to entries/2024/new_zealand_zone.json diff --git a/entries/no_lastname_nz.json b/entries/2024/no_lastname_nz.json similarity index 100% rename from entries/no_lastname_nz.json rename to entries/2024/no_lastname_nz.json diff --git a/entries/norway_flag.json b/entries/2024/norway_flag.json similarity index 100% rename from entries/norway_flag.json rename to entries/2024/norway_flag.json diff --git a/entries/olympic_rings.json b/entries/2024/olympic_rings.json similarity index 100% rename from entries/olympic_rings.json rename to entries/2024/olympic_rings.json diff --git a/entries/pacific_drive_station_wagon.json b/entries/2024/pacific_drive_station_wagon.json similarity index 100% rename from entries/pacific_drive_station_wagon.json rename to entries/2024/pacific_drive_station_wagon.json diff --git a/entries/pacman_vs_pinky_friends.json b/entries/2024/pacman_vs_pinky_friends.json similarity index 100% rename from entries/pacman_vs_pinky_friends.json rename to entries/2024/pacman_vs_pinky_friends.json diff --git a/entries/palestinian_flag.json b/entries/2024/palestinian_flag.json similarity index 100% rename from entries/palestinian_flag.json rename to entries/2024/palestinian_flag.json diff --git a/entries/pansexual_flag.json b/entries/2024/pansexual_flag.json similarity index 100% rename from entries/pansexual_flag.json rename to entries/2024/pansexual_flag.json diff --git a/entries/peeking_autumn_blaze.json b/entries/2024/peeking_autumn_blaze.json similarity index 100% rename from entries/peeking_autumn_blaze.json rename to entries/2024/peeking_autumn_blaze.json diff --git a/entries/peeking_princess_skystar.json b/entries/2024/peeking_princess_skystar.json similarity index 100% rename from entries/peeking_princess_skystar.json rename to entries/2024/peeking_princess_skystar.json diff --git a/entries/perry_the_platapus.json b/entries/2024/perry_the_platapus.json similarity index 100% rename from entries/perry_the_platapus.json rename to entries/2024/perry_the_platapus.json diff --git a/entries/pinky_friends_vs_pacman.json b/entries/2024/pinky_friends_vs_pacman.json similarity index 100% rename from entries/pinky_friends_vs_pacman.json rename to entries/2024/pinky_friends_vs_pacman.json diff --git a/entries/pinky_pacman_.json b/entries/2024/pinky_pacman_.json similarity index 100% rename from entries/pinky_pacman_.json rename to entries/2024/pinky_pacman_.json diff --git a/entries/piwakawaka.json b/entries/2024/piwakawaka.json similarity index 100% rename from entries/piwakawaka.json rename to entries/2024/piwakawaka.json diff --git a/entries/pixel_anime_faction_paf_.json b/entries/2024/pixel_anime_faction_paf_.json similarity index 100% rename from entries/pixel_anime_faction_paf_.json rename to entries/2024/pixel_anime_faction_paf_.json diff --git a/entries/pokemon_gold_silver_crystal_character.json b/entries/2024/pokemon_gold_silver_crystal_character.json similarity index 100% rename from entries/pokemon_gold_silver_crystal_character.json rename to entries/2024/pokemon_gold_silver_crystal_character.json diff --git "a/entries/pok\303\251_ball_from_pok\303\251mon_gold_silver.json" "b/entries/2024/pok\303\251_ball_from_pok\303\251mon_gold_silver.json" similarity index 100% rename from "entries/pok\303\251_ball_from_pok\303\251mon_gold_silver.json" rename to "entries/2024/pok\303\251_ball_from_pok\303\251mon_gold_silver.json" diff --git "a/entries/pok\303\251_ball_from_pok\303\251mon_red_blue_green_yellow_.json" "b/entries/2024/pok\303\251_ball_from_pok\303\251mon_red_blue_green_yellow_.json" similarity index 100% rename from "entries/pok\303\251_ball_from_pok\303\251mon_red_blue_green_yellow_.json" rename to "entries/2024/pok\303\251_ball_from_pok\303\251mon_red_blue_green_yellow_.json" diff --git "a/entries/pok\303\251mon_red_blue_green_yellow_character.json" "b/entries/2024/pok\303\251mon_red_blue_green_yellow_character.json" similarity index 100% rename from "entries/pok\303\251mon_red_blue_green_yellow_character.json" rename to "entries/2024/pok\303\251mon_red_blue_green_yellow_character.json" diff --git a/entries/poland_flag.json b/entries/2024/poland_flag.json similarity index 100% rename from entries/poland_flag.json rename to entries/2024/poland_flag.json diff --git a/entries/portal_logo.json b/entries/2024/portal_logo.json similarity index 100% rename from entries/portal_logo.json rename to entries/2024/portal_logo.json diff --git a/entries/portugal_flag.json b/entries/2024/portugal_flag.json similarity index 100% rename from entries/portugal_flag.json rename to entries/2024/portugal_flag.json diff --git a/entries/programming_dev_collection.json b/entries/2024/programming_dev_collection.json similarity index 100% rename from entries/programming_dev_collection.json rename to entries/2024/programming_dev_collection.json diff --git a/entries/programming_dev_logo.json b/entries/2024/programming_dev_logo.json similarity index 100% rename from entries/programming_dev_logo.json rename to entries/2024/programming_dev_logo.json diff --git a/entries/propagandalf.json b/entries/2024/propagandalf.json similarity index 100% rename from entries/propagandalf.json rename to entries/2024/propagandalf.json diff --git a/entries/rampage_baboon.json b/entries/2024/rampage_baboon.json similarity index 100% rename from entries/rampage_baboon.json rename to entries/2024/rampage_baboon.json diff --git a/entries/rare_blue_chicken_stardew_valley_.json b/entries/2024/rare_blue_chicken_stardew_valley_.json similarity index 100% rename from entries/rare_blue_chicken_stardew_valley_.json rename to entries/2024/rare_blue_chicken_stardew_valley_.json diff --git a/entries/red_and_black_flag.json b/entries/2024/red_and_black_flag.json similarity index 100% rename from entries/red_and_black_flag.json rename to entries/2024/red_and_black_flag.json diff --git a/entries/retrodeck_logo.json b/entries/2024/retrodeck_logo.json similarity index 100% rename from entries/retrodeck_logo.json rename to entries/2024/retrodeck_logo.json diff --git a/entries/rocket_league_logo.json b/entries/2024/rocket_league_logo.json similarity index 100% rename from entries/rocket_league_logo.json rename to entries/2024/rocket_league_logo.json diff --git a/entries/romania_flag.json b/entries/2024/romania_flag.json similarity index 100% rename from entries/romania_flag.json rename to entries/2024/romania_flag.json diff --git a/entries/router_icon.json b/entries/2024/router_icon.json similarity index 100% rename from entries/router_icon.json rename to entries/2024/router_icon.json diff --git a/entries/rozemyne.json b/entries/2024/rozemyne.json similarity index 100% rename from entries/rozemyne.json rename to entries/2024/rozemyne.json diff --git a/entries/russian_flag.json b/entries/2024/russian_flag.json similarity index 100% rename from entries/russian_flag.json rename to entries/2024/russian_flag.json diff --git a/entries/rust.json b/entries/2024/rust.json similarity index 100% rename from entries/rust.json rename to entries/2024/rust.json diff --git a/entries/sam_sam_and_max_.json b/entries/2024/sam_sam_and_max_.json similarity index 100% rename from entries/sam_sam_and_max_.json rename to entries/2024/sam_sam_and_max_.json diff --git a/entries/satisfactory.json b/entries/2024/satisfactory.json similarity index 100% rename from entries/satisfactory.json rename to entries/2024/satisfactory.json diff --git "a/entries/sentience_pm_projet_m\303\251duse_.json" "b/entries/2024/sentience_pm_projet_m\303\251duse_.json" similarity index 100% rename from "entries/sentience_pm_projet_m\303\251duse_.json" rename to "entries/2024/sentience_pm_projet_m\303\251duse_.json" diff --git a/entries/sh_itjust_works_logo.json b/entries/2024/sh_itjust_works_logo.json similarity index 100% rename from entries/sh_itjust_works_logo.json rename to entries/2024/sh_itjust_works_logo.json diff --git a/entries/sliso_globe.json b/entries/2024/sliso_globe.json similarity index 100% rename from entries/sliso_globe.json rename to entries/2024/sliso_globe.json diff --git a/entries/slovakia_flag.json b/entries/2024/slovakia_flag.json similarity index 100% rename from entries/slovakia_flag.json rename to entries/2024/slovakia_flag.json diff --git a/entries/slovenia_flag.json b/entries/2024/slovenia_flag.json similarity index 100% rename from entries/slovenia_flag.json rename to entries/2024/slovenia_flag.json diff --git a/entries/spain_flag.json b/entries/2024/spain_flag.json similarity index 100% rename from entries/spain_flag.json rename to entries/2024/spain_flag.json diff --git a/entries/squared_circle_championship_belt.json b/entries/2024/squared_circle_championship_belt.json similarity index 100% rename from entries/squared_circle_championship_belt.json rename to entries/2024/squared_circle_championship_belt.json diff --git a/entries/super_smash_bros_logo.json b/entries/2024/super_smash_bros_logo.json similarity index 100% rename from entries/super_smash_bros_logo.json rename to entries/2024/super_smash_bros_logo.json diff --git a/entries/sweden_flag.json b/entries/2024/sweden_flag.json similarity index 100% rename from entries/sweden_flag.json rename to entries/2024/sweden_flag.json diff --git a/entries/swedish_flag_airforce.json b/entries/2024/swedish_flag_airforce.json similarity index 100% rename from entries/swedish_flag_airforce.json rename to entries/2024/swedish_flag_airforce.json diff --git a/entries/syl_avatar.json b/entries/2024/syl_avatar.json similarity index 100% rename from entries/syl_avatar.json rename to entries/2024/syl_avatar.json diff --git a/entries/tash_peterson.json b/entries/2024/tash_peterson.json similarity index 100% rename from entries/tash_peterson.json rename to entries/2024/tash_peterson.json diff --git a/entries/team_fortress_2_logo.json b/entries/2024/team_fortress_2_logo.json similarity index 100% rename from entries/team_fortress_2_logo.json rename to entries/2024/team_fortress_2_logo.json diff --git a/entries/the_blue_corner.json b/entries/2024/the_blue_corner.json similarity index 100% rename from entries/the_blue_corner.json rename to entries/2024/the_blue_corner.json diff --git a/entries/the_blue_corner_2.json b/entries/2024/the_blue_corner_2.json similarity index 100% rename from entries/the_blue_corner_2.json rename to entries/2024/the_blue_corner_2.json diff --git a/entries/the_dark_side_of_the_moon.json b/entries/2024/the_dark_side_of_the_moon.json similarity index 100% rename from entries/the_dark_side_of_the_moon.json rename to entries/2024/the_dark_side_of_the_moon.json diff --git a/entries/the_head_of_technoblade.json b/entries/2024/the_head_of_technoblade.json similarity index 100% rename from entries/the_head_of_technoblade.json rename to entries/2024/the_head_of_technoblade.json diff --git a/entries/the_kiwi_kiwi_fruit.json b/entries/2024/the_kiwi_kiwi_fruit.json similarity index 100% rename from entries/the_kiwi_kiwi_fruit.json rename to entries/2024/the_kiwi_kiwi_fruit.json diff --git a/entries/the_komeiji_sisters_touhou_project_.json b/entries/2024/the_komeiji_sisters_touhou_project_.json similarity index 100% rename from entries/the_komeiji_sisters_touhou_project_.json rename to entries/2024/the_komeiji_sisters_touhou_project_.json diff --git a/entries/the_tardis_and_sutekh.json b/entries/2024/the_tardis_and_sutekh.json similarity index 100% rename from entries/the_tardis_and_sutekh.json rename to entries/2024/the_tardis_and_sutekh.json diff --git a/entries/three_investigators.json b/entries/2024/three_investigators.json similarity index 100% rename from entries/three_investigators.json rename to entries/2024/three_investigators.json diff --git a/entries/tim_sweeney.json b/entries/2024/tim_sweeney.json similarity index 100% rename from entries/tim_sweeney.json rename to entries/2024/tim_sweeney.json diff --git a/entries/toothless.json b/entries/2024/toothless.json similarity index 100% rename from entries/toothless.json rename to entries/2024/toothless.json diff --git a/entries/touhou_project_hijack.json b/entries/2024/touhou_project_hijack.json similarity index 100% rename from entries/touhou_project_hijack.json rename to entries/2024/touhou_project_hijack.json diff --git a/entries/transgender_flag.json b/entries/2024/transgender_flag.json similarity index 100% rename from entries/transgender_flag.json rename to entries/2024/transgender_flag.json diff --git a/entries/trees_in_new_zealand.json b/entries/2024/trees_in_new_zealand.json similarity index 100% rename from entries/trees_in_new_zealand.json rename to entries/2024/trees_in_new_zealand.json diff --git a/entries/tugboat.json b/entries/2024/tugboat.json similarity index 100% rename from entries/tugboat.json rename to entries/2024/tugboat.json diff --git a/entries/tux_mascot_.json b/entries/2024/tux_mascot_.json similarity index 100% rename from entries/tux_mascot_.json rename to entries/2024/tux_mascot_.json diff --git a/entries/twilight_marekisser.json b/entries/2024/twilight_marekisser.json similarity index 100% rename from entries/twilight_marekisser.json rename to entries/2024/twilight_marekisser.json diff --git a/entries/typescript_community.json b/entries/2024/typescript_community.json similarity index 100% rename from entries/typescript_community.json rename to entries/2024/typescript_community.json diff --git a/entries/ubuntu.json b/entries/2024/ubuntu.json similarity index 100% rename from entries/ubuntu.json rename to entries/2024/ubuntu.json diff --git a/entries/ugly.json b/entries/2024/ugly.json similarity index 100% rename from entries/ugly.json rename to entries/2024/ugly.json diff --git a/entries/upper_head_of_couleur.json b/entries/2024/upper_head_of_couleur.json similarity index 100% rename from entries/upper_head_of_couleur.json rename to entries/2024/upper_head_of_couleur.json diff --git a/entries/uselessserver093.json b/entries/2024/uselessserver093.json similarity index 100% rename from entries/uselessserver093.json rename to entries/2024/uselessserver093.json diff --git a/entries/vegan_symbol.json b/entries/2024/vegan_symbol.json similarity index 100% rename from entries/vegan_symbol.json rename to entries/2024/vegan_symbol.json diff --git a/entries/watermelon.json b/entries/2024/watermelon.json similarity index 100% rename from entries/watermelon.json rename to entries/2024/watermelon.json diff --git a/entries/white_blue_white_flag.json b/entries/2024/white_blue_white_flag.json similarity index 100% rename from entries/white_blue_white_flag.json rename to entries/2024/white_blue_white_flag.json diff --git a/entries/white_red_white_flag.json b/entries/2024/white_red_white_flag.json similarity index 100% rename from entries/white_red_white_flag.json rename to entries/2024/white_red_white_flag.json diff --git a/entries/windows_logo.json b/entries/2024/windows_logo.json similarity index 100% rename from entries/windows_logo.json rename to entries/2024/windows_logo.json diff --git a/entries/zero.json b/entries/2024/zero.json similarity index 100% rename from entries/zero.json rename to entries/2024/zero.json diff --git a/entries2025/.keep b/entries/2025/.keep similarity index 100% rename from entries2025/.keep rename to entries/2025/.keep diff --git a/entries2025/112haloboy_pixel_ponies.json b/entries/2025/112haloboy_pixel_ponies.json similarity index 100% rename from entries2025/112haloboy_pixel_ponies.json rename to entries/2025/112haloboy_pixel_ponies.json diff --git "a/entries2025/1\313\242\341\265\227_hungary.json" "b/entries/2025/1\313\242\341\265\227_hungary.json" similarity index 100% rename from "entries2025/1\313\242\341\265\227_hungary.json" rename to "entries/2025/1\313\242\341\265\227_hungary.json" diff --git "a/entries2025/2\342\201\277\341\265\210_hungary.json" "b/entries/2025/2\342\201\277\341\265\210_hungary.json" similarity index 100% rename from "entries2025/2\342\201\277\341\265\210_hungary.json" rename to "entries/2025/2\342\201\277\341\265\210_hungary.json" diff --git a/entries2025/30p87.json b/entries/2025/30p87.json similarity index 100% rename from entries2025/30p87.json rename to entries/2025/30p87.json diff --git "a/entries2025/3\312\263\341\265\210_hungary.json" "b/entries/2025/3\312\263\341\265\210_hungary.json" similarity index 100% rename from "entries2025/3\312\263\341\265\210_hungary.json" rename to "entries/2025/3\312\263\341\265\210_hungary.json" diff --git a/entries2025/86_47.json b/entries/2025/86_47.json similarity index 100% rename from entries2025/86_47.json rename to entries/2025/86_47.json diff --git a/entries2025/_fuck_flags_statement.json b/entries/2025/_fuck_flags_statement.json similarity index 100% rename from entries2025/_fuck_flags_statement.json rename to entries/2025/_fuck_flags_statement.json diff --git a/entries2025/antifa.json b/entries/2025/antifa.json similarity index 100% rename from entries2025/antifa.json rename to entries/2025/antifa.json diff --git a/entries2025/anubis_mascot.json b/entries/2025/anubis_mascot.json similarity index 100% rename from entries2025/anubis_mascot.json rename to entries/2025/anubis_mascot.json diff --git a/entries2025/aotearoa_new_zealand.json b/entries/2025/aotearoa_new_zealand.json similarity index 100% rename from entries2025/aotearoa_new_zealand.json rename to entries/2025/aotearoa_new_zealand.json diff --git a/entries2025/arch.json b/entries/2025/arch.json similarity index 100% rename from entries2025/arch.json rename to entries/2025/arch.json diff --git a/entries2025/arte_logo.json b/entries/2025/arte_logo.json similarity index 100% rename from entries2025/arte_logo.json rename to entries/2025/arte_logo.json diff --git a/entries2025/article_1_of_german_basic_law.json b/entries/2025/article_1_of_german_basic_law.json similarity index 100% rename from entries2025/article_1_of_german_basic_law.json rename to entries/2025/article_1_of_german_basic_law.json diff --git a/entries2025/ategondev.json b/entries/2025/ategondev.json similarity index 100% rename from entries2025/ategondev.json rename to entries/2025/ategondev.json diff --git a/entries2025/bad_dragon_logo.json b/entries/2025/bad_dragon_logo.json similarity index 100% rename from entries2025/bad_dragon_logo.json rename to entries/2025/bad_dragon_logo.json diff --git a/entries2025/bavarian_meal.json b/entries/2025/bavarian_meal.json similarity index 100% rename from entries2025/bavarian_meal.json rename to entries/2025/bavarian_meal.json diff --git a/entries2025/bevy.json b/entries/2025/bevy.json similarity index 100% rename from entries2025/bevy.json rename to entries/2025/bevy.json diff --git a/entries2025/big_luigi.json b/entries/2025/big_luigi.json similarity index 100% rename from entries2025/big_luigi.json rename to entries/2025/big_luigi.json diff --git a/entries2025/blender.json b/entries/2025/blender.json similarity index 100% rename from entries2025/blender.json rename to entries/2025/blender.json diff --git a/entries2025/bloodsurg_memorial.json b/entries/2025/bloodsurg_memorial.json similarity index 100% rename from entries2025/bloodsurg_memorial.json rename to entries/2025/bloodsurg_memorial.json diff --git a/entries2025/bok_club_pixel_ponies.json b/entries/2025/bok_club_pixel_ponies.json similarity index 100% rename from entries2025/bok_club_pixel_ponies.json rename to entries/2025/bok_club_pixel_ponies.json diff --git a/entries2025/bomb_cow_express_stu.json b/entries/2025/bomb_cow_express_stu.json similarity index 100% rename from entries2025/bomb_cow_express_stu.json rename to entries/2025/bomb_cow_express_stu.json diff --git a/entries2025/bomb_cow_express_train.json b/entries/2025/bomb_cow_express_train.json similarity index 100% rename from entries2025/bomb_cow_express_train.json rename to entries/2025/bomb_cow_express_train.json diff --git a/entries2025/carpenter_brut_logo.json b/entries/2025/carpenter_brut_logo.json similarity index 100% rename from entries2025/carpenter_brut_logo.json rename to entries/2025/carpenter_brut_logo.json diff --git a/entries2025/chiro.json b/entries/2025/chiro.json similarity index 100% rename from entries2025/chiro.json rename to entries/2025/chiro.json diff --git a/entries2025/commander_keen.json b/entries/2025/commander_keen.json similarity index 100% rename from entries2025/commander_keen.json rename to entries/2025/commander_keen.json diff --git a/entries2025/cozy_glow_cutie_mark.json b/entries/2025/cozy_glow_cutie_mark.json similarity index 100% rename from entries2025/cozy_glow_cutie_mark.json rename to entries/2025/cozy_glow_cutie_mark.json diff --git a/entries2025/d2jam.json b/entries/2025/d2jam.json similarity index 100% rename from entries2025/d2jam.json rename to entries/2025/d2jam.json diff --git a/entries2025/demoman.json b/entries/2025/demoman.json similarity index 100% rename from entries2025/demoman.json rename to entries/2025/demoman.json diff --git a/entries2025/derpy_hooves.json b/entries/2025/derpy_hooves.json similarity index 100% rename from entries2025/derpy_hooves.json rename to entries/2025/derpy_hooves.json diff --git a/entries2025/die_drei_fragezeichen.json b/entries/2025/die_drei_fragezeichen.json similarity index 100% rename from entries2025/die_drei_fragezeichen.json rename to entries/2025/die_drei_fragezeichen.json diff --git a/entries2025/donkey_kong.json b/entries/2025/donkey_kong.json similarity index 100% rename from entries2025/donkey_kong.json rename to entries/2025/donkey_kong.json diff --git a/entries2025/dragondot.json b/entries/2025/dragondot.json similarity index 100% rename from entries2025/dragondot.json rename to entries/2025/dragondot.json diff --git a/entries2025/drm_free_games_are_forever.json b/entries/2025/drm_free_games_are_forever.json similarity index 100% rename from entries2025/drm_free_games_are_forever.json rename to entries/2025/drm_free_games_are_forever.json diff --git a/entries2025/dusk_saw.json b/entries/2025/dusk_saw.json similarity index 100% rename from entries2025/dusk_saw.json rename to entries/2025/dusk_saw.json diff --git a/entries2025/ebonypet.json b/entries/2025/ebonypet.json similarity index 100% rename from entries2025/ebonypet.json rename to entries/2025/ebonypet.json diff --git a/entries2025/eli_elly_.json b/entries/2025/eli_elly_.json similarity index 100% rename from entries2025/eli_elly_.json rename to entries/2025/eli_elly_.json diff --git a/entries2025/emblem_of_globasa.json b/entries/2025/emblem_of_globasa.json similarity index 100% rename from entries2025/emblem_of_globasa.json rename to entries/2025/emblem_of_globasa.json diff --git a/entries2025/ena.json b/entries/2025/ena.json similarity index 100% rename from entries2025/ena.json rename to entries/2025/ena.json diff --git a/entries2025/esix.json b/entries/2025/esix.json similarity index 100% rename from entries2025/esix.json rename to entries/2025/esix.json diff --git a/entries2025/estelle_and_joshua_bright.json b/entries/2025/estelle_and_joshua_bright.json similarity index 100% rename from entries2025/estelle_and_joshua_bright.json rename to entries/2025/estelle_and_joshua_bright.json diff --git a/entries2025/eu_aligned_flags.json b/entries/2025/eu_aligned_flags.json similarity index 100% rename from entries2025/eu_aligned_flags.json rename to entries/2025/eu_aligned_flags.json diff --git a/entries2025/euler_s_identity.json b/entries/2025/euler_s_identity.json similarity index 100% rename from entries2025/euler_s_identity.json rename to entries/2025/euler_s_identity.json diff --git a/entries2025/fairy.json b/entries/2025/fairy.json similarity index 100% rename from entries2025/fairy.json rename to entries/2025/fairy.json diff --git a/entries2025/fdgo_ultras.json b/entries/2025/fdgo_ultras.json similarity index 100% rename from entries2025/fdgo_ultras.json rename to entries/2025/fdgo_ultras.json diff --git a/entries2025/feddit_org.json b/entries/2025/feddit_org.json similarity index 100% rename from entries2025/feddit_org.json rename to entries/2025/feddit_org.json diff --git a/entries2025/flag_of_algeria.json b/entries/2025/flag_of_algeria.json similarity index 100% rename from entries2025/flag_of_algeria.json rename to entries/2025/flag_of_algeria.json diff --git a/entries2025/flag_of_argentina.json b/entries/2025/flag_of_argentina.json similarity index 100% rename from entries2025/flag_of_argentina.json rename to entries/2025/flag_of_argentina.json diff --git a/entries2025/flag_of_brazil.json b/entries/2025/flag_of_brazil.json similarity index 100% rename from entries2025/flag_of_brazil.json rename to entries/2025/flag_of_brazil.json diff --git a/entries2025/flag_of_cyprus.json b/entries/2025/flag_of_cyprus.json similarity index 100% rename from entries2025/flag_of_cyprus.json rename to entries/2025/flag_of_cyprus.json diff --git a/entries2025/flag_of_malta.json b/entries/2025/flag_of_malta.json similarity index 100% rename from entries2025/flag_of_malta.json rename to entries/2025/flag_of_malta.json diff --git a/entries2025/flag_of_minas_gerais.json b/entries/2025/flag_of_minas_gerais.json similarity index 100% rename from entries2025/flag_of_minas_gerais.json rename to entries/2025/flag_of_minas_gerais.json diff --git a/entries2025/flag_of_oceania.json b/entries/2025/flag_of_oceania.json similarity index 100% rename from entries2025/flag_of_oceania.json rename to entries/2025/flag_of_oceania.json diff --git a/entries2025/foss.json b/entries/2025/foss.json similarity index 100% rename from entries2025/foss.json rename to entries/2025/foss.json diff --git a/entries2025/fqqd.json b/entries/2025/fqqd.json similarity index 100% rename from entries2025/fqqd.json rename to entries/2025/fqqd.json diff --git a/entries2025/free_luigi_.json b/entries/2025/free_luigi_.json similarity index 100% rename from entries2025/free_luigi_.json rename to entries/2025/free_luigi_.json diff --git a/entries2025/freehk.json b/entries/2025/freehk.json similarity index 100% rename from entries2025/freehk.json rename to entries/2025/freehk.json diff --git a/entries2025/fridays_for_future.json b/entries/2025/fridays_for_future.json similarity index 100% rename from entries2025/fridays_for_future.json rename to entries/2025/fridays_for_future.json diff --git a/entries2025/fuck_afd.json b/entries/2025/fuck_afd.json similarity index 100% rename from entries2025/fuck_afd.json rename to entries/2025/fuck_afd.json diff --git a/entries2025/fuck_stalin.json b/entries/2025/fuck_stalin.json similarity index 100% rename from entries2025/fuck_stalin.json rename to entries/2025/fuck_stalin.json diff --git a/entries2025/furret_stu.json b/entries/2025/furret_stu.json similarity index 100% rename from entries2025/furret_stu.json rename to entries/2025/furret_stu.json diff --git a/entries2025/game_of_life_gliders.json b/entries/2025/game_of_life_gliders.json similarity index 100% rename from entries2025/game_of_life_gliders.json rename to entries/2025/game_of_life_gliders.json diff --git a/entries2025/gary_yourofsky.json b/entries/2025/gary_yourofsky.json similarity index 100% rename from entries2025/gary_yourofsky.json rename to entries/2025/gary_yourofsky.json diff --git a/entries2025/gog.json b/entries/2025/gog.json similarity index 100% rename from entries2025/gog.json rename to entries/2025/gog.json diff --git a/entries2025/goodboy_dog.json b/entries/2025/goodboy_dog.json similarity index 100% rename from entries2025/goodboy_dog.json rename to entries/2025/goodboy_dog.json diff --git a/entries2025/green_anarchism_flag.json b/entries/2025/green_anarchism_flag.json similarity index 100% rename from entries2025/green_anarchism_flag.json rename to entries/2025/green_anarchism_flag.json diff --git a/entries2025/grub.json b/entries/2025/grub.json similarity index 100% rename from entries2025/grub.json rename to entries/2025/grub.json diff --git a/entries2025/gunners_arsenal_f_c_.json b/entries/2025/gunners_arsenal_f_c_.json similarity index 100% rename from entries2025/gunners_arsenal_f_c_.json rename to entries/2025/gunners_arsenal_f_c_.json diff --git a/entries2025/hazelnut_junction_commuters.json b/entries/2025/hazelnut_junction_commuters.json similarity index 100% rename from entries2025/hazelnut_junction_commuters.json rename to entries/2025/hazelnut_junction_commuters.json diff --git a/entries2025/huggies_emote.json b/entries/2025/huggies_emote.json similarity index 100% rename from entries2025/huggies_emote.json rename to entries/2025/huggies_emote.json diff --git a/entries2025/hyacinth.json b/entries/2025/hyacinth.json similarity index 100% rename from entries2025/hyacinth.json rename to entries/2025/hyacinth.json diff --git a/entries2025/ike_a_.json b/entries/2025/ike_a_.json similarity index 100% rename from entries2025/ike_a_.json rename to entries/2025/ike_a_.json diff --git a/entries2025/inaturalist.json b/entries/2025/inaturalist.json similarity index 100% rename from entries2025/inaturalist.json rename to entries/2025/inaturalist.json diff --git a/entries2025/intercity_express.json b/entries/2025/intercity_express.json similarity index 100% rename from entries2025/intercity_express.json rename to entries/2025/intercity_express.json diff --git a/entries2025/intercity_express_entering_a_portal.json b/entries/2025/intercity_express_entering_a_portal.json similarity index 100% rename from entries2025/intercity_express_entering_a_portal.json rename to entries/2025/intercity_express_entering_a_portal.json diff --git a/entries2025/international_space_station_iss_.json b/entries/2025/international_space_station_iss_.json similarity index 100% rename from entries2025/international_space_station_iss_.json rename to entries/2025/international_space_station_iss_.json diff --git a/entries2025/inugami_korone.json b/entries/2025/inugami_korone.json similarity index 100% rename from entries2025/inugami_korone.json rename to entries/2025/inugami_korone.json diff --git a/entries2025/irelephant.json b/entries/2025/irelephant.json similarity index 100% rename from entries2025/irelephant.json rename to entries/2025/irelephant.json diff --git a/entries2025/itch_io_logo.json b/entries/2025/itch_io_logo.json similarity index 100% rename from entries2025/itch_io_logo.json rename to entries/2025/itch_io_logo.json diff --git a/entries2025/jimbo.json b/entries/2025/jimbo.json similarity index 100% rename from entries2025/jimbo.json rename to entries/2025/jimbo.json diff --git a/entries2025/keygen_church_logo.json b/entries/2025/keygen_church_logo.json similarity index 100% rename from entries2025/keygen_church_logo.json rename to entries/2025/keygen_church_logo.json diff --git a/entries2025/klingon_ship.json b/entries/2025/klingon_ship.json similarity index 100% rename from entries2025/klingon_ship.json rename to entries/2025/klingon_ship.json diff --git a/entries2025/koboldcoterie.json b/entries/2025/koboldcoterie.json similarity index 100% rename from entries2025/koboldcoterie.json rename to entries/2025/koboldcoterie.json diff --git a/entries2025/kurisu_makise.json b/entries/2025/kurisu_makise.json similarity index 100% rename from entries2025/kurisu_makise.json rename to entries/2025/kurisu_makise.json diff --git a/entries2025/lain_iwakura.json b/entries/2025/lain_iwakura.json similarity index 100% rename from entries2025/lain_iwakura.json rename to entries/2025/lain_iwakura.json diff --git a/entries2025/lemmings.json b/entries/2025/lemmings.json similarity index 100% rename from entries2025/lemmings.json rename to entries/2025/lemmings.json diff --git a/entries2025/lgbtq_greece.json b/entries/2025/lgbtq_greece.json similarity index 100% rename from entries2025/lgbtq_greece.json rename to entries/2025/lgbtq_greece.json diff --git a/entries2025/linux_mint_logo.json b/entries/2025/linux_mint_logo.json similarity index 100% rename from entries2025/linux_mint_logo.json rename to entries/2025/linux_mint_logo.json diff --git a/entries2025/littleshyfim_and_tootsie4ever.json b/entries/2025/littleshyfim_and_tootsie4ever.json similarity index 100% rename from entries2025/littleshyfim_and_tootsie4ever.json rename to entries/2025/littleshyfim_and_tootsie4ever.json diff --git a/entries2025/madeline.json b/entries/2025/madeline.json similarity index 100% rename from entries2025/madeline.json rename to entries/2025/madeline.json diff --git a/entries2025/madeline_celeste_pico_8_.json b/entries/2025/madeline_celeste_pico_8_.json similarity index 100% rename from entries2025/madeline_celeste_pico_8_.json rename to entries/2025/madeline_celeste_pico_8_.json diff --git a/entries2025/madotsuki.json b/entries/2025/madotsuki.json similarity index 100% rename from entries2025/madotsuki.json rename to entries/2025/madotsuki.json diff --git a/entries2025/maelle.json b/entries/2025/maelle.json similarity index 100% rename from entries2025/maelle.json rename to entries/2025/maelle.json diff --git a/entries2025/mander_xyz.json b/entries/2025/mander_xyz.json similarity index 100% rename from entries2025/mander_xyz.json rename to entries/2025/mander_xyz.json diff --git a/entries2025/mastodon.json b/entries/2025/mastodon.json similarity index 100% rename from entries2025/mastodon.json rename to entries/2025/mastodon.json diff --git a/entries2025/maya_fey.json b/entries/2025/maya_fey.json similarity index 100% rename from entries2025/maya_fey.json rename to entries/2025/maya_fey.json diff --git a/entries2025/nafo_1_of_2_.json b/entries/2025/nafo_1_of_2_.json similarity index 100% rename from entries2025/nafo_1_of_2_.json rename to entries/2025/nafo_1_of_2_.json diff --git a/entries2025/nafo_2_of_2_.json b/entries/2025/nafo_2_of_2_.json similarity index 100% rename from entries2025/nafo_2_of_2_.json rename to entries/2025/nafo_2_of_2_.json diff --git a/entries2025/nix_flake.json b/entries/2025/nix_flake.json similarity index 100% rename from entries2025/nix_flake.json rename to entries/2025/nix_flake.json diff --git a/entries2025/ohaa.json b/entries/2025/ohaa.json similarity index 100% rename from entries2025/ohaa.json rename to entries/2025/ohaa.json diff --git a/entries2025/omegamouse.json b/entries/2025/omegamouse.json similarity index 100% rename from entries2025/omegamouse.json rename to entries/2025/omegamouse.json diff --git a/entries2025/p_np.json b/entries/2025/p_np.json similarity index 100% rename from entries2025/p_np.json rename to entries/2025/p_np.json diff --git a/entries2025/parana_pine_and_red_breasted_toucan.json b/entries/2025/parana_pine_and_red_breasted_toucan.json similarity index 100% rename from entries2025/parana_pine_and_red_breasted_toucan.json rename to entries/2025/parana_pine_and_red_breasted_toucan.json diff --git a/entries2025/pathfinder_roleplaying_game.json b/entries/2025/pathfinder_roleplaying_game.json similarity index 100% rename from entries2025/pathfinder_roleplaying_game.json rename to entries/2025/pathfinder_roleplaying_game.json diff --git a/entries2025/peeking_belgium_pony.json b/entries/2025/peeking_belgium_pony.json similarity index 100% rename from entries2025/peeking_belgium_pony.json rename to entries/2025/peeking_belgium_pony.json diff --git a/entries2025/peeking_queen_chrysalis.json b/entries/2025/peeking_queen_chrysalis.json similarity index 100% rename from entries2025/peeking_queen_chrysalis.json rename to entries/2025/peeking_queen_chrysalis.json diff --git a/entries2025/pickaxe.json b/entries/2025/pickaxe.json similarity index 100% rename from entries2025/pickaxe.json rename to entries/2025/pickaxe.json diff --git a/entries2025/pipp_best_pony.json b/entries/2025/pipp_best_pony.json similarity index 100% rename from entries2025/pipp_best_pony.json rename to entries/2025/pipp_best_pony.json diff --git a/entries2025/pipp_s_blep.json b/entries/2025/pipp_s_blep.json similarity index 100% rename from entries2025/pipp_s_blep.json rename to entries/2025/pipp_s_blep.json diff --git a/entries2025/pixel_ponies.json b/entries/2025/pixel_ponies.json similarity index 100% rename from entries2025/pixel_ponies.json rename to entries/2025/pixel_ponies.json diff --git a/entries2025/pochita.json b/entries/2025/pochita.json similarity index 100% rename from entries2025/pochita.json rename to entries/2025/pochita.json diff --git a/entries2025/pokemon.json b/entries/2025/pokemon.json similarity index 100% rename from entries2025/pokemon.json rename to entries/2025/pokemon.json diff --git "a/entries2025/pok\303\251ball_6_6_.json" "b/entries/2025/pok\303\251ball_6_6_.json" similarity index 100% rename from "entries2025/pok\303\251ball_6_6_.json" rename to "entries/2025/pok\303\251ball_6_6_.json" diff --git a/entries2025/pretzel.json b/entries/2025/pretzel.json similarity index 100% rename from entries2025/pretzel.json rename to entries/2025/pretzel.json diff --git a/entries2025/princess_pipp_petals.json b/entries/2025/princess_pipp_petals.json similarity index 100% rename from entries2025/princess_pipp_petals.json rename to entries/2025/princess_pipp_petals.json diff --git a/entries2025/programming_dev.json b/entries/2025/programming_dev.json similarity index 100% rename from entries2025/programming_dev.json rename to entries/2025/programming_dev.json diff --git a/entries2025/pup_cup_dog.json b/entries/2025/pup_cup_dog.json similarity index 100% rename from entries2025/pup_cup_dog.json rename to entries/2025/pup_cup_dog.json diff --git a/entries2025/purple.json b/entries/2025/purple.json similarity index 100% rename from entries2025/purple.json rename to entries/2025/purple.json diff --git a/entries2025/purple_and_black_flag.json b/entries/2025/purple_and_black_flag.json similarity index 100% rename from entries2025/purple_and_black_flag.json rename to entries/2025/purple_and_black_flag.json diff --git a/entries2025/purple_sus.json b/entries/2025/purple_sus.json similarity index 100% rename from entries2025/purple_sus.json rename to entries/2025/purple_sus.json diff --git a/entries2025/r_a_m_the_robot.json b/entries/2025/r_a_m_the_robot.json similarity index 100% rename from entries2025/r_a_m_the_robot.json rename to entries/2025/r_a_m_the_robot.json diff --git a/entries2025/rainbow_dash.json b/entries/2025/rainbow_dash.json similarity index 100% rename from entries2025/rainbow_dash.json rename to entries/2025/rainbow_dash.json diff --git a/entries2025/rainbow_flag.json b/entries/2025/rainbow_flag.json similarity index 100% rename from entries2025/rainbow_flag.json rename to entries/2025/rainbow_flag.json diff --git a/entries2025/rainbow_pawb_logo.json b/entries/2025/rainbow_pawb_logo.json similarity index 100% rename from entries2025/rainbow_pawb_logo.json rename to entries/2025/rainbow_pawb_logo.json diff --git a/entries2025/ralsei.json b/entries/2025/ralsei.json similarity index 100% rename from entries2025/ralsei.json rename to entries/2025/ralsei.json diff --git a/entries2025/red_and_black_flag.json b/entries/2025/red_and_black_flag.json similarity index 100% rename from entries2025/red_and_black_flag.json rename to entries/2025/red_and_black_flag.json diff --git a/entries2025/rocket_league_logo.json b/entries/2025/rocket_league_logo.json similarity index 100% rename from entries2025/rocket_league_logo.json rename to entries/2025/rocket_league_logo.json diff --git a/entries2025/rubber_duck.json b/entries/2025/rubber_duck.json similarity index 100% rename from entries2025/rubber_duck.json rename to entries/2025/rubber_duck.json diff --git a/entries2025/sc07.json b/entries/2025/sc07.json similarity index 100% rename from entries2025/sc07.json rename to entries/2025/sc07.json diff --git a/entries2025/seating_situation_passengers.json b/entries/2025/seating_situation_passengers.json similarity index 100% rename from entries2025/seating_situation_passengers.json rename to entries/2025/seating_situation_passengers.json diff --git a/entries2025/seiran.json b/entries/2025/seiran.json similarity index 100% rename from entries2025/seiran.json rename to entries/2025/seiran.json diff --git a/entries2025/simon_belmont.json b/entries/2025/simon_belmont.json similarity index 100% rename from entries2025/simon_belmont.json rename to entries/2025/simon_belmont.json diff --git a/entries2025/small_ukrainian_flag.json b/entries/2025/small_ukrainian_flag.json similarity index 100% rename from entries2025/small_ukrainian_flag.json rename to entries/2025/small_ukrainian_flag.json diff --git a/entries2025/speckflagge.json b/entries/2025/speckflagge.json similarity index 100% rename from entries2025/speckflagge.json rename to entries/2025/speckflagge.json diff --git a/entries2025/spezi_logo.json b/entries/2025/spezi_logo.json similarity index 100% rename from entries2025/spezi_logo.json rename to entries/2025/spezi_logo.json diff --git a/entries2025/squaredcircle.json b/entries/2025/squaredcircle.json similarity index 100% rename from entries2025/squaredcircle.json rename to entries/2025/squaredcircle.json diff --git a/entries2025/ssh_ftp_http.json b/entries/2025/ssh_ftp_http.json similarity index 100% rename from entries2025/ssh_ftp_http.json rename to entries/2025/ssh_ftp_http.json diff --git a/entries2025/steam_deck_logo.json b/entries/2025/steam_deck_logo.json similarity index 100% rename from entries2025/steam_deck_logo.json rename to entries/2025/steam_deck_logo.json diff --git a/entries2025/stop_killing_games.json b/entries/2025/stop_killing_games.json similarity index 100% rename from entries2025/stop_killing_games.json rename to entries/2025/stop_killing_games.json diff --git a/entries2025/stu_rocks.json b/entries/2025/stu_rocks.json similarity index 100% rename from entries2025/stu_rocks.json rename to entries/2025/stu_rocks.json diff --git a/entries2025/study_sama.json b/entries/2025/study_sama.json similarity index 100% rename from entries2025/study_sama.json rename to entries/2025/study_sama.json diff --git a/entries2025/super_mario_world_rotating_block.json b/entries/2025/super_mario_world_rotating_block.json similarity index 100% rename from entries2025/super_mario_world_rotating_block.json rename to entries/2025/super_mario_world_rotating_block.json diff --git a/entries2025/tardis_13th_doctor_and_rose.json b/entries/2025/tardis_13th_doctor_and_rose.json similarity index 100% rename from entries2025/tardis_13th_doctor_and_rose.json rename to entries/2025/tardis_13th_doctor_and_rose.json diff --git a/entries2025/tblflip.json b/entries/2025/tblflip.json similarity index 100% rename from entries2025/tblflip.json rename to entries/2025/tblflip.json diff --git a/entries2025/the_first_stu.json b/entries/2025/the_first_stu.json similarity index 100% rename from entries2025/the_first_stu.json rename to entries/2025/the_first_stu.json diff --git a/entries2025/the_monster_from_let_s_sky.json b/entries/2025/the_monster_from_let_s_sky.json similarity index 100% rename from entries2025/the_monster_from_let_s_sky.json rename to entries/2025/the_monster_from_let_s_sky.json diff --git a/entries2025/the_pony_bok_club.json b/entries/2025/the_pony_bok_club.json similarity index 100% rename from entries2025/the_pony_bok_club.json rename to entries/2025/the_pony_bok_club.json diff --git a/entries2025/three_headed_monkey.json b/entries/2025/three_headed_monkey.json similarity index 100% rename from entries2025/three_headed_monkey.json rename to entries/2025/three_headed_monkey.json diff --git a/entries2025/tiny_derpy.json b/entries/2025/tiny_derpy.json similarity index 100% rename from entries2025/tiny_derpy.json rename to entries/2025/tiny_derpy.json diff --git a/entries2025/toast.json b/entries/2025/toast.json similarity index 100% rename from entries2025/toast.json rename to entries/2025/toast.json diff --git a/entries2025/toki_pona_a_minimalist_language.json b/entries/2025/toki_pona_a_minimalist_language.json similarity index 100% rename from entries2025/toki_pona_a_minimalist_language.json rename to entries/2025/toki_pona_a_minimalist_language.json diff --git a/entries2025/triforce.json b/entries/2025/triforce.json similarity index 100% rename from entries2025/triforce.json rename to entries/2025/triforce.json diff --git a/entries2025/troleg.json b/entries/2025/troleg.json similarity index 100% rename from entries2025/troleg.json rename to entries/2025/troleg.json diff --git a/entries2025/ukrainian_amogus.json b/entries/2025/ukrainian_amogus.json similarity index 100% rename from entries2025/ukrainian_amogus.json rename to entries/2025/ukrainian_amogus.json diff --git a/entries2025/ukrainian_flag_and_salute.json b/entries/2025/ukrainian_flag_and_salute.json similarity index 100% rename from entries2025/ukrainian_flag_and_salute.json rename to entries/2025/ukrainian_flag_and_salute.json diff --git a/entries2025/ultimate_chicken_horse.json b/entries/2025/ultimate_chicken_horse.json similarity index 100% rename from entries2025/ultimate_chicken_horse.json rename to entries/2025/ultimate_chicken_horse.json diff --git a/entries2025/uss_enterprise.json b/entries/2025/uss_enterprise.json similarity index 100% rename from entries2025/uss_enterprise.json rename to entries/2025/uss_enterprise.json diff --git a/entries2025/v_label_com.json b/entries/2025/v_label_com.json similarity index 100% rename from entries2025/v_label_com.json rename to entries/2025/v_label_com.json diff --git a/entries2025/watch_dominion.json b/entries/2025/watch_dominion.json similarity index 100% rename from entries2025/watch_dominion.json rename to entries/2025/watch_dominion.json diff --git a/entries2025/watermelon.json b/entries/2025/watermelon.json similarity index 100% rename from entries2025/watermelon.json rename to entries/2025/watermelon.json diff --git a/entries2025/wir_iel_banner.json b/entries/2025/wir_iel_banner.json similarity index 100% rename from entries2025/wir_iel_banner.json rename to entries/2025/wir_iel_banner.json diff --git a/entries2025/yiffit_mascot.json b/entries/2025/yiffit_mascot.json similarity index 100% rename from entries2025/yiffit_mascot.json rename to entries/2025/yiffit_mascot.json diff --git "a/entries2025/\305\223il.json" "b/entries/2025/\305\223il.json" similarity index 100% rename from "entries2025/\305\223il.json" rename to "entries/2025/\305\223il.json" diff --git "a/entries2025/\345\205\211\346\231\202.json" "b/entries/2025/\345\205\211\346\231\202.json" similarity index 100% rename from "entries2025/\345\205\211\346\231\202.json" rename to "entries/2025/\345\205\211\346\231\202.json" diff --git a/web/_js/config-2024.js b/web/_js/config-2024.js index 7313d9b4312fd1421eca8924b9c5e8f7783cac18..8ec9cb974a5e44a2cb3afd626f3603162a11a01e 100644 --- a/web/_js/config-2024.js +++ b/web/_js/config-2024.js @@ -2,38 +2,38 @@ // Please also check code indicated with "@instanceonly" outside this file. // TODO: Avoid having instance-only code inside the main scripts to make updating easier. -const prodDomain = "canvas.mariusdavid.fr" -window.prodDomain = prodDomain +const prodDomain = "2024.canvas-atlas.fediverse.events"; +window.prodDomain = prodDomain; -const instanceId = "canvas2024" -window.instanceId = instanceId +const instanceId = "canvas2024"; +window.instanceId = instanceId; -const instanceSubreddit = null -window.instanceSubreddit = instanceSubreddit +const instanceSubreddit = null; +window.instanceSubreddit = instanceSubreddit; -const instanceRepo = null -window.instanceRepo = instanceRepo +const instanceRepo = null; +window.instanceRepo = instanceRepo; -const pageTitle = "2024 Fediverse canvas Atlas" -window.pageTitle = pageTitle +const pageTitle = "2024 Fediverse Canvas Atlas"; +window.pageTitle = pageTitle; const canvasSize = { x: 1000, - y: 500 -} -window.canvasSize = canvasSize + y: 500, +}; +window.canvasSize = canvasSize; const canvasOffset = { x: 0, - y: 0 -} -window.canvasOffset = canvasOffset + y: 0, +}; +window.canvasOffset = canvasOffset; const canvasCenter = { - x: canvasSize.x/2 + canvasOffset.x, - y: canvasSize.y/2 + canvasOffset.y -} -window.canvasCenter = canvasCenter + x: canvasSize.x / 2 + canvasOffset.x, + y: canvasSize.y / 2 + canvasOffset.y, +}; +window.canvasCenter = canvasCenter; const variationsConfig = { default: { @@ -42,27 +42,29 @@ const variationsConfig = { default: 0, drawablePeriods: [0, 0], drawableRegions: [ - [[0, 0], [0, 0, 999, 499]] + [ + [0, 0], + [0, 0, 999, 499], + ], ], versions: [ { timestamp: "Final", url: "./_img/fedicanvas2024/final.png", - } + }, ], - icon: '' + icon: '', + }, +}; +window.variationsConfig = variationsConfig; - } -} -window.variationsConfig = variationsConfig +let defaultVariation = "default"; +window.defaultVariation = defaultVariation; -let defaultVariation = 'default' -window.defaultVariation = defaultVariation +let defaultPeriod = variationsConfig[defaultVariation].default; +window.defaultPeriod = defaultPeriod; -let defaultPeriod = variationsConfig[defaultVariation].default -window.defaultPeriod = defaultPeriod +const useNumericalId = true; +window.useNumericalId = useNumericalId; -const useNumericalId = true -window.useNumericalId = useNumericalId - -window.defaultAtlasURL = "./atlas2024.json" +window.defaultAtlasURL = "./atlas/2024.json"; diff --git a/web/_js/config-2025.js b/web/_js/config-2025.js index c3a3788e968a8a4cc6731ee6549722f52135806e..715c8c8cf16791a239d0d04b326663d9d8fef154 100644 --- a/web/_js/config-2025.js +++ b/web/_js/config-2025.js @@ -2,7 +2,7 @@ // Please also check code indicated with "@instanceonly" outside this file. // TODO: Avoid having instance-only code inside the main scripts to make updating easier. -const prodDomain = "canvas2025.mariusdavid.fr"; +const prodDomain = "2025.canvas-atlas.fediverse.events"; window.prodDomain = prodDomain; const instanceId = "canvas2025"; @@ -14,7 +14,7 @@ window.instanceSubreddit = instanceSubreddit; const instanceRepo = null; window.instanceRepo = instanceRepo; -const pageTitle = "2025 Fediverse canvas Atlas"; +const pageTitle = "2025 Fediverse Canvas Atlas"; window.pageTitle = pageTitle; const canvasSize = { @@ -48,54 +48,198 @@ const variationsConfig = { ], ], versions: [ - {"timestamp": "blank", "url":"./_img/fedicanvas2025/canvas-1752285642.png"}, - {"timestamp": 1752289199, "url":"./_img/fedicanvas2025/canvas-1752289199.png"}, - {"timestamp": 1752292797, "url":"./_img/fedicanvas2025/canvas-1752292797.png"}, - {"timestamp": 1752296399, "url":"./_img/fedicanvas2025/canvas-1752296399.png"}, - {"timestamp": 1752299999, "url":"./_img/fedicanvas2025/canvas-1752299999.png"}, - {"timestamp": 1752303597, "url":"./_img/fedicanvas2025/canvas-1752303597.png"}, - {"timestamp": 1752307199, "url":"./_img/fedicanvas2025/canvas-1752307199.png"}, - {"timestamp": 1752310797, "url":"./_img/fedicanvas2025/canvas-1752310797.png"}, - {"timestamp": 1752314399, "url":"./_img/fedicanvas2025/canvas-1752314399.png"}, - {"timestamp": 1752317999, "url":"./_img/fedicanvas2025/canvas-1752317999.png"}, - {"timestamp": 1752321599, "url":"./_img/fedicanvas2025/canvas-1752321599.png"}, - {"timestamp": 1752325199, "url":"./_img/fedicanvas2025/canvas-1752325199.png"}, - {"timestamp": 1752328799, "url":"./_img/fedicanvas2025/canvas-1752328799.png"}, - {"timestamp": 1752332399, "url":"./_img/fedicanvas2025/canvas-1752332399.png"}, - {"timestamp": 1752335999, "url":"./_img/fedicanvas2025/canvas-1752335999.png"}, - {"timestamp": 1752339599, "url":"./_img/fedicanvas2025/canvas-1752339599.png"}, - {"timestamp": 1752343199, "url":"./_img/fedicanvas2025/canvas-1752343199.png"}, - {"timestamp": 1752346799, "url":"./_img/fedicanvas2025/canvas-1752346799.png"}, - {"timestamp": 1752350399, "url":"./_img/fedicanvas2025/canvas-1752350399.png"}, - {"timestamp": 1752353999, "url":"./_img/fedicanvas2025/canvas-1752353999.png"}, - {"timestamp": 1752357598, "url":"./_img/fedicanvas2025/canvas-1752357598.png"}, - {"timestamp": 1752361199, "url":"./_img/fedicanvas2025/canvas-1752361199.png"}, - {"timestamp": 1752364799, "url":"./_img/fedicanvas2025/canvas-1752364799.png"}, - {"timestamp": 1752368399, "url":"./_img/fedicanvas2025/canvas-1752368399.png"}, - {"timestamp": 1752371999, "url":"./_img/fedicanvas2025/canvas-1752371999.png"}, - {"timestamp": 1752375597, "url":"./_img/fedicanvas2025/canvas-1752375597.png"}, - {"timestamp": 1752379199, "url":"./_img/fedicanvas2025/canvas-1752379199.png"}, - {"timestamp": 1752382799, "url":"./_img/fedicanvas2025/canvas-1752382799.png"}, - {"timestamp": 1752386399, "url":"./_img/fedicanvas2025/canvas-1752386399.png"}, - {"timestamp": 1752389999, "url":"./_img/fedicanvas2025/canvas-1752389999.png"}, - {"timestamp": 1752393599, "url":"./_img/fedicanvas2025/canvas-1752393599.png"}, - {"timestamp": 1752397199, "url":"./_img/fedicanvas2025/canvas-1752397199.png"}, - {"timestamp": 1752400799, "url":"./_img/fedicanvas2025/canvas-1752400799.png"}, - {"timestamp": 1752404399, "url":"./_img/fedicanvas2025/canvas-1752404399.png"}, - {"timestamp": 1752407998, "url":"./_img/fedicanvas2025/canvas-1752407998.png"}, - {"timestamp": 1752411599, "url":"./_img/fedicanvas2025/canvas-1752411599.png"}, - {"timestamp": 1752415199, "url":"./_img/fedicanvas2025/canvas-1752415199.png"}, - {"timestamp": 1752418799, "url":"./_img/fedicanvas2025/canvas-1752418799.png"}, - {"timestamp": 1752422399, "url":"./_img/fedicanvas2025/canvas-1752422399.png"}, - {"timestamp": 1752425999, "url":"./_img/fedicanvas2025/canvas-1752425999.png"}, - {"timestamp": 1752429594, "url":"./_img/fedicanvas2025/canvas-1752429594.png"}, - {"timestamp": 1752433199, "url":"./_img/fedicanvas2025/canvas-1752433199.png"}, - {"timestamp": 1752436799, "url":"./_img/fedicanvas2025/canvas-1752436799.png"}, - {"timestamp": 1752440399, "url":"./_img/fedicanvas2025/canvas-1752440399.png"}, - {"timestamp": 1752443999, "url":"./_img/fedicanvas2025/canvas-1752443999.png"}, - {"timestamp": 1752447596, "url":"./_img/fedicanvas2025/canvas-1752447596.png"}, - {"timestamp": 1752451198, "url":"./_img/fedicanvas2025/canvas-1752451198.png"}, - {"timestamp": 1752454799, "url":"./_img/fedicanvas2025/canvas-1752454799.png"}, + { + timestamp: "blank", + url: "./_img/fedicanvas2025/canvas-1752285642.png", + }, + { + timestamp: 1752289199, + url: "./_img/fedicanvas2025/canvas-1752289199.png", + }, + { + timestamp: 1752292797, + url: "./_img/fedicanvas2025/canvas-1752292797.png", + }, + { + timestamp: 1752296399, + url: "./_img/fedicanvas2025/canvas-1752296399.png", + }, + { + timestamp: 1752299999, + url: "./_img/fedicanvas2025/canvas-1752299999.png", + }, + { + timestamp: 1752303597, + url: "./_img/fedicanvas2025/canvas-1752303597.png", + }, + { + timestamp: 1752307199, + url: "./_img/fedicanvas2025/canvas-1752307199.png", + }, + { + timestamp: 1752310797, + url: "./_img/fedicanvas2025/canvas-1752310797.png", + }, + { + timestamp: 1752314399, + url: "./_img/fedicanvas2025/canvas-1752314399.png", + }, + { + timestamp: 1752317999, + url: "./_img/fedicanvas2025/canvas-1752317999.png", + }, + { + timestamp: 1752321599, + url: "./_img/fedicanvas2025/canvas-1752321599.png", + }, + { + timestamp: 1752325199, + url: "./_img/fedicanvas2025/canvas-1752325199.png", + }, + { + timestamp: 1752328799, + url: "./_img/fedicanvas2025/canvas-1752328799.png", + }, + { + timestamp: 1752332399, + url: "./_img/fedicanvas2025/canvas-1752332399.png", + }, + { + timestamp: 1752335999, + url: "./_img/fedicanvas2025/canvas-1752335999.png", + }, + { + timestamp: 1752339599, + url: "./_img/fedicanvas2025/canvas-1752339599.png", + }, + { + timestamp: 1752343199, + url: "./_img/fedicanvas2025/canvas-1752343199.png", + }, + { + timestamp: 1752346799, + url: "./_img/fedicanvas2025/canvas-1752346799.png", + }, + { + timestamp: 1752350399, + url: "./_img/fedicanvas2025/canvas-1752350399.png", + }, + { + timestamp: 1752353999, + url: "./_img/fedicanvas2025/canvas-1752353999.png", + }, + { + timestamp: 1752357598, + url: "./_img/fedicanvas2025/canvas-1752357598.png", + }, + { + timestamp: 1752361199, + url: "./_img/fedicanvas2025/canvas-1752361199.png", + }, + { + timestamp: 1752364799, + url: "./_img/fedicanvas2025/canvas-1752364799.png", + }, + { + timestamp: 1752368399, + url: "./_img/fedicanvas2025/canvas-1752368399.png", + }, + { + timestamp: 1752371999, + url: "./_img/fedicanvas2025/canvas-1752371999.png", + }, + { + timestamp: 1752375597, + url: "./_img/fedicanvas2025/canvas-1752375597.png", + }, + { + timestamp: 1752379199, + url: "./_img/fedicanvas2025/canvas-1752379199.png", + }, + { + timestamp: 1752382799, + url: "./_img/fedicanvas2025/canvas-1752382799.png", + }, + { + timestamp: 1752386399, + url: "./_img/fedicanvas2025/canvas-1752386399.png", + }, + { + timestamp: 1752389999, + url: "./_img/fedicanvas2025/canvas-1752389999.png", + }, + { + timestamp: 1752393599, + url: "./_img/fedicanvas2025/canvas-1752393599.png", + }, + { + timestamp: 1752397199, + url: "./_img/fedicanvas2025/canvas-1752397199.png", + }, + { + timestamp: 1752400799, + url: "./_img/fedicanvas2025/canvas-1752400799.png", + }, + { + timestamp: 1752404399, + url: "./_img/fedicanvas2025/canvas-1752404399.png", + }, + { + timestamp: 1752407998, + url: "./_img/fedicanvas2025/canvas-1752407998.png", + }, + { + timestamp: 1752411599, + url: "./_img/fedicanvas2025/canvas-1752411599.png", + }, + { + timestamp: 1752415199, + url: "./_img/fedicanvas2025/canvas-1752415199.png", + }, + { + timestamp: 1752418799, + url: "./_img/fedicanvas2025/canvas-1752418799.png", + }, + { + timestamp: 1752422399, + url: "./_img/fedicanvas2025/canvas-1752422399.png", + }, + { + timestamp: 1752425999, + url: "./_img/fedicanvas2025/canvas-1752425999.png", + }, + { + timestamp: 1752429594, + url: "./_img/fedicanvas2025/canvas-1752429594.png", + }, + { + timestamp: 1752433199, + url: "./_img/fedicanvas2025/canvas-1752433199.png", + }, + { + timestamp: 1752436799, + url: "./_img/fedicanvas2025/canvas-1752436799.png", + }, + { + timestamp: 1752440399, + url: "./_img/fedicanvas2025/canvas-1752440399.png", + }, + { + timestamp: 1752443999, + url: "./_img/fedicanvas2025/canvas-1752443999.png", + }, + { + timestamp: 1752447596, + url: "./_img/fedicanvas2025/canvas-1752447596.png", + }, + { + timestamp: 1752451198, + url: "./_img/fedicanvas2025/canvas-1752451198.png", + }, + { + timestamp: 1752454799, + url: "./_img/fedicanvas2025/canvas-1752454799.png", + }, { timestamp: "final", url: "./_img/fedicanvas2025/final.png", @@ -115,4 +259,4 @@ window.defaultPeriod = defaultPeriod; const useNumericalId = true; window.useNumericalId = useNumericalId; -window.defaultAtlasURL = "./atlas2025.json" +window.defaultAtlasURL = "./atlas/2025.json"; diff --git a/web/_js/config-common.js b/web/_js/config-common.js index ff4a2656cbe91dd631733cb6de4c661e2ea4cc3d..f67aed7157ce88ced53f81af4872bfcdf132eb42 100644 --- a/web/_js/config-common.js +++ b/web/_js/config-common.js @@ -88,7 +88,7 @@ const externalLinksConfig = [ placeholder: "pJkm23b2nA", configureInputField: (inputField) => { inputField.placeholder = "r/example"; - inputField.pattern = "^r\/[A-Za-z0-9][A-Za-z0-9_]{1,50}$"; + inputField.pattern = "^r/[A-Za-z0-9][A-Za-z0-9_]{1,50}$"; inputField.title = "Subreddit in format of r/example"; inputField.minLength = "4"; inputField.maxLength = "50"; @@ -112,16 +112,16 @@ const externalLinksConfig = [ ]; console.info( - `%cThe fediverse canvas atlas + `%cThe Fediverse Canvas Atlas %cCopyright (c) 2017 Roland Rytz Copyright (c) 2023 Place Atlas Initiative and contributors -Copyright (c) 2025 Fediverse canvas atlas contributors +Copyright (c) 2025 Fediverse Canvas Atlas contributors Licensed under AGPL-3.0 (https://2023.place-atlas.stefanocoding.me/license.txt) -https://sc07.dev/marius851000/fediverse-canvas-atlas-2024 +https://sc07.dev/fediverse.events/canvas-atlas To get the image of the canvas, use downloadCanvas(). `, "font-size: 150%; line-height: 150%", - "", + "" ); diff --git a/web/index_template.html b/web/index_template.html index 99a4f3b80d807e597153a729e6ef15b56e44a0d8..ef7952dcb117fdd473c6c65e6c91e87c89bf2f14 100644 --- a/web/index_template.html +++ b/web/index_template.html @@ -17,8 +17,8 @@ - - + + @@ -26,10 +26,10 @@ - + - + @@ -52,7 +52,7 @@ {2025ONLYCOMMENTSTART}{2025ONLYCOMMENTEND} @@ -104,7 +104,7 @@ Place Wiki -->
  • - Source + Source
    • @@ -113,11 +113,11 @@ {2024ONLYCOMMENTSTART}
  • - 2024 atlas + 2024 atlas
    • {2024ONLYCOMMENTEND} {2025ONLYCOMMENTSTART}
  • - 2025 atlas + 2025 atlas
    • {2025ONLYCOMMENTEND}