From 283d2fe66f34892fc7811b4151739742ad7e5d60 Mon Sep 17 00:00:00 2001 From: Janis M Date: Tue, 29 Mar 2022 14:38:40 +0200 Subject: [PATCH] better error handling register --- index.js | 27 +++++- static/css/auth.css | 24 +++-- static/css/auth_header.css | 33 +++++++ static/css/header.css | 4 - static/css/order.css | 10 +- static/css/product.css | 166 ++++++++++++--------------------- static/css/style.css | 32 ++++++- static/js/jquery.min.js | 2 + static/js/register.js | 52 +++++++++++ validators.js | 15 +++ views/login.ejs | 37 ++++---- views/order.ejs | 2 +- views/partials/auth_header.ejs | 6 ++ views/partials/head.ejs | 1 + views/product.ejs | 68 +++++++------- views/register.ejs | 148 +++++++++++++++-------------- 16 files changed, 367 insertions(+), 260 deletions(-) create mode 100644 static/css/auth_header.css create mode 100644 static/js/jquery.min.js create mode 100644 static/js/register.js create mode 100644 validators.js create mode 100644 views/partials/auth_header.ejs diff --git a/index.js b/index.js index 2b1c5d9..0f96fe8 100644 --- a/index.js +++ b/index.js @@ -8,6 +8,7 @@ const uuid = require("uuid"); // Import Modules const mysql_handler = require("./mysql_handler"); +const validator = require("./validators") // Global Variables const app = express(); @@ -332,7 +333,29 @@ app.post("/auth/register", notAuthenticatedHandler,(req, res) =>{ let cityName = req.body.cityName; let country = req.body.country; - let error = ""; // Error message + let error = ""; + /* + 0: No error + error_username_dup + error_email_dup + error_password_length_short + error_password_length_long + error_password_emismatch + error_email_invalid + error_username_invalid + error_firstname_invalid + error_lastname_invalid + error_street_invalid + error_housenumber_invalid + error_postcode_invalid + error_cityname_invalid + error_country_invalid + */ + + + if(!validator.validate_password(password1)){ + error += "Passwort muss mindestens 8 Zeichen lang sein!\n"; + } if(password1 != password2){ // If passwords don't match error += "Passwörter sind unterschiedlich!"; @@ -346,7 +369,7 @@ app.post("/auth/register", notAuthenticatedHandler,(req, res) =>{ } if(error != ""){ // If there is an error - res.redirect(`/register/${error}`); // Redirect to register page with error message + res.send("ERROR") // Redirect to register page with error message }else{ bcrypt.genSalt(10, function(err, salt) { // Generate salt bcrypt.hash(password1, salt, function(err, hash){ // Hash password diff --git a/static/css/auth.css b/static/css/auth.css index e3195e7..7aa4138 100644 --- a/static/css/auth.css +++ b/static/css/auth.css @@ -1,15 +1,11 @@ -h1{ - text-align: center; -} - -form{ +.auth_form{ display:block; margin-left: auto; margin-right: auto; width: 500px; } -form label{ +.auth_form label{ display:block; margin-left: auto; margin-right: auto; @@ -17,7 +13,7 @@ form label{ margin-top: 20px; } -form label p{ +.auth_form label p{ width: 100%; display:block; margin-left: auto; @@ -26,7 +22,7 @@ form label p{ font-weight: bold; letter-spacing: 1.5px; } -form label input{ +.auth_form label input{ width: 100%; display:block; margin-left: auto; @@ -37,16 +33,18 @@ form label input{ background-color: rgb(255, 255, 255); transition: 0.1s; transition-timing-function: linear; + padding-left:5px; + padding-right: 5px; outline: none !important; } -form h4{ +.auth_form h4{ text-align: center; margin-top: 30px; margin-bottom: 0px; } /* Submit button with blue background horizontal center*/ -form input[type="submit"]{ +.auth_form input[type="button"]{ color: rgb(255, 255, 255); font-weight: bold; letter-spacing: 1.5px; @@ -68,16 +66,16 @@ form input[type="submit"]{ /* Hover */ -form label input:hover{ +.auth_form label input:hover{ border: 2px solid rgb(1, 197, 246); } -form label input:focus{ +.auth_form label input:focus{ border: 2px solid rgb(1, 197, 246); box-shadow: 0 0 5px #719ece62; } -form input[type="submit"]:hover{ +.auth_form input[type="submit"]:hover{ border: 2px solid rgb(7, 130, 200); background-color: rgb(7, 130, 200); } diff --git a/static/css/auth_header.css b/static/css/auth_header.css new file mode 100644 index 0000000..9bc7c59 --- /dev/null +++ b/static/css/auth_header.css @@ -0,0 +1,33 @@ +/* Header */ +.auth-header { + width: 100%; + display: block; + height: 50px; + background-color: rgb(97, 102, 141); + margin-top: 0px; + padding: 0px; +} + +.auth-header p{ + float:left; + color:white; + font-weight: bold; + font-size: 14pt; + padding:0; + margin-left: 10px; + margin-top: 14px; +} + +.auth-header .auth-header-image-container{ + display: block; + margin-left: auto; + margin-right: auto; + height: 45px; + width: 45px; + padding-top: 2px; +} + +.auth-header .auth-header-image-container img{ + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/static/css/header.css b/static/css/header.css index 7e85d4e..25b310e 100644 --- a/static/css/header.css +++ b/static/css/header.css @@ -6,10 +6,6 @@ transform: translateY(-50%); } -body { - margin: 0; -} - /* BACKGROUND */ .headerDIV > div { height: 100%; diff --git a/static/css/order.css b/static/css/order.css index cb0959e..556b9ff 100644 --- a/static/css/order.css +++ b/static/css/order.css @@ -11,8 +11,7 @@ height: 30px; } - -form input[type="submit"]{ +.order_form input[type="submit"]{ color: rgb(255, 255, 255); font-weight: bold; letter-spacing: 1.5px; @@ -29,14 +28,9 @@ form input[type="submit"]{ transition-timing-function: linear; outline: none !important; cursor:pointer; - } -h3{ - text-align: center; -} - -hr{ +#order-info hr{ width: 100%; border: 0px; background-color:rgba(51, 51, 51, 0.337); diff --git a/static/css/product.css b/static/css/product.css index 7dd5805..e6d2b07 100644 --- a/static/css/product.css +++ b/static/css/product.css @@ -1,14 +1,3 @@ -*{ - padding:0; -} - -h1, h2{ - margin-left: 0px; - text-align: left; - padding-bottom: 0; - margin-bottom: 0px; -} - .seller{ display: block; height: 30px; @@ -34,37 +23,6 @@ h1, h2{ border: 2px solid rgb(143, 143, 143); float:left; } -#content -{ - width: 1000px; - background-color: rgb(244, 244, 244); - margin:auto; - padding-top: 10px; -} -#productPicture -{ - width: 40%; - height: 400px; - /*background-color: rgb(85, 85, 85);*/ - display: block; - float: left; - border-bottom: 2px solid rgb(104, 117, 151); -} - -#productPicture img -{ - width: 90%; - display: block; -} -#info -{ - width: 60%; - height: 400px; - display: block; - float: right; - /*background-color: rgb(121, 170, 182);*/ - border-bottom: 2px solid rgb(104, 117, 151);; -} .order-button{ color: rgb(255, 255, 255); @@ -85,50 +43,47 @@ h1, h2{ margin-right: 30px; margin-top: 10px; } - -#description -{ - width: 100%; - display: block; - float: left; - background-color: rgba(103, 187, 183, 0); - border-bottom: 2px solid rgb(104, 117, 151); -} - -#description p,h2 { - padding-left: 30px; - padding-right: 30px; -} - -#newReview{ - width: 100%; - display: block; - float: left; - background-color: rgba(45, 66, 94, 0); - padding-bottom: 20px; +/* Info header*/ +.product-header{ + height: 400px; border-bottom: 2px solid rgb(104, 117, 151);; } -#reviews{ - width: 100%; - height: 1600px; +#product-image +{ + width: 40%; + height: 400px; display: block; float: left; - background-color: rgba(39, 39, 39, 0); +} +#product-image img +{ + width: 90%; + display: block; } -#reviewTemplate + +#product-info +{ + width: 60%; + height: 400px; + display: block; + float: right; +} + +/* Sections */ +section { width: 100%; - float: left; - margin-bottom: 20px; -} -#reviewTemplatePicture -{ - width: 200px; - height: 200px; display: block; - float: left; - background-color: rgb(85, 158, 255); + background-color: rgba(103, 187, 183, 0); + border-bottom: 2px solid rgb(104, 117, 151); + padding-top:20px; + padding-bottom: 10px; +} + +section p, h2 { + padding-left: 30px; + padding-right: 30px; } @@ -137,31 +92,40 @@ h1, h2{ width: 100%; height: 50px; display: block; - float: left; + background-color: rgb(124, 142, 212); } -#text -{ - width: 100%; - height: 150px; - display: block; - float: left; - background-color: rgb(211, 196, 247); -} -#reviewTemplateText -{ - background-color: rgb(235, 196, 228); +/* review */ +.review-container{ + margin-bottom: 20px; } -form{ +.review-header{ + padding-top:10px; + padding-bottom:10px; + background-color: rgb(124, 142, 212); + display:block; + width: 100%; +} + +.review-content{ + display: block; + width: 100%; + background-color: rgb(204, 214, 255); + padding-top:10px; + padding-bottom:20px; +} + + +.product-form{ display:block; margin-left: auto; margin-right: auto; width: 500px; } -form label{ +.product-form label{ display:block; margin-left: auto; margin-right: auto; @@ -169,7 +133,7 @@ form label{ margin-top: 20px; } -form label p{ +.product-form label p{ width: 100%; display:block; margin-left: auto; @@ -178,7 +142,7 @@ form label p{ font-weight: bold; letter-spacing: 1.5px; } -form label input{ +.product-form label input{ width: 100%; display:block; margin-left: auto; @@ -192,7 +156,7 @@ form label input{ outline: none !important; } /* Submit button with blue background horizontal center*/ -form input[type="submit"]{ +.product-form input[type="submit"]{ color: rgb(255, 255, 255); font-weight: bold; letter-spacing: 1.5px; @@ -214,21 +178,21 @@ form input[type="submit"]{ /* Hover */ -form label input:hover{ +.product-form label input:hover{ border: 2px solid rgb(1, 197, 246); } -form label input:focus{ +.product-form label input:focus{ border: 2px solid rgb(1, 197, 246); box-shadow: 0 0 5px #719ece62; } -form input[type="submit"]:hover{ +.product-form input[type="submit"]:hover{ border: 2px solid rgb(7, 130, 200); background-color: rgb(7, 130, 200); } -textarea{ +.product-form textarea{ resize: vertical; width: 100%; display:block; @@ -237,9 +201,3 @@ textarea{ } -@media only screen and (max-width: 1030px) { - #content - { - width: 100%; - } - } \ No newline at end of file diff --git a/static/css/style.css b/static/css/style.css index 004bdb2..9f34ccc 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,5 +1,7 @@ *{ font-family: Arial, Helvetica, sans-serif; + padding: 0; + margin: 0; } html,body{ @@ -7,11 +9,16 @@ html,body{ height: 100%; } -h1{ - text-align: center; +h1, h2{ + margin-left: 0px; + text-align: left; + padding-bottom: 0; + margin-bottom: 0px; } - +.text-center{ + text-align: center; +} #error-text{ color: red; @@ -35,4 +42,21 @@ h1{ margin-right: auto; display: block; padding-top: 10px; -} \ No newline at end of file +} + +.content{ + background-color: rgb(244, 244, 244); + width: 1000px; + display: block; + margin-left:auto; + margin-right:auto; + padding-top:10px; + padding-bottom: 20px; +} + +@media only screen and (max-width: 1030px) { + .content + { + width: 100%; + } + } \ No newline at end of file diff --git a/static/js/jquery.min.js b/static/js/jquery.min.js new file mode 100644 index 0000000..c4c6022 --- /dev/null +++ b/static/js/jquery.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="
",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 8 && password.length < 255){ + return true + } + } + return false; +} + +module.exports = { + validate_password +} \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs index b7cdee9..9ae9b60 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -5,23 +5,26 @@ -

Login

+ <%- include('partials/auth_header'); %> +
+

Login

-
-

<%- error %>

- - - - - - - Sie haben keinen Account? -
+
+

<%- error %>

+ + + + + + + Sie haben keinen Account? +
+
\ No newline at end of file diff --git a/views/order.ejs b/views/order.ejs index c984a4e..27e34ad 100644 --- a/views/order.ejs +++ b/views/order.ejs @@ -18,7 +18,7 @@ -
+ diff --git a/views/partials/auth_header.ejs b/views/partials/auth_header.ejs new file mode 100644 index 0000000..3795db5 --- /dev/null +++ b/views/partials/auth_header.ejs @@ -0,0 +1,6 @@ +
+

OnlineShop | <%= title %>

+
+ +
+
\ No newline at end of file diff --git a/views/partials/head.ejs b/views/partials/head.ejs index 58d93d6..bce27a9 100644 --- a/views/partials/head.ejs +++ b/views/partials/head.ejs @@ -4,4 +4,5 @@ Shop - <%= title %> + \ No newline at end of file diff --git a/views/product.ejs b/views/product.ejs index aa6775d..7672d96 100644 --- a/views/product.ejs +++ b/views/product.ejs @@ -10,13 +10,12 @@ <%- include('partials/header'); %> -
- -
-
+
+
+
-
+

<%= product.productName %>


Nr.:<%= product.id %>


@@ -24,34 +23,36 @@

Preis: <%= product.price %> € / Stück

Kategorie: <%= category.name %> -

-

+

+ +

<% } else { %> - color: red; font-weight:bold;"> - Aktuell nicht lieferbar! - <% } %> + + <% } %>
-
+
-
+

Beschreibung

<%= product.productDescription %>

-
- <% if(loggedIn){ %> -
+ + + <% if(user){ %> +

Rezensionen

- +
+ <% } %> -
+
<% if(reviews.length > 0){ %> <% for(let i = 0; i < reviews.length; i++){ %> -
-
-
-

<%= reviews[i].name %>

-

Bewertung: <%= reviews[i].rating %>

-
-
-

<%= reviews[i].title %>

-

<%= reviews[i].content %>

- -
+
+
+

(<%= reviews[i].rating %>) <%= reviews[i].name %>: <%= reviews[i].title %>

+
+
+

<%= reviews[i].content %>

- <% } %> - <% }else{ %> -
Leider hat dieses Produkt noch keine Bewertung. :(
+ <% } %> + <% }else{ %> +

Leider hat dieses Produkt noch keine Bewertung. :(

<% } %> -
+
<%- include('partials/footer'); %> diff --git a/views/register.ejs b/views/register.ejs index 07d5431..f6db57d 100644 --- a/views/register.ejs +++ b/views/register.ejs @@ -5,78 +5,84 @@ -

Register

+ <%- include('partials/auth_header'); %> +
+

Register

-
-

<%- error %>

+ +

+ +

Account Informationen:

+ + + + + + + + + +

Persönliche Informationen:

+ + + + + + +

Lieferadresse:

+ + + + + + + + + + + + + Sie haben bereits einen Account? +
+
-

Account Informationen:

- - - - - - - - - -

Persönliche Informationen:

- - - - - - -

Lieferadresse:

- - - - - - - - - - - - - Sie haben bereits einen Account? - + + \ No newline at end of file