diff --git a/app.py b/app.py index 200478f..85141c0 100644 --- a/app.py +++ b/app.py @@ -55,17 +55,17 @@ def home(): return render_template('home.html' , page=page ) @app.route('//') -def pageStat(path): +def page_static(path): page = pages.get_or_404(path) - return render_template('home.html' , page=page ) + return render_template('page.html' , page=page ) -@app.route('/blog/') +@app.route('/vitrine/') def blog(): - articles = (p for p in pages if 'date' in p.meta and 'type' in p.meta and p.meta['type']=='blog') + articles = (p for p in pages if 'date' in p.meta and 'category' in p.meta and p.meta['category']=='vitrine') latest = sorted(articles, reverse=True,key=lambda p: p.meta['date']) - catList = Liste_cat() - return render_template('archive.html', articles=latest , catList=catList ) + # catList = Liste_cat() + return render_template('flux_No_img.html', articles=latest ) @app.route('/actu/') @@ -83,9 +83,9 @@ def actu(): }) latest = sorted(articles_gal, reverse=True, key=lambda p: p['article'].meta['date']) - catList = Liste_cat() + # catList = Liste_cat() print(articles_gal) - return render_template('archive.html', articles=latest , picto=pictoR ) + return render_template('flux_img.html', articles=latest , picto=pictoR ) @app.route('/images/') def image(filepath): @@ -98,11 +98,6 @@ def image(filepath): # Return a 404 error if the file is not found return 'File not found', 404 -#@app.route('/images/') -#def image(filepath): -# # Serve images from the correct folder -# return send_from_directory(app.config['FLATPAGES_ROOT'], filepath) -# if __name__ == '__main__': app.run(host='0.0.0.0') diff --git a/pages/actu/article2.md b/pages/actu/article2.md index 4e254bb..bd35215 100644 --- a/pages/actu/article2.md +++ b/pages/actu/article2.md @@ -17,3 +17,6 @@ Ici, pas de spectacles, de livres, ou d’actualité, on parle des vraies choses Et à la fin de chaque épisode, au moment où David fait un cadeau étrange à son invité, on a l’impression d’avoir fait partie de cette conversation, et on se dit que si on avait été dans la pièce on aurait sûrement eu des trucs à raconter. Small Talk est un podcast original Konbini sur une idée originale de David Castello-Lopes. + + + diff --git a/pages/blog/test01.md b/pages/blog/journal_donateur_01.md similarity index 62% rename from pages/blog/test01.md rename to pages/blog/journal_donateur_01.md index 4b7a2d1..23a1a70 100644 --- a/pages/blog/test01.md +++ b/pages/blog/journal_donateur_01.md @@ -1,16 +1,15 @@ -title: test2 +title: journal 01 date: 2020-11-04 author: marie -type: blog -category: life +type: journal +image: cover.jpg +category: vitrine # Comment s’inscrire, comment nous contacter ? L'inscription annuelle est de 10€, une rencontre avec les parents est organisée au moment de l’inscription. -
Notre adresse :
Rue Jean Massart 1, 1040 Etterbeek (Metro Thieffry) -
Téléphone : 0473/18.27.06 [asb_aile@hotmail.com](mailto:asb_aile@hotmail.com) diff --git a/pages/blog/journal_donateur_01/cover.jpg b/pages/blog/journal_donateur_01/cover.jpg new file mode 100644 index 0000000..d18d9bb Binary files /dev/null and b/pages/blog/journal_donateur_01/cover.jpg differ diff --git a/pages/blog/test01/tumblr_bf2e21a4e9ab509bdd33db950cc67a54_c8e5c0ef_1280.jpg b/pages/blog/journal_donateur_01/tumblr_bf2e21a4e9ab509bdd33db950cc67a54_c8e5c0ef_1280.jpg similarity index 100% rename from pages/blog/test01/tumblr_bf2e21a4e9ab509bdd33db950cc67a54_c8e5c0ef_1280.jpg rename to pages/blog/journal_donateur_01/tumblr_bf2e21a4e9ab509bdd33db950cc67a54_c8e5c0ef_1280.jpg diff --git a/pages/blog/test01/tumblr_ce161bba895492c13226e845dd41e864_17a08d91_1280.png b/pages/blog/journal_donateur_01/tumblr_ce161bba895492c13226e845dd41e864_17a08d91_1280.png similarity index 100% rename from pages/blog/test01/tumblr_ce161bba895492c13226e845dd41e864_17a08d91_1280.png rename to pages/blog/journal_donateur_01/tumblr_ce161bba895492c13226e845dd41e864_17a08d91_1280.png diff --git a/pages/blog/test01/tumblr_d89a2dad1a0a6fe7f0dcd89e8508d277_fc085122_1280.jpg b/pages/blog/journal_donateur_01/tumblr_d89a2dad1a0a6fe7f0dcd89e8508d277_fc085122_1280.jpg similarity index 100% rename from pages/blog/test01/tumblr_d89a2dad1a0a6fe7f0dcd89e8508d277_fc085122_1280.jpg rename to pages/blog/journal_donateur_01/tumblr_d89a2dad1a0a6fe7f0dcd89e8508d277_fc085122_1280.jpg diff --git a/pages/blog/test02.md b/pages/blog/test02.md new file mode 100644 index 0000000..bf7293f --- /dev/null +++ b/pages/blog/test02.md @@ -0,0 +1,17 @@ +title: journal 02 +date: 2020-11-04 +author: marie +type: journal +image: cover.jpg +category: vitrine + + + +# Comment s’inscrire, comment nous contacter ? + +L'inscription annuelle est de 10€, une rencontre avec les parents est organisée au moment de l’inscription. + +[asb_aile@hotmail.com](mailto:asb_aile@hotmail.com) + + + diff --git a/pages/blog/test02/cover.jpg b/pages/blog/test02/cover.jpg new file mode 100644 index 0000000..1a8ce10 Binary files /dev/null and b/pages/blog/test02/cover.jpg differ diff --git a/pages/contact.md b/pages/contact.md index aaad5a7..9bff61d 100644 --- a/pages/contact.md +++ b/pages/contact.md @@ -1,4 +1,4 @@ -title: contact +title: contact date: 2020-11-04 author: l'aile diff --git a/pages/home.md b/pages/home.md index 72a233e..d738191 100644 --- a/pages/home.md +++ b/pages/home.md @@ -1,4 +1,4 @@ -title: home +title: home date: 2020-11-04 author: l'aile diff --git a/pages/recherche.md b/pages/recherche.md new file mode 100644 index 0000000..eea23ee --- /dev/null +++ b/pages/recherche.md @@ -0,0 +1,72 @@ +title: Recherche +date: 2020-11-04 +author: l'aile + + + +[l'abecedaire](http:gngngng.com) + + + +1. "The Great Gatsby" + - by F. Scott Fitzgerald + - ISBN: 978-0743273565 + - Citation:La Petite École est un dispositif pédagogique et thérapeutique de pré-scolarisation unique en Fédération Wallonie Bruxelles, fondée par deux enseignantes en 2016. + La Petite École est un lieu de transition vers l’école pour des enfants de l’exil, jamais ou peu scolarisés. + Située dans une ancienne boutique des Marolles, elle offre un espace discret et accueillant. Elle propose une première expérience de l’école et de ses codes. + Ce dispositif, à la fois souple et structuré, permet aux enfants d’être disponibles aux apprentissages et de s’inscrire dans un projet scolaire. (Fitzgerald, 2004, p. 180) + - [Link to book](https://www.amazon.com/Great-Gatsby-F-Scott-Fitzgerald/dp/0743273567) + +2. "To Kill a Mockingbird" + - by Harper Lee + - ISBN: 978-0446310789 + - Citation: (Lee, 1960, p. 95) + - [Link to book](https://www.amazon.com/Kill-Mockingbird-Harper-Lee/dp/0446310786) + +3. "1984" + - by George Orwell + - ISBN: 978-0451524935 + - Citation: (Orwell, 1949, p. 245) + - [Link to book](https://www.amazon.com/1984-Signet-Classics-George-Orwell/dp/0451524934) + +4. "Pride and Prejudice" + - by Jane Austen + - ISBN: 978-0679783268 + - Citation: (Austen, 1813, p. 65) + - [Link to book](https://www.amazon.com/Pride-Prejudice-Penguin-Classics-Austen/dp/0679783261) + +5. "The Catcher in the Rye" + - by J.D. Salinger + - ISBN: 978-0316769488 + - Citation: (Salinger, 1951, p. 120) + - [Link to book](https://www.amazon.com/Catcher-Rye-J-D-Salinger/dp/0316769487) + +6. "The Lord of the Rings" + - by J.R.R. Tolkien + - ISBN: 978-0345339713 + - Citation: (Tolkien, 1954, p. 350) + - [Link to book](https://www.amazon.com/Lord-Rings-J-R-R-Tolkien/dp/0345339713) + +7. "Harry Potter and the Sorcerer's Stone" + - by J.K. Rowling + - ISBN: 978-0439554934 + - Citation: (Rowling, 1997, p. 185) + - [Link to book](https://www.amazon.com/Harry-Potter-Sorcerers-Stone-Rowling/dp/0439554934) + +8. "The Kite Runner" + - by Khaled Hosseini + - ISBN: 978-1594631931 + - Citation: (Hosseini, 2003, p. 275) + - [Link to book](https://www.amazon.com/Kite-Runner-Khaled-Hosseini/dp/1594631930) + +9. "The Hunger Games" + - by Suzanne Collins + - ISBN: 978-0439023481 + - Citation: (Collins, 2008, p. 150) + - [Link to book](https://www.amazon.com/Hunger-Games-Suzanne-Collins/dp/0439023483) + +10. "To the Lighthouse" + - by Virginia Woolf + - ISBN: 978-0156907392 + - Citation: (Woolf, 1927, p. 325) + - [Link to book](https://www.amazon.com/To-Lighthouse-Virginia-Woolf/dp/0156907390) diff --git a/static/css/style.css b/static/css/style.css index 9361f08..4f3f74b 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -52,9 +52,9 @@ table { /*edit variable here*/ :root{ - --menu_h: 70px; + --menu_h: 70px; --base_padding:20px; - --hover_color-menu: #fae5d4; + --hover_color-menu: #fae5d4; --menu-font-size : 3em; } @@ -68,6 +68,12 @@ body{ background-size:cover; } +h1{ + + font-family:'script12_btroman'; + + +} #homeSpacer{ height:calc(100vh - var(--menu_h)); @@ -113,7 +119,7 @@ nav{ } -.menu_active{ +#menu ul .menu_active{ height:calc(var(--menu_h)) !important; border: solid 3px var(--hover_color-menu)!important; } @@ -127,7 +133,7 @@ nav{ } -#menu ul li{ +#menu ul li { box-sizing: border-box; padding:calc(var(--base_padding)-6); height:0; @@ -151,10 +157,17 @@ nav{ display:inline-block; } -#menu ul li h3, #menu ul li span{ +#menu ul li h3 , #menu ul li span { display: inline; } +#menu ul li a{ + text-decoration: none; + color: #000; + display: block; + width:100%; +} + #menu ul li:hover{ background:var(--hover_color-menu); } @@ -212,7 +225,7 @@ nav{ position: absolute; width:150px; height:auto; - top:calc(var(--menu_h)*2); + top:calc(var(--menu_h)*3); left:var(--menu_h); z-index: -1; @@ -238,12 +251,10 @@ nav{ position: relative; } .wrapper h1{ - font-size: 6em; padding-bottom: 0.5em; font-family: 'script12_btroman'; } .wrapper p{ - font-size: 2em; } .content_wrapper{ @@ -255,20 +266,84 @@ nav{ article { margin-bottom: 40px; + font-size:10px; } -article .a_title{ + +article div .a_title { font-family:'script12_btroman'; - font-size: 5em; + font-size: 6rem; text-transform: capitalize; font-weight:bolder; } -article p{ - margin-top: 20px; - font-size: 1.5em; + +article div .a_meta { + font-family:'script12_btroman'; + font-size: 2rem; + text-transform: capitalize; + font-weight:bolder; +} + +article p { + margin-bottom: 20px; + font-size: 1.5rem; + line-height: 1.4em; +} +article h1 { + font-size: 2.5rem; + line-height: 1.4em; +} + +article strong{ + font-weight: bolder; +} + +article em{ + font-style: italic; +} + + +article ol li{ + margin-top: 0px; + font-size: 1.5rem; line-height: 1.4em; + +} + +article ol li p { + font-size: 1.5rem; + margin:0; + padding: 0; +} + +article ol li ul{ + margin-bottom:50px; +} + +article ol li ul li:first-child{ + font-size: 1.2rem; + margin-bottom:20px; +} + +article ol li ul li:last-of-type{ + font-size: 1.2rem; + margin-top:10px; } + + + +article ol li ul li{ + font-size: 0.8rem; +} + +article .vitrine img{ + display: block; + width: 50%; + margin:auto; +} + + .content_wrapper .separator{ width: 50%; height: 12px; diff --git a/static/js/script.js b/static/js/script.js index 9003eee..f0ecfce 100644 --- a/static/js/script.js +++ b/static/js/script.js @@ -2,16 +2,18 @@ $(document).ready(function(){ if ($('#homeSpacer')){ - $('#content').css({height:'0',overflow:'hidden'}); - $('#homeSpacer').click(function(){ - $(this).css('height','0'); + //$('#content').css({height:'0',overflow:'hidden'}); + console.log('/page'); + $(document).on('scroll click',function(){ + $("#homeSpacer").css('height','0'); $('#content').css({height:'auto',overflow:'auto'}); $('nav').css('z-index','1000'); $("body").css('overflow','auto'); - }); - } - function getRndInteger(min, max) { + }); + } + + function getRndInteger(min, max) { return Math.floor(Math.random() * (max - min + 1) ) + min; } var vw = $(window).width(); @@ -43,10 +45,7 @@ $(document).ready(function(){ $('#logo').css('top',topval ); }) - - actu_img_width = $('.img_container').width(); - console.log(actu_img_width); $('.img_container').css('height', actu_img_width); }) diff --git a/templates/flux_No_img.html b/templates/flux_No_img.html new file mode 100644 index 0000000..d82c7a9 --- /dev/null +++ b/templates/flux_No_img.html @@ -0,0 +1,39 @@ +{% extends 'base.html' %} + +{% block head %} + + +{% endblock %} + +{% block nav %} +{% include 'menu.html'%} +{% endblock nav %} + +{% block content %} + +
+
+ {% for a in articles %} +
+
+ {{a.title}}
+ + {{a.type}} + {% if a.image %} + + {% endif %} +
+
+ {{a}} +
+ +
+
+ +
+ +
+ + {% endfor %} + +{% endblock %} diff --git a/templates/archive.html b/templates/flux_img.html similarity index 92% rename from templates/archive.html rename to templates/flux_img.html index 362b59b..6b794f1 100644 --- a/templates/archive.html +++ b/templates/flux_img.html @@ -16,8 +16,8 @@ {% for a in articles %}
- {{a.article.title}}, - {{a.article.date}}, + {{a.article.title}}
+ {{a.article.date}}
{{a.article}} diff --git a/templates/home.html b/templates/home.html index ada93ff..9bf908d 100644 --- a/templates/home.html +++ b/templates/home.html @@ -8,6 +8,7 @@ {% if request.path == "/" %}
+{% else %} {% endif %} {% endblock %} @@ -22,12 +23,13 @@
- - {{page}} +
+ {{page}} +
-
+ -
+
{% endblock %} diff --git a/templates/menu.html b/templates/menu.html index 2b2e6fd..b3c2619 100644 --- a/templates/menu.html +++ b/templates/menu.html @@ -5,11 +5,11 @@
☓
diff --git a/templates/page.html b/templates/page.html index cec25f3..75b3a61 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,9 +1,6 @@ {% extends 'base.html' %} {% block head %} - - - {% endblock %} {% block nav %} @@ -12,12 +9,6 @@ {% block content %} - -haut de page ↑ - - - -
{{ page }}