diff options
36 files changed, 62 insertions, 212 deletions
diff --git a/flasksite.ini b/flasksite.ini new file mode 100644 index 0000000..73c2152 --- /dev/null +++ b/flasksite.ini @@ -0,0 +1,9 @@ +[uwsgi] +socket = /var/www/run/flask-main/flask-main.sock +home = env +wsgi-file = server.py +callable = app +master = true +die-on-term = true +processes = 4 +logger = file:/var/www/logs/uwsgi.log @@ -1,2 +1,12 @@ license.html -thoughts/rants/dontread.txt +home.html +pgp.txt +files/ +files/pdfopts.yaml +files/RESUME.html +files/RESUME.pdf +files/gensume +files/RESUME.md +files/bookmarks.html +panupdate +about/faq.html diff --git a/runuwsgi b/runuwsgi new file mode 100755 index 0000000..9588af0 --- /dev/null +++ b/runuwsgi @@ -0,0 +1,3 @@ +#!/bin/ksh +cd /var/www/ezcms +uwsgi --ini flasksite.ini & diff --git a/siteconfig.py b/siteconfig.py index 8917a20..f5cbee6 100644 --- a/siteconfig.py +++ b/siteconfig.py @@ -35,8 +35,8 @@ class siteconfig: # REQUIRED SETTINGS # - DOMAIN = "example.net" # Your site here! - HOME_TITLE = "WELCOME" + DOMAIN = "mjfer.net" # Your site here! + HOME_TITLE = "welcome" LINKS_FILE = ".links" # ".lnx" if you like DESC_FILE = ".description" # ".desc" DEFAULT_MIMETYPE = "application/octet-stream" @@ -92,16 +92,16 @@ class siteconfig: # RSS Settings rss_channel_config = { - 'TITLE': "RSS Feed for example.net", - 'LINK': "http://127.0.0.1:5000/", - 'DESCRIPTION': "My example feed", + 'TITLE': "mjfer.net RSS Feed", + 'LINK': "https://mjfer.net/", + 'DESCRIPTION': "feed organized by the latest updated files", 'LANGUAGE': "en-us", 'PUBDATE': "", 'LASTBUILDDATE': "", 'DOCS': "https://git.mjfer.net/ezcms.git/", 'GENERATOR': "EZCMS", - 'AUTHOR': "editor@example.net", - 'WEBMASTER': "webmaster@example.net", + 'AUTHOR': "mjf@mjfer.net", + 'WEBMASTER': "mjf@mjfer.net", # Max amount of paragraphs to print in each description 'DESCRIPTION_LENGTH': 3, # File extensions to include in RSS updates diff --git a/static/5575602.png b/static/5575602.png Binary files differnew file mode 100644 index 0000000..f4a10bc --- /dev/null +++ b/static/5575602.png diff --git a/static/email.svg b/static/email.svg new file mode 100644 index 0000000..f576714 --- /dev/null +++ b/static/email.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-envelope" viewBox="0 0 16 16"> + <path fill-rule="evenodd" d="M0 4a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V4Zm2-1a1 1 0 0 0-1 1v.217l7 4.2 7-4.2V4a1 1 0 0 0-1-1H2Zm13 2.383-4.708 2.825L15 11.105V5.383Zm-.034 6.876-5.64-3.471L8 9.583l-1.326-.795-5.64 3.47A1 1 0 0 0 2 13h12a1 1 0 0 0 .966-.741ZM1 11.105l4.708-2.897L1 5.383v5.722Z"/> +</svg>
\ No newline at end of file diff --git a/static/github.svg b/static/github.svg new file mode 100644 index 0000000..bb4e45c --- /dev/null +++ b/static/github.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-github" viewBox="0 0 16 16"> + <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/> +</svg>
\ No newline at end of file diff --git a/static/human_router.jpg b/static/human_router.jpg Binary files differnew file mode 100644 index 0000000..e0934c1 --- /dev/null +++ b/static/human_router.jpg diff --git a/static/linkedin.svg b/static/linkedin.svg new file mode 100644 index 0000000..4c4efe5 --- /dev/null +++ b/static/linkedin.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-linkedin" viewBox="0 0 16 16"> + <path d="M0 1.146C0 .513.526 0 1.175 0h13.65C15.474 0 16 .513 16 1.146v13.708c0 .633-.526 1.146-1.175 1.146H1.175C.526 16 0 15.487 0 14.854V1.146zm4.943 12.248V6.169H2.542v7.225h2.401zm-1.2-8.212c.837 0 1.358-.554 1.358-1.248-.015-.709-.52-1.248-1.342-1.248-.822 0-1.359.54-1.359 1.248 0 .694.521 1.248 1.327 1.248h.016zm4.908 8.212V9.359c0-.216.016-.432.08-.586.173-.431.568-.878 1.232-.878.869 0 1.216.662 1.216 1.634v3.865h2.401V9.25c0-2.22-1.184-3.252-2.764-3.252-1.274 0-1.845.7-2.165 1.193v.025h-.016a5.54 5.54 0 0 1 .016-.025V6.169h-2.4c.03.678 0 7.225 0 7.225h2.4z"/> +</svg>
\ No newline at end of file diff --git a/static/main.css b/static/main.css index 4db48f9..3e60bff 100644 --- a/static/main.css +++ b/static/main.css @@ -7,7 +7,6 @@ h3,h4 { text-align: justify; margin: 0.25em auto; } -/* class to optionally center h3 when we want it */ h3.center { text-align: center; } @@ -52,8 +51,7 @@ body { max-width: 35%; display: block; } -/* Use for long text which doesnt wrap nicely */ -.long { +.longboi { word-wrap: break-word; } p { @@ -70,6 +68,7 @@ code { white-space: pre-wrap; word-wrap: break-all; } + table { border-spacing: 0 10px; } @@ -81,20 +80,23 @@ img { height: auto; width: auto; } -/*mobile*/ +img.icon { + filter: invert(50%); +} +/* some Stallman trickery for making mobile text bigger */ @media screen and (max-device-width: 480px) { - body { + body { max-width: 100%; font-size: 90%; - } - .license { + } + .license { font-size: 0; - } - p { + } + p { margin-top: 5%; margin-bottom: 5%; - } - code.long { + } + code.longboi { font-size: 65%; } } diff --git a/static/puffy.gif b/static/puffy.gif Binary files differnew file mode 100644 index 0000000..aa0d461 --- /dev/null +++ b/static/puffy.gif diff --git a/static/rss.svg b/static/rss.svg new file mode 100644 index 0000000..39bef06 --- /dev/null +++ b/static/rss.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-rss-fill" viewBox="0 0 16 16"> + <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm1.5 2.5c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1 0-2zm0 4a6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1 0-2zm.5 7a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/> +</svg>
\ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 5ca253a..1509d5c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,7 +3,7 @@ <title>{{ domain }}/{{ title }}</title> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <meta name="viewport" content="width=device-width, initial-scale=1.0"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0"/> {% block css%} <link rel="stylesheet" type="text/css" href="/static/main.css"> {% endblock %} @@ -17,9 +17,9 @@ <b> <a href="/site/{{ dir }}">{{ dir }}/</a> |</b> {% endfor %} <!-- Add icons here --> - <a href="/feed.xml"target="_blank" rel="noopener noreferrer"> - <img src="https://icons.getbootstrap.com/assets/icons/rss-fill.svg"> - </a> + <a href="/feed.xml" target="_blank" rel="noopener noreferrer"> + <img class="icon" src="/static/rss.svg"></a> + <a href="mailto:mjf@mjfer.net"><img class="icon" src="/static/email.svg"></a> </div> <h2>{{ title }}</h2> <div class="content"> @@ -30,8 +30,8 @@ <h3 class="center"><a href="{{ parent_dir }}">Go up to parent folder ({{ parent_dir }})</a></h3> {% endif %} </div> - {% if last_update %} - <p>Last update: {{ last_update }}</p> + {% if last_update %} + <p>Last update: {{ last_update }} -4:00 UTC</p> {% endif %} <div class="license">{% include 'site/license.html' %}</div> </center></body> diff --git a/templates/site b/templates/site new file mode 100644 index 0000000..f7d5c78 --- /dev/null +++ b/templates/site @@ -0,0 +1 @@ +replace with symlink to site-files.git diff --git a/templates/site/about/.description b/templates/site/about/.description deleted file mode 100644 index eee24f1..0000000 --- a/templates/site/about/.description +++ /dev/null @@ -1 +0,0 @@ -Who runs this place anyway? diff --git a/templates/site/about/faq.html b/templates/site/about/faq.html deleted file mode 100644 index 0ad0c1a..0000000 --- a/templates/site/about/faq.html +++ /dev/null @@ -1,3 +0,0 @@ -<h2>Frequently Anticipated Questions</h2> -<li><i>A question?</i></li> -<p>Yes, that is a question. Nice one</p> diff --git a/templates/site/about/whoami.html b/templates/site/about/whoami.html deleted file mode 100644 index 954d8db..0000000 --- a/templates/site/about/whoami.html +++ /dev/null @@ -1 +0,0 @@ -<p>Person that does things</p> diff --git a/templates/site/files/.description b/templates/site/files/.description deleted file mode 100644 index 0dd21eb..0000000 --- a/templates/site/files/.description +++ /dev/null @@ -1 +0,0 @@ -Everything else I don't have a place for diff --git a/templates/site/files/1.html b/templates/site/files/1.html deleted file mode 100644 index 6be9b63..0000000 --- a/templates/site/files/1.html +++ /dev/null @@ -1,11 +0,0 @@ -<p>This is some text</p> -<br> -<br> -<br> -<p> -This is a whole lot more text including very very very long lines, like wowza -this is long! Fortunately, css should wrap it nicely -</p> -<p> -Separate each paragraph! -</p> diff --git a/templates/site/fun/.description b/templates/site/fun/.description deleted file mode 100644 index 37c5a36..0000000 --- a/templates/site/fun/.description +++ /dev/null @@ -1 +0,0 @@ -The internet is srs business these days. Here's some fun stuff instead diff --git a/templates/site/fun/.links b/templates/site/fun/.links deleted file mode 100644 index b3ea8fb..0000000 --- a/templates/site/fun/.links +++ /dev/null @@ -1 +0,0 @@ -???,http://www.nyan.cat/ diff --git a/templates/site/fun/renegade.html! b/templates/site/fun/renegade.html! deleted file mode 100644 index cc1e6f8..0000000 --- a/templates/site/fun/renegade.html! +++ /dev/null @@ -1,6 +0,0 @@ -<html> - <body> - <h1>This file breaks all the rules!</h1> - <p>This file doesn't use the base template.</p> - </body> -</html> diff --git a/templates/site/home.html b/templates/site/home.html deleted file mode 100644 index 01d676e..0000000 --- a/templates/site/home.html +++ /dev/null @@ -1,4 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -<p>Home</p> -{% endblock %} diff --git a/templates/site/license.html b/templates/site/license.html deleted file mode 100644 index 172b43f..0000000 --- a/templates/site/license.html +++ /dev/null @@ -1,17 +0,0 @@ -<p xmlns:dct="http://purl.org/dc/terms/" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#"> - <a rel="license" - href="http://creativecommons.org/publicdomain/zero/1.0/"> - <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0" /> - </a> - <br /> - To the extent possible under law, - <span property="dct:title">The author</span> - has waived all copyright and related or neighboring rights to - content on <span property="dct:title">{{ domain }}</span>. - All work may be cited without attribution at the reader's discretion. - However, if you do use the work here, or otherwise benefit from it, - the author would love to hear about it! - This work is published from: -<span property="vcard:Country" datatype="dct:ISO3166" content="US" about="{{ domain }}"> - United States</span>. -</p> diff --git a/templates/site/thoughts/.description b/templates/site/thoughts/.description deleted file mode 100644 index f9004b2..0000000 --- a/templates/site/thoughts/.description +++ /dev/null @@ -1,3 +0,0 @@ -My thoughts on various topics that I may or may not be qualified to write about -When I can't figure out exactly what I'm thinking, it gets written somewhere -here. diff --git a/templates/site/thoughts/rants/.description b/templates/site/thoughts/rants/.description deleted file mode 100644 index 33f8ee8..0000000 --- a/templates/site/thoughts/rants/.description +++ /dev/null @@ -1 +0,0 @@ -<img src="https://www.pngfind.com/pngs/m/436-4365661_disapproval-guy-text-face-astonished-what-man-disapproval.png" /> diff --git a/templates/site/thoughts/rants/dontread.txt b/templates/site/thoughts/rants/dontread.txt deleted file mode 100644 index e90754c..0000000 --- a/templates/site/thoughts/rants/dontread.txt +++ /dev/null @@ -1,2 +0,0 @@ -I hate people who try to beep me while I'm turning left... like what do you -want me to do? Run the kids over? diff --git a/templates/site/tutorials/.description b/templates/site/tutorials/.description deleted file mode 100644 index ec41834..0000000 --- a/templates/site/tutorials/.description +++ /dev/null @@ -1,3 +0,0 @@ -There's a lot of tutorials out there that can show you something if you know -what to look for. Here's some tutorials that might help when you don't know -what to search. diff --git a/templates/site/tutorials/.links b/templates/site/tutorials/.links deleted file mode 100644 index a0e2e99..0000000 --- a/templates/site/tutorials/.links +++ /dev/null @@ -1 +0,0 @@ -Cool site,https://fsf.org diff --git a/templates/site/tutorials/.secret/secretfile.txt b/templates/site/tutorials/.secret/secretfile.txt deleted file mode 100644 index cae75f7..0000000 --- a/templates/site/tutorials/.secret/secretfile.txt +++ /dev/null @@ -1 +0,0 @@ -You shouldn't be able to see this file. It is a secret diff --git a/templates/site/tutorials/how-to-make-this-site.html b/templates/site/tutorials/how-to-make-this-site.html deleted file mode 100644 index 09dc877..0000000 --- a/templates/site/tutorials/how-to-make-this-site.html +++ /dev/null @@ -1 +0,0 @@ -<p>Carefully</p> diff --git a/templates/site/tutorials/linux/linuz1.html b/templates/site/tutorials/linux/linuz1.html deleted file mode 100644 index c299a06..0000000 --- a/templates/site/tutorials/linux/linuz1.html +++ /dev/null @@ -1 +0,0 @@ -Linux is cool diff --git a/templates/site/tutorials/python/.description b/templates/site/tutorials/python/.description deleted file mode 100644 index d69e5c3..0000000 --- a/templates/site/tutorials/python/.description +++ /dev/null @@ -1 +0,0 @@ -Some basics and thoughts on Python diff --git a/templates/site/tutorials/python/py-style.html b/templates/site/tutorials/python/py-style.html deleted file mode 100644 index 62de1ba..0000000 --- a/templates/site/tutorials/python/py-style.html +++ /dev/null @@ -1,34 +0,0 @@ -<h1 id="coding-style-guide">Coding Style Guide</h1> -<p>The purpose of this document is twofold: 1) To ensure that anyone who might like to make my code better understands why I write python the way I do 2) to ensure <em>I</em> adhere to my own style because I’m terribly inconsistent</p> -<p>Being terribly inconsistent, the guidelines are not set in stone and if you have a good argument for doing things a particular, I don’t really care.</p> -<p><em>BUT</em> first and foremost, <em>code must comply with PEP8 first</em>. This is easy to automate. I like coala since it’s friendly but there’ plenty of advanced linters out there.</p> -<p>That aside, I have the following idiosyncracies:</p> -<h2 id="strings-are-double-quoted.-keys-and-chars-are-single-quoted.">1) <em>Strings</em> are <em>double-quoted</em>. <em>Keys</em> and <em>chars</em> are <em>single-quoted</em>.</h2> -<p>This is really just because I like how C does it. And Cpython’s C-based so why not?</p> -<p>Like so: <code>code string = "This is a phrase" word = "word" cur_char = 'a' newline = '\n' # note, two characters, but it's still ONE char in output # keys are single-quoted to avoid confusion dictionary = { 'key' : "1245dqw3w431", 'return': newline }</code></p> -<p>The only exception is for strings with quotes in them (anything to avoid escapes, really) <code>code quoted_string = ( '"You miss 100% of the shots you don't take - Wayne Gretsky" - Michael Scott' )</code> That brings me to my next point.</p> -<h2 id="long-strings-belong-in-parentheses">2) Long strings belong in parentheses</h2> -<p>As in:</p> -<pre class="code"><code>longboi = ( - "This is a really long string usefull when making help menus. Be\n" - "sure to leave s space at the end of each line, or add a new line\n" - "when needed.\n" - - "Try your best to keep formatting accurate like this." -)</code></pre> -<h2 id="tabs-are-four-spaces-and-spaces-are-always-prefered-to-tabs">3) Tabs are four spaces and spaces are <em>ALWAYS</em> prefered to tabs</h2> -<p>Again, see PEP8.</p> -<h2 id="always-add-spaces-between-arithmetic-but-never-for-brackets">4) Always add spaces between arithmetic, but never for brackets</h2> -<p>It’s a pain to read: <code>code 1/(2*sqrt(pi))*exp(x**2)</code> Do this <code>code 1 / (2 * sqrt(pi)) * exp(x ** 2)</code> The same goes for logic operators <code>code true & false ^ true</code></p> -<h2 id="everything-should-be-snake_case">5) EVERYTHING should be snake_case</h2> -<p>This is python. Unless there’s a compatibility thing (like a library’s code was written that way, or it matches an API variable), snake_case is preferred.</p> -<pre class="code"><code>user_input = int(input()) # variable -MAX_INPUT = 1000 # constant -def judge_input(_input, _max): # function - if _max > _input: - print("Too big!") - -judge_input(user_input, MAX_INPUT -class Input_Judger: # a class - # etc etc</code></pre> -<p>Example exception <code>code # this doesn't actually work, but you get the idea r = requests.get("www.debian.org") pageSize = r.json()['pageSize'] # camel case ok</code></p> diff --git a/templates/site/tutorials/python/py-style.md b/templates/site/tutorials/python/py-style.md deleted file mode 100644 index bf96f59..0000000 --- a/templates/site/tutorials/python/py-style.md +++ /dev/null @@ -1,91 +0,0 @@ -# Coding Style Guide - -The purpose of this document is twofold: -1) To ensure that anyone who might like to make my code better understands - why I write python the way I do -2) to ensure *I* adhere to my own style because I'm terribly inconsistent - -Being terribly inconsistent, the guidelines are not set in stone and if -you have a good argument for doing things a particular, I don't really care. - -*BUT* first and foremost, *code must comply with PEP8 first*. This is easy -to automate. I like coala since it's friendly but there' plenty of advanced -linters out there. - -That aside, I have the following idiosyncracies: - -## 1) *Strings* are *double-quoted*. *Keys* and *chars* are *single-quoted*. - -This is really just because I like how C does it. And Cpython's C-based so -why not? - -Like so: - ```code - string = "This is a phrase" - word = "word" - cur_char = 'a' - newline = '\n' # note, two characters, but it's still ONE char in output - # keys are single-quoted to avoid confusion - dictionary = { 'key' : "1245dqw3w431", 'return': newline } - ``` - -The only exception is for strings with quotes in them (anything to avoid -escapes, really) - ```code - quoted_string = ( - '"You miss 100% of the shots you don't take - Wayne Gretsky" - Michael Scott' - ) - ``` -That brings me to my next point. - -## 2) Long strings belong in parentheses - -As in: -```code -longboi = ( - "This is a really long string usefull when making help menus. Be\n" - "sure to leave s space at the end of each line, or add a new line\n" - "when needed.\n" - - "Try your best to keep formatting accurate like this." -) -``` - -## 3) Tabs are four spaces and spaces are *ALWAYS* prefered to tabs -Again, see PEP8. - -## 4) Always add spaces between arithmetic, but never for brackets -It's a pain to read: - ```code - 1/(2*sqrt(pi))*exp(x**2) - ``` -Do this - ```code - 1 / (2 * sqrt(pi)) * exp(x ** 2) - ``` -The same goes for logic operators - ```code - true & false ^ true - ``` - -## 5) EVERYTHING should be snake_case -This is python. Unless there's a compatibility thing (like a library's -code was written that way, or it matches an API variable), -snake_case is preferred. -```code -user_input = int(input()) # variable -MAX_INPUT = 1000 # constant -def judge_input(_input, _max): # function - if _max > _input: - print("Too big!") - -judge_input(user_input, MAX_INPUT -class Input_Judger: # a class - # etc etc -``` -Example exception -```code -# this doesn't actually work, but you get the idea -r = requests.get("www.debian.org") -pageSize = r.json()['pageSize'] # camel case ok``` - diff --git a/templates/site/tutorials/python/test.py b/templates/site/tutorials/python/test.py deleted file mode 100644 index 83b87a6..0000000 --- a/templates/site/tutorials/python/test.py +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/python3 -print("hi") |
