From 6178c73f98cf2f3ffbac94115a07af3ae62a0b01 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Sun, 1 Mar 2020 22:17:44 +0100 Subject: Migrate to pug --- .gitignore | 1 + .webpull | 1 + Dockerfile | 3 - README.md | 9 ++- html/landing/arobase.png | Bin 1326 -> 0 bytes html/landing/fonts/texgyreheros-bold.otf | Bin 144464 -> 0 bytes html/landing/fonts/texgyreheros-bolditalic.otf | Bin 146012 -> 0 bytes html/landing/fonts/texgyreheros-italic.otf | Bin 150164 -> 0 bytes html/landing/fonts/texgyreheros-regular.otf | Bin 143912 -> 0 bytes html/landing/fonts/texgyreheroscn-bold.otf | Bin 140124 -> 0 bytes html/landing/fonts/texgyreheroscn-bolditalic.otf | Bin 147024 -> 0 bytes html/landing/fonts/texgyreheroscn-italic.otf | Bin 146948 -> 0 bytes html/landing/fonts/texgyreheroscn-regular.otf | Bin 139992 -> 0 bytes html/landing/img/flower.svg | 1 - html/robots.txt | 2 - src/._layout.pug.swp | Bin 0 -> 12288 bytes src/.documentation.pug.swp | Bin 0 -> 12288 bytes src/_layout.pug | 23 +++++++ src/documentation.pug | 9 +++ src/index.pug | 49 ++++++++++++++ static/css/.main.css.swp | Bin 0 -> 12288 bytes static/css/main.css | 78 +++++++++++++++++++++++ static/fonts/texgyreheros-bold.otf | Bin 0 -> 144464 bytes static/fonts/texgyreheros-bolditalic.otf | Bin 0 -> 146012 bytes static/fonts/texgyreheros-italic.otf | Bin 0 -> 150164 bytes static/fonts/texgyreheros-regular.otf | Bin 0 -> 143912 bytes static/fonts/texgyreheroscn-bold.otf | Bin 0 -> 140124 bytes static/fonts/texgyreheroscn-bolditalic.otf | Bin 0 -> 147024 bytes static/fonts/texgyreheroscn-italic.otf | Bin 0 -> 146948 bytes static/fonts/texgyreheroscn-regular.otf | Bin 0 -> 139992 bytes static/img/arobase.png | Bin 0 -> 1326 bytes static/img/flower.svg | 1 + static/robots.txt | 2 + 33 files changed, 172 insertions(+), 7 deletions(-) create mode 100644 .gitignore delete mode 100644 Dockerfile delete mode 100644 html/landing/arobase.png delete mode 100644 html/landing/fonts/texgyreheros-bold.otf delete mode 100644 html/landing/fonts/texgyreheros-bolditalic.otf delete mode 100644 html/landing/fonts/texgyreheros-italic.otf delete mode 100644 html/landing/fonts/texgyreheros-regular.otf delete mode 100644 html/landing/fonts/texgyreheroscn-bold.otf delete mode 100644 html/landing/fonts/texgyreheroscn-bolditalic.otf delete mode 100644 html/landing/fonts/texgyreheroscn-italic.otf delete mode 100644 html/landing/fonts/texgyreheroscn-regular.otf delete mode 100644 html/landing/img/flower.svg delete mode 100644 html/robots.txt create mode 100644 src/._layout.pug.swp create mode 100644 src/.documentation.pug.swp create mode 100644 src/_layout.pug create mode 100644 src/documentation.pug create mode 100644 src/index.pug create mode 100644 static/css/.main.css.swp create mode 100644 static/css/main.css create mode 100644 static/fonts/texgyreheros-bold.otf create mode 100644 static/fonts/texgyreheros-bolditalic.otf create mode 100644 static/fonts/texgyreheros-italic.otf create mode 100644 static/fonts/texgyreheros-regular.otf create mode 100644 static/fonts/texgyreheroscn-bold.otf create mode 100644 static/fonts/texgyreheroscn-bolditalic.otf create mode 100644 static/fonts/texgyreheroscn-italic.otf create mode 100644 static/fonts/texgyreheroscn-regular.otf create mode 100644 static/img/arobase.png create mode 100644 static/img/flower.svg create mode 100644 static/robots.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2d19fc7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.html diff --git a/.webpull b/.webpull index a9bf588..f381d82 100755 --- a/.webpull +++ b/.webpull @@ -1 +1,2 @@ #!/bin/bash +pug ./src --out ./static diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index b4cbbce..0000000 --- a/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM superboum/amd64_webserver:v2 -COPY ./html /srv/http - diff --git a/README.md b/README.md index 2e45f3e..2716d97 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ # site -deuxfleurs.fr \ No newline at end of file +deuxfleurs.fr + +## Building + +``` +sudo npm install -g pug +sudo npm install -g jstransformer-markdown-it +``` diff --git a/html/landing/arobase.png b/html/landing/arobase.png deleted file mode 100644 index d2a275a..0000000 Binary files a/html/landing/arobase.png and /dev/null differ diff --git a/html/landing/fonts/texgyreheros-bold.otf b/html/landing/fonts/texgyreheros-bold.otf deleted file mode 100644 index 2f23b92..0000000 Binary files a/html/landing/fonts/texgyreheros-bold.otf and /dev/null differ diff --git a/html/landing/fonts/texgyreheros-bolditalic.otf b/html/landing/fonts/texgyreheros-bolditalic.otf deleted file mode 100644 index 556b8e1..0000000 Binary files a/html/landing/fonts/texgyreheros-bolditalic.otf and /dev/null differ diff --git a/html/landing/fonts/texgyreheros-italic.otf b/html/landing/fonts/texgyreheros-italic.otf deleted file mode 100644 index ae50725..0000000 Binary files a/html/landing/fonts/texgyreheros-italic.otf and /dev/null differ diff --git a/html/landing/fonts/texgyreheros-regular.otf b/html/landing/fonts/texgyreheros-regular.otf deleted file mode 100644 index ac6c32f..0000000 Binary files a/html/landing/fonts/texgyreheros-regular.otf and /dev/null differ diff --git a/html/landing/fonts/texgyreheroscn-bold.otf b/html/landing/fonts/texgyreheroscn-bold.otf deleted file mode 100644 index dc5f63a..0000000 Binary files a/html/landing/fonts/texgyreheroscn-bold.otf and /dev/null differ diff --git a/html/landing/fonts/texgyreheroscn-bolditalic.otf b/html/landing/fonts/texgyreheroscn-bolditalic.otf deleted file mode 100644 index 2b46b47..0000000 Binary files a/html/landing/fonts/texgyreheroscn-bolditalic.otf and /dev/null differ diff --git a/html/landing/fonts/texgyreheroscn-italic.otf b/html/landing/fonts/texgyreheroscn-italic.otf deleted file mode 100644 index f5159dd..0000000 Binary files a/html/landing/fonts/texgyreheroscn-italic.otf and /dev/null differ diff --git a/html/landing/fonts/texgyreheroscn-regular.otf b/html/landing/fonts/texgyreheroscn-regular.otf deleted file mode 100644 index 5630217..0000000 Binary files a/html/landing/fonts/texgyreheroscn-regular.otf and /dev/null differ diff --git a/html/landing/img/flower.svg b/html/landing/img/flower.svg deleted file mode 100644 index 869788e..0000000 --- a/html/landing/img/flower.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/html/robots.txt b/html/robots.txt deleted file mode 100644 index c2a49f4..0000000 --- a/html/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Allow: / diff --git a/src/._layout.pug.swp b/src/._layout.pug.swp new file mode 100644 index 0000000..be34817 Binary files /dev/null and b/src/._layout.pug.swp differ diff --git a/src/.documentation.pug.swp b/src/.documentation.pug.swp new file mode 100644 index 0000000..c3ff08b Binary files /dev/null and b/src/.documentation.pug.swp differ diff --git a/src/_layout.pug b/src/_layout.pug new file mode 100644 index 0000000..37d269a --- /dev/null +++ b/src/_layout.pug @@ -0,0 +1,23 @@ +block root + doctype html + head + meta(charset='utf-8') + title 💮💮 deuxfleurs - #{title} + link(rel="stylesheet", href="css/main.css") + header + .container + .menu-item + a(href='index.html') + strong deuxfleurs  + img(src='img/flower.svg' width='38') + img(src='img/flower.svg' width='38') + .menu-item + a(href='https://guichet.deuxfleurs.fr') compte + span  |  + .menu-item + a(href='documentation.html') doc + span  |  + h1 #{title} + main + block content + diff --git a/src/documentation.pug b/src/documentation.pug new file mode 100644 index 0000000..a9a70f0 --- /dev/null +++ b/src/documentation.pug @@ -0,0 +1,9 @@ +extends _layout.pug + +prepend root + - title = "documentation" + +block content + .container.spacing + h2 Bientôt... + diff --git a/src/index.pug b/src/index.pug new file mode 100644 index 0000000..b2fb145 --- /dev/null +++ b/src/index.pug @@ -0,0 +1,49 @@ +extends _layout.pug + +prepend root + - title = "deuxfleurs" + +block content + .container.spacing + .chapeau ⇨ protège votre vie privée + .chapeau ⇨ défend vos libertés et vos droits + .chapeau ⇨ ne vous manipule pas + .chapeau ⇨ promeut la sobriété numérique pour protéger la planète + + section.spacing + h2 nos services permettent de + .list + a.service-box.spacing(href='https://riot.deuxfleurs.fr') + div(style='font-size: 80px') 💬 + h3 discuter + a.service-box.spacing(href='https://cloud.deuxfleurs.fr') + div(style='font-size: 80px') 🔒 + h3 sauvegarder vos documents + a.service-box.spacing(href='https://sogo.deuxfleurs.fr') + div(style='font-size: 80px') 📨 + h3 envoyer des emails + a.service-box.spacing(href='https://p.adnab.me') + div(style='font-size: 80px') 📄 + h3 collaborer + a.service-box.spacing(href='documentation.html#site') + div(style='font-size: 80px') 🌐 + h3 créer votre site + a.service-box.spacing(href='https://git.deuxfleurs.fr') + div(style='font-size: 80px') 💻 + h3 coder + br + + section.spacing + h2 internet est politique + :markdown-it(linkify) + L'IETF, l'organisme en charge de la standardisation d'internet, reconnait que les choix technologiques ont un impact sur les droits de l'homme [[RFC8280]](https://trac.tools.ietf.org/html/rfc8280). + + section.spacing + h2 nous sommes une association collégiale + section.spacing + h2 nous rejoindre + p + | Si vous connaissez un membre de l'association, contactez le directement. + br + | Sinon, vous pouvez nous écrire à coucoudeuxfleurs.fr. + diff --git a/static/css/.main.css.swp b/static/css/.main.css.swp new file mode 100644 index 0000000..c7a3738 Binary files /dev/null and b/static/css/.main.css.swp differ diff --git a/static/css/main.css b/static/css/main.css new file mode 100644 index 0000000..37666f7 --- /dev/null +++ b/static/css/main.css @@ -0,0 +1,78 @@ +@font-face { + font-family: "Heroes"; + src: url('../fonts/texgyreheros-regular.otf') format('truetype'); +} +* { + font-family: Heroes; + margin: 0; + padding: 0; +} + +header { + background-color: #519c60; + color: #ffffff; + padding: 30px 0px 1px 0px; +} + +h1 { + font-size: 5em; +} + +h2 { + font-size: 3em; +} + +p { + font-size: 1.2em; +} + +.spacing { + margin-top: 1em; +} + +header > .container > h1 { + margin: 10px 0px -27px 0px; +} + +header > .container > .menu-item { + float: right; +} + +header > .container > .menu-item > img { + vertical-align: -9px; +} + +header > .container > .menu-item > a,span { + font-size: 30px; + color: white; + text-decoration: none; +} + +.container { + padding: 0px 40px 0px 40px; +} + +.chapeau { + font-size: 1.8em; + font-weight: bold; + line-height: 1.2; +} + +.service-box { + color: #000; + text-decoration: none; + border: 0.2em solid #000; + width: 250px; + text-align:center; + margin-right: 1em; + float: left; +} + +.service-box:hover { + background-color: #000; + color: #fff; +} + +.list > br { + clear: both; +} diff --git a/static/fonts/texgyreheros-bold.otf b/static/fonts/texgyreheros-bold.otf new file mode 100644 index 0000000..2f23b92 Binary files /dev/null and b/static/fonts/texgyreheros-bold.otf differ diff --git a/static/fonts/texgyreheros-bolditalic.otf b/static/fonts/texgyreheros-bolditalic.otf new file mode 100644 index 0000000..556b8e1 Binary files /dev/null and b/static/fonts/texgyreheros-bolditalic.otf differ diff --git a/static/fonts/texgyreheros-italic.otf b/static/fonts/texgyreheros-italic.otf new file mode 100644 index 0000000..ae50725 Binary files /dev/null and b/static/fonts/texgyreheros-italic.otf differ diff --git a/static/fonts/texgyreheros-regular.otf b/static/fonts/texgyreheros-regular.otf new file mode 100644 index 0000000..ac6c32f Binary files /dev/null and b/static/fonts/texgyreheros-regular.otf differ diff --git a/static/fonts/texgyreheroscn-bold.otf b/static/fonts/texgyreheroscn-bold.otf new file mode 100644 index 0000000..dc5f63a Binary files /dev/null and b/static/fonts/texgyreheroscn-bold.otf differ diff --git a/static/fonts/texgyreheroscn-bolditalic.otf b/static/fonts/texgyreheroscn-bolditalic.otf new file mode 100644 index 0000000..2b46b47 Binary files /dev/null and b/static/fonts/texgyreheroscn-bolditalic.otf differ diff --git a/static/fonts/texgyreheroscn-italic.otf b/static/fonts/texgyreheroscn-italic.otf new file mode 100644 index 0000000..f5159dd Binary files /dev/null and b/static/fonts/texgyreheroscn-italic.otf differ diff --git a/static/fonts/texgyreheroscn-regular.otf b/static/fonts/texgyreheroscn-regular.otf new file mode 100644 index 0000000..5630217 Binary files /dev/null and b/static/fonts/texgyreheroscn-regular.otf differ diff --git a/static/img/arobase.png b/static/img/arobase.png new file mode 100644 index 0000000..d2a275a Binary files /dev/null and b/static/img/arobase.png differ diff --git a/static/img/flower.svg b/static/img/flower.svg new file mode 100644 index 0000000..869788e --- /dev/null +++ b/static/img/flower.svg @@ -0,0 +1 @@ + diff --git a/static/robots.txt b/static/robots.txt new file mode 100644 index 0000000..c2a49f4 --- /dev/null +++ b/static/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Allow: / -- cgit v1.2.3