-
-
- {{ participation.event.title }}
-
+
+
+
+ {{ participation.event.title }}
+
{{ participation.event.physicalAddress.locality }} -
{{ $t("You're organizing this event") }}
@@ -211,6 +211,7 @@ export default class EventListCard extends mixins(ActorMixin, EventMixin) {
div.title-wrapper {
display: flex;
+ align-items: center;
div.date-component {
flex: 0;
@@ -222,6 +223,7 @@ export default class EventListCard extends mixins(ActorMixin, EventMixin) {
line-height: 1em;
font-size: 1.6em;
padding-bottom: 5px;
+ margin: auto 0;
}
}
diff --git a/js/src/graphql/actor.ts b/js/src/graphql/actor.ts
index ec7d36d3b..105bd5b48 100644
--- a/js/src/graphql/actor.ts
+++ b/js/src/graphql/actor.ts
@@ -97,6 +97,7 @@ query LoggedUserParticipations($afterDateTime: DateTime, $beforeDateTime: DateTi
uuid,
title,
picture {
+ id,
url,
alt
},
@@ -143,6 +144,7 @@ export const LOGGED_USER_DRAFTS = gql`
uuid,
title,
picture {
+ id,
url,
alt
},
diff --git a/js/src/graphql/admin.ts b/js/src/graphql/admin.ts
index ab7de6f41..e1eb2ce78 100644
--- a/js/src/graphql/admin.ts
+++ b/js/src/graphql/admin.ts
@@ -7,7 +7,8 @@ export const DASHBOARD = gql`
uuid,
title,
picture {
- alt
+ id,
+ alt,
url
},
},
diff --git a/js/src/graphql/event.ts b/js/src/graphql/event.ts
index 7d1fbefcc..1ce5d1b24 100644
--- a/js/src/graphql/event.ts
+++ b/js/src/graphql/event.ts
@@ -110,6 +110,10 @@ export const FETCH_EVENT = gql`
uuid,
title,
beginsOn,
+ picture {
+ id,
+ url
+ }
physicalAddress {
description
},
diff --git a/js/src/graphql/report.ts b/js/src/graphql/report.ts
index 9cd58c2f1..46b72fae3 100644
--- a/js/src/graphql/report.ts
+++ b/js/src/graphql/report.ts
@@ -25,6 +25,7 @@ export const REPORTS = gql`
uuid,
title,
picture {
+ id,
url
}
},
@@ -58,6 +59,7 @@ const REPORT_FRAGMENT = gql`
title,
description,
picture {
+ id,
url
}
},
diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json
index 1db3b06eb..6357caac5 100644
--- a/js/src/i18n/en_US.json
+++ b/js/src/i18n/en_US.json
@@ -1,272 +1,298 @@
{
- "A validation email was sent to {email}": "A validation email was sent to {email}",
- "About this event": "About this event",
- "About this instance": "About this instance",
- "About": "About",
- "Add a new profile": "Add a new profile",
- "Add a tag": "Add a tag",
- "Add an address": "Add an address",
- "Add to my calendar": "Add to my calendar",
- "Add": "Add",
- "Additional comments": "Additional comments",
- "Administration": "Administration",
- "Allow all comments": "Allow all comments",
- "Approve": "Approve",
- "Are you going to this event?": "Are you going to this event?",
- "Are you sure you want to cancel the event creation? You'll lose all modifications.": "Are you sure you want to cancel the event creation? You'll lose all modifications.",
- "Are you sure you want to cancel the event edition? You'll lose all modifications.": "Are you sure you want to cancel the event edition? You'll lose all modifications.",
- "Are you sure you want to cancel your participation at event \"{title}\"?": "Are you sure you want to cancel your participation at event \"{title}\"?",
- "Are you sure you want to delete this event? This action cannot be reverted.": "Are you sure you want to delete this event? This action cannot be reverted.",
- "Before you can login, you need to click on the link inside it to validate your account": "Before you can login, you need to click on the link inside it to validate your account",
- "By {name}": "By {name}",
- "Cancel creation": "Cancel creation",
- "Cancel edition": "Cancel edition",
- "Cancel my participation request…": "Cancel my participation request…",
- "Cancel my participation…": "Cancel my participation…",
- "Cancel": "Cancel",
- "Category": "Category",
- "Change my identity…": "Change my identity…",
- "Change my password": "Change my password",
- "Change password": "Change password",
- "Change": "Change",
- "Clear": "Clear",
- "Click to select": "Click to select",
- "Click to upload": "Click to upload",
- "Close comments for all (except for admins)": "Close comments for all (except for admins)",
- "Comments on the event page": "Comments on the event page",
- "Comments": "Comments",
- "Confirm my particpation": "Confirm my particpation",
- "Confirmed: Will happen": "Confirmed: Will happen",
- "Continue editing": "Continue editing",
- "Country": "Country",
- "Create a new event": "Create a new event",
- "Create a new group": "Create a new group",
- "Create a new identity": "Create a new identity",
- "Create group": "Create group",
- "Create my event": "Create my event",
- "Create my group": "Create my group",
- "Create my profile": "Create my profile",
- "Create token": "Create token",
- "Create your communities and your events": "Create your communities and your events",
- "Create": "Create",
- "Creator": "Creator",
- "Current": "Current",
- "Delete event": "Delete event",
- "Delete this identity": "Delete this identity",
- "Delete your identity": "Delete your identity",
- "Delete {eventTitle}": "Delete {eventTitle}",
- "Delete {preferredUsername}": "Delete {preferredUsername}",
- "Delete": "Delete",
- "Description": "Description",
- "Didn't receive the instructions ?": "Didn't receive the instructions ?",
- "Disallow promoting on Mobilizon": "Disallow promoting on Mobilizon",
- "Display name": "Display name",
- "Display participation price": "Display participation price",
- "Displayed name": "Displayed name",
- "Do you want to participate in {title}?": "Do you want to participate in {title}?",
- "Draft": "Draft",
- "Drafts": "Drafts",
- "Edit": "Edit",
- "Either the account is already validated, either the validation token is incorrect.": "Either the account is already validated, either the validation token is incorrect.",
- "Email": "Email",
- "Ends on…": "Ends on…",
- "Enter some tags": "Enter some tags",
- "Error while validating account": "Error while validating account",
- "Event already passed": "Event already passed",
- "Event list": "Event list",
- "Event {eventTitle} deleted": "Event {eventTitle} deleted",
- "Event {eventTitle} reported": "Event {eventTitle} reported",
- "Event": "Event",
- "Events nearby you": "Events nearby you",
- "Events you're going at": "Events you're going at",
- "Events": "Events",
- "Exclude": "Exclude",
- "Explore": "Explore",
- "Features": "Features",
- "Find an address": "Find an address",
- "Forgot your password ?": "Forgot your password ?",
- "From the {startDate} at {startTime} to the {endDate} at {endTime}": "From the {startDate} at {startTime} to the {endDate} at {endTime}",
- "General information": "General information",
- "Going as {name}": "Going as {name}",
- "Group List": "Group List",
- "Group full name": "Group full name",
- "Group name": "Group name",
- "Group {displayName} created": "Group {displayName} created",
- "Group": "Group",
- "Groups": "Groups",
- "I create an identity": "I create an identity",
- "I participate": "I participate",
- "I want to approve every participation request": "I want to approve every participation request",
- "Identities": "Identities",
- "Identity {displayName} created": "Identity {displayName} created",
- "Identity {displayName} deleted": "Identity {displayName} deleted",
- "Identity {displayName} updated": "Identity {displayName} updated",
- "Identity": "Identity",
- "If an account with this email exists, we just sent another confirmation email to {email}": "If an account with this email exists, we just sent another confirmation email to {email}",
- "If this identity is the only administrator of some groups, you need to delete them before being able to delete this identity.": "If this identity is the only administrator of some groups, you need to delete them before being able to delete this identity.",
- "Join event {title}": "Join event {title}",
- "Join": "Join",
- "Last published event": "Last published event",
- "Last week": "Last week",
- "Learn more on {0}": "Learn more on {0}",
- "Learn more on": "Learn more on",
- "Leave event": "Leave event",
- "Leave": "Leave",
- "Leaving event \"{title}\"": "Leaving event \"{title}\"",
- "Legal": "Legal",
- "License": "License",
- "Limited places": "Limited places",
- "Load more": "Load more",
- "Loading…": "Loading…",
- "Locality": "Locality",
- "Log in": "Log in",
- "Log out": "Log out",
- "Login": "Login",
- "Manage participants": "Manage participants",
- "Manage participations": "Manage participations",
- "Members": "Members",
- "Moderated comments (shown after approval)": "Moderated comments (shown after approval)",
- "My account": "My account",
- "My events": "My events",
- "My identities": "My identities",
- "Name": "Name",
- "New password": "New password",
- "No address defined": "No address defined",
- "No events found": "No events found",
- "No group found": "No group found",
- "No groups found": "No groups found",
- "No participants yet.": "No participants yet.",
- "No results for \"{queryText}\"": "No results for \"{queryText}\"",
- "Number of places": "Number of places",
- "Old password": "Old password",
- "One person is going": "No one is going | One person is going | {approved} persons are going",
- "Only accessible through link and search (private)": "Only accessible through link and search (private)",
- "Opened reports": "Opened reports",
- "Organized by {name}": "Organized by {name}",
- "Organized": "Organized",
- "Organizer": "Organizer",
- "Other stuff…": "Other stuff…",
- "Otherwise this identity will just be removed from the group administrators.": "Otherwise this identity will just be removed from the group administrators.",
- "Page limited to my group (asks for auth)": "Page limited to my group (asks for auth)",
- "Participants": "Participants",
- "Participate": "Participate",
- "Participation approval": "Participation approval",
- "Participation requested!": "Participation requested!",
- "Password (confirmation)": "Password (confirmation)",
- "Password change": "Password change",
- "Password reset": "Password reset",
- "Password": "Password",
- "Past events": "Passed events",
- "Pick an identity": "Pick an identity",
- "Please be nice to each other": "Please be nice to each other",
- "Please check you spam folder if you didn't receive the email.": "Please check you spam folder if you didn't receive the email.",
- "Please contact this instance's Mobilizon admin if you think this is a mistake.": "Please contact this instance's Mobilizon admin if you think this is a mistake.",
- "Please make sure the address is correct and that the page hasn't been moved.": "Please make sure the address is correct and that the page hasn't been moved.",
- "Please read the full rules": "Please read the full rules",
- "Please type at least 5 characters": "Please type at least 5 characters",
- "Postal Code": "Postal Code",
- "Private event": "Private event",
- "Private feeds": "Private feeds",
- "Promotion": "Promotion",
- "Public RSS/Atom Feed": "Public RSS/Atom Feed",
- "Public comment moderation": "Public comment moderation",
- "Public event": "Public event",
- "Public feeds": "Public feeds",
- "Public iCal Feed": "Public iCal Feed",
- "Publish": "Publish",
- "Published events": "Published events",
- "RSS/Atom Feed": "RSS/Atom Feed",
- "Region": "Region",
- "Register an account on Mobilizon!": "Register an account on Mobilizon!",
- "Register": "Register",
- "Registration is currently closed.": "Registration is currently closed.",
- "Reject": "Reject",
- "Rejected participations": "Rejected participations",
- "Rejected": "Rejected",
- "Report this event": "Report this event",
- "Report": "Report",
- "Requests": "Requests",
- "Resend confirmation email": "Resend confirmation email",
- "Reset my password": "Reset my password",
- "Save draft": "Save draft",
- "Save": "Save",
- "Search events, groups, etc.": "Search events, groups, etc.",
- "Search results: \"{search}\"": "Search results: \"{search}\"",
- "Search": "Search",
- "Searching…": "Searching…",
- "Send confirmation email again": "Send confirmation email again",
- "Send email to reset my password": "Send email to reset my password",
- "Send the report": "Send the report",
- "Share this event": "Share this event",
- "Show map": "Show map",
- "Show remaining number of places": "Show remaining number of places",
- "Sign up": "Sign up",
- "Starts on…": "Starts on…",
- "Status": "Status",
- "Street": "Street",
- "Tentative: Will be confirmed later": "Tentative: Will be confirmed later",
- "The content came from another server. Transfer an anonymous copy of the report?": "The content came from another server. Transfer an anonymous copy of the report ?",
- "The event came from another instance. Your participation will be confirmed after we confirm it with the other instance.": "The event came from another instance. Your participation will be confirmed after we confirm it with the other instance.",
- "The event organizer didn't add any description.": "The event organizer didn't add any description.",
- "The event organizer has chosen to approve manually the participations to this event. You will receive a notification when your participation has been approved": "The event organizer has chosen to approve manually the participations to this event. You will receive a notification when your participation has been approved",
- "The event title will be ellipsed.": "The event title will be ellipsed.",
- "The page you're looking for doesn't exist.": "The page you're looking for doesn't exist.",
- "The password was successfully changed": "The password was successfully changed",
- "The report will be sent to the moderators of your instance. You can explain why you report this content below.": "The report will be sent to the moderators of your instance. You can explain why you report this content below.",
- "The {date} at {time}": "The {date} at {time}",
- "The {date} from {startTime} to {endTime}": "The {date} from {startTime} to {endTime}",
- "There are {participants} participants.": "There's only one participant | There are {participants} participants.",
- "These events may interest you": "These events may interest you",
- "This instance isn't opened to registrations, but you can register on other instances.": "This instance isn't opened to registrations, but you can register on other instances.",
- "This will delete / anonymize all content (events, comments, messages, participations…) created from this identity.": "This will delete / anonymize all content (events, comments, messages, participations…) created from this identity.",
- "Title": "Title",
- "To confirm, type your event title \"{eventTitle}\"": "To confirm, type your event title \"{eventTitle}\"",
- "To confirm, type your identity username \"{preferredUsername}\"": "To confirm, type your identity username \"{preferredUsername}\"",
- "Transfer to {outsideDomain}": "Transfer to {outsideDomain}",
- "Unfortunately, your participation request was rejected by the organizers.": "Unfortunately, your participation request was rejected by the organizers.",
- "Unknown error.": "Unknown error.",
- "Unsaved changes": "Unsaved changes",
- "Upcoming": "Upcoming",
- "Update event {name}": "Update event {name}",
- "Update my event": "Update my event",
- "User logout": "User logout",
- "Username": "Username",
- "Users": "Users",
- "View event page": "View event page",
- "View everything": "View everything",
- "Visible everywhere on the web (public)": "Visible everywhere on the web (public)",
- "Waiting for organization team approval.": "Waiting for organization team approval.",
- "Waiting list": "Waiting list",
- "We just sent an email to {email}": "We just sent an email to {email}",
- "Website / URL": "Website / URL",
- "Welcome back {username}": "Welcome back {username}",
- "Welcome back!": "Welcome back!",
- "Welcome on your administration panel": "Welcome on your administration panel",
- "Who can view this event and participate": "Who can view this event and participate",
- "World map": "World map",
- "You and one other person are going to this event": "You're the only one going to this event | You and one other person are going to this event | You and {approved} persons are going to this event.",
- "You announced that you're going to this event.": "You announced that you're going to this event.",
- "You are already logged-in.": "You are already logged-in.",
- "You are an organizer.": "You are an organizer.",
- "You have been disconnected": "You have been disconnected",
- "You have one event in {days} days.": "You have no events in {days} days | You have one event in {days} days. | You have {count} events in {days} days",
- "You have one event today.": "You have no events today | You have one event today. | You have {count} events today",
- "You have one event tomorrow.": "You have no events tomorrow | You have one event tomorrow. | You have {count} events tomorrow",
- "You need to login.": "You need to login.",
- "You're not going to any event yet": "You're not going to any event yet",
- "You're organizing this event": "You're organizing this event",
- "Your account has been validated": "Your account has been validated",
- "Your account is being validated": "Your account is being validated",
- "Your account is nearly ready, {username}": "Your account is nearly ready, {username}",
- "Your local administrator resumed it's policy:": "Your local administrator resumed it's policy:",
- "e.g. 10 Rue Jangot": "e.g. 10 Rue Jangot",
- "iCal Feed": "iCal Feed",
- "meditate a bit": "meditate a bit",
- "with another identity…": "with another identity…",
- "with {identity}": "with {identity}",
- "{actor}'s avatar": "{actor}'s avatar",
- "{approved} / {total} seats": "{approved} / {total} seats",
- "{count} participants": "{count} participants",
- "{count} requests waiting": "{count} requests waiting",
- "© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks": "© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks"
+ "A user-friendly, emancipatory and ethical tool for gathering, organising, and mobilising.": "A user-friendly, emancipatory and ethical tool for gathering, organising, and mobilising.",
+ "A validation email was sent to {email}": "A validation email was sent to {email}",
+ "About Mobilizon": "About Mobilizon",
+ "About this event": "About this event",
+ "About this instance": "About this instance",
+ "About": "About",
+ "Add a new profile": "Add a new profile",
+ "Add a tag": "Add a tag",
+ "Add an address": "Add an address",
+ "Add to my calendar": "Add to my calendar",
+ "Add": "Add",
+ "Additional comments": "Additional comments",
+ "Administration": "Administration",
+ "Allow all comments": "Allow all comments",
+ "Approve": "Approve",
+ "Are you going to this event?": "Are you going to this event?",
+ "Are you sure you want to cancel the event creation? You'll lose all modifications.": "Are you sure you want to cancel the event creation? You'll lose all modifications.",
+ "Are you sure you want to cancel the event edition? You'll lose all modifications.": "Are you sure you want to cancel the event edition? You'll lose all modifications.",
+ "Are you sure you want to cancel your participation at event \"{title}\"?": "Are you sure you want to cancel your participation at event \"{title}\"?",
+ "Are you sure you want to delete this event? This action cannot be reverted.": "Are you sure you want to delete this event? This action cannot be reverted.",
+ "Before you can login, you need to click on the link inside it to validate your account": "Before you can login, you need to click on the link inside it to validate your account",
+ "By {name}": "By {name}",
+ "Cancel creation": "Cancel creation",
+ "Cancel edition": "Cancel edition",
+ "Cancel my participation request…": "Cancel my participation request…",
+ "Cancel my participation…": "Cancel my participation…",
+ "Cancel": "Cancel",
+ "Category": "Category",
+ "Change my identity…": "Change my identity…",
+ "Change my password": "Change my password",
+ "Change password": "Change password",
+ "Change": "Change",
+ "Clear": "Clear",
+ "Click to select": "Click to select",
+ "Click to upload": "Click to upload",
+ "Close comments for all (except for admins)": "Close comments for all (except for admins)",
+ "Comments on the event page": "Comments on the event page",
+ "Comments": "Comments",
+ "Confirm my particpation": "Confirm my particpation",
+ "Confirmed: Will happen": "Confirmed: Will happen",
+ "Continue editing": "Continue editing",
+ "Country": "Country",
+ "Create a new event": "Create a new event",
+ "Create a new group": "Create a new group",
+ "Create a new identity": "Create a new identity",
+ "Create group": "Create group",
+ "Create my event": "Create my event",
+ "Create my group": "Create my group",
+ "Create my profile": "Create my profile",
+ "Create token": "Create token",
+ "Create your communities and your events": "Create your communities and your events",
+ "Create": "Create",
+ "Creator": "Creator",
+ "Current": "Current",
+ "Delete event": "Delete event",
+ "Delete this identity": "Delete this identity",
+ "Delete your identity": "Delete your identity",
+ "Delete {eventTitle}": "Delete {eventTitle}",
+ "Delete {preferredUsername}": "Delete {preferredUsername}",
+ "Delete": "Delete",
+ "Description": "Description",
+ "Didn't receive the instructions ?": "Didn't receive the instructions ?",
+ "Disallow promoting on Mobilizon": "Disallow promoting on Mobilizon",
+ "Display name": "Display name",
+ "Display participation price": "Display participation price",
+ "Displayed name": "Displayed name",
+ "Do you want to participate in {title}?": "Do you want to participate in {title}?",
+ "Draft": "Draft",
+ "Drafts": "Drafts",
+ "Edit": "Edit",
+ "Either the account is already validated, either the validation token is incorrect.": "Either the account is already validated, either the validation token is incorrect.",
+ "Email": "Email",
+ "Ends on…": "Ends on…",
+ "Enter some tags": "Enter some tags",
+ "Error while validating account": "Error while validating account",
+ "Event already passed": "Event already passed",
+ "Event list": "Event list",
+ "Event {eventTitle} deleted": "Event {eventTitle} deleted",
+ "Event {eventTitle} reported": "Event {eventTitle} reported",
+ "Event": "Event",
+ "Events nearby you": "Events nearby you",
+ "Events you're going at": "Events you're going at",
+ "Events": "Events",
+ "Exclude": "Exclude",
+ "Explore": "Explore",
+ "Featured events": "Featured events",
+ "Features": "Features",
+ "Find an address": "Find an address",
+ "Find an instance": "Find an instance",
+ "Forgot your password ?": "Forgot your password ?",
+ "From a birthday party with friends and family to a march for climate change, right now, our gatherings are trapped inside the tech giants’ platforms. How can we organize, how can we click “Attend,” without providing private data to Facebook or locking ourselves up inside MeetUp?": "From a birthday party with friends and family to a march for climate change, right now, our gatherings are trapped inside the tech giants’ platforms. How can we organize, how can we click “Attend,” without providing private data to Facebook or locking ourselves up inside MeetUp?",
+ "From the {startDate} at {startTime} to the {endDate} at {endTime}": "From the {startDate} at {startTime} to the {endDate} at {endTime}",
+ "Gather ⋅ Organize ⋅ Mobilize": "Gather ⋅ Organize ⋅ Mobilize",
+ "General information": "General information",
+ "Going as {name}": "Going as {name}",
+ "Group List": "Group List",
+ "Group full name": "Group full name",
+ "Group name": "Group name",
+ "Group {displayName} created": "Group {displayName} created",
+ "Group": "Group",
+ "Groups": "Groups",
+ "I create an identity": "I create an identity",
+ "I participate": "I participate",
+ "I want to approve every participation request": "I want to approve every participation request",
+ "Identities": "Identities",
+ "Identity {displayName} created": "Identity {displayName} created",
+ "Identity {displayName} deleted": "Identity {displayName} deleted",
+ "Identity {displayName} updated": "Identity {displayName} updated",
+ "Identity": "Identity",
+ "If an account with this email exists, we just sent another confirmation email to {email}": "If an account with this email exists, we just sent another confirmation email to {email}",
+ "If this identity is the only administrator of some groups, you need to delete them before being able to delete this identity.": "If this identity is the only administrator of some groups, you need to delete them before being able to delete this identity.",
+ "Installing Mobilizon will allow communities to free themselves from the services of tech giants by creating their own event platform.": "Installing Mobilizon will allow communities to free themselves from the services of tech giants by creating their own event platform.",
+ "Join event {title}": "Join event {title}",
+ "Join {instance}, a Mobilizon instance": "Join {instance}, a Mobilizon instance",
+ "Join": "Join",
+ "Last published event": "Last published event",
+ "Last week": "Last week",
+ "Learn more about Mobilizon": "Learn more about Mobilizon",
+ "Learn more on {0}": "Learn more on {0}",
+ "Learn more on": "Learn more on",
+ "Learn more": "Learn more",
+ "Leave event": "Leave event",
+ "Leave": "Leave",
+ "Leaving event \"{title}\"": "Leaving event \"{title}\"",
+ "Legal": "Legal",
+ "Let's create a new common": "Let's create a new common",
+ "License": "License",
+ "Limited places": "Limited places",
+ "Load more": "Load more",
+ "Loading…": "Loading…",
+ "Locality": "Locality",
+ "Log in": "Log in",
+ "Log out": "Log out",
+ "Login": "Login",
+ "Manage participants": "Manage participants",
+ "Manage participations": "Manage participations",
+ "Members": "Members",
+ "Mobilizon is a free/libre software that will allow communities to create their own spaces to publish events in order to better emancipate themselves from tech giants.": "Mobilizon is a free/libre software that will allow communities to create their own spaces to publish events in order to better emancipate themselves from tech giants.",
+ "Mobilizon’s licence": "Mobilizon’s licence",
+ "Moderated comments (shown after approval)": "Moderated comments (shown after approval)",
+ "My account": "My account",
+ "My events": "My events",
+ "My identities": "My identities",
+ "Name": "Name",
+ "New password": "New password",
+ "No address defined": "No address defined",
+ "No events found": "No events found",
+ "No group found": "No group found",
+ "No groups found": "No groups found",
+ "No participants yet.": "No participants yet.",
+ "No results for \"{queryText}\"": "No results for \"{queryText}\"",
+ "Number of places": "Number of places",
+ "Old password": "Old password",
+ "One person is going": "No one is going | One person is going | {approved} persons are going",
+ "Only accessible through link and search (private)": "Only accessible through link and search (private)",
+ "Opened reports": "Opened reports",
+ "Organize and take action, freely": "Organize and take action, freely",
+ "Organized by {name}": "Organized by {name}",
+ "Organized": "Organized",
+ "Organizer": "Organizer",
+ "Other stuff…": "Other stuff…",
+ "Otherwise this identity will just be removed from the group administrators.": "Otherwise this identity will just be removed from the group administrators.",
+ "Page limited to my group (asks for auth)": "Page limited to my group (asks for auth)",
+ "Participants": "Participants",
+ "Participate": "Participate",
+ "Participation approval": "Participation approval",
+ "Participation requested!": "Participation requested!",
+ "Password (confirmation)": "Password (confirmation)",
+ "Password change": "Password change",
+ "Password reset": "Password reset",
+ "Password": "Password",
+ "Past events": "Passed events",
+ "Pick an identity": "Pick an identity",
+ "Please be nice to each other": "Please be nice to each other",
+ "Please check you spam folder if you didn't receive the email.": "Please check you spam folder if you didn't receive the email.",
+ "Please contact this instance's Mobilizon admin if you think this is a mistake.": "Please contact this instance's Mobilizon admin if you think this is a mistake.",
+ "Please make sure the address is correct and that the page hasn't been moved.": "Please make sure the address is correct and that the page hasn't been moved.",
+ "Please read the full rules": "Please read the full rules",
+ "Please type at least 5 characters": "Please type at least 5 characters",
+ "Postal Code": "Postal Code",
+ "Private event": "Private event",
+ "Private feeds": "Private feeds",
+ "Promotion": "Promotion",
+ "Public RSS/Atom Feed": "Public RSS/Atom Feed",
+ "Public comment moderation": "Public comment moderation",
+ "Public event": "Public event",
+ "Public feeds": "Public feeds",
+ "Public iCal Feed": "Public iCal Feed",
+ "Publish": "Publish",
+ "Published events": "Published events",
+ "RSS/Atom Feed": "RSS/Atom Feed",
+ "Read Framasoft’s statement of intent on the Framablog": "Read Framasoft’s statement of intent on the Framablog",
+ "Region": "Region",
+ "Register an account on Mobilizon!": "Register an account on Mobilizon!",
+ "Register": "Register",
+ "Registration is currently closed.": "Registration is currently closed.",
+ "Reject": "Reject",
+ "Rejected participations": "Rejected participations",
+ "Rejected": "Rejected",
+ "Report this event": "Report this event",
+ "Report": "Report",
+ "Requests": "Requests",
+ "Resend confirmation email": "Resend confirmation email",
+ "Reset my password": "Reset my password",
+ "Save draft": "Save draft",
+ "Save": "Save",
+ "Search events, groups, etc.": "Search events, groups, etc.",
+ "Search results: \"{search}\"": "Search results: \"{search}\"",
+ "Search": "Search",
+ "Searching…": "Searching…",
+ "Send confirmation email again": "Send confirmation email again",
+ "Send email to reset my password": "Send email to reset my password",
+ "Send the report": "Send the report",
+ "Share this event": "Share this event",
+ "Show map": "Show map",
+ "Show remaining number of places": "Show remaining number of places",
+ "Sign up": "Sign up",
+ "Software to the people": "Software to the people",
+ "Starts on…": "Starts on…",
+ "Status": "Status",
+ "Street": "Street",
+ "Tentative: Will be confirmed later": "Tentative: Will be confirmed later",
+ "The content came from another server. Transfer an anonymous copy of the report?": "The content came from another server. Transfer an anonymous copy of the report ?",
+ "The event came from another instance. Your participation will be confirmed after we confirm it with the other instance.": "The event came from another instance. Your participation will be confirmed after we confirm it with the other instance.",
+ "The event organizer didn't add any description.": "The event organizer didn't add any description.",
+ "The event organizer has chosen to approve manually the participations to this event. You will receive a notification when your participation has been approved": "The event organizer has chosen to approve manually the participations to this event. You will receive a notification when your participation has been approved",
+ "The event title will be ellipsed.": "The event title will be ellipsed.",
+ "The page you're looking for doesn't exist.": "The page you're looking for doesn't exist.",
+ "The password was successfully changed": "The password was successfully changed",
+ "The report will be sent to the moderators of your instance. You can explain why you report this content below.": "The report will be sent to the moderators of your instance. You can explain why you report this content below.",
+ "The {date} at {time}": "The {date} at {time}",
+ "The {date} from {startTime} to {endTime}": "The {date} from {startTime} to {endTime}",
+ "There are {participants} participants.": "There's only one participant | There are {participants} participants.",
+ "These events may interest you": "These events may interest you",
+ "This installation (called “instance“) can easily {interconnect}, thanks to {protocol}.": "This installation (called “instance“) can easily {interconnect}, thanks to {protocol}.",
+ "This instance isn't opened to registrations, but you can register on other instances.": "This instance isn't opened to registrations, but you can register on other instances.",
+ "This will delete / anonymize all content (events, comments, messages, participations…) created from this identity.": "This will delete / anonymize all content (events, comments, messages, participations…) created from this identity.",
+ "Title": "Title",
+ "To change the world, change the software": "To change the world, change the software",
+ "To confirm, type your event title \"{eventTitle}\"": "To confirm, type your event title \"{eventTitle}\"",
+ "To confirm, type your identity username \"{preferredUsername}\"": "To confirm, type your identity username \"{preferredUsername}\"",
+ "Transfer to {outsideDomain}": "Transfer to {outsideDomain}",
+ "Unfortunately, this instance isn't opened to registrations": "Unfortunately, this instance isn't opened to registrations",
+ "Unfortunately, your participation request was rejected by the organizers.": "Unfortunately, your participation request was rejected by the organizers.",
+ "Unknown error.": "Unknown error.",
+ "Unsaved changes": "Unsaved changes",
+ "Upcoming": "Upcoming",
+ "Update event {name}": "Update event {name}",
+ "Update my event": "Update my event",
+ "User logout": "User logout",
+ "Username": "Username",
+ "Users": "Users",
+ "View event page": "View event page",
+ "View everything": "View everything",
+ "Visible everywhere on the web (public)": "Visible everywhere on the web (public)",
+ "Waiting for organization team approval.": "Waiting for organization team approval.",
+ "Waiting list": "Waiting list",
+ "We just sent an email to {email}": "We just sent an email to {email}",
+ "We want to develop a digital common, that everyone can make their own, which respects privacy and activism by design.": "We want to develop a digital common, that everyone can make their own, which respects privacy and activism by design.",
+ "We won’t change the world from Facebook. The tool we dream of, surveillance capitalism corporations won’t develop it, as they couldn’t profit from it. This is an opportunity to build something better, by taking another approach.": "We won’t change the world from Facebook. The tool we dream of, surveillance capitalism corporations won’t develop it, as they couldn’t profit from it. This is an opportunity to build something better, by taking another approach.",
+ "Website / URL": "Website / URL",
+ "Welcome back {username}": "Welcome back {username}",
+ "Welcome back!": "Welcome back!",
+ "Welcome on your administration panel": "Welcome on your administration panel",
+ "Who can view this event and participate": "Who can view this event and participate",
+ "World map": "World map",
+ "You and one other person are going to this event": "You're the only one going to this event | You and one other person are going to this event | You and {approved} persons are going to this event.",
+ "You announced that you're going to this event.": "You announced that you're going to this event.",
+ "You are already logged-in.": "You are already logged-in.",
+ "You are an organizer.": "You are an organizer.",
+ "You have been disconnected": "You have been disconnected",
+ "You have one event in {days} days.": "You have no events in {days} days | You have one event in {days} days. | You have {count} events in {days} days",
+ "You have one event today.": "You have no events today | You have one event today. | You have {count} events today",
+ "You have one event tomorrow.": "You have no events tomorrow | You have one event tomorrow. | You have {count} events tomorrow",
+ "You need to login.": "You need to login.",
+ "You're not going to any event yet": "You're not going to any event yet",
+ "You're organizing this event": "You're organizing this event",
+ "Your account has been validated": "Your account has been validated",
+ "Your account is being validated": "Your account is being validated",
+ "Your account is nearly ready, {username}": "Your account is nearly ready, {username}",
+ "Your local administrator resumed it's policy:": "Your local administrator resumed it's policy:",
+ "a decentralised federation protocol": "a decentralised federation protocol",
+ "e.g. 10 Rue Jangot": "e.g. 10 Rue Jangot",
+ "iCal Feed": "iCal Feed",
+ "interconnect with others like it": "interconnect with others like it",
+ "its source code is public": "its source code is public",
+ "meditate a bit": "meditate a bit",
+ "respect of the fundamental freedoms": "respect of the fundamental freedoms",
+ "with another identity…": "with another identity…",
+ "with {identity}": "with {identity}",
+ "{actor}'s avatar": "{actor}'s avatar",
+ "{approved} / {total} seats": "{approved} / {total} seats",
+ "{count} participants": "{count} participants",
+ "{count} requests waiting": "{count} requests waiting",
+ "{license} guarantees {respect} of the people who will use it. Since {source}, anyone can audit it, which guarantees its transparency.": "{license} guarantees {respect} of the people who will use it. Since {source}, anyone can audit it, which guarantees its transparency.",
+ "© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks": "© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks"
}
\ No newline at end of file
diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json
index c06c13f86..1b87577d2 100644
--- a/js/src/i18n/fr_FR.json
+++ b/js/src/i18n/fr_FR.json
@@ -268,5 +268,8 @@
"{approved} / {total} seats": "{approved} / {total} places",
"{count} participants": "Un⋅e participant⋅e|{count} participant⋅e⋅s",
"{count} requests waiting": "Un⋅e demande en attente|{count} demandes en attente",
- "© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks": "© Les contributeurs de Mobilizon {date} - Fait avec Elixir, Phoenix, VueJS & et de l'amour et des semaines"
+ "© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks": "© Les contributeurs de Mobilizon {date} - Fait avec Elixir, Phoenix, VueJS & et de l'amour et des semaines",
+ "Organize and take action, freely": "S'organiser et agir, librement",
+ "Join {instance}, a Mobilizon instance": "Rejoignez {instance}, une instance Mobilizon",
+ "Learn more": "En apprendre plus"
}
\ No newline at end of file
diff --git a/js/src/router/index.ts b/js/src/router/index.ts
index 44534e842..fcbfd5ffb 100644
--- a/js/src/router/index.ts
+++ b/js/src/router/index.ts
@@ -15,6 +15,7 @@ Vue.use(Router);
enum GlobalRouteName {
HOME = 'Home',
+ ABOUT = 'About',
PAGE_NOT_FOUND = 'PageNotFound',
SEARCH = 'Search',
}
@@ -66,7 +67,12 @@ const router = new Router({
component: Home,
meta: { requiredAuth: false },
},
-
+ {
+ path: '/about',
+ name: RouteName.ABOUT,
+ component: () => import(/* webpackChunkName: "about" */ '@/views/About.vue'),
+ meta: { requiredAuth: false },
+ },
{
path: '*',
name: RouteName.PAGE_NOT_FOUND,
diff --git a/js/src/views/About.vue b/js/src/views/About.vue
new file mode 100644
index 000000000..760905a8a
--- /dev/null
+++ b/js/src/views/About.vue
@@ -0,0 +1,199 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/js/src/views/Event/Event.vue b/js/src/views/Event/Event.vue
index 0f975e7b3..c59f134f0 100644
--- a/js/src/views/Event/Event.vue
+++ b/js/src/views/Event/Event.vue
@@ -264,7 +264,7 @@ import { RouteName } from '@/router';
return [];
},
skip() {
- return !this.event.id || !this.currentActor.id;
+ return !this.currentActor || !this.event || !this.event.id || !this.currentActor.id;
},
},
},
diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index 7d9df77a0..d0845476c 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -1,26 +1,25 @@
+
+
+
+
+ {{ $t('Learn more') }}
+
+ {{ $t('About Mobilizon') }}
++ {{ $t('A user-friendly, emancipatory and ethical tool for gathering, organising, and mobilising.') }} +
+
+
+
+
+
+
+
+
+
+
+ {{ $t('Gather ⋅ Organize ⋅ Mobilize') }}
+ + +
+ 
+
+
+
+
+
+
+ {{ $t("Let's create a new common") }}
+ +
+
+
+ 
+
+
+
+
+
+
+
+
+ {{ $t('To change the world, change the software') }}
++ {{ $t('We won’t change the world from Facebook. The tool we dream of, surveillance capitalism corporations won’t develop it, as they couldn’t profit from it. This is an opportunity to build something better, by taking another approach.') }}+ +
+
+
+
+
+
+
+
+
+
+
+ {{ $t('Mobilizon’s licence') }}
+ {{ $t('respect of the fundamental freedoms') }}
+ {{ $t('its source code is public') }}
+
+
+ {{ $t('Software to the people') }}
++ If the direction given by the development team does not suit you, + you have the legal right to create your own version of the software, + with your own governance choices. +
++ Mobilizon is not developed by a secretive start-up, but by a group + of friends who strive to change the world, one byte at a time. + So while we do work slower, we remain attentive and in touch with our users. +
+
+ 
+
+
+
+
+
+
+ Concieved with care for humans
+We asked professional designers to help us develop our vision for Mobilizon. + We took time to study the digital habits of activists in order to + understand the features they need to gather, organize, and mobilize. +
++ So that, right from its conception, Mobilizon would fit the needs and uses of + the people who are going to use it. +
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('Register') }}
+
+
+ Register on this instance
+
-
+
+
-
@@ -31,12 +30,12 @@
{{ $t('Welcome back {username}', { username: currentActor.displayName() }) }}
-
-
+ {{ $t("Unfortunately, this instance isn't opened to registrations") }}
+
+
-
- {{ $t('Sign up') }}
-
-
- {{ config.name }}
-{{ config.description }}
-- {{ $t("This instance isn't opened to registrations, but you can register on other instances.") }} -
-
-
+
-
- 
-
-
-
- {{ $t('Gather ⋅ Organize ⋅ Mobilize') }}
+{{ $t('Join {instance}, a Mobilizon instance', { instance: config.name }) }} +
{{ config.description }}
+ + +{{ $t("Upcoming") }}
+
-
+
{{ $t('Events nearby you') }}
+{{ $t('Featured events') }}
@@ -129,6 +128,22 @@ import { IConfig } from '@/types/config.model';
config: {
query: CONFIG,
},
+ currentUserParticipations: {
+ query: LOGGED_USER_PARTICIPATIONS,
+ variables() {
+ const lastWeek = new Date();
+ lastWeek.setDate(new Date().getDate() - 7);
+ return {
+ afterDateTime: lastWeek.toISOString(),
+ };
+ },
+ update: (data) => {
+ return data.loggedUser.participations.map(participation => new Participant(participation));
+ },
+ skip() {
+ return this.currentUser.isLoggedIn === false;
+ },
+ },
},
components: {
DateComponent,
@@ -141,35 +156,19 @@ export default class Home extends Vue {
locations = [];
city = { name: null };
country = { name: null };
- currentUserParticipations: IParticipant[] = [];
currentUser!: ICurrentUser;
currentActor!: IPerson;
- config: IConfig = { description: '', name: '', registrationsOpen: false };
+ config!: IConfig;
RouteName = RouteName;
+ currentUserParticipations: IParticipant[] = [];
+
// get displayed_name() {
// return this.loggedPerson && this.loggedPerson.name === null
// ? this.loggedPerson.preferredUsername
// : this.loggedPerson.name;
// }
- async mounted() {
- const lastWeek = new Date();
- lastWeek.setDate(new Date().getDate() - 7);
-
- if (this.currentUser.isLoggedIn === false) return;
- const { data } = await this.$apollo.query({
- query: LOGGED_USER_PARTICIPATIONS,
- variables: {
- afterDateTime: lastWeek.toISOString(),
- },
- });
-
- if (data) {
- this.currentUserParticipations = data.loggedUser.participations.map(participation => new Participant(participation));
- }
- }
-
isToday(date: Date) {
return (new Date(date)).toDateString() === (new Date()).toDateString();
}
@@ -205,6 +204,7 @@ export default class Home extends Vue {
res.sort(
(a: IParticipant, b: IParticipant) => a.event.beginsOn.getTime() - b.event.beginsOn.getTime(),
);
+
return res.reduce((acc: Map>, participation: IParticipant) => {
const day = (new Date(participation.event.beginsOn)).toDateString();
const participations: Map = acc.get(day) || new Map();
@@ -281,8 +281,12 @@ export default class Home extends Vue {
color: rgba(0, 0, 0, 0.87);
}
-.events-nearby {
+.events-featured {
margin: 25px auto;
+
+ .columns {
+ margin: 1rem auto 3rem;
+ }
}
.date-component-container {
@@ -314,8 +318,7 @@ export default class Home extends Vue {
background: lighten($secondary, 20%);
.column figure.image img {
- width: 480px;
- height: 350px;
+ max-width: 400px;
}
}
diff --git a/js/tslint.json b/js/tslint.json
index ec31266d4..b9093c513 100644
--- a/js/tslint.json
+++ b/js/tslint.json
@@ -5,6 +5,7 @@
"import-name": false,
"ter-arrow-parens": false,
"no-boolean-literal-compare": false,
- "object-shorthand-properties-first": false
+ "object-shorthand-properties-first": false,
+ "space-in-parens": false
}
}
diff --git a/js/yarn.lock b/js/yarn.lock
index 5e3a8ac22..52f19dccf 100644
--- a/js/yarn.lock
+++ b/js/yarn.lock
@@ -4177,9 +4177,9 @@ ejs@^2.6.1:
integrity sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==
electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.247:
- version "1.3.275"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.275.tgz#19a38436e34216f51820fa2f4326d5ce141fa36f"
- integrity sha512-/YWtW/VapMnuYA1lNOaa1F4GhR1LBf+CUTp60lzDPEEh0XOzyOAyULyYZVF9vziZ3qSbTqCwmKwsyRXp66STbw==
+ version "1.3.277"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.277.tgz#38b7b297f9b3f67ea900a965c1b11a555de526ec"
+ integrity sha512-Czmsrgng89DOgJlIknnw9bn5431QdtnUwGp5YYiPwU1DbZQUxCLF+rc1ZC09VNAdalOPcvH6AE8BaA0H5HjI/w==
elegant-spinner@^1.0.1:
version "1.0.1"
@@ -8494,7 +8494,7 @@ os-locale@^2.0.0:
lcid "^1.0.0"
mem "^1.1.0"
-os-locale@^3.0.0:
+os-locale@^3.0.0, os-locale@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -9504,9 +9504,9 @@ prosemirror-utils@^0.9.6:
integrity sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA==
prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.11.4:
- version "1.11.5"
- resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.11.5.tgz#ed06a485cce573eac49de7ad6fd1bc3d065e81b7"
- integrity sha512-sfHnSbkT2jhhT8YPXuoMZzPPrfL+JA+qxe39IFgQM4VnyjCII26EfVfQlj8iq9DS489flEbZSLFmE0LFM9+ZiA==
+ version "1.11.6"
+ resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.11.6.tgz#8500fc20a06b9bf3e2f60c01d9a950bd61512db6"
+ integrity sha512-QilemwGa8ib1n42JFFP4J4SEpzPan2IcMNUlllya/ye9gjuHy1Wt5R/o0zXK0Y0HRP4gNqqb9VrbLvi7UAILqQ==
dependencies:
prosemirror-model "^1.1.0"
prosemirror-state "^1.0.0"
@@ -13198,15 +13198,15 @@ yargs@^10.0.3:
yargs-parser "^8.1.0"
yargs@^11.0.0:
- version "11.1.0"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
- integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==
+ version "11.1.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
+ integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==
dependencies:
cliui "^4.0.0"
decamelize "^1.1.1"
find-up "^2.1.0"
get-caller-file "^1.0.1"
- os-locale "^2.0.0"
+ os-locale "^3.1.0"
require-directory "^2.1.1"
require-main-filename "^1.0.1"
set-blocking "^2.0.0"