Skip to content

Commit

Permalink
animations for filters on map
Browse files Browse the repository at this point in the history
  • Loading branch information
@AntoineF4C5
AntoineF4C5 committed Mar 16, 2024
1 parent 55de405 commit 02b43b8
Show file tree
Hide file tree
Showing 3 changed files with 171 additions and 123 deletions.
5 changes: 4 additions & 1 deletion pkg/event/event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,11 @@ func CreateEvent(conn *clover.DB, event Event) error {
return err
}

message := fmt.Sprintf("Alert: Un nouvel évènement de type %s a été signalé près de vous", event.MapObject.Category)
message := fmt.Sprintf("Alerte: Un nouvel évènement de type %s a été signalé près de vous", event.MapObject.Category)
err = notifications.NotifyNearby(conn, message, event.MapObject.Geometry)
if err != nil {
return err
}

return nil
}
Expand Down
182 changes: 111 additions & 71 deletions templates/components/navbar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
align-items: center;
height: 4vh;
}
.munis-navbar .munis-navbar-item:hover, .munis-navbar .munis-navbar-button:hover {

.munis-navbar .munis-navbar-item:hover,
.munis-navbar .munis-navbar-button:hover {
border-radius: 10px;
}

.w3-bar .navbar-right {
display: flex;
align-items: center;
Expand All @@ -18,81 +21,118 @@

<base href="/">
<div x-data="{ mobile: mobileCheck(), sidebar: false }">
<nav class="w3-bar w3-dark-grey munis-navbar" style="align-items: center;" x-show="!mobile" x-cloak>
<div style="display: flex; align-items: center;" class="w3-mobile">
<div href="/" class="w3-bar-item munis-navbar-item w3-mobile" style="display: flex; align-items: center;">
<img src="static/logo-white.png" alt="Logo" style="height:40px;">
<span style="margin-left: 10px;margin-right:20px; font-family: 'Roboto', sans-serif; font-size: 24px; font-weight: 700;">Munis</span>
</a>
<a href="/map" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Carte</a>
<a href="/grid" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Grille évènement/aide</a>
<div class="w3-dropdown-hover w3-mobile">
<button class="w3-button munis-navbar-button">Modération<i class="fa fa-caret-down"></i></button>
<div class="w3-dropdown-content w3-bar-block w3-dark-grey" style="z-index:999999999999">
<a href="/events/table" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Tableau d'évènements</a>
<a href="/helps/table" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Tableau d'aide</a>
<nav class="w3-bar w3-dark-grey munis-navbar" style="align-items: center;" x-show="!mobile" x-cloak>
<div style="display: flex; align-items: center;" class="w3-mobile">
<div href="/" class="w3-bar-item munis-navbar-item w3-mobile" style="display: flex; align-items: center;">
<img src="static/logo-white.png" alt="Logo" style="height:40px;">
<span
style="margin-left: 10px;margin-right:20px; font-family: 'Roboto', sans-serif; font-size: 24px; font-weight: 700;">Munis</span>
</a>
<a href="/map" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Carte</a>
<a href="/grid" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Grille
évènement/aide</a>
<div class="w3-dropdown-hover w3-mobile">
<button class="w3-button munis-navbar-button">Modération<i class="fa fa-caret-down"></i></button>
<div class="w3-dropdown-content w3-bar-block w3-dark-grey" style="z-index:999999999999">
<a href="/events/table"
class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Tableau
d'évènements</a>
<a href="/helps/table"
class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Tableau
d'aide</a>
</div>
</div>
<a href="/a-propos" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">À
propos</a>
</div>
</div>
<a href="/a-propos" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">À propos</a>
</div>

<div class="topnav-right">
{{ if .ActiveSession }}
<form action="/logout" method="post" style="display: inline;">
<button type="submit" class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Se déconnecter</button>
</form>
<a href="/manage-post" class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Bonjour, {{ .UserName }} !</a>
{{ else if .SigningUp }}
<a href="/login" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-margin-right w3-right w3-mobile">Se connecter</a>
<span class="w3-bar-item munis-navbar-item w3-right w3-margin-right w3-mobile">Déjà inscrit ?</span>
{{ else if .LoggingIn }}
<a href="/create-account" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-right w3-mobile">Créer un compte</a>
<span class="w3-bar-item munis-navbar-item w3-right w3-margin-right w3-mobile">Pas encore de compte ?</span>
{{ else }}
<a href="/login" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-right w3-mobile">Se connecter</a>
<a href="/create-account" class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Créer un compte</a>
{{ end }}
</div>
</nav>
<div class="topnav-right">
{{ if .ActiveSession }}
<form action="/logout" method="post" style="display: inline;">
<button type="submit"
class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Se
déconnecter</button>
</form>
<a href="/manage-post"
class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Bonjour,
{{ .UserName }} !</a>
{{ else if .SigningUp }}
<a href="/login"
class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-margin-right w3-right w3-mobile">Se
connecter</a>
<span class="w3-bar-item munis-navbar-item w3-right w3-margin-right w3-mobile">Déjà inscrit ?</span>
{{ else if .LoggingIn }}
<a href="/create-account"
class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-right w3-mobile">Créer un
compte</a>
<span class="w3-bar-item munis-navbar-item w3-right w3-margin-right w3-mobile">Pas encore de compte
?</span>
{{ else }}
<a href="/login"
class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-right w3-mobile">Se
connecter</a>
<a href="/create-account"
class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Créer
un compte</a>
{{ end }}
</div>
</nav>

<nav class="w3-bar w3-dark-grey" style="align-items: center;" x-show="mobile" x-cloak>
<div style="display: flex;" class="w3-mobile">
<button class="w3-button munis-navbar-button w3-large" @click="sidebar = !sidebar">&#9776;</button>
<div class="w3-bar-item munis-navbar-item w3-mobile" style="display: flex; align-items: center;">
<img src="static/logo-white.png" alt="Logo" style="height:40px;">
<span style="margin-left: 10px; font-family: 'Roboto', sans-serif; font-size: 24px; font-weight: 700;">Munis</span>
<nav class="w3-bar w3-dark-grey" style="align-items: center;" x-show="mobile" x-cloak>
<div style="display: flex;" class="w3-mobile">
<button class="w3-button munis-navbar-button w3-large" @click="sidebar = !sidebar">&#9776;</button>
<div class="w3-bar-item munis-navbar-item w3-mobile" style="display: flex; align-items: center;">
<img src="static/logo-white.png" alt="Logo" style="height:40px;">
<span
style="margin-left: 10px; font-family: 'Roboto', sans-serif; font-size: 24px; font-weight: 700;">Munis</span>
</div>
</div>
</div>
</nav>
<div class="w3-sidebar w3-bar-block" style="width:70%;z-index: 99999;" x-show="mobile && sidebar">
<a href="/map" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Carte</a>
<a href="/grid" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Grille évènement/aide</a>
<a href="/a-propos" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">À propos</a>
<div class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile" x-data="{dropdown: false}">
<button class="w3-button munis-navbar-button w3-mobile w3-bar-item" @click="dropdown = !dropdown">Modération</button>
<div x-show="dropdown">
<a href="/events/table" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Tableau d'évènements</a>
<a href="/helps/table" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Tableau d'aide</a>
</nav>
<div class="w3-sidebar w3-bar-block" style="width:70%;z-index: 99999;" x-show="mobile && sidebar">
<a href="/map" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Carte</a>
<a href="/grid" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Grille
évènement/aide</a>
<a href="/a-propos" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">À propos</a>
<div class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile" x-data="{dropdown: false}">
<button class="w3-button munis-navbar-button w3-mobile w3-bar-item"
@click="dropdown = !dropdown">Modération</button>
<div x-show="dropdown">
<a href="/events/table"
class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Tableau
d'évènements</a>
<a href="/helps/table"
class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-mobile">Tableau d'aide</a>
</div>
</div>
<div class="topnav-right">
{{ if .ActiveSession }}
<form action="/logout" method="post" style="display: inline;">
<button type="submit"
class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Se
déconnecter</button>
</form>
<a href="/manage-post"
class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Bonjour,
{{ .UserName }} !</a>
{{ else if .SigningUp }}
<a href="/login"
class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-margin-right w3-right w3-mobile">Se
connecter</a>
<span class="w3-bar-item munis-navbar-item w3-right w3-margin-right w3-mobile">Déjà inscrit ?</span>
{{ else if .LoggingIn }}
<a href="/create-account"
class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-right w3-mobile">Créer un
compte</a>
<span class="w3-bar-item munis-navbar-item w3-right w3-margin-right w3-mobile">Pas encore de compte ?</span>
{{ else }}
<a href="/login" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-right w3-mobile">Se
connecter</a>
<a href="/create-account"
class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Créer
un compte</a>
{{ end }}
</div>
</div>
<div class="topnav-right">
{{ if .ActiveSession }}
<form action="/logout" method="post" style="display: inline;">
<button type="submit" class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Se déconnecter</button>
</form>
<a href="/manage-post" class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Bonjour, {{ .UserName }} !</a>
{{ else if .SigningUp }}
<a href="/login" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-margin-right w3-right w3-mobile">Se connecter</a>
<span class="w3-bar-item munis-navbar-item w3-right w3-margin-right w3-mobile">Déjà inscrit ?</span>
{{ else if .LoggingIn }}
<a href="/create-account" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-right w3-mobile">Créer un compte</a>
<span class="w3-bar-item munis-navbar-item w3-right w3-margin-right w3-mobile">Pas encore de compte ?</span>
{{ else }}
<a href="/login" class="w3-bar-item munis-navbar-item w3-button munis-navbar-button w3-right w3-mobile">Se connecter</a>
<a href="/create-account" class="w3-bar-item munis-navbar-item w3-margin-right w3-button munis-navbar-button w3-right w3-mobile">Créer un compte</a>
{{ end }}
</div>
</div>
</div>
</base>
{{ end }}
{{ end }}
Loading

0 comments on commit 02b43b8

Please sign in to comment.