Skip to content
Snippets Groups Projects
Commit bf1de7d6 authored by user's avatar user
Browse files

Merge branch 'main' of https://github.com/MohcineProject/Wishlist-application

parents 8c7cda62 54404884
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/Controller/WishlistController.php
+ 20
− 11
View file @ bf1de7d6
...@@ -17,8 +17,11 @@ final class WishlistController extends AbstractController ...@@ -17,8 +17,11 @@ final class WishlistController extends AbstractController
#[Route(name: 'app_wishlist_index', methods: ['GET'])] #[Route(name: 'app_wishlist_index', methods: ['GET'])]
public function getWishLists(WishlistRepository $wishlistRepository): Response public function getWishLists(WishlistRepository $wishlistRepository): Response
{ {
$user = $this->getUser() ;
return $this->render('wishlist/index.html.twig', [ return $this->render('wishlist/index.html.twig', [
'wishlists' => $wishlistRepository->findAll(), 'wishlists' => $user->getWishlists()->toArray()
]); ]);
} }
...@@ -26,15 +29,7 @@ final class WishlistController extends AbstractController ...@@ -26,15 +29,7 @@ final class WishlistController extends AbstractController
public function createWishlist(Request $request, EntityManagerInterface $entityManager): Response public function createWishlist(Request $request, EntityManagerInterface $entityManager): Response
{ {
$wishlist = new Wishlist(); $wishlist = new Wishlist();
$name = $request->get(key: 'name'); $form = $this->createForm(WishlistType::class, $wishlist);
$wishlist->setName(name: $name);
$deadline = $request->get('deadline') ;
$wishlist->setDeadline($deadline);
$entityManager->persist($wishlist);
$entityManager->flush();
return new Response('wishlist created successfully', Response::HTTP_CREATED) ;
/* $form = $this->createForm(WishlistType::class, $wishlist);
$form->handleRequest($request); $form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) { if ($form->isSubmitted() && $form->isValid()) {
...@@ -47,7 +42,9 @@ final class WishlistController extends AbstractController ...@@ -47,7 +42,9 @@ final class WishlistController extends AbstractController
return $this->render('wishlist/new.html.twig', [ return $this->render('wishlist/new.html.twig', [
'wishlist' => $wishlist, 'wishlist' => $wishlist,
'form' => $form, 'form' => $form,
]); */ ]);
} }
#[Route('/{id}', name: 'app_wishlist_show', methods: ['GET'])] #[Route('/{id}', name: 'app_wishlist_show', methods: ['GET'])]
...@@ -94,3 +91,15 @@ final class WishlistController extends AbstractController ...@@ -94,3 +91,15 @@ final class WishlistController extends AbstractController
} }
/*
$wishlist = new Wishlist();
$name = $request->get(key: 'name');
$wishlist->setName(name: $name);
$deadline = $request->get('deadline') ;
$wishlist->setDeadline($deadline);
$this->getUser()->addToAuthorWhishlists($wishlist);
$entityManager->persist($wishlist);
$entityManager->persist($this->getUser()) ;
$entityManager->flush(); */
\ No newline at end of file
src/Entity/User.php
+ 5
− 0
View file @ bf1de7d6
...@@ -164,6 +164,11 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface ...@@ -164,6 +164,11 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
return $this->wishlists; return $this->wishlists;
} }
public function addToAuthorWhishlists(Wishlists $wishlist){
if (!$this->wishlists->contains($wishlist)) {
$this->wishlists[] = $wishlist;
}
}
// public function getInvitations(): Collection // public function getInvitations(): Collection
// { // {
// return $this->invitations; // return $this->invitations;
......
templates/wishlist/index.html.twig
+ 26
− 205
View file @ bf1de7d6
{% extends 'base.html.twig' %}
{% block title %}My Wishlists{% endblock %} {% extends 'base.html.twig' %}
{% block body %} {% block title %} My Wishlists {% endblock %}
<header>
<div class="user-icon"></div>
<h1>My Wishlists</h1>
<input type="text" class="search-bar" placeholder="Search...">
</header>
<div class="navbar">
<button class="add-wishlist-btn" data-bs-toggle="modal" data-bs-target="#createWishlistModal">Add wishlist</button>
</div>
<!-- Create Wishlist Modal --> {% block body %}
<div class="modal fade" id="createWishlistModal" tabindex="-1" aria-labelledby="createWishlistModalLabel" aria-hidden="true"> <header>
<div class="modal-dialog"> <div class="user-icon"></div>
<div class="modal-content"> <h1>My Wishlists</h1>
<div class="modal-header"> <input type="text" class="search-bar" placeholder="Search...">
<h5 class="modal-title" id="createWishlistModalLabel">Create New Wishlist</h5> </header>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> <div class="navbar">
<div class="modal-body"> <button class="add-wishlist-btn">Add wishlist</button>
<form id="createWishlistForm">
<div class="mb-3">
<label for="wishlistName" class="form-label">Name*</label>
<input type="text" class="form-control" id="wishlistName" required>
</div>
<div class="mb-3">
<label for="wishlistDeadline" class="form-label">Deadline</label>
<input type="datetime-local" class="form-control" id="wishlistDeadline">
</div>
<div class="mb-3 form-check">
<input type="checkbox" class="form-check-input" id="wishlistIsDisabled">
<label class="form-check-label" for="wishlistIsDisabled">Disabled</label>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="submitWishlist">Create</button>
</div>
</div>
</div> </div>
</div>
<div class="container">
<div class="container"> {% for wishlist in wishlists %}
{% for wishlist in wishlists %} <div class="wishlist">
<div class="wishlist {% if wishlist.isDisabled %}wishlist-disabled{% endif %}"> <h2>{{ wishlist.title }}</h2>
<div class="wishlist-header"> <div class="wishlist-items">
<h2>{{ wishlist.name }}</h2>
{% if wishlist.deadline %}
<span class="deadline-badge">
Due: {{ wishlist.deadline|date('Y-m-d H:i') }}
{% if wishlist.deadline|date('U') < 'now'|date('U') %}
<span class="deadline-passed">(Passed)</span>
{% endif %}
</span>
{% endif %}
{% if wishlist.isDisabled %}
<span class="disabled-badge">Disabled</span>
{% endif %}
</div>
<div class="wishlist-items">
{% for item in wishlist.items %} {% for item in wishlist.items %}
<div class="wishlist-item">📷</div> <div class="wishlist-item">📷</div>
{% endfor %} {% endfor %}
</div>
<p class="wishlist-footer">Authors: name1, name2</p>
<div class="wishlist-actions">
<button title="Share wishlist">↗</button>
<button title="Edit title">✏</button>
<button title="Delete wishlist">🗑</button>
</div>
</div> </div>
<p class="wishlist-footer">Authors: name1, name2</p> {% end for %}
<div class="wishlist-actions">
<button title="Share wishlist">↗</button>
<button title="Edit wishlist">✏</button>
<button title="Delete wishlist">🗑</button>
</div>
</div> </div>
{% endfor %} {% endblock %}
</div>
{% endblock %}
{% block javascripts %}
{{ parent() }}
<script>
document.addEventListener('DOMContentLoaded', function() {
document.getElementById('submitWishlist').addEventListener('click', function() {
const name = document.getElementById('wishlistName').value;
const deadline = document.getElementById('wishlistDeadline').value;
const isDisabled = document.getElementById('wishlistIsDisabled').checked;
if (!name) {
alert('Please enter a name for your wishlist');
return;
}
fetch('/wishlists/create', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-Requested-With': 'XMLHttpRequest'
},
body: JSON.stringify({
name: name,
deadline: deadline,
isDisabled: isDisabled
})
})
.then(response => response.json())
.then(data => {
if (data.success) {
bootstrap.Modal.getInstance(document.getElementById('createWishlistModal')).hide();
window.location.reload();
} else {
alert('Error creating wishlist: ' + data.message);
}
})
.catch(error => {
console.error('Error:', error);
alert('An error occurred while creating the wishlist');
});
});
});
</script>
{% endblock %}
{% block stylesheets %}
{{ parent() }}
<style>
.wishlist {
border: 1px solid #ddd;
border-radius: 8px;
padding: 15px;
margin-bottom: 20px;
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
position: relative;
}
.wishlist-disabled {
opacity: 0.7;
background-color: #f8f9fa;
}
.wishlist-header {
display: flex;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
gap: 10px;
margin-bottom: 10px;
}
.deadline-badge {
background: #e9ecef;
padding: 3px 8px;
border-radius: 4px;
font-size: 0.9em;
}
.deadline-passed {
color: #dc3545;
font-weight: bold;
}
.disabled-badge {
background: #6c757d;
color: white;
padding: 3px 8px;
border-radius: 4px;
font-size: 0.9em;
}
.wishlist-items {
display: flex;
flex-wrap: wrap;
gap: 10px;
margin: 15px 0;
}
.wishlist-item {
width: 60px;
height: 60px;
background: #f5f5f5;
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
font-size: 24px;
}
.wishlist-actions {
display: flex;
gap: 10px;
justify-content: flex-end;
}
.wishlist-actions button {
background: none;
border: none;
cursor: pointer;
font-size: 18px;
}
.add-wishlist-btn {
background-color: #4CAF50;
color: white;
border: none;
padding: 10px 15px;
border-radius: 4px;
cursor: pointer;
}
.add-wishlist-btn:hover {
background-color: #45a049;
}
</style>
{% endblock %}
\ No newline at end of file
templates/wishlist/new.html.twig
+ 93
− 5
View file @ bf1de7d6
{# templates/wishlist/new.html.twig #}
{% extends 'base.html.twig' %} {% extends 'base.html.twig' %}
{% block title %}New Wishlist{% endblock %} {% block title %}Create New Wishlist{% endblock %}
{% block stylesheets %}
{{ parent() }}
<style>
.wishlist-form {
max-width: 600px;
margin: 0 auto;
padding: 20px;
background-color: #f8f9fa;
border-radius: 8px;
box-shadow: 0 0 10px rgba(0,0,0,0.1);
}
.form-group {
margin-bottom: 1.5rem;
}
.form-label {
display: block;
margin-bottom: 0.5rem;
font-weight: bold;
}
.form-control {
width: 100%;
padding: 0.5rem;
border: 1px solid #ced4da;
border-radius: 4px;
font-size: 1rem;
}
.form-check {
display: flex;
align-items: center;
margin-top: 1rem;
}
.form-check-input {
margin-right: 0.5rem;
}
.btn {
padding: 0.5rem 1rem;
border-radius: 4px;
cursor: pointer;
font-size: 1rem;
}
.btn-primary {
background-color: #007bff;
color: white;
border: none;
}
.btn-primary:hover {
background-color: #0069d9;
}
.form-help {
font-size: 0.8rem;
color: #6c757d;
margin-top: 0.25rem;
}
.error-message {
color: #dc3545;
font-size: 0.875rem;
margin-top: 0.25rem;
}
</style>
{% endblock %}
{% block body %} {% block body %}
<h1>Create new Wishlist</h1> <div class="container">
<h1 class="my-4">Create New Wishlist</h1>
{{ form_start(form, {'attr': {'class': 'wishlist-form'}}) }}
<div class="form-group">
{{ form_label(form.name) }}
{{ form_widget(form.name, {'attr': {'class': 'form-control'}}) }}
{{ form_errors(form.name) }}
<small class="form-help">Give your wishlist a descriptive name</small>
</div>
{{ include('wishlist/_form.html.twig') }} <div class="form-group">
{{ form_label(form.deadline) }}
{{ form_widget(form.deadline, {'attr': {'class': 'form-control'}}) }}
{{ form_errors(form.deadline) }}
<small class="form-help">Optional - set a deadline for this wishlist</small>
</div>
<a href="{{ path('app_wishlist_index') }}">back to list</a> <div class="form-check">
{% endblock %} {{ form_widget(form.isDisabled, {'attr': {'class': 'form-check-input'}}) }}
{{ form_label(form.isDisabled) }}
{{ form_errors(form.isDisabled) }}
</div>
<small class="form-help">Disabled wishlists won't be visible to others</small>
<div class="form-group mt-4">
<button type="submit" class="btn btn-primary">Create Wishlist</button>
<a href="{{ path('wishlist_index') }}" class="btn btn-secondary ml-2">Cancel</a>
</div>
{{ form_end(form) }}
</div>
{% endblock %}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment