From 59d14c35e06461ef273a784bb1a53ce4d9c1f0f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 09:07:26 +0100 Subject: [PATCH 01/32] adjust UI for REST framework --- .../static/css/rest_framework_tweaks.css | 133 ++++++++++++++++++ publications/static/js/popper.js | 6 + 2 files changed, 139 insertions(+) create mode 100644 publications/static/css/rest_framework_tweaks.css create mode 100644 publications/static/js/popper.js diff --git a/publications/static/css/rest_framework_tweaks.css b/publications/static/css/rest_framework_tweaks.css new file mode 100644 index 0000000..06536fe --- /dev/null +++ b/publications/static/css/rest_framework_tweaks.css @@ -0,0 +1,133 @@ +/* +https://github.com/encode/django-rest-framework/blob/master/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +*/ + +ul.breadcrumb { + margin: 20px 0; + font-weight: bold; +} + +.breadcrumb li.active a { + color: #777; + padding: 0 10px; +} + +body a { + color: #158F9B; +} + +body a:hover { + color: #278189; +} + +.pagination>.disabled>a, +.pagination>.disabled>a:hover, +.pagination>.disabled>a:focus { + cursor: not-allowed; + pointer-events: none; +} + +.pager>.disabled>a, +.pager>.disabled>a:hover, +.pager>.disabled>a:focus { + pointer-events: none; +} + +.pager .next { + margin-left: 10px; +} + +html, body { + height: 100%; +} + +.wrapper { + position: relative; + top: 0; + left: 0; + padding-top: 60px; + margin: -60px 0; + min-height: 100%; +} + +.form-switcher { + margin-bottom: 0; +} + +.well { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} + +.well .form-actions { + padding-bottom: 0; + margin-bottom: 0; +} + +.well form { + margin-bottom: 0; +} + +.nav-tabs { + border: 0; +} + +.nav-tabs>li { + float: right; +} + +.nav-tabs li a { + margin-right: 0; +} + +.nav-tabs>.active>a { + background: #F5F5F5; +} + +.nav-tabs>.active>a:hover { + background: #F5F5F5; +} + +.tabbable.first-tab-active .tab-content { + border-top-right-radius: 0; +} + +.page-header { + border-bottom: none; + padding-bottom: 0px; + margin: 0; +} + +/* custom general page styles */ +.hero-unit h1, .hero-unit h2 { + color: #A30000; +} + + +.request-info { + clear: both; +} + +.horizontal-checkbox label { + padding-top: 0; +} + +.horizontal-checkbox label { + padding-top: 0 !important; +} + +.horizontal-checkbox input { + float: left; + width: 20px; + margin-top: 3px; +} + +.modal-footer form { + margin-left: 5px; + margin-right: 5px; +} + +.pagination { + margin: 5px 0 10px 0; +} \ No newline at end of file diff --git a/publications/static/js/popper.js b/publications/static/js/popper.js new file mode 100644 index 0000000..1fb2256 --- /dev/null +++ b/publications/static/js/popper.js @@ -0,0 +1,6 @@ +/** + * @popperjs/core v2.11.6 - MIT License + */ + +!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).Popper={})}(this,(function(e){"use strict";function t(e){if(null==e)return window;if("[object Window]"!==e.toString()){var t=e.ownerDocument;return t&&t.defaultView||window}return e}function n(e){return e instanceof t(e).Element||e instanceof Element}function r(e){return e instanceof t(e).HTMLElement||e instanceof HTMLElement}function o(e){return"undefined"!=typeof ShadowRoot&&(e instanceof t(e).ShadowRoot||e instanceof ShadowRoot)}var i=Math.max,a=Math.min,s=Math.round;function f(){var e=navigator.userAgentData;return null!=e&&e.brands?e.brands.map((function(e){return e.brand+"/"+e.version})).join(" "):navigator.userAgent}function c(){return!/^((?!chrome|android).)*safari/i.test(f())}function p(e,o,i){void 0===o&&(o=!1),void 0===i&&(i=!1);var a=e.getBoundingClientRect(),f=1,p=1;o&&r(e)&&(f=e.offsetWidth>0&&s(a.width)/e.offsetWidth||1,p=e.offsetHeight>0&&s(a.height)/e.offsetHeight||1);var u=(n(e)?t(e):window).visualViewport,l=!c()&&i,d=(a.left+(l&&u?u.offsetLeft:0))/f,h=(a.top+(l&&u?u.offsetTop:0))/p,m=a.width/f,v=a.height/p;return{width:m,height:v,top:h,right:d+m,bottom:h+v,left:d,x:d,y:h}}function u(e){var n=t(e);return{scrollLeft:n.pageXOffset,scrollTop:n.pageYOffset}}function l(e){return e?(e.nodeName||"").toLowerCase():null}function d(e){return((n(e)?e.ownerDocument:e.document)||window.document).documentElement}function h(e){return p(d(e)).left+u(e).scrollLeft}function m(e){return t(e).getComputedStyle(e)}function v(e){var t=m(e),n=t.overflow,r=t.overflowX,o=t.overflowY;return/auto|scroll|overlay|hidden/.test(n+o+r)}function y(e,n,o){void 0===o&&(o=!1);var i,a,f=r(n),c=r(n)&&function(e){var t=e.getBoundingClientRect(),n=s(t.width)/e.offsetWidth||1,r=s(t.height)/e.offsetHeight||1;return 1!==n||1!==r}(n),m=d(n),y=p(e,c,o),g={scrollLeft:0,scrollTop:0},b={x:0,y:0};return(f||!f&&!o)&&(("body"!==l(n)||v(m))&&(g=(i=n)!==t(i)&&r(i)?{scrollLeft:(a=i).scrollLeft,scrollTop:a.scrollTop}:u(i)),r(n)?((b=p(n,!0)).x+=n.clientLeft,b.y+=n.clientTop):m&&(b.x=h(m))),{x:y.left+g.scrollLeft-b.x,y:y.top+g.scrollTop-b.y,width:y.width,height:y.height}}function g(e){var t=p(e),n=e.offsetWidth,r=e.offsetHeight;return Math.abs(t.width-n)<=1&&(n=t.width),Math.abs(t.height-r)<=1&&(r=t.height),{x:e.offsetLeft,y:e.offsetTop,width:n,height:r}}function b(e){return"html"===l(e)?e:e.assignedSlot||e.parentNode||(o(e)?e.host:null)||d(e)}function w(e){return["html","body","#document"].indexOf(l(e))>=0?e.ownerDocument.body:r(e)&&v(e)?e:w(b(e))}function x(e,n){var r;void 0===n&&(n=[]);var o=w(e),i=o===(null==(r=e.ownerDocument)?void 0:r.body),a=t(o),s=i?[a].concat(a.visualViewport||[],v(o)?o:[]):o,f=n.concat(s);return i?f:f.concat(x(b(s)))}function O(e){return["table","td","th"].indexOf(l(e))>=0}function j(e){return r(e)&&"fixed"!==m(e).position?e.offsetParent:null}function E(e){for(var n=t(e),i=j(e);i&&O(i)&&"static"===m(i).position;)i=j(i);return i&&("html"===l(i)||"body"===l(i)&&"static"===m(i).position)?n:i||function(e){var t=/firefox/i.test(f());if(/Trident/i.test(f())&&r(e)&&"fixed"===m(e).position)return null;var n=b(e);for(o(n)&&(n=n.host);r(n)&&["html","body"].indexOf(l(n))<0;){var i=m(n);if("none"!==i.transform||"none"!==i.perspective||"paint"===i.contain||-1!==["transform","perspective"].indexOf(i.willChange)||t&&"filter"===i.willChange||t&&i.filter&&"none"!==i.filter)return n;n=n.parentNode}return null}(e)||n}var D="top",A="bottom",L="right",P="left",M="auto",k=[D,A,L,P],W="start",B="end",H="viewport",T="popper",R=k.reduce((function(e,t){return e.concat([t+"-"+W,t+"-"+B])}),[]),S=[].concat(k,[M]).reduce((function(e,t){return e.concat([t,t+"-"+W,t+"-"+B])}),[]),V=["beforeRead","read","afterRead","beforeMain","main","afterMain","beforeWrite","write","afterWrite"];function q(e){var t=new Map,n=new Set,r=[];function o(e){n.add(e.name),[].concat(e.requires||[],e.requiresIfExists||[]).forEach((function(e){if(!n.has(e)){var r=t.get(e);r&&o(r)}})),r.push(e)}return e.forEach((function(e){t.set(e.name,e)})),e.forEach((function(e){n.has(e.name)||o(e)})),r}function C(e){return e.split("-")[0]}function N(e,t){var n=t.getRootNode&&t.getRootNode();if(e.contains(t))return!0;if(n&&o(n)){var r=t;do{if(r&&e.isSameNode(r))return!0;r=r.parentNode||r.host}while(r)}return!1}function I(e){return Object.assign({},e,{left:e.x,top:e.y,right:e.x+e.width,bottom:e.y+e.height})}function _(e,r,o){return r===H?I(function(e,n){var r=t(e),o=d(e),i=r.visualViewport,a=o.clientWidth,s=o.clientHeight,f=0,p=0;if(i){a=i.width,s=i.height;var u=c();(u||!u&&"fixed"===n)&&(f=i.offsetLeft,p=i.offsetTop)}return{width:a,height:s,x:f+h(e),y:p}}(e,o)):n(r)?function(e,t){var n=p(e,!1,"fixed"===t);return n.top=n.top+e.clientTop,n.left=n.left+e.clientLeft,n.bottom=n.top+e.clientHeight,n.right=n.left+e.clientWidth,n.width=e.clientWidth,n.height=e.clientHeight,n.x=n.left,n.y=n.top,n}(r,o):I(function(e){var t,n=d(e),r=u(e),o=null==(t=e.ownerDocument)?void 0:t.body,a=i(n.scrollWidth,n.clientWidth,o?o.scrollWidth:0,o?o.clientWidth:0),s=i(n.scrollHeight,n.clientHeight,o?o.scrollHeight:0,o?o.clientHeight:0),f=-r.scrollLeft+h(e),c=-r.scrollTop;return"rtl"===m(o||n).direction&&(f+=i(n.clientWidth,o?o.clientWidth:0)-a),{width:a,height:s,x:f,y:c}}(d(e)))}function F(e,t,o,s){var f="clippingParents"===t?function(e){var t=x(b(e)),o=["absolute","fixed"].indexOf(m(e).position)>=0&&r(e)?E(e):e;return n(o)?t.filter((function(e){return n(e)&&N(e,o)&&"body"!==l(e)})):[]}(e):[].concat(t),c=[].concat(f,[o]),p=c[0],u=c.reduce((function(t,n){var r=_(e,n,s);return t.top=i(r.top,t.top),t.right=a(r.right,t.right),t.bottom=a(r.bottom,t.bottom),t.left=i(r.left,t.left),t}),_(e,p,s));return u.width=u.right-u.left,u.height=u.bottom-u.top,u.x=u.left,u.y=u.top,u}function U(e){return e.split("-")[1]}function z(e){return["top","bottom"].indexOf(e)>=0?"x":"y"}function X(e){var t,n=e.reference,r=e.element,o=e.placement,i=o?C(o):null,a=o?U(o):null,s=n.x+n.width/2-r.width/2,f=n.y+n.height/2-r.height/2;switch(i){case D:t={x:s,y:n.y-r.height};break;case A:t={x:s,y:n.y+n.height};break;case L:t={x:n.x+n.width,y:f};break;case P:t={x:n.x-r.width,y:f};break;default:t={x:n.x,y:n.y}}var c=i?z(i):null;if(null!=c){var p="y"===c?"height":"width";switch(a){case W:t[c]=t[c]-(n[p]/2-r[p]/2);break;case B:t[c]=t[c]+(n[p]/2-r[p]/2)}}return t}function Y(e){return Object.assign({},{top:0,right:0,bottom:0,left:0},e)}function G(e,t){return t.reduce((function(t,n){return t[n]=e,t}),{})}function J(e,t){void 0===t&&(t={});var r=t,o=r.placement,i=void 0===o?e.placement:o,a=r.strategy,s=void 0===a?e.strategy:a,f=r.boundary,c=void 0===f?"clippingParents":f,u=r.rootBoundary,l=void 0===u?H:u,h=r.elementContext,m=void 0===h?T:h,v=r.altBoundary,y=void 0!==v&&v,g=r.padding,b=void 0===g?0:g,w=Y("number"!=typeof b?b:G(b,k)),x=m===T?"reference":T,O=e.rects.popper,j=e.elements[y?x:m],E=F(n(j)?j:j.contextElement||d(e.elements.popper),c,l,s),P=p(e.elements.reference),M=X({reference:P,element:O,strategy:"absolute",placement:i}),W=I(Object.assign({},O,M)),B=m===T?W:P,R={top:E.top-B.top+w.top,bottom:B.bottom-E.bottom+w.bottom,left:E.left-B.left+w.left,right:B.right-E.right+w.right},S=e.modifiersData.offset;if(m===T&&S){var V=S[i];Object.keys(R).forEach((function(e){var t=[L,A].indexOf(e)>=0?1:-1,n=[D,A].indexOf(e)>=0?"y":"x";R[e]+=V[n]*t}))}return R}var K={placement:"bottom",modifiers:[],strategy:"absolute"};function Q(){for(var e=arguments.length,t=new Array(e),n=0;n=0?-1:1,i="function"==typeof n?n(Object.assign({},t,{placement:e})):n,a=i[0],s=i[1];return a=a||0,s=(s||0)*o,[P,L].indexOf(r)>=0?{x:s,y:a}:{x:a,y:s}}(n,t.rects,i),e}),{}),s=a[t.placement],f=s.x,c=s.y;null!=t.modifiersData.popperOffsets&&(t.modifiersData.popperOffsets.x+=f,t.modifiersData.popperOffsets.y+=c),t.modifiersData[r]=a}},se={left:"right",right:"left",bottom:"top",top:"bottom"};function fe(e){return e.replace(/left|right|bottom|top/g,(function(e){return se[e]}))}var ce={start:"end",end:"start"};function pe(e){return e.replace(/start|end/g,(function(e){return ce[e]}))}function ue(e,t){void 0===t&&(t={});var n=t,r=n.placement,o=n.boundary,i=n.rootBoundary,a=n.padding,s=n.flipVariations,f=n.allowedAutoPlacements,c=void 0===f?S:f,p=U(r),u=p?s?R:R.filter((function(e){return U(e)===p})):k,l=u.filter((function(e){return c.indexOf(e)>=0}));0===l.length&&(l=u);var d=l.reduce((function(t,n){return t[n]=J(e,{placement:n,boundary:o,rootBoundary:i,padding:a})[C(n)],t}),{});return Object.keys(d).sort((function(e,t){return d[e]-d[t]}))}var le={name:"flip",enabled:!0,phase:"main",fn:function(e){var t=e.state,n=e.options,r=e.name;if(!t.modifiersData[r]._skip){for(var o=n.mainAxis,i=void 0===o||o,a=n.altAxis,s=void 0===a||a,f=n.fallbackPlacements,c=n.padding,p=n.boundary,u=n.rootBoundary,l=n.altBoundary,d=n.flipVariations,h=void 0===d||d,m=n.allowedAutoPlacements,v=t.options.placement,y=C(v),g=f||(y===v||!h?[fe(v)]:function(e){if(C(e)===M)return[];var t=fe(e);return[pe(e),t,pe(t)]}(v)),b=[v].concat(g).reduce((function(e,n){return e.concat(C(n)===M?ue(t,{placement:n,boundary:p,rootBoundary:u,padding:c,flipVariations:h,allowedAutoPlacements:m}):n)}),[]),w=t.rects.reference,x=t.rects.popper,O=new Map,j=!0,E=b[0],k=0;k=0,S=R?"width":"height",V=J(t,{placement:B,boundary:p,rootBoundary:u,altBoundary:l,padding:c}),q=R?T?L:P:T?A:D;w[S]>x[S]&&(q=fe(q));var N=fe(q),I=[];if(i&&I.push(V[H]<=0),s&&I.push(V[q]<=0,V[N]<=0),I.every((function(e){return e}))){E=B,j=!1;break}O.set(B,I)}if(j)for(var _=function(e){var t=b.find((function(t){var n=O.get(t);if(n)return n.slice(0,e).every((function(e){return e}))}));if(t)return E=t,"break"},F=h?3:1;F>0;F--){if("break"===_(F))break}t.placement!==E&&(t.modifiersData[r]._skip=!0,t.placement=E,t.reset=!0)}},requiresIfExists:["offset"],data:{_skip:!1}};function de(e,t,n){return i(e,a(t,n))}var he={name:"preventOverflow",enabled:!0,phase:"main",fn:function(e){var t=e.state,n=e.options,r=e.name,o=n.mainAxis,s=void 0===o||o,f=n.altAxis,c=void 0!==f&&f,p=n.boundary,u=n.rootBoundary,l=n.altBoundary,d=n.padding,h=n.tether,m=void 0===h||h,v=n.tetherOffset,y=void 0===v?0:v,b=J(t,{boundary:p,rootBoundary:u,padding:d,altBoundary:l}),w=C(t.placement),x=U(t.placement),O=!x,j=z(w),M="x"===j?"y":"x",k=t.modifiersData.popperOffsets,B=t.rects.reference,H=t.rects.popper,T="function"==typeof y?y(Object.assign({},t.rects,{placement:t.placement})):y,R="number"==typeof T?{mainAxis:T,altAxis:T}:Object.assign({mainAxis:0,altAxis:0},T),S=t.modifiersData.offset?t.modifiersData.offset[t.placement]:null,V={x:0,y:0};if(k){if(s){var q,N="y"===j?D:P,I="y"===j?A:L,_="y"===j?"height":"width",F=k[j],X=F+b[N],Y=F-b[I],G=m?-H[_]/2:0,K=x===W?B[_]:H[_],Q=x===W?-H[_]:-B[_],Z=t.elements.arrow,$=m&&Z?g(Z):{width:0,height:0},ee=t.modifiersData["arrow#persistent"]?t.modifiersData["arrow#persistent"].padding:{top:0,right:0,bottom:0,left:0},te=ee[N],ne=ee[I],re=de(0,B[_],$[_]),oe=O?B[_]/2-G-re-te-R.mainAxis:K-re-te-R.mainAxis,ie=O?-B[_]/2+G+re+ne+R.mainAxis:Q+re+ne+R.mainAxis,ae=t.elements.arrow&&E(t.elements.arrow),se=ae?"y"===j?ae.clientTop||0:ae.clientLeft||0:0,fe=null!=(q=null==S?void 0:S[j])?q:0,ce=F+ie-fe,pe=de(m?a(X,F+oe-fe-se):X,F,m?i(Y,ce):Y);k[j]=pe,V[j]=pe-F}if(c){var ue,le="x"===j?D:P,he="x"===j?A:L,me=k[M],ve="y"===M?"height":"width",ye=me+b[le],ge=me-b[he],be=-1!==[D,P].indexOf(w),we=null!=(ue=null==S?void 0:S[M])?ue:0,xe=be?ye:me-B[ve]-H[ve]-we+R.altAxis,Oe=be?me+B[ve]+H[ve]-we-R.altAxis:ge,je=m&&be?function(e,t,n){var r=de(e,t,n);return r>n?n:r}(xe,me,Oe):de(m?xe:ye,me,m?Oe:ge);k[M]=je,V[M]=je-me}t.modifiersData[r]=V}},requiresIfExists:["offset"]};var me={name:"arrow",enabled:!0,phase:"main",fn:function(e){var t,n=e.state,r=e.name,o=e.options,i=n.elements.arrow,a=n.modifiersData.popperOffsets,s=C(n.placement),f=z(s),c=[P,L].indexOf(s)>=0?"height":"width";if(i&&a){var p=function(e,t){return Y("number"!=typeof(e="function"==typeof e?e(Object.assign({},t.rects,{placement:t.placement})):e)?e:G(e,k))}(o.padding,n),u=g(i),l="y"===f?D:P,d="y"===f?A:L,h=n.rects.reference[c]+n.rects.reference[f]-a[f]-n.rects.popper[c],m=a[f]-n.rects.reference[f],v=E(i),y=v?"y"===f?v.clientHeight||0:v.clientWidth||0:0,b=h/2-m/2,w=p[l],x=y-u[c]-p[d],O=y/2-u[c]/2+b,j=de(w,O,x),M=f;n.modifiersData[r]=((t={})[M]=j,t.centerOffset=j-O,t)}},effect:function(e){var t=e.state,n=e.options.element,r=void 0===n?"[data-popper-arrow]":n;null!=r&&("string"!=typeof r||(r=t.elements.popper.querySelector(r)))&&N(t.elements.popper,r)&&(t.elements.arrow=r)},requires:["popperOffsets"],requiresIfExists:["preventOverflow"]};function ve(e,t,n){return void 0===n&&(n={x:0,y:0}),{top:e.top-t.height-n.y,right:e.right-t.width+n.x,bottom:e.bottom-t.height+n.y,left:e.left-t.width-n.x}}function ye(e){return[D,L,A,P].some((function(t){return e[t]>=0}))}var ge={name:"hide",enabled:!0,phase:"main",requiresIfExists:["preventOverflow"],fn:function(e){var t=e.state,n=e.name,r=t.rects.reference,o=t.rects.popper,i=t.modifiersData.preventOverflow,a=J(t,{elementContext:"reference"}),s=J(t,{altBoundary:!0}),f=ve(a,r),c=ve(s,o,i),p=ye(f),u=ye(c);t.modifiersData[n]={referenceClippingOffsets:f,popperEscapeOffsets:c,isReferenceHidden:p,hasPopperEscaped:u},t.attributes.popper=Object.assign({},t.attributes.popper,{"data-popper-reference-hidden":p,"data-popper-escaped":u})}},be=Z({defaultModifiers:[ee,te,oe,ie]}),we=[ee,te,oe,ie,ae,le,he,me,ge],xe=Z({defaultModifiers:we});e.applyStyles=ie,e.arrow=me,e.computeStyles=oe,e.createPopper=xe,e.createPopperLite=be,e.defaultModifiers=we,e.detectOverflow=J,e.eventListeners=ee,e.flip=le,e.hide=ge,e.offset=ae,e.popperGenerator=Z,e.popperOffsets=te,e.preventOverflow=he,Object.defineProperty(e,"__esModule",{value:!0})})); +//# sourceMappingURL=popper.min.js.map From f77bf46a17a6887026a24c4372f38b777d36ae3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 09:07:41 +0100 Subject: [PATCH 02/32] fix for problem install backports.zoneinfo on Pyton 3.10.x https://stackoverflow.com/questions/71712258/error-could-not-build-wheels-for-backports-zoneinfo-which-is-required-to-insta --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 831864d..3e75167 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ arrow==1.2.3 asgiref==3.5.2 -backports.zoneinfo==0.2.1 +backports.zoneinfo==0.2.1;python_version<"3.9" blessed==1.19.1 beautifulsoup4==4.11.1 certifi==2022.9.24 From 4354d7d4bcaac69dcb4e80a554129bc204231bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 09:34:03 +0100 Subject: [PATCH 03/32] fix indentation --- publications/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publications/views.py b/publications/views.py index ad8d742..c40d7cf 100644 --- a/publications/views.py +++ b/publications/views.py @@ -105,7 +105,7 @@ def delete_account(request): def change_useremail(request): email_new = request.POST.get('email_new', False) currentuser = request.user - email_old = currentuser.email + email_old = currentuser.email if email_new: currentuser.email = email_new From e88c1b86870ed0689c60cdadfbca60b348503b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 09:34:19 +0100 Subject: [PATCH 04/32] ignore output dir of manage.py collectstatic --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 2a4e088..cb0b8f4 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,5 @@ geodjango/ tests-ui/screenshots/ + +static/ From cfba81d408b4cd9494ab23d58cd8b9fec5caa793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 09:34:27 +0100 Subject: [PATCH 05/32] makemigrations --- .../0004_ojsservers_subscription_and_more.py | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 publications/migrations/0004_ojsservers_subscription_and_more.py diff --git a/publications/migrations/0004_ojsservers_subscription_and_more.py b/publications/migrations/0004_ojsservers_subscription_and_more.py new file mode 100644 index 0000000..0705d85 --- /dev/null +++ b/publications/migrations/0004_ojsservers_subscription_and_more.py @@ -0,0 +1,79 @@ +# Generated by Django 4.0.5 on 2022-12-23 08:10 + +import django.contrib.gis.db.models.fields +import django.contrib.postgres.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('publications', '0003_publication_journal'), + ] + + operations = [ + migrations.CreateModel( + name='OJSservers', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('url_field', models.URLField()), + ('harvest_interval_minutes', models.IntegerField(default=4320)), + ('last_harvest', models.DateTimeField(auto_now_add=True, null=True)), + ], + ), + migrations.CreateModel( + name='Subscription', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('search_text', models.CharField(max_length=4096)), + ('timeperiod_startdate', models.DateField(null=True)), + ('timeperiod_enddate', models.DateField(null=True)), + ('search_area', django.contrib.gis.db.models.fields.GeometryCollectionField(blank=True, null=True, srid=4326)), + ('user_name', models.CharField(max_length=4096)), + ], + options={ + 'verbose_name': 'subscription', + 'ordering': ['user_name'], + }, + ), + migrations.AddField( + model_name='publication', + name='timeperiod_enddate', + field=django.contrib.postgres.fields.ArrayField(base_field=models.DateField(null=True), null=True, size=None), + ), + migrations.AddField( + model_name='publication', + name='timeperiod_startdate', + field=django.contrib.postgres.fields.ArrayField(base_field=models.DateField(null=True), null=True, size=None), + ), + migrations.AlterField( + model_name='publication', + name='abstract', + field=models.TextField(null=True), + ), + migrations.AlterField( + model_name='publication', + name='creationDate', + field=models.DateTimeField(auto_now_add=True, null=True), + ), + migrations.AlterField( + model_name='publication', + name='geometry', + field=django.contrib.gis.db.models.fields.GeometryCollectionField(blank=True, null=True, srid=4326, verbose_name='Publication geometry (Points, Lines, Polygons as GeoJSON)'), + ), + migrations.AlterField( + model_name='publication', + name='lastUpdate', + field=models.DateTimeField(auto_now=True, null=True), + ), + migrations.AlterField( + model_name='publication', + name='publicationDate', + field=models.DateField(null=True), + ), + migrations.AlterField( + model_name='publication', + name='title', + field=models.CharField(max_length=4096, null=True), + ), + ] From b60c0ecb996fa17853538d1bfa20e0b2d5963815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 09:57:12 +0100 Subject: [PATCH 06/32] update required fields and remove SQL test data --- README.md | 4 +- fixtures/test_data.json | 10 +++- fixtures/test_data.sql | 48 --------------- publications/admin.py | 5 -- ...005_alter_publication_abstract_and_more.py | 59 +++++++++++++++++++ publications/models.py | 22 +++---- 6 files changed, 80 insertions(+), 68 deletions(-) delete mode 100644 fixtures/test_data.sql create mode 100644 publications/migrations/0005_alter_publication_abstract_and_more.py diff --git a/README.md b/README.md index b68f711..6eed6aa 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ The folder `/fixtures` contains some test data, either as an SQL command to inse python manage.py dumpdata --exclude=auth --exclude=contenttypes | jq > fixtures/test_data.json # load: -python manage.py loaddata fixtures/test_data.json +python manage.py loaddata fixtures/test_data.sql ``` ### Run locally @@ -149,8 +149,6 @@ python -Wa manage.py test # running UI tests needs either compose configuration or a manage.py runserver in a seperate shell docker-compose up --build -# TODO insert test data - python -Wa manage.py test tests-ui ``` diff --git a/fixtures/test_data.json b/fixtures/test_data.json index 20bcdc7..8017e5b 100644 --- a/fixtures/test_data.json +++ b/fixtures/test_data.json @@ -10,7 +10,10 @@ "url": null, "geometry": "SRID=4326;GEOMETRYCOLLECTION (POINT (7.595730774920725 51.96944097112328), POLYGON ((7.599984296478425 51.984257653537384, 7.5715788777530975 51.97057414651397, 7.570122189613329 51.950602187631205, 7.580319006590855 51.93825551711683, 7.609054957094401 51.93035649564658, 7.659674869951374 51.942256350721436, 7.6833460522228165 51.968514669138415, 7.665137450475669 51.99229098076532, 7.626171042736502 51.98982421450293, 7.599984296478425 51.984257653537384)))", "creationDate": "2022-10-24T12:10:53.086Z", - "lastUpdate": "2022-10-24T12:10:53.086Z" + "lastUpdate": "2022-10-24T12:10:53.086Z", + "journal": "OPTIMAP Test Journal", + "timeperiod_startdate": "[\"2020-02-02\"]", + "timeperiod_enddate": "[\"2022-02-20\"]" } }, { @@ -24,7 +27,10 @@ "url": "http://paper.url/two", "geometry": "SRID=4326;GEOMETRYCOLLECTION (LINESTRING (9.754609563397707 52.36630414438588, 9.813062794192035 52.41569645624003, 10.141300167111496 52.36904961184797, 10.518997966087937 52.330597538337116, 10.838242534270051 52.311358956793185, 11.058566250338231 52.220550088821824, 11.535184901427073 52.15714903642342, 12.272594889905236 52.24258143981572, 12.618817872299417 52.35532056817789, 12.911084026269464 52.2976119913985, 13.144896949445211 52.50063147184562, 13.396695482095708 52.517051586549286))", "creationDate": "2022-10-24T12:10:53.086Z", - "lastUpdate": "2022-10-24T12:10:53.086Z" + "lastUpdate": "2022-10-24T12:10:53.086Z", + "journal": "OPTIMAP Test Journal", + "timeperiod_startdate": "[\"2010-01-01\"]", + "timeperiod_enddate": "[\"2012-12-12\"]" } } ] diff --git a/fixtures/test_data.sql b/fixtures/test_data.sql deleted file mode 100644 index 2d13325..0000000 --- a/fixtures/test_data.sql +++ /dev/null @@ -1,48 +0,0 @@ --- Draw geometry at https://geojson.io/#map=10.92/51.902/7.6702 --- possibly need to convert to GeometryCollection from FeatureCollection if we face that in GeoJSON the wild: https://gis.stackexchange.com/questions/177254/create-a-geosgeometry-from-a-featurecollection-in-geodangoINSERT INTO public.publications_publication VALUES - -INSERT INTO public.publications_publication VALUES - (1, 'The First Article', 'This is the first article. It is good in Münster.', '2010-10-10 10:10:10',NULL, 'https://service.tib.eu/optimeta/index.php/optimeta/article/view/8' , ST_GeomFromGeoJSON(' - { - "type": "GeometryCollection", - "geometries": [{ - "coordinates": [7.595730774920725,51.96944097112328], - "type": "Point", - "crs":{"type":"name","properties":{"name":"EPSG:4326"}} - }, { - "type": "Polygon", - "coordinates": [[ - [7.599984296478425,51.984257653537384], - [7.5715788777530975,51.97057414651397], - [7.570122189613329,51.950602187631205], - [7.580319006590855,51.93825551711683], - [7.609054957094401,51.93035649564658], - [7.659674869951374,51.942256350721436], - [7.6833460522228165,51.968514669138415], - [7.665137450475669,51.99229098076532], - [7.626171042736502,51.98982421450293], - [7.599984296478425,51.984257653537384] - ]] - }] - }'),'Journal of Optimal Geolocations', now(), now(), '{"2022-06-01"}','{"2022-06-08"}'), - (2, 'Paper Two', 'A second article. It is better; from Hanover to Berlin.', '2011-11-11 11:11:11','10.5555/12345678', NULL , ST_GeomFromGeoJSON(' - { - "type": "GeometryCollection", - "geometries": [{ - "type": "LineString", - "coordinates": [ - [9.754609563397707,52.36630414438588], - [9.813062794192035,52.41569645624003], - [10.141300167111496,52.36904961184797], - [10.518997966087937,52.330597538337116], - [10.838242534270051,52.311358956793185], - [11.058566250338231,52.220550088821824], - [11.535184901427073,52.15714903642342], - [12.272594889905236,52.24258143981572], - [12.618817872299417,52.35532056817789], - [12.911084026269464,52.2976119913985], - [13.144896949445211,52.50063147184562], - [13.396695482095708,52.517051586549286] - ] - }] - }'), 'Journal of Optimal Geolocations',now(), now(), '{"2022-02-01"}','{"2022-03-31"}') diff --git a/publications/admin.py b/publications/admin.py index d685131..6075839 100644 --- a/publications/admin.py +++ b/publications/admin.py @@ -1,14 +1,9 @@ -from django.contrib import admin -"""Markers admin.""" - from django.contrib.gis import admin from publications.models import Publication - @admin.register(Publication) class PublicationAdmin(admin.OSMGeoAdmin): """Publication Admin.""" list_display = ("title", "publicationDate", "creationDate", "lastUpdate") -# Register your models here. diff --git a/publications/migrations/0005_alter_publication_abstract_and_more.py b/publications/migrations/0005_alter_publication_abstract_and_more.py new file mode 100644 index 0000000..aec7c9a --- /dev/null +++ b/publications/migrations/0005_alter_publication_abstract_and_more.py @@ -0,0 +1,59 @@ +# Generated by Django 4.0.5 on 2022-12-23 08:48 + +import django.contrib.postgres.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('publications', '0004_ojsservers_subscription_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='publication', + name='abstract', + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name='publication', + name='creationDate', + field=models.DateTimeField(auto_now=True), + ), + migrations.AlterField( + model_name='publication', + name='doi', + field=models.CharField(blank=True, max_length=1024, null=True), + ), + migrations.AlterField( + model_name='publication', + name='journal', + field=models.CharField(blank=True, max_length=1024, null=True), + ), + migrations.AlterField( + model_name='publication', + name='lastUpdate', + field=models.DateTimeField(auto_now=True), + ), + migrations.AlterField( + model_name='publication', + name='timeperiod_enddate', + field=django.contrib.postgres.fields.ArrayField(base_field=models.DateField(null=True), blank=True, null=True, size=None), + ), + migrations.AlterField( + model_name='publication', + name='timeperiod_startdate', + field=django.contrib.postgres.fields.ArrayField(base_field=models.DateField(null=True), blank=True, null=True, size=None), + ), + migrations.AlterField( + model_name='publication', + name='title', + field=models.CharField(max_length=4096), + ), + migrations.AlterField( + model_name='publication', + name='url', + field=models.URLField(blank=True, max_length=1024, null=True), + ), + ] diff --git a/publications/models.py b/publications/models.py index 2170bf2..ad3543e 100644 --- a/publications/models.py +++ b/publications/models.py @@ -3,18 +3,20 @@ class Publication(models.Model): - - title = models.CharField(max_length=4096,null =True) - abstract = models.TextField(null=True) + # required fields + title = models.CharField(max_length=4096) publicationDate = models.DateField(null=True) - doi = models.CharField(max_length=1024, null=True) - url = models.URLField(max_length=1024, null=True) + creationDate = models.DateTimeField(auto_now_add=True) + lastUpdate = models.DateTimeField(auto_now=True) + + # possibly blank fields + abstract = models.TextField(null=True, blank=True) + doi = models.CharField(max_length=1024, null=True, blank=True) + url = models.URLField(max_length=1024, null=True, blank=True) geometry = models.GeometryCollectionField(verbose_name='Publication geometry (Points, Lines, Polygons as GeoJSON)',srid = 4326, null=True, blank=True) - journal = models.CharField(max_length=1024, null=True) - creationDate = models.DateTimeField(auto_now_add=True,null=True) - lastUpdate = models.DateTimeField(auto_now=True,null=True) - timeperiod_startdate = ArrayField(models.DateField(null=True), null=True) - timeperiod_enddate = ArrayField(models.DateField(null=True), null=True) + journal = models.CharField(max_length=1024, null=True, blank=True) + timeperiod_startdate = ArrayField(models.DateField(null=True), null=True, blank=True) + timeperiod_enddate = ArrayField(models.DateField(null=True), null=True, blank=True) def __str__(self): """Return string representation.""" From 8ad177601327a6b2c5edb5a54a88850b4e22533f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 10:00:29 +0100 Subject: [PATCH 07/32] fix favicon for admin UI --- publications/templates/admin/base_site.html | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 publications/templates/admin/base_site.html diff --git a/publications/templates/admin/base_site.html b/publications/templates/admin/base_site.html new file mode 100644 index 0000000..9f71327 --- /dev/null +++ b/publications/templates/admin/base_site.html @@ -0,0 +1,5 @@ +{% extends "admin/base_site.html" %} +{% load static %} +{% block extrahead %} + +{% endblock %} From 4e2324f477cd408a04795373a3c4df52489a96f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 10:02:19 +0100 Subject: [PATCH 08/32] have main menu on privacy page --- publications/templates/privacy.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publications/templates/privacy.html b/publications/templates/privacy.html index 916b74a..4102471 100644 --- a/publications/templates/privacy.html +++ b/publications/templates/privacy.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "main.html" %} {% block title %}Privacy policy and imprint | {% endblock %} From 68e4dd88c107a183c87dbddd063adec22a55d9b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 10:17:08 +0100 Subject: [PATCH 09/32] add OPTITMAP logo to admin site --- publications/templates/admin/base_site.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/publications/templates/admin/base_site.html b/publications/templates/admin/base_site.html index 9f71327..9f8a684 100644 --- a/publications/templates/admin/base_site.html +++ b/publications/templates/admin/base_site.html @@ -1,5 +1,17 @@ {% extends "admin/base_site.html" %} {% load static %} + +{% comment %} +See https://github.com/django/django/blob/main/django/contrib/admin/templates/admin/base_site.html +{% endcomment %} + {% block extrahead %} {% endblock %} + +{% block branding %} +

OPTIMAP logo ADMIN

+{% if user.is_anonymous %} + {% include "admin/color_theme_toggle.html" %} +{% endif %} +{% endblock %} From 13b41ae5d4a7e0606f4e82e1317eaeb4a59fcda5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 10:17:26 +0100 Subject: [PATCH 10/32] so admin link to superusers, closes #77 --- publications/templates/main.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/publications/templates/main.html b/publications/templates/main.html index 9abbd9b..a820c5d 100644 --- a/publications/templates/main.html +++ b/publications/templates/main.html @@ -21,7 +21,12 @@ {{user.email}}
  • Settings
    • -
  • Subscription
    • +
  • Subscriptions
    • + {% if user.is_superuser %} +
    +
  • Admin
    • + {% endif %} +
  • Logout
    • @@ -48,8 +53,9 @@ - {% endif %} -{% endblock %} + {% endif %} + +{% endblock navbar %} {% block content %}
    @@ -69,7 +75,7 @@
    -{% endblock %} +{% endblock content %} {% block scripts %} From 0f3f87c9a2b967ac3b03cfb1bb66ab5548ac3d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 10:32:12 +0100 Subject: [PATCH 11/32] show user button on data page --- publications/templates/data.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publications/templates/data.html b/publications/templates/data.html index 758ae12..54f400e 100644 --- a/publications/templates/data.html +++ b/publications/templates/data.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "main.html" %} {% load optimeta_extras %} From 536d80beb6079c71bfca70d51877b2408f21f323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 10:37:10 +0100 Subject: [PATCH 12/32] use leaflet admin in the backend --- optimetaPortal/settings.py | 1 + publications/admin.py | 6 +++--- publications/models.py | 2 +- requirements.txt | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/optimetaPortal/settings.py b/optimetaPortal/settings.py index acd9b82..62c16eb 100644 --- a/optimetaPortal/settings.py +++ b/optimetaPortal/settings.py @@ -61,6 +61,7 @@ 'django_q', 'drf_spectacular', 'drf_spectacular_sidecar', + 'leaflet' # used in admin site ] REST_FRAMEWORK = { diff --git a/publications/admin.py b/publications/admin.py index 6075839..3bce120 100644 --- a/publications/admin.py +++ b/publications/admin.py @@ -1,9 +1,9 @@ -from django.contrib.gis import admin - +from django.contrib import admin +from leaflet.admin import LeafletGeoAdmin from publications.models import Publication @admin.register(Publication) -class PublicationAdmin(admin.OSMGeoAdmin): +class PublicationAdmin(LeafletGeoAdmin): """Publication Admin.""" list_display = ("title", "publicationDate", "creationDate", "lastUpdate") diff --git a/publications/models.py b/publications/models.py index ad3543e..bc4770e 100644 --- a/publications/models.py +++ b/publications/models.py @@ -13,7 +13,7 @@ class Publication(models.Model): abstract = models.TextField(null=True, blank=True) doi = models.CharField(max_length=1024, null=True, blank=True) url = models.URLField(max_length=1024, null=True, blank=True) - geometry = models.GeometryCollectionField(verbose_name='Publication geometry (Points, Lines, Polygons as GeoJSON)',srid = 4326, null=True, blank=True) + geometry = models.GeometryCollectionField(verbose_name='Publication geometry/ies', srid = 4326, null=True, blank=True) journal = models.CharField(max_length=1024, null=True, blank=True) timeperiod_startdate = ArrayField(models.DateField(null=True), null=True, blank=True) timeperiod_enddate = ArrayField(models.DateField(null=True), null=True, blank=True) diff --git a/requirements.txt b/requirements.txt index 3e75167..c143e4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,7 @@ charset-normalizer==2.1.1 Django==4.0.5 django-environ==0.9.0 django-filter==21.1 +django-leaflet==0.28.3 django-magiclink==1.2.0 django-picklefield==3.1 django-q==1.3.9 From bfadc0ecb597876ecc067f55034f9626a9b84d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 23 Dec 2022 10:52:42 +0100 Subject: [PATCH 13/32] add .ico version of the favicon as fallback --- publications/static/favicon.ico | Bin 0 -> 11571 bytes publications/urls.py | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 publications/static/favicon.ico diff --git a/publications/static/favicon.ico b/publications/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1363dd2e2f66d05a9d7305d5e2b36045671a699b GIT binary patch literal 11571 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 literal 0 HcmV?d00001 diff --git a/publications/urls.py b/publications/urls.py index fd5981e..00ffe55 100644 --- a/publications/urls.py +++ b/publications/urls.py @@ -1,6 +1,7 @@ """OPTIMAP urls.""" from django.urls import path,include +from django.shortcuts import redirect from publications.views import privacypolicy,Confirmationlogin,loginres,optimap,autheticate_via_magic_link,customlogout,user_settings,user_subscriptions,delete_account,change_useremail,data,add_subscriptions from .feeds import OptimetaFeed from .feeds import atomFeed @@ -10,6 +11,7 @@ urlpatterns = [ path('', optimap, name="home"), + path('favicon.ico', lambda request: redirect('static/favicon.ico', permanent=True)), path("api/", include("publications.api")), path('api/schema/', SpectacularAPIView.as_view(), name='schema'), path('api/schema/ui/', SpectacularRedocView.as_view(url_name='optimap:schema'), name='redoc'), From 30a34aa2267c127e9f119c16f9947405c434f742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20N=C3=BCst?= Date: Fri, 27 Jan 2023 10:36:43 +0100 Subject: [PATCH 14/32] add tagline --- publications/static/css/main.css | 7 +++++++ publications/templates/base.html | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/publications/static/css/main.css b/publications/static/css/main.css index f07afc0..60e0bb7 100644 --- a/publications/static/css/main.css +++ b/publications/static/css/main.css @@ -18,6 +18,13 @@ main { background-color: #158F9B; } +.tagline { + font-weight: 800; + font-size: 1.6em; + box-sizing: unset; + font-style: italic; +} + #sidebar { float: left; height: 100%; diff --git a/publications/templates/base.html b/publications/templates/base.html index abcf397..c451ef7 100644 --- a/publications/templates/base.html +++ b/publications/templates/base.html @@ -25,11 +25,13 @@