diff --git a/.gitea/workflows/deploy-interior.yml b/.gitea/workflows/deploy-interior.yml deleted file mode 100644 index bc9f88a..0000000 --- a/.gitea/workflows/deploy-interior.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Deploy Interior Site - -on: - push: - branches: [master, main] - paths: - - 'Ремонт квартира/**' - -jobs: - deploy: - runs-on: self-hosted - steps: - - name: Checkout - run: | - git clone --depth=1 https://daniil:${{ secrets.REPO_TOKEN }}@git.digital-home.site/daniil/obsidian.git /tmp/obsidian-deploy-${{ github.run_id }} || \ - (cd /tmp/obsidian-deploy-${{ github.run_id }} && git pull) - - - name: Update interior site - run: | - VAULT=/tmp/obsidian-deploy-${{ github.run_id }} - - # Синхронизировать контент из vault (в корень content/, без notes/) - find /opt/digital-home/interior/content/ -maxdepth 1 -name '*.md' ! -name 'index.md' -delete - rm -rf /opt/digital-home/interior/content/images - cp -r "$VAULT/Ремонт квартира/"*.md /opt/digital-home/interior/content/ - cp -r "$VAULT/Ремонт квартира/images" /opt/digital-home/interior/content/images 2>/dev/null || true - - # Убедиться что index.md есть - if [ ! -f /opt/digital-home/interior/content/index.md ]; then - printf '---\ntitle: Ремонт квартиры\n---\n\n# Ремонт квартиры\n\n- [[Интерьер]]\n- [[Интерьер кухня]]\n- [[Интерьер спальни]]\n- [[План квартиры]]\n' \ - > /opt/digital-home/interior/content/index.md - fi - - # Пересобрать и перезапустить - cd /opt/digital-home/interior - docker build -t interior:latest . - docker rm -f interior || true - docker run -d \ - --name interior \ - --network coolify \ - -p 3007:80 \ - --restart unless-stopped \ - --label traefik.enable=true \ - --label 'traefik.http.routers.interior.rule=Host(`interior.digital-home.site`)' \ - --label traefik.http.routers.interior.entrypoints=https \ - --label traefik.http.routers.interior.tls=true \ - --label traefik.http.routers.interior.tls.certresolver=letsencrypt \ - --label traefik.http.services.interior.loadbalancer.server.port=80 \ - interior:latest - echo 'Deploy done' - - - name: Cleanup - if: always() - run: rm -rf /tmp/obsidian-deploy-${{ github.run_id }} diff --git a/.gitea/workflows/deploy-remont.yml b/.gitea/workflows/deploy-remont.yml new file mode 100644 index 0000000..c2bccc8 --- /dev/null +++ b/.gitea/workflows/deploy-remont.yml @@ -0,0 +1,58 @@ +name: Deploy Remont Site + +# Автосборка сайта remont.digital-home.site из заметок «Ремонт квартира». +# Триггер — пуш в эту папку. Сайт генерируется внутри docker build (node → nginx), +# поэтому раннеру нужны только docker + git (как в jam-looper). + +on: + push: + branches: [master, main] + paths: + - 'Ремонт квартира/**' + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Собрать образ + run: | + # ascii-контекст (путь с кириллицей и пробелом → в простой каталог) + rm -rf /tmp/remont-ctx + cp -r "Ремонт квартира" /tmp/remont-ctx + docker build -t remont-web:latest -f /tmp/remont-ctx/.site/Dockerfile /tmp/remont-ctx + echo "✅ Образ собран" + + - name: Перезапустить контейнер + run: | + docker rm -f remont-web >/dev/null 2>&1 || true + docker run -d --name remont-web --restart unless-stopped \ + --network coolify \ + --label traefik.enable=true \ + --label "traefik.http.routers.remont-http.rule=Host(\`remont.digital-home.site\`)" \ + --label traefik.http.routers.remont-http.entrypoints=http \ + --label traefik.http.routers.remont-http.middlewares=remont-redirect \ + --label traefik.http.middlewares.remont-redirect.redirectscheme.scheme=https \ + --label "traefik.http.routers.remont-https.rule=Host(\`remont.digital-home.site\`)" \ + --label traefik.http.routers.remont-https.entrypoints=https \ + --label traefik.http.routers.remont-https.tls=true \ + --label traefik.http.routers.remont-https.tls.certresolver=letsencrypt \ + --label traefik.http.routers.remont-https.service=remont \ + --label traefik.http.services.remont.loadbalancer.server.port=80 \ + remont-web:latest + + - name: Проверить, что сайт жив + run: | + for i in $(seq 1 10); do + code=$(curl -s -o /dev/null -w '%{http_code}' https://remont.digital-home.site/ || echo 000) + if [ "$code" = "200" ]; then + echo "✅ https://remont.digital-home.site отвечает 200" + exit 0 + fi + sleep 4 + done + echo "❌ Сайт отвечает $code" + docker logs remont-web --tail 30 + exit 1 diff --git a/Ремонт квартира/.dockerignore b/Ремонт квартира/.dockerignore new file mode 100644 index 0000000..b587bf6 --- /dev/null +++ b/Ремонт квартира/.dockerignore @@ -0,0 +1,3 @@ +.site/node_modules +.site/out +.git diff --git a/Ремонт квартира/.site/.gitignore b/Ремонт квартира/.site/.gitignore new file mode 100644 index 0000000..72aae85 --- /dev/null +++ b/Ремонт квартира/.site/.gitignore @@ -0,0 +1,2 @@ +node_modules/ +out/ diff --git a/Ремонт квартира/.site/Dockerfile b/Ремонт квартира/.site/Dockerfile new file mode 100644 index 0000000..62178a4 --- /dev/null +++ b/Ремонт квартира/.site/Dockerfile @@ -0,0 +1,14 @@ +# Многостадийная сборка. Контекст = папка «Ремонт квартира» (содержит .site + *.md + images). +# Стадия build генерирует статику из заметок; nginx её отдаёт. + +FROM node:20-alpine AS build +WORKDIR /app +COPY .site/package.json /app/.site/ +RUN cd /app/.site && npm install --omit=dev --no-audit --no-fund +COPY . /app +RUN cd /app/.site && OUT=/out node generate.js + +FROM nginx:alpine +COPY .site/nginx.conf /etc/nginx/conf.d/default.conf +COPY --from=build /out /usr/share/nginx/html +EXPOSE 80 diff --git a/Ремонт квартира/.site/assets/app.js b/Ремонт квартира/.site/assets/app.js new file mode 100644 index 0000000..3cb36b4 --- /dev/null +++ b/Ремонт квартира/.site/assets/app.js @@ -0,0 +1,79 @@ +// ── тема ────────────────────────────────────────────────── +(function () { + const root = document.documentElement; + const saved = localStorage.getItem('remont-theme'); + const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches; + root.setAttribute('data-theme', saved || (prefersDark ? 'dark' : 'light')); + + const btn = document.getElementById('themeBtn'); + btn.addEventListener('click', () => { + const next = root.getAttribute('data-theme') === 'dark' ? 'light' : 'dark'; + root.setAttribute('data-theme', next); + localStorage.setItem('remont-theme', next); + document.querySelector('meta[name=theme-color]') + .setAttribute('content', next === 'dark' ? '#201F1B' : '#EDE8DE'); + }); +})(); + +// ── тень шапки при скролле ──────────────────────────────── +(function () { + const bar = document.getElementById('topbar'); + const onScroll = () => bar.classList.toggle('scrolled', window.scrollY > 8); + onScroll(); + window.addEventListener('scroll', onScroll, { passive: true }); +})(); + +// ── появление секций ────────────────────────────────────── +(function () { + const io = new IntersectionObserver((entries) => { + entries.forEach((e) => { + if (e.isIntersecting) { e.target.classList.add('in'); io.unobserve(e.target); } + }); + }, { threshold: 0.12, rootMargin: '0px 0px -8% 0px' }); + document.querySelectorAll('.reveal').forEach((el) => io.observe(el)); +})(); + +// ── активный пункт навигации ────────────────────────────── +(function () { + const links = [...document.querySelectorAll('#nav a')]; + const map = new Map(links.map((a) => [a.getAttribute('href').slice(1), a])); + const io = new IntersectionObserver((entries) => { + entries.forEach((e) => { + if (e.isIntersecting) { + links.forEach((l) => l.classList.remove('active')); + map.get(e.target.id)?.classList.add('active'); + } + }); + }, { rootMargin: '-45% 0px -50% 0px' }); + ['plan', 'living', 'bedroom'].forEach((id) => { + const el = document.getElementById(id); + if (el) io.observe(el); + }); +})(); + +// ── лайтбокс ────────────────────────────────────────────── +(function () { + const lb = document.getElementById('lightbox'); + const lbImg = document.getElementById('lbImg'); + const close = document.getElementById('lbClose'); + + function open(src, alt) { + lbImg.src = src; lbImg.alt = alt || ''; + lb.classList.add('open'); lb.setAttribute('aria-hidden', 'false'); + document.body.style.overflow = 'hidden'; + } + function hide() { + lb.classList.remove('open'); lb.setAttribute('aria-hidden', 'true'); + document.body.style.overflow = ''; + lbImg.src = ''; + } + + document.querySelectorAll('[data-zoom]').forEach((img) => { + img.style.cursor = 'zoom-in'; + img.addEventListener('click', (ev) => { ev.stopPropagation(); open(img.src, img.alt); }); + }); + + lb.addEventListener('click', (e) => { if (e.target !== lbImg) hide(); }); + close.addEventListener('click', hide); + document.addEventListener('keydown', (e) => { if (e.key === 'Escape') hide(); }); +})(); diff --git a/Ремонт квартира/.site/assets/style.css b/Ремонт квартира/.site/assets/style.css new file mode 100644 index 0000000..e6dbb6c --- /dev/null +++ b/Ремонт квартира/.site/assets/style.css @@ -0,0 +1,361 @@ +/* ============================================================ + Ремонт квартиры — концепт-борд + Палитра взята из материалов самой квартиры: + шалфейный фасад кухни, тёплый дуб, штукатурка, пыльно-голубая спальня. + ============================================================ */ + +:root { + /* поверхности */ + --plaster: #EDE8DE; /* фон — тёплая штукатурка */ + --paper: #F7F3EA; /* карточки */ + --paper-2: #FBF9F3; /* приподнятые карточки */ + --ink: #2B2A25; /* текст */ + --ink-soft:#6A675C; /* вторичный текст */ + + /* материалы квартиры */ + --sage: #7C8A66; /* фасад кухни */ + --sage-deep: #55613C; /* тёмный шалфей для текста */ + --oak: #C7A579; /* дуб */ + --blue: #97B0C3; /* спальня */ + --graphite: #4B4E52; /* пол / диван */ + + --line: rgba(43, 42, 37, .14); + --line-strong: rgba(43, 42, 37, .28); + --shadow: 0 1px 2px rgba(43,42,37,.05), 0 12px 32px -18px rgba(43,42,37,.28); + --shadow-lift: 0 2px 4px rgba(43,42,37,.06), 0 24px 48px -22px rgba(43,42,37,.38); + + --maxw: 1160px; + --r: 14px; + --r-lg: 22px; + + --ff-display: "Spectral", Georgia, serif; + --ff-body: "Onest", system-ui, -apple-system, sans-serif; +} + +:root[data-theme="dark"] { + --plaster: #201F1B; + --paper: #262521; + --paper-2: #2D2C27; + --ink: #EFEADF; + --ink-soft:#A7A296; + --sage: #9DAE84; + --sage-deep: #B7C79E; + --oak: #D6B98E; + --blue: #A6BED0; + --graphite: #8A8D91; + --line: rgba(239, 234, 223, .13); + --line-strong: rgba(239, 234, 223, .26); + --shadow: 0 1px 2px rgba(0,0,0,.3), 0 14px 34px -18px rgba(0,0,0,.6); + --shadow-lift: 0 2px 4px rgba(0,0,0,.35), 0 26px 52px -22px rgba(0,0,0,.7); +} + +* { box-sizing: border-box; } + +html { scroll-behavior: smooth; scroll-padding-top: 84px; } +@media (prefers-reduced-motion: reduce) { html { scroll-behavior: auto; } } + +body { + margin: 0; + background: var(--plaster); + color: var(--ink); + font-family: var(--ff-body); + font-size: 17px; + line-height: 1.6; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + overflow-x: hidden; +} + +/* тонкая тканевая текстура фона */ +body::before { + content: ""; + position: fixed; + inset: 0; + z-index: -1; + pointer-events: none; + background-image: radial-gradient(circle at 1px 1px, rgba(43,42,37,.045) 1px, transparent 0); + background-size: 22px 22px; +} +:root[data-theme="dark"] body::before { + background-image: radial-gradient(circle at 1px 1px, rgba(255,255,255,.03) 1px, transparent 0); +} + +img { max-width: 100%; display: block; } +a { color: inherit; } + +.wrap { max-width: var(--maxw); margin: 0 auto; padding: 0 24px; } + +/* ---------- типографика ---------- */ +.eyebrow { + font-size: 12.5px; + letter-spacing: .22em; + text-transform: uppercase; + font-weight: 600; + color: var(--sage-deep); + display: inline-flex; + align-items: center; + gap: .6em; +} +.eyebrow::before { + content: ""; + width: 26px; height: 1px; + background: currentColor; + opacity: .6; +} + +h1, h2, h3 { font-family: var(--ff-display); font-weight: 500; margin: 0; } + +/* ---------- шапка ---------- */ +.topbar { + position: sticky; top: 0; z-index: 50; + backdrop-filter: saturate(1.4) blur(10px); + background: color-mix(in srgb, var(--plaster) 82%, transparent); + border-bottom: 1px solid transparent; + transition: border-color .3s, background .3s; +} +.topbar.scrolled { border-bottom-color: var(--line); } +.topbar__inner { + max-width: var(--maxw); margin: 0 auto; padding: 14px 24px; + display: flex; align-items: center; justify-content: space-between; gap: 18px; +} +.brand { display: flex; align-items: baseline; gap: 10px; font-weight: 600; letter-spacing: .01em; } +.brand b { font-family: var(--ff-display); font-weight: 600; font-size: 19px; letter-spacing: .01em; } +.brand span { font-size: 12.5px; color: var(--ink-soft); letter-spacing: .04em; } +.nav { display: flex; align-items: center; gap: 4px; } +.nav a { + text-decoration: none; font-size: 14.5px; color: var(--ink-soft); + padding: 7px 13px; border-radius: 999px; transition: color .2s, background .2s; + white-space: nowrap; +} +.nav a:hover { color: var(--ink); background: color-mix(in srgb, var(--sage) 14%, transparent); } +.nav a.active { color: var(--sage-deep); background: color-mix(in srgb, var(--sage) 18%, transparent); } + +.theme-toggle { + border: 1px solid var(--line-strong); background: transparent; color: var(--ink); + width: 38px; height: 38px; border-radius: 50%; cursor: pointer; + display: grid; place-items: center; flex: none; transition: background .2s, border-color .2s; +} +.theme-toggle:hover { background: color-mix(in srgb, var(--sage) 14%, transparent); border-color: var(--sage); } +.theme-toggle svg { width: 18px; height: 18px; } +.theme-toggle .sun { display: none; } +:root[data-theme="dark"] .theme-toggle .sun { display: block; } +:root[data-theme="dark"] .theme-toggle .moon { display: none; } + +.nav a .sm { display: none; } +@media (max-width: 720px) { + .nav a { padding: 6px 9px; font-size: 13px; } + .brand span { display: none; } +} +@media (max-width: 560px) { + .brand { display: none; } + .nav a .lg { display: none; } + .nav a .sm { display: inline; } + .nav a { padding: 6px 11px; } + .topbar__inner { justify-content: space-between; } +} + +/* ---------- hero ---------- */ +.hero { padding: clamp(48px, 8vw, 96px) 0 clamp(36px, 5vw, 60px); } +.hero__grid { + display: grid; grid-template-columns: 1.05fr .95fr; gap: clamp(28px, 5vw, 64px); + align-items: center; +} +.hero__title { + font-size: clamp(52px, 9vw, 108px); + line-height: .92; letter-spacing: -.02em; margin: 18px 0 0; +} +.hero__title em { font-style: italic; color: var(--sage-deep); } +.hero__lead { + margin: 24px 0 0; max-width: 30ch; color: var(--ink-soft); font-size: 18px; +} +.hero__meta { + margin-top: 30px; display: flex; flex-wrap: wrap; gap: 26px; + border-top: 1px solid var(--line); padding-top: 22px; +} +.hero__meta div { display: flex; flex-direction: column; } +.hero__meta .num { font-family: var(--ff-display); font-size: 30px; line-height: 1; color: var(--ink); } +.hero__meta .lbl { font-size: 12.5px; letter-spacing: .04em; color: var(--ink-soft); margin-top: 6px; } + +.hero__plan { + background: var(--paper); border: 1px solid var(--line); border-radius: var(--r-lg); + padding: 22px; box-shadow: var(--shadow); position: relative; +} +.hero__plan img { border-radius: 8px; margin: 0 auto; max-height: 460px; width: auto; cursor: zoom-in; } +.hero__plan .cap { + position: absolute; top: 22px; left: 22px; + font-size: 11.5px; letter-spacing: .18em; text-transform: uppercase; + color: var(--ink-soft); background: var(--paper); padding: 4px 10px; border-radius: 999px; + border: 1px solid var(--line); +} + +@media (max-width: 860px) { + .hero__grid { grid-template-columns: 1fr; } + .hero__plan { order: -1; } + .hero__plan img { max-height: 380px; } +} + +/* ---------- палитра материалов ---------- */ +.swatches { display: flex; gap: 14px; flex-wrap: wrap; margin-top: 30px; } +.swatch { display: flex; align-items: center; gap: 9px; font-size: 13px; color: var(--ink-soft); } +.swatch i { + width: 22px; height: 22px; border-radius: 50%; display: block; + box-shadow: inset 0 0 0 1px rgba(0,0,0,.08); +} + +/* ---------- секции ---------- */ +.section { padding: clamp(52px, 8vw, 104px) 0; border-top: 1px solid var(--line); } +.section__head { display: flex; align-items: flex-end; justify-content: space-between; gap: 24px; flex-wrap: wrap; } +.section__head h2 { font-size: clamp(34px, 5vw, 56px); letter-spacing: -.015em; line-height: 1; margin-top: 14px; } +.section__index { + font-family: var(--ff-display); font-size: clamp(46px, 7vw, 84px); line-height: 1; + color: var(--line-strong); font-weight: 500; +} +.section__lead { max-width: 46ch; color: var(--ink-soft); margin: 20px 0 0; } + +/* планировка */ +.plan-layout { display: grid; grid-template-columns: 1.4fr 1fr; gap: clamp(24px,4vw,52px); margin-top: 44px; align-items: start; } +.plan-figure { + background: var(--paper); border: 1px solid var(--line); border-radius: var(--r-lg); + padding: 26px; box-shadow: var(--shadow); display: grid; place-items: center; +} +.plan-figure img { max-height: 540px; width: auto; cursor: zoom-in; } +.rooms { list-style: none; margin: 0; padding: 0; } +.rooms li { + display: grid; grid-template-columns: auto 1fr auto; align-items: center; gap: 16px; + padding: 15px 4px; border-bottom: 1px solid var(--line); +} +.rooms li:first-child { border-top: 1px solid var(--line); } +.room-no { + width: 34px; height: 34px; border-radius: 50%; display: grid; place-items: center; + font-family: var(--ff-display); font-size: 17px; color: var(--sage-deep); + border: 1px solid var(--sage); background: color-mix(in srgb, var(--sage) 10%, transparent); +} +.room-name { font-weight: 500; } +.room-name small { display: block; font-weight: 400; color: var(--ink-soft); font-size: 13px; } +.room-area { font-family: var(--ff-display); font-size: 20px; color: var(--ink); white-space: nowrap; } +a.rooms-link { text-decoration: none; } +a.rooms-link .room-name { transition: color .2s; } +a.rooms-link:hover .room-name { color: var(--sage-deep); } +.tag { + font-size: 11px; letter-spacing: .04em; padding: 3px 9px; border-radius: 999px; white-space: nowrap; +} +.tag--done { color: var(--sage-deep); background: color-mix(in srgb, var(--sage) 16%, transparent); } +.tag--wip { color: var(--ink-soft); background: color-mix(in srgb, var(--ink-soft) 12%, transparent); } + +@media (max-width: 860px) { .plan-layout { grid-template-columns: 1fr; } } + +/* галерея рендеров */ +.renders { display: grid; gap: 18px; margin-top: 40px; } +.renders--hero { grid-template-columns: 1fr; } +.renders--trio { grid-template-columns: repeat(3, 1fr); margin-top: 18px; } +.render { + position: relative; border-radius: var(--r); overflow: hidden; border: 1px solid var(--line); + box-shadow: var(--shadow); cursor: zoom-in; background: var(--paper); +} +.render img { width: 100%; height: 100%; object-fit: cover; transition: transform .6s cubic-bezier(.2,.7,.2,1); } +.render:hover img { transform: scale(1.035); } +.render .rcap { + position: absolute; left: 12px; bottom: 12px; + font-size: 12px; letter-spacing: .04em; color: #fff; + background: rgba(20,20,18,.55); backdrop-filter: blur(4px); + padding: 5px 11px; border-radius: 999px; +} +@media (max-width: 720px) { .renders--trio { grid-template-columns: 1fr; } } + +/* блок вариантов (мебель) */ +.subhead { display: flex; align-items: baseline; gap: 14px; margin: 56px 0 22px; } +.subhead h3 { font-size: 26px; letter-spacing: -.01em; } +.subhead .count { font-size: 13px; color: var(--ink-soft); letter-spacing: .04em; } +.subhead::after { content: ""; flex: 1; height: 1px; background: var(--line); align-self: center; } + +.options { display: grid; grid-template-columns: repeat(3, 1fr); gap: 20px; } +.opt { + display: flex; flex-direction: column; background: var(--paper); border: 1px solid var(--line); + border-radius: var(--r); overflow: hidden; box-shadow: var(--shadow); + transition: transform .35s cubic-bezier(.2,.7,.2,1), box-shadow .35s, border-color .35s; +} +.opt:hover { transform: translateY(-5px); box-shadow: var(--shadow-lift); border-color: var(--sage); } +.opt__media { aspect-ratio: 16 / 10; background: var(--paper-2); cursor: zoom-in; overflow: hidden; } +.opt__media img { width: 100%; height: 100%; object-fit: contain; padding: 10px; } +.opt__body { padding: 18px 20px 20px; display: flex; flex-direction: column; gap: 4px; flex: 1; } +.opt__no { font-size: 12px; letter-spacing: .12em; color: var(--sage-deep); font-weight: 600; } +.opt__name { font-family: var(--ff-display); font-size: 20px; line-height: 1.15; } +.opt__price { font-family: var(--ff-display); font-size: 28px; margin-top: 8px; } +.opt__price span { font-size: 15px; color: var(--ink-soft); } +.opt__link { + margin-top: auto; padding-top: 16px; display: inline-flex; align-items: center; gap: 7px; + text-decoration: none; font-size: 14px; font-weight: 600; color: var(--sage-deep); +} +.opt__link svg { width: 15px; height: 15px; transition: transform .2s; } +.opt__link:hover svg { transform: translate(2px,-2px); } +@media (max-width: 860px) { .options { grid-template-columns: 1fr 1fr; } } +@media (max-width: 560px) { .options { grid-template-columns: 1fr; } } + +/* варианты отделки (нумерованный список к изображению) */ +.finish { display: grid; grid-template-columns: 1.35fr 1fr; gap: clamp(24px,4vw,48px); margin-top: 40px; align-items: center; } +.finish__img { border-radius: var(--r); overflow: hidden; border: 1px solid var(--line); box-shadow: var(--shadow); cursor: zoom-in; } +.variants { list-style: none; margin: 0; padding: 0; counter-reset: v; } +.variants li { + display: grid; grid-template-columns: auto 1fr; gap: 16px; align-items: start; + padding: 16px 0; border-bottom: 1px solid var(--line); +} +.variants li:first-child { border-top: 1px solid var(--line); } +.variants li::before { + counter-increment: v; content: counter(v); + font-family: var(--ff-display); font-size: 17px; color: var(--sage-deep); + width: 32px; height: 32px; border-radius: 50%; display: grid; place-items: center; + border: 1px solid var(--sage); background: color-mix(in srgb, var(--sage) 10%, transparent); +} +.variants b { font-weight: 500; } +.variants small { color: var(--ink-soft); display: block; font-size: 13.5px; } +@media (max-width: 860px) { .finish { grid-template-columns: 1fr; } } + +/* парный ряд рендеров */ +.renders--duo { grid-template-columns: repeat(2, 1fr); margin-top: 18px; } +@media (max-width: 720px) { .renders--duo { grid-template-columns: 1fr; } } + +/* проза и заметки из markdown */ +.prose { max-width: 62ch; color: var(--ink-soft); margin: 22px 0 0; } +.note { + max-width: 62ch; margin: 26px 0 0; padding: 14px 20px; font-size: 15px; color: var(--ink-soft); + border-left: 2px solid var(--sage); background: color-mix(in srgb, var(--sage) 8%, transparent); + border-radius: 0 8px 8px 0; +} + +/* обычные таблицы из markdown */ +.table-wrap { margin-top: 30px; overflow-x: auto; border: 1px solid var(--line); border-radius: var(--r); } +.table-wrap table { width: 100%; border-collapse: collapse; font-size: 15px; background: var(--paper); } +.table-wrap th, .table-wrap td { text-align: left; padding: 13px 18px; border-bottom: 1px solid var(--line); vertical-align: middle; } +.table-wrap th { font-weight: 600; color: var(--sage-deep); font-size: 12.5px; letter-spacing: .04em; text-transform: uppercase; } +.table-wrap tr:last-child td { border-bottom: none; } +.table-wrap td img { width: 84px; border-radius: 8px; } + +/* ---------- футер ---------- */ +.footer { border-top: 1px solid var(--line); padding: 46px 0 60px; color: var(--ink-soft); font-size: 14px; } +.footer__inner { display: flex; justify-content: space-between; gap: 20px; flex-wrap: wrap; align-items: center; } +.footer b { font-family: var(--ff-display); color: var(--ink); font-weight: 500; } + +/* ---------- лайтбокс ---------- */ +.lightbox { + position: fixed; inset: 0; z-index: 100; display: none; + background: rgba(18,17,15,.86); backdrop-filter: blur(6px); + align-items: center; justify-content: center; padding: 4vw; cursor: zoom-out; +} +.lightbox.open { display: flex; } +.lightbox img { max-width: 94vw; max-height: 90vh; width: auto; border-radius: 8px; box-shadow: 0 30px 80px rgba(0,0,0,.6); cursor: default; } +.lightbox__close { + position: absolute; top: 20px; right: 24px; width: 44px; height: 44px; border-radius: 50%; + border: 1px solid rgba(255,255,255,.3); background: rgba(0,0,0,.3); color: #fff; cursor: pointer; + display: grid; place-items: center; font-size: 22px; line-height: 1; +} +.lightbox__close:hover { background: rgba(0,0,0,.55); } + +/* ---------- reveal ---------- */ +.reveal { opacity: 0; transform: translateY(22px); transition: opacity .7s ease, transform .7s cubic-bezier(.2,.7,.2,1); } +.reveal.in { opacity: 1; transform: none; } +@media (prefers-reduced-motion: reduce) { + .reveal { opacity: 1; transform: none; transition: none; } + .render img, .opt { transition: none; } +} + +:focus-visible { outline: 2px solid var(--sage); outline-offset: 3px; border-radius: 4px; } diff --git a/Ремонт квартира/.site/generate.js b/Ремонт квартира/.site/generate.js new file mode 100644 index 0000000..037f510 --- /dev/null +++ b/Ремонт квартира/.site/generate.js @@ -0,0 +1,420 @@ +#!/usr/bin/env node +/* + * Генератор сайта «Ремонт квартиры». + * Читает markdown-заметки из родительской папки vault и собирает статический сайт + * в OUT. Дизайн — из assets/. Контент (рендеры, карточки мебели, варианты) берётся + * из самих заметок, поэтому правка заметки → обновление сайта после пересборки. + */ +const fs = require('fs'); +const path = require('path'); +const sharp = require('sharp'); + +const HERE = __dirname; +const ROOT = path.resolve(HERE, '..'); // папка «Ремонт квартира» +const IMG_SRC = path.join(ROOT, 'images'); +const OUT = process.env.OUT || path.join(HERE, 'out'); +const OUT_IMG = path.join(OUT, 'images'); +const cfg = JSON.parse(fs.readFileSync(path.join(HERE, 'site.config.json'), 'utf8')); + +// ─── утилиты ────────────────────────────────────────────── +const esc = (s) => String(s == null ? '' : s) + .replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); + +function inline(t) { + t = esc(t); + t = t.replace(/\*\*([^*]+)\*\*/g, '$1'); + t = t.replace(/\[([^\]]+)\]\(([^)]+)\)/g, '$1'); + return t; +} + +const usedImages = new Set(); +function imgSrc(name) { + name = String(name).trim(); + usedImages.add(name); + return 'images/' + name.replace(/\.[a-z0-9]+$/i, '') + '.webp'; +} +function parseWiki(line) { + const m = line.trim().match(/^!\[\[([^\]|]+?)(?:\|[^\]]*)?\]\]$/); + return m ? m[1].trim() : null; +} +function plural(n, one, few, many) { + const m10 = n % 10, m100 = n % 100; + if (m10 === 1 && m100 !== 11) return one; + if (m10 >= 2 && m10 <= 4 && (m100 < 12 || m100 > 14)) return few; + return many; +} +function domainLabel(url) { + try { return new URL(url).hostname.replace(/^www\./, ''); } catch { return 'сайт'; } +} +function extractUrl(cell) { + const md = cell.match(/\]\(([^)]+)\)/); // [text](url) + if (md) return md[1].trim(); + const bare = cell.match(/https?:\/\/\S+/); + return bare ? bare[0].trim() : ''; +} + +// ─── парсер markdown в блоки ───────────────────────────── +function parseBlocks(md) { + const lines = md.replace(/\r/g, '').split('\n'); + const blocks = []; + let i = 0; + const isTable = (l) => l.trim().startsWith('|'); + const isList = (l) => /^\s*(\d+\.|[-*])\s+/.test(l); + const isQuote = (l) => /^\s*>/.test(l); + const isHeading = (l) => /^#{1,6}\s/.test(l); + + while (i < lines.length) { + const line = lines[i]; + if (!line.trim()) { i++; continue; } + + const h = line.match(/^(#{1,6})\s+(.*)$/); + if (h) { blocks.push({ t: 'h', lvl: h[1].length, text: h[2].trim() }); i++; continue; } + + if (isTable(line)) { + const rows = []; + while (i < lines.length && isTable(lines[i])) { rows.push(lines[i]); i++; } + blocks.push(parseTable(rows)); continue; + } + + if (parseWiki(line)) { + const imgs = []; + while (i < lines.length) { + if (!lines[i].trim()) { i++; continue; } + const w = parseWiki(lines[i]); + if (w) { imgs.push(w); i++; } else break; + } + blocks.push({ t: 'images', imgs }); continue; + } + + if (isList(line)) { + const items = []; + while (i < lines.length && isList(lines[i])) { + items.push(lines[i].replace(/^\s*(\d+\.|[-*])\s+/, '').trim()); i++; + } + blocks.push({ t: 'list', items }); continue; + } + + if (isQuote(line)) { + const q = []; + while (i < lines.length && isQuote(lines[i])) { q.push(lines[i].replace(/^\s*>\s?/, '')); i++; } + blocks.push({ t: 'quote', text: q.join(' ') }); continue; + } + + const para = []; + while (i < lines.length && lines[i].trim() && !isHeading(lines[i]) && + !isTable(lines[i]) && !isList(lines[i]) && !isQuote(lines[i]) && !parseWiki(lines[i])) { + para.push(lines[i].trim()); i++; + } + blocks.push({ t: 'p', text: para.join(' ') }); + } + return blocks; +} + +function parseTable(rows) { + // split по неэкранированному «|», затем восстанавливаем «\|» → «|» (для ![[img|width]] внутри ячеек) + const cells = (r) => r.trim().replace(/^\|/, '').replace(/\|$/, '') + .split(/(? c.replace(/\\\|/g, '|').trim()); + const headers = cells(rows[0]); + const body = rows.slice(2).map(cells).filter((r) => r.some((c) => c !== '')); + return { t: 'table', headers, rows: body }; +} + +// ─── распознавание таблицы-«прайса» → карточки ─────────── +function tableIsPriced(tbl) { + return tbl.headers.some((h) => /цена|price|₽|руб/i.test(h)); +} +function colIndex(headers, re) { return headers.findIndex((h) => re.test(h)); } + +function renderCards(tbl) { + const H = tbl.headers; + const iNo = colIndex(H, /^№|^no$|^#$/i); + const iPrice = colIndex(H, /цена|price|₽|руб/i); + const iLink = colIndex(H, /ссылк|link|url/i); + const iPhoto = colIndex(H, /фото|photo|картин|image/i); + const iName = H.findIndex((h, idx) => idx !== iNo && idx !== iPrice && idx !== iLink && idx !== iPhoto && h); + + const cards = tbl.rows.map((r, idx) => { + const no = iNo >= 0 && r[iNo] ? r[iNo] : String(idx + 1); + const name = iName >= 0 ? r[iName] : ''; + const priceRaw = iPrice >= 0 ? r[iPrice] : ''; + const priceNum = (priceRaw.match(/[\d\s .]+/) || [''])[0].trim(); + const unit = /₽|руб/i.test(priceRaw) ? '₽' : ''; + const photo = iPhoto >= 0 ? parseWiki(r[iPhoto]) : null; + const url = iLink >= 0 ? extractUrl(r[iLink]) : ''; + const media = photo + ? `
${esc(name)}
` + : ''; + const price = priceNum + ? `${esc(priceNum)}${unit ? ` ${unit}` : ''}` : ''; + const link = url + ? `Открыть на ${esc(domainLabel(url))} ` + : ''; + return `
${media}
+ Вариант ${esc(no)} + ${inline(name)} + ${price}${link}
`; + }).join('\n'); + return `
${cards}
`; +} + +function renderTable(tbl) { + const head = tbl.headers.map((h) => `${inline(h)}`).join(''); + const body = tbl.rows.map((r) => + `${r.map((c) => `${parseWiki(c) ? `` : inline(c)}`).join('')}` + ).join('\n'); + return `
${head}${body}
`; +} + +function renderImages(imgs) { + if (imgs.length === 1) { + return `
`; + } + const cls = imgs.length === 2 ? 'renders--duo' : 'renders--trio'; + const cells = imgs.map((im) => `
`).join(''); + return `
${cells}
`; +} + +function renderVariants(items) { + const li = items.map((it) => { + const parts = it.split(/\s+[—–-]\s+/); + const b = parts.shift(); + const small = parts.join(' — '); + return `
  • ${inline(b)}${small ? `${inline(small)}` : ''}
  • `; + }).join('\n'); + return `
      ${li}
    `; +} + +// картинка сразу перед списком → блок «отделки» (image | варианты) +function renderFinish(img, items) { + const li = items.map((it) => { + const parts = it.split(/\s+[—–-]\s+/); + const b = parts.shift(); + const small = parts.join(' — '); + return `
  • ${inline(b)}${small ? `${inline(small)}` : ''}
  • `; + }).join('\n'); + return `
    +
    +
      ${li}
    `; +} + +function subhead(text, count) { + const c = count != null + ? `${count} ${plural(count, 'вариант', 'варианта', 'вариантов')}` : ''; + return `

    ${inline(text)}

    ${c}
    `; +} + +// ─── сборка секции ──────────────────────────────────────── +function renderSection(sec) { + const md = fs.readFileSync(path.join(ROOT, sec.file), 'utf8'); + let blocks = parseBlocks(md); + + const titleBlock = blocks.find((b) => b.t === 'h' && b.lvl === 1); + const title = sec.title || (titleBlock ? titleBlock.text : sec.nav); + // лид — первый абзац + const leadBlock = blocks.find((b) => b.t === 'p'); + const lead = leadBlock ? leadBlock.text : ''; + + // тело: всё кроме заголовка h1 и первого абзаца + let body = blocks.filter((b) => b !== titleBlock && b !== leadBlock); + + const out = []; + for (let i = 0; i < body.length; i++) { + const b = body[i]; + const next = body[i + 1]; + + if (b.t === 'h') { + let count = null; + if (next) { + if (next.t === 'table' && tableIsPriced(next)) count = next.rows.length; + else if (next.t === 'list') count = next.items.length; + else if (next.t === 'images' && body[i + 2] && body[i + 2].t === 'list') count = body[i + 2].items.length; + } + out.push(subhead(b.text, count)); + } else if (b.t === 'images') { + if (next && next.t === 'list' && b.imgs.length === 1) { + out.push(renderFinish(b.imgs[0], next.items)); + i++; // список поглощён + } else { + out.push(renderImages(b.imgs)); + } + } else if (b.t === 'table') { + out.push(tableIsPriced(b) ? renderCards(b) : renderTable(b)); + } else if (b.t === 'list') { + out.push(renderVariants(b.items)); + } else if (b.t === 'quote') { + out.push(`

    ${inline(b.text)}

    `); + } else if (b.t === 'p') { + out.push(`

    ${inline(b.text)}

    `); + } + } + + const sw = (sec.swatches || []).map((s) => + `${esc(s.name)}`).join(''); + + return `
    +
    +
    +
    + ${esc(sec.eyebrow || '')} +

    ${esc(title)}

    + ${lead ? `

    ${inline(lead)}

    ` : ''} + ${sw ? `
    ${sw}
    ` : ''} +
    + +
    + ${out.join('\n ')} +
    +
    `; +} + +// ─── секция планировки (таблица комнат из заметки) ─────── +function renderPlan(plan) { + const md = fs.readFileSync(path.join(ROOT, plan.file), 'utf8'); + const blocks = parseBlocks(md); + const tbl = blocks.find((b) => b.t === 'table'); + let rooms = ''; + if (tbl) { + const H = tbl.headers; + const iNo = colIndex(H, /^№|^no$|^#$/i); + const iArea = colIndex(H, /площад|м²|area/i); + const iName = H.findIndex((h, idx) => idx !== iNo && idx !== iArea && h); + rooms = tbl.rows.map((r) => { + const no = r[iNo] || ''; + const name = r[iName] || ''; + const area = r[iArea] || ''; + const m = (plan.meta && plan.meta[no]) || {}; + const nameHtml = `${esc(name)}${m.sub ? `${esc(m.sub)}` : ''}`; + const nameCell = m.link ? `${nameHtml}` : nameHtml; + const tag = m.tag === 'done' ? 'концепт готов' + : m.tag === 'wip' ? 'в работе' : ''; + return `
  • ${esc(no)}${nameCell}${tag}${esc(area)}
  • `; + }).join('\n'); + } + return `
    +
    +
    +
    + ${esc(plan.eyebrow)} +

    ${esc(plan.nav)}

    +

    ${esc(plan.lead)}

    +
    + +
    +
    +
    Схема планировки
    +
      ${rooms}
    +
    +
    +
    `; +} + +// ─── страница целиком ───────────────────────────────────── +function buildHtml() { + const h = cfg.hero; + const nav = [cfg.plan, ...cfg.sections].map((s) => + `${esc(s.nav)}${esc(s.navShort || s.nav)}`).join('\n '); + const materials = h.materials.map((m) => + `${esc(m.name)}`).join('\n '); + const stats = h.stats.map((s) => + `
    ${esc(s.num)}${esc(s.lbl)}
    `).join('\n '); + + const sections = cfg.sections.map(renderSection).join('\n\n'); + + return ` + + + + +${esc(cfg.title)} + + + + + + + + + + +
    +
    +
    ${esc(cfg.brand)} ${esc(cfg.brandMeta)}
    + + +
    +
    + +
    +
    +
    +
    + ${esc(h.eyebrow)} +

    ${h.title}

    +

    ${esc(h.lead)}

    +
    + ${materials} +
    +
    + ${stats} +
    +
    +
    + Планировка + Планировка квартиры +
    +
    +
    +
    + +${renderPlan(cfg.plan)} + +${sections} + + + + + + + +`; +} + +// ─── оптимизация картинок ───────────────────────────────── +async function optimizeImages() { + fs.mkdirSync(OUT_IMG, { recursive: true }); + for (const name of usedImages) { + const src = path.join(IMG_SRC, name); + const dst = path.join(OUT_IMG, name.replace(/\.[a-z0-9]+$/i, '') + '.webp'); + if (!fs.existsSync(src)) { console.warn('⚠ нет картинки:', name); continue; } + await sharp(src).resize({ width: 1600, withoutEnlargement: true }).webp({ quality: 82 }).toFile(dst); + } +} + +// ─── main ───────────────────────────────────────────────── +(async () => { + fs.rmSync(OUT, { recursive: true, force: true }); + fs.mkdirSync(path.join(OUT, 'css'), { recursive: true }); + fs.mkdirSync(path.join(OUT, 'js'), { recursive: true }); + + const html = buildHtml(); // наполняет usedImages + fs.writeFileSync(path.join(OUT, 'index.html'), html); + fs.copyFileSync(path.join(HERE, 'assets/style.css'), path.join(OUT, 'css/style.css')); + fs.copyFileSync(path.join(HERE, 'assets/app.js'), path.join(OUT, 'js/app.js')); + await optimizeImages(); + + console.log(`✅ Сайт собран: ${OUT}`); + console.log(` картинок: ${usedImages.size}, секций: ${cfg.sections.length}`); +})().catch((e) => { console.error('❌', e); process.exit(1); }); diff --git a/Ремонт квартира/.site/nginx.conf b/Ремонт квартира/.site/nginx.conf new file mode 100644 index 0000000..51a1b02 --- /dev/null +++ b/Ремонт квартира/.site/nginx.conf @@ -0,0 +1,21 @@ +server { + listen 80; + server_name _; + root /usr/share/nginx/html; + index index.html; + + # index — всегда свежий, чтобы правки доезжали сразу + location = /index.html { + add_header Cache-Control "no-cache"; + } + + # статика с длинным кэшем + location ~* \.(webp|png|jpg|jpeg|svg|css|js|woff2)$ { + expires 7d; + add_header Cache-Control "public, max-age=604800"; + } + + location / { + try_files $uri $uri/ /index.html; + } +} diff --git a/Ремонт квартира/.site/package-lock.json b/Ремонт квартира/.site/package-lock.json new file mode 100644 index 0000000..4bbb503 --- /dev/null +++ b/Ремонт квартира/.site/package-lock.json @@ -0,0 +1,545 @@ +{ + "name": "remont-site", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "remont-site", + "version": "1.0.0", + "dependencies": { + "sharp": "^0.33.5" + } + }, + "node_modules/@emnapi/runtime": { + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.2.tgz", + "integrity": "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==", + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@img/sharp-darwin-arm64": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz", + "integrity": "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-arm64": "1.0.4" + } + }, + "node_modules/@img/sharp-darwin-x64": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz", + "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-x64": "1.0.4" + } + }, + "node_modules/@img/sharp-libvips-darwin-arm64": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz", + "integrity": "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==", + "cpu": [ + "arm64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-darwin-x64": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz", + "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==", + "cpu": [ + "x64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-arm": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz", + "integrity": "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==", + "cpu": [ + "arm" + ], + "libc": [ + "glibc" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-arm64": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz", + "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==", + "cpu": [ + "arm64" + ], + "libc": [ + "glibc" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-s390x": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz", + "integrity": "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==", + "cpu": [ + "s390x" + ], + "libc": [ + "glibc" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-x64": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz", + "integrity": "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==", + "cpu": [ + "x64" + ], + "libc": [ + "glibc" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linuxmusl-arm64": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz", + "integrity": "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==", + "cpu": [ + "arm64" + ], + "libc": [ + "musl" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linuxmusl-x64": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz", + "integrity": "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==", + "cpu": [ + "x64" + ], + "libc": [ + "musl" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-linux-arm": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz", + "integrity": "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==", + "cpu": [ + "arm" + ], + "libc": [ + "glibc" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm": "1.0.5" + } + }, + "node_modules/@img/sharp-linux-arm64": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz", + "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==", + "cpu": [ + "arm64" + ], + "libc": [ + "glibc" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm64": "1.0.4" + } + }, + "node_modules/@img/sharp-linux-s390x": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz", + "integrity": "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==", + "cpu": [ + "s390x" + ], + "libc": [ + "glibc" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-s390x": "1.0.4" + } + }, + "node_modules/@img/sharp-linux-x64": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz", + "integrity": "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==", + "cpu": [ + "x64" + ], + "libc": [ + "glibc" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-x64": "1.0.4" + } + }, + "node_modules/@img/sharp-linuxmusl-arm64": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz", + "integrity": "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==", + "cpu": [ + "arm64" + ], + "libc": [ + "musl" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-arm64": "1.0.4" + } + }, + "node_modules/@img/sharp-linuxmusl-x64": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz", + "integrity": "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==", + "cpu": [ + "x64" + ], + "libc": [ + "musl" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-x64": "1.0.4" + } + }, + "node_modules/@img/sharp-wasm32": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz", + "integrity": "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==", + "cpu": [ + "wasm32" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", + "optional": true, + "dependencies": { + "@emnapi/runtime": "^1.2.0" + }, + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-ia32": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz", + "integrity": "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==", + "cpu": [ + "ia32" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-x64": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz", + "integrity": "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + }, + "engines": { + "node": ">=12.5.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "license": "MIT", + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-arrayish": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz", + "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==", + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/sharp": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.5.tgz", + "integrity": "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==", + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "color": "^4.2.3", + "detect-libc": "^2.0.3", + "semver": "^7.6.3" + }, + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-darwin-arm64": "0.33.5", + "@img/sharp-darwin-x64": "0.33.5", + "@img/sharp-libvips-darwin-arm64": "1.0.4", + "@img/sharp-libvips-darwin-x64": "1.0.4", + "@img/sharp-libvips-linux-arm": "1.0.5", + "@img/sharp-libvips-linux-arm64": "1.0.4", + "@img/sharp-libvips-linux-s390x": "1.0.4", + "@img/sharp-libvips-linux-x64": "1.0.4", + "@img/sharp-libvips-linuxmusl-arm64": "1.0.4", + "@img/sharp-libvips-linuxmusl-x64": "1.0.4", + "@img/sharp-linux-arm": "0.33.5", + "@img/sharp-linux-arm64": "0.33.5", + "@img/sharp-linux-s390x": "0.33.5", + "@img/sharp-linux-x64": "0.33.5", + "@img/sharp-linuxmusl-arm64": "0.33.5", + "@img/sharp-linuxmusl-x64": "0.33.5", + "@img/sharp-wasm32": "0.33.5", + "@img/sharp-win32-ia32": "0.33.5", + "@img/sharp-win32-x64": "0.33.5" + } + }, + "node_modules/simple-swizzle": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz", + "integrity": "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD", + "optional": true + } + } +} diff --git a/Ремонт квартира/.site/package.json b/Ремонт квартира/.site/package.json new file mode 100644 index 0000000..9b443be --- /dev/null +++ b/Ремонт квартира/.site/package.json @@ -0,0 +1,12 @@ +{ + "name": "remont-site", + "version": "1.0.0", + "private": true, + "description": "Генератор сайта «Ремонт квартиры» из заметок Obsidian", + "scripts": { + "build": "node generate.js" + }, + "dependencies": { + "sharp": "^0.33.5" + } +} diff --git a/Ремонт квартира/.site/site.config.json b/Ремонт квартира/.site/site.config.json new file mode 100644 index 0000000..c4c6e7d --- /dev/null +++ b/Ремонт квартира/.site/site.config.json @@ -0,0 +1,71 @@ +{ + "title": "Ремонт квартиры — концепт", + "description": "Концепт ремонта двухкомнатной квартиры 60 м²: планировка, интерьеры, варианты мебели и отделки.", + "brand": "Квартира", + "brandMeta": "2-комн · 60 м²", + "hero": { + "eyebrow": "Концепт ремонта · 2026", + "title": "Наша
    квартира", + "lead": "Двухкомнатная, 60 м². Собираем интерьер по комнатам: планировка, рендеры, варианты мебели и отделки — чтобы выбирать спокойно и вместе.", + "planImage": "plan.png", + "materials": [ + { "name": "Шалфей", "hex": "#7C8A66" }, + { "name": "Дуб", "hex": "#C7A579" }, + { "name": "Штукатурка", "hex": "#EDE8DE" }, + { "name": "Голубой", "hex": "#97B0C3" }, + { "name": "Графит", "hex": "#4B4E52" } + ], + "stats": [ + { "num": "2", "lbl": "комнаты" }, + { "num": "60", "lbl": "м² общая" }, + { "num": "2", "lbl": "концепта готово" } + ] + }, + "plan": { + "id": "plan", + "file": "Планировка.md", + "nav": "Планировка", + "navShort": "План", + "eyebrow": "Обзор", + "index": "01", + "lead": "Шесть помещений и балкон. Номера на схеме совпадают с номерами комнат ниже.", + "meta": { + "3": { "sub": "кухня-студия с зоной отдыха", "link": "#living", "tag": "done" }, + "2": { "sub": "основная, у окна", "link": "#bedroom", "tag": "done" }, + "1": { "sub": "концепт в работе", "tag": "wip" }, + "4": { "sub": "коридор" }, + "5": {}, + "6": {} + } + }, + "sections": [ + { + "id": "living", + "file": "Гостиная-кухня.md", + "nav": "Гостиная-кухня", + "navShort": "Кухня", + "eyebrow": "Комната 3 · 17,0 м²", + "index": "02", + "swatches": [ + { "name": "Шалфей", "hex": "#7C8A66" }, + { "name": "Дуб", "hex": "#C7A579" }, + { "name": "Кремовый", "hex": "#EDE8DE" }, + { "name": "Графит", "hex": "#4B4E52" } + ] + }, + { + "id": "bedroom", + "file": "Спальня.md", + "nav": "Спальня", + "navShort": "Спальня", + "eyebrow": "Комната 2 · 12,0 м²", + "index": "03", + "swatches": [ + { "name": "Голубой", "hex": "#97B0C3" }, + { "name": "Дуб", "hex": "#C7A579" }, + { "name": "Кремовый", "hex": "#EDE8DE" }, + { "name": "Серый", "hex": "#8C8B86" } + ] + } + ] +} diff --git a/Ремонт квартира/README.md b/Ремонт квартира/README.md new file mode 100644 index 0000000..25ffd25 --- /dev/null +++ b/Ремонт квартира/README.md @@ -0,0 +1,16 @@ +# Ремонт квартиры + +Концепт ремонта двухкомнатной квартиры, **60 м²**. Планировка, рендеры интерьеров, варианты мебели и отделки. + +## Разделы + +- [[Планировка]] +- [[Гостиная-кухня]] +- [[Спальня]] + +## Сайт + +Онлайн-версия собирается автоматически из этих заметок при каждом пуше в git: +**https://remont.digital-home.site** + +> Сборка сайта живёт в скрытой папке `.site/` (Obsidian её не показывает). diff --git a/Ремонт квартира/images/Pasted image 20260501163909.png b/Ремонт квартира/images/divan-1-king.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501163909.png rename to Ремонт квартира/images/divan-1-king.png diff --git a/Ремонт квартира/images/Pasted image 20260501164308.png b/Ремонт квартира/images/divan-2-moon.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501164308.png rename to Ремонт квартира/images/divan-2-moon.png diff --git a/Ремонт квартира/images/Pasted image 20260501164539.png b/Ремонт квартира/images/divan-3-moon.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501164539.png rename to Ремонт квартира/images/divan-3-moon.png diff --git a/Ремонт квартира/images/Pasted image 20260501163503.png b/Ремонт квартира/images/gostinaya-render.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501163503.png rename to Ремонт квартира/images/gostinaya-render.png diff --git a/Ремонт квартира/images/Pasted image 20260501180035.png b/Ремонт квартира/images/kuhnya-1.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501180035.png rename to Ремонт квартира/images/kuhnya-1.png diff --git a/Ремонт квартира/images/Pasted image 20260501180043.png b/Ремонт квартира/images/kuhnya-2.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501180043.png rename to Ремонт квартира/images/kuhnya-2.png diff --git a/Ремонт квартира/images/Pasted image 20260501180052.png b/Ремонт квартира/images/kuhnya-3.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501180052.png rename to Ремонт квартира/images/kuhnya-3.png diff --git a/Ремонт квартира/images/Pasted image 20260501175949.png b/Ремонт квартира/images/plan.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501175949.png rename to Ремонт квартира/images/plan.png diff --git a/Ремонт квартира/images/Pasted image 20260501163554.png b/Ремонт квартира/images/spalnya-render.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501163554.png rename to Ремонт квартира/images/spalnya-render.png diff --git a/Ремонт квартира/images/Pasted image 20260501163639.png b/Ремонт квартира/images/spalnya-varianty-steny.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501163639.png rename to Ремонт квартира/images/spalnya-varianty-steny.png diff --git a/Ремонт квартира/images/Pasted image 20260501170656.png b/Ремонт квартира/images/stol-1.png similarity index 100% rename from Ремонт квартира/images/Pasted image 20260501170656.png rename to Ремонт квартира/images/stol-1.png diff --git a/Ремонт квартира/Гостиная-кухня.md b/Ремонт квартира/Гостиная-кухня.md new file mode 100644 index 0000000..311f426 --- /dev/null +++ b/Ремонт квартира/Гостиная-кухня.md @@ -0,0 +1,27 @@ +# Гостиная-кухня + +Кухня-студия с зоной отдыха. Шалфейные фасады, дуб, столешница под мрамор, тёмный пол. + +## Зона гостиной + +![[gostinaya-render.png|829]] + +### Варианты диванов + +| № | Диван | Цена | Ссылка | Фото | +| - | ------------------------------ | -------- | ---------------------------------------------------------------------------------------------------------- | ----------------------------- | +| 1 | King велюр-алькантара «Пепел» | 55 700 ₽ | https://divanboss.ru/divany/pryamye-divany/divan-king-velyur-alkantara/!divan-king-velyur-alkantara-pepel/ | ![[divan-1-king.png\|262]] | +| 2 | Moon 147260 | 49 950 ₽ | https://spb.moon.ru/card/147260 | ![[divan-2-moon.png\|275]] | +| 3 | Moon 148688 | 71 000 ₽ | https://spb.moon.ru/card/148688 | ![[divan-3-moon.png\|265]] | + +## Зона кухни + +![[kuhnya-1.png]] +![[kuhnya-2.png]] +![[kuhnya-3.png]] + +### Варианты столов + +| № | Стол | Цена | Ссылка | Фото | +| - | --------------------------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------- | ----------------------- | +| 1 | Раздвижной круглый 90(170)×90×75 | 12 500 ₽ | https://market.yandex.ru/card/stol-kukhonnyy-razdvizhnoy-stol-obedennyy-kruglyy-90kh90-sm--dve-vkladki-po-40-sm/102967523148 | ![[stol-1.png\|134]] | diff --git a/Ремонт квартира/Интерьер спальни.md b/Ремонт квартира/Интерьер спальни.md deleted file mode 100644 index 6e10ccf..0000000 --- a/Ремонт квартира/Интерьер спальни.md +++ /dev/null @@ -1,2 +0,0 @@ -![[Pasted image 20260501163554.png|608]] -![[Pasted image 20260501163639.png|608]] diff --git a/Ремонт квартира/План квартиры.md b/Ремонт квартира/План квартиры.md deleted file mode 100644 index 4987b7f..0000000 --- a/Ремонт квартира/План квартиры.md +++ /dev/null @@ -1 +0,0 @@ -![[Pasted image 20260501175949.png]] \ No newline at end of file diff --git a/Ремонт квартира/Планировка.md b/Ремонт квартира/Планировка.md new file mode 100644 index 0000000..a8ac3c5 --- /dev/null +++ b/Ремонт квартира/Планировка.md @@ -0,0 +1,16 @@ +# Планировка + +Двухкомнатная квартира, **60 м²**. + +![[plan.png]] + +| № | Помещение | Площадь | +| -- | -------------- | ------- | +| 3 | Гостиная-кухня | 17,0 м² | +| 2 | Спальня | 12,0 м² | +| 1 | Вторая комната | 14,9 м² | +| 4 | Прихожая | 9,2 м² | +| 5 | Ванная | 4,9 м² | +| 6 | Санузел | 2,0 м² | + +> Онлайн-версия: https://remont.digital-home.site diff --git a/Ремонт квартира/Спальня.md b/Ремонт квартира/Спальня.md new file mode 100644 index 0000000..d148404 --- /dev/null +++ b/Ремонт квартира/Спальня.md @@ -0,0 +1,15 @@ +# Спальня + +Спокойная: пыльно-голубые стены, светлый дуб и мягкий текстиль. + +![[spalnya-render.png|608]] + +## Отделка стены за кроватью + +![[spalnya-varianty-steny.png|608]] + +1. Полки с подсветкой — две парящие полки, тёплый свет снизу +2. Деревянная карта мира — панно с контурной подсветкой +3. Вертикальные рейки — дубовые рейки во всю стену +4. Постеры — триптих: море и травы в рамах +5. Одна парящая полка — минимализм, длинная полка с подсветкой