orionplace-react 0.3.1 → 0.5.0

package/README.md

@@ -127,7 +127,7 @@ starting the application. Imports then work at any component directory depth.
 <!-- components:start (generated by scripts/generate-package-readme-components.mjs) -->
 ## Components
 
-The starter includes **124 storefront components**, copied into
+The starter includes **126 storefront components**, copied into
 `components/orionplace/` of your project. Each one has a README in English and Russian
 next to its source that describes its inputs, data and actions.
 
@@ -292,6 +292,8 @@ Journal content and customer contact flows.
 | **Contact details** | `AboutPage` | Display the store’s published company and contact information. |
 | **Contact form** | `ContactForm` | Sending a question to the store. |
 | **Unsubscribe from emails** | `EmailUnsubscribe` | Confirming an unsubscribe request from an email link. |
+| **Privacy policy page** | `StorefrontPrivacy` | The store’s personal data policy with a cookies section and the operator’s details. |
+| **Cookie notice** | `CookieNotice` | A small notice about the necessary cookies with a link to the cookies section of the policy. |
 
 ### Shared interface
 
@@ -317,6 +319,8 @@ npx orionplace-react add frontend www.shop.example.com
 npx orionplace-react remove frontend www.shop.example.com
 npx orionplace-react set mimic shop.example.com
 sudo npx orionplace-react install
+npx orionplace-react status
+sudo npx orionplace-react restart
 npx orionplace-react help
 ```
 
@@ -363,9 +367,34 @@ builds the project, runs it as the system service `orionplace-shop` on a free
 local port and connects each storefront domain with nginx and a Let's Encrypt
 certificate. Run it again after code or package updates; the service keeps its
 port. Options: `--name <service>`, `--port <port>`, `--user <user>`,
-`--no-domains`, `--yes`, `--dry-run`. Full guide:
+`--no-build` (install the build already in the folder), `--no-domains`, `--yes`,
+`--dry-run`. Full guide:
 [Install a storefront](https://orionmarket.place/en/sandbox/install/storefront?framework=react).
 
+### Manage the service
+
+Run these in the project folder, or name the service from anywhere with
+`--name shop`:
+
+```bash
+npx orionplace-react status            # running?, autostart, port, home page answer, domains
+sudo npx orionplace-react start
+sudo npx orionplace-react stop
+sudo npx orionplace-react restart      # waits until the home page answers again
+sudo npx orionplace-react logs 200     # last log lines; --follow keeps reading
+npx orionplace-react list              # every storefront service on this server
+sudo npx orionplace-react uninstall    # stop and remove the service (alias: cleanup)
+```
+
+`start` and `restart` wait up to 90 seconds for the home page and print the
+last log lines when it does not answer. `status` ends with code 3 when the
+storefront is stopped or does not answer, so scripts and monitors can use it.
+`uninstall` (or `cleanup`) stops the service, takes it out of autostart and
+deletes its unit file and registration; the project folder and its build stay.
+With the `orionplace` server tool it runs `orionplace app remove`, which also
+turns the storefront's domains into a placeholder page. `--dry-run` shows what it
+would remove; `--yes` skips the question.
+
 ## Generated files
 
 | Path                                    | Purpose                                                                          |
@@ -440,8 +469,14 @@ The corresponding `.cfg` is read on every request. Backend URLs must use HTTPS,
 end in `/api`, and belong to `*.orionplace.app`. API methods, query strings, bodies,
 authorization and cookies are forwarded. Backend statuses are retained and cookie
 Domain attributes are removed to bind cookies to the storefront. Gateway responses
-use `Cache-Control: no-store`. Network failures return `502`. Cross-site mutations
-are rejected with `403`.
+use `Cache-Control: no-store`. Network failures return `502`.
+
+A changing request (POST, PUT, PATCH, DELETE) from another site is rejected with
+`403`. A request from the page's own host or the storefront domain passes, and the
+backend receives it with the storefront domain's origin
+(`https://shop.example.com`), the one it accepts forms from. So a host that shows
+the storefront through `X-Front-Domain`, such as a preview host or a local port,
+can sign in too.
 
 Browser requests use `/api/...`. Server components call the same gateway in process
 through `lib/orionplace/appLoadServer.ts`, which forwards the current request's

package/bin/orionplace-react.mjs

@@ -2,6 +2,7 @@
 import { setupProject } from '../src/setup.mjs';
 import { updateProject } from '../src/update.mjs';
 import { installService } from '../src/install.mjs';
+import { SERVICE_ACTIONS, SERVICE_ALIASES, controlService, findApp, printService } from '../src/service.mjs';
 import { readFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import { createInterface } from 'node:readline/promises';
@@ -37,9 +38,20 @@ On your Linux server (run from the project root):
   nginx and HTTPS. Run it again after changes or an update to rebuild and restart.
   Server tool: https://orionmarket.place/downloads/orionplace.sh
 
+Manage the installed service (from the project root, or name it with --name):
+  npx orionplace-react status              service, autostart, port and home page answer
+  sudo npx orionplace-react start
+  sudo npx orionplace-react stop
+  sudo npx orionplace-react restart        restart and wait until the home page answers
+  sudo npx orionplace-react logs [lines]   last log lines (100); --follow keeps reading
+  npx orionplace-react list                every storefront service on this server
+  sudo npx orionplace-react uninstall      stop the service and remove it (alias: cleanup);
+                                       the project folder stays
+
 Options: --cwd <directory>  --dry-run  --help  --version
 Update option: --local (apply this CLI version instead of fetching the latest release)
-Install options: --name <service>  --port <port>  --user <user>  --no-domains  --yes
+Install options: --name <service>  --port <port>  --user <user>  --no-build  --no-domains  --yes
+Service options: --name <service>  --follow (logs)  --dry-run --yes (uninstall)
 
 Update downloads the latest release, refreshes unedited source, and installs dependencies.
 It preserves edited source, domain mappings and MIMIC. --dry-run leaves project files unchanged.
@@ -62,11 +74,14 @@ try {
     let cwd          = process.cwd();
     let dryRun       = false;
     let local        = false;
-    const install    = { domains: true, yes: false };
+    let follow       = false;
+    const install    = { domains: true, build: true, yes: false };
     for (let index = 0; index < argv.length; index++) {
       if (argv[index] === '--dry-run') dryRun = true;
       else if (argv[index] === '--local') local = true;
       else if (argv[index] === '--no-domains') install.domains = false;
+      else if (argv[index] === '--no-build') install.build = false;
+      else if (argv[index] === '--follow' || argv[index] === '-f') follow = true;
       else if (argv[index] === '--yes' || argv[index] === '-y') install.yes = true;
       else if (['--name', '--port', '--user'].includes(argv[index])) {
         if (!argv[index + 1]) throw new Error(`${argv[index]} needs a value`);
@@ -77,11 +92,15 @@ try {
       } else if (argv[index].startsWith('--')) throw new Error(`Unknown option: ${argv[index]}`);
       else positional.push(argv[index]);
     }
-    const [command, target] = positional;
+    const [given, target] = positional;
+    const command    = SERVICE_ALIASES[given] || given;
     if (local && command !== 'update') throw new Error('--local is only supported by update.');
-    if (command !== 'install' && (install.name || install.port || install.user || !install.domains || install.yes)) {
-      throw new Error('--name, --port, --user, --no-domains and --yes are install options.');
+    const service    = SERVICE_ACTIONS.includes(command);
+    if (command !== 'install' && (install.port || install.user || !install.domains || !install.build || (install.yes && command !== 'uninstall') || (install.name && !service))) {
+      throw new Error('--port, --user, --no-build, --no-domains and --yes are install options (--yes also for uninstall); --name is for install and the service commands.');
     }
+    if (follow && command !== 'logs') throw new Error('--follow is a logs option.');
+    if (dryRun && service && command !== 'uninstall') throw new Error('--dry-run is only for uninstall among the service commands; status shows the state without changes.');
     let result;
     if (command === 'install' && positional.length === 1) {
       const done = await installService({ cwd, dryRun, ...install });
@@ -92,14 +111,26 @@ try {
       } else {
         console.log(`\nInstalled orionplace-${done.name} (port ${done.port}, user ${done.user}).`);
         for (const domain of done.frontends) {
-          if (!done.connected) console.log(`  - ${domain}: not connected to nginx (see above)`);
+          if (!install.domains) console.log(`  - ${domain}: not connected (--no-domains)`);
+          else if (!done.connected) console.log(`  - ${domain}: not connected to nginx (see above)`);
           else if (done.failed.includes(domain)) console.log(`  ✗ ${domain}: not connected (see above)`);
           else console.log(`  ✓ https://${domain}`);
         }
         if (done.failed.length) console.log('Fix the problems above, then run: sudo orionplace domain add <domain>');
-        console.log(`Manage it with: orionplace app status ${done.name} | orionplace app logs ${done.name}`);
+        console.log(`Manage it from this folder: npx orionplace-react status | sudo npx orionplace-react restart | sudo npx orionplace-react logs`);
         console.log('After code changes or npx orionplace-react update, run sudo npx orionplace-react install again.');
       }
+    } else if (service && positional.length <= (command === 'logs' ? 2 : 1)) {
+      if (command === 'uninstall' && !dryRun && !install.yes && process.stdin.isTTY) {
+        const app    = await findApp({ cwd, name: install.name });
+        const prompt = createInterface({ input: process.stdin, output: process.stdout });
+        let answer;
+        try { answer = await prompt.question(`Stop and remove the service orionplace-${app.NAME}? The project stays in ${app.DIR}. [y/N] `); }
+        finally { prompt.close(); }
+        if (!/^y(es)?$/i.test(answer.trim())) { console.log('Nothing changed.'); process.exit(0); }
+      }
+      const done       = await controlService({ action: command, cwd, name: install.name, lines: positional[1] ?? 100, follow, dryRun });
+      process.exitCode = printService(done);
     } else if (command === 'init' && positional.length <= 2) {
       result = await setupProject({ cwd: target ? resolve(cwd, target) : cwd, dryRun });
     } else if (command === 'update' && positional.length === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orionplace-react",
-  "version": "0.3.1",
+  "version": "0.5.0",
   "description": "Next.js 16 storefront for your Orionplace marketplace: setup CLI, server API gateway, typed store and ready-made catalog, cart, checkout and account components in English and Russian, plus an Android app build.",
   "type": "module",
   "license": "MIT",

package/runtime/marketplace.mjs

@@ -208,6 +208,18 @@ export async function forwardMarketplace(request, configuration = {}) {
     }
   }
   headers.set('X-Front-Domain', tenant.domain);
+  // The backend accepts forms from the storefront domain's own origin. A public
+  // host that shows this storefront (MIMIC, a preview host or a local port)
+  // passed the same-origin check above, so it is sent as that origin.
+  let ownOrigin         = false;
+  try {
+    ownOrigin = Boolean(origin) && originHosts.includes(new URL(origin).host);
+  } catch {
+    ownOrigin = false;
+  }
+  if (ownOrigin) {
+    headers.set('origin', `https://${tenant.domain}`);
+  }
   headers.set('Accept-Encoding', 'identity');
   const clientIp        =
     request.headers.get('x-init-ip') ||

package/src/install.mjs

@@ -222,7 +222,7 @@ async function ensureDomains(root, { yes }) {
 }
 
 // The storefront's home page as the public domain sees it -> HTTP status, 0 when down.
-function homeStatus(port, host) {
+export function homeStatus(port, host) {
   return new Promise(done => {
     const call = request({ host: '127.0.0.1', port, path: '/', headers: { host }, timeout: 15000 }, response => {
       response.resume();
@@ -234,7 +234,7 @@ function homeStatus(port, host) {
   });
 }
 
-async function waitForHttp(port, host, seconds = 90) {
+export async function waitForHttp(port, host, seconds = 90) {
   const until = Date.now() + seconds * 1000;
   while (Date.now() < until) {
     const status = await homeStatus(port, host);
@@ -302,7 +302,8 @@ export async function installService({
     return { dryRun, name: service, port: chosen, user: account.name, unitPath, unit, conf, frontends: settings.frontends || [], backend: settings.backend };
   }
 
-  log(`\n==> Building the ${framework.title} storefront ${service}`);
+  const rebuild  = build || !existsSync(join(root, framework.output));
+  log(rebuild ? `\n==> Building the ${framework.title} storefront ${service}` : `\n==> Using the existing build of ${service} (--no-build)`);
   // The website build; ORIONPLACE_APP_ORIGIN would make the Android app build.
   const buildEnv = { ...process.env };
   delete buildEnv.ORIONPLACE_APP_ORIGIN;
@@ -310,7 +311,7 @@ export async function installService({
     const installed = await run('npm', ['install', '--no-audit', '--no-fund'], { cwd: root, env: buildEnv });
     if (installed.code) throw new Error('npm install failed; see the messages above.');
   }
-  if (build || !existsSync(join(root, framework.output))) {
+  if (rebuild) {
     const built = await run('npm', ['run', 'build'], { cwd: root, env: buildEnv });
     if (built.code) throw new Error('The build failed; see the messages above. The running service (if any) was not changed.');
   }

package/src/project-readme.mjs

@@ -353,6 +353,9 @@ The quickest way: prepare the server with the OrionMarketplace server script,
 then run \`sudo npx orionplace-react install\` in this folder. It builds the
 project, runs it as a system service and connects your domains with nginx and
 HTTPS. Steps: [Install a storefront](https://orionmarket.place/en/sandbox/install/storefront?framework=react).
+Then manage it from this folder: \`npx orionplace-react status\`, \`sudo npx orionplace-react restart\`,
+\`sudo npx orionplace-react stop\`, \`sudo npx orionplace-react start\` and \`sudo npx orionplace-react logs\`.
+\`sudo npx orionplace-react uninstall\` (or \`cleanup\`) stops and removes the service; this folder stays.
 
 To set the server up yourself instead:
 

package/src/service.mjs

@@ -0,0 +1,186 @@
+// Manages the storefront service that "install" set up: start, stop, restart,
+// status, logs and the list of every storefront service on this server.
+// The service is found by its folder (the project root) or by --name.
+import { existsSync } from 'node:fs';
+import { readFile, rm } from 'node:fs/promises';
+import { join, resolve } from 'node:path';
+import { defaultPaths, framework, homeStatus, readApps, runCommand, waitForHttp } from './install.mjs';
+
+export const SERVICE_ACTIONS = ['start', 'stop', 'restart', 'status', 'logs', 'list', 'uninstall'];
+// "cleanup" is another name for uninstall.
+export const SERVICE_ALIASES = { cleanup: 'uninstall' };
+
+async function frontends(dir) {
+  try { return JSON.parse(await readFile(join(dir, 'orionplace/settings.json'), 'utf8')).frontends || []; }
+  catch { return []; }
+}
+
+// The registered storefront of this folder, or the one named with --name.
+export async function findApp({ cwd = process.cwd(), name, paths = defaultPaths } = {}) {
+  const apps = await readApps(paths);
+  const root = resolve(cwd);
+  const app  = name ? apps.find(item => item.NAME === name) : apps.find(item => item.DIR === root);
+  if (app) return app;
+  const known = apps.map(item => item.NAME).join(', ');
+  if (name) throw new Error(`No storefront service named ${name}.${known ? ` Installed: ${known}.` : ''}`);
+  throw new Error(`${root} is not installed as a service. Install it first: sudo npx orionplace-${framework.id} install`
+    + (known ? `\nOr name another storefront: --name ${apps[0].NAME} (installed: ${known})` : ''));
+}
+
+// true / false; "unknown" when neither systemd nor OpenRC answers.
+async function isRunning(service, { run, systemd }) {
+  const result = systemd
+    ? await run('systemctl', ['is-active', '--quiet', service], { capture: true })
+    : await run('rc-service', [service, 'status'], { capture: true });
+  return result.code === 0;
+}
+
+async function isEnabled(service, { run, systemd }) {
+  const result = systemd
+    ? await run('systemctl', ['is-enabled', '--quiet', service], { capture: true })
+    : await run('rc-update', ['show', 'default'], { capture: true });
+  return systemd ? result.code === 0 : new RegExp(`^\\s*${service}\\s`, 'm').test(result.output);
+}
+
+async function lastLogs(app, { run, systemd, paths, lines = 40 }) {
+  const result = systemd
+    ? await run('journalctl', ['-u', app.SERVICE || `orionplace-${app.NAME}`, '-n', String(lines), '--no-pager'], { capture: true })
+    : await run('tail', ['-n', String(lines), join(paths.logs, `${app.NAME}.log`)], { capture: true });
+  return result.output;
+}
+
+// One storefront's state: service, autostart, and the home page as its first domain sees it.
+export async function serviceStatus(app, { run = runCommand, systemd = existsSync('/run/systemd/system'), probe = homeStatus } = {}) {
+  const service = app.SERVICE || `orionplace-${app.NAME}`;
+  const domains = await frontends(app.DIR);
+  const running = await isRunning(service, { run, systemd });
+  const enabled = await isEnabled(service, { run, systemd });
+  const http    = running ? await probe(Number(app.PORT), domains[0] || 'localhost') : 0;
+  return { name: app.NAME, service, framework: app.FRAMEWORK, dir: app.DIR, port: Number(app.PORT), running, enabled, http, domains };
+}
+
+/**
+ * controlService({ action, cwd, name, lines, follow }) runs one action and
+ * returns what happened; logs and follow print straight to the terminal.
+ */
+export async function controlService({
+  action, cwd = process.cwd(), name, lines = 100, follow = false,
+  paths = defaultPaths, run = runCommand, uid = process.getuid?.(),
+  systemd = existsSync('/run/systemd/system'), openrc = existsSync('/sbin/openrc-run'),
+  platform = process.platform, probe = homeStatus, wait = waitForHttp, dryRun = false,
+} = {}) {
+  action = SERVICE_ALIASES[action] || action;
+  if (!SERVICE_ACTIONS.includes(action)) throw new Error(`Unknown service command ${action}. Use ${SERVICE_ACTIONS.join(', ')}.`);
+  if (platform !== 'linux') throw new Error(`${action} manages the Linux service that install set up. Run it on your server.`);
+  if (!systemd && !openrc) throw new Error('Neither systemd nor OpenRC was found on this server.');
+
+  if (action === 'list') {
+    const apps = await readApps(paths);
+    return { action, apps: await Promise.all(apps.map(app => serviceStatus(app, { run, systemd, probe }))) };
+  }
+
+  const app     = await findApp({ cwd, name, paths });
+  const service = app.SERVICE || `orionplace-${app.NAME}`;
+  if (action === 'status') return { action, ...await serviceStatus(app, { run, systemd, probe }) };
+
+  if (action === 'logs') {
+    const count = Number(lines);
+    if (!Number.isInteger(count) || count < 1) throw new Error('Give the number of log lines as a whole number, for example: logs 200');
+    const args  = systemd
+      ? ['journalctl', ['-u', service, '-n', String(count), '--no-pager', ...(follow ? ['--follow'] : [])]]
+      : ['tail', ['-n', String(count), ...(follow ? ['-F'] : []), join(paths.logs, `${app.NAME}.log`)]];
+    const result = await run(...args);
+    if (result.code) throw new Error(`${args[0]} could not read the logs of ${service}${uid !== 0 ? `; try: sudo npx orionplace-${framework.id} logs` : ''}.`);
+    return { action, name: app.NAME, service };
+  }
+
+  if (action === 'uninstall') return uninstallService(app, { paths, run, uid, systemd, name, dryRun });
+  if (uid !== 0) throw new Error(`${action} needs root: sudo npx orionplace-${framework.id} ${action}${name ? ` --name ${name}` : ''}`);
+  const result  = systemd
+    ? await run('systemctl', [action, service], { capture: true })
+    : await run('rc-service', [service, action], { capture: true });
+  if (result.code) throw new Error(`Could not ${action} ${service}:\n${result.output.trim()}`);
+  if (action === 'stop') return { action, name: app.NAME, service, running: false };
+
+  const domains = await frontends(app.DIR);
+  const http    = await wait(Number(app.PORT), domains[0] || 'localhost', 90);
+  if (!http) {
+    throw new Error(`${service} did not answer on port ${app.PORT} within 90 seconds. Last log lines:\n${await lastLogs(app, { run, systemd, paths })}`);
+  }
+  return { action, name: app.NAME, service, port: Number(app.PORT), running: true, http, domains };
+}
+
+/**
+ * Stops the service, removes it from autostart, deletes its unit or init
+ * script and its registration. The project folder and its build stay. With
+ * the orionplace server tool, "orionplace app remove" does it and also turns
+ * the storefront's domains into a placeholder page.
+ */
+async function uninstallService(app, { paths, run, uid, systemd, name, dryRun }) {
+  const service  = app.SERVICE || `orionplace-${app.NAME}`;
+  const unitPath = systemd ? join(paths.systemd, `${service}.service`) : join(paths.openrc, service);
+  const confPath = join(paths.etc, 'apps', `${app.NAME}.conf`);
+  const tool     = (paths.tool || []).find(path => existsSync(path));
+  const result   = { action: 'uninstall', name: app.NAME, service, dir: app.DIR, domains: await frontends(app.DIR), tool: Boolean(tool), unitPath, confPath, dryRun };
+  if (dryRun) return result;
+  if (uid !== 0) throw new Error(`uninstall needs root: sudo npx orionplace-${framework.id} uninstall${name ? ` --name ${name}` : ''}`);
+  if (tool) {
+    const removed = await run(tool, ['app', 'remove', app.NAME, '--yes']);
+    if (removed.code) throw new Error(`orionplace app remove ${app.NAME} failed; see the messages above.`);
+    return result;
+  }
+  // A service that is already stopped or missing is fine: the goal is that it is gone.
+  if (systemd) await run('systemctl', ['disable', '--now', service], { capture: true });
+  else {
+    await run('rc-service', [service, 'stop'], { capture: true });
+    await run('rc-update', ['del', service, 'default'], { capture: true });
+  }
+  await rm(unitPath, { force: true });
+  if (systemd) await run('systemctl', ['daemon-reload'], { capture: true });
+  await rm(confPath, { force: true });
+  return result;
+}
+
+// The CLI output of controlService; returns the process exit code.
+export function printService(result, log = console.log) {
+  const line = item => {
+    const state = item.running ? (item.http ? `running, home page HTTP ${item.http}` : 'running, home page does not answer') : 'stopped';
+    return `${item.name.padEnd(16)} ${String(item.framework || '').padEnd(7)} ${String(item.port).padEnd(6)} ${state}`;
+  };
+  if (result.action === 'list') {
+    if (!result.apps.length) {
+      log(`No storefront services on this server. Install one from its folder: sudo npx orionplace-${framework.id} install`);
+      return 0;
+    }
+    log(`${'NAME'.padEnd(16)} ${'TYPE'.padEnd(7)} ${'PORT'.padEnd(6)} STATE`);
+    for (const item of result.apps) log(line(item));
+    return 0;
+  }
+  if (result.action === 'status') {
+    log(`${result.service} (${result.framework || framework.id}) in ${result.dir}`);
+    log(`  Service:   ${result.running ? 'running' : 'stopped'}${result.enabled ? ', starts with the server' : ', does not start with the server'}`);
+    log(`  Port:      127.0.0.1:${result.port}`);
+    log(`  Home page: ${result.running ? (result.http ? `HTTP ${result.http}` : 'does not answer') : '-'}`);
+    for (const domain of result.domains) log(`  Domain:    https://${domain}`);
+    return result.running && result.http && result.http < 500 ? 0 : 3;
+  }
+  if (result.action === 'uninstall') {
+    if (result.dryRun) {
+      log(`Would stop and remove ${result.service}:`);
+      log(result.tool ? `  orionplace app remove ${result.name} --yes (also turns its domains into a placeholder)` : `  ${result.unitPath}\n  ${result.confPath}`);
+      log(`The project stays in ${result.dir}.`);
+      return 0;
+    }
+    log(`Removed the service ${result.service}. The project and its build stay in ${result.dir}; delete the folder when you no longer need it.`);
+    if (!result.tool && result.domains.length) {
+      log(`nginx still sends ${result.domains.join(', ')} to the stopped service; remove those sites from your nginx configuration.`);
+    }
+    log(`Install it again with: sudo npx orionplace-${framework.id} install`);
+    return 0;
+  }
+  if (result.action === 'stop') log(`Stopped ${result.service}.`);
+  else if (result.action === 'start' || result.action === 'restart') {
+    log(`${result.action === 'start' ? 'Started' : 'Restarted'} ${result.service}: home page HTTP ${result.http} on 127.0.0.1:${result.port}.`);
+  }
+  return 0;
+}

package/templates/app/StorefrontShell.tsx

@@ -20,6 +20,7 @@ import {
 import { OrionplaceThemeProvider } from '@/components/orionplace/theme/OrionplaceThemeProvider';
 import { StorefrontHeader } from '@/components/orionplace/storefront/StorefrontHeader';
 import { StorefrontFooter } from '@/components/orionplace/storefront/StorefrontFooter';
+import { CookieNotice } from '@/components/orionplace/legal/CookieNotice';
 import { CartPreview } from '@/components/orionplace/cart/CartPreview';
 import { useOrionplaceApi } from '@/hooks/useOrionplaceApi';
 import { useOrionplaceAppLoad } from '@/hooks/useOrionplaceAppLoad';
@@ -354,6 +355,13 @@ function ShellContent({ children }: { children: ReactNode }) {
       />
       <div className={styles.content}>{children}</div>
       <StorefrontFooter onNavigate={route} />
+      {/* The notice is for the website; the Android app links its policy from the store listing. */}
+      {APP_ORIGIN ? null : (
+        <CookieNotice
+          href={`${localized('/privacy')}#cookies`}
+          onNavigate={route}
+        />
+      )}
     </div>
   );
 }

package/templates/app/_storefront/PrivacyPage.tsx

@@ -0,0 +1,15 @@
+'use client';
+
+import { StorefrontPrivacy } from '@/components/orionplace/legal/StorefrontPrivacy';
+import styles from '@/app/storefront.module.css';
+
+export function PrivacyPage() {
+  return (
+    <main
+      className={styles.page}
+      data-storefront-page="privacy"
+    >
+      <StorefrontPrivacy />
+    </main>
+  );
+}

package/templates/app/_storefront/storefrontRoutes.tsx

@@ -13,6 +13,7 @@ import { ManufacturersPage } from '@/app/_storefront/ManufacturersPage';
 import { OrdersPage } from '@/app/_storefront/OrdersPage';
 import { ProductPage } from '@/app/_storefront/ProductPage';
 import { ProfilePage } from '@/app/_storefront/ProfilePage';
+import { PrivacyPage } from '@/app/_storefront/PrivacyPage';
 import { PromocodesPage } from '@/app/_storefront/PromocodesPage';
 import { PromoPage } from '@/app/_storefront/PromoPage';
 import { SearchPage } from '@/app/_storefront/SearchPage';
@@ -451,6 +452,8 @@ const routes: Record<string, Loader> = {
     };
   },
 
+  '/privacy': async () => ({ page: <PrivacyPage /> }),
+
   '/profile': async () => ({ page: <ProfilePage /> }),
 
   '/promo/[id]': async (context) => {

package/templates/app/privacy/page.tsx

@@ -0,0 +1,9 @@
+import {
+  renderStorefrontRoute,
+  type StorefrontPageProps,
+} from '@/lib/orionplace/serverRoute';
+
+// The page and its first data: app/_storefront/storefrontRoutes.tsx.
+export default function Page(props: StorefrontPageProps) {
+  return renderStorefrontRoute('/privacy', props);
+}

package/templates/components/orionplace/blog/BlogArticle.README.md

@@ -21,6 +21,14 @@ the image fails. Article videos accept HTTP or HTTPS addresses and the
 backend's `/ps3/...` paths. In an Android app build those paths (cover, videos,
 images and videos inside the text) load from the storefront address.
 
+The cover and the images of the text open larger: a click, Enter or Space on
+one opens `ProductReviewImageViewer` at that image, with the article's other
+images a step away and each image's caption (its `figcaption`, else its
+`title`, else its `alt`) under it. The images get `role="button"`, a keyboard
+stop and an «Open image» name; a zoom-in cursor marks them. Images inside a
+link, a button or a product placement keep their own action. The helper is
+`lib/orionplace/blogImageViewer.ts`.
+
 During server rendering, editor HTML is converted to escaped text paragraphs.
 After hydration, DOMPurify replaces those paragraphs with sanitized formatting.
 The allowlist retains headings, text formatting, links, lists, quotes, code,
@@ -91,6 +99,14 @@ ID тарифов, ссылка также передаёт их в `ids`. Дл
 `preview_image_urls`. Область сохраняет пропорции 3:2. После ошибки загрузки
 обложка исчезает. Компонент выводит только видео с адресами HTTP или HTTPS.
 
+Обложка и изображения текста открываются крупно: нажатие, Enter или пробел на
+изображении открывает `ProductReviewImageViewer` на нём, остальные изображения
+статьи — в одном шаге, а под каждым — его подпись (`figcaption`, иначе `title`,
+иначе `alt`). Изображения получают `role="button"`, остановку клавиатуры и
+название «Открыть изображение»; их отмечает курсор с лупой. Изображения внутри
+ссылки, кнопки или размещения товара сохраняют своё действие. Вспомогательный
+модуль — `lib/orionplace/blogImageViewer.ts`.
+
 При серверном рендеринге HTML редактора превращается в экранированные
 текстовые абзацы. После гидратации DOMPurify заменяет их очищенным
 форматированным HTML. Разрешены заголовки, оформление текста, ссылки, списки,

package/templates/components/orionplace/blog/BlogArticle.module.css

@@ -302,3 +302,8 @@
 @media (prefers-reduced-motion: reduce) {
   .skeleton { animation: none; }
 }
+/* Images that open in the viewer. */
+.cover[data-blog-image-viewer],
+.prose img[data-blog-image-viewer] { cursor: zoom-in; }
+.cover[data-blog-image-viewer]:focus-visible,
+.prose img[data-blog-image-viewer]:focus-visible { outline: 2px solid var(--orionplace-accent); outline-offset: 3px; }

package/templates/components/orionplace/blog/BlogArticle.tsx

@@ -6,6 +6,7 @@ import {
   useMemo,
   useRef,
   useState,
+  type SyntheticEvent,
 } from 'react';
 import {
   useOrionplace,
@@ -41,6 +42,16 @@ import {
   BlogComments,
   type BlogCommentsProps,
 } from './BlogComments';
+import {
+  blogViewerImage,
+  blogViewerImages,
+  blogViewerIndex,
+  blogViewerPhotos,
+  isBlogViewerOpenKey,
+  markBlogViewerImages,
+  type IBlogViewerImage,
+} from '@/lib/orionplace/blogImageViewer';
+import { ProductReviewImageViewer } from '@/components/orionplace/products/ProductReviewImageViewer';
 import styles from './BlogArticle.module.css';
 
 export interface BlogArticleProps extends ProductGroupEvents {
@@ -92,6 +103,9 @@ export function BlogArticle({
   const [mounted, setMounted] = useState(false);
   const [coverFailed, setCoverFailed] = useState(false);
   const articleRef = useRef<HTMLDivElement>(null);
+  const coverRef = useRef<HTMLImageElement>(null);
+  // The cover and the text images open larger in the viewer.
+  const [viewer, setViewer] = useState<{ images: IBlogViewerImage[]; index: number }>();
   const requestRef = useRef<AbortController | undefined>(undefined);
   const previousAuthentication = useRef(authenticated);
   const wasShown = useRef(Boolean(preloaded));
@@ -177,6 +191,30 @@ export function BlogArticle({
     setCoverFailed(false);
   }, [cover]);
 
+  // The text is set as HTML: its images become buttons after each render.
+  useEffect(() => {
+    markBlogViewerImages(
+      blogViewerImages([coverRef.current, articleRef.current]),
+      labels.imageOpen,
+    );
+  }, [html, cover, coverFailed, mounted, labels.imageOpen, post?.id]);
+
+  const openViewer = (event: SyntheticEvent) => {
+    const images = blogViewerImages([coverRef.current, articleRef.current]);
+    const index = blogViewerIndex(event.target, images);
+    if (index < 0) {
+      return;
+    }
+    event.preventDefault();
+    setViewer({
+      index,
+      images: images.map((image) => {
+        const shown = blogViewerImage(image);
+        return image === coverRef.current ? { ...shown, alt: shown.alt || title } : shown;
+      }),
+    });
+  };
+
   useEffect(() => {
     requestRef.current?.abort();
     setAccessChanged(false);
@@ -240,7 +278,16 @@ export function BlogArticle({
       ) : null}
 
       {post ? (
-        <article className={styles.article} data-blog-article={post.id}>
+        <article
+          className={styles.article}
+          data-blog-article={post.id}
+          onClick={openViewer}
+          onKeyDown={(event) => {
+            if (isBlogViewerOpenKey(event.nativeEvent)) {
+              openViewer(event);
+            }
+          }}
+        >
           <header className={styles.header}>
             <h1>{title}</h1>
             <div className={styles.meta}>
@@ -252,6 +299,7 @@ export function BlogArticle({
             </div>
             {cover && !coverFailed ? (
               <img
+                ref={coverRef}
                 src={cover}
                 alt=""
                 width={3}
@@ -344,6 +392,17 @@ export function BlogArticle({
       ) : settled && !pending && !error ? (
         <OrionplaceEmptyState kind="journal" message={labels.unavailable} />
       ) : null}
+      {viewer && viewer.images.length ? (
+        <ProductReviewImageViewer
+          images={blogViewerPhotos(viewer.images)}
+          index={viewer.index}
+          label={labels.imageViewer}
+          alt={title || labels.imageViewer}
+          captions={viewer.images.map((image) => image.caption || image.alt)}
+          wide
+          onClose={() => setViewer(undefined)}
+        />
+      ) : null}
     </section>
   );
 }