diff --git a/content/blog/2022-10-17_comparing-go-gorm-and-sqlx.rst b/content/blog/2022-10-17_comparing-go-gorm-and-sqlx.rst index d7ea1a6..c2aedac 100644 --- a/content/blog/2022-10-17_comparing-go-gorm-and-sqlx.rst +++ b/content/blog/2022-10-17_comparing-go-gorm-and-sqlx.rst @@ -183,7 +183,8 @@ Notes ~~~~~ I sent this blog post to my friend `Andrey `_ and he mentioned that I was incorrect with my comparision of sqlx to pymysql. -To put it in a python metaphor, "sqlx is like using urllib3, gorm is like using something that generates a bunch of requests code for you." +To put it in a python metaphor, "sqlx is like using urllib3, gorm is like using something that generates a bunch of requests code for you. Using pymysql is like using tcp to do a REST request." Sqlx is more akin to `SqlAlchemy core `_ vs using `SqlAlchemy orm `_. -As the sort of equivalent to ``pymysql`` in Go is ``database/sql`` from the stdlib. +Sqlx is just some slight extensions over ``database/sql``. +As the sort of equivalent to ``pymysql`` in Go is ``database/sql/driver`` from the stdlib. diff --git a/pelicanconf.py b/pelicanconf.py index 5fe9b0c..f86aa2c 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -1,7 +1,10 @@ +from pathlib import Path + +pwd = Path.cwd() AUTHOR = 'Tyrel Souza' SITENAME = "Tyrel Souza's Blog" TWITTER_USERNAME = 'tyrelsouza' -SITEURL = 'https://tyrel.dev/blog' +SITEURL = '' SITESUBTITLE = 'Code, Tech, Home Automation, Personal Blog' @@ -61,3 +64,5 @@ DEFAULT_METADATA = { 'status': 'draft', 'extras/favicon.ico': {'path': 'favicon.ico'}, } + +THEME = "./themes/custom" diff --git a/tasks.py b/tasks.py index 1171b1e..704f357 100644 --- a/tasks.py +++ b/tasks.py @@ -32,7 +32,7 @@ CONFIG = { 'ssh_path': '/www/tyrel.dev/blog/', # Host and port for `serve` 'host': 'localhost', - 'port': 8000, + 'port': 8001, } @task diff --git a/themes/custom/static/css/fonts.css b/themes/custom/static/css/fonts.css new file mode 100644 index 0000000..5601507 --- /dev/null +++ b/themes/custom/static/css/fonts.css @@ -0,0 +1,12 @@ +@font-face { + font-family: 'Yanone Kaffeesatz'; + font-style: normal; + font-weight: 400; + src: + local('Yanone Kaffeesatz Regular'), + local('YanoneKaffeesatz-Regular'), + /* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */ + url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'), + /* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */ + url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2'); +} diff --git a/themes/custom/static/css/main.css b/themes/custom/static/css/main.css new file mode 100644 index 0000000..c0c00b0 --- /dev/null +++ b/themes/custom/static/css/main.css @@ -0,0 +1,482 @@ +/* + Name: Smashing HTML5 + Date: July 2009 + Description: Sample layout for HTML5 and CSS3 goodness. + Version: 1.0 + License: MIT + Licensed by: Smashing Media GmbH + Original author: Enrique Ramírez +*/ + +/* Imports */ +@import url("reset.css"); +@import url("pygment.css"); +@import url("typogrify.css"); +@import url("fonts.css"); + +/***** Global *****/ +/* Body */ +body { + background: #F5F4EF; + color: #000305; + font-size: 87.5%; /* Base font size: 14px */ + font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; + line-height: 1.429; + margin: 0; + padding: 0; + text-align: left; +} + +/* Headings */ +h1 {font-size: 2em } +h2 {font-size: 1.571em} /* 22px */ +h3 {font-size: 1.429em} /* 20px */ +h4 {font-size: 1.286em} /* 18px */ +h5 {font-size: 1.143em} /* 16px */ +h6 {font-size: 1em} /* 14px */ + +h1, h2, h3, h4, h5, h6 { + font-weight: 400; + line-height: 1.1; + margin-bottom: .8em; + font-family: 'Yanone Kaffeesatz', arial, serif; +} + +h3, h4, h5, h6 { margin-top: .8em; } + +hr { border: 2px solid #EEEEEE; } + +/* Anchors */ +a {outline: 0;} +a img {border: 0px; text-decoration: none;} +a:link, a:visited { + color: #C74350; + padding: 0 1px; + text-decoration: underline; +} +a:hover, a:active { + background-color: #C74350; + color: #fff; + text-decoration: none; + text-shadow: 1px 1px 1px #333; +} + +h1 a:hover { + background-color: inherit +} + +/* Paragraphs */ +div.line-block, +p { margin-top: 1em; + margin-bottom: 1em;} + +strong, b {font-weight: bold;} +em, i {font-style: italic;} + +/* Lists */ +ul { + list-style: outside disc; + margin: 0em 0 0 1.5em; +} + +ol { + list-style: outside decimal; + margin: 0em 0 0 1.5em; +} + +li { margin-top: 0.5em; + margin-bottom: 1em; } + +.post-info { + float:right; + margin:10px; + padding:5px; +} + +.post-info p{ + margin-top: 1px; + margin-bottom: 1px; +} + +.readmore { float: right } + +dl {margin: 0 0 1.5em 0;} +dt {font-weight: bold;} +dd {margin-left: 1.5em;} + +pre{background-color: rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;} + +/* Quotes */ +blockquote { + margin: 20px; + font-style: italic; +} +cite {} + +q {} + +div.note { + float: right; + margin: 5px; + font-size: 85%; + max-width: 300px; +} + +/* Tables */ +table {margin: .5em auto 1.5em auto; width: 98%;} + + /* Thead */ + thead th {padding: .5em .4em; text-align: left;} + thead td {} + + /* Tbody */ + tbody td {padding: .5em .4em;} + tbody th {} + + tbody .alt td {} + tbody .alt th {} + + /* Tfoot */ + tfoot th {} + tfoot td {} + +/* HTML5 tags */ +header, section, footer, +aside, nav, article, figure { + display: block; +} + +/***** Layout *****/ +.body {clear: both; margin: 0 auto; max-width: 800px;} +img { max-width: 100%; } +img.right, figure.right, div.figure.align-right { + float: right; + margin: 0 0 2em 2em; +} +img.left, figure.left, div.figure.align-left { + float: left; + margin: 0 2em 2em 0; +} + +/* .rst support */ +div.figure img, figure img { /* to fill figure exactly */ + max-width: 100%; +} +div.figure p.caption, figure p.caption { /* margin provided by figure */ + margin-top: 0; + margin-bottom: 0; +} + +/* + Header +*****************/ +#banner { + margin: 0 auto; + padding: 0.8em 0 0 0; +} + + /* Banner */ + #banner h1 { + font-size: 3.571em; + line-height: 1.0; + margin-bottom: .3em; + } + + #banner h1 a:link, #banner h1 a:visited { + color: #000305; + display: block; + font-weight: bold; + margin: 0 0 0 .2em; + text-decoration: none; + } + #banner h1 a:hover, #banner h1 a:active { + background: none; + color: #C74350; + text-shadow: none; + } + + #banner h1 strong {font-size: 0.36em; font-weight: normal;} + + /* Main Nav */ + #banner nav { + background: #000305; + font-size: 1.143em; + overflow: auto; + line-height: 30px; + margin: 0 auto 2em auto; + padding: 0; + text-align: center; + max-width: 800px; + + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + } + + #banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;} + #banner nav li {float: left; display: inline; margin: 0;} + + #banner nav a:link, #banner nav a:visited { + color: #fff; + display: inline-block; + height: 30px; + padding: 5px 1.5em; + text-decoration: none; + } + #banner nav a:hover, #banner nav a:active, + #banner nav .active a:link, #banner nav .active a:visited { + background: #C74451; + color: #fff; + text-shadow: none !important; + } + + #banner nav li:first-child a { + border-top-left-radius: 5px; + -moz-border-radius-topleft: 5px; + -webkit-border-top-left-radius: 5px; + + border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + -webkit-border-bottom-left-radius: 5px; + } + +/* + Featured +*****************/ +#featured { + background: #fff; + margin-bottom: 2em; + overflow: hidden; + padding: 20px; + max-width: 760px; + + border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; +} + +#featured figure { + border: 2px solid #eee; + float: right; + margin: 0.786em 2em 0 5em; + max-width: 248px; +} +#featured figure img {display: block; float: right;} + +#featured h2 {color: #C74451; font-size: 1.714em; margin-bottom: 0.333em;} +#featured h3 {font-size: 1.429em; margin-bottom: .5em;} + +#featured h3 a:link, #featured h3 a:visited {color: #000305; text-decoration: none;} +#featured h3 a:hover, #featured h3 a:active {color: #fff;} + +/* + Body +*****************/ +#content { + background: #fff; + margin-bottom: 2em; + overflow: hidden; + padding: 20px 20px; + max-width: 760px; + + border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; +} + +/* + Extras +*****************/ +#extras {margin: 0 auto 3em auto; overflow: hidden;} + +#extras ul {list-style: none; margin: 0;} +#extras li {border-bottom: 1px solid #fff;} +#extras h2 { + color: #C74350; + font-size: 1.429em; + margin-bottom: .25em; + padding: 0 3px; +} + +#extras a:link, #extras a:visited { + color: #444; + display: block; + border-bottom: 1px solid #F4E3E3; + text-decoration: none; + padding: .3em .25em; +} + +#extras a:hover, #extras a:active {color: #fff;} + + /* Blogroll */ + #extras .blogroll { + float: left; + max-width: 615px; + } + + #extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;} + + /* Social */ + #extras .social { + float: right; + max-width: 175px; + } + + #extras div[class='social'] a { + background-repeat: no-repeat; + background-position: 3px 6px; + padding-left: 25px; + } + + /* Icons */ + .social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');} + .social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');} + .social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');} + .social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');} + .social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');} + .social a[href*='github.com'], + .social a[href*='git.io'] { + background-image: url('../images/icons/github.png'); + background-size: 16px 16px; + } + .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');} + .social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');} + .social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');} + .social a[href*='news.ycombinator.com'], + .social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');} + .social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');} + .social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');} + .social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');} + .social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');} + .social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');} + .social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');} + .social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');} + .social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');} + .social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');} + .social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');} + +/* + About +*****************/ +#about { + background: #fff; + font-style: normal; + margin-bottom: 2em; + overflow: hidden; + padding: 20px; + text-align: left; + max-width: 760px; + + border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; +} + +#about .primary {float: left; max-width: 165px;} +#about .primary strong {color: #C64350; display: block; font-size: 1.286em;} +#about .photo {float: left; margin: 5px 20px;} + +#about .url:link, #about .url:visited {text-decoration: none;} + +#about .bio {float: right; max-width: 500px;} + +/* + Footer +*****************/ +#contentinfo {padding-bottom: 2em; text-align: right;} + +/***** Sections *****/ +/* Blog */ +.hentry { + display: block; + clear: both; + border-top: 1px solid #eee; + padding: 1.5em 0; +} +li:first-child .hentry, #content > .hentry {border: 0; margin: 0;} +#content > .hentry {padding: 1em 0;} +.hentry img{display : none ;} +.entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;} +.entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;} +.entry-title a:visited {background-color: #fff;} + +.hentry .post-info * {font-style: normal;} + + /* Content */ + .hentry footer {margin-bottom: 2em;} + .hentry footer address {display: inline;} + #posts-list footer address {display: block;} + + /* Blog Index */ + #posts-list {list-style: none; margin: 0;} + #posts-list .hentry {padding-left: 10px; position: relative;} + + #posts-list footer { + left: 10px; + position: relative; + float: left; + top: 0.5em; + max-width: 190px; + } + + /* About the Author */ + #about-author { + background: #f9f9f9; + clear: both; + font-style: normal; + margin: 2em 0; + padding: 10px 20px 15px 20px; + + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + } + + #about-author strong { + color: #C64350; + clear: both; + display: block; + font-size: 1.429em; + } + + #about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;} + + /* Comments */ + #comments-list {list-style: none; margin: 0 1em;} + #comments-list blockquote { + background: #f8f8f8; + clear: both; + font-style: normal; + margin: 0; + padding: 15px 20px; + + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + } + #comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;} + + #comments-list li:nth-child(2n) blockquote {background: #F5f5f5;} + + /* Add a Comment */ + #add-comment label {clear: left; float: left; text-align: left; max-width: 150px;} + #add-comment input[type='text'], + #add-comment input[type='email'], + #add-comment input[type='url'] {float: left; max-width: 200px;} + + #add-comment textarea {float: left; height: 150px; max-width: 495px;} + + #add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;} + + #add-comment input[type='submit'] {float: right; margin: 0 .5em;} + #add-comment * {margin-bottom: .5em;} + + +.literal { + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border: 1px solid #BCBEC0; + padding: 2px; + font:12px Monaco,Consolas,"Andale Mono","DejaVu Sans Mono",monospace +} diff --git a/themes/custom/static/css/pygment.css b/themes/custom/static/css/pygment.css new file mode 100644 index 0000000..fdd056f --- /dev/null +++ b/themes/custom/static/css/pygment.css @@ -0,0 +1,205 @@ +.hll { +background-color:#eee; +} +.c { +color:#408090; +font-style:italic; +} +.err { +border:1px solid #FF0000; +} +.k { +color:#007020; +font-weight:bold; +} +.o { +color:#666666; +} +.cm { +color:#408090; +font-style:italic; +} +.cp { +color:#007020; +} +.c1 { +color:#408090; +font-style:italic; +} +.cs { +background-color:#FFF0F0; +color:#408090; +} +.gd { +color:#A00000; +} +.ge { +font-style:italic; +} +.gr { +color:#FF0000; +} +.gh { +color:#000080; +font-weight:bold; +} +.gi { +color:#00A000; +} +.go { +color:#303030; +} +.gp { +color:#C65D09; +font-weight:bold; +} +.gs { +font-weight:bold; +} +.gu { +color:#800080; +font-weight:bold; +} +.gt { +color:#0040D0; +} +.kc { +color:#007020; +font-weight:bold; +} +.kd { +color:#007020; +font-weight:bold; +} +.kn { +color:#007020; +font-weight:bold; +} +.kp { +color:#007020; +} +.kr { +color:#007020; +font-weight:bold; +} +.kt { +color:#902000; +} +.m { +color:#208050; +} +.s { +color:#4070A0; +} +.na { +color:#4070A0; +} +.nb { +color:#007020; +} +.nc { +color:#0E84B5; +font-weight:bold; +} +.no { +color:#60ADD5; +} +.nd { +color:#555555; +font-weight:bold; +} +.ni { +color:#D55537; +font-weight:bold; +} +.ne { +color:#007020; +} +.nf { +color:#06287E; +} +.nl { +color:#002070; +font-weight:bold; +} +.nn { +color:#0E84B5; +font-weight:bold; +} +.nt { +color:#062873; +font-weight:bold; +} +.nv { +color:#BB60D5; +} +.ow { +color:#007020; +font-weight:bold; +} +.w { +color:#BBBBBB; +} +.mf { +color:#208050; +} +.mh { +color:#208050; +} +.mi { +color:#208050; +} +.mo { +color:#208050; +} +.sb { +color:#4070A0; +} +.sc { +color:#4070A0; +} +.sd { +color:#4070A0; +font-style:italic; +} +.s2 { +color:#4070A0; +} +.se { +color:#4070A0; +font-weight:bold; +} +.sh { +color:#4070A0; +} +.si { +color:#70A0D0; +font-style:italic; +} +.sx { +color:#C65D09; +} +.sr { +color:#235388; +} +.s1 { +color:#4070A0; +} +.ss { +color:#517918; +} +.bp { +color:#007020; +} +.vc { +color:#BB60D5; +} +.vg { +color:#BB60D5; +} +.vi { +color:#BB60D5; +} +.il { +color:#208050; +} diff --git a/themes/custom/static/css/reset.css b/themes/custom/static/css/reset.css new file mode 100644 index 0000000..c88e619 --- /dev/null +++ b/themes/custom/static/css/reset.css @@ -0,0 +1,52 @@ +/* + Name: Reset Stylesheet + Description: Resets browser's default CSS + Author: Eric Meyer + Author URI: https://meyerweb.com/eric/tools/css/reset/ +*/ + +/* v1.0 | 20080212 */ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, font, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td { + background: transparent; + border: 0; + font-size: 100%; + margin: 0; + outline: 0; + padding: 0; + vertical-align: baseline; +} + +body {line-height: 1;} + +ol, ul {list-style: none;} + +blockquote, q {quotes: none;} + +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} + +/* remember to define focus styles! */ +:focus { + outline: 0; +} + +/* remember to highlight inserts somehow! */ +ins {text-decoration: none;} +del {text-decoration: line-through;} + +/* tables still need 'cellspacing="0"' in the markup */ +table { + border-collapse: collapse; + border-spacing: 0; +} \ No newline at end of file diff --git a/themes/custom/static/css/typogrify.css b/themes/custom/static/css/typogrify.css new file mode 100644 index 0000000..3bae497 --- /dev/null +++ b/themes/custom/static/css/typogrify.css @@ -0,0 +1,3 @@ +.caps {font-size:.92em;} +.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;} +.dquo {margin-left:-.38em;} diff --git a/themes/custom/static/css/wide.css b/themes/custom/static/css/wide.css new file mode 100644 index 0000000..d505979 --- /dev/null +++ b/themes/custom/static/css/wide.css @@ -0,0 +1,57 @@ +@import url("main.css"); + +.literal { + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border: 1px solid #BCBEC0; + padding: 2px; + font:12px Monaco,Consolas,"Andale Mono","DejaVu Sans Mono",monospace +} + +body { + font:1.3em/1.3 "Hoefler Text","Georgia",Georgia,serif,sans-serif; +} + +.post-info{ + display: none; +} + +#banner nav { + display: none; + -moz-border-radius: 0px; + margin-bottom: 20px; + overflow: hidden; + font-size: 1em; + background: #F5F4EF; +} + +#banner nav ul{ + padding-right: 50px; +} + +#banner nav li{ + float: right; + color: #000; +} + +#banner nav li a { + color: #000; +} + +#banner h1 { + margin-bottom: -18px; +} + +#featured, #extras { + padding: 50px; +} + +#featured { + padding-top: 20px; +} + +#extras { + padding-top: 0px; + padding-bottom: 0px; +} diff --git a/themes/custom/static/fonts/Yanone_Kaffeesatz_400.eot b/themes/custom/static/fonts/Yanone_Kaffeesatz_400.eot new file mode 100644 index 0000000..b3b90db Binary files /dev/null and b/themes/custom/static/fonts/Yanone_Kaffeesatz_400.eot differ diff --git a/themes/custom/static/fonts/Yanone_Kaffeesatz_400.svg b/themes/custom/static/fonts/Yanone_Kaffeesatz_400.svg new file mode 100644 index 0000000..a69669b --- /dev/null +++ b/themes/custom/static/fonts/Yanone_Kaffeesatz_400.svg @@ -0,0 +1,407 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/custom/static/fonts/Yanone_Kaffeesatz_400.ttf b/themes/custom/static/fonts/Yanone_Kaffeesatz_400.ttf new file mode 100644 index 0000000..6f4feb0 Binary files /dev/null and b/themes/custom/static/fonts/Yanone_Kaffeesatz_400.ttf differ diff --git a/themes/custom/static/fonts/Yanone_Kaffeesatz_400.woff b/themes/custom/static/fonts/Yanone_Kaffeesatz_400.woff new file mode 100644 index 0000000..ddccf76 Binary files /dev/null and b/themes/custom/static/fonts/Yanone_Kaffeesatz_400.woff differ diff --git a/themes/custom/static/fonts/Yanone_Kaffeesatz_400.woff2 b/themes/custom/static/fonts/Yanone_Kaffeesatz_400.woff2 new file mode 100644 index 0000000..7b18f7e Binary files /dev/null and b/themes/custom/static/fonts/Yanone_Kaffeesatz_400.woff2 differ diff --git a/themes/custom/static/fonts/font.css b/themes/custom/static/fonts/font.css new file mode 100644 index 0000000..a9eb87e --- /dev/null +++ b/themes/custom/static/fonts/font.css @@ -0,0 +1,12 @@ +@font-face { + font-family: 'Yanone Kaffeesatz'; + font-style: normal; + font-weight: 400; + src: + local('Yanone Kaffeesatz Regular'), + local('YanoneKaffeesatz-Regular'), + /* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */ + url('Yanone_Kaffeesatz_400.woff') format('woff'), + /* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */ + url('Yanone_Kaffeesatz_400.woff2') format('woff2'); +} diff --git a/themes/custom/static/images/icons/aboutme.png b/themes/custom/static/images/icons/aboutme.png new file mode 100644 index 0000000..600110f Binary files /dev/null and b/themes/custom/static/images/icons/aboutme.png differ diff --git a/themes/custom/static/images/icons/bitbucket.png b/themes/custom/static/images/icons/bitbucket.png new file mode 100644 index 0000000..277a7df Binary files /dev/null and b/themes/custom/static/images/icons/bitbucket.png differ diff --git a/themes/custom/static/images/icons/delicious.png b/themes/custom/static/images/icons/delicious.png new file mode 100644 index 0000000..34868c5 Binary files /dev/null and b/themes/custom/static/images/icons/delicious.png differ diff --git a/themes/custom/static/images/icons/facebook.png b/themes/custom/static/images/icons/facebook.png new file mode 100644 index 0000000..1d8a432 Binary files /dev/null and b/themes/custom/static/images/icons/facebook.png differ diff --git a/themes/custom/static/images/icons/github.png b/themes/custom/static/images/icons/github.png new file mode 100644 index 0000000..5d9109d Binary files /dev/null and b/themes/custom/static/images/icons/github.png differ diff --git a/themes/custom/static/images/icons/gitorious.png b/themes/custom/static/images/icons/gitorious.png new file mode 100644 index 0000000..a6705d0 Binary files /dev/null and b/themes/custom/static/images/icons/gitorious.png differ diff --git a/themes/custom/static/images/icons/gittip.png b/themes/custom/static/images/icons/gittip.png new file mode 100644 index 0000000..b9f67aa Binary files /dev/null and b/themes/custom/static/images/icons/gittip.png differ diff --git a/themes/custom/static/images/icons/google-groups.png b/themes/custom/static/images/icons/google-groups.png new file mode 100644 index 0000000..bbd0a0f Binary files /dev/null and b/themes/custom/static/images/icons/google-groups.png differ diff --git a/themes/custom/static/images/icons/google-plus.png b/themes/custom/static/images/icons/google-plus.png new file mode 100644 index 0000000..f8553d4 Binary files /dev/null and b/themes/custom/static/images/icons/google-plus.png differ diff --git a/themes/custom/static/images/icons/hackernews.png b/themes/custom/static/images/icons/hackernews.png new file mode 100644 index 0000000..8e05e3e Binary files /dev/null and b/themes/custom/static/images/icons/hackernews.png differ diff --git a/themes/custom/static/images/icons/lastfm.png b/themes/custom/static/images/icons/lastfm.png new file mode 100644 index 0000000..2eedd2d Binary files /dev/null and b/themes/custom/static/images/icons/lastfm.png differ diff --git a/themes/custom/static/images/icons/linkedin.png b/themes/custom/static/images/icons/linkedin.png new file mode 100644 index 0000000..06a8801 Binary files /dev/null and b/themes/custom/static/images/icons/linkedin.png differ diff --git a/themes/custom/static/images/icons/reddit.png b/themes/custom/static/images/icons/reddit.png new file mode 100644 index 0000000..d826d3e Binary files /dev/null and b/themes/custom/static/images/icons/reddit.png differ diff --git a/themes/custom/static/images/icons/rss.png b/themes/custom/static/images/icons/rss.png new file mode 100644 index 0000000..12448f5 Binary files /dev/null and b/themes/custom/static/images/icons/rss.png differ diff --git a/themes/custom/static/images/icons/slideshare.png b/themes/custom/static/images/icons/slideshare.png new file mode 100644 index 0000000..9cbe858 Binary files /dev/null and b/themes/custom/static/images/icons/slideshare.png differ diff --git a/themes/custom/static/images/icons/speakerdeck.png b/themes/custom/static/images/icons/speakerdeck.png new file mode 100644 index 0000000..7281ec4 Binary files /dev/null and b/themes/custom/static/images/icons/speakerdeck.png differ diff --git a/themes/custom/static/images/icons/stackoverflow.png b/themes/custom/static/images/icons/stackoverflow.png new file mode 100644 index 0000000..3c6862e Binary files /dev/null and b/themes/custom/static/images/icons/stackoverflow.png differ diff --git a/themes/custom/static/images/icons/twitter.png b/themes/custom/static/images/icons/twitter.png new file mode 100644 index 0000000..cef1cef Binary files /dev/null and b/themes/custom/static/images/icons/twitter.png differ diff --git a/themes/custom/static/images/icons/vimeo.png b/themes/custom/static/images/icons/vimeo.png new file mode 100644 index 0000000..4b9d721 Binary files /dev/null and b/themes/custom/static/images/icons/vimeo.png differ diff --git a/themes/custom/static/images/icons/youtube.png b/themes/custom/static/images/icons/youtube.png new file mode 100644 index 0000000..e334e68 Binary files /dev/null and b/themes/custom/static/images/icons/youtube.png differ diff --git a/themes/custom/templates/analytics.html b/themes/custom/templates/analytics.html new file mode 100644 index 0000000..071c77f --- /dev/null +++ b/themes/custom/templates/analytics.html @@ -0,0 +1,26 @@ +{% if GOOGLE_ANALYTICS %} + +{% endif %} +{% if GAUGES %} + +{% endif %} diff --git a/themes/custom/templates/archives.html b/themes/custom/templates/archives.html new file mode 100644 index 0000000..f678494 --- /dev/null +++ b/themes/custom/templates/archives.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} +{% block content %} +
+

Archives for {{ SITENAME }}

+ +
+{% for article in dates %} +
{{ article.locale_date }}
+
{{ article.title }}
+{% endfor %} +
+
+{% endblock %} diff --git a/themes/custom/templates/article.html b/themes/custom/templates/article.html new file mode 100644 index 0000000..6abcb09 --- /dev/null +++ b/themes/custom/templates/article.html @@ -0,0 +1,53 @@ +{% extends "base.html" %} +{% block html_lang %}{{ article.lang }}{% endblock %} +{% block head -%} + {{ super() -}} + {% if article.summary %} + + {% endif %} +{% endblock %} + +{% block title %}{{ article.title|striptags }}{% endblock %} + +{% block extra_head %} +{% import 'translations.html' as translations with context %} +{% if translations.entry_hreflang(article) %} + {{ translations.entry_hreflang(article) }} +{% endif %} +{% endblock %} + +{% block content %} +
+
+
+

+ {{ article.title }}

+ {% include 'twitter.html' %} +
+ +
+ {% include 'article_infos.html' %} + {{ article.content }} +
+ {% if DISQUS_SITENAME and SITEURL and article.status != "draft" %} +
+

Comments !

+
+ + +
+ {% endif %} + +
+
+{% endblock %} diff --git a/themes/custom/templates/article_infos.html b/themes/custom/templates/article_infos.html new file mode 100644 index 0000000..172ad85 --- /dev/null +++ b/themes/custom/templates/article_infos.html @@ -0,0 +1,23 @@ +
+ + Published: {{ article.locale_date }} + + {% if article.modified %} +
+ + Updated: {{ article.locale_modified }} + + {% endif %} + + {% if article.authors %} +
+ By {% for author in article.authors %} + {{ author }} + {% endfor %} +
+ {% endif %} +

In {{ article.category }}.

+{% include 'taglist.html' %} +{% import 'translations.html' as translations with context %} +{{ translations.translations_for(article) }} +
diff --git a/themes/custom/templates/author.html b/themes/custom/templates/author.html new file mode 100644 index 0000000..0b37290 --- /dev/null +++ b/themes/custom/templates/author.html @@ -0,0 +1,2 @@ +{% extends "index.html" %} +{% block title %}{{ SITENAME }} - {{ author }}{% endblock %} diff --git a/themes/custom/templates/authors.html b/themes/custom/templates/authors.html new file mode 100644 index 0000000..e61a332 --- /dev/null +++ b/themes/custom/templates/authors.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} + +{% block title %}{{ SITENAME }} - Authors{% endblock %} + +{% block content %} + +
+

Authors on {{ SITENAME }}

+
    + {% for author, articles in authors|sort %} +
  • {{ author }} ({{ articles|count }})
    • + {% endfor %} +
+
+ +{% endblock %} diff --git a/themes/custom/templates/base.html b/themes/custom/templates/base.html new file mode 100644 index 0000000..2b30289 --- /dev/null +++ b/themes/custom/templates/base.html @@ -0,0 +1,83 @@ + + + + {% block head %} + + + + {% block title %}{{ SITENAME }}{%endblock%} + + {% if FEED_ALL_ATOM %} + + {% endif %} + {% if FEED_ALL_RSS %} + + {% endif %} + {% block extra_head %}{% endblock extra_head %} + {% endblock head %} + + + +{% include 'github.html' %} + + {% block content %} + {% endblock %} +
+ {% if LINKS %} +
+

{{ LINKS_WIDGET_NAME | default('links') }}

+
    + {% for name, link in LINKS %} +
  • {{ name }}
    • + {% endfor %} +
+
+ {% endif %} + {% if SOCIAL or FEED_ALL_ATOM or FEED_ALL_RSS %} + + {% endif %} +
+ + + +{% include 'analytics.html' %} +{% include 'disqus_script.html' %} + + diff --git a/themes/custom/templates/categories.html b/themes/custom/templates/categories.html new file mode 100644 index 0000000..07f6290 --- /dev/null +++ b/themes/custom/templates/categories.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} + +{% block title %}{{ SITENAME }} - Categories{% endblock %} + +{% block content %} + +
+

Categories for {{ SITENAME }}

+
    + {% for category, articles in categories|sort %} +
  • {{ category }} ({{ articles|count }})
    • + {% endfor %} +
+
+ +{% endblock %} diff --git a/themes/custom/templates/category.html b/themes/custom/templates/category.html new file mode 100644 index 0000000..56f8e93 --- /dev/null +++ b/themes/custom/templates/category.html @@ -0,0 +1,2 @@ +{% extends "index.html" %} +{% block title %}{{ SITENAME }} - {{ category }}{% endblock %} diff --git a/themes/custom/templates/comments.html b/themes/custom/templates/comments.html new file mode 100644 index 0000000..bb033c0 --- /dev/null +++ b/themes/custom/templates/comments.html @@ -0,0 +1 @@ +{% if DISQUS_SITENAME %}

There are comments.

{% endif %} diff --git a/themes/custom/templates/disqus_script.html b/themes/custom/templates/disqus_script.html new file mode 100644 index 0000000..23ec532 --- /dev/null +++ b/themes/custom/templates/disqus_script.html @@ -0,0 +1,11 @@ +{% if DISQUS_SITENAME %} + +{% endif %} diff --git a/themes/custom/templates/github.html b/themes/custom/templates/github.html new file mode 100644 index 0000000..ccc401f --- /dev/null +++ b/themes/custom/templates/github.html @@ -0,0 +1,9 @@ +{% if GITHUB_URL %} + +{% if GITHUB_POSITION != "left" %} +Fork me on GitHub +{% else %} +Fork me on GitHub +{% endif %} + +{% endif %} diff --git a/themes/custom/templates/index.html b/themes/custom/templates/index.html new file mode 100644 index 0000000..14e9c14 --- /dev/null +++ b/themes/custom/templates/index.html @@ -0,0 +1,65 @@ +{% extends "base.html" %} +{% block content_title %}{% endblock %} +{% block content %} +{% if articles %} + {% for article in articles_page.object_list %} + + {# First item #} + {% if loop.first and not articles_page.has_previous() %} + + {% if loop.length > 1 %} +
+

Other articles

+
+
    + {% endif %} + {# other items #} + {% else %} + {% if loop.first %} +
    +
      + {% endif %} +
    1. +
      +

      {{ article.title }}

      +
      + +
      + {% include 'article_infos.html' %} + {{ article.summary }} + read more + {% include 'comments.html' %} +
      +
      2. + {% endif %} + {% if loop.last %} + {% if loop.length > 1 or articles_page.has_other_pages() %} +
    + {% if articles_page.has_other_pages() %} + {% include 'pagination.html' %} + {% endif %} +
    + {% endif %} + {% endif %} + {% endfor %} +{% else %} +
    + {% if pages %} +

    Pages

    + + {% else %} +

    This site currently has no content.

    + {% endif %} +
    +{% endif %} +{% endblock content %} diff --git a/themes/custom/templates/page.html b/themes/custom/templates/page.html new file mode 100644 index 0000000..428c47f --- /dev/null +++ b/themes/custom/templates/page.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} +{% block html_lang %}{{ page.lang }}{% endblock %} +{% block title %}{{ page.title|striptags }}{% endblock %} + +{% block extra_head %} +{% import 'translations.html' as translations with context %} +{% if translations.entry_hreflang(page) %} + {{ translations.entry_hreflang(page) }} +{% endif %} +{% endblock %} + +{% block content %} +
    +

    {{ page.title }}

    + {% import 'translations.html' as translations with context %} + {{ translations.translations_for(page) }} + {{ page.content }} +
    +{% endblock %} diff --git a/themes/custom/templates/period_archives.html b/themes/custom/templates/period_archives.html new file mode 100644 index 0000000..252e002 --- /dev/null +++ b/themes/custom/templates/period_archives.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} +{% block content %} +
    +

    Archives for {{ period | reverse | join(' ') }}

    + +
    +{% for article in dates %} +
    {{ article.locale_date }}
    +
    {{ article.title }}
    +{% endfor %} +
    +
    +{% endblock %} diff --git a/themes/custom/templates/tag.html b/themes/custom/templates/tag.html new file mode 100644 index 0000000..68cdcba --- /dev/null +++ b/themes/custom/templates/tag.html @@ -0,0 +1,2 @@ +{% extends "index.html" %} +{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %} diff --git a/themes/custom/templates/taglist.html b/themes/custom/templates/taglist.html new file mode 100644 index 0000000..58f3557 --- /dev/null +++ b/themes/custom/templates/taglist.html @@ -0,0 +1 @@ +{% if article.tags %}

    tags: {% for tag in article.tags %}{{ tag | escape }} {% endfor %}

    {% endif %} diff --git a/themes/custom/templates/tags.html b/themes/custom/templates/tags.html new file mode 100644 index 0000000..fb09955 --- /dev/null +++ b/themes/custom/templates/tags.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} + +{% block title %}{{ SITENAME }} - Tags{% endblock %} + +{% block content %} + +
    +

    Tags for {{ SITENAME }}

    +
      + {% for tag, articles in tags|sort %} +
    • {{ tag }} ({{ articles|count }})
      • + {% endfor %} +
    +
    + +{% endblock %} diff --git a/themes/custom/templates/translations.html b/themes/custom/templates/translations.html new file mode 100644 index 0000000..1eec7c4 --- /dev/null +++ b/themes/custom/templates/translations.html @@ -0,0 +1,16 @@ +{% macro translations_for(article) %} +{% if article.translations %} +Translations: + {% for translation in article.translations %} + {{ translation.lang }} + {% endfor %} +{% endif %} +{% endmacro %} + +{% macro entry_hreflang(entry) %} +{% if entry.translations %} + {% for translation in entry.translations %} + + {% endfor %} +{% endif %} +{% endmacro %} diff --git a/themes/custom/templates/twitter.html b/themes/custom/templates/twitter.html new file mode 100644 index 0000000..bf78c32 --- /dev/null +++ b/themes/custom/templates/twitter.html @@ -0,0 +1,3 @@ +{% if TWITTER_USERNAME %} + +{% endif %}