From c168dd575703ea5ab17171f33c1a472cc12f4386 Mon Sep 17 00:00:00 2001 From: michigg Date: Sun, 22 Oct 2017 15:27:54 +0200 Subject: [PATCH] implement image upload gui --- .../__pycache__/settings.cpython-35.pyc | Bin 3040 -> 3058 bytes ofu_app/ofu_app/settings.py | 2 +- ofu_app/static/css/food/main.css | 19 ++++++++++- ofu_app/static/js/food/image_capturing.js | 30 ++++++++++++++++++ ofu_app/static/js/food/rating.js | 2 +- ofu_app/templates/food/food_wrapper.jinja | 1 + ofu_app/templates/macros/food_macros.jinja | 19 +++++++++-- 7 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 ofu_app/static/js/food/image_capturing.js diff --git a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc index 1b31c30eb06db11bf8c4a870e83c257c9a2fd50a..c65670b7452f50ded9d63ba5daf3821ecea1ab6c 100644 GIT binary patch delta 425 zcmY+9O-chn6ojkCpfPcxNz{q?(P;dO!jOo@iJ-dcQQAo3 zB2q-FNC{m+m(dmajzPd+p8gD4V;B%SG(z*}D!PW&NgRnCtz_MoSS*uipiOiG-9%f& z`AI$wkPzKM7SL@pZKFHrZnou~Z<*L~NZG&YzGn{yQ|L_L(1SIQMf3`(phrj*Jw|Le zyEmm1#6~o(p&nl=(&Ha#=SMgI diff --git a/ofu_app/ofu_app/settings.py b/ofu_app/ofu_app/settings.py index 6601853..9dc661b 100644 --- a/ofu_app/ofu_app/settings.py +++ b/ofu_app/ofu_app/settings.py @@ -23,7 +23,7 @@ SECRET_KEY = '7tm($-7tz!co8762!)ptmj%)80)qa^z0odee*8-!be!i(a!p4j' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ['mg-server.ddns.net', 'localhost', '127.0.0.1', ] +ALLOWED_HOSTS = ['mg-server.ddns.net', 'localhost', '127.0.0.1', '192.168.100.8'] # Application definition diff --git a/ofu_app/static/css/food/main.css b/ofu_app/static/css/food/main.css index ed19f60..2f1322a 100644 --- a/ofu_app/static/css/food/main.css +++ b/ofu_app/static/css/food/main.css @@ -1,4 +1,4 @@ -footer{ +footer { /*mb equal height in #food-nav*/ margin-bottom: 60px; } @@ -10,4 +10,21 @@ footer{ position: fixed; width: 100%; height: 60px; +} + +.food-name p { + margin-bottom: 0; +} + +/** Picture Input **/ +.pic-upload { + display: none !important; +} + +.custom-pic-upload { + /*border: 1px solid #ccc;*/ + display: inline-block; + /*padding: 6px 12px;*/ + padding-right: 5px; + cursor: pointer; } \ No newline at end of file diff --git a/ofu_app/static/js/food/image_capturing.js b/ofu_app/static/js/food/image_capturing.js new file mode 100644 index 0000000..9868fc9 --- /dev/null +++ b/ofu_app/static/js/food/image_capturing.js @@ -0,0 +1,30 @@ +document.addEventListener('DOMContentLoaded', add_img_class, true); + +function add_img_class() { + console.log($('.food-item')); + $('.food-item').each(function () { + var food_id = $(this).data('food'); + console.log("ITEM: " + $(this) + " FOOD-ID: " + food_id); + $(this).find('.img').addClass('img-' + food_id); + $(this).find('.pic-upload').addClass('img-upload-' + food_id).on('change', function () { + readURL(this) + }); + }); +} + +function readURL(obj) { + var picClass = "img-" + $(obj).attr('class').split(' ')[1].split('-')[2]; + console.log(picClass); + input = $('.' + picClass)[0]; + var file = input.files[0]; + console.log(file); + + var reader = new FileReader(); + reader.onload = function () { + document.getElementById('clock').style.backgroundImage = "url(" + reader.result + ")"; + } + if (file) { + reader.readAsDataURL(file); + } else { + } +} \ No newline at end of file diff --git a/ofu_app/static/js/food/rating.js b/ofu_app/static/js/food/rating.js index 3e018cf..59f23ac 100644 --- a/ofu_app/static/js/food/rating.js +++ b/ofu_app/static/js/food/rating.js @@ -10,7 +10,7 @@ function rate_init() { $('.star').on("mouseenter mouseleave", function () { showRating(this); }).on("click", function () { - console.log('Click') + console.log('Click'); sendRating(this); }) } diff --git a/ofu_app/templates/food/food_wrapper.jinja b/ofu_app/templates/food/food_wrapper.jinja index 378fe23..39f418d 100644 --- a/ofu_app/templates/food/food_wrapper.jinja +++ b/ofu_app/templates/food/food_wrapper.jinja @@ -2,6 +2,7 @@ {% block js_extra %} + {% endblock %} {% block css_extra %} diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja index c6e1079..5cbbffe 100644 --- a/ofu_app/templates/macros/food_macros.jinja +++ b/ofu_app/templates/macros/food_macros.jinja @@ -34,8 +34,23 @@
    {% for single_food in menu %}
  • -

    {{ single_food.name }}

    -

    +
    +

    {{ single_food.name }}

    +
    Gericht
    +
    +
    +
    +
    + +
    + {# TODO: extract style to external css file #} + +
    +
    +
    • {% endfor %}