From 6178c73f98cf2f3ffbac94115a07af3ae62a0b01 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Sun, 1 Mar 2020 22:17:44 +0100 Subject: [PATCH] Migrate to pug --- .gitignore | 1 + .webpull | 1 + Dockerfile | 3 - README.md | 9 +- 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 ++++++++++++++++++ .../fonts/texgyreheros-bold.otf | Bin .../fonts/texgyreheros-bolditalic.otf | Bin .../fonts/texgyreheros-italic.otf | Bin .../fonts/texgyreheros-regular.otf | Bin .../fonts/texgyreheroscn-bold.otf | Bin .../fonts/texgyreheroscn-bolditalic.otf | Bin .../fonts/texgyreheroscn-italic.otf | Bin .../fonts/texgyreheroscn-regular.otf | Bin {html/landing => static/img}/arobase.png | Bin {html/landing => static}/img/flower.svg | 0 {html => static}/robots.txt | 0 22 files changed, 169 insertions(+), 4 deletions(-) create mode 100644 .gitignore delete mode 100644 Dockerfile 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 rename {html/landing => static}/fonts/texgyreheros-bold.otf (100%) rename {html/landing => static}/fonts/texgyreheros-bolditalic.otf (100%) rename {html/landing => static}/fonts/texgyreheros-italic.otf (100%) rename {html/landing => static}/fonts/texgyreheros-regular.otf (100%) rename {html/landing => static}/fonts/texgyreheroscn-bold.otf (100%) rename {html/landing => static}/fonts/texgyreheroscn-bolditalic.otf (100%) rename {html/landing => static}/fonts/texgyreheroscn-italic.otf (100%) rename {html/landing => static}/fonts/texgyreheroscn-regular.otf (100%) rename {html/landing => static/img}/arobase.png (100%) rename {html/landing => static}/img/flower.svg (100%) rename {html => static}/robots.txt (100%) 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/src/._layout.pug.swp b/src/._layout.pug.swp new file mode 100644 index 0000000000000000000000000000000000000000..be34817452fa56691033a0cf2821da006ff53547 GIT binary patch literal 12288 zcmeI2JCD>b5XZexq5}j41&zsx%bvt0_n=q-TLA?^bU=kb*~Gh!&Up||?rz1a;S*3% zAW_rs5omy~a2=wfLm(u2{?2BPhfXWDJZUWbZO7w`$G_QTl^L$xy>UzSgAIXpQiv-n z_wIi^+wJ^#F2uuH<&@^mGPfD6>PjUwX*GA>)7D{lt%&OkzHOMO?a-#ALR-b*0~1Y( znu4+(&-KGbCcp$1Bv8|+*IyEw8|!QC&1LVLJbmiUf=+ll6JP>NfC(@GCcp%k025#W zhnWDC9q|koIMQC?Ognb|8QVu5m;e)C0!)AjFaajO1egF5U;<2l2{3^}NFYjtxVa?6 zd&qtNpZ)*;c|wRU&}Zl)^a?Ui4BdvVLg%5Q(B5$&-as#*2)YhkgpNVq;P(@>2YrCt zIqx8DOn?b60Vco%m;e)C0!)AjFaaj85CMrMTsJgDyd~ozC)8DAC5uqF?F>@tb-DbA zQZnj^Xco}fGRoyjKD6cK$J1fz#@VB;uGDDYCvBB>L}`%+nlj_BN-PSuNy-2f+;tDN z+nH#d(fyBCO;p-TVK}bSSStz=Rqu`r3dn6Rs&GJDWF@KA{h@qv#?I5NeK zssg(`_T^5RkRJG(eSdX7poKOgeyWOmEPsbIMYHd2MkdV@wL2qnaHxSx1#+M&*tLq1 zW+J6Y^Q~^B%)qlWG0JMC$h#mL;$CcR=n@xT;!SVShG>mBXXY#ns^JhUl!))*D+t zX>Hj^SA|xUAL-V*t7gM!$EDRN?_EYppGT$fIx34aQq6SYjk7YZhON8dAp{^WnZOKf z#Ou9!&2qRT7UmBoTaIc7KmY;|fB*y_009Ua0(U)rBncBsF$OgUqET tqMqkM;+i$#jnA~$65+2a^daSi&b3vdaE>eW1+P%0IL?wwSNZV``)~ZgRX6|u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c7a373843f6d2e90d595b6eadf1aeec61edb1184 GIT binary patch literal 12288 zcmeI2J#5rS6vrokuHf?o4Txq)KndvV{Rn|%S3(p)90e3e$8lVQG;5F7R&0+MkCP3E zkAfN@5mM3}5+xFd5>a1qCrYG46f_{JyM_aV_}j4;1SBG5#9QgN-u0V#^X50>Vztw$ zpE`D&kK0X#*N==n+&y*n)y|QDf3GrjE|akd;ykkKEA(ZirJEUFF5B)>nXopgoGe1_ zwC2j0S{fKxON}srQ*+X^7KtFX@nP9q6eI&=UfDDiU zGC&5%02v?yWMCB<5H4f4*E9BJ1B%E0|JCpR|F$sp1T27ga2?En5S#^5;CFBmjDaEW z16T*vg7=#ldj(#C7vMQ~4E_dxfj_|ma39ab1QTEn*aF^eWbA+N8oU5cz$5SnxCyR+X)p!OfZxC* z*avok9bh}y0N%l0;cyl10VyB`yyIN(jYdK}4UazBLD)mg@NUNiIEnm&ZegZF4!nAlO zJ(DMhgzg5hrGu`IyA2uTH;wEWON2o;ZaFv;EOmZ!HgJvK;?1#o(kq5m+Lb7!ZZ~Db zQxyg-A1Vef6S&e*8b^p#+~To{W!`DYBCGj@K`bp_mgU&ZypyM5W6hTLIx2MAyt_|30G#)?RP zy#Dg#mW!opRHc60NO%sGeiX(U6V3rV4W-%AK|e1d)dPS%(qCFnL_s*$;y+8RWZGu? zP-_0@rP^unOot=Gwq48Tn%1yqx^r6kXqj4CcC%1uTN!V7FE*`?gc%t&I+JEDk;8kx T7+`R5guymDT&VMeBQe$o67!Kt literal 0 HcmV?d00001 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/html/landing/fonts/texgyreheros-bold.otf b/static/fonts/texgyreheros-bold.otf similarity index 100% rename from html/landing/fonts/texgyreheros-bold.otf rename to static/fonts/texgyreheros-bold.otf diff --git a/html/landing/fonts/texgyreheros-bolditalic.otf b/static/fonts/texgyreheros-bolditalic.otf similarity index 100% rename from html/landing/fonts/texgyreheros-bolditalic.otf rename to static/fonts/texgyreheros-bolditalic.otf diff --git a/html/landing/fonts/texgyreheros-italic.otf b/static/fonts/texgyreheros-italic.otf similarity index 100% rename from html/landing/fonts/texgyreheros-italic.otf rename to static/fonts/texgyreheros-italic.otf diff --git a/html/landing/fonts/texgyreheros-regular.otf b/static/fonts/texgyreheros-regular.otf similarity index 100% rename from html/landing/fonts/texgyreheros-regular.otf rename to static/fonts/texgyreheros-regular.otf diff --git a/html/landing/fonts/texgyreheroscn-bold.otf b/static/fonts/texgyreheroscn-bold.otf similarity index 100% rename from html/landing/fonts/texgyreheroscn-bold.otf rename to static/fonts/texgyreheroscn-bold.otf diff --git a/html/landing/fonts/texgyreheroscn-bolditalic.otf b/static/fonts/texgyreheroscn-bolditalic.otf similarity index 100% rename from html/landing/fonts/texgyreheroscn-bolditalic.otf rename to static/fonts/texgyreheroscn-bolditalic.otf diff --git a/html/landing/fonts/texgyreheroscn-italic.otf b/static/fonts/texgyreheroscn-italic.otf similarity index 100% rename from html/landing/fonts/texgyreheroscn-italic.otf rename to static/fonts/texgyreheroscn-italic.otf diff --git a/html/landing/fonts/texgyreheroscn-regular.otf b/static/fonts/texgyreheroscn-regular.otf similarity index 100% rename from html/landing/fonts/texgyreheroscn-regular.otf rename to static/fonts/texgyreheroscn-regular.otf diff --git a/html/landing/arobase.png b/static/img/arobase.png similarity index 100% rename from html/landing/arobase.png rename to static/img/arobase.png diff --git a/html/landing/img/flower.svg b/static/img/flower.svg similarity index 100% rename from html/landing/img/flower.svg rename to static/img/flower.svg diff --git a/html/robots.txt b/static/robots.txt similarity index 100% rename from html/robots.txt rename to static/robots.txt