Merge branch 'beta'

alkator/urls.py

@@ -16,7 +16,7 @@ Including another URLconf
 """
 from django.contrib import admin
 from django.urls import path
-from alkatorapi.views import register, results, photos, payment_result, payment_state, invoice
+from alkatorapi.views import register, results, photos, payment_result, payment_state, invoice, upload_files
 
 urlpatterns = [
     path('admin/', admin.site.urls),
@@ -26,4 +26,5 @@ urlpatterns = [
     path('api/payment_result', payment_result),
     path('api/payment_state', payment_state),
     path('api/invoice', invoice),
+    path('api/upload_files', upload_files)
 ]

alkatorapi/views.py

@@ -207,6 +207,18 @@ def photos(request):
     return HttpResponse(json.dumps(rtn), content_type='application/json')
 
 
+@csrf_exempt
+def upload_files(request):
+    for name, file in request.FILES.items():
+        print(name)
+        rand = random.randint(0, 99999)
+        random_name = f'photos/uploads/{rand}_{file.name}'
+        with open(random_name, "wb+") as destination:
+            for chunk in file.chunks():
+                destination.write(chunk)
+    return HttpResponse('{"success":"Úspěšně nahráno! Počkejte až dojde ke schválení nahraných souborů."}', content_type='application/json')
+
+
 @staff_member_required
 def invoice(request):
     user = User.objects.get(invoice_id=request.GET['invoice_id'])

frontend/src/scripts/index.js

@@ -15,6 +15,7 @@ class Main extends Component {
     constructor(props) {
         super(props);
         this.state = {
+            files: [],
             text: "",
             status: "",
             faq: false,
@@ -55,15 +56,19 @@ class Main extends Component {
     onHashChange(event){
         this.setState({page: window.location.hash})
     }
+    handleChangeFiles(event) {
+        this.setState({files: [...event.target.files]})
+    }
     onSubmit(event){
         event.preventDefault();
         let form = document.getElementById("form");
+        let api_endpoint = form.action;
         let formData = new FormData(form);
         if(this.state.progress){
             return;
         }
         this.setState({progress: true})
-        fetch(addr_prefix + "/api/register", {
+        fetch(addr_prefix + api_endpoint, {
             method:"POST",
             body: formData,
         }).then(resp => resp.json()).then(json => {
@@ -78,8 +83,10 @@ class Main extends Component {
                     text: json.success,
                     status: "success",
                 })
+                if (json.redirect){
                     window.open(json.redirect ,"_self")
                 }
+            }
         });
     }
     togglefaq(){
@@ -128,12 +135,30 @@ class Main extends Component {
                 <li class="nav-item">
                     <a class="nav-link" href="#gallery">Galerie</a>
                 </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#upload_files">Nahrát vlastní fotky/videa</a>
+                </li>
                 <li class="nav-item">
                     <a class="nav-link" href="#payment">Platba</a>
                 </li>
             </ul>
         </div>
     </nav>
+    {this.state.status == "success" &&
+        <div class="absolute container-fluid alert alert-success">
+            {this.state.text}
+        </div>}
+        {this.state.status == "failed" &&
+        <div class="absolute container-fluid alert alert-danger">
+            {this.state.text}
+        </div>}
+    {this.state.page == "#upload_files" &&
+    <div>
+        <form id="form" action="/api/upload_files" class="container" onSubmit={(e) => this.onSubmit(e)}>
+            <label>Zvolte soubory <input type="file" name="files" accept=".jpg,.png,.webp,.webm,.avi,.mkv,.mp4" multiple={true}  onChange={(e)=> this.handleChangeFiles.bind(this)(e)}/></label>
+            <button type="submit" class="btn btn-primary">Nahrát</button>
+        </form>
+    </div>}
     {this.state.page == "#payment" &&
     <div class="container text">
         Platební bránu poskytuje firma <a href="https://www.comgate.cz/cz/platebni-brana">Comgate, a.s</a>. Platit je možné pomocí <a href="https://help.comgate.cz/v1/docs/cs/platby-kartou">platební karty</a> nebo <a href="https://help.comgate.cz/docs/bankovni-prevody">bankovním převodem</a>. Podrobnosti a přesný postup platby včetně animací najdete v odkazech.<br />
@@ -150,14 +175,6 @@ class Main extends Component {
     }
     {this.state.page == "" &&
     <div>
-        {this.state.status == "success" &&
-        <div class="absolute container-fluid alert alert-success">
-            {this.state.text}
-        </div>}
-        {this.state.status == "failed" &&
-        <div class="absolute container-fluid alert alert-danger">
-            {this.state.text}
-        </div>}
         {this.state.faq &&
             <div class="shadow"></div>}
         {this.state.faq &&
@@ -261,7 +278,7 @@ class Main extends Component {
                     <p>Sportem ku chlastu!</p>
                 </div>
                 <div class="col-xl-6">
-                    <h1 class="text"    >Výsledky 2. ročníku (Podzim 2024)</h1>
+                    <h1 class="text">Výsledky 1. ročníku</h1>
                     {this.state.results &&
                         <table class="table results">
                             <thead>
@@ -296,7 +313,7 @@ class Main extends Component {
             <h1>Kapacita je aktuálně naplněna, budem se těšit u dalšího ročníku.</h1>
         </div>
         {/*
-        <form id="form" class="container" onSubmit={(e) => this.onSubmit(e)}>
+        <form id="form" class="container" action="/api/register" onSubmit={(e) => this.onSubmit(e)}>
             <h1>Registrace</h1>
             <div class="mb-3">
                 <label for="first_name" class="form-label">Jméno</label>

resize_photos.py

@@ -1,7 +1,7 @@
 import glob
 import PIL.Image
 
-photos = glob.glob('photos/*.jpg')
+photos = glob.glob('photos/2/*.jpg')
 
 for image in photos:
     print(image)