new photos in gallery

31 files changed, 21 insertions, 20 deletions

diff --git a/pages/index.fnl b/pages/index.fnl
index 439adb6..7d14412 100644
--- a/pages/index.fnl
+++ b/pages/index.fnl
@@ -1,7 +1,13 @@
 (local templates (require :templates))
 (local html (require :vendor.html))
 
-(local content
+(fn pick-gallery-photo [list]
+  (let [chosen (. list (math.random (# list)))]
+    [:div {}
+     [:a {:href (.. "static/" chosen.name ".webp") :target "_blank"}
+      [:img {:src (.. "static/" chosen.name "-p.webp") :alt chosen.alt}]]]))
+
+(fn content []
   [[:article {:class "article"}
     [:img {:class "logo" :src "/static/logo.svg"
            :alt "Белая жаба в мультяшном стиле с чайником на голове"}]
@@ -13,36 +19,31 @@
     [:p {}
       [:NO-ESCAPE
        (..
-        "Маленькая уютная чайная для своих: Омск, ул. Пушкина, д. 133/9, этаж 2. "
+        "Уютная чайная комната в Омске: Омск, ул. Пушкина, д. 133/9, этаж 2. "
         "Вход с крыльца Магнита, дверь слева, домофон 4. "
         "Посещение по предварительной договоренности, стоимость 500 рублей с человека.")]]
     [:p {}
      [:a {:href "https://t.me/whitetoadvlad" :class "button"}
        "Записаться"]]]
    [:div {:class "gallery"}
-    [:div {}
-     [:a {:href "static/people.jpg" :target "_blank"}
-      [:img {:src "static/people_p.jpg" :alt "Люди в чайной"}]]]
-    [:div {}
-     [:a {:href "static/table.jpg" :target "_blank"}
-      [:img {:src "static/table_p.jpg"
-             :alt "Сфотографированные сверху пиалы на японском столике"}]]]
+    (pick-gallery-photo [{:name "people" :alt "Люди в чайной"}
+                         {:name "gaiwan2" :alt "Близко сфотографированный чайный столик с пиалами и гайванью"}
+                         {:name "teapot2" :alt "Пиала и чайник на фоне гирлянды"}])
+    (pick-gallery-photo [{:name "table" :alt "Сфотографированные сверху пиалы на японском столике"}])
     [:div {}
      [:video {:autoplay true :loop true :muted true}
-      [:source {:src "static/boiling_p.webm" :type "video/webm"}]]]
-    [:div {}
-     [:a {:href "static/gaiwan.jpg" :target "_blank"}
-      [:img {:src "static/gaiwan_p.jpg"
-             :alt "Гайвань и ширма с гирляндами на фоне"}]]]
-     [:div {}
-      [:a {:href "static/rack.jpg" :target "_blank"}
-       [:img {:src "static/rack_p.jpg"
-              :alt "Стеллаж с чайной посудой"}]]]
+      [:source {:src "static/boiling-p.webm" :type "video/webm"}]]]
+    (pick-gallery-photo [{:name "gaiwan" :alt "Гайвань и ширма с гирляндами на фоне"}
+                         {:name "wall" :alt "Белая стена с веером и тенью окна"}
+                         {:name "teapot" :alt "Чайник в темноте на светлом фоне гирлянд"}
+                         {:name "teapot3" :alt "Чайник в руке на фоне растений"}])
+    (pick-gallery-photo [{:name "rack" :alt "Стеллаж с чайной посудой"}
+                         {:name "flowers" :alt "Ваза с цветами рядом с чайным столиком"}])
     [:div {}
      [:video {:autoplay true :loop true :muted true}
-      [:source {:src "static/gaiwan_p.webm" :type "video/webm"}]]]]])
+      [:source {:src "static/gaiwan-p.webm" :type "video/webm"}]]]]])
 
 (fn render [request]
- (values 200 {} (html.render (templates.base-template content) true)))
+ (values 200 {} (html.render (templates.base-template (content)) true)))
 
 {: render}
diff --git a/static/boiling_p.webm b/static/boiling-p.webm
index 166318f..166318f 100644
--- a/static/boiling_p.webm
+++ b/static/boiling-p.webm
diff --git a/static/flowers-p.webp b/static/flowers-p.webp
new file mode 100644
index 0000000..e3d599d
--- /dev/null
+++ b/static/flowers-p.webp
diff --git a/static/flowers.webp b/static/flowers.webp
new file mode 100644
index 0000000..39da15c
--- /dev/null
+++ b/static/flowers.webp
diff --git a/static/gaiwan_p.webm b/static/gaiwan-p.webm
index a6a03ec..a6a03ec 100644
--- a/static/gaiwan_p.webm
+++ b/static/gaiwan-p.webm
diff --git a/static/gaiwan-p.webp b/static/gaiwan-p.webp
new file mode 100644
index 0000000..1a88c9a
--- /dev/null
+++ b/static/gaiwan-p.webp
diff --git a/static/gaiwan.jpg b/static/gaiwan.jpg
deleted file mode 100644
index 9202153..0000000
--- a/static/gaiwan.jpg
+++ /dev/null
diff --git a/static/gaiwan.webp b/static/gaiwan.webp
new file mode 100644
index 0000000..32ac9df
--- /dev/null
+++ b/static/gaiwan.webp
diff --git a/static/gaiwan2-p.webp b/static/gaiwan2-p.webp
new file mode 100644
index 0000000..cf29828
--- /dev/null
+++ b/static/gaiwan2-p.webp
diff --git a/static/gaiwan2.webp b/static/gaiwan2.webp
new file mode 100644
index 0000000..a301062
--- /dev/null
+++ b/static/gaiwan2.webp
diff --git a/static/gaiwan_p.jpg b/static/gaiwan_p.jpg
deleted file mode 100644
index c3c025d..0000000
--- a/static/gaiwan_p.jpg
+++ /dev/null
diff --git a/static/people-p.webp b/static/people-p.webp
new file mode 100644
index 0000000..e6afe3b
--- /dev/null
+++ b/static/people-p.webp
diff --git a/static/people.jpg b/static/people.jpg
deleted file mode 100644
index 1a3bef8..0000000
--- a/static/people.jpg
+++ /dev/null
diff --git a/static/people.webp b/static/people.webp
new file mode 100644
index 0000000..c22b66b
--- /dev/null
+++ b/static/people.webp
diff --git a/static/people_p.jpg b/static/people_p.jpg
deleted file mode 100644
index 97c52ef..0000000
--- a/static/people_p.jpg
+++ /dev/null
diff --git a/static/rack-p.webp b/static/rack-p.webp
new file mode 100644
index 0000000..d3c8f46
--- /dev/null
+++ b/static/rack-p.webp
diff --git a/static/rack.jpg b/static/rack.jpg
deleted file mode 100644
index 076d353..0000000
--- a/static/rack.jpg
+++ /dev/null
diff --git a/static/rack.webp b/static/rack.webp
new file mode 100644
index 0000000..8e204f6
--- /dev/null
+++ b/static/rack.webp
diff --git a/static/rack_p.jpg b/static/rack_p.jpg
deleted file mode 100644
index 6bb653d..0000000
--- a/static/rack_p.jpg
+++ /dev/null
diff --git a/static/table-p.webp b/static/table-p.webp
new file mode 100644
index 0000000..28ada8d
--- /dev/null
+++ b/static/table-p.webp
diff --git a/static/table.jpg b/static/table.jpg
deleted file mode 100644
index 4dd1390..0000000
--- a/static/table.jpg
+++ /dev/null
diff --git a/static/table.webp b/static/table.webp
new file mode 100644
index 0000000..9125e4d
--- /dev/null
+++ b/static/table.webp
diff --git a/static/table_p.jpg b/static/table_p.jpg
deleted file mode 100644
index 4cf0d13..0000000
--- a/static/table_p.jpg
+++ /dev/null
diff --git a/static/teapot-p.webp b/static/teapot-p.webp
new file mode 100644
index 0000000..4d88b39
--- /dev/null
+++ b/static/teapot-p.webp
diff --git a/static/teapot.webp b/static/teapot.webp
new file mode 100644
index 0000000..46ccce0
--- /dev/null
+++ b/static/teapot.webp
diff --git a/static/teapot2-p.webp b/static/teapot2-p.webp
new file mode 100644
index 0000000..a48a665
--- /dev/null
+++ b/static/teapot2-p.webp
diff --git a/static/teapot2.webp b/static/teapot2.webp
new file mode 100644
index 0000000..505669b
--- /dev/null
+++ b/static/teapot2.webp
diff --git a/static/teapot3-p.webp b/static/teapot3-p.webp
new file mode 100644
index 0000000..5d5111a
--- /dev/null
+++ b/static/teapot3-p.webp
diff --git a/static/teapot3.webp b/static/teapot3.webp
new file mode 100644
index 0000000..dfd7c3e
--- /dev/null
+++ b/static/teapot3.webp
diff --git a/static/wall-p.webp b/static/wall-p.webp
new file mode 100644
index 0000000..53ccac5
--- /dev/null
+++ b/static/wall-p.webp
diff --git a/static/wall.webp b/static/wall.webp
new file mode 100644
index 0000000..20bda56
--- /dev/null
+++ b/static/wall.webp