add download func

app.py

@@ -1,78 +1,96 @@
 # -*- coding: utf-8 -*-
-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
+import secrets
-from models import PrintedDetal
+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_IMG_FOLDER'] = os.path.join('static', 'uploads', 'img')
-app.config['UPLOAD_FOLDER2'] = UPLOAD_STL_FOLDER
+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['img']
+        stl_file = request.files['stl']
+        src_file = request.files['src']
 
-        image_file = request.files['imgfile']
+        if len(image_file.filename) > 0:
-        stl_file = request.files['stlfile']
+            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))
 
-        logging.debug(image_file)
+        if len(stl_file.filename) > 0:
-        logging.debug(stl_file)
+            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))
 
-        image_file.save(os.path.join(
+        if len(src_file.filename) > 0:
-            app.config['UPLOAD_FOLDER'], image_file.filename))
+            filename = src_file.filename.split('.')
-        stl_file.save(os.path.join(
+            src_file.filename = secrets.token_hex(15) + '.' + filename[-1]
-            app.config['UPLOAD_FOLDER2'], stl_file.filename))
+            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
 
-        logging.debug(image_file)
+        logging.debug(image_file.filename)
-        logging.debug(stl_file)
+        logging.debug(stl_file.filename)
+        logging.debug(src_file.filename)
         logging.debug(isprinered)
 
-        # detal = PrintedDetal(imgpath=image_file.filename,
+        detal = PrintedDetal(img=image_file.filename,
-        #                    stlpath=stl_file.filename,
+                             stl=stl_file.filename,
-        #                    isprinted=isprinered)
+                             src=src_file.filename,
-        # db.session.add(detal)
+                             isprinted=isprinered)
-        # db.session.commit()
+        db.session.add(detal)
+        db.session.commit()
 
-        return render_template("adminpage.html")
+        return redirect(url_for('admipage'))
 
-    else:
+@app.route('/download/<filename>', methods=['GET', 'POST'])
-        return render_template("adminpage.html")
+def download(filename):
-
+    return send_file(app.config['UPLOAD_SRC_FOLDER']+'/'+ filename, as_attachment=True)
-
-@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__":

models.py

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

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,19 +55,18 @@ header{
 
 }
 
-.card-img-top{
+.card-img-top {
   padding: 10px;
   border-radius: 18px;
 }
 
-h5{
+h5 {
   font-size: 17px;
 }
 
 
 
-.mobile-margin{
+.mobile-margin {
   margin-bottom: 10px;
   padding: 10px;
-}
+}
-

templates/adminpage.html

@@ -8,7 +8,7 @@
     <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</title>
+    <title>3d Detals adminka</title>
 </head>
 
 <body>
@@ -18,13 +18,13 @@
     <div class="container">
 
         <div class="row ">
-            <form method="post" enctype=multipart/form-data>
+            <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="imgfile" />
+                <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="origfile" />
+                <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="stlfile" />
+                <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">

templates/index.html

@@ -17,25 +17,24 @@
   <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 mobile-margin">
-          <img class="card-img-top" src="{{url_for('static', filename='img/1.jpg')}}" alt="1 image">
+          <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 mobile-margin">Скачать исходник</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 mobile-margin">Скачать 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" disabled>
-                <label class="form-check-label" for="flexCheckDefault">
+                <label> Напечатано </label>
-                  Напечатано
-                </label>
               </div>
               <div class="col d-flex justify-content-center">
                 <h5> 22.10.2022</h5>