aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-03-01 22:17:44 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-03-01 22:17:44 +0100
commit6178c73f98cf2f3ffbac94115a07af3ae62a0b01 (patch)
tree96ff1898a2493fdbaa39f1b641e2bc50fac7b079
parenta8e6e0952b6edcd1282f9f2221e0d4fbb463d0fe (diff)
downloadsite-6178c73f98cf2f3ffbac94115a07af3ae62a0b01.tar.gz
site-6178c73f98cf2f3ffbac94115a07af3ae62a0b01.zip
Migrate to pug
-rw-r--r--.gitignore1
-rwxr-xr-x.webpull1
-rw-r--r--Dockerfile3
-rw-r--r--README.md9
-rw-r--r--src/._layout.pug.swpbin0 -> 12288 bytes
-rw-r--r--src/.documentation.pug.swpbin0 -> 12288 bytes
-rw-r--r--src/_layout.pug23
-rw-r--r--src/documentation.pug9
-rw-r--r--src/index.pug49
-rw-r--r--static/css/.main.css.swpbin0 -> 12288 bytes
-rw-r--r--static/css/main.css78
-rw-r--r--static/fonts/texgyreheros-bold.otf (renamed from html/landing/fonts/texgyreheros-bold.otf)bin144464 -> 144464 bytes
-rw-r--r--static/fonts/texgyreheros-bolditalic.otf (renamed from html/landing/fonts/texgyreheros-bolditalic.otf)bin146012 -> 146012 bytes
-rw-r--r--static/fonts/texgyreheros-italic.otf (renamed from html/landing/fonts/texgyreheros-italic.otf)bin150164 -> 150164 bytes
-rw-r--r--static/fonts/texgyreheros-regular.otf (renamed from html/landing/fonts/texgyreheros-regular.otf)bin143912 -> 143912 bytes
-rw-r--r--static/fonts/texgyreheroscn-bold.otf (renamed from html/landing/fonts/texgyreheroscn-bold.otf)bin140124 -> 140124 bytes
-rw-r--r--static/fonts/texgyreheroscn-bolditalic.otf (renamed from html/landing/fonts/texgyreheroscn-bolditalic.otf)bin147024 -> 147024 bytes
-rw-r--r--static/fonts/texgyreheroscn-italic.otf (renamed from html/landing/fonts/texgyreheroscn-italic.otf)bin146948 -> 146948 bytes
-rw-r--r--static/fonts/texgyreheroscn-regular.otf (renamed from html/landing/fonts/texgyreheroscn-regular.otf)bin139992 -> 139992 bytes
-rw-r--r--static/img/arobase.png (renamed from html/landing/arobase.png)bin1326 -> 1326 bytes
-rw-r--r--static/img/flower.svg (renamed from html/landing/img/flower.svg)0
-rw-r--r--static/robots.txt (renamed from html/robots.txt)0
22 files changed, 169 insertions, 4 deletions
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 0000000..be34817
--- /dev/null
+++ b/src/._layout.pug.swp
Binary files differ
diff --git a/src/.documentation.pug.swp b/src/.documentation.pug.swp
new file mode 100644
index 0000000..c3ff08b
--- /dev/null
+++ b/src/.documentation.pug.swp
Binary files 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&nbsp;
+ img(src='img/flower.svg' width='38')
+ img(src='img/flower.svg' width='38')
+ .menu-item
+ a(href='https://guichet.deuxfleurs.fr') compte
+ span &nbsp;|&nbsp;
+ .menu-item
+ a(href='documentation.html') doc
+ span &nbsp;|&nbsp;
+ 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&eacute;giale
+ section.spacing
+ h2 nous rejoindre
+ p
+ | Si vous connaissez un membre de l'association, contactez le directement.
+ br
+ | Sinon, vous pouvez nous écrire à coucou<img src="img/arobase.png" height="15"/>deuxfleurs.fr.
+
diff --git a/static/css/.main.css.swp b/static/css/.main.css.swp
new file mode 100644
index 0000000..c7a3738
--- /dev/null
+++ b/static/css/.main.css.swp
Binary files 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/html/landing/fonts/texgyreheros-bold.otf b/static/fonts/texgyreheros-bold.otf
index 2f23b92..2f23b92 100644
--- a/html/landing/fonts/texgyreheros-bold.otf
+++ b/static/fonts/texgyreheros-bold.otf
Binary files differ
diff --git a/html/landing/fonts/texgyreheros-bolditalic.otf b/static/fonts/texgyreheros-bolditalic.otf
index 556b8e1..556b8e1 100644
--- a/html/landing/fonts/texgyreheros-bolditalic.otf
+++ b/static/fonts/texgyreheros-bolditalic.otf
Binary files differ
diff --git a/html/landing/fonts/texgyreheros-italic.otf b/static/fonts/texgyreheros-italic.otf
index ae50725..ae50725 100644
--- a/html/landing/fonts/texgyreheros-italic.otf
+++ b/static/fonts/texgyreheros-italic.otf
Binary files differ
diff --git a/html/landing/fonts/texgyreheros-regular.otf b/static/fonts/texgyreheros-regular.otf
index ac6c32f..ac6c32f 100644
--- a/html/landing/fonts/texgyreheros-regular.otf
+++ b/static/fonts/texgyreheros-regular.otf
Binary files differ
diff --git a/html/landing/fonts/texgyreheroscn-bold.otf b/static/fonts/texgyreheroscn-bold.otf
index dc5f63a..dc5f63a 100644
--- a/html/landing/fonts/texgyreheroscn-bold.otf
+++ b/static/fonts/texgyreheroscn-bold.otf
Binary files differ
diff --git a/html/landing/fonts/texgyreheroscn-bolditalic.otf b/static/fonts/texgyreheroscn-bolditalic.otf
index 2b46b47..2b46b47 100644
--- a/html/landing/fonts/texgyreheroscn-bolditalic.otf
+++ b/static/fonts/texgyreheroscn-bolditalic.otf
Binary files differ
diff --git a/html/landing/fonts/texgyreheroscn-italic.otf b/static/fonts/texgyreheroscn-italic.otf
index f5159dd..f5159dd 100644
--- a/html/landing/fonts/texgyreheroscn-italic.otf
+++ b/static/fonts/texgyreheroscn-italic.otf
Binary files differ
diff --git a/html/landing/fonts/texgyreheroscn-regular.otf b/static/fonts/texgyreheroscn-regular.otf
index 5630217..5630217 100644
--- a/html/landing/fonts/texgyreheroscn-regular.otf
+++ b/static/fonts/texgyreheroscn-regular.otf
Binary files differ
diff --git a/html/landing/arobase.png b/static/img/arobase.png
index d2a275a..d2a275a 100644
--- a/html/landing/arobase.png
+++ b/static/img/arobase.png
Binary files differ
diff --git a/html/landing/img/flower.svg b/static/img/flower.svg
index 869788e..869788e 100644
--- a/html/landing/img/flower.svg
+++ b/static/img/flower.svg
diff --git a/html/robots.txt b/static/robots.txt
index c2a49f4..c2a49f4 100644
--- a/html/robots.txt
+++ b/static/robots.txt