diff --git a/CHANGELOG.md b/CHANGELOG.md index b7b1867..9ee982d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## 1.0.0 +## 1.0.1 - - 2021-09-26 +### Changed +- Specify Vite port number so that it doesn't conflict with other test projects running on port `3000`. + +### Fixed +- Fix an issue where the opening times were being set too soon on the full message template and subsequently not being rendered. ([#3](https://github.com/cavellblood/sunset-to-sunset/issues/3)) + +## 1.0.0 - 2021-09-23 ### Changed - Initial Release -## 1.0.0-beta.2 +## 1.0.0-beta.2 - 2021-09-23 ### Fixed - Added build files. -## 1.0.0-beta.1 +## 1.0.0-beta.1 - 2021-09-23 ### Added - Added a default banner template if no template is defined. - Allow multiple closing and opening elements to be added to the banner. diff --git a/package.json b/package.json index cba65b8..e377ee1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sunset-to-sunset", - "version": "1.0.0", + "version": "1.0.1", "description": "", "main": "src/js/main.js", "author": "Cavell Blood", diff --git a/prettier.config.js b/prettier.config.js new file mode 100644 index 0000000..c2b3a0d --- /dev/null +++ b/prettier.config.js @@ -0,0 +1,3 @@ +module.exports = { + useTabs: true +} \ No newline at end of file diff --git a/src/js/main.js b/src/js/main.js index 9968477..c96d0bc 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -83,12 +83,7 @@ const renderMessage = (opening) => { const messageTemplate = template.content.cloneNode(true) - // Find all opening elements and add formatted times - const openingElements = messageTemplate.querySelectorAll('.sts-opening-time') - formatTimes(openingElements, opening) - if (userFullTemplate) { - console.log('full user template') let messageContainer = messageTemplate.querySelector('.sts-full-message__container'); while (messageContainer.firstElementChild) { @@ -98,7 +93,6 @@ const renderMessage = (opening) => { messageContainer.insertBefore(message, null) } else if (userSimpleTemplate) { - console.log('simple user template') const messageArea = messageTemplate.querySelector('.sts-message-area'); messageArea.insertBefore(message, null) } @@ -106,8 +100,12 @@ const renderMessage = (opening) => { const html = document.getElementsByTagName('html')[0] html.classList.add('sts-during-sabbath') + + // Find all opening elements and add formatted times + const openingElements = messageTemplate.querySelectorAll('.sts-opening-time') + formatTimes(openingElements, opening) - // Insert the messageTemplate as the last item on the page. + // Insert the messageTemplate as the first item on the page. document.body.insertBefore(messageTemplate, document.body.firstChild) } diff --git a/vite.config.js b/vite.config.js index 486ae0a..a39145d 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,10 +1,10 @@ -import legacy from '@vitejs/plugin-legacy' -import { nodeResolve } from '@rollup/plugin-node-resolve'; -import path from 'path'; +import legacy from "@vitejs/plugin-legacy"; +import { nodeResolve } from "@rollup/plugin-node-resolve"; +import path from "path"; // https://vitejs.dev/config/ export default ({ command }) => ({ - root: path.resolve(__dirname, "src"), + root: path.resolve(__dirname, "src"), build: { emptyOutDir: true, manifest: true, @@ -12,25 +12,26 @@ export default ({ command }) => ({ rollupOptions: { input: { "sunset-to-sunset": "./src/js/main.js", - test: "./src/tests/index.html" + test: "./src/tests/index.html", }, output: { sourcemap: true, entryFileNames: `assets/[name].min.js`, chunkFileNames: `assets/[name].js`, - assetFileNames: `assets/[name].[ext]` + assetFileNames: `assets/[name].[ext]`, }, }, }, - publicDir: './src/tests', - plugins: [ - legacy({ - targets: ['defaults', 'not IE 11'] - }), - nodeResolve({ - moduleDirectories: [ - path.resolve('./node_modules'), - ], - }), - ], -}) \ No newline at end of file + publicDir: "./src/tests", + plugins: [ + legacy({ + targets: ["defaults", "not IE 11"], + }), + nodeResolve({ + moduleDirectories: [path.resolve("./node_modules")], + }), + ], + server: { + port: 3100 + } +});