From 7a84d3a632c6b825af2865fa6a68b7c5aad32433 Mon Sep 17 00:00:00 2001 From: Ben <36240171+benkyd@users.noreply.github.com> Date: Sun, 24 Apr 2022 23:51:16 +0100 Subject: [PATCH] accessibiliuty Former-commit-id: 342820102ceb82a5e6921c05d47a4fcfe366251d --- client/public/basket/index.html | 1 + .../components/accessability-popout.mjs | 310 ++++++++++++++++++ client/public/components/basket-popout.mjs | 155 +++++++-- .../public/components/css/product-listing.css | 10 +- client/public/components/product-list.mjs | 3 +- client/public/components/product-listing.mjs | 5 +- .../public/components/templates/navbar.html | 5 +- client/public/featured/index.html | 1 + client/public/global.css | 5 +- client/public/index.html | 2 + client/public/product/index.html | 1 + client/public/search/index.html | 1 + package.json | 5 +- src/routes/api.js | 6 +- src/routes/helpers.js | 10 + 15 files changed, 476 insertions(+), 44 deletions(-) create mode 100644 client/public/components/accessability-popout.mjs diff --git a/client/public/basket/index.html b/client/public/basket/index.html index 94d0e8d..e6f6d80 100644 --- a/client/public/basket/index.html +++ b/client/public/basket/index.html @@ -20,6 +20,7 @@ + diff --git a/client/public/components/accessability-popout.mjs b/client/public/components/accessability-popout.mjs new file mode 100644 index 0000000..d5b88f7 --- /dev/null +++ b/client/public/components/accessability-popout.mjs @@ -0,0 +1,310 @@ +import { RegisterComponent, Component } from './components.mjs'; + +class AccessabilityPopout extends Component { + static __IDENTIFY() { return 'accessability-popout'; } + + constructor() { + super(AccessabilityPopout); + } + + OnMount() { + const size = localStorage.getItem('font-size'); + + // https://stackoverflow.com/questions/3514784/what-is-the-best-way-to-detect-a-mobile-device + this.isMobile = false; + if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|Android|Silk|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent) || + /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(navigator.userAgent.substr(0, 4))) { + this.isMobile = true; + } + + switch (size) { + case 'Small': + this.setSmallFontSize(); + break; + case 'Large': + this.setLargeFontSize(); + break; + case 'Normal': + default: + this.setNormalFontSize(); + break; + } + + this.setState({ + fontSize: size, + }); + } + + Render() { + return { + template: /* html */` + +
+ accessibility +
+ + + + `, + style: ` + #accessability-wrapper { + flex-basis: 4%; + } + + .accessability { + display: flex; + justify-content: space-between; + padding-bottom: 2px; + } + + .accessability:hover { + opacity: 0.5; + } + + #accessability-icon { + padding-top: 2px; + cursor: pointer; + } + + .popup { + display: none; + } + + .show { + display: flex; + } + + #accessability-popup { + font-size: 0.5em; + position: absolute; + background-color: #AB8FFF; + border: 1px solid #222; + right: 0; + width: 400px; + padding-top: 10px; + padding-bottom: 10px; + flex-direction: column; + justify-content: center; + align-items: center; + z-index: 100; + } + + @media (pointer:none), (pointer:coarse), screen and (max-width: 900px) { + #accessability-popup { + position: absolute; + left: 0; + width: 100%; + } + } + + .popup-header { + display: flex; + justify-content: space-between; + padding-bottom: 2px; + font-size: 1.5em; + font-weight: bold; + } + + .toggler { + position: absolute; + right: 2px; + top: 2px; + background: transparent; + border: none; + cursor: pointer; + outline: none; + height: 2em; + width: 2em; + z-index: 50; + transition: all 0.2s ease-in; + } + + .cross-line { + background: #222; + box-shadow: #222 0px 0px 2px; + position: absolute; + height: 2px; + left: 0; + width: 100%; + } + + #toggler:hover .cross-line { + background: #777; + } + + .cross-line-top { + top: 50%; + transform: rotate(45deg) translatey(-50%); + } + + .cross-line-bottom { + bottom: 50%; + transform: rotate(-45deg) translatey(50%); + } + + .popup-content { + display: flex; + flex-direction: column; + flex-wrap: nowrap; + justify-content: left; + width: 100%; + height: 100%; + justify-content: space-between; + } + + .popup-content-item { + padding: 10px; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-between; + align-items: center; + } + + .text-size-controls { + flex-basis: 50%; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-around; + align-items: center; + } + + .text-size-control { + padding: 5px; + cursor: pointer; + outline: none; + border: none; + background: #222; + color: #fff; + font-size: 1.5em; + font-weight: bold; + transition: all 0.2s ease-in; + } + + .text-size-control:hover { + background: #777; + } + + .text-size-control.small { + font-size: 0.7em; + } + + .text-size-control.normal { + font-size: 1em; + } + + .text-size-control.large { + font-size: 1.5em; + } + `, + }; + } + + setSmallFontSize() { + localStorage.setItem('font-size', 'Small'); + // check if screen is mobile first + if (!this.isMobile) { + document.body.style.fontSize = '12px'; + } else { + document.body.style.fontSize = '16px'; + } + } + + setNormalFontSize() { + localStorage.setItem('font-size', 'Normal'); + if (!this.isMobile) { + document.body.style.fontSize = '16px'; + } else { + document.body.style.fontSize = '25px'; + } + } + + setLargeFontSize() { + localStorage.setItem('font-size', 'Large'); + if (!this.isMobile) { + document.body.style.fontSize = '24px'; + } else { + document.body.style.fontSize = '40px'; + } + } + + + OnRender() { + const accessabilityWrapper = this.root.querySelector('#accessability-wrapper'); + const accessabilityToggler = this.root.querySelector('.accessability'); + const popup = this.root.querySelector('.popup'); + const closeButton = this.root.querySelector('.toggler'); + + accessabilityToggler.addEventListener('click', () => { + popup.classList.toggle('show'); + }); + + closeButton.addEventListener('click', () => { + popup.classList.remove('show'); + }); + + const toggler = this.root.querySelector('.toggler'); + toggler.addEventListener('click', () => { + popup.classList.remove('show'); + }); + + // allow "click off to close", allowing for the users mouse to start clicking and dragging inside the popup + // without closing it if the mouse leaves the popup + let isMouseInside = true; + + accessabilityWrapper.addEventListener('mouseleave', () => { + isMouseInside = false; + }); + + accessabilityWrapper.addEventListener('mouseenter', () => { + isMouseInside = true; + }); + + window.addEventListener('click', () => { + if (!isMouseInside) { + popup.classList.remove('show'); + } + }); + + // text size controls + const small = this.root.querySelector('.small'); + const normal = this.root.querySelector('.normal'); + const large = this.root.querySelector('.large'); + + small.addEventListener('click', () => { + this.setSmallFontSize(); + this.setState({ fontSize: 'Small' }); + }); + + normal.addEventListener('click', () => { + this.setNormalFontSize(); + this.setState({ fontSize: 'Normal' }); + }); + + large.addEventListener('click', () => { + this.setLargeFontSize(); + this.setState({ fontSize: 'Large' }); + }); + } +} + +RegisterComponent(AccessabilityPopout); diff --git a/client/public/components/basket-popout.mjs b/client/public/components/basket-popout.mjs index b5d73e2..f423972 100644 --- a/client/public/components/basket-popout.mjs +++ b/client/public/components/basket-popout.mjs @@ -85,15 +85,25 @@ class BasketPopout extends Component { super(BasketPopout); } - OnLocalBasketUpdate() { + async OnLocalBasketUpdate() { const basket = localStorage.getItem('basket'); if (basket) { try { const basketJSON = JSON.parse(basket); + + const res = await fetch('/api/basket/price', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(basketJSON), + }).then(res => res.json()); + this.setState({ items: basketJSON.items, total: basketJSON.total, + subtotal: res.data.subtotal, }); } catch (e) { console.log(e); @@ -102,6 +112,7 @@ class BasketPopout extends Component { this.setState({ items: {}, total: 0, + subtotal: 0, }); } } @@ -124,14 +135,16 @@ class BasketPopout extends Component { @@ -197,7 +212,7 @@ class BasketPopout extends Component { max-height: 550px; max-width: 500px; padding-top: 10px; - padding-bottom: 10px; + padding-bottom: 5px; flex-direction: column; justify-content: center; align-items: center; @@ -206,12 +221,58 @@ class BasketPopout extends Component { @media (pointer:none), (pointer:coarse), screen and (max-width: 900px) { #basket-popup { - position: fixed; + position: absolute; left: 0; + max-width: 100%; width: 100%; } } + .popup-header { + display: flex; + justify-content: space-between; + padding-bottom: 2px; + font-size: 1.5em; + font-weight: bold; + } + + .toggler { + position: absolute; + right: 2px; + top: 2px; + background: transparent; + border: none; + cursor: pointer; + outline: none; + height: 2em; + width: 2em; + z-index: 50; + transition: all 0.2s ease-in; + } + + .cross-line { + background: #222; + box-shadow: #222 0px 0px 2px; + position: absolute; + height: 2px; + left: 0; + width: 100%; + } + + #toggler:hover .cross-line { + background: #777; + } + + .cross-line-top { + top: 50%; + transform: rotate(45deg) translatey(-50%); + } + + .cross-line-bottom { + bottom: 50%; + transform: rotate(-45deg) translatey(50%); + } + .popup-content { display: flex; flex-direction: column; @@ -247,30 +308,78 @@ class BasketPopout extends Component { text-align: right; flex-grow: 1; } + + .popup-footer { + width: 100%; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-around; + align-items: center; + padding-top: 7px; + padding-bottom: 2px; + } + + .popup-footer-total { + font-size: 1em; + font-weight: bold; + } + + .popup-footer-button { + font-size: 1.4em; + font-weight: bold; + background-color: #AB8FFF; + border: 1px solid #222; + color: #222; + padding: 5px; + cursor: pointer; + outline: none; + transition: all 0.2s ease-in; + } + + .popup-footer-button:hover { + background-color: #222; + color: #AB8FFF; + } `, }; } OnRender() { - // set up basket + const basketWrapper = this.root.querySelector('#basket-wrapper'); const basketToggler = this.root.querySelector('.basket'); + const popup = this.root.querySelector('.popup'); + const closeButton = this.root.querySelector('.toggler'); basketToggler.addEventListener('click', () => { - const popup = this.root.querySelector('.popup'); popup.classList.toggle('show'); + }); - popup.addEventListener('click', (e) => { - if (e.target.classList.contains('popup-close')) { - popup.classList.remove('show'); - } - }); + closeButton.addEventListener('click', () => { + popup.classList.remove('show'); + }); - // allow "click off to close" - // document.addEventListener('click', (e) => { - // if (!popup.contains(e.target)) { - // popup.classList.remove('show'); - // } - // }); + const toggler = this.root.querySelector('.toggler'); + toggler.addEventListener('click', () => { + popup.classList.remove('show'); + }); + + // allow "click off to close", allowing for the users mouse to start clicking and dragging inside the popup + // without closing it if the mouse leaves the popup + let isMouseInside = true; + + basketWrapper.addEventListener('mouseleave', () => { + isMouseInside = false; + }); + + basketWrapper.addEventListener('mouseenter', () => { + isMouseInside = true; + }); + + window.addEventListener('mouseup', () => { + if (!isMouseInside) { + popup.classList.remove('show'); + } }); } } diff --git a/client/public/components/css/product-listing.css b/client/public/components/css/product-listing.css index da4345d..62a3d5b 100644 --- a/client/public/components/css/product-listing.css +++ b/client/public/components/css/product-listing.css @@ -173,17 +173,19 @@ input[type=number] { margin-block-end: 0.83em; margin-right: 1em; cursor: pointer; - background-color: #1A1A1A; + background-color: #222; border: none; - color: #FFFFFF; + color: #F5F6F6; padding: 0.5em; font-size: 1.5em; font-weight: bold; + transition: all 0.2s ease-in; } .add-to-basket-button:hover { - background-color: #FFFFFF; - color: #1A1A1A; + background-color: #F5F6F6; + outline: 2px solid #222; + color: #222; } .add-to-favorites-button:hover { diff --git a/client/public/components/product-list.mjs b/client/public/components/product-list.mjs index 3fa8e47..b889747 100644 --- a/client/public/components/product-list.mjs +++ b/client/public/components/product-list.mjs @@ -41,7 +41,7 @@ class ProductList extends Component { return /* html */`
- Refine search results + Refine results
@@ -56,7 +56,6 @@ class ProductList extends Component { Render() { const augmentPanel = this.GenerateAugmentPanel(this.state.augmentable); - console.log(augmentPanel); if (this.state.page * this.state.per_page >= this.state.total) { this.keepLoading = false; diff --git a/client/public/components/product-listing.mjs b/client/public/components/product-listing.mjs index b5eb5a0..22ef47f 100644 --- a/client/public/components/product-listing.mjs +++ b/client/public/components/product-listing.mjs @@ -133,7 +133,7 @@ class ProductListing extends Component {
{this.state.name} {this.state.id}
- ${this.state.discount + ${this.state.discountbar ? `£${parseFloat(this.state.price).toFixed(2)}£${parseFloat(this.state.discount).toFixed(2)}` : `£${parseFloat(this.state.price).toFixed(2)}`}
${this.state.description || this.state.name + ' ' + this.state.tag}
@@ -149,7 +149,7 @@ class ProductListing extends Component {
- Add to Favorites +
@@ -231,7 +231,6 @@ class ProductListing extends Component { // if it is a brick, get potential modifier from the drop down menu const brick = this.state.type === 'brick'; const modifier = brick ? this.root.querySelector('.brick-colour-selector-select').value : undefined; - console.log(modifier); AddProductToBasket(this.state.id, this.state.type, Math.abs(parseInt(quantityInput.value)), modifier); quantityInput.value = 1; diff --git a/client/public/components/templates/navbar.html b/client/public/components/templates/navbar.html index 62379f8..e0ff304 100644 --- a/client/public/components/templates/navbar.html +++ b/client/public/components/templates/navbar.html @@ -41,9 +41,10 @@ - - + + +
\ No newline at end of file diff --git a/client/public/featured/index.html b/client/public/featured/index.html index ef0ced4..cf4c118 100644 --- a/client/public/featured/index.html +++ b/client/public/featured/index.html @@ -24,6 +24,7 @@ + diff --git a/client/public/global.css b/client/public/global.css index 6828013..94a708f 100644 --- a/client/public/global.css +++ b/client/public/global.css @@ -25,6 +25,10 @@ limited-margin { /* small screen */ @media screen and (max-width: 900px) { + body { + font-size: 25px; + } + limited-margin { width: 90%; } @@ -34,7 +38,6 @@ limited-margin { @media (pointer:none), (pointer:coarse) { body { zoom: 120%; - font-size: 25px; } limited-margin { diff --git a/client/public/index.html b/client/public/index.html index f75b765..b4a1388 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -24,6 +24,8 @@ + + diff --git a/client/public/product/index.html b/client/public/product/index.html index f1625b0..4878c78 100644 --- a/client/public/product/index.html +++ b/client/public/product/index.html @@ -20,6 +20,7 @@ + diff --git a/client/public/search/index.html b/client/public/search/index.html index 3932878..3ec2724 100644 --- a/client/public/search/index.html +++ b/client/public/search/index.html @@ -24,6 +24,7 @@ + diff --git a/package.json b/package.json index 5f3a358..236fb4b 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,7 @@ "eslintConfig": { "extends": "portsoc", "rules": { - "indent": [ - "error", - 4 - ] + "indent": "off" }, "root": true, "env": { diff --git a/src/routes/api.js b/src/routes/api.js index 952d6c8..512865e 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -26,11 +26,7 @@ function Init() { Server.App.get('/api/auth/orders/'); Server.App.get('/api/auth/order/:id'); - Server.App.get('/api/auth/basket/'); - Server.App.put('/api/auth/basket/:id'); - Server.App.post('/api/auth/basket/:id'); - Server.App.delete('/api/auth/basket/:id'); - Server.App.delete('/api/auth/basket/'); + Server.App.post('/api/basket/price', Helpers.CalculateBasketPrice); Logger.Module('API', 'API Routes Initialized'); } diff --git a/src/routes/helpers.js b/src/routes/helpers.js index 091f374..8dd8f83 100644 --- a/src/routes/helpers.js +++ b/src/routes/helpers.js @@ -10,6 +10,16 @@ function Special(req, res, next) { }); } +function CalculateBasketPrice(req, res) { + res.send({ + data: { + subtotal: 10, + }, + }); +} + + module.exports = { Special, + CalculateBasketPrice, };