diff --git a/DX-MAPS-GALLERY.md b/DX-MAPS-GALLERY.md index b8f4e56e..c31d0eac 100644 --- a/DX-MAPS-GALLERY.md +++ b/DX-MAPS-GALLERY.md @@ -11,8 +11,8 @@ on the site loads from the same build tree. | | | |---|---| | `public/dx-maps/` | **The dx-maps output folder, dropped in** (doxa-maps `development` cff06fb8e, `public/dx-maps/`, copied unchanged). Every map on this site loads from it, same-origin. | -| `app/pages/deep-research/index.vue` | **Deep Research: the Research Gallery.** The page loads one script (`/dx-maps/doxa-maps-spa/doxa-maps-spa.js`) and adds one element (``), sized to the viewport below the header; its `tree-base` is built at runtime from the page's own origin. It gives the gallery `profile-config` `{"experimental": false}`, so the gallery's Experimental folder is hidden (galleries built before that flag ignore it). Hidden: in no menu, `robots: noindex`. | -| `app/pages/research/index.vue` | **The Research page, DX Life's own:** the heading, the "By Region" link and the UUPG list, with the production simple map (`doxa-simple-map`) carrying the Engagement, Prayer and Adoption tabs, the same map the home, pray and adopt pages each show one tab of. | +| `app/pages/deep-research/index.vue` | **Deep Research: the Research Gallery.** The page loads one script (`/dx-maps/doxa-maps-spa/doxa-maps-spa.js`) and adds one element (``), sized to the viewport below the header; its `tree-base` is built at runtime from the page's own origin. Every section of the gallery shows, the Experimental section included. Hidden: in no menu, `robots: noindex`. | +| `app/pages/research/index.vue` | **The Research page, DX Life production's (fc4d622):** the heading, the "By Region" link, the research map on its own (`bundle="research-map"`, ``) and the UUPG list. One addition, under the map: "Want Deeper Research? See our Deep-Research Maps →", linking to `/deep-research` (the locale prefix kept). The two phrases, and the page name "Deep Research", are in `i18n/locales//common.json` for all 11 locales; "Deep Research" stays a name in every language, as the gallery's own heading does. | | `app/pages/regions/index.vue`, `app/utils/nav.ts`, `nuxt.config.ts` | `/regions` is DX Life's own index again, with its menu item, and `/countries` goes to it (`USE_LEGACY_REGIONS_PAGE` and `LEGACY_REGIONS_PAGE` on). Set both off to send `/regions` to a gallery tab instead. | | `app/composables/useDoxaMap.ts` | The home (engagement), pray (prayer) and adopt (adoption) maps now load `/dx-maps/doxa-simple-map/doxa-simple-map.js`; the research-map key loads `/dx-maps/doxa-research-map/doxa-research-map.js`. Mapbox GL moves from v3.3.0 to v3.24.0, the version the dx-maps bundles are built and tested with. | | `app/components/DoxaMapSlot.vue` | With no Mapbox token configured, it asks the map for the keyless MapLibre engine (see **Map engine**). With a token, the config passes through unchanged. The map fills the slot's box, not the viewport (`--profile-min-h: 0`), so the slot never cuts off the map's attribution and bottom controls. | @@ -66,7 +66,7 @@ or `.env` is needed for this page. Without `DATABASE_URL`, the dev server only l - To run it against a **local** dx-maps, and to try all three ways a site can take the gallery (drop-in, CDN, subdomain) with the exact ports and settings: [documentation/LAPTOP-6WAY.md](documentation/LAPTOP-6WAY.md). -## Deployment method: the dx-maps output folder dropped in (this branch, mobilization-maps, from research-gallery-drop-in) +## Deployment method: the dx-maps output folder dropped in (this branch, deep-research, from research-gallery-drop-in) Identical to research-gallery-js (maps from the CDN), except that the dx-maps **output folder is dropped into `public/dx-maps/`** and every map loads **same-origin** from it: `NUXT_PUBLIC_DX_MAPS_BASE` defaults to empty, which means this diff --git a/MOBILIZATION-MAPS-LAPTOP.md b/MOBILIZATION-MAPS-LAPTOP.md index e3de4abb..dc1675aa 100644 --- a/MOBILIZATION-MAPS-LAPTOP.md +++ b/MOBILIZATION-MAPS-LAPTOP.md @@ -1,6 +1,6 @@ # Deep Research on a laptop -Run this branch (`mobilization-maps`) of the DX Life site on your own machine and look at the +Run this branch (`deep-research`) of the DX Life site on your own machine and look at the hidden Deep Research page and the Research page. No database, no Docker, no secrets. ## You need @@ -11,8 +11,8 @@ hidden Deep Research page and the Research page. No database, no Docker, no secr ## Steps ```bash -git clone -b mobilization-maps --single-branch https://git.nuxtbase.app/doxa-life/doxa-maps-cdn.git dx-life-mobilization-maps -cd dx-life-mobilization-maps +git clone -b deep-research --single-branch https://git.nuxtbase.app/doxa-life/doxa-maps-cdn.git dx-life-deep-research +cd dx-life-deep-research bun install PORT=4611 bun run dev ``` @@ -31,7 +31,7 @@ prayer API (`https://pray.doxa.life`, the default). | **Deep Research** (hidden: in no menu, not indexed) | | | Deep Research in Arabic (right-to-left) | | | One view of it, e.g. the Regions dashboard | | -| **Research** (as on doxa.life today, with our research map) | | +| **Research** (as on doxa.life today, with our research map and, under it, the link to Deep Research) | | | Regions (DX Life's own index, back in the menu) | | | Home, Pray, Adopt (DX Life's own maps, unchanged) | , [/pray](http://localhost:4611/pray), [/adopt](http://localhost:4611/adopt) | | Plugin Studio (it is in the maps folder; no page needed) | | @@ -54,11 +54,14 @@ back to MapLibre, so a map always starts. ## What is in this branch -- `/deep-research`: the Deep Research gallery (the DX Maps mobilization maps in one app), filling the - page below the header. Its Experimental folder is hidden, and every tab has an info button that - explains what the map does. -- `/research`: the page file is identical to DX Life's production branch (fc4d622); the research map - now loads from this site's own `/dx-maps/`. +- `/deep-research`: the Deep Research gallery (the DX Maps mobilization maps in one app, the + Experimental section included), filling the page below the header. Every tab has an info button + that explains what the map does. +- `/research`: DX Life's production page (fc4d622), with the research map on its own, now loaded from + this site's own `/dx-maps/`, and under it one new line: "Want Deeper Research? See our + Deep-Research Maps →", which links to `/deep-research` in the reader's language. The line is in all + 11 of the site's locales. +- `/` and `/pray`: the engagement map and the prayer map (the simple map with those presets), as before. - `public/dx-maps/`: the DX Maps output folder, from DX Maps `development` cff06fb8e. - The page never loads anything from api.mapbox.com; a map loads Mapbox itself, and only when Mapbox is chosen. A slow or blocked Mapbox cannot stop a map from appearing. diff --git a/app/pages/deep-research/index.vue b/app/pages/deep-research/index.vue index 2c95a053..93a0a13f 100644 --- a/app/pages/deep-research/index.vue +++ b/app/pages/deep-research/index.vue @@ -63,8 +63,8 @@ onMounted(() => { gallery.setAttribute('tree-base', DX_MAPS_BASE || `${window.location.origin}/dx-maps`) // The site's language drives the gallery's (and every map's); it follows the language switcher. gallery.setAttribute('language', locale.value) - // Deep Research shows the curated sections only: the gallery's Experimental folder is hidden. - const galleryConfig: Record = { experimental: false } + // Every section shows, Experimental included (the gallery's default). + const galleryConfig: Record = {} // MapLibre (keyless) by default; Mapbox only when NUXT_PUBLIC_MAP_PROVIDER=mapbox and a token is set. // The provider is always explicit: a token alone never selects Mapbox in dx-maps. const token = mapboxTokenIfChosen(runtimeConfig.public) diff --git a/app/pages/research/index.vue b/app/pages/research/index.vue index ea56a903..4624dcf5 100644 --- a/app/pages/research/index.vue +++ b/app/pages/research/index.vue @@ -44,12 +44,22 @@ useTextHighlight() - +
+ + +

+ {{ t('Want Deeper Research?') }} + {{ t('See our Deep-Research Maps') }} → +

+