@doswiftly/cli 0.1.1

package/templates/storefront-nextjs-shadcn/lib/graphql/server.ts

@@ -0,0 +1,267 @@
+import { cache } from 'react';
+import { GraphQLClient } from 'graphql-request';
+import type { TypedDocumentNode } from '@graphql-typed-document-node/core';
+import { getCurrencyFromCookieAsync } from '@/lib/currency/';
+
+// Import config - will be injected by CLI during template generation
+let config: {
+  shop: { slug: string };
+  api: { url: string };
+} | null = null;
+
+try {
+  // Dynamic import to handle cases where config doesn't exist yet
+  const configModule = require('@/doswiftly.config');
+  config = configModule.default || configModule;
+} catch (error) {
+  // Fallback to environment variables if config file doesn't exist
+  config = {
+    shop: {
+      slug: process.env.NEXT_PUBLIC_SHOP_SLUG || 'demo-shop',
+    },
+    api: {
+      url: process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8000',
+    },
+  };
+}
+
+/**
+ * Cached GraphQL client factory for Server Components
+ * 
+ * Uses React cache() to deduplicate requests within a single render pass.
+ * Server-side requests now include X-Preferred-Currency header from cookie
+ * for SSR currency consistency.
+ * 
+ * Note: This is an async function in Next.js 15+ because cookies() is async.
+ * 
+ * @returns GraphQL client configured for server-side usage with currency support
+ */
+export const getClient = cache(async () => {
+  // Read currency from cookie (SSR-safe, async in Next.js 15+)
+  const currency = await getCurrencyFromCookieAsync();
+  
+  return new GraphQLClient(`${config!.api.url}/storefront/graphql`, {
+    headers: {
+      'X-Shop-Slug': config!.shop.slug,
+      // Include X-Preferred-Currency from cookie for SSR consistency
+      ...(currency && { 'X-Preferred-Currency': currency }),
+    },
+  });
+});
+
+/**
+ * Generic request helper with React cache
+ * 
+ * @param document - TypedDocumentNode from codegen
+ * @param variables - Query variables
+ * @returns Query result
+ */
+export const request = cache(async <TResult, TVariables>(
+  document: TypedDocumentNode<TResult, TVariables>,
+  variables?: TVariables
+): Promise<TResult> => {
+  const client = await getClient();
+  return client.request(document, variables as any);
+});
+
+// ============================================================================
+// HELPER FUNCTIONS
+// ============================================================================
+
+/**
+ * Fetch shop data with currency configuration
+ * 
+ * Used in root layout to initialize currency store.
+ * Cached per render to avoid duplicate requests.
+ * 
+ * @returns Shop query result
+ * 
+ * @example
+ * ```typescript
+ * // app/layout.tsx
+ * import { fetchShop } from '@/lib/graphql/server';
+ * 
+ * export default async function RootLayout() {
+ *   const data = await fetchShop();
+ *   return <CurrencyProvider shopData={data.shop}>...</CurrencyProvider>;
+ * }
+ * ```
+ */
+export const fetchShop = cache(async () => {
+  // Import generated types dynamically to avoid circular dependencies
+  const { ShopDocument } = await import('@/generated/graphql');
+  return request(ShopDocument, {});
+});
+
+/**
+ * Fetch single product by handle or ID
+ * 
+ * Returns product in base currency for SSG compatibility.
+ * Client components should refetch with preferred currency if needed.
+ * 
+ * @param handleOrId - Product handle (string) or ID
+ * @returns Product query result
+ * 
+ * @example
+ * ```typescript
+ * // app/products/[handle]/page.tsx
+ * import { fetchProduct } from '@/lib/graphql/server';
+ * 
+ * export default async function ProductPage({ params }) {
+ *   const data = await fetchProduct(params.handle);
+ *   return <ProductClient initialProduct={data.product} />;
+ * }
+ * ```
+ */
+export const fetchProduct = cache(async (handleOrId: string) => {
+  if (!handleOrId) {
+    throw new Error('Product handle or ID is required');
+  }
+  
+  const { ProductDocument } = await import('@/generated/graphql');
+  
+  // Determine if it's an ID or handle
+  const isId = handleOrId.startsWith('gid://');
+  
+  return request(ProductDocument, {
+    ...(isId ? { id: handleOrId } : { handle: handleOrId }),
+  });
+});
+
+/**
+ * Fetch products with pagination and normalization
+ * 
+ * Automatically normalizes GraphQL edges/nodes structure to flat arrays
+ * for easier consumption in components.
+ * 
+ * @param variables - Query variables (first, after, query, sortKey, reverse)
+ * @returns Normalized products response
+ * 
+ * @example
+ * ```typescript
+ * // app/products/page.tsx
+ * import { fetchProducts } from '@/lib/graphql/server';
+ * 
+ * export default async function ProductsPage() {
+ *   const { products, pageInfo } = await fetchProducts({ first: 20 });
+ *   return products.map(product => <ProductCard key={product.id} product={product} />);
+ * }
+ * ```
+ */
+export const fetchProducts = cache(async (variables?: {
+  first?: number;
+  after?: string;
+  query?: string;
+  sortKey?: string;
+  reverse?: boolean;
+}) => {
+  const { ProductsDocument } = await import('@/generated/graphql');
+  
+  const data = await request(ProductsDocument, {
+    first: variables?.first ?? 20,
+    after: variables?.after,
+    query: variables?.query,
+    sortKey: variables?.sortKey as any,
+    reverse: variables?.reverse,
+  });
+  
+  // Normalize: edges/nodes → flat array
+  return {
+    products: data.products.edges.map((edge: any) => edge.node),
+    pageInfo: data.products.pageInfo,
+    totalCount: data.products.totalCount,
+  };
+});
+
+/**
+ * Fetch collections with pagination and normalization
+ * 
+ * @param variables - Query variables
+ * @returns Normalized collections response
+ * 
+ * @example
+ * ```typescript
+ * import { fetchCollections } from '@/lib/graphql/server';
+ * 
+ * const { collections } = await fetchCollections({ first: 10 });
+ * ```
+ */
+export const fetchCollections = cache(async (variables?: {
+  first?: number;
+  after?: string;
+  query?: string;
+  sortKey?: string;
+  reverse?: boolean;
+}) => {
+  const { CollectionsDocument } = await import('@/generated/graphql');
+  
+  const data = await request(CollectionsDocument, {
+    first: variables?.first ?? 20,
+    after: variables?.after,
+    query: variables?.query,
+    sortKey: variables?.sortKey as any,
+    reverse: variables?.reverse,
+  });
+  
+  // Normalize: edges/nodes → flat array
+  return {
+    collections: data.collections.edges.map((edge: any) => edge.node),
+    pageInfo: data.collections.pageInfo,
+    totalCount: data.collections.totalCount,
+  };
+});
+
+/**
+ * Fetch single collection by handle or ID
+ * 
+ * @param handleOrId - Collection handle or ID
+ * @returns Collection query result
+ * 
+ * @example
+ * ```typescript
+ * import { fetchCollection } from '@/lib/graphql/server';
+ * 
+ * const data = await fetchCollection('featured-products');
+ * ```
+ */
+export const fetchCollection = cache(async (handleOrId: string) => {
+  const { CollectionDocument } = await import('@/generated/graphql');
+  
+  const isId = handleOrId.startsWith('gid://');
+  
+  return request(CollectionDocument, {
+    ...(isId ? { id: handleOrId } : { handle: handleOrId }),
+  });
+});
+
+/**
+ * Fetch categories from GraphQL API
+ * 
+ * @returns Categories query result with tree structure
+ */
+export const fetchCategories = cache(async () => {
+  const { CategoriesDocument } = await import('@/generated/graphql');
+  return request(CategoriesDocument, {});
+});
+
+/**
+ * Fetch customer data (requires access token)
+ * 
+ * @param accessToken - Customer access token
+ * @returns Customer query result with addresses and orders
+ */
+export const fetchCustomer = cache(async (accessToken: string) => {
+  const { CustomerDocument } = await import('@/generated/graphql');
+  return request(CustomerDocument, { customerAccessToken: accessToken });
+});
+
+// ============================================================================
+// TYPE EXPORTS
+// ============================================================================
+
+/**
+ * Normalized response types for helper functions
+ * These types will be inferred from generated GraphQL types
+ */
+export type NormalizedProductsResponse = Awaited<ReturnType<typeof fetchProducts>>;
+export type NormalizedCollectionsResponse = Awaited<ReturnType<typeof fetchCollections>>;

package/templates/storefront-nextjs-shadcn/lib/hooks.ts

@@ -0,0 +1,30 @@
+import { useState, useEffect } from "react";
+
+/**
+ * useDebouncedValue - Debounce a value
+ *
+ * @param value - Value to debounce
+ * @param delay - Delay in ms (default: 300)
+ * @returns Debounced value
+ *
+ * @example
+ * ```tsx
+ * const [query, setQuery] = useState("");
+ * const debouncedQuery = useDebouncedValue(query, 300);
+ *
+ * // debouncedQuery updates 300ms after query stops changing
+ * ```
+ */
+export function useDebouncedValue<T>(value: T, delay = 300): T {
+  const [debouncedValue, setDebouncedValue] = useState(value);
+
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setDebouncedValue(value);
+    }, delay);
+
+    return () => clearTimeout(timer);
+  }, [value, delay]);
+
+  return debouncedValue;
+}

package/templates/storefront-nextjs-shadcn/lib/theme/theme-config.ts

@@ -0,0 +1,89 @@
+/**
+ * Theme Configuration
+ * Design tokens and theme settings for the storefront
+ */
+
+export const themeConfig = {
+  // Default theme
+  defaultTheme: "system" as const,
+
+  // Available themes
+  themes: ["light", "dark", "system"] as const,
+
+  // Enable system theme detection
+  enableSystem: true,
+
+  // Disable theme transition on page load
+  disableTransitionOnChange: false,
+
+  // Storage key for theme preference
+  storageKey: "doswiftly-theme",
+
+  // Attribute to set on document element
+  attribute: "class",
+
+  // CSS variables for theme colors
+  colors: {
+    light: {
+      background: "0 0% 100%",
+      foreground: "222.2 84% 4.9%",
+      card: "0 0% 100%",
+      "card-foreground": "222.2 84% 4.9%",
+      popover: "0 0% 100%",
+      "popover-foreground": "222.2 84% 4.9%",
+      primary: "222.2 47.4% 11.2%",
+      "primary-foreground": "210 40% 98%",
+      secondary: "210 40% 96.1%",
+      "secondary-foreground": "222.2 47.4% 11.2%",
+      muted: "210 40% 96.1%",
+      "muted-foreground": "215.4 16.3% 46.9%",
+      accent: "210 40% 96.1%",
+      "accent-foreground": "222.2 47.4% 11.2%",
+      destructive: "0 84.2% 60.2%",
+      "destructive-foreground": "210 40% 98%",
+      border: "214.3 31.8% 91.4%",
+      input: "214.3 31.8% 91.4%",
+      ring: "222.2 84% 4.9%",
+    },
+    dark: {
+      background: "222.2 84% 4.9%",
+      foreground: "210 40% 98%",
+      card: "222.2 84% 4.9%",
+      "card-foreground": "210 40% 98%",
+      popover: "222.2 84% 4.9%",
+      "popover-foreground": "210 40% 98%",
+      primary: "210 40% 98%",
+      "primary-foreground": "222.2 47.4% 11.2%",
+      secondary: "217.2 32.6% 17.5%",
+      "secondary-foreground": "210 40% 98%",
+      muted: "217.2 32.6% 17.5%",
+      "muted-foreground": "215 20.2% 65.1%",
+      accent: "217.2 32.6% 17.5%",
+      "accent-foreground": "210 40% 98%",
+      destructive: "0 62.8% 30.6%",
+      "destructive-foreground": "210 40% 98%",
+      border: "217.2 32.6% 17.5%",
+      input: "217.2 32.6% 17.5%",
+      ring: "212.7 26.8% 83.9%",
+    },
+  },
+} as const;
+
+export type Theme = (typeof themeConfig.themes)[number];
+
+/**
+ * Get theme colors for a specific theme
+ */
+export function getThemeColors(theme: "light" | "dark") {
+  return themeConfig.colors[theme];
+}
+
+/**
+ * Generate CSS variables for theme
+ */
+export function generateThemeVariables(theme: "light" | "dark") {
+  const colors = getThemeColors(theme);
+  return Object.entries(colors)
+    .map(([key, value]) => `--${key}: ${value};`)
+    .join("\n  ");
+}

package/templates/storefront-nextjs-shadcn/lib/utils.ts

@@ -0,0 +1,6 @@
+import { clsx, type ClassValue } from "clsx";
+import { twMerge } from "tailwind-merge";
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}

package/templates/storefront-nextjs-shadcn/next.config.ts

@@ -0,0 +1,47 @@
+import type { NextConfig } from 'next';
+
+const nextConfig: NextConfig = {
+  // Enable React strict mode for better development experience
+  reactStrictMode: true,
+
+  // Image optimization configuration
+  images: {
+    remotePatterns: [
+      {
+        protocol: 'https',
+        hostname: '**.doswiftly.pl',
+      },
+      {
+        protocol: 'https',
+        hostname: 'images.unsplash.com',
+      },
+      {
+        protocol: 'http',
+        hostname: 'app.localhost',
+        port: '8000',
+      },
+    ],
+    // Allow dangerous URLs for local development
+    dangerouslyAllowSVG: true,
+    contentDispositionType: 'attachment',
+    // Disable image optimization for local development if needed
+    unoptimized: process.env.NODE_ENV === 'development',
+  },
+
+  // Experimental features
+  experimental: {
+    // Enable server actions
+    serverActions: {
+      bodySizeLimit: '2mb',
+    },
+  },
+
+  // Environment variables validation
+  env: {
+    NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL,
+    NEXT_PUBLIC_PROJECT_ID: process.env.NEXT_PUBLIC_PROJECT_ID,
+    NEXT_PUBLIC_SHOP_SLUG: process.env.NEXT_PUBLIC_SHOP_SLUG,
+  },
+};
+
+export default nextConfig;

package/templates/storefront-nextjs-shadcn/open-next.config.ts

@@ -0,0 +1,3 @@
+import { defineCloudflareConfig } from "@opennextjs/cloudflare";
+
+export default defineCloudflareConfig({});

package/templates/storefront-nextjs-shadcn/package.dev.json

@@ -0,0 +1,30 @@
+{
+  "name": "test-storefront",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint"
+  },
+  "dependencies": {
+    "@doswiftly/commerce-sdk": "file:../../../commerce-sdk",
+    "graphql-request": "^7.1.2",
+    "graphql": "^16.10.0",
+    "next": "latest",
+    "react": "^19",
+    "react-dom": "^19",
+    "lucide-react": "latest"
+  },
+  "devDependencies": {
+    "@types/node": "latest",
+    "@types/react": "latest",
+    "@types/react-dom": "latest",
+    "typescript": "latest",
+    "@tailwindcss/postcss": "latest",
+    "tailwindcss": "latest",
+    "eslint": "latest",
+    "eslint-config-next": "latest"
+  }
+}

package/templates/storefront-nextjs-shadcn/package.json

@@ -0,0 +1,60 @@
+{
+  "name": "{{PROJECT_NAME}}",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "build:cf": "opennextjs-cloudflare build",
+    "start": "next start",
+    "lint": "next lint",
+    "codegen": "graphql-codegen --config codegen.ts",
+    "codegen:watch": "graphql-codegen --config codegen.ts --watch"
+  },
+  "dependencies": {
+    "@doswiftly/storefront-operations": "{{STOREFRONT_OPS_VERSION}}",
+    "@graphql-typed-document-node/core": "^3.2.0",
+    "@tanstack/react-query": "^5.62.0",
+    "graphql-request": "^7.1.2",
+    "graphql": "^16.10.0",
+    "graphql-tag": "^2.12.6",
+    "js-cookie": "^3.0.5",
+    "next": "^15.1.9",
+    "react": "^19",
+    "react-dom": "^19",
+    "lucide-react": "latest",
+    "@radix-ui/react-accordion": "^1.2.0",
+    "@radix-ui/react-checkbox": "^1.1.0",
+    "@radix-ui/react-dialog": "^1.1.0",
+    "@radix-ui/react-label": "^2.1.0",
+    "@radix-ui/react-radio-group": "^1.2.0",
+    "@radix-ui/react-select": "^2.1.0",
+    "@radix-ui/react-slot": "^1.1.0",
+    "@radix-ui/react-tabs": "^1.1.0",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.0",
+    "tailwind-merge": "^2.5.0",
+    "zustand": "^5.0.2",
+    "zod": "^3.23.8",
+    "sonner": "^1.7.1",
+    "next-themes": "^0.4.4"
+  },
+  "devDependencies": {
+    "@graphql-codegen/cli": "^5.0.3",
+    "@graphql-codegen/typescript": "^4.1.2",
+    "@graphql-codegen/typescript-operations": "^4.4.2",
+    "@graphql-codegen/typed-document-node": "^5.0.12",
+    "@next/env": "^15.1.9",
+    "@opennextjs/cloudflare": "^1.0.0",
+    "@types/js-cookie": "^3.0.6",
+    "@types/node": "latest",
+    "@types/react": "latest",
+    "@types/react-dom": "latest",
+    "fast-check": "^3.15.0",
+    "typescript": "latest",
+    "@tailwindcss/postcss": "latest",
+    "tailwindcss": "latest",
+    "eslint": "latest",
+    "eslint-config-next": "^15.1.9"
+  }
+}

package/templates/storefront-nextjs-shadcn/package.json.template

@@ -0,0 +1,46 @@
+{
+  "name": "{{PROJECT_NAME}}",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint",
+    "codegen": "graphql-codegen --config codegen.ts",
+    "codegen:watch": "graphql-codegen --config codegen.ts --watch"
+  },
+  "dependencies": {
+    "@doswiftly/storefront-operations": "{{STOREFRONT_OPS_VERSION}}",
+    "@graphql-typed-document-node/core": "^3.2.0",
+    "@tanstack/react-query": "^5.62.0",
+    "graphql-request": "^7.1.2",
+    "graphql": "^16.10.0",
+    "graphql-tag": "^2.12.6",
+    "next": "latest",
+    "react": "^19",
+    "react-dom": "^19",
+    "lucide-react": "latest",
+    "@radix-ui/react-slot": "^1.1.0",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.0",
+    "tailwind-merge": "^2.5.0",
+    "zustand": "^5.0.2",
+    "zod": "^3.23.8"
+  },
+  "devDependencies": {
+    "@graphql-codegen/cli": "^5.0.3",
+    "@graphql-codegen/typescript": "^4.1.2",
+    "@graphql-codegen/typescript-operations": "^4.4.2",
+    "@graphql-codegen/typed-document-node": "^5.0.12",
+    "@next/env": "latest",
+    "@types/node": "latest",
+    "@types/react": "latest",
+    "@types/react-dom": "latest",
+    "typescript": "latest",
+    "@tailwindcss/postcss": "latest",
+    "tailwindcss": "latest",
+    "eslint": "latest",
+    "eslint-config-next": "latest"
+  }
+}

package/templates/storefront-nextjs-shadcn/postcss.config.mjs

@@ -0,0 +1,8 @@
+/** @type {import('postcss-load-config').Config} */
+const config = {
+  plugins: {
+    "@tailwindcss/postcss": {},
+  },
+};
+
+export default config;

package/templates/storefront-nextjs-shadcn/proxy.ts

@@ -0,0 +1,80 @@
+import { NextResponse } from "next/server";
+import type { NextRequest } from "next/server";
+import {
+  protectedRoutes,
+  guestOnlyRoutes,
+  AUTH_COOKIE_NAME,
+  redirects,
+  matchesRoute,
+} from "@/lib/auth/routes";
+
+/**
+ * Authentication Proxy Function (Next.js 15+)
+ *
+ * Security Model (3 layers):
+ * 1. Proxy function (this file) - Fast redirect based on cookie existence (UX layer)
+ * 2. AuthGuard component - Client-side validation via useAuth hook
+ * 3. GraphQL Backend - Ultimate security (validates token on every request)
+ *
+ * IMPORTANT: This proxy checks cookie EXISTENCE, not VALIDITY.
+ * Token validation happens in:
+ * - AuthGuard (client-side via useAuth hook)
+ * - GraphQL API (server-side, ultimate security)
+ *
+ * Why this approach?
+ * - Proxy runs on Edge Runtime (fast, but limited capabilities)
+ * - Cannot make GraphQL requests to validate token
+ * - Provides instant redirect without waiting for client hydration
+ * - Prevents flash of protected content for unauthenticated users
+ *
+ * @see lib/auth/routes.ts - SSOT for route configuration
+ * @see components/auth/auth-guard.tsx - Client-side auth protection
+ */
+export function proxy(request: NextRequest) {
+  const { pathname } = request.nextUrl;
+  const token = request.cookies.get(AUTH_COOKIE_NAME)?.value;
+  const hasToken = Boolean(token);
+
+  // Protected routes - redirect to login if no token
+  if (matchesRoute(pathname, protectedRoutes)) {
+    if (!hasToken) {
+      const loginUrl = new URL(redirects.unauthenticated, request.url);
+      // Preserve the original URL for redirect after login
+      loginUrl.searchParams.set("redirect", pathname);
+      return NextResponse.redirect(loginUrl);
+    }
+  }
+
+  // Guest-only routes - redirect to account if has token
+  if (matchesRoute(pathname, guestOnlyRoutes)) {
+    if (hasToken) {
+      return NextResponse.redirect(
+        new URL(redirects.authenticated, request.url)
+      );
+    }
+  }
+
+  return NextResponse.next();
+}
+
+/**
+ * Matcher configuration
+ *
+ * Only run proxy on routes that need auth checks.
+ * This improves performance by skipping static assets, API routes, etc.
+ *
+ * Update this when adding new protected or guest-only route groups.
+ */
+export const config = {
+  matcher: [
+    /*
+     * Match all request paths except:
+     * - _next/static (static files)
+     * - _next/image (image optimization files)
+     * - favicon.ico (favicon file)
+     * - public folder files (images, etc.)
+     * - API routes (handled separately)
+     */
+    "/((?!_next/static|_next/image|favicon.ico|.*\\.(?:svg|png|jpg|jpeg|gif|webp)$).*)",
+  ],
+};

package/templates/storefront-nextjs-shadcn/public/icons/payment/apple-pay.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 32" fill="none">
+  <rect width="48" height="32" rx="4" fill="#000"/>
+  <path d="M14.5 11.5c.5-.7.9-1.6.8-2.5-.8 0-1.8.5-2.3 1.2-.5.6-.9 1.5-.8 2.4.9.1 1.8-.4 2.3-1.1z" fill="#fff"/>
+  <path d="M15.3 12.8c-1.3-.1-2.4.7-3 .7-.6 0-1.6-.7-2.6-.7-1.3 0-2.6.8-3.3 2-.7 1.2-.9 3.2.1 5 .5.9 1.1 1.8 1.9 1.8s1.2-.5 2.3-.5c1.1 0 1.4.5 2.4.5s1.4-.9 1.9-1.8c.3-.5.5-.9.6-1.2-1.4-.5-2-2.2-1.4-3.5.3-.7.8-1.2 1.4-1.5-.5-.8-1.3-1.3-2.3-1.3v.5z" fill="#fff"/>
+  <path d="M22 21.5V11h2.9c2 0 3.4 1.4 3.4 3.4s-1.4 3.4-3.4 3.4h-1.5v3.7H22zm1.4-4.9h1.2c1.4 0 2.1-.7 2.1-2s-.7-2-2.1-2h-1.2v4z" fill="#fff"/>
+  <path d="M29 18.3c0-2 1.3-3.2 3.2-3.2 2 0 3.2 1.2 3.2 3.2v.3h-5.1c.1 1.2.8 1.9 2 1.9.8 0 1.4-.3 1.6-.9h1.4c-.2 1.2-1.4 2-3 2-2 0-3.3-1.3-3.3-3.3zm1.3-.4h3.8c-.1-1.1-.8-1.8-1.9-1.8s-1.8.7-1.9 1.8z" fill="#fff"/>
+  <path d="M36.5 24v-1.2c.1 0 .3.1.5.1.6 0 1-.3 1.2-.9l.1-.4-2.6-6.4h1.5l1.9 5.2 1.9-5.2H42l-2.7 6.9c-.6 1.5-1.3 2-2.5 2-.1 0-.2 0-.3-.1z" fill="#fff"/>
+</svg>