From 5dffffd5a9ab080ae67915dc111b00714249f8e9 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Sat, 26 Mar 2022 20:50:06 -0500
Subject: [PATCH] Change to mounted node_modules folder
Signed-off-by: Thomas A. Christensen II <25492070+MillironX@users.noreply.github.com>
---
assets/package-lock.json | 38 --
assets/package.json | 24 -
config.toml | 49 ++
layouts/_default/baseof.html | 36 +-
package-lock.json | 841 +++++++++++++++++------------------
package.json | 10 +-
6 files changed, 470 insertions(+), 528 deletions(-)
delete mode 100644 assets/package-lock.json
delete mode 100644 assets/package.json
diff --git a/assets/package-lock.json b/assets/package-lock.json
deleted file mode 100644
index 0ff83d2..0000000
--- a/assets/package-lock.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "name": "millironx.github.io",
- "version": "0.0.0",
- "lockfileVersion": 1,
- "requires": true,
- "dependencies": {
- "@fortawesome/fontawesome-pro": {
- "version": "5.15.4",
- "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/5.15.4/fontawesome-pro-5.15.4.tgz",
- "integrity": "sha512-ApOqpDdKgA79xfLZH3B5PucZxj+TZyQUSrZ4bKkbJCR+zjmveQ4/gp/uXc5bNNhsdtJUy16BYJ/lAVydca2Y5Q=="
- },
- "@popperjs/core": {
- "version": "2.11.2",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
- "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA=="
- },
- "bootstrap": {
- "version": "5.1.3",
- "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
- "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q=="
- },
- "fittext.js": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/fittext.js/-/fittext.js-1.2.0.tgz",
- "integrity": "sha1-51PVJjI5I30o8wFeipaUVpu0PLY="
- },
- "jquery": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
- "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
- },
- "jquery-mask-plugin": {
- "version": "1.14.16",
- "resolved": "https://registry.npmjs.org/jquery-mask-plugin/-/jquery-mask-plugin-1.14.16.tgz",
- "integrity": "sha512-reywdHlYEkPbzWjTpcc1fk9XQ3PLvO5dzEAVqy8zI7NTF22tB1HbeU3iboZTLdkBEPaWAqeI2HtEjsGQ4roZKw=="
- }
- }
-}
diff --git a/assets/package.json b/assets/package.json
deleted file mode 100644
index 8d9a1f6..0000000
--- a/assets/package.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "name": "millironx.github.io",
- "version": "0.0.0",
- "description": "My personal website",
- "devDependencies": {},
- "repository": {
- "type": "git",
- "url": "git+https://github.com/MillironX/millironx.github.io.git"
- },
- "author": "Thomas A. Christensen II",
- "license": "MIT",
- "bugs": {
- "url": "https://github.com/MillironX/millironx.github.io/issues"
- },
- "homepage": "https://github.com/MillironX/millironx.github.io#readme",
- "dependencies": {
- "@fortawesome/fontawesome-pro": "^5.15.4",
- "@popperjs/core": "^2.11.2",
- "bootstrap": "^5.1.3",
- "fittext.js": "^1.2.0",
- "jquery": "^3.6.0",
- "jquery-mask-plugin": "^1.14.16"
- }
-}
diff --git a/config.toml b/config.toml
index 4989eb1..467d73e 100644
--- a/config.toml
+++ b/config.toml
@@ -10,3 +10,52 @@ theme = "ananke"
[Params]
cardImage = "saddles"
motto = ""
+
+[module]
+ [[module.mounts]]
+ source = "assets/graphics"
+ target = "assets/graphics"
+
+ [[module.mounts]]
+ source = "assets/images"
+ target = "assets/images"
+
+ [[module.mounts]]
+ source = "assets/scripts"
+ target = "assets/scripts"
+
+ [[module.mounts]]
+ source = "assets/styles"
+ target = "assets/styles"
+
+ [[modules.mounts]]
+ source = "assets/scripts/custom"
+ target = "assets/scripts/custom"
+
+ [[module.mounts]]
+ source = "./node_modules/@fortawesome/fontawesome-pro/js"
+ target = "assets/scripts/fontawesome"
+
+ [[module.mounts]]
+ source = "./node_modules/@popperjs/core/dist/umd"
+ target = "assets/scripts/popper"
+
+ [[module.mounts]]
+ source = "./node_modules/bootstrap/scss"
+ target = "assets/styles/bootstrap"
+
+ [[module.mounts]]
+ source = "./node_modules/bootstrap/dist/js"
+ target = "assets/scripts/bootstrap"
+
+ [[module.mounts]]
+ source = "./node_modules/fittext.js"
+ target = "assets/scripts/fittext"
+
+ [[module.mounts]]
+ source = "./node_modules/jquery/dist"
+ target = "assets/scripts/jquery"
+
+ [[module.mounts]]
+ source = "./node_modules/jquery-mask-plugin/dist"
+ target = "assets/scripts/jquery-mask-plugin"
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index fef4eee..0ff1188 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -5,17 +5,15 @@
{{ .Title }} - {{ .Site.Title }}
-
- {{ $twbscss := resources.Get "node_modules/bootstrap/scss/bootstrap.scss" | resources.ToCSS }}
- {{ $mycss := resources.Get "styles/main.css" }}
- {{ $allcss := slice $twbscss $mycss | resources.Concat "css/bundle.css" }}
- {{ $allcsspure := $allcss | resources.PostCSS (dict "nomap" true) | minify | fingerprint | resources.PostProcess }}
-
+ {{ $twbscss := resources.Get "styles/bootstrap/bootstrap.scss" | resources.ToCSS }}
+ {{ $mycss := resources.Get "styles/main.css" }}
+ {{ $allcss := slice $twbscss $mycss | resources.Concat "css/bundle.css" }}
+ {{ $allcsspure := $allcss | resources.PostCSS (dict "nomap" true) | minify | fingerprint | resources.PostProcess }}
+
{{ $millironx := resources.Get "graphics/millironx.svg" }}
-
-
- {{ $jqueryjs := resources.Get "node_modules/jquery/dist/jquery.js" }}
- {{ $popperjs := resources.Get "node_modules/@popperjs/core/dist/umd/popper.js" }}
- {{ $twbsjs := resources.Get "node_modules/bootstrap/dist/js/bootstrap.js" }}
- {{ $fajs := resources.Get "node_modules/@fortawesome/fontawesome-pro/js/all.js" }}
- {{ $fittextjs := resources.Get "node_modules/fittext.js/jquery.fittext.js" }}
- {{ $jqmaskjs := resources.Get "node_modules/jquery-mask-plugin/dist/jquery.mask.js" }}
- {{ $scrolljs := resources.Get "scripts/scroll-effect.js" }}
- {{ $maskjs := resources.Get "scripts/phone-masking.js" }}
- {{ $ttjs := resources.Get "scripts/tooltip-enable.js" }}
- {{ $alljs := slice $jqueryjs $popperjs $twbsjs $fajs $fittextjs $scrolljs $jqmaskjs $maskjs $ttjs | resources.Concat
- "js/bundle.js" | minify | fingerprint
- }}
+ {{ $fajs := resources.Get "scripts/fontawesome/all.min.js" }}
+ {{ $jqueryjs := resources.Get "scripts/jquery/jquery.min.js" }}
+ {{ $popperjs := resources.Get "scripts/popper/popper.min.js" }}
+ {{ $twbsjs := resources.Get "scripts/bootstrap/bootstrap.min.js" }}
+ {{ $jqmaskjs := resources.Get "scripts/jquery-mask-plugin/jquery.mask.min.js" }}
+ {{ $fittextjs := resources.Get "scripts/fittext/jquery.fittext.js" | minify }}
+ {{ $scrolljs := resources.Get "scripts/scroll-effect.js" | minify }}
+ {{ $maskjs := resources.Get "scripts/phone-masking.js" | minify }}
+ {{ $ttjs := resources.Get "scripts/tooltip-enable.js" | minify }}
+ {{ $alljs := slice $jqueryjs $popperjs $twbsjs $fajs $fittextjs $scrolljs $jqmaskjs $maskjs $ttjs | resources.Concat "js/bundle.js" | fingerprint }}
+