jsw/flask_eindproject
1
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Finished user interface. Added mobile-ish support. Added homepage. Added viewpage. Fixed some scrapers

Browse source
This commit is contained in:
Jurn Wubben 2025-06-25 11:35:13 +02:00
parent 89118c6d1d
commit 42f40ad9a0
8 changed files with 433 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/forms.py
View file

@ -48,7 +48,6 @@ class CheckItem(FlaskForm):
class DeleteItem(FlaskForm): class DeleteItem(FlaskForm):
index = HiddenField() index = HiddenField()
it_del_submit = SubmitField("Delete item")
def parseHiddenIndex(field: HiddenField, array: list[Any]) -> int | None: def parseHiddenIndex(field: HiddenField, array: list[Any]) -> int | None:

8
app/scrapers.py
View file

@ -80,7 +80,7 @@ class GenericScraper(ScraperLike):
price = soup.select_one(self._priceQuery) price = soup.select_one(self._priceQuery)
image = soup.select_one(self._imageQuery) image = soup.select_one(self._imageQuery)
if name is None or price is None or image is None: if name is None or image is None:
raise ScrapeError( raise ScrapeError(
f"Failed to scrape site. Invalid webpage or queries: N:{name},P:{price},I:{image}" f"Failed to scrape site. Invalid webpage or queries: N:{name},P:{price},I:{image}"
) )
@ -88,7 +88,11 @@ class GenericScraper(ScraperLike):
name = name.text.strip() name = name.text.strip()
image = image.get("src") image = image.get("src")
try: try:
x = self.priceParser(price.text) if price is None:
price = "0"
else:
price = price.text
x = self.priceParser(price)
reg = search(r"([0-9]+)(?:(?:\.|,)([0-9]+))?", x) reg = search(r"([0-9]+)(?:(?:\.|,)([0-9]+))?", x)
if not reg: if not reg:
raise ValueError raise ValueError

24
app/templates/base.html
View file

@ -14,6 +14,11 @@
{% endblock head %} {% endblock head %}
</head> </head>
<body class="m-0 p-0 w-full h-screen bg-base-200 flex flex-col"> <body class="m-0 p-0 w-full h-screen bg-base-200 flex flex-col">
{% block aboveNavbar %}
{% endblock aboveNavbar %}
<div class="w-full flex-grow min-h-screen flex flex-col">
<nav class="w-full p-2 flex-none"> <nav class="w-full p-2 flex-none">
<div class="navbar bg-base-100 shadow-sm rounded-md"> <div class="navbar bg-base-100 shadow-sm rounded-md">
<div class="navbar-start"> <div class="navbar-start">
@ -36,21 +41,19 @@
</div> </div>
<ul <ul
tabindex="0" tabindex="0"
class="menu menu-sm dropdown-content bg-base-100 rounded-box z-1 mt-3 w-52 p-2 shadow" class="menu menu-sm dropdown-content bg-base-100 rounded-box z-1 mt-4 w-44 p-2 shadow"
> >
<li><a></a></li> <li><a class="btn btn-soft btn-success w-40 mb-2" href="/new">New wishlist</a></li>
<li> {% block middleNavPhone %}
<a>Parent</a> {% endblock middleNavPhone %}
<ul class="p-2">
<li><a>Submenu 1</a></li>
<li><a>Submenu 2</a></li>
</ul>
</li>
<li><a>Item 3</a></li>
</ul> </ul>
</div> </div>
<a class="btn btn-ghost text-xl" href="/">wishthat</a> <a class="btn btn-ghost text-xl" href="/">wishthat</a>
</div> </div>
<div class="navbar-middle">
{% block middleNav %}
{% endblock middleNav %}
</div>
<div class="navbar-end"> <div class="navbar-end">
<a class="btn btn-soft btn-success hidden lg:inline-flex" href="/new">New wishlist</a> <a class="btn btn-soft btn-success hidden lg:inline-flex" href="/new">New wishlist</a>
</div> </div>
@ -59,5 +62,6 @@
{% block content %} {% block content %}
{% endblock content %} {% endblock content %}
</div>
</body> </body>
</html> </html>

280
app/templates/edit.html
View file

@ -1,91 +1,226 @@
{% set cpath = url_for("edit", id=wishlist.editId) %} {% set cpath = url_for("edit", id=wishlist.editId) %}
{% extends "base.html" %} {% extends "base.html" %}
{% block middleNav %}
<a class="btn btn-soft w-40 hidden lg:inline-flex" href="/view/{{ wishlist.viewId }}">View wishlist</a>
{% endblock middleNav %}
{% block middleNavPhone %}
<li><a class="btn btn-soft w-40" href="/view/{{ wishlist.viewId }}">View wishlist</a></li>
{% endblock middleNavPhone %}
<li><a class="btn btn-soft w-40" href="/view/{{ wishlist.viewId }}">View wishlist</a></li>
{% block content %} {% block content %}
<main class="bg-base-100"> <main class="flex flex-col justify-end sm:justify-center items-center h-screen w-full">
<h1>Edit '{{wishlist.title}}'</h1> <div class="flex flex-col-reverse sm:flex-row rounded-lg border-2 border-base-300 bg-base-100 p-6 shadow-lg w-[34em] max-h-[35em] sm:w-[40em] md:w-[45em] scale-65 sm:scale-90 md:scale-100 ">
<sub>Manage your wishlist details and items</sub> <ul class="menu menu-horizontal sm:menu-vertical w-full sm:w-min rounded-box bg-base-200 flex-none gap-1" id="menu">
<br>
<form action="{{ cpath }}" method="POST">
{{ form_wl_editinfo.hidden_tag() }}
{{ form_wl_editinfo.title.label }}
{{ form_wl_editinfo.title(placeholder=wishlist.title) }}
<!-- <br> -->
{{ form_wl_editinfo.description.label }}
{{ form_wl_editinfo.description(placeholder=wishlist.description) }}
<!-- <br> -->
{{ form_wl_editinfo.wl_edit_submit() }}
</form>
<br>
<h1>Urls</h1>
<ul>
<li> <li>
View: <a href={{ url_for("view", id=wishlist.viewId) }}>{{ wishlist.viewId }}</a> <a class="tooltip tooltip-top sm:tooltip-right" data-tip="Info">
<svg xmlns="http://www.w3.org/2000/svg"
class="h-5 w-5"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
</a>
</li> </li>
<li> <li>
Edit: <a href={{ url_for("edit", id=wishlist.editId) }}>{{ wishlist.editId }}</a> <a class="tooltip tooltip-top sm:tooltip-right" data-tip="Urls">
<svg xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
class="w-5 h-5">
<path fill="currentColor" d="M11 17H7q-2.075 0-3.537-1.463T2 12t1.463-3.537T7 7h4v2H7q-1.25 0-2.125.875T4 12t.875 2.125T7 15h4zm-3-4v-2h8v2zm5 4v-2h4q1.25 0 2.125-.875T20 12t-.875-2.125T17 9h-4V7h4q2.075 0 3.538 1.463T22 12t-1.463 3.538T17 17z" />
</svg>
</a>
</li>
<li>
<a class="tooltip tooltip-top sm:tooltip-right" data-tip="Wishes">
<svg xmlns="http://www.w3.org/2000/svg"
class="w-5 h-5"
viewBox="0 0 24 24">
<path fill="currentColor" d="M4 22V11H2V5h5.2q-.125-.225-.162-.475T7 4q0-1.25.875-2.125T10 1q.575 0 1.075.213T12 1.8q.425-.4.925-.6T14 1q1.25 0 2.125.875T17 4q0 .275-.05.513T16.8 5H22v6h-2v11zM14 3q-.425 0-.712.288T13 4t.288.713T14 5t.713-.288T15 4t-.288-.712T14 3M9 4q0 .425.288.713T10 5t.713-.288T11 4t-.288-.712T10 3t-.712.288T9 4M4 7v2h7V7zm7 13v-9H6v9zm2 0h5v-9h-5zm7-11V7h-7v2z" />
</svg>
</a>
</li>
</ul>
<div class="divider divider-vertical sm:divider-horizontal"></div>
<div class="flex-grow w-full overflow-y-scroll p-2" id="tabs">
<div class="contents">
<!-- INFO -->
<h1 class="text-2xl">Info</h1>
<form action="{{ cpath }}" method="POST">
<!-- {{ form_wl_editinfo.hidden_tag() }} -->
<legend class="fieldset-legend">{{ form_wl_editinfo.title.label.text }}</legend>
{{ form_wl_editinfo.title(placeholder=wishlist.title, class="w-full
input validator mt-1 mb-4") }}
<!-- <br> -->
<legend class="fieldset-legend">{{ form_wl_editinfo.description.label.text }}</legend>
{{ form_wl_editinfo.description(placeholder=wishlist.description,
class="w-full textarea validator mt-1 mb-2") }}
<div class="validator-hint">Please make sure that both inputs are filled.</div>
<!-- <br> -->
<div class="join">
<form action="{{ cpath }}" method="POST" class="contents">
{{ form_wl_delete.hidden_tag() }} {{ form_wl_delete.wl_del_submit(class="btn btn-soft btn-error
join-item w-full") }}
</form>
{{ form_wl_editinfo.wl_edit_submit(class="btn btn-soft btn-success
join-item w-full") }}
</div>
</form>
</div>
<div class="contents">
<!-- URLS -->
<h1 class="text-2xl">Urls</h1>
<ul class="list shadow-sm rounded-md my-4">
<li class="list-row flex items-center">
<svg xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
class="opacity-30 size-[1.8em] flex-none">
<defs>
<mask id="ipSPreviewOpen0">
<g fill="none" stroke-linejoin="round" stroke-width="4">
<path fill="#fff" stroke="#fff" d="M24 36c11.046 0 20-12 20-12s-8.954-12-20-12S4 24 4 24s8.954 12 20 12Z" />
<path fill="#000" stroke="#000" d="M24 29a5 5 0 1 0 0-10a5 5 0 0 0 0 10Z" />
</g>
</mask>
</defs>
<path fill="currentColor" d="M0 0h48v48H0z" mask="url(#ipSPreviewOpen0)" />
</svg>
<p class="flex-grow">{{ wishlist.viewId }}</p>
<a class="btn btn-square btn-ghost flex-none"
href="{{ url_for('view', id=wishlist.viewId) }}">
<svg xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
class="opacity-30 size-[1.8em]">
<path fill="currentColor" d="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h6q.425 0 .713.288T12 4t-.288.713T11 5H5v14h14v-6q0-.425.288-.712T20 12t.713.288T21 13v6q0 .825-.587 1.413T19 21zM19 6.4L10.4 15q-.275.275-.7.275T9 15t-.275-.7t.275-.7L17.6 5H15q-.425 0-.712-.288T14 4t.288-.712T15 3h5q.425 0 .713.288T21 4v5q0 .425-.288.713T20 10t-.712-.288T19 9z" />
</svg>
</a>
</li>
<li class="list-row flex items-center">
<svg xmlns="http://www.w3.org/2000/svg"
width="25"
height="25"
viewBox="0 0 24 24"
class="opacity-30 size-[1.8em] flex-none">
<path fill="currentColor" d="M5 19h1.425L16.2 9.225L14.775 7.8L5 17.575zm-2 2v-4.25L16.2 3.575q.3-.275.663-.425t.762-.15t.775.15t.65.45L20.425 5q.3.275.438.65T21 6.4q0 .4-.137.763t-.438.662L7.25 21zM19 6.4L17.6 5zm-3.525 2.125l-.7-.725L16.2 9.225z" />
</svg>
<p class="flex-grow">{{ wishlist.editId }}</p>
<a class="btn btn-square btn-ghost flex-none"
href='{{ url_for("edit", id=wishlist.editId) }}'>
<svg xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
class="opacity-30 size-[1.8em]">
<path fill="currentColor" d="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h6q.425 0 .713.288T12 4t-.288.713T11 5H5v14h14v-6q0-.425.288-.712T20 12t.713.288T21 13v6q0 .825-.587 1.413T19 21zM19 6.4L10.4 15q-.275.275-.7.275T9 15t-.275-.7t.275-.7L17.6 5H15q-.425 0-.712-.288T14 4t.288-.712T15 3h5q.425 0 .713.288T21 4v5q0 .425-.288.713T20 10t-.712-.288T19 9z" />
</svg>
</a>
</li> </li>
</ul> </ul>
<form action="{{ cpath }}" method="POST"> <form action="{{ cpath }}" method="POST">
{{ form_wl_reseturls.hidden_tag() }} {{ form_wl_reseturls.hidden_tag() }} {{ form_wl_reseturls.wl_reset_submit(class="btn btn-soft btn-warning")
{{ form_wl_reseturls.wl_reset_submit() }} }}
</form> </form>
<br> </div>
<h1>New item</h1> <div class="contents">
<form action="{{ cpath }}" method="POST"> <!-- ITEMS -->
{{ form_it_new.hidden_tag() }} <h1 class="text-xl mb-2">Add/Delete items</h1>
<!-- <br> --> <ul class="list bg-base-100 rounded-md shadow-sm">
{{ form_it_new.it_new_title.label }} <li class="opacity-60 list-row">
{{ form_it_new.it_new_title() }} <span class="flex flex-row items-center font-bold">Create item</span>
<!-- <br> --> <span></span>
{{ form_it_new.description.label }} <span></span>
{{ form_it_new.description() }} <button type="submit"
<!-- <br> --> class="btn btn-square btn-ghost group"
{{ form_it_new.price.label }} onclick="add_item_modal.showModal()">
{{ form_it_new.price() }} <svg class="size-[1.8em] group-hover:fill-white"
<!-- <br> --> xmlns="http://www.w3.org/2000/svg"
{{ form_it_new.url.label }} viewBox="0 0 24 24">
{{ form_it_new.url() }} <path fill="currentColor" d="M11 13v3q0 .425.288.713T12 17t.713-.288T13 16v-3h3q.425 0 .713-.288T17 12t-.288-.712T16 11h-3V8q0-.425-.288-.712T12 7t-.712.288T11 8v3H8q-.425 0-.712.288T7 12t.288.713T8 13zm-6 8q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm0-2h14V5H5zM5 5v14z" />
<!-- <br> --> </svg>
{{ form_it_new.image.label }} </button>
{{ form_it_new.image() }} </li>
<!-- <br> -->
{{ form_it_new.it_new_submit() }}
<button id="scrape">Scrape</button>
</form>
<br>
<h1>Delete items</h1>
{% if wishlist.items|length == 0 %}<p>No items yet</p>{% endif %}
<ul>
{% for value in wishlist.items %} {% for value in wishlist.items %}
<li> <li class="list-row bg-base-100">
<form action="{{ cpath }}" method="POST"> <div>
<img class="size-10 rounded-box" src="{{ value.image }}" />
</div>
<div class="text-lg">{{ value.title }}</div>
<p class="list-col-wrap text-xs">{{ value.description }}</p>
<form action="{{ cpath }}" method="POST" class="contents">
{{ form_it_delete.csrf_token }} {{ form_it_delete.csrf_token }}
{{ form_it_delete.index(value=loop.index) }} {{ form_it_delete.index(value=loop.index) }}
{{ form_it_delete.it_del_submit() }} <button type="submit" class="btn btn-square btn-ghost btn-error group">
<svg class="size-[1.8em] group-hover:fill-white"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24">
<path d="m9.4 16.5l2.6-2.6l2.6 2.6l1.4-1.4l-2.6-2.6L16 9.9l-1.4-1.4l-2.6 2.6l-2.6-2.6L8 9.9l2.6 2.6L8 15.1zM7 21q-.825 0-1.412-.587T5 19V6H4V4h5V3h6v1h5v2h-1v13q0 .825-.587 1.413T17 21zM17 6H7v13h10zM7 6v13z" />
</svg>
</button>
</form> </form>
{{ value.title }}
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
<br> </div>
<h1>Delete wishlist</h1> </div>
<form action="{{ cpath }}" method="POST"> </div>
{{ form_wl_delete.hidden_tag() }} <span></span>
{{ form_wl_delete.wl_del_submit() }}
</form>
<style>
form {
display:grid;
grid-template-columns: max-content max-content;
grid-gap:5px;
}
form label { text-align:right; }
form label:after { content: ":"; }
</style>
</main> </main>
<dialog id="add_item_modal" class="modal">
<div class="modal-box">
<form method="dialog">
<button class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2" id="close">✕</button>
</form>
<h1 class="text-xl font-bold">
Item creation
</h3>
<form action="{{ cpath }}" method="POST">
{{ form_it_new.hidden_tag() }}
<legend class="fieldset-legend">{{ form_it_new.it_new_title.label.text }}</legend>
{{ form_it_new.it_new_title(class="w-full input validator mt-1 mb-4") }}
<!-- <br> -->
<legend class="fieldset-legend">{{ form_it_new.description.label.text }}</legend>
{{ form_it_new.description(class="w-full input validator mt-1 mb-2") }}
<legend class="fieldset-legend">{{ form_it_new.price.label.text }}</legend>
{{ form_it_new.price(class="w-full input validator mt-1 mb-2", pattern="(?:€|$)?\d*(?:,|.)\d*") }}
<legend class="fieldset-legend">{{ form_it_new.url.label.text }}</legend>
{{ form_it_new.url(class="w-full input validator mt-1 mb-2") }}
<legend class="fieldset-legend">{{ form_it_new.image.label.text }}</legend>
{{ form_it_new.image(class="w-full input validator mt-1 mb-2") }}
<div class="validator-hint">Please make sure that both inputs are filled and are valid.</div>
<div class="join modal-actions">
<button class="btn btn-soft join-item sm:w-full" id="scrape">Autofill</button>
{{ form_it_new.it_new_submit(class="btn btn-soft btn-success
join-item sm:w-full") }}
</div>
</form>
</div>
</dialog>
<script> <script>
const $all = (...v) => document.querySelectorAll(...v)
const menu = $all("#menu > li > a")
const tabs = $all("#tabs > div")
const def = 0
let activeMenu = menu[def]
let activeTab = tabs[def]
activeMenu.classList.add("menu-active")
for (let i of Array.from(tabs).filter((_, i) => i != def)) i.classList.add("hidden")
for (let [index, elem] of Object.entries(menu)) {
index = +index
elem.addEventListener("click", e => {
activeMenu.classList.remove("menu-active")
elem.classList.add("menu-active")
activeTab.classList.add("hidden")
tabs[index].classList.remove("hidden")
activeMenu = elem
activeTab = tabs[index]
})
}
const $q = (...i) => document.querySelector(...i); const $q = (...i) => document.querySelector(...i);
const title = $q("#it_new_title") const title = $q("#it_new_title")
const price = $q("#price") const price = $q("#price")
@ -105,8 +240,7 @@
const res = await fetch( const res = await fetch(
"/scrape?" + new URLSearchParams({ "/scrape?" + new URLSearchParams({
url: tUrl url: tUrl
}).toString(), }).toString(), {
{
method: "get", method: "get",
} }
) )
@ -121,5 +255,9 @@
image.value = json.image; image.value = json.image;
price.value = json.price; price.value = json.price;
}) })
$q("#close").addEventListener("click", e => {
$all("dialog > div > form > input").forEach(v => v.value = "")
})
</script> </script>
{% endblock content %} {% endblock content %}

73
app/templates/index.html
View file

@ -1 +1,74 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block aboveNavbar %}
<div
class="hero min-h-screen"
style="background-image: url(https://images.unsplash.com/photo-1558018754-1f1b019ece9d?q=80&w=1227&auto=format&fit=crop&ixlib=rb-4.1.0&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D);"
>
<div class="hero-overlay"></div>
<div class="hero-content text-neutral-content text-center">
<div class="max-w-md">
<h1 class="mb-5 text-5xl font-bold">Hello there</h1>
<p class="mb-5">
Welcome to WishThat. The place to create and share wishlists online.
</p>
<button class="btn btn-primary" onclick="content.scrollIntoView({ behavior: 'smooth', block: 'end' })">Learn more</button>
</div>
</div>
</div>
{% endblock aboveNavbar %}
{% block content %}
<main class="w-full h-full px-20 pt-5 flex flex-col" id="content">
<h2 class="text-3xl font-bold mb-5">Why Use Wishthat?</h2>
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
<div class="card bg-base-100 shadow-md flex flex-col">
<div class="card-body">
<h3 class="card-title">Avoid Duplicate Purchases</h3>
<p>Our system helps you keep track of what has been purchased, ensuring that you don't buy the same item twice.</p>
</div>
</div>
<div class="card bg-base-100 shadow-md flex flex-col">
<div class="card-body">
<h3 class="card-title">No Account Needed</h3>
<p>Start creating wishlists immediately without the hassle of signing up or logging in.</p>
</div>
</div>
<div class="card bg-base-100 shadow-md flex flex-col">
<div class="card-body">
<h3 class="card-title">Price and Image Scraping</h3>
<p>We scrape websites for the latest prices and images, making sure you don't have to painstakingly create wish items manually!</p>
</div>
</div>
<div class="card bg-base-100 shadow-md flex flex-col">
<div class="card-body">
<h3 class="card-title">Easy to Use</h3>
<p>Our user-friendly interface allows you to create and manage your wishlists effortlessly.</p>
</div>
</div>
<div class="card bg-base-100 shadow-md flex flex-col">
<div class="card-body">
<h3 class="card-title">Fully Open Source</h3>
<p>Wishthat is fully open-source and FOSS, allowing anyone to check our security.</p>
</div>
</div>
<div class="card bg-base-100 shadow-md flex flex-col">
<div class="card-body">
<h3 class="card-title">Mobile friendly design</h3>
<p>The software has been designed with mobile friendlyness in mind. Meaning that your phone addicted friends may enjoy this site as well.</p>
</div>
</div>
</div>
<span class="flex-grow"></span>
<footer class="footer footer-center p-10 bg-base-100 text-base-content">
<div>
<p>© 2025 jsw. All rights reserved.</p>
</div>
</footer>
</main>
{% endblock content %}

91
app/templates/view.html
View file

@ -1,50 +1,76 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<main class="w-full h-full min-h-0 px-20 pt-5 overflow-y-scroll">
<!-- Wishlist Title Card -->
<div class="w-full bg-base-100 p-5 rounded-lg shadow-md mb-5">
<h1 class="text-2xl font-bold">{{wishlist.title}}</h1>
<p class="text-gray-600">{{wishlist.description}}</p>
</div>
<h1>{{wishlist.title}}</h1> <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-6 overflow-y-scroll mb-5">
<sub>{{wishlist.description}}</sub>
<a href="{{url_for('edit', id=wishlist.editId)}}">edit</a>
<ul>
{% if wishlist.items|length == 0 %}
<p>No items yet</p>
{% endif %}
{% for item in wishlist.items %} {% for item in wishlist.items %}
<li> <div class="card bg-base-100 image-full shadow-md h-full flex flex-col">
<form method="POST" href="{{ url_for("view", id=wishlist.editId) }}"> <figure class="flex-grow">
<img
src="{{item.image}}"
alt="{{ item.title }}"
class="object-cover h-full w-full rounded-t-lg" />
</figure>
<div class="card-body flex flex-col flex-grow">
<h2 class="card-title">{{ item.title }}</h2>
<p class="flex-grow">{{ item.description }}</p>
<div class="card-actions justify-end">
<div class="{{ "join" if not item.bought }}"><a class="btn btn-soft {{ "join-item" if not item.bought }}" href="{{ item.url }}" {{ "hidden" if item.bought }}>{{ "€" ~ item.price if not item.bought }}</a>
<form method="POST" action="{{ url_for('view', id=wishlist.viewId) }}" class="contents">
<button class="buy btn btn-soft btn-primary {{ "join-item" if not item.bought }}" {{ "disabled" if item.bought }}>{{ "Reserved" if item.bought else "Reserve" }}</button>
{{ form.csrf_token }} {{ form.csrf_token }}
{{ form.num(value = loop.index) }} {{ form.num(value=loop.index) }}
</form></div>
<input type=checkbox {{ "checked disabled" if item.bought}}> </div>
{{ item.title }}: {{ item.description }} </div>
</form> </div>
</li>
{% endfor %} {% endfor %}
</ul> </div>
</main>
<dialog>
<p>Are you sure you bought this product. You won't be able to undo this.</p> <dialog class="modal">
<form method="dialog"> <div class="modal-box">
<button id="dialog-confirm-ok">OK</button> <h3 class="text-lg font-bold">Important!</h3>
<button id="dialog-confirm-no">Close</button> <p class="py-4">Are you sure you bought this product? You won't be able to undo this.</p>
<div class="modal-action">
<form method="dialog" class="join">
<button id="dialog-confirm-no" class="btn btn-soft join-item">Close</button>
<button id="dialog-confirm-ok" class="btn btn-soft btn-primary join-item">OK</button>
</form> </form>
</div>
</div>
</dialog>
<dialog class="modal" {{ "open" if wishlist.items|length < 1 }}>
<div class="modal-box">
<h3 class="text-lg font-bold">Still empty!</h3>
<p class="py-4">Hi there. It seems like you are here a bit too early, the wishlist is still empty. Please come back later.</p>
<div class="modal-action">
<form method="dialog">
<a class="btn" href="/">Go back</a>
</form>
</div>
</div>
</dialog> </dialog>
<script> <script>
const $ = (...f) => document.querySelector(...f); const $ = (...f) => document.querySelector(...f);
const $all = (...f) => document.querySelectorAll(...f); const $all = (...f) => document.querySelectorAll(...f);
const items = Array.from($all("input[type=checkbox]")); const items = Array.from($all(".buy"));
const dialog = $("dialog") const dialog = $("dialog");
const dialogOk = $("#dialog-confirm-ok") const dialogOk = $("#dialog-confirm-ok");
const dialogNo = $("#dialog-confirm-no") const dialogNo = $("#dialog-confirm-no");
for (let checkbox of items) { for (let button of items) {
checkbox.addEventListener("click", e => { button.addEventListener("click", e => {
e.preventDefault(); e.preventDefault();
const onclick = () => checkbox.form.submit(); const onclick = () => button.form.submit();
dialogOk.addEventListener("click", onclick); dialogOk.addEventListener("click", onclick);
dialogNo.addEventListener( dialogNo.addEventListener(
@ -52,11 +78,8 @@
() => dialogOk.removeEventListener("click", onclick) () => dialogOk.removeEventListener("click", onclick)
); );
console.log(dialog)
dialog.show(); dialog.show();
}); });
} }
</script> </script>
{% endblock content %} {% endblock content %}

3
app/views.py
View file

@ -85,6 +85,7 @@ def edit(id: str):
return redirect(url_for("edit", id=wishlist.editId)) return redirect(url_for("edit", id=wishlist.editId))
elif form_it_new.validate_on_submit() and form_it_new.it_new_submit.data: elif form_it_new.validate_on_submit() and form_it_new.it_new_submit.data:
print("NEW")
f = form_it_new f = form_it_new
price = f.price.data if f.price.data != None else 0 price = f.price.data if f.price.data != None else 0
@ -107,7 +108,7 @@ def edit(id: str):
db.session.commit() db.session.commit()
return redirect(url_for("edit", id=id)) return redirect(url_for("edit", id=id))
elif form_it_delete.validate_on_submit() and form_it_delete.it_del_submit.data: elif form_it_delete.validate_on_submit() and form_it_delete.index.data:
index = parseHiddenIndex(form_it_delete.index, wishlist.items) index = parseHiddenIndex(form_it_delete.index, wishlist.items)
if index == None: if index == None:
return abort(400) return abort(400)

BIN
instance/application.db
View file

Binary file not shown.