pitchum/debianize-mobilizon
pitchum/debianize-mobilizon
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge branch 'fixes-after-sitemap' into 'master'

Browse Source 
Fixes after sitemap

See merge request framasoft/mobilizon!539
This commit is contained in:
Thomas Citharel 2020-08-13 09:24:09 +02:00
commit b65ba33aa8
5 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.exs
View File

@ -238,7 +238,7 @@ config :mobilizon, Oban,
log: false, log: false,
queues: [default: 10, search: 5, mailers: 10, background: 5], queues: [default: 10, search: 5, mailers: 10, background: 5],
crontab: [ crontab: [
{"@daily", Mobilizon.Service.Workers.BuildSiteMap, queue: :background} {"@hourly", Mobilizon.Service.Workers.BuildSiteMap, queue: :background}
] ]
config :mobilizon, :rich_media, config :mobilizon, :rich_media,

2
js/src/components/NavBar.vue
View File

@ -6,7 +6,7 @@
</b-navbar-item> </b-navbar-item>
</template> </template>
<template slot="start"> <template slot="start">
<b-navbar-item tag="router-link" :to="{ name: RouteName.EXPLORE }">{{ <b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{
$t("Explore") $t("Explore")
}}</b-navbar-item> }}</b-navbar-item>
<b-navbar-item tag="router-link" :to="{ name: RouteName.MY_EVENTS }">{{ <b-navbar-item tag="router-link" :to="{ name: RouteName.MY_EVENTS }">{{

7
js/src/router/event.ts
View File

@ -13,7 +13,6 @@ export enum EventRouteName {
EVENT_LIST = "EventList", EVENT_LIST = "EventList",
CREATE_EVENT = "CreateEvent", CREATE_EVENT = "CreateEvent",
MY_EVENTS = "MyEvents", MY_EVENTS = "MyEvents",
EXPLORE = "Explore",
EDIT_EVENT = "EditEvent", EDIT_EVENT = "EditEvent",
DUPLICATE_EVENT = "DuplicateEvent", DUPLICATE_EVENT = "DuplicateEvent",
PARTICIPATIONS = "Participations", PARTICIPATIONS = "Participations",
@ -39,12 +38,6 @@ export const eventRoutes: RouteConfig[] = [
component: editEvent, component: editEvent,
meta: { requiredAuth: true }, meta: { requiredAuth: true },
}, },
{
path: "/events/explore",
name: EventRouteName.EXPLORE,
redirect: { name: "Search" },
meta: { requiredAuth: false },
},
{ {
path: "/events/me", path: "/events/me",
name: EventRouteName.MY_EVENTS, name: EventRouteName.MY_EVENTS,

1
lib/web/controllers/page_controller.ex
View File

@ -16,7 +16,6 @@ defmodule Mobilizon.Web.PageController do
defdelegate my_events(conn, params), to: PageController, as: :index defdelegate my_events(conn, params), to: PageController, as: :index
defdelegate create_event(conn, params), to: PageController, as: :index defdelegate create_event(conn, params), to: PageController, as: :index
defdelegate list_events(conn, params), to: PageController, as: :index defdelegate list_events(conn, params), to: PageController, as: :index
defdelegate explore_events(conn, params), to: PageController, as: :index
defdelegate edit_event(conn, params), to: PageController, as: :index defdelegate edit_event(conn, params), to: PageController, as: :index
defdelegate moderation_report(conn, params), to: PageController, as: :index defdelegate moderation_report(conn, params), to: PageController, as: :index
defdelegate participation_email_confirmation(conn, params), to: PageController, as: :index defdelegate participation_email_confirmation(conn, params), to: PageController, as: :index

2
lib/web/router.ex
View File

@ -82,6 +82,7 @@ defmodule Mobilizon.Web.Router do
get("/@:name", PageController, :actor) get("/@:name", PageController, :actor)
get("/events/me", PageController, :my_events) get("/events/me", PageController, :my_events)
get("/events/create", PageController, :create_event)
get("/events/:uuid", PageController, :event) get("/events/:uuid", PageController, :event)
get("/comments/:uuid", PageController, :comment) get("/comments/:uuid", PageController, :comment)
get("/resource/:uuid", PageController, :resource) get("/resource/:uuid", PageController, :resource)
@ -142,7 +143,6 @@ defmodule Mobilizon.Web.Router do
get("/events/create", PageController, :create_event) get("/events/create", PageController, :create_event)
get("/events/list", PageController, :list_events) get("/events/list", PageController, :list_events)
get("/events/me", PageController, :my_events) get("/events/me", PageController, :my_events)
get("/events/explore", PageController, :explore_events)
get("/events/:uuid/edit", PageController, :edit_event) get("/events/:uuid/edit", PageController, :edit_event)
# This is a hack to ease link generation into emails # This is a hack to ease link generation into emails