From eeb9febc967942529b8ef47c8a14f11962dc9748 Mon Sep 17 00:00:00 2001
From: Norbert <norbert@testo.systems>
Date: Sat, 20 Jun 2020 07:48:31 +0200
Subject: [PATCH] add some colors

---
 .../__pycache__/urls.cpython-38.pyc           | Bin 623 -> 692 bytes
 .../__pycache__/views.cpython-38.pyc          | Bin 3349 -> 3599 bytes
 .../imguploader/templates/change.html         |  67 ++++++++++-
 .../imguploader/templates/changeid.html       | 110 +++++++++++++++---
 .../imguploader/templates/failed.html         |  51 ++++++++
 .../imguploader/templates/index.html          |  25 +++-
 .../imguploader/templates/search.html         |  32 ++++-
 .../imguploader/templates/sukces.html         |  49 ++++++++
 .../imguploader/templates/upload.html         |  33 +++++-
 bibrecognition/imguploader/urls.py            |   2 +
 bibrecognition/imguploader/views.py           |  10 ++
 11 files changed, 358 insertions(+), 21 deletions(-)
 create mode 100644 bibrecognition/imguploader/templates/failed.html
 create mode 100644 bibrecognition/imguploader/templates/sukces.html

diff --git a/bibrecognition/imguploader/__pycache__/urls.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/urls.cpython-38.pyc
index c51b4beb8e6d09c53d3058a6ef60b6011186309a..21cf05c6cee4df135416ae245c203d855573b782 100644
GIT binary patch
delta 220
zcmaFQvV~PUl$V!_0SI~*y^Tv|Vqka-;vfTVAjbiSi`PxmuCz*JOyNsq&*DwtPvPig
z2J!@eJiZh`5HFoQia(V<l{u9)O8|%kQ-pe%%o(EiQ-p&VG({#Js?e|EC@xJ-PAx9h
zzr|EsT*aQ2n3<EB0_3EnX)@m8P03F#%}vcKi7(2}FY(h9n(W8e#Z|-$w7iH9NKC%L
gsLmz|;)zaXWeSp!05W+Pfsl!ZnU4_({$$|=08HdCApigX

delta 135
zcmdnO`kqBQl$V!_0SKzA-p27TF)%y^agYHgkmCTv#gis#SIVWcM)9WdrZT6pX7K?r
ze+pkOlQ}~aZwh}fgQmd5dli!l8HE`ICbu$nO_pR*XA=hMEE1mV#uOwW0%Y<q0wEI*
MGan-q{$}9@0DoK;Jpcdz

diff --git a/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc b/bibrecognition/imguploader/__pycache__/views.cpython-38.pyc
index 04e9881d27f59ecac89d2331eff9c59d58f0456d..95c2ce1bd43fcaf77a64064b4bb5dc811e2c63ef 100644
GIT binary patch
delta 1415
zcmZ`(OHUI~6u$RPJJZsZmjVj-eqa?5V-z1K;G@JC(TK(bBeCgBOJQ2dovDdrNEdal
zIB}&5G`hfr8`k~+6BGBd@E52tZZxhu-yMQta2DTu_dMpD``vTrY3HNv##^aW1Ec5p
z%P*6ej>X1q{$cUZyUpg-hiszV>@>UR-C=f*v-Gyb&p(=$d0<Fuu4*~%GLx<TcYa&n
zOzAo9FU7a46vQCso&GEB4sUxBIeMjwTrx=zM4aq>OEzKMjkQ*lwrs=_<)ucDPRJJU
z{RBZIH(RO%(R|UioPg(LyYEGM60Ptn*yO*B4Do@LuMy6-x53<wv}n0nvZU-Fo))qb
z_C0<|-_^elbT0s(Pq)Y(a08&S4}zrthXB3)q~4R*1&VfMm;YGrIIz~9JOblMf{9qx
zwllNttTSO0ONCp~cBt2ndi%Owzv-j;2t|i7^)++GJT}ctJ|pBWmlGFtzM$Tw*vb|}
zfh}krU(#MM`OU8zL&hgBdXe3o^xqq!HDf8^>C;UwIA@+l+yI*^yUiXmb<^;)BCl)X
z%xy7ab@I5aX1vbFSvj`GbeGrJ0$<H&@OYS!PK<?WK+8}>u0&ks5?ahBa#PuItzh*{
zxg|S@lq@$ZPa{^ztCZaoDjS1!LuKK>NXRpQL4cZrvtXgvV0#DxQ8d+P$a64ZQfNr-
ztv?2(`&D$Jx*kI0FyI2<1VNyysd%6cEF7P3hTuzLO9kut6wdH2S)9}UWW2wLCq=V}
z@dm9y=t5>zp2Y`v4I2s!^|hJeFW#HxfvC*L^JJDg06Ph8%58-6sqn)^Q;GFQrgUV&
zsGu6{?G$n@0hD%ap>}Z?RH>*_v5Rgf7tLjj1`|G|7vu|c)3Pns3ZjlHi<NNT4<iH@
zDil{q+J~i57`m>LQ>l3jR`d|6HVQUO5b&~+FzobzYV|mrf89ict!`GSc==-8|Ct!6
zjgccqlfL$Vqc0qcgTr*`7MQ#)=<g!N<`YhJCTBUJT!P%P8Sqaf;W)36j{qj*HNuUH
z+(6U@Rq|Q-r>q{z|EuKlZ;-!Q<vQ`P^cH_Oc|U{Sog4s+05Sk<Rkb1!`B%$-<}5Z?
Xnl-Dobq*>xd;Rap-O>HA-LdFz-;@?7

delta 1150
zcmZvb&rcIU6vyZ7Zg=~GLd%buRzO4%R*;}kKt&2#B}OGiB*q#{8g_w|?GI+RB$C!f
zdo?jQ;SNX6cohE#Z|=p52QPXuF)_wCZx*GA_VDeS_vX#K`MkHUI=52I^U-LS@L&4*
zm&aR)&E`&cyE(Y8%n?1g`SW{=4xUEMwX*5ByM)G>Bt3w(y{z;QAj#gykD#5!l(V-|
z`~=#>#Z#Qzx=CAbeH7PnncB1&mv{}8x#$rZL%WZQrz{rpB`>gK*{0*c6766wmHtQ^
z<3d{5J0%UHd%qNb?sjx{U|OJ1&YP4bxUEYxiT+;Jr5+zSiRK9uJYJ8}Q)p`_B3nl*
zigFrdkQLPaNDrD=E={p*^~k{A^5`%+$GBvJIorNbbc;?_v+~RH)OL8SAJs%-t*^Bi
zm||I}Yghq7D&z?<U{#`DUEsD<hpPBDq$H_I%cLq-U|ZfH^b=!RT6<p!WXQrj_CcGe
z$=i{NwgW)c3T{h<7^<OFWDDx@9C2etu+AfH+z8cSj;wwAV--{v>ZA$>8Q}`}8G2;a
ze>;-%k%2(A3$%y3HX@5Fxx%tJyyE6<Psy8ZEk`fnUI9~ZZ1p(?(fePH7{CFbmryRF
zh^|kd<)cNb7X^oaUO~Z`XdDN@JFDI0gzuPcPV|~i;?6Y6Rg?={JXQ4nsc4NqDE_oy
ztjT}Q-4*QC0{1xM>{)0eD#fHAgypcLN;I>#9~y%iKE>0-S*z9$7~<nDl~(CAchhc^
zV_fdjPOckK|5(cqoDKo$N>(f3U6w(|G3OeJpw{723!y_?6>v(n<@%ub{MGmXVoZ=i
zaGq+Iw&|K)z;UTn@&|hew+LnetAKe1eS)nZ`VY)=7{?lXX4la|gdP+GK)=!fQR;aN
zHhgio?clM3;mynomTH>TZu7vbo?t`K^@%pj8AX{w$)I4o;he*U1Sj%Eqima#{G%XF
K5BnVLg}&cok?5cR

diff --git a/bibrecognition/imguploader/templates/change.html b/bibrecognition/imguploader/templates/change.html
index 1cc9000..9f9aa68 100644
--- a/bibrecognition/imguploader/templates/change.html
+++ b/bibrecognition/imguploader/templates/change.html
@@ -6,13 +6,76 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Search Photos</title>
 </head>
+<style>
+    body {
+        margin: 0;
+    font-family: sans-serif;
+    }
 
+    form {
+        padding: 20px;
+        margin: 30px;
+        border: 1px solid #dedede;
+        border-radius: 10px;
+        display: flex;
+        flex-direction: column;
+
+
+    }
+
+    form label {
+        margin: 20px 0 5px 0;
+        color: #2e2e2e;
+        font-size: 16px;
+        font-family: sans-serif;
+    }
+
+    form input[type=submit] {
+        margin: 25px 0 0 0;
+        color: white;
+        background-color: #0077ff;
+        padding: 10px;
+        font-size: 16px;
+        font-weight: bold;
+        border: none;
+        border-radius: 5px;
+    }
+    ul{
+            padding: 0;
+    list-style: none;
+    margin: 30px;
+    }
+    li{
+        display: flex;
+        padding: 20px;
+        border: 1px solid #dedede;
+        border-radius: 5px;
+        margin-bottom: 15px;
+        align-items: flex-start;
+    }
+    li img{
+        max-width: 250px;
+    }
+    li div{
+            margin-left: 20px;
+        display: flex;
+        flex-direction: column;
+    }
+    li div a{
+        padding: 7px 14px;
+        background-color: #0083ff;
+        color: white;
+        font-family: sans-serif;
+        text-decoration: none;
+        border-radius: 5px;
+    }
+</style>
 <body>
     {% if form %}
     <form action="/change" method="post">
         {% csrf_token %}
         {{ form }}
-        <input type="submit" value="Submit">
+        <input type="submit" value="Wybierz">
     </form>
     {% endif %}
     {% if meta %}
@@ -23,6 +86,8 @@
                 {% for nr in n.1 %}
                 <p>{{ nr }}</p>
                 {% endfor %}
+                <a href="change/{{n.2}}">Zmień</a>
+                
             </div>
         </li>
         {% endfor %}
diff --git a/bibrecognition/imguploader/templates/changeid.html b/bibrecognition/imguploader/templates/changeid.html
index 7456b8a..0633c4a 100644
--- a/bibrecognition/imguploader/templates/changeid.html
+++ b/bibrecognition/imguploader/templates/changeid.html
@@ -6,24 +6,108 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Search Photos</title>
 </head>
+<style>
+    body {
+        margin: 0;
+    font-family: sans-serif;
+    }
 
+    .wrapper {
+        padding: 20px;
+        margin: 30px;
+        border: 1px solid #dedede;
+        border-radius: 10px;
+        display: flex;
+        flex-direction: column;
+    align-items: flex-start;
+
+
+    }
+    form{
+        
+        display: flex;
+        flex-direction: column;
+    align-items: flex-start;
+    }
+    span{
+        display: block;
+    padding: 10px;
+    border-radius: 5px;
+    border: 1px solid #009aff;
+    background-color: #97ccff;
+    }
+
+    form label {
+        margin: 20px 0 5px 0;
+        color: #2e2e2e;
+        font-size: 16px;
+        font-family: sans-serif;
+    }
+
+    form input[type=submit] {
+        margin: 25px 0 0 0;
+        color: white;
+        background-color: #0077ff;
+        padding: 10px;
+        font-size: 16px;
+        font-weight: bold;
+        border: none;
+        border-radius: 5px;
+    }
+
+    ul {
+        padding: 0;
+        list-style: none;
+        margin: 30px;
+    }
+
+    li {
+        display: flex;
+        padding: 20px;
+        border: 1px solid #dedede;
+        border-radius: 5px;
+        margin-bottom: 15px;
+    }
+
+    li img {
+        max-width: 250px;
+    }
+
+    li div {
+        margin-left: 20px;
+        display: flex;
+        flex-direction: column;
+    }
+
+    li div a {
+        padding: 7px 14px;
+        background-color: #0083ff;
+        color: white;
+        font-family: sans-serif;
+        text-decoration: none;
+        border-radius: 5px;
+    }
+</style>
 <body>
     
     {% if foto %}
-    <img src="{{ foto }}" />
-    <p>Znalezione wartości:</p>
-    <span>
-    {% for n in numery %}
-            {{ n }},      
-    {% endfor %}
-    <p>Nowe wartości (po przecinku): </p>
-    <form action="/change/{{ photoid }}" method="post">
-        {% csrf_token %}
-        {{ form }}
-        <input type="submit" value="Submit">
-    </form>
+    <div class="wrapper">
+        
+        <img src="{{ foto }}" />
+        <p>Znalezione wartości:</p>
+        <span>
+        {% for n in numery %}
+                {{ n }},      
+        {% endfor %}
+        </span>
+        <p>Nowe wartości (po przecinku): </p>
+        <form action="/change/{{ photoid }}" method="post">
+            {% csrf_token %}
+            {{ form }}
+            <input type="submit" value="Zamień">
+        </form>
+    </div>
 
-    </span>
     {% endif %}
 </body>
 
diff --git a/bibrecognition/imguploader/templates/failed.html b/bibrecognition/imguploader/templates/failed.html
new file mode 100644
index 0000000..34a9a59
--- /dev/null
+++ b/bibrecognition/imguploader/templates/failed.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Search Photos</title>
+</head>
+<style>
+    body {
+        margin: 0;
+        font-family: sans-serif;
+    }
+
+    .wrapper {
+        height: 100vh;
+        width: 100vw;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+
+
+    }
+
+    p {
+        font-size: 88px;
+        font-weight: bold;
+        ;
+    }
+
+
+
+    a {
+        padding: 7px 14px;
+        background-color: #0083ff;
+        color: white;
+        font-family: sans-serif;
+        text-decoration: none;
+        border-radius: 5px;
+    }
+</style>
+
+<body>
+    <div class="wrapper">
+        <p>Bład</p>
+        <a href="/">Wróć do głównej</a>
+    </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/bibrecognition/imguploader/templates/index.html b/bibrecognition/imguploader/templates/index.html
index 94131d0..c6819f4 100644
--- a/bibrecognition/imguploader/templates/index.html
+++ b/bibrecognition/imguploader/templates/index.html
@@ -5,12 +5,27 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>RunPhoto</title>
 </head>
-<body>
+<style>
+    div a{
+        padding: 5px 0;
+        display: inline-block;
+        color: #2e2e2e;
+        text-decoration: none;
+        font-family: sans-serif;
+        font-size: 16px;
+    }
+</style>
+<body style="margin: 0px;">
     {% if user.is_authenticated %}
-        Zalogowany 😎 <br />
-        <a href="{% url 'upload' %}">Załaduj zdjęcia</a><br />
-        <a href="{% url 'search' %}">Przeszukaj bazę</a><br />
-        <a href="{% url 'change' %}">Koryguj</a>
+        <p style="width: 100%; background-color: #008eff; color: white; padding: 15px 20px; margin: 0;font-family: sans-serif;">Zalogowany 😎 </p><br />
+        <div style="padding: 20px;border: 1px solid #dedede;
+    border-radius: 10px;
+    margin: 0 30px 0 30px;">
+            <a href="{% url 'upload' %}">Załaduj zdjęcia</a><br />
+            <a href="{% url 'search' %}">Przeszukaj bazę</a><br />
+            <a href="{% url 'change' %}">Koryguj</a>   
+        </div>
+        
     {% else %}
         Gość 🏃‍♀️<br />
         <a href="{% url 'search' %}">Przeszukaj bazę</a>
diff --git a/bibrecognition/imguploader/templates/search.html b/bibrecognition/imguploader/templates/search.html
index f119c11..b92a386 100644
--- a/bibrecognition/imguploader/templates/search.html
+++ b/bibrecognition/imguploader/templates/search.html
@@ -6,13 +6,43 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Search Photos</title>
 </head>
+<style>
+     body{
+        margin: 0;
+    }
+    form{
+        padding: 20px;
+        margin: 30px;
+        border: 1px solid #dedede;
+    border-radius: 10px;
+    display: flex;
+    flex-direction: column;
 
+
+    }
+    form label{
+        margin: 20px 0 5px 0;
+        color: #2e2e2e;
+        font-size: 16px;
+        font-family: sans-serif;
+    }
+    form input[type=submit]{
+        margin: 25px 0 0 0;
+        color: white;
+        background-color: #0077ff;
+        padding: 10px;
+        font-size: 16px;
+        font-weight: bold;
+        border: none;
+        border-radius: 5px;
+    }
+</style>
 <body>
     {% if form %}
     <form action="/search" method="post" >
         {% csrf_token %}
         {{ form }}
-        <input type="submit" value="Submit">
+        <input type="submit" value="Szukaj">
     </form>
     {% endif %}
     {% if foto %}
diff --git a/bibrecognition/imguploader/templates/sukces.html b/bibrecognition/imguploader/templates/sukces.html
new file mode 100644
index 0000000..268125f
--- /dev/null
+++ b/bibrecognition/imguploader/templates/sukces.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Search Photos</title>
+</head>
+<style>
+    body {
+        margin: 0;
+        font-family: sans-serif;
+    }
+
+    .wrapper {
+            height: 100vh;
+    width: 100vw;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+
+
+    }
+    p{
+        font-size: 88px;
+        font-weight: bold;;
+    }
+
+    
+
+    a {
+        padding: 7px 14px;
+        background-color: #0083ff;
+        color: white;
+        font-family: sans-serif;
+        text-decoration: none;
+        border-radius: 5px;
+    }
+</style>
+
+<body>
+    <div class="wrapper">
+        <p>Sukces</p>
+        <a href="/">Wróć do głównej</a>
+    </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/bibrecognition/imguploader/templates/upload.html b/bibrecognition/imguploader/templates/upload.html
index ad8c1ce..5244c77 100644
--- a/bibrecognition/imguploader/templates/upload.html
+++ b/bibrecognition/imguploader/templates/upload.html
@@ -5,11 +5,42 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Upload Photos</title>
 </head>
+<style>
+    body{
+        margin: 0;
+    }
+    form{
+        padding: 20px;
+        margin: 30px;
+        border: 1px solid #dedede;
+    border-radius: 10px;
+    display: flex;
+    flex-direction: column;
+
+
+    }
+    form label{
+        margin: 20px 0 5px 0;
+        color: #2e2e2e;
+        font-size: 16px;
+        font-family: sans-serif;
+    }
+    form input[type=submit]{
+        margin: 25px 0 0 0;
+        color: white;
+        background-color: #0077ff;
+        padding: 10px;
+        font-size: 16px;
+        font-weight: bold;
+        border: none;
+        border-radius: 5px;
+    }
+</style>
 <body>
     <form action="/upload" method="post"  enctype="multipart/form-data">
         {% csrf_token %}
         {{ form }}
-        <input type="submit" value="Submit">
+        <input type="submit" value="Dodaj">
     </form>
 </body>
 </html>
\ No newline at end of file
diff --git a/bibrecognition/imguploader/urls.py b/bibrecognition/imguploader/urls.py
index fe7f252..919266a 100644
--- a/bibrecognition/imguploader/urls.py
+++ b/bibrecognition/imguploader/urls.py
@@ -10,6 +10,8 @@ urlpatterns = [
     path('search', views.searchPhotos, name="search"),
     path('change', views.changePhotos, name="change"),
     path('change/<int:photo>', views.changePhotoID, name="changeid"),
+    path('success/', views.ss, name="ss"),
+    path('failed/', views.ff, name="ff"),
     
 
 
diff --git a/bibrecognition/imguploader/views.py b/bibrecognition/imguploader/views.py
index dd0f308..15ed393 100644
--- a/bibrecognition/imguploader/views.py
+++ b/bibrecognition/imguploader/views.py
@@ -112,6 +112,7 @@ def changePhotos(request):
                     for numer in pm:
                         numery.append(numer.meta_value)
                     meta.append(numery)
+                    meta.append(zdjecie.id)
                     imgMeta.append(meta)
                     
                 return render(request, 'change.html', {'meta': imgMeta})
@@ -160,3 +161,12 @@ def changePhotoID(request, photo):
             return HttpResponseRedirect('/failed/')
 
     return render(request, 'changeid.html', {'photoid':photo,'foto': foto, 'numery': numery, 'form': form})
+
+def ss(request):
+
+    return render(request, 'sukces.html')
+
+
+def ff(request):
+
+    return render(request, 'failed.html')