Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make map more readable on mobile + some css styling #757

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f92be97
make map more readable on mobile + some css styling
ratte1303 Jul 5, 2024
12894b5
Diverse Anpassungen
ratte1303 Jul 5, 2024
b5ad7fb
dependencies updated
ratte1303 Jul 5, 2024
6be06d0
More Event-Lists in GroupView based on category
ratte1303 Jul 5, 2024
9d0b56f
Group Page Improvements
ratte1303 Jul 5, 2024
1c11536
MapLibre implementation and minor changes
ratte1303 Jul 6, 2024
a1446d8
remove wheel scroll
ratte1303 Jul 6, 2024
57e242e
change of default event options
ratte1303 Jul 8, 2024
b57892f
change of default event creation settings
ratte1303 Jul 10, 2024
704ee2a
minor changes
ratte1303 Jul 10, 2024
bbf9785
groupview improvements
ratte1303 Jul 12, 2024
f45aa6f
no agenda on HomeView
ratte1303 Jul 13, 2024
bea7ac3
moved number of participants above Participate button
ratte1303 Jul 13, 2024
61d7257
GroupView Improvements
ratte1303 Jul 13, 2024
96dd92d
Share buttons in event sidebar
ratte1303 Jul 13, 2024
ed13233
Share buttons in event sidebar
ratte1303 Jul 13, 2024
e215a4d
Group Page improvements
ratte1303 Jul 13, 2024
dbb54e0
minor changes
ratte1303 Jul 14, 2024
62ff007
minor changes
ratte1303 Jul 14, 2024
c46987b
EventActionSection and EventView Anpassungen
ratte1303 Aug 25, 2024
b9aea3b
Merge remote-tracking branch 'mobilizon_main/main'
ratte1303 Aug 28, 2024
de940bd
update
ratte1303 Sep 15, 2024
3a7ede9
update
ratte1303 Sep 15, 2024
aa8d06d
update
ratte1303 Sep 15, 2024
6d42439
merge (#2)
ratte1303 Sep 15, 2024
61b8d44
Merge branch 'framasoft:main' into main
ratte1303 Sep 15, 2024
11694ee
removed conversation error note
ratte1303 Sep 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 42 additions & 126 deletions lib/mobilizon/events/categories.ex
Original file line number Diff line number Diff line change
Expand Up @@ -25,136 +25,52 @@ defmodule Mobilizon.Events.Categories do
end
end

defp build_in_categories do
[
%{
id: :arts,
label: gettext("Arts")
},
%{
id: :book_clubs,
label: gettext("Book clubs")
},
%{
id: :business,
label: gettext("Business")
},
%{
id: :causes,
label: gettext("Causes")
},
%{
id: :comedy,
label: gettext("Comedy")
},
%{
id: :crafts,
label: gettext("Crafts")
},
%{
id: :food_drink,
label: gettext("Food & Drink")
},
%{
id: :health,
label: gettext("Health")
},
%{
id: :music,
label: gettext("Music")
},
%{
id: :auto_boat_air,
label: gettext("Auto, boat and air")
},
%{
id: :community,
label: gettext("Community")
},
%{
id: :family_education,
label: gettext("Family & Education")
},
%{
id: :fashion_beauty,
label: gettext("Fashion & Beauty")
},
%{
id: :film_media,
label: gettext("Film & Media")
},
%{
id: :games,
label: gettext("Games")
},
%{
id: :language_culture,
label: gettext("Language & Culture")
},
%{
id: :learning,
label: gettext("Learning")
},
%{
id: :lgbtq,
label: gettext("LGBTQ")
},
%{
id: :movements_politics,
label: gettext("Movements and politics")
},
%{
id: :networking,
label: gettext("Networking")
},
%{
id: :party,
label: gettext("Party")
},
%{
id: :performing_visual_arts,
label: gettext("Performing & Visual Arts")
},
%{
id: :pets,
label: gettext("Pets")
},
%{
id: :photography,
label: gettext("Photography")
},
%{
id: :outdoors_adventure,
label: gettext("Outdoors & Adventure")
},
%{
id: :spirituality_religion_beliefs,
label: gettext("Spirituality, Religion & Beliefs")
},
%{
id: :science_tech,
label: gettext("Science & Tech")
},
%{
id: :sports,
label: gettext("Sports")
},
%{
id: :theatre,
label: gettext("Theatre")
},
# Legacy default value
%{
id: :meeting,
label: gettext("Meeting")
}
]
end
defp build_in_categories do
[
%{
id: :bildung,
label: gettext("Bildung")
},
%{
id: :bildungsurlaub,
label: gettext("Bildungsurlaub")
},
%{
id: :streik,
label: gettext("Streik")
},
%{
id: :vorbereitungstreffen,
label: gettext("Vorbereitungstreffen")
},
%{
id: :musik,
label: gettext("Musik")
},
%{
id: :kreativ,
label: gettext("Kreativ")
},
%{
id: :aktion_demo,
label: gettext("Aktion/Demo")
},
%{
id: :offenes_plenum,
label: gettext("Offenes Plenum")
},
# Standardkategorie
%{
id: :meeting,
label: gettext("Veranstaltung")
}
]
end

@spec extra_categories :: [%{id: atom(), label: String.t()}]
defp extra_categories do
:mobilizon
|> Application.get_env(:instance)
|> Keyword.get(:extra_categories, [])
end
end
end
2 changes: 1 addition & 1 deletion lib/service/geospatial/nominatim.ex
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ defmodule Mobilizon.Service.Geospatial.Nominatim do
""
end

Map.get(body, "housenumber", "") <> " " <> road
road <> " " <> Map.get(body, "housenumber", "")
end

@address29_classes ["amenity", "shop", "tourism", "leisure"]
Expand Down
Loading