From 8945af704716d47e69dec8dfc896ea79f2a578db Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 17 Jul 2020 00:31:34 +0100 Subject: [PATCH 01/18] Updating gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 521b971..0ff9c79 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ blog/node_modules # static blog/static +!blog/static/images test/ .DS_Store From 9785d6648cab10069d4d6a85ae42cc404753e0a0 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 17 Jul 2020 00:32:12 +0100 Subject: [PATCH 02/18] Removing redundant gulp scripts --- blog/package.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/blog/package.json b/blog/package.json index a77ea87..21f0f87 100644 --- a/blog/package.json +++ b/blog/package.json @@ -14,14 +14,7 @@ "webpack": "^4.43.0" }, "scripts": { - "buildSearch": "gulp buildSearch", - "buildHugo": "gulp buildHugo", "buildBlog": "gulp buildBlog", - "buildTheme": "gulp buildTheme", - "buildLunr": "gulp buildLunr", - "cleanJS": "gulp cleanJS", - "insertJS": "gulp insertJS", - "minifyJS": "gulp minifyJS", - "minifyImages": "gulp minifyImages" + "buildLunr": "gulp buildLunr" } } From 79ebc1dc2b1cd957ec258fce9f52cbbc16359d72 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 17 Jul 2020 00:32:27 +0100 Subject: [PATCH 03/18] Updating terraform with s3 policy --- infrastructure/main.tf | 2 +- .../terraform.tfstate.d/prod-eu-west-1/terraform.tfstate | 2 +- .../prod-eu-west-1/terraform.tfstate.backup | 9 ++++----- infrastructure/variables.tf | 4 ---- infrastructure/variables/prod-eu-west-1.tfvars | 1 - 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/infrastructure/main.tf b/infrastructure/main.tf index c22396d..9a3a28b 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -35,7 +35,7 @@ module "cloudfront_s3_cdn" { "Effect":"Allow", "Principal": "*", "Action":["s3:GetObject"], - "Resource": "arn:aws:s3:::${var.bucket_name}/*" + "Resource": "arn:aws:s3:::${module.cloudfront_s3_cdn.s3_bucket}/*" } ] } diff --git a/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate b/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate index 312ecd7..b2e19b7 100644 --- a/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate +++ b/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "0.12.26", - "serial": 90, + "serial": 97, "lineage": "cda52006-90fc-4aec-a630-42e69057b365", "outputs": { "cf_arn": { diff --git a/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate.backup b/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate.backup index f4171dd..18e8848 100644 --- a/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate.backup +++ b/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "0.12.26", - "serial": 88, + "serial": 95, "lineage": "cda52006-90fc-4aec-a630-42e69057b365", "outputs": { "cf_arn": { @@ -50,7 +50,7 @@ "attributes": { "id": "1149999058", "json": "{\n \"Version\": \"2012-10-17\",\n \"Statement\": [\n {\n \"Sid\": \"S3GetObjectForCloudFront\",\n \"Effect\": \"Allow\",\n \"Action\": \"s3:GetObject\",\n \"Resource\": \"arn:aws:s3:::${bucket_name}${origin_path}*\",\n \"Principal\": {\n \"AWS\": \"${cloudfront_origin_access_identity_iam_arn}\"\n }\n },\n {\n \"Sid\": \"S3ListBucketForCloudFront\",\n \"Effect\": \"Allow\",\n \"Action\": \"s3:ListBucket\",\n \"Resource\": \"arn:aws:s3:::${bucket_name}\",\n \"Principal\": {\n \"AWS\": \"${cloudfront_origin_access_identity_iam_arn}\"\n }\n }\n ]\n}", - "override_json": "{\n \"Sid\":\"PublicRead\",\n \"Effect\":\"Allow\",\n \"Principal\": \"*\",\n \"Action\":[\"s3:GetObject\"],\n \"Resource\": \"arn:aws:s3:::prod-panaetius-blog-origin/*\"\n}\n", + "override_json": "{}", "policy_id": null, "source_json": null, "statement": [ @@ -116,7 +116,7 @@ "attributes": { "id": "239689126", "json": "{\n \"Version\": \"2012-10-17\",\n \"Statement\": [\n {\n \"Sid\": \"S3GetObjectForCloudFront\",\n \"Effect\": \"Allow\",\n \"Action\": \"s3:GetObject\",\n \"Resource\": \"arn:aws:s3:::${bucket_name}${origin_path}*\",\n \"Principal\": {\n \"AWS\": \"*\"\n }\n }\n ]\n}", - "override_json": "{\n \"Sid\":\"PublicRead\",\n \"Effect\":\"Allow\",\n \"Principal\": \"*\",\n \"Action\":[\"s3:GetObject\"],\n \"Resource\": \"arn:aws:s3:::prod-panaetius-blog-origin/*\"\n}\n", + "override_json": "{}", "policy_id": null, "source_json": null, "statement": [ @@ -729,11 +729,10 @@ "attributes": { "bucket": "prod-panaetius-blog-origin", "id": "prod-panaetius-blog-origin", - "policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"S3GetObjectForCloudFront\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity E21A7YWJ1RT3K5\"},\"Action\":\"s3:GetObject\",\"Resource\":\"arn:aws:s3:::prod-panaetius-blog-origin/*\"},{\"Sid\":\"S3ListBucketForCloudFront\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity E21A7YWJ1RT3K5\"},\"Action\":\"s3:ListBucket\",\"Resource\":\"arn:aws:s3:::prod-panaetius-blog-origin\"}]}" + "policy": "{\n \"Version\": \"2012-10-17\",\n \"Statement\": [\n {\n \"Sid\": \"S3GetObjectForCloudFront\",\n \"Effect\": \"Allow\",\n \"Action\": \"s3:GetObject\",\n \"Resource\": \"arn:aws:s3:::prod-panaetius-blog-origin/*\",\n \"Principal\": {\n \"AWS\": \"arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity E21A7YWJ1RT3K5\"\n }\n },\n {\n \"Sid\": \"S3ListBucketForCloudFront\",\n \"Effect\": \"Allow\",\n \"Action\": \"s3:ListBucket\",\n \"Resource\": \"arn:aws:s3:::prod-panaetius-blog-origin\",\n \"Principal\": {\n \"AWS\": \"arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity E21A7YWJ1RT3K5\"\n }\n }\n ]\n}" }, "private": "bnVsbA==", "dependencies": [ - "module.cloudfront_s3_cdn.aws_cloudfront_origin_access_identity.default", "module.cloudfront_s3_cdn.aws_s3_bucket.origin" ] } diff --git a/infrastructure/variables.tf b/infrastructure/variables.tf index 837bbd3..f6ef5db 100644 --- a/infrastructure/variables.tf +++ b/infrastructure/variables.tf @@ -14,10 +14,6 @@ variable "profile" { } -variable "bucket_name" { - -} - variable "acm_certificate_arn" { } diff --git a/infrastructure/variables/prod-eu-west-1.tfvars b/infrastructure/variables/prod-eu-west-1.tfvars index f74486a..d100a69 100644 --- a/infrastructure/variables/prod-eu-west-1.tfvars +++ b/infrastructure/variables/prod-eu-west-1.tfvars @@ -2,7 +2,6 @@ name = "panaetius-blog" region = "eu-west-1" stage = "prod" profile = "admin" -bucket_name = "prod-panaetius-blog-origin" acm_certificate_arn = "arn:aws:acm:us-east-1:745437999005:certificate/60af49f0-07bb-4680-8f5b-3c9a33f756e5" parent_zone_id = "Z05316671VABVSMAAF1RC" aliases = ["panaetius.io"] From b484a1ce1715d44526b740f044a3db2251106216 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 17 Jul 2020 00:40:59 +0100 Subject: [PATCH 04/18] Updating gitignore Ignoring blog/static but not blog/static/images --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0ff9c79..3e1ab97 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ blog/node_modules # static blog/static -!blog/static/images +!blog/static/images/* test/ .DS_Store From 9e83be091efa859387667f3666fef1d63797cded Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 17 Jul 2020 00:41:10 +0100 Subject: [PATCH 05/18] Adding blog images to LFS --- blog/static/images/front-images/world.svg | 1 + blog/static/images/icons/Extraterrestrials.svg | 1 + blog/static/images/icons/Gods.png | 3 +++ blog/static/images/icons/Kraken.png | 3 +++ blog/static/images/icons/Wizard.png | 3 +++ blog/static/images/icons/info-icon-notice.png | 3 +++ blog/static/images/icons/note-icon-notice.png | 3 +++ blog/static/images/icons/series-icon-notice.png | 3 +++ blog/static/images/icons/series-scarecrow.png | 3 +++ blog/static/images/icons/tip-icon-notice.png | 3 +++ blog/static/images/icons/warning-icon-notice.png | 3 +++ 11 files changed, 29 insertions(+) create mode 100644 blog/static/images/front-images/world.svg create mode 100644 blog/static/images/icons/Extraterrestrials.svg create mode 100644 blog/static/images/icons/Gods.png create mode 100644 blog/static/images/icons/Kraken.png create mode 100644 blog/static/images/icons/Wizard.png create mode 100644 blog/static/images/icons/info-icon-notice.png create mode 100644 blog/static/images/icons/note-icon-notice.png create mode 100644 blog/static/images/icons/series-icon-notice.png create mode 100644 blog/static/images/icons/series-scarecrow.png create mode 100644 blog/static/images/icons/tip-icon-notice.png create mode 100644 blog/static/images/icons/warning-icon-notice.png diff --git a/blog/static/images/front-images/world.svg b/blog/static/images/front-images/world.svg new file mode 100644 index 0000000..822f455 --- /dev/null +++ b/blog/static/images/front-images/world.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/blog/static/images/icons/Extraterrestrials.svg b/blog/static/images/icons/Extraterrestrials.svg new file mode 100644 index 0000000..ec1fbe9 --- /dev/null +++ b/blog/static/images/icons/Extraterrestrials.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/blog/static/images/icons/Gods.png b/blog/static/images/icons/Gods.png new file mode 100644 index 0000000..be95c69 --- /dev/null +++ b/blog/static/images/icons/Gods.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9133885cabc71992e566fba8a0c29a3be3671e3866d29a25d41a2265ab6321c +size 5955 diff --git a/blog/static/images/icons/Kraken.png b/blog/static/images/icons/Kraken.png new file mode 100644 index 0000000..c3ce784 --- /dev/null +++ b/blog/static/images/icons/Kraken.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb2ebede545f670d24f42093c7e279677d787fe0da6f4d0f92447cd96eb13f5f +size 11800 diff --git a/blog/static/images/icons/Wizard.png b/blog/static/images/icons/Wizard.png new file mode 100644 index 0000000..6961f1a --- /dev/null +++ b/blog/static/images/icons/Wizard.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3cb3693db4ae5860bbb858d87130dd3c6437d75513e47fd4687dea3f44fd039 +size 9941 diff --git a/blog/static/images/icons/info-icon-notice.png b/blog/static/images/icons/info-icon-notice.png new file mode 100644 index 0000000..aaa08bf --- /dev/null +++ b/blog/static/images/icons/info-icon-notice.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddad3778f8056e86cc8f2943d4901213479d1466813bd35cfdc67f1863015b24 +size 5289 diff --git a/blog/static/images/icons/note-icon-notice.png b/blog/static/images/icons/note-icon-notice.png new file mode 100644 index 0000000..0758900 --- /dev/null +++ b/blog/static/images/icons/note-icon-notice.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dce0d1b29b2d5af6b969f95bef14d47c9c8ad4e18a0b4f9b3dc2319c68dce9d6 +size 3290 diff --git a/blog/static/images/icons/series-icon-notice.png b/blog/static/images/icons/series-icon-notice.png new file mode 100644 index 0000000..0e2f6cd --- /dev/null +++ b/blog/static/images/icons/series-icon-notice.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bf5ed5d1e9b56c4aad183350caeed421a4b6abc27940d198fdf89781f9c72bf +size 14397 diff --git a/blog/static/images/icons/series-scarecrow.png b/blog/static/images/icons/series-scarecrow.png new file mode 100644 index 0000000..161329f --- /dev/null +++ b/blog/static/images/icons/series-scarecrow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46b1dcc910219b41d0ca64058b62e00587851db5f88d7e577be7521ec699e4b1 +size 5581 diff --git a/blog/static/images/icons/tip-icon-notice.png b/blog/static/images/icons/tip-icon-notice.png new file mode 100644 index 0000000..3642180 --- /dev/null +++ b/blog/static/images/icons/tip-icon-notice.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b166ebc9322129c0d10a7555a7014a7e7124604c32e69dbd6eb2d5d07a5de99 +size 3463 diff --git a/blog/static/images/icons/warning-icon-notice.png b/blog/static/images/icons/warning-icon-notice.png new file mode 100644 index 0000000..a6f1ce2 --- /dev/null +++ b/blog/static/images/icons/warning-icon-notice.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83d2a04cec7f942033cb7d08e88ae7b06d9b79891397956d717b93c45cb04429 +size 5793 From a687826fdfc077d2a0c7f248442ee01e727e6e8d Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 17 Jul 2020 01:01:36 +0100 Subject: [PATCH 06/18] Updating Hugo config.toml changing baseURL to panaetius.io --- blog/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog/config.toml b/blog/config.toml index 382010d..80398c6 100644 --- a/blog/config.toml +++ b/blog/config.toml @@ -1,4 +1,4 @@ -baseURL = "http://127.0.0.1:6060" +baseURL = "panaetius.io" title = "panaetius.io" # theme = "panaetius-chunky-theme" theme = ["hugo-notice-admonition", "panaetius-theme"] From b7a7ab65390088fdfb464ae010b2d8fcac498e21 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Sun, 19 Jul 2020 03:28:31 +0100 Subject: [PATCH 07/18] Updating latest --- blog/config.toml | 3 +- .../lambda/prod-panaetius-blog-lambda/main.js | 22 ++ .../prod-panaetius-blog-lambda/main.zip | Bin 0 -> 546 bytes infrastructure/main.tf | 128 ++++++++-- .../prod-eu-west-1/terraform.tfstate | 222 ++++++++++++++-- .../prod-eu-west-1/terraform.tfstate.backup | 236 ++++++++++++++++-- infrastructure/variables.tf | 23 +- .../variables/prod-eu-west-1.tfvars | 21 +- 8 files changed, 581 insertions(+), 74 deletions(-) create mode 100644 infrastructure/lambda/prod-panaetius-blog-lambda/main.js create mode 100644 infrastructure/lambda/prod-panaetius-blog-lambda/main.zip diff --git a/blog/config.toml b/blog/config.toml index 80398c6..44dcf57 100644 --- a/blog/config.toml +++ b/blog/config.toml @@ -1,4 +1,5 @@ -baseURL = "panaetius.io" +baseURL = "https://panaetius.io/" +# relativeURLs = true title = "panaetius.io" # theme = "panaetius-chunky-theme" theme = ["hugo-notice-admonition", "panaetius-theme"] diff --git a/infrastructure/lambda/prod-panaetius-blog-lambda/main.js b/infrastructure/lambda/prod-panaetius-blog-lambda/main.js new file mode 100644 index 0000000..8ddc9f2 --- /dev/null +++ b/infrastructure/lambda/prod-panaetius-blog-lambda/main.js @@ -0,0 +1,22 @@ +"use strict"; + +exports.handler = (event, context, callback) => { + // Extract the request from the Cloudfront event that is sent to Lambda@Edge + var request = event.Records[0].cf.request; + + // Extract the URI from the request + var oldURI = request.url; + + // Match any '/' that occurs at the end of a URI. Replace it with a default index + var newURI = oldURI.replace(/\/$, '\/index.html'/); + + // Log the URI as received by Cloudfront and the new URI to be used to fetch from the origin + console.log(`Old URI: ${oldURI}`); + console.log(`New URI: ${newURI}`); + + // Replace the received URI with the URI that includes the index page + request.uri = newURI; + + // Return to Cloudfront + return callback(null, request) +}; diff --git a/infrastructure/lambda/prod-panaetius-blog-lambda/main.zip b/infrastructure/lambda/prod-panaetius-blog-lambda/main.zip new file mode 100644 index 0000000000000000000000000000000000000000..8913aa049804cde1ce8bb7b5067aeb1ca23237d4 GIT binary patch literal 546 zcmWIWW@Zs#U|`^2NSggI;A-KwraDFjhO0~r4D1Xt47rJ!d3ssJp&^_M%oT41<12x< zw1S&~k>x8;6m^)nh^B0R-nBHqMkI&Z$$x8t+05DtGj7n_$)f6ArHZx>?LqC;bkncy!6AT$qh%nzj)0S~gidp=&AeMxS;hnOf~o z4m9scopZw6V`X0`($uYeQjcz% zaZd5B*h0(vGxL@o&6%)i+Sjw37yWdOe(T^l_4&QR-72T)k2&V*9ThtGcGAz})_do4 z*;n4$CCYd2ZGd;5<@C~R)sN5g-#h$8h&8U<@5uaR*E`n1qz9`9~(tY4|yWN*%Nw5T54|l!~nT}iE28}KQm@bixEG`AK=Z% uB*%;^0wsVE%fJAPDTXDDAQn72Ss~Gh7L@_stZX1 Date: Tue, 21 Jul 2020 23:26:23 +0100 Subject: [PATCH 08/18] Updating terraform --- .../lambda/prod-panaetius-blog-lambda/main.js | 13 +- .../prod-panaetius-blog-lambda/main.js.zip | Bin 0 -> 601 bytes .../prod-panaetius-blog-lambda/main.zip | Bin 546 -> 0 bytes infrastructure/main.tf | 63 ++++---- .../prod-eu-west-1/terraform.tfstate | 151 ++++++----------- .../prod-eu-west-1/terraform.tfstate.backup | 153 ++++++------------ .../variables/prod-eu-west-1.tfvars | 2 +- 7 files changed, 135 insertions(+), 247 deletions(-) create mode 100644 infrastructure/lambda/prod-panaetius-blog-lambda/main.js.zip delete mode 100644 infrastructure/lambda/prod-panaetius-blog-lambda/main.zip diff --git a/infrastructure/lambda/prod-panaetius-blog-lambda/main.js b/infrastructure/lambda/prod-panaetius-blog-lambda/main.js index 8ddc9f2..6c9f2bf 100644 --- a/infrastructure/lambda/prod-panaetius-blog-lambda/main.js +++ b/infrastructure/lambda/prod-panaetius-blog-lambda/main.js @@ -5,10 +5,17 @@ exports.handler = (event, context, callback) => { var request = event.Records[0].cf.request; // Extract the URI from the request - var oldURI = request.url; + var oldURI = request.uri; // Match any '/' that occurs at the end of a URI. Replace it with a default index - var newURI = oldURI.replace(/\/$, '\/index.html'/); + function replace_uri(uri) { + uri = uri.replace(/\/$/, "/index.html"); + // uri = uri.replace(/\.io\/search\?q\=(.*)/, ".io/search/index.html?q=$1"); + // console.log(uri) + return uri; + } + // var newURI = oldURI.replace(/\/$/, "/index.html"); + var newURI = replace_uri(oldURI); // Log the URI as received by Cloudfront and the new URI to be used to fetch from the origin console.log(`Old URI: ${oldURI}`); @@ -18,5 +25,5 @@ exports.handler = (event, context, callback) => { request.uri = newURI; // Return to Cloudfront - return callback(null, request) + return callback(null, request); }; diff --git a/infrastructure/lambda/prod-panaetius-blog-lambda/main.js.zip b/infrastructure/lambda/prod-panaetius-blog-lambda/main.js.zip new file mode 100644 index 0000000000000000000000000000000000000000..bfff512512451196e00197d92602eee1e58489f2 GIT binary patch literal 601 zcmWIWW@Zs#-~d7f2E{HQ0SD|rR&HWuo?cdQOR#UYw4unJ_v3CVN`P$~36vq2rea&m^~>&Api3+HtN~JkCgH8?!&J#I!A!V+2AD z1h&e_OtO+IZ7`bTCwjqExoH#II){4K<xc=Su)n(`IUFmGpw4S0K^Zoa?XLnlyA|9_*TlQA%^{G;K zMXTl-%H-<;fh&tY_Lmjkl>T0z;vwsi^w*}B*W73^kF2p# z#2U_vlYNf&UHYUKz1=T&%E|)MN0-fYFJJz?qf%4ooPXpC(HGed{TC?NHFsSqe6AYN zd`3l0Jz>s5m)jh&sy}1So=Z4hyiNV0v$e#RTMDz~-=utcwQ2Il)w5@>_NfGh_}4=}K#5yXO~jsR~~HV~H) M2u*=B9}|cN05+xs(f|Me literal 0 HcmV?d00001 diff --git a/infrastructure/lambda/prod-panaetius-blog-lambda/main.zip b/infrastructure/lambda/prod-panaetius-blog-lambda/main.zip deleted file mode 100644 index 8913aa049804cde1ce8bb7b5067aeb1ca23237d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 546 zcmWIWW@Zs#U|`^2NSggI;A-KwraDFjhO0~r4D1Xt47rJ!d3ssJp&^_M%oT41<12x< zw1S&~k>x8;6m^)nh^B0R-nBHqMkI&Z$$x8t+05DtGj7n_$)f6ArHZx>?LqC;bkncy!6AT$qh%nzj)0S~gidp=&AeMxS;hnOf~o z4m9scopZw6V`X0`($uYeQjcz% zaZd5B*h0(vGxL@o&6%)i+Sjw37yWdOe(T^l_4&QR-72T)k2&V*9ThtGcGAz})_do4 z*;n4$CCYd2ZGd;5<@C~R)sN5g-#h$8h&8U<@5uaR*E`n1qz9`9~(tY4|yWN*%Nw5T54|l!~nT}iE28}KQm@bixEG`AK=Z% uB*%;^0wsVE%fJAPDTXDDAQn72Ss~Gh7L@_stZX1 Date: Tue, 21 Jul 2020 23:30:06 +0100 Subject: [PATCH 09/18] Updated submodule blog/themes/panaetius-theme --- blog/themes/panaetius-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog/themes/panaetius-theme b/blog/themes/panaetius-theme index 412ab93..9c39415 160000 --- a/blog/themes/panaetius-theme +++ b/blog/themes/panaetius-theme @@ -1 +1 @@ -Subproject commit 412ab931c34399a3902f3c3cb7861f31988db368 +Subproject commit 9c394151dc54aba757d3e5993298a6ee79a0d84b From 4ee76b4ae8cbeb2a26f732ccc28b85591b1fef0a Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Wed, 22 Jul 2020 03:18:26 +0100 Subject: [PATCH 10/18] Adding navbar logo --- blog/static/images/icons/pillar.png | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 blog/static/images/icons/pillar.png diff --git a/blog/static/images/icons/pillar.png b/blog/static/images/icons/pillar.png new file mode 100644 index 0000000..cda196d --- /dev/null +++ b/blog/static/images/icons/pillar.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:976ca07a255e4daf537eade91362a54a917356338647ed923354d9fefa4e37b8 +size 383 From ec63c49cec3ab0419787f6bea5836da7bc9b8e6e Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Wed, 22 Jul 2020 03:18:33 +0100 Subject: [PATCH 11/18] Updating code theme --- blog/config.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blog/config.toml b/blog/config.toml index 44dcf57..3f5a784 100644 --- a/blog/config.toml +++ b/blog/config.toml @@ -84,5 +84,6 @@ page = ["HTML", "RSS"] [markup] [markup.highlight] -style = "monokailight" +# style = "monokailight" +style = "paraiso-dark" lineNos = true From 6ca5c521b13138241caaca4f92a5b53237e79d20 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Wed, 22 Jul 2020 03:18:39 +0100 Subject: [PATCH 12/18] Updating documentation --- blog/webpack-filestructure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog/webpack-filestructure.md b/blog/webpack-filestructure.md index 8f01033..4b73340 100644 --- a/blog/webpack-filestructure.md +++ b/blog/webpack-filestructure.md @@ -1,6 +1,6 @@ # Webpack -TODO: This note should also go under a note for structuring a website.s +TODO: This note should also go under a note for structuring a website. Great tutorial for the basics: . From d55dc4580fd17023dabfe209f1e22ac1ccf3d846 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Wed, 22 Jul 2020 03:18:44 +0100 Subject: [PATCH 13/18] Updated submodule blog/themes/panaetius-theme --- blog/themes/panaetius-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog/themes/panaetius-theme b/blog/themes/panaetius-theme index 9c39415..e0e96bf 160000 --- a/blog/themes/panaetius-theme +++ b/blog/themes/panaetius-theme @@ -1 +1 @@ -Subproject commit 9c394151dc54aba757d3e5993298a6ee79a0d84b +Subproject commit e0e96bf8bb4ad2ee7c5f2f08ddf890bd30692fc6 From 325b5981cc4c244a15dac25619aabaa033b4c209 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Wed, 22 Jul 2020 20:51:16 +0100 Subject: [PATCH 14/18] Updated submodule blog/themes/panaetius-theme --- blog/themes/panaetius-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog/themes/panaetius-theme b/blog/themes/panaetius-theme index e0e96bf..70b1821 160000 --- a/blog/themes/panaetius-theme +++ b/blog/themes/panaetius-theme @@ -1 +1 @@ -Subproject commit e0e96bf8bb4ad2ee7c5f2f08ddf890bd30692fc6 +Subproject commit 70b1821afbda4d39a313de8b62bbe3ba6ba8e885 From 0f2ada632db76866861a6723bea501ad40d64c56 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Wed, 22 Jul 2020 23:59:59 +0100 Subject: [PATCH 15/18] Updated submodule blog/themes/hugo-notice-admonition --- blog/themes/hugo-notice-admonition | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog/themes/hugo-notice-admonition b/blog/themes/hugo-notice-admonition index f08dd40..1e35d5c 160000 --- a/blog/themes/hugo-notice-admonition +++ b/blog/themes/hugo-notice-admonition @@ -1 +1 @@ -Subproject commit f08dd406cc63f912032bdf914e893acc751324ed +Subproject commit 1e35d5ca2da42b56de2c6112bfd84d3845c24e52 From 16ab5ebe71d5eaa3d6d7e3522fb4be9aa65e0a1c Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Thu, 23 Jul 2020 00:00:19 +0100 Subject: [PATCH 16/18] Changing series admonition icon --- blog/static/images/icons/series-icon-notice-old.png | 3 +++ blog/static/images/icons/series-icon-notice.png | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 blog/static/images/icons/series-icon-notice-old.png diff --git a/blog/static/images/icons/series-icon-notice-old.png b/blog/static/images/icons/series-icon-notice-old.png new file mode 100644 index 0000000..0e2f6cd --- /dev/null +++ b/blog/static/images/icons/series-icon-notice-old.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bf5ed5d1e9b56c4aad183350caeed421a4b6abc27940d198fdf89781f9c72bf +size 14397 diff --git a/blog/static/images/icons/series-icon-notice.png b/blog/static/images/icons/series-icon-notice.png index 0e2f6cd..b0a7305 100644 --- a/blog/static/images/icons/series-icon-notice.png +++ b/blog/static/images/icons/series-icon-notice.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bf5ed5d1e9b56c4aad183350caeed421a4b6abc27940d198fdf89781f9c72bf -size 14397 +oid sha256:0d25a4bc69642278bcc2f716dff6397f339e3c8cd62956d66760f49439d1172d +size 8081 From 7b11866bfc03b503a22af8b7f3cbbb8a96c0f878 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Thu, 23 Jul 2020 00:00:30 +0100 Subject: [PATCH 17/18] Changing draft content --- blog/content/post/second_post copy 2/index.md | 2 +- blog/content/post/second_post copy/index.md | 2 +- blog/content/post/second_post/index.md | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/blog/content/post/second_post copy 2/index.md b/blog/content/post/second_post copy 2/index.md index 78a8bae..74fabab 100644 --- a/blog/content/post/second_post copy 2/index.md +++ b/blog/content/post/second_post copy 2/index.md @@ -1,5 +1,5 @@ --- -title: "Really long title Second Post Copy for layout scaling with flexbox using css 2." +title: "Really long title Second Post Copy for layout scaling with flexbox using css 2" date: "2020-05-05T02:14:50+01:00" images: ["images/banner.svg"] draft: true diff --git a/blog/content/post/second_post copy/index.md b/blog/content/post/second_post copy/index.md index 846ff1c..698de72 100644 --- a/blog/content/post/second_post copy/index.md +++ b/blog/content/post/second_post copy/index.md @@ -1,5 +1,5 @@ --- -title: "Really long title Second Post Copy for layout scaling with flexbox using css." +title: "Really long title Second Post Copy for layout scaling with flexbox using css" date: "2020-05-06T02:14:51+01:00" images: - "images/banner.svg" diff --git a/blog/content/post/second_post/index.md b/blog/content/post/second_post/index.md index a8bd260..28207d4 100644 --- a/blog/content/post/second_post/index.md +++ b/blog/content/post/second_post/index.md @@ -6,7 +6,6 @@ images: draft: true authors: - "Daniel Tomlinson" - - "New Authors" tags: - "Introduction" - "test" From 6b061c558b67c3fe0aa2d3ae0051522811680471 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Thu, 23 Jul 2020 00:01:36 +0100 Subject: [PATCH 18/18] Updated submodule blog/themes/panaetius-theme --- blog/themes/panaetius-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog/themes/panaetius-theme b/blog/themes/panaetius-theme index 70b1821..524a2be 160000 --- a/blog/themes/panaetius-theme +++ b/blog/themes/panaetius-theme @@ -1 +1 @@ -Subproject commit 70b1821afbda4d39a313de8b62bbe3ba6ba8e885 +Subproject commit 524a2be0120e9fdd828c5827e3ac5f4aa7c50792