From 3ae7f7f7be00e7c04a7b0424d19ca3f8f943d133 Mon Sep 17 00:00:00 2001 From: Spencer Flagg Date: Sat, 18 Jun 2022 12:41:36 +0200 Subject: [PATCH] dow styles; style versioning --- .eleventy.js | 23 +++++++++- package-lock.json | 76 +++++++++++++++++++++++++++++++++- package.json | 4 +- src/_data/env.js | 5 +++ src/_includes/layouts/base.njk | 2 +- src/assets/styles/main.scss | 6 +++ 6 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 src/_data/env.js diff --git a/.eleventy.js b/.eleventy.js index dd1e001..800026d 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,4 +1,6 @@ const eleventySass = require("eleventy-sass"); +const path = require("path"); +require('dotenv').config(); module.exports = function (eleventyConfig) { @@ -9,8 +11,27 @@ module.exports = function (eleventyConfig) { // eleventyConfig.addPassthroughCopy('src/assets/images/**/*.jpg'); // eleventyConfig.addPassthroughCopy('src/assets/images/**/*.gif'); + + const sassOptions = { + compileOptions: { + permalink: function(contents, inputPath) { + return path.format({ + dir: "assets/styles", + name: path.basename(inputPath, path.extname(inputPath)), + ext: "." + process.env.VERSION + ".css" + }); + } + }, + // sass: { + // loadPaths: ["src/_includes"], + // style: "expanded", + // sourceMap: true, + // }, + // defaultEleventyEnv: "development" + }; + //plugins - eleventyConfig.addPlugin(eleventySass); + eleventyConfig.addPlugin(eleventySass, sassOptions); eleventyConfig.addFilter('isActive', (arr) => arr.filter(guest => guest.name != '')); eleventyConfig.addFilter('day', (arr,givenDate, givenLoc) => arr.filter(guest => guest.dates.some(e => (e.date == givenDate && e.day == givenLoc)))); diff --git a/package-lock.json b/package-lock.json index 31e55a3..aad3891 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,9 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "eleventy-sass": "^1.3.1" + "dotenv": "^16.0.1", + "eleventy-sass": "^1.3.1", + "path": "^0.12.7" }, "devDependencies": { "@11ty/eleventy": "^1.0.1" @@ -851,6 +853,14 @@ "integrity": "sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==", "dev": true }, + "node_modules/dotenv": { + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz", + "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==", + "engines": { + "node": ">=12" + } + }, "node_modules/easy-extender": { "version": "2.3.4", "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz", @@ -2191,6 +2201,15 @@ "node": ">= 0.8" } }, + "node_modules/path": { + "version": "0.12.7", + "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", + "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==", + "dependencies": { + "process": "^0.11.1", + "util": "^0.10.3" + } + }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -2287,6 +2306,14 @@ "node": ">=0.10.0" } }, + "node_modules/process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", @@ -3320,6 +3347,19 @@ "node": ">= 0.8" } }, + "node_modules/util": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "dependencies": { + "inherits": "2.0.3" + } + }, + "node_modules/util/node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==" + }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -4142,6 +4182,11 @@ "integrity": "sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==", "dev": true }, + "dotenv": { + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz", + "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==" + }, "easy-extender": { "version": "2.3.4", "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz", @@ -5166,6 +5211,15 @@ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, + "path": { + "version": "0.12.7", + "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", + "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==", + "requires": { + "process": "^0.11.1", + "util": "^0.10.3" + } + }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -5242,6 +5296,11 @@ "js-beautify": "^1.6.12" } }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" + }, "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", @@ -6065,6 +6124,21 @@ "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true }, + "util": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "requires": { + "inherits": "2.0.3" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==" + } + } + }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", diff --git a/package.json b/package.json index 924b6fd..4e01dd8 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,8 @@ "@11ty/eleventy": "^1.0.1" }, "dependencies": { - "eleventy-sass": "^1.3.1" + "dotenv": "^16.0.1", + "eleventy-sass": "^1.3.1", + "path": "^0.12.7" } } diff --git a/src/_data/env.js b/src/_data/env.js new file mode 100644 index 0000000..c1f330a --- /dev/null +++ b/src/_data/env.js @@ -0,0 +1,5 @@ +require('dotenv').config(); + +module.exports = { + version: process.env.VERSION +}; \ No newline at end of file diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index b14c2d9..17a8134 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -7,7 +7,7 @@ {{ title }} - + diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss index e3e8408..51c9559 100644 --- a/src/assets/styles/main.scss +++ b/src/assets/styles/main.scss @@ -133,6 +133,12 @@ main { grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr; grid-template-rows: 3rem 16rem 16rem 16rem; width: 95vw; + + .dow{ + display: flex; + justify-content: center; + } + & > li { &:nth-child(-n+7){ background-color: transparent;