From 28eb6cedb3cb7e91eef67489df12c8c55fe7f1db Mon Sep 17 00:00:00 2001 From: magentix Date: Mon, 8 Nov 2021 11:37:18 +0100 Subject: [PATCH] StaPy 1.6 compatibility --- source/{web => assets}/css/style.css | 3 +- source/{web => assets}/favicon.ico | Bin source/{web => assets}/media/wave.jpg | Bin source/{web => assets}/robots.txt | 0 source/json/404.html.json | 4 +- source/json/about.html.json | 4 +- source/json/article.html.json | 5 --- source/json/articles.html.json | 7 ++-- source/json/blog/article-1.html.json | 9 +++++ source/json/blog/article-2.html.json | 9 +++++ source/json/blog/article-3.html.json | 9 +++++ .../json/{default.json => default/html.json} | 0 source/json/index.html.json | 4 +- source/page/articles.html | 36 ++---------------- source/page/{ => blog}/article.html | 10 ++--- source/template/block/article.html | 9 +++++ source/template/block/head.html | 4 +- 17 files changed, 58 insertions(+), 55 deletions(-) rename source/{web => assets}/css/style.css (98%) rename source/{web => assets}/favicon.ico (100%) rename source/{web => assets}/media/wave.jpg (100%) rename source/{web => assets}/robots.txt (100%) delete mode 100644 source/json/article.html.json create mode 100644 source/json/blog/article-1.html.json create mode 100644 source/json/blog/article-2.html.json create mode 100644 source/json/blog/article-3.html.json rename source/json/{default.json => default/html.json} (100%) rename source/page/{ => blog}/article.html (77%) create mode 100644 source/template/block/article.html diff --git a/source/web/css/style.css b/source/assets/css/style.css similarity index 98% rename from source/web/css/style.css rename to source/assets/css/style.css index 4920508..e4ed760 100644 --- a/source/web/css/style.css +++ b/source/assets/css/style.css @@ -39,7 +39,7 @@ h2, h3, h4 { } h2 { - font-size: 1.85rem; + font-size: 1.75rem; } h3 { @@ -108,6 +108,7 @@ blockquote { img { max-width: 100%; + height: 100%; margin: 1.5rem auto; display: block; } diff --git a/source/web/favicon.ico b/source/assets/favicon.ico similarity index 100% rename from source/web/favicon.ico rename to source/assets/favicon.ico diff --git a/source/web/media/wave.jpg b/source/assets/media/wave.jpg similarity index 100% rename from source/web/media/wave.jpg rename to source/assets/media/wave.jpg diff --git a/source/web/robots.txt b/source/assets/robots.txt similarity index 100% rename from source/web/robots.txt rename to source/assets/robots.txt diff --git a/source/json/404.html.json b/source/json/404.html.json index 51135fb..128d04c 100644 --- a/source/json/404.html.json +++ b/source/json/404.html.json @@ -1,6 +1,6 @@ { - "title": "Page not found", - "description": "The requested URL was not found on this server", + "meta_title": "Page not found", + "meta_description": "The requested URL was not found on this server", "content": "page/404.html", "robots": "noindex,nofollow" } \ No newline at end of file diff --git a/source/json/about.html.json b/source/json/about.html.json index c66463c..712b0ac 100644 --- a/source/json/about.html.json +++ b/source/json/about.html.json @@ -1,5 +1,5 @@ { - "title": "Dusk - About", - "description": "A simple and minimal theme made with StaPy", + "meta_title": "Dusk - About", + "meta_description": "A simple and minimal theme made with StaPy", "content": "page/about.html" } \ No newline at end of file diff --git a/source/json/article.html.json b/source/json/article.html.json deleted file mode 100644 index be98b37..0000000 --- a/source/json/article.html.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "Dusk - Article", - "description": "A simple and minimal theme made with StaPy", - "content": "page/article.html" -} \ No newline at end of file diff --git a/source/json/articles.html.json b/source/json/articles.html.json index 709b199..ba2b2f2 100644 --- a/source/json/articles.html.json +++ b/source/json/articles.html.json @@ -1,5 +1,6 @@ { - "title": "Dusk - Articles", - "description": "A simple and minimal theme made with StaPy", - "content": "page/articles.html" + "meta_title": "Dusk - Articles", + "meta_description": "A simple and minimal theme made with StaPy", + "content": "page/articles.html", + "article": "template/block/article.html" } \ No newline at end of file diff --git a/source/json/blog/article-1.html.json b/source/json/blog/article-1.html.json new file mode 100644 index 0000000..be9a33b --- /dev/null +++ b/source/json/blog/article-1.html.json @@ -0,0 +1,9 @@ +{ + "meta_title": "Arctic - Article", + "meta_description": "A simple and minimal theme for StaPy", + "title": "At asperiores dolores hic molestias", + "date": "2021-04-06", + "author": "Magentix", + "intro": "Quo magnam mollitia ea odit amet. Eos iste itaque sed consequatur dolor ut saepe omnis sed maiores excepturi in voluptatem nihil.", + "content": "page/blog/article.html" +} \ No newline at end of file diff --git a/source/json/blog/article-2.html.json b/source/json/blog/article-2.html.json new file mode 100644 index 0000000..0a28742 --- /dev/null +++ b/source/json/blog/article-2.html.json @@ -0,0 +1,9 @@ +{ + "meta_title": "Arctic - Article", + "meta_description": "A simple and minimal theme for StaPy", + "title": "Qui voluptates consequatur eos reprehenderit", + "date": "2021-04-02", + "author": "Magentix", + "intro": "Dolore qui aliquam eius aut voluptatem dolor. Eos molestias molestiae et quibusdam amet quo pariatur deleniti aut nostrum iure eos explicabo voluptate.", + "content": "page/blog/article.html" +} \ No newline at end of file diff --git a/source/json/blog/article-3.html.json b/source/json/blog/article-3.html.json new file mode 100644 index 0000000..835c7fb --- /dev/null +++ b/source/json/blog/article-3.html.json @@ -0,0 +1,9 @@ +{ + "meta_title": "Arctic - Article", + "meta_description": "A simple and minimal theme for StaPy", + "title": "Lorem ipsum dolor sit amet", + "date": "2021-03-26", + "author": "Magentix", + "intro": "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.", + "content": "page/blog/article.html" +} \ No newline at end of file diff --git a/source/json/default.json b/source/json/default/html.json similarity index 100% rename from source/json/default.json rename to source/json/default/html.json diff --git a/source/json/index.html.json b/source/json/index.html.json index fa6cd7e..d91631f 100644 --- a/source/json/index.html.json +++ b/source/json/index.html.json @@ -1,5 +1,5 @@ { - "title": "Dusk - Home", - "description": "A simple and minimal theme for StaPy", + "meta_title": "Dusk - Home", + "meta_description": "A simple and minimal theme for StaPy", "content": "page/index.html" } \ No newline at end of file diff --git a/source/page/articles.html b/source/page/articles.html index bcac3ca..6172e67 100644 --- a/source/page/articles.html +++ b/source/page/articles.html @@ -1,37 +1,7 @@

Articles

-
-

- At asperiores dolores hic molestias -

-

- 2021-04-06 by Magentix -

-

- Quo magnam mollitia ea odit amet. Eos iste itaque sed consequatur dolor ut saepe omnis sed maiores excepturi in voluptatem nihil. -

-
+{% article + blog/article-1.html %} -
-

- Qui voluptates consequatur eos reprehenderit -

-

- 2021-04-02 by Magentix -

-

- Dolore qui aliquam eius aut voluptatem dolor. Eos molestias molestiae et quibusdam amet quo pariatur deleniti aut nostrum iure eos explicabo voluptate. -

-
+{% article + blog/article-2.html %} -
-

- Lorem ipsum dolor sit amet -

-

- 2021-03-26 by Magentix -

-

- Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. -

-
\ No newline at end of file +{% article + blog/article-3.html %} \ No newline at end of file diff --git a/source/page/article.html b/source/page/blog/article.html similarity index 77% rename from source/page/article.html rename to source/page/blog/article.html index e052ee1..b59d691 100644 --- a/source/page/article.html +++ b/source/page/blog/article.html @@ -1,19 +1,19 @@

- Articles : At asperiores dolores hic molestias + Articles : {{ title }}

-

At asperiores dolores hic molestias

+

{{ title }}

- 2021-04-06 by Magentix + {{ date }} by {{ author }}

- Quo magnam mollitia ea odit amet. Eos iste itaque sed consequatur dolor ut saepe omnis sed maiores excepturi in voluptatem nihil. + {{ intro }}

-Wave +Wave

Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. diff --git a/source/template/block/article.html b/source/template/block/article.html new file mode 100644 index 0000000..2838692 --- /dev/null +++ b/source/template/block/article.html @@ -0,0 +1,9 @@ +

+

{{ $title }}

+

+ {{ $date }} by {{ $author }} +

+

+ {{ $intro }} +

+
\ No newline at end of file diff --git a/source/template/block/head.html b/source/template/block/head.html index 6519f58..5e3e80b 100644 --- a/source/template/block/head.html +++ b/source/template/block/head.html @@ -1,6 +1,6 @@ -{{ title }} - +{{ meta_title }} + \ No newline at end of file -- 2.45.2