From 0a10cae4c1bc13891db08f9ef2a7b7c55f7249be Mon Sep 17 00:00:00 2001 From: sneakers-the-rat Date: Thu, 16 Mar 2023 00:54:45 -0700 Subject: [PATCH] jekyll --- .gitignore | 1 + Gemfile | 12 + Gemfile.lock | 79 ++++ _assets/index.js | 8 + _assets/index.scss | 1 + {src => _assets}/js/lens.js | 1 - _assets/template.html | 22 ++ _config.yml | 59 +++ config/paths.js | 3 + config/webpack.common.js | 19 +- config/webpack.dev.js | 12 + config/webpack.prod.js | 4 +- default.html | 19 + package-lock.json | 341 ++++++++++++++---- package.json | 10 +- src/.gitignore | 5 + src/404.html | 25 ++ src/Gemfile | 33 ++ src/_includes/footer.html | 0 src/_includes/head.html | 6 + src/_layouts/default.html | 22 ++ src/_layouts/home.html | 29 ++ .../2023-03-15-welcome-to-jekyll.markdown | 29 ++ src/{styles => _scss}/_layout.scss | 0 src/{styles => _scss}/_scaffolding.scss | 0 src/{styles => _scss}/_text.scss | 0 src/{styles => _scss}/_variables.scss | 0 src/{styles => _scss}/index.scss | 0 src/{styles => _scss}/pages/home.scss | 0 src/about.markdown | 18 + src/index.js | 29 -- src/index.markdown | 6 + src/js/example.js | 3 - src/template.html | 37 -- 34 files changed, 685 insertions(+), 148 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 _assets/index.js create mode 100644 _assets/index.scss rename {src => _assets}/js/lens.js (99%) create mode 100644 _assets/template.html create mode 100644 _config.yml create mode 100644 default.html create mode 100644 src/.gitignore create mode 100644 src/404.html create mode 100644 src/Gemfile create mode 100644 src/_includes/footer.html create mode 100644 src/_includes/head.html create mode 100644 src/_layouts/default.html create mode 100644 src/_layouts/home.html create mode 100644 src/_posts/2023-03-15-welcome-to-jekyll.markdown rename src/{styles => _scss}/_layout.scss (100%) rename src/{styles => _scss}/_scaffolding.scss (100%) rename src/{styles => _scss}/_text.scss (100%) rename src/{styles => _scss}/_variables.scss (100%) rename src/{styles => _scss}/index.scss (100%) rename src/{styles => _scss}/pages/home.scss (100%) create mode 100644 src/about.markdown delete mode 100644 src/index.js create mode 100644 src/index.markdown delete mode 100644 src/js/example.js delete mode 100644 src/template.html diff --git a/.gitignore b/.gitignore index ceaea36..d24286a 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,4 @@ dist .yarn/install-state.gz .pnp.* +assets diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..0bdbde3 --- /dev/null +++ b/Gemfile @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +# gem "rails" + +gem "jekyll", "~> 4.3" + +gem "jekyll-sitemap", "~> 1.4" +gem "jekyll-seo-tag", "~> 2.8" + +gem "jekyll-feed", "~> 0.17.0" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..ca34fba --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,79 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + colorator (1.1.0) + concurrent-ruby (1.2.2) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + eventmachine (1.2.7) + ffi (1.15.5) + forwardable-extended (2.6.0) + google-protobuf (3.22.2-x86_64-darwin) + http_parser.rb (0.8.0) + i18n (1.12.0) + concurrent-ruby (~> 1.0) + jekyll (4.3.2) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 1.0) + jekyll-sass-converter (>= 2.0, < 4.0) + jekyll-watch (~> 2.0) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) + liquid (~> 4.0) + mercenary (>= 0.3.6, < 0.5) + pathutil (~> 0.9) + rouge (>= 3.0, < 5.0) + safe_yaml (~> 1.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) + jekyll-feed (0.17.0) + jekyll (>= 3.7, < 5.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.4.0) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (5.0.1) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rexml (3.2.5) + rouge (4.1.0) + safe_yaml (1.0.5) + sass-embedded (1.59.3-x86_64-darwin) + google-protobuf (~> 3.21) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.4.2) + webrick (1.8.1) + +PLATFORMS + x86_64-darwin-21 + +DEPENDENCIES + jekyll (~> 4.3) + jekyll-feed (~> 0.17.0) + jekyll-seo-tag (~> 2.8) + jekyll-sitemap (~> 1.4) + +BUNDLED WITH + 2.4.6 diff --git a/_assets/index.js b/_assets/index.js new file mode 100644 index 0000000..bf23c4c --- /dev/null +++ b/_assets/index.js @@ -0,0 +1,8 @@ +import { init } from './js/lens.js' +init(); + +// Test import of an asset +// import webpackLogo from '@/images/webpack-logo.svg' + +// Test import of styles +import './index.scss'; diff --git a/_assets/index.scss b/_assets/index.scss new file mode 100644 index 0000000..5ab2a50 --- /dev/null +++ b/_assets/index.scss @@ -0,0 +1 @@ +@import '../src/_scss/index'; diff --git a/src/js/lens.js b/_assets/js/lens.js similarity index 99% rename from src/js/lens.js rename to _assets/js/lens.js index ae7ad8d..9a3d5a6 100644 --- a/src/js/lens.js +++ b/_assets/js/lens.js @@ -1,4 +1,3 @@ - // OK so the next thing to do is make it so it's blurry when the screen is too // big or too small, and thne prompt someone to make their screen bigger or smaller // to be a lens and then you have to move the window around to be able to see the different diff --git a/_assets/template.html b/_assets/template.html new file mode 100644 index 0000000..4635c75 --- /dev/null +++ b/_assets/template.html @@ -0,0 +1,22 @@ + + + +{% include head.html %} + + + +{% if page.navigation %} +{% include navigation.html %} +{% endif %} + +
+ + {{ content }} + +
+ + + +{% include footer.html %} + + diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..6c80b00 --- /dev/null +++ b/_config.yml @@ -0,0 +1,59 @@ +# Welcome to Jekyll! +# +# This config file is meant for settings that affect your whole blog, values +# which you are expected to set up once and rarely edit after that. If you find +# yourself editing this file very often, consider using Jekyll's data files +# feature for the data you need to update frequently. +# +# For technical reasons, this file is *NOT* reloaded automatically when you use +# 'bundle exec jekyll serve'. If you change this file, please restart the server process. +# +# If you need help with YAML syntax, here are some quick references for you: +# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml +# https://learnxinyminutes.com/docs/yaml/ +# +# Site settings +# These are used to personalize your new site. If you look in the HTML files, +# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. +# You can create any custom variable you would like, and they will be accessible +# in the templates via {{ site.myvariable }}. + +title: Internet Website 2.0 +email: j@nny.fyi +description: >- # this means to ignore newlines until "baseurl:" + This is my internet website ~reborn~ +baseurl: "" # the subpath of your site, e.g. /blog +url: "https://jon-e.net" # the base hostname & protocol for your site, e.g. http://example.com +twitter_username: json_dirs +github_username: sneakers-the-rat + +# directories +source: ./src +destination: ./dist +keep_files: + - assets # Build settings +#theme: minima +plugins: + - jekyll-feed + - jekyll-sitemap + - jekyll-seo-tag + +# Exclude from processing. +# The following items will not be processed, by default. +# Any item listed under the `exclude:` key here will be automatically added to +# the internal "default list". +# +# Excluded items can be processed by explicitly listing the directories or +# their entries' file path in the `include:` list. +# +# exclude: +# - .sass-cache/ +# - .jekyll-cache/ +# - gemfiles/ +# - Gemfile +# - Gemfile.lock +# - node_modules/ +# - vendor/bundle/ +# - vendor/cache/ +# - vendor/gems/ +# - vendor/ruby/ diff --git a/config/paths.js b/config/paths.js index d0a7e81..ed8a43e 100644 --- a/config/paths.js +++ b/config/paths.js @@ -1,6 +1,9 @@ const path = require('path') module.exports = { + // assets + assets: path.resolve('assets'), + // Source files src: path.resolve(__dirname, '../src'), diff --git a/config/webpack.common.js b/config/webpack.common.js index 46d1e61..9c48c08 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -3,29 +3,25 @@ const CopyWebpackPlugin = require('copy-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin') const paths = require('./paths') +const path = require('path') module.exports = { // Where webpack looks to start building the bundle - entry: [paths.src + '/index.js'], - - // Where webpack outputs the assets and bundles - output: { - path: paths.build, - filename: '[name].bundle.js', - publicPath: '/', + entry: { + app: './_assets/index.js' }, // Customize the webpack build process plugins: [ // Removes/cleans build folders and unused assets when rebuilding - new CleanWebpackPlugin(), + // new CleanWebpackPlugin(), // Copies files from target to destination folder new CopyWebpackPlugin({ patterns: [ { from: paths.public, - to: 'assets', + to: paths.build, globOptions: { ignore: ['*.DS_Store'], }, @@ -37,10 +33,9 @@ module.exports = { // Generates an HTML file from a template // Generates deprecation warning: https://github.com/jantimon/html-webpack-plugin/issues/1501 new HtmlWebpackPlugin({ - title: 'webpack Boilerplate', // favicon: paths.src + '/images/favicon.png', - template: paths.src + '/template.html', // template file - filename: 'index.html', // output file + template: './_assets/template.html', // template file + filename: '../src/_layouts/default.html' // output file }), ], diff --git a/config/webpack.dev.js b/config/webpack.dev.js index eec5e6f..cfb8762 100644 --- a/config/webpack.dev.js +++ b/config/webpack.dev.js @@ -1,16 +1,28 @@ const { merge } = require('webpack-merge') const common = require('./webpack.common') +const paths = require('./paths') +const path = require('path'); module.exports = merge(common, { // Set the mode to development or production mode: 'development', + // Where webpack outputs the assets and bundles + output: { + path: path.resolve('./assets'), + filename: '[name].bundle.js', + publicPath: '/assets/', + }, + // Control how source maps are generated devtool: 'inline-source-map', // Spin up a server for quick development devServer: { + static: { + directory: paths.build + }, historyApiFallback: true, open: true, compress: true, diff --git a/config/webpack.prod.js b/config/webpack.prod.js index c315c9f..dd2f707 100644 --- a/config/webpack.prod.js +++ b/config/webpack.prod.js @@ -10,7 +10,7 @@ module.exports = merge(common, { devtool: false, output: { path: paths.build, - publicPath: '/', + publicPath: '/assets/', filename: 'js/[name].[contenthash].bundle.js', }, module: { @@ -36,7 +36,7 @@ module.exports = merge(common, { plugins: [ // Extracts CSS into separate files new MiniCssExtractPlugin({ - filename: 'styles/[name].[contenthash].css', + filename: '_scss/[name].[contenthash].css', chunkFilename: '[id].css', }), ], diff --git a/default.html b/default.html new file mode 100644 index 0000000..028fb34 --- /dev/null +++ b/default.html @@ -0,0 +1,19 @@ + + + + +{% include head.html %} + + + +{% if page.navigation %} +{% include navigation.html %} +{% endif %} + +
+ {{ content }} +
+ +{% include footer.html %} + + diff --git a/package-lock.json b/package-lock.json index f8e2e12..c6a720d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@babel/preset-env": "^7.20.2", "babel-loader": "^9.1.0", "clean-webpack-plugin": "^4.0.0", + "concurrently": "^7.6.0", "copy-webpack-plugin": "^11.0.0", "cross-env": "^7.0.3", "css-loader": "^6.7.3", @@ -3797,8 +3798,6 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -3926,6 +3925,118 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, + "node_modules/concurrently": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.6.0.tgz", + "integrity": "sha512-BKtRgvcJGeZ4XttiDiNcFiRlxoAeZOseqUvyYRUp/Vtd+9p1ULmeoSqGsDA+2ivdeDFpqrJvGvmI+StKfKl5hw==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "date-fns": "^2.29.1", + "lodash": "^4.17.21", + "rxjs": "^7.0.0", + "shell-quote": "^1.7.3", + "spawn-command": "^0.0.2-1", + "supports-color": "^8.1.0", + "tree-kill": "^1.2.2", + "yargs": "^17.3.1" + }, + "bin": { + "conc": "dist/bin/concurrently.js", + "concurrently": "dist/bin/concurrently.js" + }, + "engines": { + "node": "^12.20.0 || ^14.13.0 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/open-cli-tools/concurrently?sponsor=1" + } + }, + "node_modules/concurrently/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/concurrently/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/concurrently/node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/concurrently/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/concurrently/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/concurrently/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/concurrently/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/connect-history-api-fallback": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", @@ -4437,6 +4548,19 @@ "node": ">=8.0.0" } }, + "node_modules/date-fns": { + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", + "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==", + "dev": true, + "engines": { + "node": ">=0.11" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/date-fns" + } + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -4751,9 +4875,7 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "node_modules/encodeurl": { "version": "1.0.2", @@ -6102,8 +6224,6 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, - "optional": true, - "peer": true, "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -6976,8 +7096,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, - "optional": true, - "peer": true, "engines": { "node": ">=8" } @@ -10530,8 +10648,6 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, - "optional": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -10648,6 +10764,15 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/rxjs": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", + "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "dev": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -11032,6 +11157,15 @@ "node": ">=8" } }, + "node_modules/shell-quote": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz", + "integrity": "sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -11156,6 +11290,12 @@ "source-map": "^0.6.0" } }, + "node_modules/spawn-command": { + "version": "0.0.2-1", + "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz", + "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==", + "dev": true + }, "node_modules/spdx-correct": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", @@ -11295,8 +11435,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -11626,6 +11764,15 @@ "node": ">=0.6" } }, + "node_modules/tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "dev": true, + "bin": { + "tree-kill": "cli.js" + } + }, "node_modules/trim-newlines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", @@ -12268,8 +12415,6 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -12287,8 +12432,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -12304,8 +12447,6 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "color-name": "~1.1.4" }, @@ -12317,9 +12458,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "node_modules/wrappy": { "version": "1.0.2", @@ -12353,8 +12492,6 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, - "optional": true, - "peer": true, "engines": { "node": ">=10" } @@ -12379,8 +12516,6 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -12410,8 +12545,6 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, - "optional": true, - "peer": true, "engines": { "node": ">=12" } @@ -15190,8 +15323,6 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, - "optional": true, - "peer": true, "requires": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -15303,6 +15434,85 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, + "concurrently": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.6.0.tgz", + "integrity": "sha512-BKtRgvcJGeZ4XttiDiNcFiRlxoAeZOseqUvyYRUp/Vtd+9p1ULmeoSqGsDA+2ivdeDFpqrJvGvmI+StKfKl5hw==", + "dev": true, + "requires": { + "chalk": "^4.1.0", + "date-fns": "^2.29.1", + "lodash": "^4.17.21", + "rxjs": "^7.0.0", + "shell-quote": "^1.7.3", + "spawn-command": "^0.0.2-1", + "supports-color": "^8.1.0", + "tree-kill": "^1.2.2", + "yargs": "^17.3.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "dependencies": { + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "connect-history-api-fallback": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", @@ -15630,6 +15840,12 @@ "css-tree": "^1.1.2" } }, + "date-fns": { + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", + "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==", + "dev": true + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -15878,9 +16094,7 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "encodeurl": { "version": "1.0.2", @@ -16908,9 +17122,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "get-intrinsic": { "version": "1.1.1", @@ -17552,9 +17764,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "is-glob": { "version": "4.0.3", @@ -20075,9 +20285,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "require-from-string": { "version": "2.0.2", @@ -20154,6 +20362,15 @@ "queue-microtask": "^1.2.2" } }, + "rxjs": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", + "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "dev": true, + "requires": { + "tslib": "^2.1.0" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -20458,6 +20675,12 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "shell-quote": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz", + "integrity": "sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==", + "dev": true + }, "side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -20555,6 +20778,12 @@ "source-map": "^0.6.0" } }, + "spawn-command": { + "version": "0.0.2-1", + "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz", + "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==", + "dev": true + }, "spdx-correct": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", @@ -20683,8 +20912,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "optional": true, - "peer": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -20916,6 +21143,12 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, + "tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "dev": true + }, "trim-newlines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", @@ -21381,8 +21614,6 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "optional": true, - "peer": true, "requires": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -21394,8 +21625,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "optional": true, - "peer": true, "requires": { "color-convert": "^2.0.1" } @@ -21405,8 +21634,6 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "optional": true, - "peer": true, "requires": { "color-name": "~1.1.4" } @@ -21415,9 +21642,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true, - "peer": true + "dev": true } } }, @@ -21438,9 +21663,7 @@ "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "yallist": { "version": "4.0.0", @@ -21459,8 +21682,6 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", "dev": true, - "optional": true, - "peer": true, "requires": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -21475,9 +21696,7 @@ "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "optional": true, - "peer": true + "dev": true } } }, diff --git a/package.json b/package.json index a8a88b1..85abc55 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,13 @@ "author": "Tania Rascia", "license": "MIT", "scripts": { - "start": "cross-env NODE_ENV=development webpack serve --config config/webpack.dev.js", - "build": "cross-env NODE_ENV=production webpack --config config/webpack.prod.js", + "start": "npm run-script clean:project && cross-env NODE_ENV=development webpack --progress --config config/webpack.dev.js && concurrently --names \"WEBPACK,JEKYLL\" -c \"bgBlue.bold,bgMagenta.bold\" \"npm run-script start:webpack\" \"npm run-script start:jekyll\"", + "start:webpack": "cross-env NODE_ENV=development webpack-dev-server --config config/webpack.dev.js", + "start:jekyll": "bundle exec jekyll build --watch", + "build": "npm run-script clean:project && cross-env NODE_ENV=production webpack --config config/webpack.prod.js && cross-env JEKYLL_ENV=production bundle exec jekyll build", "lint": "eslint 'src/**/*.js' || true", - "prettify": "prettier --write 'src/**/*.js'" + "prettify": "prettier --write 'src/**/*.js'", + "clean:project": "rimraf ./dist" }, "keywords": [ "webpack", @@ -26,6 +29,7 @@ "@babel/preset-env": "^7.20.2", "babel-loader": "^9.1.0", "clean-webpack-plugin": "^4.0.0", + "concurrently": "^7.6.0", "copy-webpack-plugin": "^11.0.0", "cross-env": "^7.0.3", "css-loader": "^6.7.3", diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..f40fbd8 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,5 @@ +_site +.sass-cache +.jekyll-cache +.jekyll-metadata +vendor diff --git a/src/404.html b/src/404.html new file mode 100644 index 0000000..086a5c9 --- /dev/null +++ b/src/404.html @@ -0,0 +1,25 @@ +--- +permalink: /404.html +layout: default +--- + + + +
+

404

+ +

Page not found :(

+

The requested page could not be found.

+
diff --git a/src/Gemfile b/src/Gemfile new file mode 100644 index 0000000..ff2c342 --- /dev/null +++ b/src/Gemfile @@ -0,0 +1,33 @@ +source "https://rubygems.org" +# Hello! This is where you manage which Jekyll version is used to run. +# When you want to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# +# This will help ensure the proper Jekyll version is running. +# Happy Jekylling! +gem "jekyll", "~> 4.3.2" +# This is the default theme for new Jekyll sites. You may change this to anything you like. +gem "minima", "~> 2.5" +# If you want to use GitHub Pages, remove the "gem "jekyll"" above and +# uncomment the line below. To upgrade, run `bundle update github-pages`. +# gem "github-pages", group: :jekyll_plugins +# If you have any plugins, put them here! +group :jekyll_plugins do + gem "jekyll-feed", "~> 0.12" +end + +# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem +# and associated library. +platforms :mingw, :x64_mingw, :mswin, :jruby do + gem "tzinfo", ">= 1", "< 3" + gem "tzinfo-data" +end + +# Performance-booster for watching directories on Windows +gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] + +# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem +# do not have a Java counterpart. +gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] diff --git a/src/_includes/footer.html b/src/_includes/footer.html new file mode 100644 index 0000000..e69de29 diff --git a/src/_includes/head.html b/src/_includes/head.html new file mode 100644 index 0000000..bb860fc --- /dev/null +++ b/src/_includes/head.html @@ -0,0 +1,6 @@ + + + + + +{{ page.title }} diff --git a/src/_layouts/default.html b/src/_layouts/default.html new file mode 100644 index 0000000..e1572f0 --- /dev/null +++ b/src/_layouts/default.html @@ -0,0 +1,22 @@ + + + +{% include head.html %} + + + +{% if page.navigation %} +{% include navigation.html %} +{% endif %} + +
+ + {{ content }} + +
+ + + +{% include footer.html %} + + diff --git a/src/_layouts/home.html b/src/_layouts/home.html new file mode 100644 index 0000000..98faf28 --- /dev/null +++ b/src/_layouts/home.html @@ -0,0 +1,29 @@ +--- +layout: default +--- +
+
+ +

Internet Website 2.0

+

~Welcome to the net~

+
    +
  • +

    These are the Things I like

    +

    And some reasons that I like them

    +
    • +
  • +

    Some are known

    +

    Others cannot be known, or are illegal to know

    +
    • +
  • +

    All are good

    +

    Because I am not bad

    +
    • +
+ + {{ content }} +
+
+
+ diff --git a/src/_posts/2023-03-15-welcome-to-jekyll.markdown b/src/_posts/2023-03-15-welcome-to-jekyll.markdown new file mode 100644 index 0000000..800ed88 --- /dev/null +++ b/src/_posts/2023-03-15-welcome-to-jekyll.markdown @@ -0,0 +1,29 @@ +--- +layout: post +title: "Welcome to Jekyll!" +date: 2023-03-15 23:20:36 -0700 +categories: jekyll update +--- +You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated. + +Jekyll requires blog post files to be named according to the following format: + +`YEAR-MONTH-DAY-title.MARKUP` + +Where `YEAR` is a four-digit number, `MONTH` and `DAY` are both two-digit numbers, and `MARKUP` is the file extension representing the format used in the file. After that, include the necessary front matter. Take a look at the source for this post to get an idea about how it works. + +Jekyll also offers powerful support for code snippets: + +{% highlight ruby %} +def print_hi(name) + puts "Hi, #{name}" +end +print_hi('Tom') +#=> prints 'Hi, Tom' to STDOUT. +{% endhighlight %} + +Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk]. + +[jekyll-docs]: https://jekyllrb.com/docs/home +[jekyll-gh]: https://github.com/jekyll/jekyll +[jekyll-talk]: https://talk.jekyllrb.com/ diff --git a/src/styles/_layout.scss b/src/_scss/_layout.scss similarity index 100% rename from src/styles/_layout.scss rename to src/_scss/_layout.scss diff --git a/src/styles/_scaffolding.scss b/src/_scss/_scaffolding.scss similarity index 100% rename from src/styles/_scaffolding.scss rename to src/_scss/_scaffolding.scss diff --git a/src/styles/_text.scss b/src/_scss/_text.scss similarity index 100% rename from src/styles/_text.scss rename to src/_scss/_text.scss diff --git a/src/styles/_variables.scss b/src/_scss/_variables.scss similarity index 100% rename from src/styles/_variables.scss rename to src/_scss/_variables.scss diff --git a/src/styles/index.scss b/src/_scss/index.scss similarity index 100% rename from src/styles/index.scss rename to src/_scss/index.scss diff --git a/src/styles/pages/home.scss b/src/_scss/pages/home.scss similarity index 100% rename from src/styles/pages/home.scss rename to src/_scss/pages/home.scss diff --git a/src/about.markdown b/src/about.markdown new file mode 100644 index 0000000..8b4e0b2 --- /dev/null +++ b/src/about.markdown @@ -0,0 +1,18 @@ +--- +layout: page +title: About +permalink: /about/ +--- + +This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](https://jekyllrb.com/) + +You can find the source code for Minima at GitHub: +[jekyll][jekyll-organization] / +[minima](https://github.com/jekyll/minima) + +You can find the source code for Jekyll at GitHub: +[jekyll][jekyll-organization] / +[jekyll](https://github.com/jekyll/jekyll) + + +[jekyll-organization]: https://github.com/jekyll diff --git a/src/index.js b/src/index.js deleted file mode 100644 index 4f4ba23..0000000 --- a/src/index.js +++ /dev/null @@ -1,29 +0,0 @@ -// Test import of a JavaScript module -// import { example } from '@/js/example' - -import { init } from '@/js/lens.js' -init(); - -// Test import of an asset -// import webpackLogo from '@/images/webpack-logo.svg' - -// Test import of styles -import '@/styles/index.scss' - -// Appending to the DOM -// const logo = document.createElement('img') -// logo.src = webpackLogo - -const heading = document.createElement('h1') -// heading.textContent = example() - -// Test a background image url in CSS -const imageBackground = document.createElement('div') -imageBackground.classList.add('image') - -// Test a public folder asset -// const imagePublic = document.createElement('img') -// imagePublic.src = '/assets/example.png' - -const app = document.querySelector('#root') -// app.append(logo, heading, imageBackground, imagePublic) diff --git a/src/index.markdown b/src/index.markdown new file mode 100644 index 0000000..0671507 --- /dev/null +++ b/src/index.markdown @@ -0,0 +1,6 @@ +--- +# Feel free to add content and custom Front Matter to this file. +# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults + +layout: home +--- diff --git a/src/js/example.js b/src/js/example.js deleted file mode 100644 index df459ee..0000000 --- a/src/js/example.js +++ /dev/null @@ -1,3 +0,0 @@ -export const example = - () => `Sensible webpack 5 boilerplate using Babel and PostCSS with a hot dev server - and an optimized production build.` diff --git a/src/template.html b/src/template.html deleted file mode 100644 index 3924af1..0000000 --- a/src/template.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - <%= htmlWebpackPlugin.options.title %> - - - -
-
- -

Internet Website 2.0

-

~Welcome to the net~

-
    -
  • -

    These are the Things I like

    -

    And some reasons that I like them

    -
    • -
  • -

    Some are known

    -

    Others cannot be known, or are illegal to know

    -
    • -
  • -

    All are good

    -

    Because I am not bad

    -
    • -
-
-
-
- - -