diff --git a/settings.yaml b/settings.yaml index eb637ee..dddbb1a 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1,3 +1,4 @@ +copyright_start: 2021 guilds: # Tegaki Tuesday - id: 814700630958276649 diff --git a/src/models/settings.rs b/src/models/settings.rs index a331404..0e3e36d 100644 --- a/src/models/settings.rs +++ b/src/models/settings.rs @@ -6,6 +6,7 @@ use std::fs; #[derive(Serialize, Deserialize)] pub struct Settings { pub guilds: Vec, + pub copyright_start: u32, } impl Settings { diff --git a/styles/sass/style.scss b/styles/sass/style.scss index a1be5d2..2bf823d 100644 --- a/styles/sass/style.scss +++ b/styles/sass/style.scss @@ -43,11 +43,19 @@ input[type=number] { #content { width: 100%; height: 100%; - display: flex; - flex-direction: column; + + display: grid; + grid-template-areas: + "nav nav" + "challenge submissions"; + grid-template-columns: 30em auto; + grid-template-rows: min-content auto; + overflow: hidden; nav { + grid-area: nav; + --bg: #{$fg}; --fg: #{$bg}; background: var(--bg); @@ -98,17 +106,21 @@ input[type=number] { } } - & > div:first-of-type { + & > div { + overflow: scroll; display: flex; - height: 100%; - & > :first-child { - min-width: 40em; - padding: 1em; - } - & > * { - overflow: scroll; + flex-direction: column; + gap: 1em; + + footer { + margin-top: auto; + text-align: center; } } + + #challenge { + padding: 1em; + } } * { @@ -116,17 +128,17 @@ input[type=number] { } #submissions { - display: flex; - flex-direction: column; - height: calc(100% - 2em); + grid-area: submissions; + background: rgba(0, 0, 0, 0.125); - $gap: 0.5em; - padding: $gap; + padding: 1em; + & > div { width: 100%; column-count: 3; margin: 0; + $gap: 0.5em; gap: $gap; & > figure { diff --git a/templates/copyright-years.html.tera b/templates/copyright-years.html.tera new file mode 100644 index 0000000..abc881b --- /dev/null +++ b/templates/copyright-years.html.tera @@ -0,0 +1 @@ +© {% set year = now() | date(format="%Y") | int %}{{ settings.copyright_start }}{% if year != settings.copyright_start %}–{{ year }}{% endif %} \ No newline at end of file diff --git a/templates/index.html.tera b/templates/index.html.tera index 7272dd5..3837301 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -64,7 +64,7 @@ -
+

Welcome to Tegaki Tuesday #{{ challenge }}!

{% if content.japanese %} @@ -118,38 +118,41 @@

This challenge was suggested by {{ content.suggester }} using the -h suggest command.

{%- endif -%}
-
- -
- {% for submission in submissions %} - {% set author = users[submission.author_id] %} -
- {{ author.username }}'s submission -
{% if not author.deleted %}{% endif %}{{ author.username }}{% if author.deleted %} (deleted account){% else %}{% endif %}
-
- {% endfor %} -
-
- some random shit goes here -
-
+
+ Copyright {% include "copyright-years" %} Tegaki Tuesday. All rights reserved. 字ちゃん mascot art by @bellumela. +
+
+
+ +
+ {% for submission in submissions %} + {% set author = users[submission.author_id] %} +
+ {{ author.username }}'s submission +
{% if not author.deleted %}{% endif %}{{ author.username }}{% if author.deleted %} (deleted account){% else %}{% endif %}
+
+ {% endfor %} +
+