diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index e69de29..0000000 diff --git a/.env.template b/.env.template deleted file mode 100644 index b8d8062..0000000 --- a/.env.template +++ /dev/null @@ -1,3 +0,0 @@ -DB_HOST="127.0.0.1" -DB_PORT="6379" -DEBUG=1 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4c49bd7..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.env diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index c6c5ba1..0000000 --- a/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM python:3.8-slim -LABEL name=laser-app version=0.1 - -WORKDIR /opt -RUN apt update -RUN apt install -y --no-install-recommends build-essential\ - gcc\ - libagg2-dev\ - libpotrace-dev\ - nginx-light\ - pkg-config\ - python-dev\ - redis-server -RUN rm -f /etc/nginx/sites-enabled/* -RUN pip3 install flask numpy pillow redis -RUN pip3 install pypotrace - -COPY ./files/nginx/sites-enabled/site.conf /etc/nginx/sites-enabled -COPY . . - -COPY entrypoint.sh /usr/bin/ -RUN chmod +x /usr/bin/entrypoint.sh - -EXPOSE 80 -EXPOSE 5000 -EXPOSE 9001 - -# Start the main process. -CMD ["python", "./server.py", "-i", "db"] diff --git a/css/bootstrap b/bootstrap similarity index 100% rename from css/bootstrap rename to bootstrap diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap-grid.css b/bootstrap-4.5.3-dist/css/bootstrap-grid.css similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap-grid.css rename to bootstrap-4.5.3-dist/css/bootstrap-grid.css diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap-grid.css.map b/bootstrap-4.5.3-dist/css/bootstrap-grid.css.map similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap-grid.css.map rename to bootstrap-4.5.3-dist/css/bootstrap-grid.css.map diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css b/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css rename to bootstrap-4.5.3-dist/css/bootstrap-grid.min.css diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css.map b/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css.map similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css.map rename to bootstrap-4.5.3-dist/css/bootstrap-grid.min.css.map diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap-reboot.css b/bootstrap-4.5.3-dist/css/bootstrap-reboot.css similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap-reboot.css rename to bootstrap-4.5.3-dist/css/bootstrap-reboot.css diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap-reboot.css.map b/bootstrap-4.5.3-dist/css/bootstrap-reboot.css.map similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap-reboot.css.map rename to bootstrap-4.5.3-dist/css/bootstrap-reboot.css.map diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css b/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css rename to bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css.map b/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css.map rename to bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css.map diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap.css b/bootstrap-4.5.3-dist/css/bootstrap.css similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap.css rename to bootstrap-4.5.3-dist/css/bootstrap.css diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap.css.map b/bootstrap-4.5.3-dist/css/bootstrap.css.map similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap.css.map rename to bootstrap-4.5.3-dist/css/bootstrap.css.map diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap.min.css b/bootstrap-4.5.3-dist/css/bootstrap.min.css similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap.min.css rename to bootstrap-4.5.3-dist/css/bootstrap.min.css diff --git a/css/bootstrap-4.5.3-dist/css/bootstrap.min.css.map b/bootstrap-4.5.3-dist/css/bootstrap.min.css.map similarity index 100% rename from css/bootstrap-4.5.3-dist/css/bootstrap.min.css.map rename to bootstrap-4.5.3-dist/css/bootstrap.min.css.map diff --git a/css/bootstrap-4.5.3-dist/js/bootstrap.bundle.js b/bootstrap-4.5.3-dist/js/bootstrap.bundle.js similarity index 100% rename from css/bootstrap-4.5.3-dist/js/bootstrap.bundle.js rename to bootstrap-4.5.3-dist/js/bootstrap.bundle.js diff --git a/css/bootstrap-4.5.3-dist/js/bootstrap.bundle.js.map b/bootstrap-4.5.3-dist/js/bootstrap.bundle.js.map similarity index 100% rename from css/bootstrap-4.5.3-dist/js/bootstrap.bundle.js.map rename to bootstrap-4.5.3-dist/js/bootstrap.bundle.js.map diff --git a/css/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js b/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js similarity index 100% rename from css/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js rename to bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js diff --git a/css/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js.map b/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from css/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js.map rename to bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js.map diff --git a/css/bootstrap-4.5.3-dist/js/bootstrap.js b/bootstrap-4.5.3-dist/js/bootstrap.js similarity index 100% rename from css/bootstrap-4.5.3-dist/js/bootstrap.js rename to bootstrap-4.5.3-dist/js/bootstrap.js diff --git a/css/bootstrap-4.5.3-dist/js/bootstrap.js.map b/bootstrap-4.5.3-dist/js/bootstrap.js.map similarity index 100% rename from css/bootstrap-4.5.3-dist/js/bootstrap.js.map rename to bootstrap-4.5.3-dist/js/bootstrap.js.map diff --git a/css/bootstrap-4.5.3-dist/js/bootstrap.min.js b/bootstrap-4.5.3-dist/js/bootstrap.min.js similarity index 100% rename from css/bootstrap-4.5.3-dist/js/bootstrap.min.js rename to bootstrap-4.5.3-dist/js/bootstrap.min.js diff --git a/css/bootstrap-4.5.3-dist/js/bootstrap.min.js.map b/bootstrap-4.5.3-dist/js/bootstrap.min.js.map similarity index 100% rename from css/bootstrap-4.5.3-dist/js/bootstrap.min.js.map rename to bootstrap-4.5.3-dist/js/bootstrap.min.js.map diff --git a/css/bootstrap.min.css b/bootstrap.min.css similarity index 100% rename from css/bootstrap.min.css rename to bootstrap.min.css diff --git a/js/canvas.js b/canvas.js similarity index 72% rename from js/canvas.js rename to canvas.js index 2529b1b..76efcdd 100644 --- a/js/canvas.js +++ b/canvas.js @@ -1,8 +1,10 @@ $(document).ready(function(){ +console.log("ok") + var binary_level = 100 - var url = document.URL + // Grab elements, create settings, etc. var canvas = document.getElementById('canvas'); @@ -17,7 +19,6 @@ $(document).ready(function(){ context.drawImage(video, 0, 0, 640, 480); binary(context) $("#result").show() - $('html, body').animate({scrollTop: $("#result").offset().top}, 2000); } @@ -61,7 +62,7 @@ $(document).ready(function(){ } // Trigger photo take - $('.snap').on('click', function() { + document.getElementById('snap').addEventListener('click', function() { snap() }); function binary(context){ @@ -76,6 +77,7 @@ $(document).ready(function(){ var thresh_red = binary_level; var thresh_green = binary_level; var thresh_blue = binary_level; + console.log( binary_level ) var channels = image.data.length/4; for(var i=0;iSending...') - - $.ajax({ - url: url + "/image", - method:"POST", - dataType: "json", - data:{ - image_data : image_data, - text : $("#text").val() - }, - - }).done(function(d,m,j){ - if( d.errors ){ - msg = d.errors.join(" / ") - $("#messages").html(``) - return - } - $("#messages").html(``) - imageList = localStorage.getItem("imageList") ? JSON.parse(localStorage.getItem("imageList")) : [] - imageList.push(d.hash_name) - localStorage.setItem("imageList",JSON.stringify(imageList)) - }) - .fail(function(d,m,jq){ - $("#messages").html(``) - - }) + alert("Sorry, this is still a work in progress ¯\_(ツ)_/¯") }) }) diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 6b4fe67..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: '2' - -volumes: - laserrdb: - external: true - -services: - - db: - env_file: .env - image: redis:6-alpine - ports: - - "6379:6379" - volumes: - - laserrdb:/var/lib/redis - - app: - env_file: .env - build: . - image: teamlaser/laser-app:latest - ports: - - "5000:5000" - depends_on: - - db - command: python ./server.py - - assets: - env_file: .env - image: teamlaser/laser-app:latest - ports: - - "8080:80" - depends_on: - - app - command: nginx -g 'daemon off;error_log /dev/stdout info;' - - worker: - env_file: .env - build: . - image: teamlaser/laser-app:latest - depends_on: - - db - command: bash -c "while true; do python ./worker.py; sleep 30; done" - diff --git a/entrypoint.sh b/entrypoint.sh deleted file mode 100644 index 2b300a5..0000000 --- a/entrypoint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -e - - -exec "$@" diff --git a/files/nginx/sites-enabled/site.conf b/files/nginx/sites-enabled/site.conf deleted file mode 100644 index 3cfd899..0000000 --- a/files/nginx/sites-enabled/site.conf +++ /dev/null @@ -1,13 +0,0 @@ -server { - server_name _; - listen 80 default_server; - listen [::]:80 default_server; - root /opt/; - location /image { - proxy_pass http://app:5000; - } - # Docker specific conf - resolver 127.0.0.11 ipv6=off; - access_log /dev/stdout; - -} diff --git a/index.html b/index.html index 3790a27..1662ffd 100644 --- a/index.html +++ b/index.html @@ -12,12 +12,12 @@ #canvas { margin-top: 20px; border: 1px solid #ccc; display: block; } span.ui-slider-handle.ui-corner-all.ui-state-default { background: dodgerblue;} - - + + - - - + + +