From f2ea3f7b4ddf9e47c9014c04160e5cd5ff27a4a9 Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Mon, 21 Aug 2023 11:49:19 +0200 Subject: update: new look, new folder structure --- _footer.html | 11 +++ _index_header.html | 10 +-- build.sh | 43 +++++++++++ deploy.sh | 5 +- dodaj.sh | 4 + itemy/bluza/mundur-152/fota.jpg | Bin 0 -> 133372 bytes itemy/bluza/mundur-152/opis.md | 5 ++ itemy/bluza/mundur-158-stary/fota.jpg | Bin 0 -> 197799 bytes itemy/bluza/mundur-158-stary/opis.md | 7 ++ itemy/inne/pas/fota.jpg | Bin 0 -> 209586 bytes itemy/inne/pas/opis.md | 5 ++ itemy/mundur-158-stary.jpg | Bin 197799 -> 0 bytes itemy/mundur-158-stary.md | 7 -- itemy/mundur-164.jpg | Bin 918302 -> 0 bytes itemy/mundur-164.md | 6 -- itemy/rogatywka-stary-kroj.jpg | Bin 158021 -> 0 bytes itemy/rogatywka-stary-kroj.md | 5 -- itemy/rogatywka/rogatywka-55/fota.jpg | Bin 0 -> 134332 bytes itemy/rogatywka/rogatywka-55/opis.md | 5 ++ itemy/spodnie-dlugie-176.jpg | Bin 9325900 -> 0 bytes itemy/spodnie-dlugie-176.md | 5 -- itemy/spodnie-dlugie-188.jpg | Bin 8290322 -> 0 bytes itemy/spodnie-dlugie-188.md | 5 -- itemy/spodnie-dlugie/spodnie-dlugie-176/fota.jpg | Bin 0 -> 330737 bytes itemy/spodnie-dlugie/spodnie-dlugie-176/opis.md | 5 ++ itemy/spodnie-dlugie/spodnie-dlugie-188/fota.jpg | Bin 0 -> 308282 bytes itemy/spodnie-dlugie/spodnie-dlugie-188/opis.md | 5 ++ logo-dark.svg | 9 --- logo-light.svg | 9 --- rsync_push.sh | 3 +- static/beret.png | Bin 0 -> 990 bytes static/bluza.png | Bin 0 -> 3051 bytes static/inne.png | Bin 0 -> 3131 bytes static/logo-dark.svg | 9 +++ static/logo-light.svg | 9 +++ static/rogatywka.png | Bin 0 -> 1247 bytes static/spodnica.png | Bin 0 -> 2433 bytes static/spodnie-dlugie.png | Bin 0 -> 2798 bytes static/spodnie-krotkie.png | Bin 0 -> 2383 bytes static/style.css | 89 +++++++++++++++++++++++ style.css | 48 ------------ 41 files changed, 207 insertions(+), 102 deletions(-) create mode 100644 _footer.html create mode 100755 build.sh create mode 100644 dodaj.sh create mode 100644 itemy/bluza/mundur-152/fota.jpg create mode 100644 itemy/bluza/mundur-152/opis.md create mode 100644 itemy/bluza/mundur-158-stary/fota.jpg create mode 100644 itemy/bluza/mundur-158-stary/opis.md create mode 100644 itemy/inne/pas/fota.jpg create mode 100644 itemy/inne/pas/opis.md delete mode 100644 itemy/mundur-158-stary.jpg delete mode 100644 itemy/mundur-158-stary.md delete mode 100644 itemy/mundur-164.jpg delete mode 100644 itemy/mundur-164.md delete mode 100644 itemy/rogatywka-stary-kroj.jpg delete mode 100644 itemy/rogatywka-stary-kroj.md create mode 100644 itemy/rogatywka/rogatywka-55/fota.jpg create mode 100644 itemy/rogatywka/rogatywka-55/opis.md delete mode 100644 itemy/spodnie-dlugie-176.jpg delete mode 100644 itemy/spodnie-dlugie-176.md delete mode 100644 itemy/spodnie-dlugie-188.jpg delete mode 100644 itemy/spodnie-dlugie-188.md create mode 100644 itemy/spodnie-dlugie/spodnie-dlugie-176/fota.jpg create mode 100644 itemy/spodnie-dlugie/spodnie-dlugie-176/opis.md create mode 100644 itemy/spodnie-dlugie/spodnie-dlugie-188/fota.jpg create mode 100644 itemy/spodnie-dlugie/spodnie-dlugie-188/opis.md delete mode 100644 logo-dark.svg delete mode 100644 logo-light.svg create mode 100644 static/beret.png create mode 100644 static/bluza.png create mode 100644 static/inne.png create mode 100644 static/logo-dark.svg create mode 100644 static/logo-light.svg create mode 100644 static/rogatywka.png create mode 100644 static/spodnica.png create mode 100644 static/spodnie-dlugie.png create mode 100644 static/spodnie-krotkie.png create mode 100644 static/style.css delete mode 100644 style.css diff --git a/_footer.html b/_footer.html new file mode 100644 index 0000000..02cdbbf --- /dev/null +++ b/_footer.html @@ -0,0 +1,11 @@ + + + diff --git a/_index_header.html b/_index_header.html index 93598d4..479afba 100644 --- a/_index_header.html +++ b/_index_header.html @@ -11,7 +11,7 @@

Harcdzielnia

-

Twojsza składnica

+

Drugie życie mundurów

@@ -20,10 +20,8 @@

Dlatego postanowiłem ogarnąć sprawę i stworzyć spis starych, ale sprawnych, mundurów, które będzie można za darmo odzyskać, dać im drugie życie i uratować przed kurzem i zapomnieniem gdzieś na dole szafy.

Jak to działa?

Poniżej znajduje się lista zebranych części umundurowania. Jeżeli ktoś jest w potrzebie to kontaktuje się ze mną i ustalamy jakiś termin na spotkanie / podrzucenie munduru.

-

mail: patryk.niedzwiedzinski@zhr.pl

+

mail: harcdzielnia@19pdh.pl

albo przez tel. jak ktoś ma mój numer ;)

Mam za mały mundur!

-

Napisz maila/smsa z rozmiarem i zdjęciem, a ja wrzucę i dodam do listy. -

-

Rzeczy, które mam

-
    +

    Napisz maila z rozmiarem i zdjęciem, a ja wrzucę i dodam do listy. +

    Wszystkie rzeczy:

    diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..bd64203 --- /dev/null +++ b/build.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +mkdir -p dest/foty + +cp static/* dest + +cat _index_header.html > dest/index.html + +function generate_page() { + filename=$(basename $1) + cat _header.html > dest/$filename.html + sed 's/^# \(.*\)/

    \1<\/h2>/' $1/opis.md >> dest/$filename.html + cat _footer.html >> dest/$filename.html + +} + +function generate_index() { + echo "
    " + for item in `find $1 -name opis.md`; do + category=$(basename $(dirname $(dirname $item))) + dir=$(dirname $item) + generate_page $dir + filename=$(basename $dir) + name=$(head -n1 $item | cut -c 2-) + echo "
    " + cp $dir/fota.jpg dest/foty/$filename.jpg + echo "" + echo "
    " + echo "" + echo "

    $name

    " + echo "
    " + done + echo "
    " +} + +for kategoria in `ls itemy`; do + cat _header.html > dest/$kategoria.html + generate_index itemy/$kategoria >> dest/$kategoria.html + cat _footer.html >> dest/$kategoria.html +done + +generate_index itemy >> dest/index.html +cat _footer.html >> dest/index.html diff --git a/deploy.sh b/deploy.sh index f4c7ad3..a51e7c7 100755 --- a/deploy.sh +++ b/deploy.sh @@ -25,7 +25,10 @@ echo "

" >> dest/index.html diff --git a/dodaj.sh b/dodaj.sh new file mode 100644 index 0000000..cd3a7b9 --- /dev/null +++ b/dodaj.sh @@ -0,0 +1,4 @@ +#!/bin/sh +## Skrypt do dodawania nowego itemu do listy + +DIR=$(dirname $(readlink -f $0))/itemy diff --git a/itemy/bluza/mundur-152/fota.jpg b/itemy/bluza/mundur-152/fota.jpg new file mode 100644 index 0000000..73b24b1 Binary files /dev/null and b/itemy/bluza/mundur-152/fota.jpg differ diff --git a/itemy/bluza/mundur-152/opis.md b/itemy/bluza/mundur-152/opis.md new file mode 100644 index 0000000..2e6634c --- /dev/null +++ b/itemy/bluza/mundur-152/opis.md @@ -0,0 +1,5 @@ +# Bluza mundurowa 152cm + +Brak zdjęcia + +Bluza mundurowa 152cm diff --git a/itemy/bluza/mundur-158-stary/fota.jpg b/itemy/bluza/mundur-158-stary/fota.jpg new file mode 100644 index 0000000..5800113 Binary files /dev/null and b/itemy/bluza/mundur-158-stary/fota.jpg differ diff --git a/itemy/bluza/mundur-158-stary/opis.md b/itemy/bluza/mundur-158-stary/opis.md new file mode 100644 index 0000000..03074aa --- /dev/null +++ b/itemy/bluza/mundur-158-stary/opis.md @@ -0,0 +1,7 @@ +# Bluza mundurowa 158cm - stary krój + + + +Bluza mundurowa 158cm według starego regulaminu umundurowania + +W 2016 weszła reforma mundurowa w ZHR i tych mundurów już się nie używa, ale takie mundury mogą nosić zuchy. diff --git a/itemy/inne/pas/fota.jpg b/itemy/inne/pas/fota.jpg new file mode 100644 index 0000000..a67ac14 Binary files /dev/null and b/itemy/inne/pas/fota.jpg differ diff --git a/itemy/inne/pas/opis.md b/itemy/inne/pas/opis.md new file mode 100644 index 0000000..201661b --- /dev/null +++ b/itemy/inne/pas/opis.md @@ -0,0 +1,5 @@ +# Pas harcerski + +brak zdjęcia + +Pas harcerski ZHR diff --git a/itemy/mundur-158-stary.jpg b/itemy/mundur-158-stary.jpg deleted file mode 100644 index 5800113..0000000 Binary files a/itemy/mundur-158-stary.jpg and /dev/null differ diff --git a/itemy/mundur-158-stary.md b/itemy/mundur-158-stary.md deleted file mode 100644 index 03074aa..0000000 --- a/itemy/mundur-158-stary.md +++ /dev/null @@ -1,7 +0,0 @@ -# Bluza mundurowa 158cm - stary krój - - - -Bluza mundurowa 158cm według starego regulaminu umundurowania - -W 2016 weszła reforma mundurowa w ZHR i tych mundurów już się nie używa, ale takie mundury mogą nosić zuchy. diff --git a/itemy/mundur-164.jpg b/itemy/mundur-164.jpg deleted file mode 100644 index 30cad47..0000000 Binary files a/itemy/mundur-164.jpg and /dev/null differ diff --git a/itemy/mundur-164.md b/itemy/mundur-164.md deleted file mode 100644 index 5b962a2..0000000 --- a/itemy/mundur-164.md +++ /dev/null @@ -1,6 +0,0 @@ -# Bluza mundurowa 164cm - -Brak zdjęcia - -Bluza mundurowa 164cm - diff --git a/itemy/rogatywka-stary-kroj.jpg b/itemy/rogatywka-stary-kroj.jpg deleted file mode 100644 index efdbc35..0000000 Binary files a/itemy/rogatywka-stary-kroj.jpg and /dev/null differ diff --git a/itemy/rogatywka-stary-kroj.md b/itemy/rogatywka-stary-kroj.md deleted file mode 100644 index 1ca9d22..0000000 --- a/itemy/rogatywka-stary-kroj.md +++ /dev/null @@ -1,5 +0,0 @@ -# Rogatywka - - - -Rogatywka (nie intermag), bez lilijki diff --git a/itemy/rogatywka/rogatywka-55/fota.jpg b/itemy/rogatywka/rogatywka-55/fota.jpg new file mode 100644 index 0000000..208c87f Binary files /dev/null and b/itemy/rogatywka/rogatywka-55/fota.jpg differ diff --git a/itemy/rogatywka/rogatywka-55/opis.md b/itemy/rogatywka/rogatywka-55/opis.md new file mode 100644 index 0000000..1fb597b --- /dev/null +++ b/itemy/rogatywka/rogatywka-55/opis.md @@ -0,0 +1,5 @@ +# Rogatywka 55 + +brak zdjęcia + +Rogatywka Intermag rozmiar 55 z granatowym obszyciem - takie jak nosi się w Bindudze diff --git a/itemy/spodnie-dlugie-176.jpg b/itemy/spodnie-dlugie-176.jpg deleted file mode 100644 index 9ef8429..0000000 Binary files a/itemy/spodnie-dlugie-176.jpg and /dev/null differ diff --git a/itemy/spodnie-dlugie-176.md b/itemy/spodnie-dlugie-176.md deleted file mode 100644 index 0bbd5f1..0000000 --- a/itemy/spodnie-dlugie-176.md +++ /dev/null @@ -1,5 +0,0 @@ -# Spodnie długie 176cm - - - -Spodnie długie 176cm diff --git a/itemy/spodnie-dlugie-188.jpg b/itemy/spodnie-dlugie-188.jpg deleted file mode 100644 index 11c4012..0000000 Binary files a/itemy/spodnie-dlugie-188.jpg and /dev/null differ diff --git a/itemy/spodnie-dlugie-188.md b/itemy/spodnie-dlugie-188.md deleted file mode 100644 index c6fe119..0000000 --- a/itemy/spodnie-dlugie-188.md +++ /dev/null @@ -1,5 +0,0 @@ -# Spodnie długie 188cm - - - -Spodnie długie 188cm diff --git a/itemy/spodnie-dlugie/spodnie-dlugie-176/fota.jpg b/itemy/spodnie-dlugie/spodnie-dlugie-176/fota.jpg new file mode 100644 index 0000000..eb01155 Binary files /dev/null and b/itemy/spodnie-dlugie/spodnie-dlugie-176/fota.jpg differ diff --git a/itemy/spodnie-dlugie/spodnie-dlugie-176/opis.md b/itemy/spodnie-dlugie/spodnie-dlugie-176/opis.md new file mode 100644 index 0000000..0bbd5f1 --- /dev/null +++ b/itemy/spodnie-dlugie/spodnie-dlugie-176/opis.md @@ -0,0 +1,5 @@ +# Spodnie długie 176cm + + + +Spodnie długie 176cm diff --git a/itemy/spodnie-dlugie/spodnie-dlugie-188/fota.jpg b/itemy/spodnie-dlugie/spodnie-dlugie-188/fota.jpg new file mode 100644 index 0000000..da20aa3 Binary files /dev/null and b/itemy/spodnie-dlugie/spodnie-dlugie-188/fota.jpg differ diff --git a/itemy/spodnie-dlugie/spodnie-dlugie-188/opis.md b/itemy/spodnie-dlugie/spodnie-dlugie-188/opis.md new file mode 100644 index 0000000..c6fe119 --- /dev/null +++ b/itemy/spodnie-dlugie/spodnie-dlugie-188/opis.md @@ -0,0 +1,5 @@ +# Spodnie długie 188cm + + + +Spodnie długie 188cm diff --git a/logo-dark.svg b/logo-dark.svg deleted file mode 100644 index 5edc493..0000000 --- a/logo-dark.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/logo-light.svg b/logo-light.svg deleted file mode 100644 index cc33cd4..0000000 --- a/logo-light.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/rsync_push.sh b/rsync_push.sh index a7ed78a..ff81e0f 100755 --- a/rsync_push.sh +++ b/rsync_push.sh @@ -1,3 +1,4 @@ #!/bin/sh -rsync -aP ./dest/ srv1:/srv/www/zhr.niedzwiedzinski.cyou/harcdzielnia +#rsync -aP ./dest/ srv1:/srv/www/zhr.niedzwiedzinski.cyou/harcdzielnia +rsync -aP ./dest/ srv3:/srv/www/harcdzielnia.19pdh.pl diff --git a/static/beret.png b/static/beret.png new file mode 100644 index 0000000..2a2bc28 Binary files /dev/null and b/static/beret.png differ diff --git a/static/bluza.png b/static/bluza.png new file mode 100644 index 0000000..bdc3d74 Binary files /dev/null and b/static/bluza.png differ diff --git a/static/inne.png b/static/inne.png new file mode 100644 index 0000000..bfceae3 Binary files /dev/null and b/static/inne.png differ diff --git a/static/logo-dark.svg b/static/logo-dark.svg new file mode 100644 index 0000000..5edc493 --- /dev/null +++ b/static/logo-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/static/logo-light.svg b/static/logo-light.svg new file mode 100644 index 0000000..cc33cd4 --- /dev/null +++ b/static/logo-light.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/static/rogatywka.png b/static/rogatywka.png new file mode 100644 index 0000000..94c2b53 Binary files /dev/null and b/static/rogatywka.png differ diff --git a/static/spodnica.png b/static/spodnica.png new file mode 100644 index 0000000..7223ce4 Binary files /dev/null and b/static/spodnica.png differ diff --git a/static/spodnie-dlugie.png b/static/spodnie-dlugie.png new file mode 100644 index 0000000..e148015 Binary files /dev/null and b/static/spodnie-dlugie.png differ diff --git a/static/spodnie-krotkie.png b/static/spodnie-krotkie.png new file mode 100644 index 0000000..524767b Binary files /dev/null and b/static/spodnie-krotkie.png differ diff --git a/static/style.css b/static/style.css new file mode 100644 index 0000000..a44310f --- /dev/null +++ b/static/style.css @@ -0,0 +1,89 @@ +@import url('https://fonts.googleapis.com/css2?family=Roboto+Slab&display=swap'); + +:root { + --bg: #F3FFF0; + --fg: #1E221B; +} + +html { + background: var(--bg); + color: var(--fg); + font-family: 'Roboto Slab', serif; +} + +body { + max-width: 700px; + padding: 1ex; + margin: auto; +} + +header { + display: flex; + align-items: center; + text-align: center; +} + +footer { + margin-bottom: 2em; +} + +.list { + padding: 1ex; + border: 1px solid gray; +} + +@media (max-width: 720px) { + header { + flex-direction: column; + } +} + +main img { + width: 100%; + margin-bottom: 2em; +} + +main { + padding-bottom: 2em; +} + +.container { + display: flex; + flex-wrap: wrap; + justify-content: center; + margin: 0 auto; +} + +.item { + box-sizing: border-box; + border: 5px solid var(--fg); + border-radius: 15px; + padding: 5px; + margin: 7px; + width: 100%; + max-width: 300px; + max-height: 400px; +} + +.item a { + display: grid; + grid-template-rows: 2fr 75px; +} + +.item img, +.name img { + margin: 0; + border-radius: 10px; + object-fit: cover; + max-height: 300px; +} + +.item img { +} + +.item .name { + display: grid; + grid-template-columns: 50px auto; + grid-template-rows: 1fr; + align-items: center; +} diff --git a/style.css b/style.css deleted file mode 100644 index 614d2e2..0000000 --- a/style.css +++ /dev/null @@ -1,48 +0,0 @@ -@import url('https://fonts.googleapis.com/css2?family=Roboto+Slab&display=swap'); - -:root { - --bg: #F3FFF0; - --fg: #1E221B; -} - -html { - background: var(--bg); - color: var(--fg); - font-family: 'Roboto Slab', serif; -} - -body { - max-width: 80ex; - padding: 1ex; - margin: auto; -} - -header { - display: flex; - align-items: center; - text-align: center; -} - -footer { - margin-bottom: 2em; -} - -.list { - padding: 1ex; - border: 1px solid gray; -} - -@media (max-width: 720px) { - header { - flex-direction: column; - } -} - -main img { - width: 100%; - margin-bottom: 2em; -} - -main { - padding-bottom: 2em; -} -- cgit 1.4.1