diff --git a/cspell.json b/cspell.json index 2e63262..3987eac 100644 --- a/cspell.json +++ b/cspell.json @@ -17,7 +17,8 @@ "KeycloakOIDCAB", "Keycloak", "tabindex", - "onetimelogin" + "onetimelogin", + "Ammeldelink" ], "ignoreWords": [], "import": [] diff --git a/rc_hip/rc_hip/settings.py b/rc_hip/rc_hip/settings.py index f9af3e3..81459fe 100644 --- a/rc_hip/rc_hip/settings.py +++ b/rc_hip/rc_hip/settings.py @@ -88,7 +88,6 @@ TEMPLATES = [ WSGI_APPLICATION = "rc_hip.wsgi.application" - # Database # https://docs.djangoproject.com/en/4.2/ref/settings/#databases diff --git a/rc_hip/repapp/live_tests.py b/rc_hip/repapp/live_tests.py index 60d14b7..4ed713f 100644 --- a/rc_hip/repapp/live_tests.py +++ b/rc_hip/repapp/live_tests.py @@ -7,9 +7,9 @@ from hashlib import sha256 from django.contrib.staticfiles.testing import StaticLiveServerTestCase from django.contrib.auth import get_user_model from selenium.webdriver.common.by import By -# from selenium.webdriver.chrome.webdriver import WebDriver -from selenium.webdriver.firefox.webdriver import WebDriver -from .models import CustomUser, Guest, OneTimeLogin +from selenium.webdriver.chrome.webdriver import WebDriver +from selenium.webdriver import ActionChains, Keys +from .models import CustomUser, OneTimeLogin class WorkflowTests(StaticLiveServerTestCase): @@ -22,7 +22,8 @@ class WorkflowTests(StaticLiveServerTestCase): def setUpClass(cls): super().setUpClass() cls.selenium = WebDriver() - cls.selenium.implicitly_wait(10) + cls.selenium.implicitly_wait(50) + cls.selenium.maximize_window() @classmethod def tearDownClass(cls): @@ -32,6 +33,8 @@ class WorkflowTests(StaticLiveServerTestCase): def setUp(self): super().setUp() + self.action_chains = ActionChains(self.selenium) + self.password = "ATestPassword" user = CustomUser.objects.get(pk=3) user.set_password(self.password) @@ -62,7 +65,7 @@ class WorkflowTests(StaticLiveServerTestCase): self.selenium.get(f"{self.live_server_url}/") # Click on a register link self.selenium.find_element(By.CLASS_NAME, "register_link").click() - time.sleep(1) + time.sleep(2) # Enter new device # Enter guest mail address mail = self.selenium.find_element(By.NAME, "mail") @@ -76,6 +79,10 @@ class WorkflowTests(StaticLiveServerTestCase): # Enter a error description error = self.selenium.find_element(By.NAME, "error") error.send_keys("A description of the issue\nof the device.") + # Scroll to the bottom of the page + self.selenium.find_element( + By.TAG_NAME, "body").send_keys(Keys.CONTROL, Keys.END) + time.sleep(1) # Skip device picture and device type plate # No follow up repair # Accept repair conditions @@ -121,6 +128,10 @@ class WorkflowTests(StaticLiveServerTestCase): # Enter a error description error = self.selenium.find_element(By.NAME, "error") error.send_keys("Another issue description.") + # Scroll to the bottom of the page + self.selenium.find_element( + By.TAG_NAME, "body").send_keys(Keys.CONTROL, Keys.END) + time.sleep(1) # Add device picture test_script_folder = Path(__file__).resolve().parent fixtures_folder = os.path.join(test_script_folder, "fixtures") diff --git a/rc_hip/repapp/static/repapp/images/header_background.jpg b/rc_hip/repapp/static/repapp/images/header_background.jpg new file mode 100644 index 0000000..ba9ad14 Binary files /dev/null and b/rc_hip/repapp/static/repapp/images/header_background.jpg differ diff --git a/rc_hip/repapp/static/repapp/images/logo.jpg b/rc_hip/repapp/static/repapp/images/logo.jpg new file mode 100644 index 0000000..71c1e86 Binary files /dev/null and b/rc_hip/repapp/static/repapp/images/logo.jpg differ diff --git a/rc_hip/repapp/static/repapp/css/bootstrap.min.js b/rc_hip/repapp/static/repapp/js/bootstrap.min.js similarity index 100% rename from rc_hip/repapp/static/repapp/css/bootstrap.min.js rename to rc_hip/repapp/static/repapp/js/bootstrap.min.js diff --git a/rc_hip/repapp/static/repapp/js/jquery-3.6.4.min.js b/rc_hip/repapp/static/repapp/js/jquery-3.6.4.min.js new file mode 100644 index 0000000..0de648e --- /dev/null +++ b/rc_hip/repapp/static/repapp/js/jquery-3.6.4.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.6.4 | (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,y=n.hasOwnProperty,a=y.toString,l=a.call(Object),v={},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.4",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))&&v(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+" "]&&(!y||!y.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)&&ve(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(B,"$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 ye(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 ve(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.cssHas=ce(function(){try{return C.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),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=[],y=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||y.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||y.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||y.push(".#.+[+~]"),e.querySelectorAll("\\\f"),y.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&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.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)}),d.cssHas||y.push(":has"),y=y.length&&new RegExp(y.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),v=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&&v(p,e)?-1:t==C||t.ownerDocument==p&&v(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))&&(!y||!y.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),v.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",v.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",v.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ye(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 ve(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 Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.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(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.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,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),v.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(v.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 B(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]=_e(v.pixelPosition,function(e,t){if(t)return t=Be(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 B(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 - +{% load static %} + - - RepApp + <title>RepApp - {% block title %} {% endblock title %} + {% block head %} {% endblock head %} +
+
+ + Repair-Café Logo + + +
+
+
+
+

+ {% block page_title %} + {% endblock page_title %} +

+
+
-
+
{% if messages %} {% for message in messages %}{% endfor %} {% endif %} @@ -30,14 +77,18 @@
- +
+ +
+ + diff --git a/rc_hip/repapp/templates/repapp/bootstrap.html b/rc_hip/repapp/templates/repapp/bootstrap.html new file mode 100644 index 0000000..1777fbc --- /dev/null +++ b/rc_hip/repapp/templates/repapp/bootstrap.html @@ -0,0 +1,81 @@ + +{% load static %} + + + + + + + + RepApp - + {% block title %} + Bootstrap + {% endblock title %} + + + {% block head %} + {% endblock head %} + + +
+
+ + Repair-Café Logo + + +
+
+
+
+

Anmeldung

+
+
+
+
+
+ {% if messages %} + {% for message in messages %}{% endfor %} + {% endif %} + {% block content %} + {% endblock content %} +
+
+
+ + + + diff --git a/rc_hip/repapp/templates/repapp/device_view.html b/rc_hip/repapp/templates/repapp/device_view.html index 3ffea1d..76a370b 100644 --- a/rc_hip/repapp/templates/repapp/device_view.html +++ b/rc_hip/repapp/templates/repapp/device_view.html @@ -2,9 +2,10 @@ {% block title %} - {{ device.device }} {% endblock title %} +{% block page_title %} + Gerät: {{ device.device }} +{% endblock page_title %} {% block content %} -

Gerät: {{ device.device }}

-
diff --git a/rc_hip/repapp/templates/repapp/guest_profile.html b/rc_hip/repapp/templates/repapp/guest_profile.html index b4d4bbc..b32f347 100644 --- a/rc_hip/repapp/templates/repapp/guest_profile.html +++ b/rc_hip/repapp/templates/repapp/guest_profile.html @@ -1,10 +1,11 @@ {% extends "repapp/base.html" %} {% block title %} - - Gast Daten + - Ihre Daten {% endblock title %} +{% block page_title %} + Ihre Daten +{% endblock page_title %} {% block content %} -

Ihre Daten

-
diff --git a/rc_hip/repapp/templates/repapp/index.html b/rc_hip/repapp/templates/repapp/index.html index 44bf095..8421850 100644 --- a/rc_hip/repapp/templates/repapp/index.html +++ b/rc_hip/repapp/templates/repapp/index.html @@ -282,8 +282,11 @@ } {% endblock head %} +{% block page_title %} + Anmeldung +{% endblock page_title %} {% block content %} -

Repair-Cafés

+

Repair-Café auswählen

    {% for cafe in object_list %} diff --git a/rc_hip/repapp/templates/repapp/member_login.html b/rc_hip/repapp/templates/repapp/member_login.html index e885ba4..a3a4585 100644 --- a/rc_hip/repapp/templates/repapp/member_login.html +++ b/rc_hip/repapp/templates/repapp/member_login.html @@ -1,17 +1,16 @@ {% extends "repapp/base.html" %} {% block title %} - - Mitarbeiter Login + Mitarbeiter Anmeldung {% endblock title %} +{% block page_title %} + Mitarbeiter + {% if user.is_authenticated %} + Anmelden + {% else %} + Abmelden + {% endif %} +{% endblock page_title %} {% block content %} -

    - Mitarbeiter - {% if user.is_authenticated %} - Logout - {% else %} - Login - {% endif %} -

    -
    {% if user.is_authenticated %}

    Angemeldeter Benutzer: {{ user.email }}

    diff --git a/rc_hip/repapp/templates/repapp/register_device.html b/rc_hip/repapp/templates/repapp/register_device.html index 7070663..5ae84f3 100644 --- a/rc_hip/repapp/templates/repapp/register_device.html +++ b/rc_hip/repapp/templates/repapp/register_device.html @@ -3,9 +3,10 @@ {% block title %} - Gerät anmelden {% endblock title %} +{% block page_title %} + Gerät anmelden +{% endblock page_title %} {% block content %} -

    Gerät anmelden

    -
    diff --git a/rc_hip/repapp/templates/repapp/register_device_final.html b/rc_hip/repapp/templates/repapp/register_device_final.html index c53eaa5..7229c6b 100644 --- a/rc_hip/repapp/templates/repapp/register_device_final.html +++ b/rc_hip/repapp/templates/repapp/register_device_final.html @@ -1,9 +1,10 @@ {% extends "repapp/base.html" %} {% block title %} {% endblock title %} +{% block page_title %} + Anmeldung erfolgreich! +{% endblock page_title %} {% block content %} -

    Anmeldung erfolgreich!

    -

    Vielen Dank für die Anmeldung des Geräts {{ device.device }} - {{ device.manufacturer }} zur Reparatur im Repair-Café am {{ cafe.event_date|date }}.

    diff --git a/rc_hip/repapp/templates/repapp/register_guest.html b/rc_hip/repapp/templates/repapp/register_guest.html index de85d4e..b159ef5 100644 --- a/rc_hip/repapp/templates/repapp/register_guest.html +++ b/rc_hip/repapp/templates/repapp/register_guest.html @@ -3,9 +3,10 @@ {% block title %} - Gast anmelden {% endblock title %} +{% block page_title %} + Ihre Daten +{% endblock page_title %} {% block content %} -

    Ihre Daten

    -
    {% csrf_token %} diff --git a/rc_hip/repapp/tests.py b/rc_hip/repapp/tests.py index ad36f6c..3d05dde 100644 --- a/rc_hip/repapp/tests.py +++ b/rc_hip/repapp/tests.py @@ -1,17 +1,25 @@ """ Tests for RepApp. """ +import time from hashlib import sha256 from datetime import datetime, timedelta import django.utils.timezone - -from django.test import TestCase +from django.test import TestCase, RequestFactory from django.test import Client from django.urls import reverse +from django.core import mail +from django.contrib.messages.storage.fallback import FallbackStorage from .backends import OneTimeLoginBackend, EmailBackend, create_repapp_user -from .models import (OneTimeLogin, CustomUser, Cafe, Organisator, Reparateur) +from .models import (OneTimeLogin, CustomUser, Cafe, + Organisator, Reparateur, Device, Guest) +from .views import (send_one_time_login_mail, + send_confirmation_mails, + send_guest_account_mail, + is_member, + create_one_time_login) class OneTimeLoginTest(TestCase): @@ -192,6 +200,8 @@ class ViewsTest(TestCase): fixtures = ["cafe-data.json"] def setUp(self): + self.factory = RequestFactory() + cafe = Cafe(location="neuer Ort", address="neue Adresse", event_date=django.utils.timezone.now()) cafe.save() @@ -281,3 +291,114 @@ class ViewsTest(TestCase): self.assertContains(response, "Abmelden") # ensure user is displayed self.assertContains(response, "testuser@example.com") + + def test_send_one_time_login_mail(self): + """ + Test that a mail is sent with the right link included. + """ + secret = "A_SECRET" + mail_address = "guest@example.com" + + request = self.factory.get('/') + setattr(request, 'session', 'session') + setattr(request, '_messages', FallbackStorage(request)) + + send_one_time_login_mail(secret, mail_address, request) + + self.assertEqual(len(mail.outbox), 1) + self.assertTrue("Einmal-Ammeldelink" in mail.outbox[0].subject) + self.assertEqual(mail.outbox[0].to, [mail_address]) + self.assertTrue(f'/onetimelogin/{secret}/' in mail.outbox[0].body) + + def test_send_confirmation_mails(self): + """ + Test that the confirmation mails are sent. + """ + device = Device.objects.get(pk=2) + guest = Guest.objects.get(pk=4) + cafe = Cafe.objects.get(pk=1) + + organisator = Organisator( + name="Orga", + mail="orga@example.com" + ) + organisator.save() + + request = self.factory.get('/') + setattr(request, 'session', 'session') + setattr(request, '_messages', FallbackStorage(request)) + + send_confirmation_mails(device, guest, cafe, request) + + self.assertEqual(len(mail.outbox), 2) + + self.assertEqual(mail.outbox[0].subject, + f"Neues Gerät { device.device }") + self.assertEqual(mail.outbox[0].to, [organisator.mail]) + + self.assertTrue("Geräteanmeldung" in mail.outbox[1].subject) + self.assertEqual(mail.outbox[1].to, [guest.mail]) + self.assertTrue("Geräteanmeldung" in mail.outbox[1].body) + + def test_send_guest_account_mail(self): + """ + Test that an account creation mail was sent. + """ + password = "A_SECRET" + guest = Guest.objects.get(pk=4) + + request = self.factory.get('/') + setattr(request, 'session', 'session') + setattr(request, '_messages', FallbackStorage(request)) + + send_guest_account_mail(guest, password, request) + + self.assertEqual(len(mail.outbox), 1) + self.assertTrue("Benutzerkonto" in mail.outbox[0].subject) + self.assertEqual(mail.outbox[0].to, [guest.mail]) + self.assertTrue(f'{password}' in mail.outbox[0].body) + self.assertTrue(f'{guest.mail}' in mail.outbox[0].body) + + def test_is_member(self): + """ + Test that members are detected and not guests. + """ + organisator = Organisator( + name="Orga", + mail="orga@example.com" + ) + organisator.save() + organisator_user = CustomUser( + username="orga", + email=organisator.mail + ) + organisator_user.save() + + reparateur = Reparateur( + name="Reparateur", + mail="repa@example.com" + ) + reparateur.save() + reparateur_user = CustomUser( + username="repa", + email=reparateur.mail + ) + reparateur_user.save() + + guest = CustomUser.objects.get(pk=3) + + self.assertTrue(is_member(organisator_user)) + self.assertTrue(is_member(reparateur_user)) + self.assertFalse(is_member(guest)) + + def test_create_one_time_login(self): + """ + Test one time login creation. + """ + user = CustomUser.objects.get(pk=3) + url = "/test/url/" + secret = create_one_time_login(user, url) + secret_hash = sha256(secret.encode('utf-8')).hexdigest() + + otl = OneTimeLogin.objects.get(secret=secret_hash) + self.assertEqual(otl.url, url) diff --git a/rc_hip/repapp/urls.py b/rc_hip/repapp/urls.py index 5d51289..b2ee999 100644 --- a/rc_hip/repapp/urls.py +++ b/rc_hip/repapp/urls.py @@ -27,6 +27,7 @@ urlpatterns = [ path("member/login/", views.member_login, name="member_login"), path("cron", views.cron, name="cron"), + path("bootstrap", views.bootstrap, name="bootstrap"), path("process_mails", views.process_mails, name="process_mails"), ] diff --git a/rc_hip/repapp/views.py b/rc_hip/repapp/views.py index 0aab730..110556e 100644 --- a/rc_hip/repapp/views.py +++ b/rc_hip/repapp/views.py @@ -26,6 +26,9 @@ from .forms import RegisterDevice, RegisterGuest def send_one_time_login_mail(secret, mail, request): + """ + Send a mail with a one time login link. + """ url = request.build_absolute_uri( f'/onetimelogin/{secret}/') subject = render_to_string( @@ -52,6 +55,9 @@ def send_one_time_login_mail(secret, mail, request): def send_confirmation_mails(device, guest, cafe, request): + """ + Send confirmation mails for device registration. + """ organizers = [] for organizer in Organisator.objects.all(): organizers.append(organizer.mail) @@ -110,6 +116,9 @@ def send_confirmation_mails(device, guest, cafe, request): def send_guest_account_mail(guest, password, request): + """ + Send guest user account created mail. + """ url = request.build_absolute_uri('/guest/profile/') subject = render_to_string( 'repapp/mail/mail_new_guest_subject.html').replace('\n', '') @@ -139,6 +148,9 @@ def send_guest_account_mail(guest, password, request): def is_member(user): + """ + Test is a user is a Repair-Café member. + """ organisator = Organisator.objects.filter(mail=user.email).first() reparateur = Reparateur.objects.filter(mail=user.email).first() return organisator or reparateur @@ -146,7 +158,7 @@ def is_member(user): def create_one_time_login(user, url) -> str: """ - create_one_time_login create a one time login object for user logins. + create_one_time_login creates a one time login object for guest user logins. """ secret = sha256( f'{user.email}{url}{datetime.datetime.now()}{random.randint(0,9999999)}'.encode( @@ -435,3 +447,13 @@ def one_time_login(request, secret: str): else: messages.add_message(request, messages.ERROR, 'Login fehlgeschlagen.') return HttpResponseRedirect(reverse_lazy('index')) + + +def bootstrap(request): + """ + Bootstrap design test page. + """ + return render( + request, + "repapp/bootstrap.html" + )