Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion krdv-guidelines-prototype/brandbook-map.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
| 07 | Оформление текста | `#/text` | Кавычки и тире, Валюты и телефоны, Сокращения и география, Контрольные примеры, Типограф |
| 08 | Корпоративные материалы | `#/corporate` | Визитки, Визитки с QR-кодом, Визитки ДО, Бланки ДО |
| 09 | Рекламные материалы | `#/advertising` | Лифлеты, Роллап, Навигация кабинетов, Режимник, Наградные документы |
| 10 | Мерч | #/merch | Примеры брендированной продукции, рабочая подборка и доска Miro |
| 10 | Мерч | `#/merch` | Примеры брендированной продукции |
| 11 | Сделано в ТОР СПВ | `#/made` | Знак, Применение |
| 12 | Фотостиль | `#/photostyle` | Принципы съемки, Единый прогресс, Выступления, Природа, Люди |
| 13 | Приложение | `#/appendix` | Социальные сети, Контакты |
Expand Down
2 changes: 1 addition & 1 deletion krdv-guidelines-prototype/src/components/GuidelinePage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function ContentSection({ section, navigate, activePageId }) {
{section.madeSigns ? <MadeSignLibrary /> : null}
{section.madeFarEastSigns ? <MadeSignLibrary variantSet="far-east" /> : null}
{section.assetImages ? <AssetImageGrid items={section.assetImages} mode={section.assetImageMode} /> : null}
{section.merchGallery ? <MerchGallery items={section.merchGallery} boardUrl={section.merchBoard} /> : null}
{section.merchGallery ? <MerchGallery items={section.merchGallery} /> : null}
{cardsAfterAssets ? <CardGrid items={section.cards} /> : null}
{section.photoCredit ? (
<footer className="photo-credit" aria-label={t("Сведения об авторе фотографии")}>
Expand Down
6 changes: 1 addition & 5 deletions krdv-guidelines-prototype/src/components/MerchGallery.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import { rasterAsset, ICONS, t } from "../data/brandbook.js";
import { UiIcon } from "./UiIcon.jsx";

function MerchGallery({ items, boardUrl }) {
function MerchGallery({ items }) {
return (
<div className="merch-showcase">
<div className="merch-showcase-toolbar">
<span>{t("Подборка примеров")} · {items.length}</span>
<a href={boardUrl} target="_blank" rel="noopener noreferrer">
{t("Все материалы в Miro")}
<UiIcon icon={ICONS.arrowRight} className="merch-link-arrow" />
</a>
</div>
<div className="merch-gallery">
{items.map((item) => (
Expand Down
1 change: 0 additions & 1 deletion krdv-guidelines-prototype/src/data/pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,6 @@ const pagesData = [
"Представленные изображения — примеры мерча, а не окончательно утвержденный ассортимент. Мерч разрабатывается и актуализируется ДВК.",
"Предложения и пожелания по брендированной продукции можно направлять команде ДВК.",
],
merchBoard: "https://miro.com/app/board/uXjVONM6M_s=/?share_link_id=455530323654",
merchGallery: [
{ title: "Ручка для дочерних обществ", file: "merch-slide-03.jpg", preview: "merch-slide-03.webp" },
{ title: "Ежедневник для дочерних обществ", file: "merch-slide-05.jpg", preview: "merch-slide-05.webp" },
Expand Down
14 changes: 0 additions & 14 deletions krdv-guidelines-prototype/src/styles/libraries.css
Original file line number Diff line number Diff line change
Expand Up @@ -816,20 +816,6 @@
text-transform: uppercase;
}

.merch-showcase-toolbar > a {
display: inline-flex;
align-items: center;
gap: 8px;
min-height: 40px;
border-bottom: 1px solid currentColor;
color: var(--blue);
font-size: 14px;
text-decoration: none;
}

.merch-showcase-toolbar > a:hover,
.merch-showcase-toolbar > a:focus-visible { color: #003c73; }

.merch-gallery {
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
Expand Down
2 changes: 1 addition & 1 deletion krdv-guidelines-prototype/tests/brandbook.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ test("current merch is a working reference gallery, not a fixed catalog", () =>
assert.equal(merch.sections.length, 1);
const examples = merch.sections[0];
assert.equal(examples.id, "examples");
assert.equal(examples.merchBoard, "https://miro.com/app/board/uXjVONM6M_s=/?share_link_id=455530323654");
assert.equal(examples.merchBoard, undefined);
assert.ok(examples.paragraphs.some((text) => text.includes("актуализируется ДВК")));
assert.ok(examples.paragraphs.some((text) => text.includes("пожелания")));
assert.equal(examples.merchGallery.length, 12);
Expand Down
6 changes: 2 additions & 4 deletions krdv-guidelines-prototype/tests/e2e/brandbook.spec.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ test("ten current leaflet covers display uncropped and open full-size PNG", asyn
expect(cols).toBe(isMobile ? 2 : 5);
});

test("merch page presents real examples from working Miro board without retired cards", async ({ page, isMobile }) => {
test("merch page shows its examples without an external board link or retired cards", async ({ page, isMobile }) => {
await page.goto("/#/merch");
await ready(page);
const section = page.locator("#examples");
Expand All @@ -464,9 +464,7 @@ test("merch page presents real examples from working Miro board without retired
await expect(page.locator("#" + id)).toHaveCount(0);
}
await expect(section.locator(".merch-gallery-card")).toHaveCount(12);
const miro = section.getByRole("link", { name: /Все материалы в Miro/ });
await expect(miro).toHaveAttribute("href", "https://miro.com/app/board/uXjVONM6M_s=/?share_link_id=455530323654");
await expect(miro).toHaveAttribute("target", "_blank");
await expect(section.locator('a[href*="miro.com"]')).toHaveCount(0);
const first = section.locator(".merch-gallery-card").first();
await first.scrollIntoViewIfNeeded();
const img = first.locator("img");
Expand Down
Loading