Upload and show offers
This commit is contained in:
parent
0ceb3578bb
commit
840a1b186f
|
@ -48,7 +48,7 @@
|
|||
id="navbarSupportedContent">
|
||||
<ul class="navbar-nav mr-auto">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{% url 'index' %}"><i class="fa-solid fa-seedling"></i><span class="ms-2">Offers</span></a>
|
||||
<a class="nav-link" href="{% url 'list_offers' %}"><i class="fa-solid fa-seedling"></i><span class="ms-2">Offers</span></a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{% url 'create_offer' %}"><i class="fa-solid fa-square-plus"></i><span class="ms-2">New Offer</span></a>
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
</div>
|
||||
<div class="show-offer-info w-50">
|
||||
<h1 class="mb-3">{{ offer.title }}</h1>
|
||||
<div class="mb-3 d-flex">
|
||||
<p class="pr-3">
|
||||
<div class="mb-3 d-flex column-gap-2">
|
||||
<p class="mr-3">
|
||||
<i class="fas fa-user"></i>
|
||||
{% if offer.user == user %}
|
||||
Me
|
||||
|
@ -24,7 +24,7 @@
|
|||
{{ offer.user.username }}
|
||||
{% endif %}
|
||||
</p>
|
||||
<p class="pr-3">
|
||||
<p class="mr-3">
|
||||
<i class="fas fa-map-marker-alt"></i> {{ offer.zipcode }}
|
||||
</p>
|
||||
{% if distance > 0 %}
|
||||
|
|
|
@ -1,45 +1,29 @@
|
|||
{% extends 'base.html' %}
|
||||
{% load static %}
|
||||
{% block title %}Offers{% endblock %}
|
||||
{% block content %}
|
||||
<div class="mb-5">
|
||||
<a class="btn btn-pfl"
|
||||
data-toggle="collapse"
|
||||
href="#collapseExample"
|
||||
role="button"
|
||||
aria-expanded="false"
|
||||
aria-controls="collapseExample">
|
||||
<div class="btn btn-pfl">
|
||||
<i class="fas fa-filter mr-3"></i>Filter<i class="fas fa-chevron-down ml-3 dropdown-collapse"></i>
|
||||
</div>
|
||||
</a>
|
||||
<div class="collapse" id="collapseExample">{{ form(filter_form, {attr: {novalidate: 'novalidate' }}) }}</div>
|
||||
</div>
|
||||
<h1>Offers</h1>
|
||||
{% if offers|length > 0 %}
|
||||
<div class="card-deck d-flex justify-content-around justify-content-sm-around justify-content-md-between flex-wrap">
|
||||
{% if offers %}
|
||||
<div class="row row-cols-1 row-cols-md-2 row-cols-xl-3 mb-3 row-gap-5">
|
||||
{% for offer in offers %}
|
||||
<div class="mb-5">
|
||||
<div class="card offer h-100">
|
||||
<a href="{{ path('show_offer', {'urlId': offer.urlId }) }}">
|
||||
{% if offer.photoFilename %}
|
||||
<img class="card-img-top offer-img"
|
||||
src="{{ asset('uploads/photos/' ~ offer.photofilename) }}"/>
|
||||
<div class="col">
|
||||
<div class="card h-100 p-0">
|
||||
<a href="{% url 'offer_detail' offer.id %}">
|
||||
{% if offer.image %}
|
||||
<img class="card-img-top offer-img" src="{{ offer.image.url }}"/>
|
||||
{% else %}
|
||||
<img class="card-img-top offer-img" src="{{ asset('placeholder.jpg') }}" />
|
||||
<img class="card-img-top offer-img" src="{% static 'placeholder.jpg' %}" />
|
||||
{% endif %}
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">{{ offer.title }}</h5>
|
||||
<h5 class="h5">{{ offer.title }}</h5>
|
||||
</div>
|
||||
</a>
|
||||
<div class="card-footer offer-footer">
|
||||
<a class="user-link"
|
||||
href="{{ path('user_public', { 'urlId': offer.byuser.urlId }) }}">
|
||||
<p class="username">
|
||||
<i class="fas fa-user mt-3"></i> {{ offer.byUser }}
|
||||
</p>
|
||||
<div class="card-footer d-flex justify-content-between">
|
||||
<a href="#">
|
||||
<i class="fas fa-user mt-3"></i> {{ offer.user.username }}
|
||||
</a>
|
||||
<p class="zip">
|
||||
<i class="fas fa-map-marker-alt mt-3"></i> {{ offer.zipCode }}
|
||||
<i class="fas fa-map-marker-alt mt-3"></i> {{ offer.zipcode }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
11
pflaenzli/upload.py
Normal file
11
pflaenzli/upload.py
Normal file
|
@ -0,0 +1,11 @@
|
|||
import os
|
||||
from pathlib import Path
|
||||
from uuid import uuid4
|
||||
from django.core.files.storage import default_storage
|
||||
|
||||
|
||||
def generate_unique_filename(filename):
|
||||
file_type = Path(filename).suffix
|
||||
new_filename = default_storage.get_available_name(uuid4())
|
||||
|
||||
return f'{new_filename}{file_type}'
|
|
@ -7,6 +7,7 @@ from . import views
|
|||
|
||||
urlpatterns = [
|
||||
path("", views.index, name="index"),
|
||||
path("offers/", views.list_offers, name="list_offers"),
|
||||
path("offer/create/", views.create_offer, name="create_offer"),
|
||||
path("offer/<int:offer_id>/", views.offer_detail, name="offer_detail"),
|
||||
path("offer/<int:offer_id>/delete", views.offer_delete, name="offer_delete"),
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
import os
|
||||
import pathlib
|
||||
import uuid
|
||||
from django.core.files.storage import default_storage
|
||||
from django.shortcuts import render, get_object_or_404, redirect
|
||||
from django.utils import timezone
|
||||
from django.contrib import messages
|
||||
|
@ -9,12 +5,19 @@ from django.contrib.auth.decorators import login_required
|
|||
|
||||
from .forms import CreateOfferForm
|
||||
from .models import Offer, Wish
|
||||
from .upload import generate_unique_filename
|
||||
|
||||
|
||||
def index(request):
|
||||
return render(request, "app/index.html")
|
||||
|
||||
|
||||
def list_offers(request, filters=None):
|
||||
offers = Offer.objects.all()
|
||||
print(offers)
|
||||
return render(request, "offer/search.html", {"offers": offers})
|
||||
|
||||
|
||||
@login_required
|
||||
def create_offer(request):
|
||||
if request.method == "POST":
|
||||
|
@ -22,7 +25,7 @@ def create_offer(request):
|
|||
form = CreateOfferForm(request.POST, request.FILES)
|
||||
if form.is_valid():
|
||||
offer = form.save(commit=False)
|
||||
offer.image.name = generate_unique_filename(request.FILES['image'].name)
|
||||
offer.image.name = generate_unique_filename(form.cleaned_data['image'].name)
|
||||
offer.user = request.user
|
||||
offer.save()
|
||||
messages.success(request, "Offer uploaded successfully!")
|
||||
|
@ -33,30 +36,23 @@ def create_offer(request):
|
|||
return render(request, "basic_form.html", {"form": form, "button_label": "Create"})
|
||||
|
||||
|
||||
@login_required
|
||||
@ login_required
|
||||
def offer_detail(request, offer_id):
|
||||
offer = get_object_or_404(Offer, id=offer_id)
|
||||
|
||||
return render(request, "offer/detail.html", {"offer": offer, "wishes": ["Monstera", "Tradescantia"]})
|
||||
|
||||
|
||||
def generate_unique_filename(filename):
|
||||
file_type = pathlib.Path(filename).suffix
|
||||
new_filename = default_storage.get_available_name(uuid.uuid4())
|
||||
|
||||
return f'{new_filename}{file_type}'
|
||||
|
||||
|
||||
@login_required
|
||||
@ login_required
|
||||
def offer_delete(request, offer_id):
|
||||
return 0
|
||||
|
||||
|
||||
@login_required
|
||||
@ login_required
|
||||
def offer_edit(request, offer_id):
|
||||
return 0
|
||||
|
||||
|
||||
@login_required
|
||||
@ login_required
|
||||
def offer_trade(request, offer_id):
|
||||
return 0
|
||||
|
|
Loading…
Reference in a new issue