add download func

app.py

@@ -1,73 +1,97 @@
 # -*- coding: utf-8 -*-
-
-from turtle import st
-from flask import Flask, render_template, request, flash, redirect, url_for
+from flask import Flask, render_template, request, flash, redirect, url_for, send_file
 from werkzeug.utils import secure_filename
 import os
-from models import db
-from models import PrintedDetal
+import secrets
+from models import db, PrintedDetal
 import logging
-from models import PrintedDetal
 
 logging.basicConfig(filename='app.log', encoding='utf-8', level=logging.DEBUG)
 
 
-UPLOAD_IMG_FOLDER = os.path.join('static', 'img', 'uploads')
-UPLOAD_STL_FOLDER = os.path.join('static', 'stl')
-ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'stl'}
-
 app = Flask(__name__)
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///app.db'
-app.config['UPLOAD_FOLDER'] = UPLOAD_IMG_FOLDER
-app.config['UPLOAD_FOLDER2'] = UPLOAD_STL_FOLDER
+app.config['UPLOAD_IMG_FOLDER'] = os.path.join('static', 'uploads', 'img')
+app.config['UPLOAD_STL_FOLDER'] = os.path.join('static', 'uploads', 'stl')
+app.config['UPLOAD_SRC_FOLDER'] = os.path.join('static', 'uploads', 'src')
 
-db.init_app(app)
+db.init_app(app) 
 
 
 @app.route("/")
 def index():
-    detals = PrintedDetal.query.all()
 
-    return render_template("index.html", detals=detals)
+    allDetals = {}
+
+    detalsQuery = PrintedDetal.query.all()
+
+    for detal in detalsQuery:
+        detals = {}
+        detals['img'] = detal.img
+        detals['stl'] = detal.stl
+        detals['src'] = detal.src
+        detals['isprinted'] = detal.isprinted
+
+        allDetals[detal.id] = detals
+
+    logging.debug(allDetals)
+
+    return render_template("index.html", detals=allDetals)
 
 
 @app.route("/admin",  methods=['GET', 'POST'])
 def admipage():
     logging.debug("adminpage loaded")
+
+    return render_template("adminpage.html")
+
+
+@app.route('/uploader', methods=['GET', 'POST'])
+def upload_file():
     if request.method == 'POST':
-        logging.debug("POST QUERY loaded")
-
-
-        image_file = request.files['images']
+        image_file = request.files['img']
         stl_file = request.files['stl']
-        
-        logging.debug(image_file)
-        logging.debug(stl_file)
+        src_file = request.files['src']
 
-        image_file.save(os.path.join(app.config['UPLOAD_FOLDER'], image_file.filename))
-        stl_file.save(os.path.join(app.config['UPLOAD_FOLDER2'], stl_file.filename))
+        if len(image_file.filename) > 0:
+            filename = image_file.filename.split('.')
+            image_file.filename = secrets.token_hex(15) + '.' + filename[-1]
+            image_file.save(os.path.join(
+                app.config['UPLOAD_IMG_FOLDER'], image_file.filename))
+
+        if len(stl_file.filename) > 0:
+            filename = stl_file.filename.split('.')
+            stl_file.filename = secrets.token_hex(15) + '.' + filename[-1]
+            stl_file.save(os.path.join(app.config['UPLOAD_STL_FOLDER'],stl_file.filename))
+
+        if len(src_file.filename) > 0:
+            filename = src_file.filename.split('.')
+            src_file.filename = secrets.token_hex(15) + '.' + filename[-1]
+            src_file.save(os.path.join(app.config['UPLOAD_SRC_FOLDER'], src_file.filename))
 
         if request.form.get('isprinted') == 'on':
             isprinered = True
         else:
             isprinered = False
 
-        detal = PrintedDetal(imgpath=image_file.filename, 
-                            stlpath=stl_file.filename, 
-                            isprinted=isprinered)
+        logging.debug(image_file.filename)
+        logging.debug(stl_file.filename)
+        logging.debug(src_file.filename)
+        logging.debug(isprinered)
+
+        detal = PrintedDetal(img=image_file.filename,
+                             stl=stl_file.filename,
+                             src=src_file.filename,
+                             isprinted=isprinered)
         db.session.add(detal)
         db.session.commit()
 
-        return render_template("adminpage.html")
+        return redirect(url_for('admipage'))
+
+@app.route('/download/<filename>', methods=['GET', 'POST'])
+def download(filename):
+    return send_file(app.config['UPLOAD_SRC_FOLDER']+'/'+ filename, as_attachment=True)
 
-    else:
-        return render_template("adminpage.html")
 
-@app.route('/uploader', methods = ['GET', 'POST'])
-def upload_file():
-   if request.method == 'POST':
-      f = request.files['file']
-      f.save(secure_filename(f.filename))
-      return 'file uploaded successfully'
 if __name__ == "__main__":
     app.run(host="0.0.0.0", debug="True", port="3800")

models.py

@@ -6,6 +6,7 @@ db = SQLAlchemy()
 
 class PrintedDetal(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    imgpath = db.Column(db.String(3000))
-    stlpath = db.Column(db.String(3000))
+    img = db.Column(db.String(3000))
+    stl = db.Column(db.String(3000))
+    src = db.Column(db.String(3000))
     isprinted = db.Column(db.Boolean())

static/css/adminpage.css

@@ -1,56 +1,62 @@
 body {
-    margin: 0;
-    padding: 0;
-    background-color: #dcf3d0;
+  margin: 0;
+  padding: 0;
+  background-color: #dcf3d0;
 
-  }
-  
-  header{
-    box-shadow: 0px 5px 10px 2px rgba(34, 60, 80, 0.2);
-  }
-  
-  .h1header {
-    margin: 0;
-    background-color: #b5e9e9;
-    height: 100px;
-    line-height: 100px;
-    text-align: center;
-    color: #034956;
-    
-  }
+}
 
-.uploadform{
+header {
+  box-shadow: 0px 5px 10px 2px rgba(34, 60, 80, 0.2);
+}
+
+.h1header {
+  margin: 0;
+  background-color: #b5e9e9;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
+  color: #034956;
+
+}
+
+.uploadform {
   margin: 30px;
 }
 
-.formsrow{
+.formsrow {
 
   border: #034956;
 
 }
 
 input[type="file"]::file-selector-button {
-  background-color:#ffe1d0;
+  background-color: #ffe1d0;
   padding: 0.5em;
   border: thin solid #f26722;
   border-radius: 2px;
 
 }
 
-input[type="file"]::form-file-button:hover {
+input[type="file"]::file-selector-button:hover {
   background-color: #fff1b5;
   color: #034956;
-  border: 2px solid #034956;
+  border: 1px solid #034956;
+  cursor: pointer;
 
 }
 
-
+.card {
+  background-color: #fef6dd;
+  border-radius: 12px;
+  box-shadow: 0px 5px 10px 2px rgba(34, 60, 80, 0.2);
+}
 
 .btn {
   margin-top: 15px;
   background-color: #ffe1d0;
   color: #034956;
   border: 2px solid #f26722;
+  border-radius: 5px;
   width: 100%;
 
 }
@@ -60,4 +66,17 @@ input[type="file"]::form-file-button:hover {
   color: #034956;
   border: 2px solid #034956;
 
+}
+
+.formblock {
+  width: 100%;
+  border: 2px solid #034956;
+  border-radius: 5px;
+
+}
+
+#printed {
+  width: 20px;
+  height: 20px;
+  accent-color: #f26722;
 }

static/css/style.css

@@ -4,7 +4,7 @@ body {
   background-color: #dcf3d0;
 }
 
-header{
+header {
   box-shadow: 0px 5px 10px 2px rgba(34, 60, 80, 0.2);
 }
 
@@ -15,14 +15,14 @@ header{
   line-height: 100px;
   text-align: center;
   color: #034956;
-  
+
 }
 
 .row {
   margin-top: 20px;
 }
 
-.col-md-4{
+.col-md-4 {
   margin-bottom: 25px;
 }
 
@@ -30,8 +30,13 @@ header{
   background-color: #fef6dd;
   border-radius: 12px;
   box-shadow: 0px 5px 10px 2px rgba(34, 60, 80, 0.2);
+  height: 450px;
 }
 
+.card-img-top{
+
+  height: 250px;
+}
 
 .btn {
 
@@ -50,11 +55,18 @@ header{
 
 }
 
-.card-img-top{
+.card-img-top {
   padding: 10px;
   border-radius: 18px;
 }
 
-h5{
+h5 {
   font-size: 17px;
+}
+
+
+
+.mobile-margin {
+  margin-bottom: 10px;
+  padding: 10px;
 }

templates/adminpage.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/css/bootstrap.min.css" rel="stylesheet"
+        integrity="sha384-Zenh87qX5JnK2Jl0vWa8Ck2rdkQ2Bzep5IDxbcnCeuOxjzrPF/et3URy9Bv1WTRi" crossorigin="anonymous">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/adminpage.css')}}">
+    <title>3d Detals adminka</title>
+</head>
+
+<body>
+    <header>
+        <h1 class="h1header"> Административная панель </h1>
+    </header>
+    <div class="container">
+
+        <div class="row ">
+            <form method="post" enctype=multipart/form-data action="/uploader">
+                <label class=" d-block p-2">Выберите изображение </label>
+                <input class=" formblock d-block p-2" type="file" name="img" />
+                <label class="  d-block p-2">Выберите исходный file </label>
+                <input class=" formblock d-block p-2" type="file" name="src" />
+                <label class="  d-block p-2">Выберите stl file </label>
+                <input class=" formblock d-block p-2" type="file" name="stl" />
+                <label > Напечатано </label>
+                <input type="checkbox" class="bxigchekcbox" id="printed" name="isprinted">
+                <input class="btn   d-block p-2" type="submit" value="Upload">
+            </form>
+        </div>
+
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/js/bootstrap.bundle.min.js"
+            integrity="sha384-OERcA2EqjJCMA+/3y+gxIOqMEjwtxJY7qPCqsdltbNJuaOe923+mo//f6V8Qbsw3"
+            crossorigin="anonymous"></script>
+</body>
+
+</html>

templates/index.html

@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/css/bootstrap.min.css" rel="stylesheet"
     integrity="sha384-Zenh87qX5JnK2Jl0vWa8Ck2rdkQ2Bzep5IDxbcnCeuOxjzrPF/et3URy9Bv1WTRi" crossorigin="anonymous">
-  <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css')}}">
+  <link rel="stylesheet" href="{{ url_for('static',filename='css/style.css')}}">
   <title>3d Detals</title>
 </head>
 <body>
@@ -16,41 +16,41 @@
   </header>
   <div class="container">
     <div class="row">
-      
-      {% for i in range(10) %}
-
-
 
+      {% for key, value in detals.items() %}
 
       <div class="col-md-4">
-        <div class="card">
-          <img class="card-img-top" src="{{ url_for('static', filename='img/{{i}}.jpg')}}  " alt="1 image">
+        <div class="card mobile-margin">
+          <img class="card-img-top" src="{{url_for('static', filename='uploads/img/' + value['img'])}}">
+          
           <div class="card-body">           
             <dv class="row">
               <div class="col">
-                <button class="btn btn-block">Скачать исходник</button>
+                <a href="{{url_for('static', filename='uploads/src/' + value['src'])}}"  class="btn btn-block mobile-margin" download >Скачать исходник</a>
               </div>
               <div class="col">
-                <button class="btn btn-block">Скачать stl </button>
+                <a  href="{{url_for('static', filename='uploads/stl/' + value['stl'])}}"  class="btn btn-block mobile-margin" download>Скачать stl </a>
               </div>
             <div class="row">
               <div class="col d-flex justify-content-center">
-                <input class="form-check-input" type="checkbox" value="" id="flexCheckDefault">
-                <label class="form-check-label" for="flexCheckDefault">
-                  Напечатано
-                </label>
+                <input class="form-check-input" type="checkbox" value="" id="flexCheckDefault" disabled>
+                <label> Напечатано </label>
               </div>
               <div class="col d-flex justify-content-center">
-                <h5> {{ i }} </h5>
+                <h5> 22.10.2022</h5>
               </div>
             </div>       
           </div>
         </div>
       </div>
 
-
       {%endfor%}
-    
+
+
+
+    </div>
+  </div>
+     
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/js/bootstrap.bundle.min.js"
     integrity="sha384-OERcA2EqjJCMA+/3y+gxIOqMEjwtxJY7qPCqsdltbNJuaOe923+mo//f6V8Qbsw3"
     crossorigin="anonymous"></script>