diff --git a/.gitignore b/.gitignore index 73e20d2..e0db375 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,7 @@ __pycache__/ .DS_Store # node and js nonsense -node_modules/ \ No newline at end of file +node_modules/ + + +.TODO \ No newline at end of file diff --git a/content/pages/About.md b/content/pages/About.md index 411ecb4..29198e9 100644 --- a/content/pages/About.md +++ b/content/pages/About.md @@ -1,9 +1,12 @@ Title: About Me Author: Matt Gibson -Summary: About me page -Save_as: index.html +Summary: I am a software and machine learning developer in Sydney, NSW, Australia. I like computing, data, machine learning and cooking. +Save_as: about.html + + + I am a software and machine learning developer in [Sydney](http://en.wikipedia.org/wiki/Sydney), NSW, Australia. I like [computing](https://en.wikipedia.org/wiki/MOS_Technology_6502), [data](https://search.r-project.org/CRAN/refmans/vcd/html/HorseKicks.html), [machine learning](https://pytorch.org/) and [cooking](https://web.archive.org/web/20160210065535/http://www.seriouseats.com/the-food-lab/?ref=nav_main). I'm delighted by the scientific enterprise which allows us ["to see a World in a Grain of Sand"](https://www.poetryfoundation.org/poems/43650/auguries-of-innocence). I'm also quite keen on gibbons 🐒. diff --git a/content/pages/CV.md b/content/pages/CV.md index 4ae3510..17e2825 100644 --- a/content/pages/CV.md +++ b/content/pages/CV.md @@ -1,6 +1,7 @@ Title: CV Author: Matt Gibson -Summary: "Experienced professional seeking job opportunities. Specialisations in machine learning, computer vision, and data analysis. Ph.D. in Computer Vision and Machine Learning. Proficient in Python, Tensorflow, Pytorch, and more." +Summary: Experienced professional always open to opportunities. Ph.D. in Computer Vision and Machine Learning with practical experience. +Save_as: cv.html Looking for work. My email can be found on my github commits. diff --git a/pelicanconf.py b/pelicanconf.py index 8594926..01ca4dc 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -21,8 +21,8 @@ SITEURL = "https://matthew-gibson.com" MENUITEMS = [ - ("About", "/index.html"), - ("CV", "/pages/CV.html"), + ("About", "/about.html"), + ("CV", "/cv.html"), ("Blog", "/category/blog.html"), ] # ▼▼▼▼▼▼▼▼▼▼ OVERWRITTEN in publishconf.py ▼▼▼▼ @@ -98,7 +98,7 @@ # #### Plugins - Sitemap #### SITEMAP = { - "format": "txt", + "format": "xml", "priorities": {"articles": 0.5, "indexes": 0.5, "pages": 0.5}, "changefreqs": {"articles": "monthly", "indexes": "daily", "pages": "monthly"}, } diff --git a/publishconf.py b/publishconf.py index 1d58dbb..4266f25 100644 --- a/publishconf.py +++ b/publishconf.py @@ -16,3 +16,8 @@ SITEURL = "https://matthew-gibson.com" RELATIVE_URLS = False # DISPLAY_PAGES_ON_MENU = True + +ANALYTICS = """ + + +""" diff --git a/themes/my-basic/README.md b/themes/my-basic/README.md new file mode 100644 index 0000000..5327f4e --- /dev/null +++ b/themes/my-basic/README.md @@ -0,0 +1,21 @@ +# About this theme + +Not really a theme, just web design really. + +``` +├── static +│ ├── css +│ └── images +└── templates + ├── archives.html // to display archives + ├── article.html // processed for each article + ├── author.html // processed for each author + ├── authors.html // must list all the authors + ├── categories.html // must list all the categories + ├── category.html // processed for each category + ├── index.html // the index (list all the articles) + ├── page.html // processed for each page + ├── period_archives.html // to display time-period archives + ├── tag.html // processed for each tag + └── tags.html // must list all the tags. Can be a tag cloud. +``` \ No newline at end of file diff --git a/themes/my-basic/static/css/style.css b/themes/my-basic/static/css/style.css index 1a4a8f5..4eaada1 100644 --- a/themes/my-basic/static/css/style.css +++ b/themes/my-basic/static/css/style.css @@ -9,7 +9,6 @@ --my-neo-grotesque: Inter, Roboto, 'Helvetica Neue', 'Arial Nova', 'Nimbus Sans', Arial, sans-serif; - --standard-border-radius: 5px; --h1-font-size: 2em; @@ -115,6 +114,7 @@ hr { h1, h2, h3, nav { font-family: var(--my-monospace-code); } + nav a { color: var(--text-secondary) } @@ -163,19 +163,23 @@ nav a:hover { main a:link { color: var(--text-link); - text-decoration: none; + text-decoration: underline; + } -main a:hover { - color: var(--primary-hover); - text-decoration: underline; - text-decoration-thickness: 0.1em; +main a:hover, main a:focus { + /* color: var(--primary-hover); */ + /* text-decoration-thickness: 0.1em; */ + text-decoration: none; + } main a:visited { color: var(--text-visited); text-decoration: underline; - text-decoration-thickness: 0.1em; + + /* text-decoration: underline; */ + /* text-decoration-thickness: 0.1em; */ } diff --git a/themes/my-basic/templates/analytics.html b/themes/my-basic/templates/analytics.html new file mode 100644 index 0000000..78b9d7c --- /dev/null +++ b/themes/my-basic/templates/analytics.html @@ -0,0 +1,3 @@ +{% if ANALYTICS %} +{{ ANALYTICS }} +{% endif %} \ No newline at end of file diff --git a/themes/my-basic/templates/archives.html b/themes/my-basic/templates/archives.html new file mode 100644 index 0000000..3d52ff7 --- /dev/null +++ b/themes/my-basic/templates/archives.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} + +{% block title %}{{ SITENAME|striptags }} - Archives{% endblock %} + +{% block content %} +

Archives for {{ SITENAME }}

+ +
+{% for article in dates %} +
{{ article.locale_date }}
+
{{ article.title }}
+{% endfor %} +
+{% endblock %} \ No newline at end of file diff --git a/themes/my-basic/templates/article.html b/themes/my-basic/templates/article.html index 9f6a872..4fdc06f 100644 --- a/themes/my-basic/templates/article.html +++ b/themes/my-basic/templates/article.html @@ -3,6 +3,11 @@ {% block title %}{{ SITENAME|striptags }} - {{ article.title|striptags }}{% endblock %} +{% block meta_desc %} + +{% endblock meta_desc %} + + {% block head %} {{ super() }} diff --git a/themes/my-basic/templates/base.html b/themes/my-basic/templates/base.html index ce1439a..f23a238 100644 --- a/themes/my-basic/templates/base.html +++ b/themes/my-basic/templates/base.html @@ -7,12 +7,19 @@ + + {% block meta_desc %} {% if SITESUBTITLE %} {% endif %} + {% endblock meta_desc %} + + {% if STYLESHEET_URL %} {% endif %} + + @@ -20,45 +27,10 @@ + {% include 'feeds.html' %} + - {% if FEED_ALL_ATOM %} - - {% endif %} - {% if FEED_ALL_RSS %} - - {% endif %} - {% if FEED_ATOM %} - - {% endif %} - {% if FEED_RSS %} - - {% endif %} - {% if CATEGORY_FEED_ATOM and category %} - - {% endif %} - {% if CATEGORY_FEED_RSS and category %} - - {% endif %} - {% if TAG_FEED_ATOM and tag %} - - {% endif %} - {% if TAG_FEED_RSS and tag %} - - {% endif %} {% endblock head %} @@ -147,6 +119,8 @@ } }) + +{% include 'analytics.html' %} \ No newline at end of file diff --git a/themes/my-basic/templates/category.html b/themes/my-basic/templates/category.html index a3ddae0..ecb7af8 100644 --- a/themes/my-basic/templates/category.html +++ b/themes/my-basic/templates/category.html @@ -1,4 +1,4 @@ -{% extends "index.html" %} +{% extends "content_list.html" %} {% block title %}{{ SITENAME|striptags }} - {{ category }} category{% endblock %} diff --git a/themes/my-basic/templates/content_list.html b/themes/my-basic/templates/content_list.html new file mode 100644 index 0000000..5bdde15 --- /dev/null +++ b/themes/my-basic/templates/content_list.html @@ -0,0 +1,30 @@ +{% extends "base.html" %} +{% block content %} +{% block content_title %} +

All articles

+{% endblock %} + + +{% for article in articles_page.object_list %} +
+
+

{{ + article.title }}

+
+
{{ article.summary }}
+ +
+{% endfor %} + +{% if articles_page.has_other_pages() %} +{% include 'pagination.html' %} +{% endif %} + +{% endblock content %} \ No newline at end of file diff --git a/themes/my-basic/templates/feeds.html b/themes/my-basic/templates/feeds.html new file mode 100644 index 0000000..4e7b6b2 --- /dev/null +++ b/themes/my-basic/templates/feeds.html @@ -0,0 +1,37 @@ +{% if FEED_ALL_ATOM %} + +{% endif %} +{% if FEED_ALL_RSS %} + +{% endif %} +{% if FEED_ATOM %} + +{% endif %} +{% if FEED_RSS %} + +{% endif %} +{% if CATEGORY_FEED_ATOM and category %} + +{% endif %} +{% if CATEGORY_FEED_RSS and category %} + +{% endif %} +{% if TAG_FEED_ATOM and tag %} + +{% endif %} +{% if TAG_FEED_RSS and tag %} + +{% endif %} \ No newline at end of file diff --git a/themes/my-basic/templates/index.html b/themes/my-basic/templates/index.html index 5bdde15..f4ac172 100644 --- a/themes/my-basic/templates/index.html +++ b/themes/my-basic/templates/index.html @@ -1,27 +1,24 @@ {% extends "base.html" %} {% block content %} {% block content_title %} -

All articles

+
+

Welcome to my homepage

{% endblock %} +

+👋 hi there, thanks for visiting. My name is Matt and I am a software / machine learning person in Sydney. I am an irregular blogger, this is mostly to order my thoughts. +

-{% for article in articles_page.object_list %} -
-
-

{{ - article.title }}

-
-
{{ article.summary }}
-
-

Published:

-
By - {% for author in article.authors %} - {{ author }} - {% endfor %} -
-
-
+

The most recent mid content I wrote:

+ +
+{% for article in dates[:4] %} +
{{ article.locale_date }}
+
{{ article.title }}
{% endfor %} +
+ +
{% if articles_page.has_other_pages() %} {% include 'pagination.html' %} diff --git a/themes/my-basic/templates/page.html b/themes/my-basic/templates/page.html index b1cacbe..2f1e736 100644 --- a/themes/my-basic/templates/page.html +++ b/themes/my-basic/templates/page.html @@ -1,8 +1,13 @@ -{% extends "base.html" %} +{% extends "content_list.html" %} {% block html_lang %}{{ page.lang }}{% endblock %} {% block title %}{{ SITENAME|striptags }} - {{ page.title|striptags }}{%endblock%} +{% block meta_desc %} + +{% endblock meta_desc %} + + {% block head %} {{ super() }}