Merge pull request #1407 from kiosion/design-rework-2

Design rework

.github/workflows/netlify-deploy.yml

@@ -18,13 +18,13 @@ jobs:
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 9.1.0
+          version: 9.8.0
           run_install: false
       - name: Use node_modules cache
         uses: actions/cache@v4
         id: nm-cache
         with:
-          path: 'svelte-app/node_modules'
+          path: "svelte-app/node_modules"
           key: ${{ runner.os }}-npm-${{ hashFiles('svelte-app/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-nm-16-

.github/workflows/sanity.yml

@@ -2,16 +2,16 @@ name: CI - Sanity
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
     paths-ignore:
-      - '**/*.md'
-      - 'LICENSE'
-      - '**/.husky'
-      - 'svelte-app/**'
-      - 'express-api/**'
-      - 'elixir-api/**'
+      - "**/*.md"
+      - "LICENSE"
+      - "**/.husky"
+      - "svelte-app/**"
+      - "express-api/**"
+      - "elixir-api/**"
 
-concurrency: 
+concurrency:
   group: sanity
   cancel-in-progress: true
 
@@ -30,13 +30,13 @@ jobs:
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 9.1.0
+          version: 9.8.0
           run_install: false
       - name: Use node_modules cache
         uses: actions/cache@v4
         id: nm-cache
         with:
-          path: 'sanity-cms/node_modules'
+          path: "sanity-cms/node_modules"
           key: ${{ runner.os }}-npm-${{ hashFiles('sanity-cms/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-npm-

.github/workflows/svelte.yml

@@ -2,17 +2,17 @@ name: CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
     paths-ignore:
-      - '**/*.md'
-      - 'LICENSE'
-      - '**/.husky'
-      - 'sanity-cms/**'
-      - 'express-api/**'
-      - 'rust-api/**'
-      - 'elixir-api/**'
+      - "**/*.md"
+      - "LICENSE"
+      - "**/.husky"
+      - "sanity-cms/**"
+      - "express-api/**"
+      - "rust-api/**"
+      - "elixir-api/**"
 
-concurrency: 
+concurrency:
   group: ci
   cancel-in-progress: true
 
@@ -31,13 +31,13 @@ jobs:
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 9.1.0
+          version: 9.8.0
           run_install: false
       - name: Use node_modules cache
         uses: actions/cache@v4
         id: nm-cache
         with:
-          path: 'svelte-app/node_modules'
+          path: "svelte-app/node_modules"
           key: ${{ runner.os }}-npm-${{ hashFiles('svelte-app/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-npm-
@@ -52,6 +52,6 @@ jobs:
     secrets: inherit
   deploy:
     name: Deploy
-    needs: [ lint, tests ]
+    needs: [lint, tests]
     uses: ./.github/workflows/netlify-deploy.yml
     secrets: inherit

.github/workflows/test.yml

@@ -2,10 +2,10 @@ name: Tests
 
 on:
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
   workflow_call:
 
-concurrency: 
+concurrency:
   group: test-${{ github.ref }}
   cancel-in-progress: true
 
@@ -23,13 +23,13 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9.1.0
+          version: 9.8.0
           run_install: false
       - name: Use node_modules cache
         uses: actions/cache@v4
         id: nm-cache
         with:
-          path: 'svelte-app/node_modules'
+          path: "svelte-app/node_modules"
           key: ${{ runner.os }}-npm-${{ hashFiles('svelte-app/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-npm-
@@ -52,13 +52,13 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 9.1.0
+          version: 9.8.0
           run_install: false
       - name: Use node_modules cache
         uses: actions/cache@v4
         id: nm-cache
         with:
-          path: 'svelte-app/node_modules'
+          path: "svelte-app/node_modules"
           key: ${{ runner.os }}-npm-${{ hashFiles('svelte-app/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-npm-

elixir-api/lib/app/application.ex

@@ -30,7 +30,7 @@ defmodule Hexerei.Application do
         Hexerei.Cache.TranslateCache,
         [
           options: [
-            max_size: 512
+            max_size: 1024
           ]
         ]
       },

elixir-api/lib/routes/api/v1/config.ex

@@ -15,7 +15,7 @@ defmodule Router.Api.V1.Config do
     with {:ok, params} <- validate_query_params(conn, %{"lang" => "en"}) do
       query =
         Query.new()
-        |> Query.filter([%{"_type" => "'siteSettings'"}])
+        |> Query.filter([%{"_id" => "'siteSettings'"}])
         |> Query.qualify("[0]")
         |> Query.build!()
 

elixir-api/lib/routes/api/v1/tag.ex

@@ -85,16 +85,6 @@ defmodule Router.Api.V1.Tag do
             }
           )
 
-        # parsed_counts = Task.await(counts)
-
-        # {transformed_result, meta, code} =
-        #   transform_result_document(query, result, :tag, params, %{
-        #     "total" => parsed_counts["result"]["total"],
-        #     "count" => parsed_counts["result"]["count"],
-        #     "id" => id,
-        #     "type" => params["type"]
-        #   })
-
         update_meta_and_send_response(conn, code, transformed_result, meta, duration)
       end)
     else

elixir-api/lib/routes/cdn.ex

@@ -47,11 +47,20 @@ defmodule Router.Cdn do
 
     with true <- is_binary(url_parts.filetype),
          {:ok, url} <- Hexerei.SanityClient.urlFor(url_parts.asset, conn.query_string) do
-      with {:ok, %HTTPoison.Response{status_code: 200, body: body}} <-
+      with {:ok, %HTTPoison.Response{status_code: 200, body: body, headers: headers}} <-
              Hexerei.Env.get(:http_client, Hexerei.HTTP.DefaultClient).get(url) do
+        content_type =
+          headers
+          |> Enum.find(fn {k, _} -> String.downcase(k) == "content-type" end)
+          |> case do
+            {k, v} -> String.downcase(v)
+            # fall back to filetype from ext, if present
+            _ -> "image/#{url_parts.filetype}"
+          end
+
         conn
         |> put_resp_header("Access-Control-Allow-Origin", "*")
-        |> put_resp_content_type("image/#{url_parts.filetype}")
+        |> put_resp_content_type(content_type)
         |> send_resp(200, body)
       else
         {:ok, %HTTPoison.Response{status_code: 404}} ->