Compare commits

..

No commits in common. "f8c0bcc1917c6efdf2d467ace0918a4a220a234b" and "67a6c7d8dcb5f9dc8f080e7c44badffa7be523e0" have entirely different histories.

8 changed files with 9 additions and 88 deletions

View file

@ -2,56 +2,13 @@ import { Controller } from '@hotwired/stimulus';
import L from 'leaflet';
import 'leaflet/dist/leaflet.min.css';
L.Icon.Default.mergeOptions({
iconUrl: '/leaflet/marker-icon.png',
iconRetinaUrl: '/leaflet/marker-icon-2x.png',
shadowUrl: '/leaflet/marker-shadow.png',
});
export default class extends Controller {
connect() {
this.map = L.map(this.element).setView([51.0543, 3.7174], 13);
const map = L.map(this.element).setView([51.0543, 3.7174], 13);
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '© OpenStreetMap contributors',
maxZoom: 19,
}).addTo(this.map);
this.loadSubjects();
this.map.on('click', (e) => this.createSubject(e.latlng));
}
loadSubjects() {
fetch('/api/subjects')
.then(r => r.json())
.then(data => {
data.payload.subjects.forEach(s => {
if (s.latitude && s.longitude) {
this.addMarker(s.latitude, s.longitude, s.name);
}
});
});
}
createSubject(latlng) {
const name = prompt('Name of this place?');
if (!name) return;
fetch('/api/subjects', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
name: name,
latitude: latlng.lat,
longitude: latlng.lng,
}),
})
.then(r => r.json())
.then(() => this.addMarker(latlng.lat, latlng.lng, name));
}
addMarker(lat, lng, name) {
L.marker([lat, lng]).addTo(this.map).bindPopup(name);
}).addTo(map);
}
}

View file

@ -19,11 +19,7 @@ security:
main:
lazy: true
provider: app_user_provider
form_login:
login_path: app_login
check_path: app_login
logout:
path: app_logout
# Activate different ways to authenticate:
# https://symfony.com/doc/current/security.html#the-firewall
@ -32,9 +28,8 @@ security:
# Note: Only the *first* matching rule is applied
access_control:
- {path: ^/account/login, roles: PUBLIC_ACCESS}
- {path: ^/account/register, roles: PUBLIC_ACCESS}
- {path: ^/, roles: ROLE_USER}
# - { path: ^/admin, roles: ROLE_ADMIN }
# - { path: ^/profile, roles: ROLE_USER }
when@test:
security:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 618 B

View file

@ -16,7 +16,7 @@ use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
class AccountController extends AbstractController
{
#[Route('/account/login', name: 'app_login')]
#[Route('/account/login')]
public function login(AuthenticationUtils $authUtils): Response
{
$error = $authUtils->getLastAuthenticationError();
@ -28,7 +28,7 @@ class AccountController extends AbstractController
]);
}
#[Route('/account/register', name: 'app_register')]
#[Route('/account/register')]
public function register(
Request $request,
UserPasswordHasherInterface $passwordHasher,
@ -58,17 +58,11 @@ class AccountController extends AbstractController
$em->persist($user);
$em->flush();
return $this->redirectToRoute('app_login');
return $this->redirectToRoute('app_account_login');
}
return $this->render('account/register.html.twig', [
'form' => $form,
]);
}
#[Route('/account/logout', name: 'app_logout')]
public function logout(): void
{
throw new \LogicException('This should never be reached.');
}
}

View file

@ -5,12 +5,10 @@ namespace App\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Security\Http\Attribute\IsGranted;
class IndexController extends AbstractController
{
#[Route('/')]
#[IsGranted('ROLE_USER')]
public function index(): Response
{
return $this->render('index/page.html.twig');

View file

@ -1,23 +0,0 @@
{% extends 'base.html.twig' %}
{% block body %}
<h1>Log in</h1>
{% if error %}
<div>{{ error.messageKey|trans(error.messageData, 'security') }}</div>
{% endif %}
<form method="post">
<label for="email">Email</label>
<input type="email" id="email" name="_username" value="{{ last_username }}">
<label for="password">Password</label>
<input type="password" id="password" name="_password">
<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}">
<button type="submit">Log in</button>
</form>
<p>No account yet? <a href="{{ path('app_register') }}">Register</a></p>
{% endblock %}