diff --git a/app.py b/app.py index 6e7e759..f683af4 100644 --- a/app.py +++ b/app.py @@ -11,6 +11,8 @@ from flask import Flask app = Flask(__name__, static_folder=None, subdomain_matching=True) +app.jinja_env.add_extension('pypugjs.ext.jinja.PyPugJSExtension') + app.before_request(locale.before_request) app.context_processor(locale.inject_translations) diff --git a/blueprints/risdeveau/templates/88x31.htm b/blueprints/risdeveau/templates/88x31.htm deleted file mode 100644 index 6beebe3..0000000 --- a/blueprints/risdeveau/templates/88x31.htm +++ /dev/null @@ -1,16 +0,0 @@ -
-
- - - - - - -
-
- - - - -
-
\ No newline at end of file diff --git a/blueprints/risdeveau/templates/88x31.pug b/blueprints/risdeveau/templates/88x31.pug new file mode 100644 index 0000000..8546f3b --- /dev/null +++ b/blueprints/risdeveau/templates/88x31.pug @@ -0,0 +1,13 @@ +div + .88-31 + a.disabled(href="https://chest.lair.moe") + img(src="/static/img/88x31/gf.png") + + a#pie(href="https://preview.about.akarpov.ru") + img(src="/static/img/88x31/withpie.gif") + + .88-31 + a(href="https://g.lair.moe/Sweetbread/nixos-config") + img(src="/static/img/88x31/nixos.webp") + + img(src="/static/img/88x31/teto.webp") diff --git a/blueprints/risdeveau/templates/contacts.htm b/blueprints/risdeveau/templates/contacts.htm deleted file mode 100644 index edd6c37..0000000 --- a/blueprints/risdeveau/templates/contacts.htm +++ /dev/null @@ -1,48 +0,0 @@ -
-

Development

-
- - - Gitea - - - - GitHub - - - - KolibriOS Git - -
- -

Contacts

-
- - - Matrix - - - - Fediverse - - - - Discord - - - Mail - -
- -

Game accounts

-
- - - Steam - - - - GameBanana - -
-
\ No newline at end of file diff --git a/blueprints/risdeveau/templates/contacts.pug b/blueprints/risdeveau/templates/contacts.pug new file mode 100644 index 0000000..03e2d19 --- /dev/null +++ b/blueprints/risdeveau/templates/contacts.pug @@ -0,0 +1,41 @@ +.block + h3 Development + .blocks.badges + a.block(href="//g.lair.moe/Sweetbread") + img.icon(src="/static/icon/service/gitea.webp") + | Gitea + + a.block(href="https://github.com/VerySweetBread") + img.icon(src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png") + | GitHub + + a.block(href="https://git.kolibrios.org/Sweetbread") + img.icon(src="https://git.kolibrios.org/assets/img/logo.svg") + | KolibriOS Git + + h3 Contacts + .blocks.badges + a.block(href="https://matrix.to/#/@risdeveau:lair.moe") + img.icon(src="https://matrix.org/assets/favicon.ico") + | Matrix + + a.block(href="//b.lair.moe/@risdeveau") + img.icon(src="/static/icon/service/sharkey.webp") + | Fediverse + + a.block(href="https://discord.com/users/459823895256498186") + img.icon(src="https://cdn.prod.website-files.com/6257adef93867e50d84d30e2/66e3d80db9971f10a9757c99_Symbol.svg") + | Discord + + a.block(href="mailto:risdeveau@lair.moe") + | Mail + + h3 Game accounts + .blocks.badges + a.block(href="https://steamcommunity.com/id/risdeveau") + img.icon(src="https://store.steampowered.com/favicon.ico") + | Steam + + a.block(href="https://gamebanana.com/members/3899828") + img.icon(src="https://images.gamebanana.com/static/img/favicon/favicon.ico") + | GameBanana diff --git a/blueprints/risdeveau/templates/donate.htm b/blueprints/risdeveau/templates/donate.htm deleted file mode 100644 index 7e7b12b..0000000 --- a/blueprints/risdeveau/templates/donate.htm +++ /dev/null @@ -1,19 +0,0 @@ -
-

Wallets

-
-
-

POL, BNB

- -
- -
-

TON

- -
- -
-

XMR

- -
-
-
diff --git a/blueprints/risdeveau/templates/donate.pug b/blueprints/risdeveau/templates/donate.pug new file mode 100644 index 0000000..3306533 --- /dev/null +++ b/blueprints/risdeveau/templates/donate.pug @@ -0,0 +1,14 @@ +div + h3 Wallets + .blocks.qr + .block.qr + p POL, BNB + img(src="/static/img/wallets/evm.webp") + + .block.qr + p TON + img(src="/static/img/wallets/ton.webp") + + .block.qr + p XMR + img(src="/static/img/wallets/xmr.webp") diff --git a/blueprints/risdeveau/templates/index.html b/blueprints/risdeveau/templates/index.html index 61a3aae..25b88f2 100644 --- a/blueprints/risdeveau/templates/index.html +++ b/blueprints/risdeveau/templates/index.html @@ -50,7 +50,7 @@ 'donate', '88x31' ) %} - {% include 'risdeveau/templates/%s.htm' % m %} + {% include 'risdeveau/templates/%s.pub' % m %} {% endfor %} diff --git a/blueprints/risdeveau/templates/info.htm b/blueprints/risdeveau/templates/info.htm deleted file mode 100644 index dec2475..0000000 --- a/blueprints/risdeveau/templates/info.htm +++ /dev/null @@ -1,50 +0,0 @@ -
- - - - - - - - - - - - - -
DoB2005-01-13
Languages - - - - - - - - - - - - - - - - - - - - - -
RussianNative
EnglishB2
FrenchA1?
GermanA2?
JapaneseBeginner
-
Student - - - - - - - - - -
Programmer2.5/4yr.
Translator2.5/3yr.
-
-
diff --git a/blueprints/risdeveau/templates/info.pug b/blueprints/risdeveau/templates/info.pug new file mode 100644 index 0000000..a76b2f6 --- /dev/null +++ b/blueprints/risdeveau/templates/info.pug @@ -0,0 +1,35 @@ +.block + table + tr + th DoB + td 2005-01-13 + tr + th Languages + td + table + tr + td Russian + td Native + tr + td English + td B2 + tr + td French + td A1? + tr + td German + td A2? + tr + td Japanese + td Beginner + + tr + th Student + td + table + tr + td Programmer + td 2.5/4yr. + tr + td Translator + td 2.5/3yr. diff --git a/blueprints/root/__init__.py b/blueprints/root/__init__.py index 903dc7d..adf8495 100644 --- a/blueprints/root/__init__.py +++ b/blueprints/root/__init__.py @@ -21,8 +21,8 @@ def index(): @bp.route("/host") def host(): - return render_tmpl('host.html') + return render_tmpl('host.pug') @bp.route("/us") def us(): - return render_tmpl('us.html') + return render_tmpl('us.pug') diff --git a/blueprints/root/templates/host.html b/blueprints/root/templates/host.html deleted file mode 100644 index e845ce5..0000000 --- a/blueprints/root/templates/host.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends 'base.tmpl' %} - -{% block title %}{{ _('about host') }}{% endblock %} - -{% block content %} - - {{ _("host:hoster") }}: play2go -

{{ _('host:hoster_descr') }}

- - -
- {{ _("host:specifications") }}: - -
-{% endblock %} diff --git a/blueprints/root/templates/host.pug b/blueprints/root/templates/host.pug new file mode 100644 index 0000000..bbc757b --- /dev/null +++ b/blueprints/root/templates/host.pug @@ -0,0 +1,20 @@ +extends base.tmpl + +block title + = _('about host') + +block content + a.block(href="https://play2go.cloud/?ref_id=4baFoOIp5QE" target="_blank") + strong= _("host:hoster") + | : play2go + p= _('host:hoster_descr') + + .block + strong= _("host:specifications") + | : + ul + li CPU: Ryzen 9@3.4GHz (4 cores) + li RAM: 8 GB + li SSD: 150 GB + li ETH: 500Mb/s + li Loc: Deutschland, Frankfurt am Main diff --git a/blueprints/root/templates/us.html b/blueprints/root/templates/us.html deleted file mode 100644 index 7851093..0000000 --- a/blueprints/root/templates/us.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends 'base.tmpl' %} - -{% block title %}О нас{% endblock %} - -{% block content %} - -
- - Sweetbread -
- Главный админ, занимается почти всеми сервисами. Создал этот сайт - - -
-
- - Chest -
- Должна была помогать делать этот сайт -
-{% endblock %} \ No newline at end of file diff --git a/blueprints/root/templates/us.pug b/blueprints/root/templates/us.pug new file mode 100644 index 0000000..c2136b0 --- /dev/null +++ b/blueprints/root/templates/us.pug @@ -0,0 +1,17 @@ +extends base.tmpl + +block title + | О нас + +block content + a.block.green(href="{{ url_for('risdeveau.index') }}") + .header + img.icon(src="/static/icon/us/risdeveau.webp") + | Sweetbread + | Главный админ, занимается почти всеми сервисами. Создал этот сайт + + .block.orange.disabled + .header + img.icon(src="/static/icon/us/chest.webp") + | Chest + | Должна была помогать делать этот сайт diff --git a/requirements.txt b/requirements.txt index 75d13ee..94c9862 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,4 @@ requests APScheduler musicbrainzngs python-magic +pypugjs diff --git a/shell.nix b/shell.nix index c814697..03ed89b 100644 --- a/shell.nix +++ b/shell.nix @@ -9,7 +9,7 @@ pkgs.mkShell { python python-magic virtualenv - pkgs.nodePackages.sass + # pkgs.nodePackages.sass ]; shellHook = ''