From 75260fac0e30aa9d3dac14ad82da70c6472c94bc Mon Sep 17 00:00:00 2001 From: 0x01fe Date: Wed, 3 Apr 2024 16:32:27 -0500 Subject: [PATCH 1/7] started album squared thing --- app/app.py | 56 +++++++++++++++++- .../2029240f6d1128be89ddc32729463129 | Bin 0 -> 9 bytes .../aa43147407c8a8c678cd91f678f2a023 | Bin 0 -> 90 bytes app/data/comments.json | 8 +++ app/data/users.json | 5 ++ app/static/albumsquare.css | 31 ++++++++++ app/static/style.css | 38 ++++++++++++ app/templates/album_square.html | 20 +++++++ app/templates/music.html | 12 ++++ 9 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 app/data/.flask_session/2029240f6d1128be89ddc32729463129 create mode 100644 app/data/.flask_session/aa43147407c8a8c678cd91f678f2a023 create mode 100644 app/data/comments.json create mode 100644 app/data/users.json create mode 100644 app/static/albumsquare.css create mode 100644 app/templates/album_square.html diff --git a/app/app.py b/app/app.py index 3492a78..d3f6ba5 100644 --- a/app/app.py +++ b/app/app.py @@ -2,6 +2,7 @@ import glob import configparser import random +import requests import flask import waitress import markdown @@ -19,6 +20,9 @@ STATUS_FILE = config['STATUS']['STATUS_FILE'] PORT = int(config['NETWORK']['PORT']) DEV = int(config['NETWORK']['DEV']) +MUSIC_API_TOKEN = config['AUTH']['MUSIC_API_TOKEN'] +MUSIC_API_URL = config['NETWORK']['MUSIC_API_URL'] + def get_posts(category_filter : str | None = None) -> list[Post]: post_files = glob.glob(f'{POSTS_FOLDER}/*') try: @@ -105,7 +109,25 @@ def music(): # Get status status = get_status() - return flask.render_template('music.html', posts=post_bodies, status=status) + # Get top albums + r = requests.get( + MUSIC_API_URL +'/top/albums', + headers={ + 'token' : MUSIC_API_TOKEN, + 'user' : '1', + 'limit' : '9' + }) + + top_albums = r.json()['top'] + for album_index in range(0, len(top_albums)): + album = top_albums[album_index] + + time = int(album['listen_time']) + hours = round(time/1000/60/60, 1) + + top_albums[album_index]['listen_time'] = hours + + return flask.render_template('music.html', posts=post_bodies, status=status, top_albums=top_albums) # Motion Pictures Page @app.route('/motion-pictures/') @@ -148,6 +170,38 @@ def about(): return flask.render_template('about.html', status=status) +# MISC + +@app.route('/albumsquare//') +def album_square(user_id, rows : int): + + limit = rows ** 2 + + res = 100/(rows+2) + + # Get top albums + r = requests.get( + MUSIC_API_URL +'/top/albums', + headers={ + 'token' : MUSIC_API_TOKEN, + 'user' : user_id, + 'limit' : str(limit) + }) + + top_albums = r.json()['top'] + for album_index in range(0, len(top_albums)): + album = top_albums[album_index] + + time = int(album['listen_time']) + hours = round(time/1000/60/60, 1) + + top_albums[album_index]['listen_time'] = hours + + + return flask.render_template('album_square.html', top_albums=top_albums, limit=rows, res=res) + + + if __name__ == "__main__": if DEV: app.run(port=PORT) diff --git a/app/data/.flask_session/2029240f6d1128be89ddc32729463129 b/app/data/.flask_session/2029240f6d1128be89ddc32729463129 new file mode 100644 index 0000000000000000000000000000000000000000..7f5741f13017ee705ea34021d222a06a6ee2a6c9 GIT binary patch literal 9 QcmZQzU|?uq^=8ro00XcA0RR91 literal 0 HcmV?d00001 diff --git a/app/data/.flask_session/aa43147407c8a8c678cd91f678f2a023 b/app/data/.flask_session/aa43147407c8a8c678cd91f678f2a023 new file mode 100644 index 0000000000000000000000000000000000000000..d818306312c02b6939f76f09975e7cd3b355c42e GIT binary patch literal 90 zcmeB))lF+)o$Ad10ku;!dbr{XQj2mE^HTFlrgZdhB^MW^#h2t~r{+!R(J-_yH#Sa5 oH8xK%HZ!wKO-(j2Ha1VQ1o9116D`cmEmPBs%u|z-r +
+ + + Album Square +
+ +
+ {% for album in top_albums %} + + + + {% if loop.index % limit == 0 %} +
+ {% endif %} + {% endfor %} +
+ + diff --git a/app/templates/music.html b/app/templates/music.html index 9a00a11..5e35363 100644 --- a/app/templates/music.html +++ b/app/templates/music.html @@ -28,6 +28,18 @@
{{ post|safe }}
{% endfor %} + +
+

Top Albums

+ {% for album in top_albums %} + + + + {% if loop.index % 3 == 0 %} +
+ {% endif %} + {% endfor %} +
From 6a065df685c291d1729fb8eb0ec3b6364527fbde Mon Sep 17 00:00:00 2001 From: 0x01fe Date: Thu, 4 Apr 2024 14:25:04 -0500 Subject: [PATCH 2/7] kind of fixed the sizing for the album covers --- app/app.py | 2 +- app/static/albumsquare.css | 12 ------------ app/templates/album_square.html | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/app.py b/app/app.py index d3f6ba5..a28e1e1 100644 --- a/app/app.py +++ b/app/app.py @@ -177,7 +177,7 @@ def album_square(user_id, rows : int): limit = rows ** 2 - res = 100/(rows+2) + res = (1080/(rows))-rows # Get top albums r = requests.get( diff --git a/app/static/albumsquare.css b/app/static/albumsquare.css index 0f1cb6c..1044b3d 100644 --- a/app/static/albumsquare.css +++ b/app/static/albumsquare.css @@ -1,23 +1,11 @@ .albums { height: 100%; - height: fit-content; - align-self: flex-start; - border-style: var(--borders-style); - border-radius: var(--border-radius); - border-color: #1E2022; - background-color: var(--main-background); - - /* Text Settings - font-weight: bold; - line-height: 30pt; */ line-height: 0; font-size: 0; } .albums img { - height: 100px; - width: 100px; padding: 0 0; margin: 0 0; border: 0 0; diff --git a/app/templates/album_square.html b/app/templates/album_square.html index dfd49b7..ca6d024 100644 --- a/app/templates/album_square.html +++ b/app/templates/album_square.html @@ -9,7 +9,7 @@
{% for album in top_albums %} - + {% if loop.index % limit == 0 %}
From 9ebf599a07a07ca7a8f61258bcaff7f712d1205e Mon Sep 17 00:00:00 2001 From: 0x01fe Date: Thu, 4 Apr 2024 15:48:29 -0500 Subject: [PATCH 3/7] css changes --- app/static/style.css | 22 +++++++++++++++------- app/templates/music.html | 18 ++++++++++-------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/static/style.css b/app/static/style.css index ace95c1..610c56e 100644 --- a/app/static/style.css +++ b/app/static/style.css @@ -192,11 +192,10 @@ a:hover { /* Text Settings font-weight: bold; line-height: 30pt; */ - line-height: 0; - font-size: 0; } -.albums img { + +.real-albums img { height: 100px; width: 100px; padding: 0 0; @@ -204,9 +203,18 @@ a:hover { border: 0 0; } -.albums h1 { - font-size: normal; - text-align: center; - padding: 0.5em 0; +.real-albums { + line-height: 0; + font-size: 0; + padding: 0 0; + margin: 0 0; +} + +.albums h1 { + font-size: 2em; + text-align: center; + padding: 0 0; + margin: 15pt 0; + margin-top: -5pt; } diff --git a/app/templates/music.html b/app/templates/music.html index 5e35363..f2c0fcf 100644 --- a/app/templates/music.html +++ b/app/templates/music.html @@ -31,14 +31,16 @@

Top Albums

- {% for album in top_albums %} - - - - {% if loop.index % 3 == 0 %} -
- {% endif %} - {% endfor %} +
+ {% for album in top_albums %} + + + + {% if loop.index % 3 == 0 %} +
+ {% endif %} + {% endfor %} +
From 4dba456dcd5fd638ab14ce29009d26789cce3b19 Mon Sep 17 00:00:00 2001 From: 0x01FE <0x10FE@0x01fe.net> Date: Tue, 23 Apr 2024 10:09:59 -0500 Subject: [PATCH 4/7] adding programming page stuff --- app/static/programming/vscode_extensions.txt | 12 +++++++ app/static/style.css | 33 ++++++++++++++++++++ app/templates/programming.html | 6 ++++ 3 files changed, 51 insertions(+) create mode 100644 app/static/programming/vscode_extensions.txt diff --git a/app/static/programming/vscode_extensions.txt b/app/static/programming/vscode_extensions.txt new file mode 100644 index 0000000..a0edf1d --- /dev/null +++ b/app/static/programming/vscode_extensions.txt @@ -0,0 +1,12 @@ +EOF Mark, +Glassit-VSC, +JSON formatter, +Pylance, +Remote - SSH, +Synthwave '84 Blues, +Trailing Spaces, +Helm Intellisense, +background, +Helium Icon Theme, +SQLite Viewer, +Docker \ No newline at end of file diff --git a/app/static/style.css b/app/static/style.css index 610c56e..67ad496 100644 --- a/app/static/style.css +++ b/app/static/style.css @@ -107,6 +107,39 @@ a:hover { text-decoration: none; } +.rightbar { + height: fit-content; + align-self: flex-start; + top: 10px; + + padding: 20pt; + + margin: 5em 0; + margin-right: 2em; + + border-style: var(--borders-style); + border-radius: var(--border-radius); + border-color: #1E2022; + background-color: var(--main-background); + + opacity: 0.9; + + /* box-shadow: -10px 10px var(--accent); */ + + /* Text Settings */ + font-weight: bold; + line-height: 30pt; +} + +.rightbar a { + text-decoration: none; +} + +.rightbar h2 { + font-family: Georgia, 'Times New Roman', Times, serif; + line-height: normal; +} + .dlog { flex: 3; diff --git a/app/templates/programming.html b/app/templates/programming.html index 91a5a31..2d42ceb 100644 --- a/app/templates/programming.html +++ b/app/templates/programming.html @@ -28,6 +28,12 @@
{{ post|safe }}
{% endfor %} + + +
+

Other

+ Technologies I Use +
From a66265e81388cc262cde44feb0fb0423cdbd44cb Mon Sep 17 00:00:00 2001 From: 0x01FE <0x10FE@0x01fe.net> Date: Tue, 23 Apr 2024 10:20:31 -0500 Subject: [PATCH 5/7] forgot to add requests to requirements --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bb91e2f..85ba8d2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ Markdown==3.5.2 Flask==2.2.3 waitress==2.1.2 -Werkzeug==2.2.3 \ No newline at end of file +Werkzeug==2.2.3 +requests==2.31.0 \ No newline at end of file From 6c2f7427f742243cbee8f3fce3d6c5fdb9339d0d Mon Sep 17 00:00:00 2001 From: 0x01FE <0x10FE@0x01fe.net> Date: Tue, 23 Apr 2024 11:11:54 -0500 Subject: [PATCH 6/7] made a template for the writing page --- app/app.py | 28 ++++++++++++++++++++++++++++ app/static/writing.html | 9 --------- app/templates/about.html | 1 + app/templates/games.html | 1 + app/templates/index.html | 2 +- app/templates/motion-pictures.html | 1 + app/templates/music.html | 1 + app/templates/programming.html | 1 + app/templates/writing.html | 11 +++++++++++ 9 files changed, 45 insertions(+), 10 deletions(-) delete mode 100644 app/static/writing.html create mode 100644 app/templates/writing.html diff --git a/app/app.py b/app/app.py index a28e1e1..a7e1217 100644 --- a/app/app.py +++ b/app/app.py @@ -1,6 +1,8 @@ +import os import glob import configparser import random +import datetime import requests import flask @@ -15,6 +17,7 @@ CONFIG_PATH = "./config.ini" config = configparser.ConfigParser() config.read(CONFIG_PATH) +WRITING_FOLDER = 'static/writing/' POSTS_FOLDER = config['POSTS']['POSTS_FOLDER'] STATUS_FILE = config['STATUS']['STATUS_FILE'] PORT = int(config['NETWORK']['PORT']) @@ -161,6 +164,31 @@ def programming(): return flask.render_template('programming.html', posts=post_bodies, status=status) +@app.route('/writing/') +def writing(): + + works = [] + + # Get all works in writing folder + files = glob.glob(WRITING_FOLDER + '*') + + for path in files: + + date: str = datetime.datetime.fromtimestamp(os.path.getctime(path)).strftime("%B %d, %Y") + name: str = path.split('/')[-1] + + works.append({ + 'date' : date, + 'name' : name, + 'path' : path + }) + + return flask.render_template('writing.html', works=works) + + + + + # About Page @app.route('/about/') def about(): diff --git a/app/static/writing.html b/app/static/writing.html deleted file mode 100644 index 44de92c..0000000 --- a/app/static/writing.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - home -
-
- Scream March 27th, 2024 - - \ No newline at end of file diff --git a/app/templates/about.html b/app/templates/about.html index a2663fc..ce7774c 100644 --- a/app/templates/about.html +++ b/app/templates/about.html @@ -18,6 +18,7 @@ Music
Motion Picture
Programming
+ Writing
About diff --git a/app/templates/games.html b/app/templates/games.html index d023f8b..0ffded7 100644 --- a/app/templates/games.html +++ b/app/templates/games.html @@ -18,6 +18,7 @@ Music
Motion Picture
Programming
+ Writing
About diff --git a/app/templates/index.html b/app/templates/index.html index 51412b8..def98bd 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -18,7 +18,7 @@ Music
Motion Picture
Programming
- Writing
+ Writing
About diff --git a/app/templates/motion-pictures.html b/app/templates/motion-pictures.html index 459f655..87d36f9 100644 --- a/app/templates/motion-pictures.html +++ b/app/templates/motion-pictures.html @@ -18,6 +18,7 @@ Music
Motion Picture
Programming
+ Writing
About diff --git a/app/templates/music.html b/app/templates/music.html index f2c0fcf..5ea89f3 100644 --- a/app/templates/music.html +++ b/app/templates/music.html @@ -18,6 +18,7 @@ Music
Motion Picture
Programming
+ Writing
About diff --git a/app/templates/programming.html b/app/templates/programming.html index 2d42ceb..d146ccd 100644 --- a/app/templates/programming.html +++ b/app/templates/programming.html @@ -18,6 +18,7 @@ Music
Motion Picture
Programming
+ Writing
About diff --git a/app/templates/writing.html b/app/templates/writing.html new file mode 100644 index 0000000..09df245 --- /dev/null +++ b/app/templates/writing.html @@ -0,0 +1,11 @@ + + + + home +
+
+ {% for work in works %} + {{ work.name }} {{ work.date }} + {% endfor %} + + \ No newline at end of file From 492c2f923ef584d8437f08e93e5a062d5e523c2c Mon Sep 17 00:00:00 2001 From: 0x01fe Date: Tue, 23 Apr 2024 12:40:51 -0500 Subject: [PATCH 7/7] readme edits --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index d8282e3..c9fa882 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,5 @@ Code of the website hosted at https://www.0x01fe.net -Could I gitignore the config files? -Yes. -Do I? -no. +One might ask why my pretty simple website is written in Python. The answer is so that I can just drop markdown files in a folder and have them automatically formatted and uploaded. This is done using the fact that markdown translates to HTML perfectly and that Flask / Jinja2 templates are really easy to use!