fix admin elixir

- Added possibility for administrators to have analytics (Matomo, Plausible supported) and error handling (Sentry supported) on front-end.
 - Redesigned federation admin section with dedicated instance pages
 - Allow to filter moderation reports by domain
 - Added a button to go to past events of a group if it has no upcoming events
 - Add Überauth CAS Strategy
 - Add a CLI command to delete actors
 
 - Changed mailer library from Bamboo to Swoosh, should fix emails being considered spam. **Some configuration changes are required, see below.**
 - Expose some fields to ActivityStreams event representation: `isOnline`, `remainingAttendeeCapacity` and `participantCount`
 - Expose a new field to ActivityStreams group representation: `memberCount`
 - Improve group creation errors feedback
 - Only display locality in event card
 - Stale groups are now excluded from group search
 - Event default visibility is now set according to group privacy setting
 - Remove Koena Connect button
 - Hide the whole metadata block if group has no description
 - Increase task timeout in Refresher to 60 seconds
 - Allow webfinger to be fetched over http (not https) in dev mode
 - Improve reactions when approving/rejecting an instance follow
 - Improve instance admin view for mobile
 - Allow to reject instance following
 - Allow instance to have non-standard ports
 - Add pagination to the instances list
 - Eventually fetch actors in mentions
 - Improve IdentityPicker, JoinGroupWithAccount and ActorInline components
 - Various group and posts improvements
 - Update schema.graphql file
 - Add "Accept-Language" header to sentry request metadata
 - Hide address blocks when address has no real data
 - Remove obsolete attribute type="text/css" from <style> tags
 - Improve actor cards integration
 - Use upstream dependencies for Ueberauth providers
 - Include ongoing events in search
 - Send push notification into own task
 - Add appropriate timeouts for Repo.transactions
 - Add a proper error message when adding an instance follow that doesn't respond
 - Allow the instance to be followed from Mastodon (through relays)
 - Remove unused fragment from FETCH_PERSON GraphQL query
 
 - Fixed actor refreshment being impossible
 - Fixed ical export for undefined datetimes
 - Fixed parsing links with hashtag characters
 - Fixed fetching link details from Twitter
 - Fixed Thunderbird accessing ICS feed endpoint with special `Accept` HTTP header
 - Make sure every ICS/Feed caches are emptied when modifying entities
 - Fixed time issues with DST changes
 - Fixed group preview card not truncating description
 - Fixed redirection after login
 - Fixed user admin section showing button to confirm user when the user is already confirmed
 - Fixed creating event from group view not always setting the group as organizer
 - Fixed invalid addresses blocking event metadata preview rendering
 - Fixed group deletion with comments that caused foreign key issues
 - Fixed incoming Accept activities from participations we don't already have
 - Fixed resources that didn't have metadata size limits
 - Properly fallback to UTC when sending notifications and the user doesn't have a timezone setting set
 - Fix posts creation
 - Fix rejecting instance follow
 - Fix pagination of group events
 - Add proper fallback for when a TZ isn't registered
 - Hide side of report modal on low width screens
 - Fix Telegram Logo being replaced with Mastodon logo in ShareGroupModal
 - Change URL for Mastodon Share Manager
 - Fix receiving Flag activities on federated events
 - Fix activity notifications by preloading user.activity_settings
 - Fix text overflow on group card description
 - Exclude tags with more than 40 characters from being extracted
 - Avoid duplicate tags with different casing
 - Fix invalid HTML (<div> inside <label>)
 - Fix latest group not refreshing in admin section
 - Add missing "relay@" part of federated address to follow
 - Fix Ueberauth use of CSRF with session
 - Fix being an administrator when using 3rd-party auth provider
 - Make sure activity recipient can't be nil
 - Make sure users can't create profiles or groups with non-valid patterns
 - Add description field to address representation
 - Make sure prompt show the correct message and not just "Continue?" in mix mode
 - Make sure activity notification recaps can't be sent multiple times
 - Fix group notification of new event being sent multiple times
 - Fix links to group page in group membership emails and participation
 - Fix clicking on map crashing the app
 
 - Arabic
 - Basque
 - Belarusian
 - Bengali
 - Catalan
 - Chinese (Traditional)
 - Croatian
 - Czech
 - Danish
 - Dutch
 - Esperanto
 - Finnish
 - French
 - Gaelic
 - Galician
 - German
 - Hebrew
 - Hungarian
 - Indonesian
 - Italian
 - Japanese
 - Kabyle
 - Kannada
 - Norwegian Nynorsk
 - Occitan
 - Persian
 - Polish
 - Portuguese
 - Portuguese (Brazil)
 - Russian
 - Slovenian
 - Spanish
 - Swedish
 - Welsh
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEExMITpfxOHHCvHn8FoGG53eDKB3MFAmKCI7kACgkQoGG53eDK
 B3M0cg//U3F1oCzg8piPaIAUGgXTx7yOZ+rRO8tHX63+whg6Yu7vu09G8Hm7iyVD
 t2CuzEwKNKdgwUV4XG6CJfban20p/lBhGupQvCpIUOBZ6gKn6m2j7KAHj2/GbEot
 um+Dqu/ktIZN+2vc48nH7HGgcO1c/oCzUE3nH0HYWA9GCVGIAIz+alHszOl9CtL/
 TFpgrF5ygRtk4Z4W/hg6j94PP4IpdCybob8/mgN8eZeF4VbaiCGBdsxl5jai+nqE
 wgebLqyyDAmnE/aW1E64TTLlRP8eZwmNkfxuyI5bjMX8sgvML/ZEcKmcIHPh7tby
 5+pEDnRPg8vnqI5SnkaNH2/77WWY0zPQRFsIV4NFnbMuqZ8fumIC9ke/RXEDGMfS
 ZQi0mWpTT6xZC/XyrjfcaGrV3JY/mrkEXUxFlEwMNm3dGnHKSGCgHIz4gPoQw5U+
 wxPyi+wcnmeHTbic7A89aGH3a4H2BF+f2iZeTrA+XyyopU/7Pr9xgzEHL/3Y/9wA
 +d/hJffLjOM5stg1Zqcndv9LxEFcTtjYBfIeV5kPLVc35s7IbmvoJizFBDrAWisj
 qLsmk9Tg2ODXCN9jIGto1YqQwBWUSYAfYgMzLyvLG1yb8mSBlhWUp/a3uZcekCUL
 qDOLNiiFKdD4TIjV/8Nst0YIHR3g4K2NtftjO92NWx2XeRBcS+w=
 =aZJM
 -----END PGP SIGNATURE-----

Merge tag '2.1.0' into chapril

- Added an event category field. Administrators can extend the pre-configured list of categories through configuration.
- Added possibility for administrators to have analytics (Matomo, Plausible supported) and error handling (Sentry supported) on front-end.
- Redesigned federation admin section with dedicated instance pages
- Allow to filter moderation reports by domain
- Added a button to go to past events of a group if it has no upcoming events
- Add Überauth CAS Strategy
- Add a CLI command to delete actors

- Changed mailer library from Bamboo to Swoosh, should fix emails being considered spam. **Some configuration changes are required, see below.**
- Expose some fields to ActivityStreams event representation: `isOnline`, `remainingAttendeeCapacity` and `participantCount`
- Expose a new field to ActivityStreams group representation: `memberCount`
- Improve group creation errors feedback
- Only display locality in event card
- Stale groups are now excluded from group search
- Event default visibility is now set according to group privacy setting
- Remove Koena Connect button
- Hide the whole metadata block if group has no description
- Increase task timeout in Refresher to 60 seconds
- Allow webfinger to be fetched over http (not https) in dev mode
- Improve reactions when approving/rejecting an instance follow
- Improve instance admin view for mobile
- Allow to reject instance following
- Allow instance to have non-standard ports
- Add pagination to the instances list
- Eventually fetch actors in mentions
- Improve IdentityPicker, JoinGroupWithAccount and ActorInline components
- Various group and posts improvements
- Update schema.graphql file
- Add "Accept-Language" header to sentry request metadata
- Hide address blocks when address has no real data
- Remove obsolete attribute type="text/css" from <style> tags
- Improve actor cards integration
- Use upstream dependencies for Ueberauth providers
- Include ongoing events in search
- Send push notification into own task
- Add appropriate timeouts for Repo.transactions
- Add a proper error message when adding an instance follow that doesn't respond
- Allow the instance to be followed from Mastodon (through relays)
- Remove unused fragment from FETCH_PERSON GraphQL query

- Fixed actor refreshment being impossible
- Fixed ical export for undefined datetimes
- Fixed parsing links with hashtag characters
- Fixed fetching link details from Twitter
- Fixed Thunderbird accessing ICS feed endpoint with special `Accept` HTTP header
- Make sure every ICS/Feed caches are emptied when modifying entities
- Fixed time issues with DST changes
- Fixed group preview card not truncating description
- Fixed redirection after login
- Fixed user admin section showing button to confirm user when the user is already confirmed
- Fixed creating event from group view not always setting the group as organizer
- Fixed invalid addresses blocking event metadata preview rendering
- Fixed group deletion with comments that caused foreign key issues
- Fixed incoming Accept activities from participations we don't already have
- Fixed resources that didn't have metadata size limits
- Properly fallback to UTC when sending notifications and the user doesn't have a timezone setting set
- Fix posts creation
- Fix rejecting instance follow
- Fix pagination of group events
- Add proper fallback for when a TZ isn't registered
- Hide side of report modal on low width screens
- Fix Telegram Logo being replaced with Mastodon logo in ShareGroupModal
- Change URL for Mastodon Share Manager
- Fix receiving Flag activities on federated events
- Fix activity notifications by preloading user.activity_settings
- Fix text overflow on group card description
- Exclude tags with more than 40 characters from being extracted
- Avoid duplicate tags with different casing
- Fix invalid HTML (<div> inside <label>)
- Fix latest group not refreshing in admin section
- Add missing "relay@" part of federated address to follow
- Fix Ueberauth use of CSRF with session
- Fix being an administrator when using 3rd-party auth provider
- Make sure activity recipient can't be nil
- Make sure users can't create profiles or groups with non-valid patterns
- Add description field to address representation
- Make sure prompt show the correct message and not just "Continue?" in mix mode
- Make sure activity notification recaps can't be sent multiple times
- Fix group notification of new event being sent multiple times
- Fix links to group page in group membership emails and participation
- Fix clicking on map crashing the app

- Arabic
- Basque
- Belarusian
- Bengali
- Catalan
- Chinese (Traditional)
- Croatian
- Czech
- Danish
- Dutch
- Esperanto
- Finnish
- French
- Gaelic
- Galician
- German
- Hebrew
- Hungarian
- Indonesian
- Italian
- Japanese
- Kabyle
- Kannada
- Norwegian Nynorsk
- Occitan
- Persian
- Polish
- Portuguese
- Portuguese (Brazil)
- Russian
- Slovenian
- Spanish
- Swedish
- Welsh

.ncignore

@@ -0,0 +1 @@
+deps

README.md

@@ -20,7 +20,7 @@ Mobilizon is your federated organization and mobilization platform. Gather peopl
 
 Mobilizon is a tool designed to create platforms for managing communities and events. Its purpose is to help as many people as possible to free themselves from Facebook groups and events, from Meetup, etc.
 
-The Mobilizon software is under a Free licence, so anyone can host a Mobilizon server, called an instance. These instances may federate with each other, so any person with an account on *ExampleMeet* will be able to register to an event created on *SpecimenEvent*.
+The Mobilizon software is under a Free licence, so anyone can host a Mobilizon server, called an instance. These instances may federate with each other, so any person with an account on _ExampleMeet_ will be able to register to an event created on _SpecimenEvent_.
 
 ## ✨ Features
 
@@ -33,7 +33,7 @@ You will have the power to create multiple identities from the same account, lik
 
 ### 📅 Events and groups
 
-Create your events and make sure they will appeal to everybody. 
+Create your events and make sure they will appeal to everybody.
 Privacy settings and participants roles are supported.
 There's no lock-in, you can interact with the event without registration.
 
@@ -46,23 +46,26 @@ We appreciate any contribution to Mobilizon. Check our [CONTRIBUTING](CONTRIBUTI
 ## Links
 
 ### Learn more
-  * 🌐 Official website: [https://joinmobilizon.org](https://joinmobilizon.org)
+
-  * 🔢 Pick an instance [https://mobilizon.org](https://mobilizon.org)
+- 🌐 Official website: [https://joinmobilizon.org](https://joinmobilizon.org)
-  * 💻 Source: [https://framagit.org/framasoft/mobilizon](https://framagit.org/framasoft/mobilizon)
+- 🔢 Pick an instance [https://mobilizon.org](https://mobilizon.org)
-  * 📜 Documentation [https://docs.joinmobilizon.org](https://docs.joinmobilizon.org)
+- 💻 Source: [https://framagit.org/framasoft/mobilizon](https://framagit.org/framasoft/mobilizon)
-  
+- 📜 Documentation [https://docs.joinmobilizon.org](https://docs.joinmobilizon.org)
+
 ### Discuss
-  * 💬 Element/Matrix: [https://matrix.to/#/#Mobilizon:matrix.org](https://matrix.to/#/#Mobilizon:matrix.org)
+
-  * 🗣️ Forum: [https://framacolibri.org/c/mobilizon](https://framacolibri.org/c/mobilizon)
+- 💬 Element/Matrix: [https://matrix.to/#/#Mobilizon:matrix.org](https://matrix.to/#/#Mobilizon:matrix.org)
+- 🗣️ Forum: [https://framacolibri.org/c/mobilizon](https://framacolibri.org/c/mobilizon)
 
 ### Follow
-  * 🐘 Mastodon: [https://framapiaf.org/@mobilizon](https://framapiaf.org/@mobilizon)
+
-  * 🐦 Twitter [https://twitter.com/@joinmobilizon](https://twitter.com/@joinmobilizon)
+- 🐘 Mastodon: [https://framapiaf.org/@mobilizon](https://framapiaf.org/@mobilizon)
-  
+- 🐦 Twitter [https://twitter.com/@joinmobilizon](https://twitter.com/@joinmobilizon)
+
 Note: Most federation code comes from [Pleroma](https://pleroma.social), which is `Copyright © 2017-2018 Pleroma Authors - AGPL-3.0`.
 
-
 ## ❤️ Supports of our crowdfunding
+
 ---
 
 We have run [a crowdfunding campaign](https://framablog.org/2019/05/14/mobilizon-lets-finance-a-software-to-free-our-events-from-facebook/) to pave the road to the version 1.0.0 of Mobilizon. Thanks to everyone who pitched in and shared the news around! The list of [everyone who donated is available here](https://joinmobilizon.org/hall-of-fame).

SECURITY.md

@@ -5,15 +5,15 @@ Framasoft, the Mobilizon maintainer team and community take all security bugs in
 
 ### Goals
 
-* Mobilizon users can understand the distinctions between public data and private data/metadata on Mobilizon.
+- Mobilizon users can understand the distinctions between public data and private data/metadata on Mobilizon.
 
-* Users always know where their private data/metadata resides, who has access to it, and are able to access, export, and delete it.
+- Users always know where their private data/metadata resides, who has access to it, and are able to access, export, and delete it.
 
-* Protect private user data/metadata, not just from hackers but also (as much as is possible) from other users, instance admins, community moderators, and external applications.
+- Protect private user data/metadata, not just from hackers but also (as much as is possible) from other users, instance admins, community moderators, and external applications.
 
-* Secure from malicious creation, alteration or deletion of public data.
+- Secure from malicious creation, alteration or deletion of public data.
 
-* GDPR compliance.
+- GDPR compliance.
 
 Framasoft is both a developer of open-source/free/libre self-hosted software, and a service provider with users in the European Union. As a result, we are putting user privacy, data sovereignty, and GDPR compliance into our security plans, including asking both the Framasoft community and outside hackers to review our approaches and implementations.
 
@@ -21,11 +21,11 @@ Framasoft is both a developer of open-source/free/libre self-hosted software, an
 
 [Mobilizon](https://joinmobilizon.org) will be challenging to keep secure, as it is:
 
-* open source, both back-end and front-end
+- open source, both back-end and front-end
 
-* self-hosted by diverse organisations and individuals
+- self-hosted by diverse organisations and individuals
 
-* federated (data is transmitted between different hosted instances)
+- federated (data is transmitted between different hosted instances)
 
 This means there are more attack surfaces compared to typical proprietary, centralised platforms, but also means that hackers and even users can review every part of Mobilizon and make sure that it works as expected. This should result in more secure software, and higher trust in the application and its ecosystem.
 
@@ -33,14 +33,14 @@ This means there are more attack surfaces compared to typical proprietary, centr
 
 We are committed to working with security researchers to verify, reproduce, and respond to legitimate reported vulnerabilities. You can help us by following these simple guidelines:
 
-* Alert us about the vulnerability as soon as you become aware of it by emailing the lead maintainer at tcit+mobilizon@framasoft.org.
+- Alert us about the vulnerability as soon as you become aware of it by emailing the lead maintainer at tcit+mobilizon@framasoft.org.
-* Provide details needed to reproduce and validate the vulnerability and a Proof of Concept (PoC) as soon as possible
+- Provide details needed to reproduce and validate the vulnerability and a Proof of Concept (PoC) as soon as possible
-* Act in good faith to avoid privacy violations, destruction of data, and interruption or degradation of services
+- Act in good faith to avoid privacy violations, destruction of data, and interruption or degradation of services
-* Do not access or modify users’ private data, without explicit permission of the owner. Only interact with your own accounts or test accounts for security research purposes;
+- Do not access or modify users’ private data, without explicit permission of the owner. Only interact with your own accounts or test accounts for security research purposes;
-* Contact Framasoft or a maintainer of the Mobilizon project (or the instance admin) immediately if you do inadvertently encounter user data. Do not view, alter, save, store, transfer, or otherwise access the data, and immediately purge any local information upon reporting the vulnerability;
+- Contact Framasoft or a maintainer of the Mobilizon project (or the instance admin) immediately if you do inadvertently encounter user data. Do not view, alter, save, store, transfer, or otherwise access the data, and immediately purge any local information upon reporting the vulnerability;
-* The lead maintainer will acknowledge your email within 48 hours, and will send a more detailed response within 48 hours indicating the next steps in handling your report. After the initial reply to your report, the security team will endeavor to keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
+- The lead maintainer will acknowledge your email within 48 hours, and will send a more detailed response within 48 hours indicating the next steps in handling your report. After the initial reply to your report, the security team will endeavor to keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
-* Give us time to confirm, determine the affected versions and prepare fixes to correct the issue before disclosing it to other parties (if after waiting a reasonable amount of time, we are clearly unable or unwilling to do anything about it, please do hold us accountable!)
+- Give us time to confirm, determine the affected versions and prepare fixes to correct the issue before disclosing it to other parties (if after waiting a reasonable amount of time, we are clearly unable or unwilling to do anything about it, please do hold us accountable!)
-* Please test against a local instance of the software, and refrain from running any Denial of Service or automated testing tools against Framasoft's (and our partners') infrastructure
+- Please test against a local instance of the software, and refrain from running any Denial of Service or automated testing tools against Framasoft's (and our partners') infrastructure
 
 Note : Please report security bugs in third-party modules to the person or team maintaining the module.
 

config/config.exs

@@ -13,14 +13,14 @@ config :mobilizon,
 config :mobilizon, Mobilizon.Storage.Repo, types: Mobilizon.Storage.PostgresTypes
 
 config :mobilizon, :instance,
-  name: "My Mobilizon Instance",
+  name: "Mobilizon du Chapril",
-  description: "Change this to a proper description of your instance",
+  description: "Instance du Chapril",
   hostname: "localhost",
-  registrations_open: false,
+  registrations_open: true,
   registration_email_allowlist: [],
   registration_email_denylist: [],
   languages: [],
-  default_language: "en",
+  default_language: "fr",
   demo: false,
   repository: Mix.Project.config()[:source_url],
   allow_relay: true,
@@ -35,9 +35,9 @@ config :mobilizon, :instance,
   unconfirmed_user_grace_period_hours: 48,
   activity_expire_days: 365,
   activity_keep_number: 100,
-  enable_instance_feeds: false,
+  enable_instance_feeds: true,
-  email_from: "noreply@localhost",
+  email_from: "noreply@mobilizon.chapril.org",
-  email_reply_to: "noreply@localhost"
+  email_reply_to: "noreply@mobilizon.chapril.org"
 
 config :mobilizon, :groups, enabled: true
 config :mobilizon, :events, creation: true
@@ -90,7 +90,7 @@ config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, uploads: "/var/lib/mobil
 
 config :tz_world, data_dir: "/var/lib/mobilizon/timezones"
 
-config :mobilizon, Timex.Gettext, default_locale: "en"
+config :mobilizon, Timex.Gettext, default_locale: "fr"
 
 config :mobilizon, :media_proxy,
   enabled: true,
@@ -342,7 +342,9 @@ config :mobilizon, Mobilizon.Service.Notifier.Push, enabled: true
 config :mobilizon, :exports,
   path: "/var/lib/mobilizon/uploads/exports",
   formats: [
-    Mobilizon.Service.Export.Participants.CSV
+    Mobilizon.Service.Export.Participants.CSV,
+    Mobilizon.Service.Export.Participants.PDF,
+    Mobilizon.Service.Export.Participants.ODS
   ]
 
 config :mobilizon, :analytics, providers: []

config/prod.exs

@@ -16,29 +16,29 @@ config :logger, level: :info
 # Load all locales in production
 config :mobilizon, :cldr,
   locales: [
-    "ar",
+#    "ar",
-    "be",
+#    "be",
-    "bn",
+#    "bn",
-    "ca",
+#    "ca",
-    "cs",
+#    "cs",
-    "cy",
+#    "cy",
-    "de",
+#    "de",
     "en",
-    "es",
+#    "es",
-    "fa",
+#    "fa",
-    "fi",
+#    "fi",
     "fr",
-    "gd",
+#    "gd",
-    "gl",
+#    "gl",
-    "hu",
+#    "hu",
-    "id",
+#    "id",
-    "it",
+#    "it",
-    "ja",
+#    "ja",
-    "nl",
+#    "nl",
-    "nn",
+#    "nn",
-    "pl",
+#    "pl",
-    "pt",
+#    "pt",
-    "ru",
+#    "ru",
-    "sv",
+#    "sv",
-    "zh_Hant"
+#    "zh_Hant"
   ]

js/.gitignore

@@ -23,3 +23,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+.yarn

js/.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+#yarnPath: .yarn/releases/yarn-3.1.1.cjs

js/package.json

@@ -125,5 +125,6 @@
     "vue-i18n-extract": "^2.0.4",
     "vue-template-compiler": "^2.6.11",
     "webpack-cli": "^4.7.0"
-  }
+  },
+  "packageManager": "yarn@3.1.1"
 }

js/public/img/mobilizon_logo.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 248.16 46.78">
+    <title>Mobilizon Logo</title>
+    <g data-name="header">
+        <path d="M0 45.82l3.18-40.8a29.88 29.88 0 015.07-.36 27.74 27.74 0 014.95.36l4.86 17.16a92.19 92.19 0 012.34 10.08h.36a92.19 92.19 0 012.34-10.08L28 5.02a29.23 29.23 0 015-.36 29.23 29.23 0 015 .36l3.18 40.8a13.61 13.61 0 01-3.63.42 23.41 23.41 0 01-3.63-.24l-1.2-19.92q-.36-5.52-.48-12.84h-.44l-7.32 26.51a25.62 25.62 0 01-4 .3 23.36 23.36 0 01-3.84-.3L9.36 13.24H9q-.3 8.94-.48 12.84L7.26 46a22.47 22.47 0 01-3.6.24A13.75 13.75 0 010 45.82zM74 31.06q0 8-4.26 12.3a12.21 12.21 0 01-9 3.42 12.21 12.21 0 01-9-3.42q-4.26-4.26-4.26-12.3t4.24-12.31a12.21 12.21 0 019-3.42 12.21 12.21 0 019 3.42Q74 23.02 74 31.06zM60.75 20.98q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM103.2 19.75q2.7 4.11 2.7 11.28T102 42.31a13.18 13.18 0 01-10 4.11 31.41 31.41 0 01-11.34-2V2.2l.4-.45h2.76A4 4 0 0187 2.83a5.38 5.38 0 01.93 3.57v11.94a12.08 12.08 0 017.56-2.7 8.71 8.71 0 017.71 4.11zm-9.72 2a7.28 7.28 0 00-5.58 2.82v16a15 15 0 004.08.54 5.25 5.25 0 004.68-2.67q1.68-2.67 1.68-7.59 0-9.03-4.86-9.1zM121 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014 1.62A6.27 6.27 0 01121 22z" />
+        <path d="M119.82.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z" fill="#fff" />
+        <path d="M139.08 40.42h2a10.23 10.23 0 01.6 3.18 9.24 9.24 0 01-.18 2.1 38.47 38.47 0 01-5.64.54q-6.48 0-6.48-7v-37l.36-.42h2.88a3.94 3.94 0 013.12 1.05 5.52 5.52 0 01.9 3.57v31.31q-.02 2.67 2.44 2.67zM155.94 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014.05 1.62 6.27 6.27 0 011.43 4.39z" />
+        <path d="M154.8 2.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z" fill="#fff" />
+        <path d="M163.08 39.22l8.76-11.82q1.32-1.8 4.8-5.7l-.18-.3a63.09 63.09 0 01-7.74.42H163a9.79 9.79 0 01-.24-2.34 15.8 15.8 0 01.42-3.3h20.4a16.31 16.31 0 011 4.26 4.1 4.1 0 01-.78 2.34L175 34.66a64.65 64.65 0 01-4.56 5.7l.18.24q3.12-.3 5.22-.3h2.58a15.35 15.35 0 006.12-.9 9.4 9.4 0 01.72 3.12q0 3.42-4.32 3.42h-18a14.27 14.27 0 01-.9-3.93 5.08 5.08 0 011.04-2.79zM215.88 31.06q0 8-4.26 12.3a13.63 13.63 0 01-18.06 0q-4.26-4.26-4.26-12.3t4.26-12.31a13.63 13.63 0 0118.06 0q4.26 4.27 4.26 12.31zm-13.29-10.08q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM247 25.84v13.32a11 11 0 001.2 5.64 7 7 0 01-4.41 1.56q-2.43 0-3.33-1.14a5.69 5.69 0 01-.9-3.54V27.4a7.74 7.74 0 00-.72-3.87 2.78 2.78 0 00-2.58-1.17 8.62 8.62 0 00-6.3 3v20.58a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3v-29.7l.42-.36h2.76q3.42 0 4.08 3.6 4.38-3.84 8.73-3.84t6.42 2.82a12.17 12.17 0 012.07 7.38z" />
+        <path d="M57.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84zM198.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84z" fill="#fff" />
+    </g>
+</svg>

js/src/assets/mobilizon_logo_original.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 248.16 46.78">
+    <title>Mobilizon Logo</title>
+    <g data-name="header">
+        <path d="M0 45.82l3.18-40.8a29.88 29.88 0 015.07-.36 27.74 27.74 0 014.95.36l4.86 17.16a92.19 92.19 0 012.34 10.08h.36a92.19 92.19 0 012.34-10.08L28 5.02a29.23 29.23 0 015-.36 29.23 29.23 0 015 .36l3.18 40.8a13.61 13.61 0 01-3.63.42 23.41 23.41 0 01-3.63-.24l-1.2-19.92q-.36-5.52-.48-12.84h-.44l-7.32 26.51a25.62 25.62 0 01-4 .3 23.36 23.36 0 01-3.84-.3L9.36 13.24H9q-.3 8.94-.48 12.84L7.26 46a22.47 22.47 0 01-3.6.24A13.75 13.75 0 010 45.82zM74 31.06q0 8-4.26 12.3a12.21 12.21 0 01-9 3.42 12.21 12.21 0 01-9-3.42q-4.26-4.26-4.26-12.3t4.24-12.31a12.21 12.21 0 019-3.42 12.21 12.21 0 019 3.42Q74 23.02 74 31.06zM60.75 20.98q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM103.2 19.75q2.7 4.11 2.7 11.28T102 42.31a13.18 13.18 0 01-10 4.11 31.41 31.41 0 01-11.34-2V2.2l.4-.45h2.76A4 4 0 0187 2.83a5.38 5.38 0 01.93 3.57v11.94a12.08 12.08 0 017.56-2.7 8.71 8.71 0 017.71 4.11zm-9.72 2a7.28 7.28 0 00-5.58 2.82v16a15 15 0 004.08.54 5.25 5.25 0 004.68-2.67q1.68-2.67 1.68-7.59 0-9.03-4.86-9.1zM121 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014 1.62A6.27 6.27 0 01121 22z" />
+        <path d="M119.82.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z" fill="#fff" />
+        <path d="M139.08 40.42h2a10.23 10.23 0 01.6 3.18 9.24 9.24 0 01-.18 2.1 38.47 38.47 0 01-5.64.54q-6.48 0-6.48-7v-37l.36-.42h2.88a3.94 3.94 0 013.12 1.05 5.52 5.52 0 01.9 3.57v31.31q-.02 2.67 2.44 2.67zM155.94 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014.05 1.62 6.27 6.27 0 011.43 4.39z" />
+        <path d="M154.8 2.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z" fill="#fff" />
+        <path d="M163.08 39.22l8.76-11.82q1.32-1.8 4.8-5.7l-.18-.3a63.09 63.09 0 01-7.74.42H163a9.79 9.79 0 01-.24-2.34 15.8 15.8 0 01.42-3.3h20.4a16.31 16.31 0 011 4.26 4.1 4.1 0 01-.78 2.34L175 34.66a64.65 64.65 0 01-4.56 5.7l.18.24q3.12-.3 5.22-.3h2.58a15.35 15.35 0 006.12-.9 9.4 9.4 0 01.72 3.12q0 3.42-4.32 3.42h-18a14.27 14.27 0 01-.9-3.93 5.08 5.08 0 011.04-2.79zM215.88 31.06q0 8-4.26 12.3a13.63 13.63 0 01-18.06 0q-4.26-4.26-4.26-12.3t4.26-12.31a13.63 13.63 0 0118.06 0q4.26 4.27 4.26 12.31zm-13.29-10.08q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM247 25.84v13.32a11 11 0 001.2 5.64 7 7 0 01-4.41 1.56q-2.43 0-3.33-1.14a5.69 5.69 0 01-.9-3.54V27.4a7.74 7.74 0 00-.72-3.87 2.78 2.78 0 00-2.58-1.17 8.62 8.62 0 00-6.3 3v20.58a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3v-29.7l.42-.36h2.76q3.42 0 4.08 3.6 4.38-3.84 8.73-3.84t6.42 2.82a12.17 12.17 0 012.07 7.38z" />
+        <path d="M57.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84zM198.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84z" fill="#fff" />
+    </g>
+</svg>

js/src/components/Account/ProfileOnboarding.vue

@@ -41,8 +41,8 @@
           )
         }}
       </p>
-      <div class="has-text-centered">
+      <div class="has-text-centered has-text-primary has-background-success">
-        <code>{{ `${currentActor.preferredUsername}@${domain}` }}</code>
+        <pre>{{ `${currentActor.preferredUsername}@${domain}` }}</pre>
       </div>
     </div>
   </div>

js/src/components/Editor.vue

@@ -566,7 +566,7 @@ $color-white: #eee;
     }
     &.is-selected,
     &:hover {
-      background-color: rgba($color-white, 0.2);
+      background-color: rgba(#eee, 0.2);
     }
     &.is-empty {
       opacity: 0.5;
@@ -583,7 +583,7 @@ $color-white: #eee;
   padding: 0;
   font-size: 1rem;
   text-align: inherit;
-  color: $color-white;
+  color: #eee;
   border-radius: 5px;
 }
 

js/src/components/Event/DateCalendarIcon.vue

@@ -54,10 +54,13 @@ export default class DateCalendarIcon extends Vue {
 
 <style lang="scss" scoped>
 div.datetime-container {
+  background: #fff;
+  border: 1px solid $borders;
   border-radius: 8px;
   display: flex;
   flex-direction: column;
   justify-content: center;
+  padding: 8px;
   text-align: center;
   overflow-y: hidden;
   overflow-x: hidden;

js/src/components/Event/EventParticipationCard.vue

@@ -546,4 +546,11 @@ article.box {
   }
   padding: 0;
 }
+.content h3.event-title-card {
+  line-height: 1em;
+  margin-top: 0.5em;
+}
+.participation-actor {
+  margin-top: 1em;
+}
 </style>

js/src/components/Footer.vue

@@ -40,6 +40,11 @@
           $t("About")
         }}</router-link>
       </li>
+      <li>
+        <a href="https://www.chapril.org/Mentions-legales.html">
+          Mentions légales
+        </a>
+      </li>
       <li>
         <router-link :to="{ name: RouteName.TERMS }">{{
           $t("Terms")
@@ -49,11 +54,14 @@
         <a
           rel="external"
           hreflang="en"
-          href="https://framagit.org/framasoft/mobilizon/blob/main/LICENSE"
+          href="https://forge.april.org/Chapril/mobilizon.chapril.org-mobilizon/src/branch/chapril/LICENSE"
         >
           {{ $t("License") }}
         </a>
       </li>
+      <li>
+        <a href="mailto:mobilizon-support@chapril.org">{{ $t("Contact") }}</a>
+      </li>
       <li>
         <a href="#navbar">{{ $t("Back to top") }}</a>
       </li>

js/src/components/Logo.vue

@@ -1,34 +1,12 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 248.16 46.78">
+  <img src="img/pics/logo_chapril_mobilizon.png" alt="logo chapril" />
-    <title>Mobilizon Logo</title>
-    <g data-name="header">
-      <path
-        d="M0 45.82l3.18-40.8a29.88 29.88 0 015.07-.36 27.74 27.74 0 014.95.36l4.86 17.16a92.19 92.19 0 012.34 10.08h.36a92.19 92.19 0 012.34-10.08L28 5.02a29.23 29.23 0 015-.36 29.23 29.23 0 015 .36l3.18 40.8a13.61 13.61 0 01-3.63.42 23.41 23.41 0 01-3.63-.24l-1.2-19.92q-.36-5.52-.48-12.84h-.44l-7.32 26.51a25.62 25.62 0 01-4 .3 23.36 23.36 0 01-3.84-.3L9.36 13.24H9q-.3 8.94-.48 12.84L7.26 46a22.47 22.47 0 01-3.6.24A13.75 13.75 0 010 45.82zM74 31.06q0 8-4.26 12.3a12.21 12.21 0 01-9 3.42 12.21 12.21 0 01-9-3.42q-4.26-4.26-4.26-12.3t4.24-12.31a12.21 12.21 0 019-3.42 12.21 12.21 0 019 3.42Q74 23.02 74 31.06zM60.75 20.98q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM103.2 19.75q2.7 4.11 2.7 11.28T102 42.31a13.18 13.18 0 01-10 4.11 31.41 31.41 0 01-11.34-2V2.2l.4-.45h2.76A4 4 0 0187 2.83a5.38 5.38 0 01.93 3.57v11.94a12.08 12.08 0 017.56-2.7 8.71 8.71 0 017.71 4.11zm-9.72 2a7.28 7.28 0 00-5.58 2.82v16a15 15 0 004.08.54 5.25 5.25 0 004.68-2.67q1.68-2.67 1.68-7.59 0-9.03-4.86-9.1zM121 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014 1.62A6.27 6.27 0 01121 22z"
-      />
-      <path
-        d="M119.82.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z"
-        fill="#fff"
-      />
-      <path
-        d="M139.08 40.42h2a10.23 10.23 0 01.6 3.18 9.24 9.24 0 01-.18 2.1 38.47 38.47 0 01-5.64.54q-6.48 0-6.48-7v-37l.36-.42h2.88a3.94 3.94 0 013.12 1.05 5.52 5.52 0 01.9 3.57v31.31q-.02 2.67 2.44 2.67zM155.94 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014.05 1.62 6.27 6.27 0 011.43 4.39z"
-      />
-      <path
-        d="M154.8 2.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z"
-        fill="#fff"
-      />
-      <path
-        d="M163.08 39.22l8.76-11.82q1.32-1.8 4.8-5.7l-.18-.3a63.09 63.09 0 01-7.74.42H163a9.79 9.79 0 01-.24-2.34 15.8 15.8 0 01.42-3.3h20.4a16.31 16.31 0 011 4.26 4.1 4.1 0 01-.78 2.34L175 34.66a64.65 64.65 0 01-4.56 5.7l.18.24q3.12-.3 5.22-.3h2.58a15.35 15.35 0 006.12-.9 9.4 9.4 0 01.72 3.12q0 3.42-4.32 3.42h-18a14.27 14.27 0 01-.9-3.93 5.08 5.08 0 011.04-2.79zM215.88 31.06q0 8-4.26 12.3a13.63 13.63 0 01-18.06 0q-4.26-4.26-4.26-12.3t4.26-12.31a13.63 13.63 0 0118.06 0q4.26 4.27 4.26 12.31zm-13.29-10.08q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM247 25.84v13.32a11 11 0 001.2 5.64 7 7 0 01-4.41 1.56q-2.43 0-3.33-1.14a5.69 5.69 0 01-.9-3.54V27.4a7.74 7.74 0 00-.72-3.87 2.78 2.78 0 00-2.58-1.17 8.62 8.62 0 00-6.3 3v20.58a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3v-29.7l.42-.36h2.76q3.42 0 4.08 3.6 4.38-3.84 8.73-3.84t6.42 2.82a12.17 12.17 0 012.07 7.38z"
-      />
-      <path
-        d="M57.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84zM198.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84z"
-        fill="#fff"
-      />
-    </g>
-  </svg>
 </template>
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+// import MobilizonLogo from "../assets/logo_chapril_mobilizon.png";
 
 @Component
 export default class Logo extends Vue {

js/src/components/NavBar.vue

@@ -11,7 +11,11 @@
         :to="{ name: RouteName.HOME }"
         :aria-label="$t('Home')"
       >
-        <logo />
+        <img
+          src="/img/long_logo_chapril_mobilizon.png"
+          alt="logo mobilizon"
+          style="width: 5em"
+        />
       </b-navbar-item>
     </template>
     <template slot="start">
@@ -54,6 +58,15 @@
       </b-navbar-item>
     </template>
     <template slot="end">
+      <b-navbar-item
+        href="https://www.chapril.org"
+        :aria-label="'www.chapril.org'"
+      >
+        <img
+          src="/img/pics/logo_chapril_mobilizon.png"
+          alt="logo chapril mobilizon"
+        />
+      </b-navbar-item>
       <b-navbar-item tag="div">
         <search-field @navbar-search="mobileNavbarActive = false" />
       </b-navbar-item>
@@ -133,8 +146,8 @@
           v-if="currentUser.role === ICurrentUserRole.ADMINISTRATOR"
           tag="router-link"
           :to="{ name: RouteName.ADMIN_DASHBOARD }"
-          >{{ $t("Administration") }}</b-navbar-item
+          >{{ $t("Administration") }}
-        >
+        </b-navbar-item>
 
         <b-navbar-item
           tag="span"

js/src/components/Utils/Subtitle.vue

@@ -17,10 +17,8 @@ h2 {
   margin: 15px 0 30px;
 
   span {
-    background: $secondary;
     display: inline;
     padding: 3px 8px;
-    color: #3a384c;
     font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
       serif;
     font-weight: 400;

js/src/variables.scss

@@ -2,6 +2,13 @@
 @import "~bulma/sass/utilities/initial-variables.sass";
 @import "~bulma/sass/utilities/derived-variables.sass";
 
+
+// chapril colors
+$chapril_blue: #2e5281;
+$chapril_blue_light: #bcd0e5;
+$chapril_orange: #ff5e00;
+$chapril_grey: #5f5f5f;
+// other
 $bleuvert: #1e7d97;
 $jaune: #ffd599;
 $violet: #424056;
@@ -20,78 +27,79 @@ $violet-3: #3c376e;
 /**
  * Borders
  */
-$borders: #d7d6de;
+$borders: mix($chapril_blue, #d7d6de);
-$backgrounds: #ecebf2;
+$backgrounds: mix($chapril_blue, #ecebf2);
 
 /**
  * Text
  */
-$purple-1: #757199;
+$purple-1: mix($chapril_blue, #757199);
 
 /**
  * Background
  */
-$purple-2: #cdcaea;
+$purple-2: mix($chapril_blue, #cdcaea);
-$purple-3: #e6e4f4;
+$purple-3: mix($chapril_blue, #e6e4f4);
 
-$orange-2: #ed8d07;
+$orange-2: mix($chapril_blue, #ed8d07);
-$orange-3: #d35204;
+$orange-3: mix($chapril_blue, #d35204);
 
-$yellow-1: #ffd599;
+$yellow-1: mix($chapril_blue, #fff1e8);
-$yellow-2: #fff1de;
+$yellow-2: mix($chapril_blue, #fff1de);
-$yellow-3: #fbd5cb;
+$yellow-3: mix($chapril_blue, #fff8f6);
-$yellow-4: #f7ba30;
+$yellow-4: mix($chapril_blue, #b4f0ff);
 
-$primary: $bleuvert;
+$primary: $chapril_blue;
 $primary-invert: findColorInvert($primary);
-$secondary: $jaune;
+$secondary: lighten($chapril_blue, 20%);
 $secondary-invert: findColorInvert($secondary);
 
-$background-color: $violet-2;
+$background-color: mix($chapril_blue, $violet-2);
+$background-color-darker: darken($background-color,10%);
 
-$success: #0d8758;
+$success: mix($chapril_blue, #0d8758);
 $success-invert: findColorInvert($success);
-$info: #36bcd4;
+$info: mix($chapril_blue, #36bcd4);
 $info-invert: findColorInvert($info);
-$danger: #cd2026;
+$danger: mix($chapril_blue, #ff2e54);
 $danger-invert: findColorInvert($danger);
 $link: $primary;
 $link-invert: $primary-invert;
-$text: $violet-1;
+$text: mix($chapril_blue, $violet-1);
-$grey: #757575;
 
 $colors: map-merge(
-  $colors,
+                $colors,
-  (
+                (
-    "primary": (
+                        "primary": (
-      $primary,
+                                $primary,
-      $primary-invert,
+                                $primary-invert,
-    ),
+                        ),
-    "secondary": (
+                        "secondary": (
-      $secondary,
+                                $secondary,
-      $secondary-invert,
+                                $secondary-invert,
-    ),
+                        ),
-    "success": (
+                        "success": (
-      $success,
+                                $success,
-      $success-invert,
+                                $success-invert,
-    ),
+                        ),
-    "info": (
+                        "info": (
-      $info,
+                                $info,
-      $info-invert,
+                                $info-invert,
-    ),
+                        ),
-    "danger": (
+                        "danger": (
-      $danger,
+                                $danger,
-      $danger-invert,
+                                $danger-invert,
-    ),
+                        ),
-    "link": (
+                        "link": (
-      $link,
+                                $link,
-      $link-invert,
+                                $link-invert,
-    ),
+                        ),
-    "grey": (
+
-      $grey,
+                        "grey": (
-      findColorInvert($grey),
+                                $grey,
-    ),
+                                findColorInvert($grey),
-  )
+                        ),
+                )
 );
 
 // Navbar
@@ -103,7 +111,7 @@ $navbar-height: 4rem;
 $footer-padding: 3rem 1.5rem 1rem;
 $footer-background-color: $background-color;
 
-$body-background-color: #efeef4;
+$body-background-color: mix( $chapril_blue, #efeef4);
 $fullhd-enabled: false;
 $hero-body-padding-medium: 6rem 1.5rem;
 
@@ -112,22 +120,26 @@ main > .container {
   min-height: 70vh;
 }
 
-$title-color: #3c376e;
+$title-color: $chapril_blue;
 $title-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
-  serif;
+serif;
 $title-weight: 700;
 $title-size: 40px;
 $title-sub-size: 45px;
 $title-sup-size: 30px;
 
-$subtitle-color: #3a384c;
+$subtitle-color: $chapril_grey;
 $subtitle-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
-  serif;
+serif;
 $subtitle-weight: 400;
 $subtitle-size: 32px;
 $subtitle-sub-size: 30px;
 $subtitle-sup-size: 15px;
 
+.title {
+  margin: 30px auto 45px;
+}
+
 .subtitle {
   background: $secondary;
   display: inline;

js/src/variables_original.scss

@@ -0,0 +1,140 @@
+@import "~bulma/sass/utilities/functions.sass";
+@import "~bulma/sass/utilities/initial-variables.sass";
+@import "~bulma/sass/utilities/derived-variables.sass";
+
+$bleuvert: #1e7d97;
+$jaune: #ffd599;
+$violet: #424056;
+
+/**
+ * Text body, paragraphs
+ */
+$violet-1: #3a384c;
+$violet-2: #474467;
+
+/**
+ * Titles, dark borders, buttons
+ */
+$violet-3: #3c376e;
+
+/**
+ * Borders
+ */
+$borders: #d7d6de;
+$backgrounds: #ecebf2;
+
+/**
+ * Text
+ */
+$purple-1: #757199;
+
+/**
+ * Background
+ */
+$purple-2: #cdcaea;
+$purple-3: #e6e4f4;
+
+$orange-2: #ed8d07;
+$orange-3: #d35204;
+
+$yellow-1: #ffd599;
+$yellow-2: #fff1de;
+$yellow-3: #fbd5cb;
+$yellow-4: #f7ba30;
+
+$primary: $bleuvert;
+$primary-invert: findColorInvert($primary);
+$secondary: $jaune;
+$secondary-invert: findColorInvert($secondary);
+
+$background-color: $violet-2;
+
+$success: #0d8758;
+$success-invert: findColorInvert($success);
+$info: #36bcd4;
+$info-invert: findColorInvert($info);
+$danger: #ff2e54;
+$danger-invert: findColorInvert($danger);
+$link: $primary;
+$link-invert: $primary-invert;
+$text: $violet-1;
+
+$colors: map-merge(
+  $colors,
+  (
+    "primary": (
+      $primary,
+      $primary-invert,
+    ),
+    "secondary": (
+      $secondary,
+      $secondary-invert,
+    ),
+    "success": (
+      $success,
+      $success-invert,
+    ),
+    "info": (
+      $info,
+      $info-invert,
+    ),
+    "danger": (
+      $danger,
+      $danger-invert,
+    ),
+    "link": (
+      $link,
+      $link-invert,
+    ),
+  )
+);
+
+// Navbar
+$navbar-background-color: $secondary;
+$navbar-item-color: $background-color;
+$navbar-height: 4rem;
+
+// Footer
+$footer-padding: 3rem 1.5rem 1rem;
+$footer-background-color: $background-color;
+
+$body-background-color: #efeef4;
+$fullhd-enabled: false;
+$hero-body-padding-medium: 6rem 1.5rem;
+
+main > .container {
+  background: $body-background-color;
+  min-height: 70vh;
+}
+
+$title-color: #3c376e;
+$title-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
+  serif;
+$title-weight: 700;
+$title-size: 40px;
+$title-sub-size: 45px;
+$title-sup-size: 30px;
+
+$subtitle-color: #3a384c;
+$subtitle-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
+  serif;
+$subtitle-weight: 400;
+$subtitle-size: 32px;
+$subtitle-sub-size: 30px;
+$subtitle-sup-size: 15px;
+
+.title {
+  margin: 30px auto 45px;
+}
+
+.subtitle {
+  background: $secondary;
+  display: inline;
+  padding: 3px 8px;
+  margin: 15px auto 30px;
+}
+
+//$input-border-color: #dbdbdb;
+$breadcrumb-item-color: $primary;
+$checkbox-background-color: #fff;
+$title-color: $violet-3;

js/src/views/Event/Edit.vue

@@ -523,7 +523,6 @@ h2.subtitle {
   span {
     padding: 5px 7px;
     display: inline;
-    background: $secondary;
   }
 }
 

js/src/views/Home.vue

@@ -13,9 +13,9 @@
           </h1>
           <p
             v-html="
-              $t('Join <b>{instance}</b>, a Mobilizon instance', {
+              `${$t('Join <b>{instance}</b>, a Mobilizon instance', {
                 instance: config.name,
-              })
+              })}.`
             "
           />
           <p class="instance-description">{{ config.description }}</p>
@@ -29,7 +29,15 @@
               tag="router-link"
               :to="{ name: RouteName.REGISTER }"
               v-if="config.registrationsOpen"
-              >{{ $t("Create an account") }}</b-button
+            >
+              <i class="mdi mdi-account"></i>
+              {{ $t("Create an account") }}</b-button
+            >
+            <a
+              class="button is-light"
+              :title="config.contact"
+              href="mailto:mobilizon-support@chapril.org"
+              >{{ $t("Contact") }}</a
             >
             <!-- We don't invite to find other instances yet -->
             <!-- <b-button v-else type="is-link" tag="a" href="https://joinmastodon.org">{{ $t('Find an instance') }}</b-button> -->
@@ -613,12 +621,12 @@ export default class Home extends Vue {
 @import "~bulma/sass/utilities/mixins.sass";
 
 main > div > .container {
-  background: $white;
+  background: #eee;
   padding: 1rem 0.5rem 3rem;
 }
 
 .search-autocomplete {
-  border: 1px solid #dbdbdb;
+  border: 1px solid $borders;
   color: rgba(0, 0, 0, 0.87);
 }
 
@@ -726,8 +734,6 @@ section.hero {
   }
 
   .container.section {
-    background: $white;
-
     @include tablet {
       margin-top: -4rem;
     }
@@ -746,7 +752,7 @@ section.hero {
 }
 
 #homepage {
-  background: $white;
+  background: #eee;
 }
 
 .home-separator {

js/src/views/User/Register.vue

@@ -348,10 +348,8 @@ export default class Register extends Vue {
 }
 
 h2.title {
-  color: $primary;
   font-size: 2.5rem;
   text-decoration: underline;
-  text-decoration-color: $secondary;
   display: inline;
 }
 

js/src/views/User/ResendConfirmation.vue

@@ -97,11 +97,13 @@ export default class ResendConfirmation extends Vue {
     e.preventDefault();
     this.error = false;
 
+    console.log("this.credentials.email", this.credentials.email);
+    console.log("this.email", this.email);
     try {
       await this.$apollo.mutate({
         mutation: RESEND_CONFIRMATION_EMAIL,
         variables: {
-          email: this.credentials.email,
+          email: this.credentials.email || this.email,
         },
       });
     } catch (err) {

js/src/views/User/SettingsOnboard.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="section container">
+  <div class="section container bg-white">
     <h1 class="title">{{ $t("Let's define a few settings") }}</h1>
     <b-steps v-model="stepIndex" :has-navigation="false">
       <b-step-item step="1" :label="$t('Settings')">
@@ -93,6 +93,7 @@ export default class SettingsOnboard extends Vue {
 </script>
 <style scoped lang="scss">
 .section.container {
+  background: white;
   .has-text-centered.section.buttons {
     justify-content: center;
   }

lib/web/email/admin.ex

@@ -113,9 +113,9 @@ defmodule Mobilizon.Web.Email.Admin do
 
   @spec user_confirmation(User.t()) :: Swoosh.Email.t()
   def user_confirmation(%User{
-        locale: user_locale,
+    locale: user_locale,
-        email: email
+    email: email
-      }) do
+  }) do
     Gettext.put_locale(user_locale)
 
     subject =

test/fixtures/mastodon-accept-activity.json

@@ -31,4 +31,4 @@
       "Emoji": "toot:Emoji"
     }
   ]
-}
+}

test/fixtures/mastodon-follow-activity.json

@@ -26,4 +26,4 @@
       "Emoji": "toot:Emoji"
     }
   ]
-}
+}

test/fixtures/mastodon-like.json

@@ -26,4 +26,4 @@
       "Emoji": "toot:Emoji"
     }
   ]
-}
+}

test/fixtures/mastodon-post-activity-hashtag.json

@@ -1,70 +1,66 @@
 {
-    "@context": [
+  "@context": [
-        "https://www.w3.org/ns/activitystreams",
+    "https://www.w3.org/ns/activitystreams",
-        "https://w3id.org/security/v1",
+    "https://w3id.org/security/v1",
-        {
+    {
-            "Emoji": "toot:Emoji",
+      "Emoji": "toot:Emoji",
-            "Hashtag": "as:Hashtag",
+      "Hashtag": "as:Hashtag",
-            "atomUri": "ostatus:atomUri",
+      "atomUri": "ostatus:atomUri",
-            "conversation": "ostatus:conversation",
+      "conversation": "ostatus:conversation",
-            "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-            "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-            "movedTo": "as:movedTo",
+      "movedTo": "as:movedTo",
-            "ostatus": "http://ostatus.org#",
+      "ostatus": "http://ostatus.org#",
-            "sensitive": "as:sensitive",
+      "sensitive": "as:sensitive",
-            "toot": "http://joinmastodon.org/ns#"
+      "toot": "http://joinmastodon.org/ns#"
-        }
+    }
-    ],
+  ],
-    "actor": "https://framapiaf.org/users/admin",
+  "actor": "https://framapiaf.org/users/admin",
+  "cc": [
+    "https://framapiaf.org/users/admin/followers",
+    "http://mobilizon.com/@tcit"
+  ],
+  "id": "https://framapiaf.org/users/admin/statuses/99512778738411822/activity",
+  "nickname": "lain",
+  "object": {
+    "atomUri": "https://framapiaf.org/users/admin/statuses/99512778738411822",
+    "attachment": [],
+    "attributedTo": "https://framapiaf.org/users/admin",
     "cc": [
-        "https://framapiaf.org/users/admin/followers",
+      "https://framapiaf.org/users/admin/followers",
-        "http://mobilizon.com/@tcit"
+      "https://framapiaf.org/users/tcit"
     ],
-    "id": "https://framapiaf.org/users/admin/statuses/99512778738411822/activity",
+    "content": "<p><span class=\"h-card\"><a href=\"https://framapiaf.org/users/tcit\" class=\"u-url mention\">@<span>tcit</span></a></span> #moo</p>",
-    "nickname": "lain",
+    "conversation": "tag:mastodon.example.org,2018-02-12:objectId=20:objectType=Conversation",
-    "object": {
+    "id": "https://framapiaf.org/users/admin/statuses/99512778738411822",
-        "atomUri": "https://framapiaf.org/users/admin/statuses/99512778738411822",
+    "inReplyTo": null,
-        "attachment": [],
+    "inReplyToAtomUri": null,
-        "attributedTo": "https://framapiaf.org/users/admin",
-        "cc": [
-            "https://framapiaf.org/users/admin/followers",
-            "https://framapiaf.org/users/tcit"
-        ],
-        "content": "<p><span class=\"h-card\"><a href=\"https://framapiaf.org/users/tcit\" class=\"u-url mention\">@<span>tcit</span></a></span> #moo</p>",
-        "conversation": "tag:mastodon.example.org,2018-02-12:objectId=20:objectType=Conversation",
-        "id": "https://framapiaf.org/users/admin/statuses/99512778738411822",
-        "inReplyTo": null,
-        "inReplyToAtomUri": null,
-        "published": "2018-02-12T14:08:20Z",
-        "sensitive": true,
-        "summary": "cw",
-        "tag": [
-            {
-                "href": "https://framapiaf.org/users/tcit",
-                "name": "@tcit@framapiaf.org",
-                "type": "Mention"
-            },
-            {
-                "href": "http://mastodon.example.org/tags/moo",
-                "name": "#moo",
-                "type": "Hashtag"
-            }
-        ],
-        "to": [
-            "https://www.w3.org/ns/activitystreams#Public"
-        ],
-        "type": "Note",
-        "url": "https://framapiaf.org/@admin/99512778738411822"
-    },
     "published": "2018-02-12T14:08:20Z",
-    "signature": {
+    "sensitive": true,
-        "created": "2018-02-12T14:08:20Z",
+    "summary": "cw",
-        "creator": "https://framapiaf.org/users/admin#main-key",
+    "tag": [
-        "signatureValue": "rnNfcopkc6+Ju73P806popcfwrK9wGYHaJVG1/ZvrlEbWVDzaHjkXqj9Q3/xju5l8CSn9tvSgCCtPFqZsFQwn/pFIFUcw7ZWB2xi4bDm3NZ3S4XQ8JRaaX7og5hFxAhWkGhJhAkfxVnOg2hG+w2d/7d7vRVSC1vo5ip4erUaA/PkWusZvPIpxnRWoXaxJsFmVx0gJgjpJkYDyjaXUlp+jmaoseeZ4EPQUWqHLKJ59PRG0mg8j2xAjYH9nQaN14qMRmTGPxY8gfv/CUFcatA+8VJU9KEsJkDAwLVvglydNTLGrxpAJU78a2eaht0foV43XUIZGe3DKiJPgE+UOKGCJw==",
+      {
-        "type": "RsaSignature2017"
+        "href": "https://framapiaf.org/users/tcit",
-    },
+        "name": "@tcit@framapiaf.org",
-    "to": [
+        "type": "Mention"
-        "https://www.w3.org/ns/activitystreams#Public"
+      },
+      {
+        "href": "http://mastodon.example.org/tags/moo",
+        "name": "#moo",
+        "type": "Hashtag"
+      }
     ],
-    "type": "Create"
+    "to": ["https://www.w3.org/ns/activitystreams#Public"],
+    "type": "Note",
+    "url": "https://framapiaf.org/@admin/99512778738411822"
+  },
+  "published": "2018-02-12T14:08:20Z",
+  "signature": {
+    "created": "2018-02-12T14:08:20Z",
+    "creator": "https://framapiaf.org/users/admin#main-key",
+    "signatureValue": "rnNfcopkc6+Ju73P806popcfwrK9wGYHaJVG1/ZvrlEbWVDzaHjkXqj9Q3/xju5l8CSn9tvSgCCtPFqZsFQwn/pFIFUcw7ZWB2xi4bDm3NZ3S4XQ8JRaaX7og5hFxAhWkGhJhAkfxVnOg2hG+w2d/7d7vRVSC1vo5ip4erUaA/PkWusZvPIpxnRWoXaxJsFmVx0gJgjpJkYDyjaXUlp+jmaoseeZ4EPQUWqHLKJ59PRG0mg8j2xAjYH9nQaN14qMRmTGPxY8gfv/CUFcatA+8VJU9KEsJkDAwLVvglydNTLGrxpAJU78a2eaht0foV43XUIZGe3DKiJPgE+UOKGCJw==",
+    "type": "RsaSignature2017"
+  },
+  "to": ["https://www.w3.org/ns/activitystreams#Public"],
+  "type": "Create"
 }

test/fixtures/mastodon-post-activity.json

@@ -1,65 +1,61 @@
 {
-    "@context": [
+  "@context": [
-        "https://www.w3.org/ns/activitystreams",
+    "https://www.w3.org/ns/activitystreams",
-        "https://w3id.org/security/v1",
+    "https://w3id.org/security/v1",
-        {
+    {
-            "Emoji": "toot:Emoji",
+      "Emoji": "toot:Emoji",
-            "Hashtag": "as:Hashtag",
+      "Hashtag": "as:Hashtag",
-            "atomUri": "ostatus:atomUri",
+      "atomUri": "ostatus:atomUri",
-            "conversation": "ostatus:conversation",
+      "conversation": "ostatus:conversation",
-            "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-            "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-            "movedTo": "as:movedTo",
+      "movedTo": "as:movedTo",
-            "ostatus": "http://ostatus.org#",
+      "ostatus": "http://ostatus.org#",
-            "sensitive": "as:sensitive",
+      "sensitive": "as:sensitive",
-            "toot": "http://joinmastodon.org/ns#"
+      "toot": "http://joinmastodon.org/ns#"
-        }
+    }
-    ],
+  ],
-    "actor": "https://framapiaf.org/users/admin",
+  "actor": "https://framapiaf.org/users/admin",
+  "cc": [
+    "https://framapiaf.org/users/admin/followers",
+    "http://mobilizon.com/@tcit"
+  ],
+  "id": "https://framapiaf.org/users/admin/statuses/99512778738411822/activity",
+  "nickname": "lain",
+  "object": {
+    "atomUri": "https://framapiaf.org/users/admin/statuses/99512778738411822",
+    "attachment": [],
+    "attributedTo": "https://framapiaf.org/users/admin",
     "cc": [
-        "https://framapiaf.org/users/admin/followers",
+      "https://framapiaf.org/users/admin/followers",
-        "http://mobilizon.com/@tcit"
+      "https://framapiaf.org/users/tcit"
     ],
-    "id": "https://framapiaf.org/users/admin/statuses/99512778738411822/activity",
+    "content": "<p><span class=\"h-card\"><a href=\"https://framapiaf.org/users/tcit\" class=\"u-url mention\">@<span>tcit</span></a></span></p>",
-    "nickname": "lain",
+    "conversation": "tag:mastodon.example.org,2018-02-12:objectId=20:objectType=Conversation",
-    "object": {
+    "id": "https://framapiaf.org/users/admin/statuses/99512778738411822",
-        "atomUri": "https://framapiaf.org/users/admin/statuses/99512778738411822",
+    "inReplyTo": null,
-        "attachment": [],
+    "inReplyToAtomUri": null,
-        "attributedTo": "https://framapiaf.org/users/admin",
-        "cc": [
-            "https://framapiaf.org/users/admin/followers",
-            "https://framapiaf.org/users/tcit"
-        ],
-        "content": "<p><span class=\"h-card\"><a href=\"https://framapiaf.org/users/tcit\" class=\"u-url mention\">@<span>tcit</span></a></span></p>",
-        "conversation": "tag:mastodon.example.org,2018-02-12:objectId=20:objectType=Conversation",
-        "id": "https://framapiaf.org/users/admin/statuses/99512778738411822",
-        "inReplyTo": null,
-        "inReplyToAtomUri": null,
-        "published": "2018-02-12T14:08:20Z",
-        "sensitive": true,
-        "summary": "cw",
-        "tag": [
-            {
-                "href": "https://framapiaf.org/users/tcit",
-                "name": "@tcit@framapiaf.org",
-                "type": "Mention"
-            }
-        ],
-        "to": [
-            "https://www.w3.org/ns/activitystreams#Public"
-        ],
-        "type": "Note",
-        "url": "https://framapiaf.org/@admin/99512778738411822"
-    },
     "published": "2018-02-12T14:08:20Z",
-    "signature": {
+    "sensitive": true,
-        "created": "2018-02-12T14:08:20Z",
+    "summary": "cw",
-        "creator": "https://framapiaf.org/users/admin#main-key",
+    "tag": [
-        "signatureValue": "rnNfcopkc6+Ju73P806popcfwrK9wGYHaJVG1/ZvrlEbWVDzaHjkXqj9Q3/xju5l8CSn9tvSgCCtPFqZsFQwn/pFIFUcw7ZWB2xi4bDm3NZ3S4XQ8JRaaX7og5hFxAhWkGhJhAkfxVnOg2hG+w2d/7d7vRVSC1vo5ip4erUaA/PkWusZvPIpxnRWoXaxJsFmVx0gJgjpJkYDyjaXUlp+jmaoseeZ4EPQUWqHLKJ59PRG0mg8j2xAjYH9nQaN14qMRmTGPxY8gfv/CUFcatA+8VJU9KEsJkDAwLVvglydNTLGrxpAJU78a2eaht0foV43XUIZGe3DKiJPgE+UOKGCJw==",
+      {
-        "type": "RsaSignature2017"
+        "href": "https://framapiaf.org/users/tcit",
-    },
+        "name": "@tcit@framapiaf.org",
-    "to": [
+        "type": "Mention"
-        "https://www.w3.org/ns/activitystreams#Public"
+      }
     ],
-    "type": "Create"
+    "to": ["https://www.w3.org/ns/activitystreams#Public"],
+    "type": "Note",
+    "url": "https://framapiaf.org/@admin/99512778738411822"
+  },
+  "published": "2018-02-12T14:08:20Z",
+  "signature": {
+    "created": "2018-02-12T14:08:20Z",
+    "creator": "https://framapiaf.org/users/admin#main-key",
+    "signatureValue": "rnNfcopkc6+Ju73P806popcfwrK9wGYHaJVG1/ZvrlEbWVDzaHjkXqj9Q3/xju5l8CSn9tvSgCCtPFqZsFQwn/pFIFUcw7ZWB2xi4bDm3NZ3S4XQ8JRaaX7og5hFxAhWkGhJhAkfxVnOg2hG+w2d/7d7vRVSC1vo5ip4erUaA/PkWusZvPIpxnRWoXaxJsFmVx0gJgjpJkYDyjaXUlp+jmaoseeZ4EPQUWqHLKJ59PRG0mg8j2xAjYH9nQaN14qMRmTGPxY8gfv/CUFcatA+8VJU9KEsJkDAwLVvglydNTLGrxpAJU78a2eaht0foV43XUIZGe3DKiJPgE+UOKGCJw==",
+    "type": "RsaSignature2017"
+  },
+  "to": ["https://www.w3.org/ns/activitystreams#Public"],
+  "type": "Create"
 }

test/fixtures/mastodon-undo-announce.json

@@ -1,47 +1,45 @@
 {
-   "type": "Undo",
+  "type": "Undo",
-   "signature": {
+  "signature": {
-     "type": "RsaSignature2017",
+    "type": "RsaSignature2017",
-     "signatureValue": "VU9AmHf3Pus9cWtMG/TOdxr+MRQfPHdTVKBBgFJBXhAlMhxEtcbxsu7zmqBgfIz6u0HpTCi5jRXEMftc228OJf/aBUkr4hyWADgcdmhPQgpibouDLgQf9BmnrPqb2rMbzZyt49GJkQZma8taLh077TTq6OKcnsAAJ1evEKOcRYS4OxBSwh4nI726bOXzZWoNzpTcrnm+llcUEN980sDSAS0uyZdb8AxZdfdG6DJQX4AkUD5qTpfqP/vC1ISirrNphvVhlxjUV9Amr4SYTsLx80vdZe5NjeL5Ir4jTIIQLedpxaDu1M9Q+Jpc0fYByQ2hOwUq8JxEmvHvarKjrq0Oww==",
+    "signatureValue": "VU9AmHf3Pus9cWtMG/TOdxr+MRQfPHdTVKBBgFJBXhAlMhxEtcbxsu7zmqBgfIz6u0HpTCi5jRXEMftc228OJf/aBUkr4hyWADgcdmhPQgpibouDLgQf9BmnrPqb2rMbzZyt49GJkQZma8taLh077TTq6OKcnsAAJ1evEKOcRYS4OxBSwh4nI726bOXzZWoNzpTcrnm+llcUEN980sDSAS0uyZdb8AxZdfdG6DJQX4AkUD5qTpfqP/vC1ISirrNphvVhlxjUV9Amr4SYTsLx80vdZe5NjeL5Ir4jTIIQLedpxaDu1M9Q+Jpc0fYByQ2hOwUq8JxEmvHvarKjrq0Oww==",
-     "creator": "http://mastodon.example.org/users/admin#main-key",
+    "creator": "http://mastodon.example.org/users/admin#main-key",
-     "created": "2018-05-11T16:23:45Z"
+    "created": "2018-05-11T16:23:45Z"
-   },
+  },
-   "object": {
+  "object": {
-     "type": "Announce",
+    "type": "Announce",
-     "to": [
+    "to": ["http://www.w3.org/ns/activitystreams#Public"],
-       "http://www.w3.org/ns/activitystreams#Public"
+    "published": "2018-05-11T16:23:37Z",
-     ],
+    "object": "https://framapiaf.org/@Framasoft/statuses/102501959686438400",
-     "published": "2018-05-11T16:23:37Z",
+    "id": "https://framapiaf.org/users/Framasoft/statuses/102501959686438400/activity",
-     "object": "https://framapiaf.org/@Framasoft/statuses/102501959686438400",
+    "cc": [
-     "id": "https://framapiaf.org/users/Framasoft/statuses/102501959686438400/activity",
+      "https://framapiaf.org/users/Framasoft/",
-     "cc": [
+      "https://framapiaf.org/users/Framasoft/followers"
-       "https://framapiaf.org/users/Framasoft/",
+    ],
-       "https://framapiaf.org/users/Framasoft/followers"
+    "atomUri": "https://framapiaf.org/users/Framasoft/statuses/102501959686438400/activity",
-     ],
+    "actor": "https://framapiaf.org/users/Framasoft"
-     "atomUri": "https://framapiaf.org/users/Framasoft/statuses/102501959686438400/activity",
+  },
-     "actor": "https://framapiaf.org/users/Framasoft"
+  "id": "https://framapiaf.org/users/Framasoft#announces/100011594053806179/undo",
-   },
+  "actor": "https://framapiaf.org/users/Framasoft",
-   "id": "https://framapiaf.org/users/Framasoft#announces/100011594053806179/undo",
+  "@context": [
-   "actor": "https://framapiaf.org/users/Framasoft",
+    "http://www.w3.org/ns/activitystreams",
-   "@context": [
+    "http://w3id.org/security/v1",
-     "http://www.w3.org/ns/activitystreams",
+    {
-     "http://w3id.org/security/v1",
+      "toot": "http://joinmastodon.org/ns#",
-     {
+      "sensitive": "as:sensitive",
-       "toot": "http://joinmastodon.org/ns#",
+      "ostatus": "http://ostatus.org#",
-       "sensitive": "as:sensitive",
+      "movedTo": "as:movedTo",
-       "ostatus": "http://ostatus.org#",
+      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-       "movedTo": "as:movedTo",
+      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-       "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+      "focalPoint": {
-       "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+        "@id": "toot:focalPoint",
-       "focalPoint": {
+        "@container": "@list"
-         "@id": "toot:focalPoint",
+      },
-         "@container": "@list"
+      "featured": "toot:featured",
-       },
+      "conversation": "ostatus:conversation",
-       "featured": "toot:featured",
+      "atomUri": "ostatus:atomUri",
-       "conversation": "ostatus:conversation",
+      "Hashtag": "as:Hashtag",
-       "atomUri": "ostatus:atomUri",
+      "Emoji": "toot:Emoji"
-       "Hashtag": "as:Hashtag",
+    }
-       "Emoji": "toot:Emoji"
+  ]
-     }
-   ]
 }

test/fixtures/mastodon-undo-like.json

@@ -31,4 +31,4 @@
       "Emoji": "toot:Emoji"
     }
   ]
-}
+}

test/fixtures/mastodon-unfollow-activity.json

@@ -1,34 +1,34 @@
 {
-   "@context":[
+  "@context": [
-      "https://www.w3.org/ns/activitystreams",
+    "https://www.w3.org/ns/activitystreams",
-      "https://w3id.org/security/v1",
+    "https://w3id.org/security/v1",
-      {
+    {
-         "toot":"http://joinmastodon.org/ns#",
+      "toot": "http://joinmastodon.org/ns#",
-         "sensitive":"as:sensitive",
+      "sensitive": "as:sensitive",
-         "ostatus":"http://ostatus.org#",
+      "ostatus": "http://ostatus.org#",
-         "movedTo":"as:movedTo",
+      "movedTo": "as:movedTo",
-         "manuallyApprovesFollowers":"as:manuallyApprovesFollowers",
+      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-         "inReplyToAtomUri":"ostatus:inReplyToAtomUri",
+      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-         "conversation":"ostatus:conversation",
+      "conversation": "ostatus:conversation",
-         "atomUri":"ostatus:atomUri",
+      "atomUri": "ostatus:atomUri",
-         "Hashtag":"as:Hashtag",
+      "Hashtag": "as:Hashtag",
-         "Emoji":"toot:Emoji"
+      "Emoji": "toot:Emoji"
-      }
+    }
-   ],
+  ],
-   "signature":{
+  "signature": {
-      "type":"RsaSignature2017",
+    "type": "RsaSignature2017",
-      "signatureValue":"Kn1/UkAQGJVaXBfWLAHcnwHg8YMAUqlEaBuYLazAG+pz5hqivsyrBmPV186Xzr+B4ZLExA9+SnOoNx/GOz4hBm0kAmukNSILAsUd84tcJ2yT9zc1RKtembK4WiwOw7li0+maeDN0HaB6t+6eTqsCWmtiZpprhXD8V1GGT8yG7X24fQ9oFGn+ng7lasbcCC0988Y1eGqNe7KryxcPuQz57YkDapvtONzk8gyLTkZMV4De93MyRHq6GVjQVIgtiYabQAxrX6Q8C+4P/jQoqdWJHEe+MY5JKyNaT/hMPt2Md1ok9fZQBGHlErk22/zy8bSN19GdG09HmIysBUHRYpBLig==",
+    "signatureValue": "Kn1/UkAQGJVaXBfWLAHcnwHg8YMAUqlEaBuYLazAG+pz5hqivsyrBmPV186Xzr+B4ZLExA9+SnOoNx/GOz4hBm0kAmukNSILAsUd84tcJ2yT9zc1RKtembK4WiwOw7li0+maeDN0HaB6t+6eTqsCWmtiZpprhXD8V1GGT8yG7X24fQ9oFGn+ng7lasbcCC0988Y1eGqNe7KryxcPuQz57YkDapvtONzk8gyLTkZMV4De93MyRHq6GVjQVIgtiYabQAxrX6Q8C+4P/jQoqdWJHEe+MY5JKyNaT/hMPt2Md1ok9fZQBGHlErk22/zy8bSN19GdG09HmIysBUHRYpBLig==",
-      "creator":"https://social.tcit.fr/users/tcit#main-key",
+    "creator": "https://social.tcit.fr/users/tcit#main-key",
-      "created":"2018-02-17T13:29:31Z"
+    "created": "2018-02-17T13:29:31Z"
-   },
+  },
-   "type":"Undo",
+  "type": "Undo",
-   "object":{
+  "object": {
-      "type":"Follow",
+    "type": "Follow",
-      "object":"http://localtesting.pleroma.lol/users/lain",
+    "object": "http://localtesting.pleroma.lol/users/lain",
-      "nickname":"lain",
+    "nickname": "lain",
-      "id":"https://social.tcit.fr/users/tcit#follows/2",
+    "id": "https://social.tcit.fr/users/tcit#follows/2",
-      "actor":"https://social.tcit.fr/users/tcit"
+    "actor": "https://social.tcit.fr/users/tcit"
-   },
+  },
-   "actor":"https://social.tcit.fr/users/tcit",
+  "actor": "https://social.tcit.fr/users/tcit",
-   "id": "https://social.tcit.fr/users/tcit#follow/2/undo"
+  "id": "https://social.tcit.fr/users/tcit#follow/2/undo"
 }

test/fixtures/mobilizon-invite-activity.json

@@ -39,4 +39,4 @@
       "uuid": "sc:identifier"
     }
   ]
-}
+}

test/fixtures/mobilizon-join-activity.json

@@ -38,4 +38,4 @@
       "uuid": "sc:identifier"
     }
   ]
-}
+}

test/fixtures/mobilizon-leave-activity.json

@@ -38,4 +38,4 @@
       "uuid": "sc:identifier"
     }
   ]
-}
+}

test/fixtures/mobilizon-members-collection.json

@@ -1,84 +1,84 @@
 {
-    "@context": [
+  "@context": [
-      "https://www.w3.org/ns/activitystreams",
+    "https://www.w3.org/ns/activitystreams",
-      "https://litepub.social/litepub/context.jsonld",
+    "https://litepub.social/litepub/context.jsonld",
+    {
+      "Hashtag": "as:Hashtag",
+      "PostalAddress": "sc:PostalAddress",
+      "address": {
+        "@id": "sc:address",
+        "@type": "sc:PostalAddress"
+      },
+      "addressCountry": "sc:addressCountry",
+      "addressLocality": "sc:addressLocality",
+      "addressRegion": "sc:addressRegion",
+      "anonymousParticipationEnabled": {
+        "@id": "mz:anonymousParticipationEnabled",
+        "@type": "sc:Boolean"
+      },
+      "category": "sc:category",
+      "commentsEnabled": {
+        "@id": "pt:commentsEnabled",
+        "@type": "sc:Boolean"
+      },
+      "ical": "http://www.w3.org/2002/12/cal/ical#",
+      "joinMode": {
+        "@id": "mz:joinMode",
+        "@type": "mz:joinModeType"
+      },
+      "joinModeType": {
+        "@id": "mz:joinModeType",
+        "@type": "rdfs:Class"
+      },
+      "location": {
+        "@id": "sc:location",
+        "@type": "sc:Place"
+      },
+      "maximumAttendeeCapacity": "sc:maximumAttendeeCapacity",
+      "mz": "https://joinmobilizon.org/ns#",
+      "participationMessage": {
+        "@id": "mz:participationMessage",
+        "@type": "sc:Text"
+      },
+      "postalCode": "sc:postalCode",
+      "pt": "https://joinpeertube.org/ns#",
+      "repliesModerationOption": {
+        "@id": "mz:repliesModerationOption",
+        "@type": "mz:repliesModerationOptionType"
+      },
+      "repliesModerationOptionType": {
+        "@id": "mz:repliesModerationOptionType",
+        "@type": "rdfs:Class"
+      },
+      "sc": "http://schema.org#",
+      "streetAddress": "sc:streetAddress",
+      "uuid": "sc:identifier"
+    }
+  ],
+  "attributedTo": "http://mobilizon.test/@demo",
+  "first": {
+    "attributedTo": "http://mobilizon.test/@demo",
+    "id": "http://mobilizon.test/@demo/members?page=1",
+    "orderedItems": [
       {
-        "Hashtag": "as:Hashtag",
+        "actor": "http://mobilizon.test/@tcit",
-        "PostalAddress": "sc:PostalAddress",
+        "id": "http://mobilizon.test/member/2fec2e84-5719-48f9-92bd-077f50ff2e6e",
-        "address": {
+        "object": "http://mobilizon.test/@demo",
-          "@id": "sc:address",
+        "role": "administrator",
-          "@type": "sc:PostalAddress"
+        "type": "Member"
-        },
+      },
-        "addressCountry": "sc:addressCountry",
+      {
-        "addressLocality": "sc:addressLocality",
+        "actor": "http://mobilizon2.com/@tcit",
-        "addressRegion": "sc:addressRegion",
+        "id": "http://mobilizon.test/member/13b0fc1e-2ceb-401c-bef7-0eba02fb92dc",
-        "anonymousParticipationEnabled": {
+        "object": "http://mobilizon.test/@demo",
-          "@id": "mz:anonymousParticipationEnabled",
+        "role": "member",
-          "@type": "sc:Boolean"
+        "type": "Member"
-        },
-        "category": "sc:category",
-        "commentsEnabled": {
-          "@id": "pt:commentsEnabled",
-          "@type": "sc:Boolean"
-        },
-        "ical": "http://www.w3.org/2002/12/cal/ical#",
-        "joinMode": {
-          "@id": "mz:joinMode",
-          "@type": "mz:joinModeType"
-        },
-        "joinModeType": {
-          "@id": "mz:joinModeType",
-          "@type": "rdfs:Class"
-        },
-        "location": {
-          "@id": "sc:location",
-          "@type": "sc:Place"
-        },
-        "maximumAttendeeCapacity": "sc:maximumAttendeeCapacity",
-        "mz": "https://joinmobilizon.org/ns#",
-        "participationMessage": {
-          "@id": "mz:participationMessage",
-          "@type": "sc:Text"
-        },
-        "postalCode": "sc:postalCode",
-        "pt": "https://joinpeertube.org/ns#",
-        "repliesModerationOption": {
-          "@id": "mz:repliesModerationOption",
-          "@type": "mz:repliesModerationOptionType"
-        },
-        "repliesModerationOptionType": {
-          "@id": "mz:repliesModerationOptionType",
-          "@type": "rdfs:Class"
-        },
-        "sc": "http://schema.org#",
-        "streetAddress": "sc:streetAddress",
-        "uuid": "sc:identifier"
       }
     ],
-    "attributedTo": "http://mobilizon.test/@demo",
+    "partOf": "http://mobilizon.test/@demo/members",
-    "first": {
+    "type": "OrderedCollectionPage"
-      "attributedTo": "http://mobilizon.test/@demo",
+  },
-      "id": "http://mobilizon.test/@demo/members?page=1",
+  "id": "http://mobilizon.test/@demo/members",
-      "orderedItems": [
+  "totalItems": 2,
-        {
+  "type": "OrderedCollection"
-          "actor": "http://mobilizon.test/@tcit",
+}
-          "id": "http://mobilizon.test/member/2fec2e84-5719-48f9-92bd-077f50ff2e6e",
-          "object": "http://mobilizon.test/@demo",
-          "role": "administrator",
-          "type": "Member"
-        },
-        {
-          "actor": "http://mobilizon2.com/@tcit",
-          "id": "http://mobilizon.test/member/13b0fc1e-2ceb-401c-bef7-0eba02fb92dc",
-          "object": "http://mobilizon.test/@demo",
-          "role": "member",
-          "type": "Member"
-        }
-      ],
-      "partOf": "http://mobilizon.test/@demo/members",
-      "type": "OrderedCollectionPage"
-    },
-    "id": "http://mobilizon.test/@demo/members",
-    "totalItems": 2,
-    "type": "OrderedCollection"
-  }

test/fixtures/prismo-url-map.json

@@ -1,65 +1,61 @@
 {
-    "id": "https://prismo.news/posts/83#Create",
+  "id": "https://prismo.news/posts/83#Create",
-    "type": "Create",
+  "type": "Create",
-    "actor": [
+  "actor": [
-        {
+    {
-            "type": "Person",
+      "type": "Person",
-            "id": "https://prismo.news/@mxb"
+      "id": "https://prismo.news/@mxb"
-        }
-    ],
-    "to": [
-        "https://www.w3.org/ns/activitystreams#Public"
-    ],
-    "object": {
-        "id": "https://prismo.news/posts/83",
-        "type": "Article",
-        "name": "Introducing: Federated follows!",
-        "published": "2018-11-01T07:10:05Z",
-        "content": "We are more than thrilled to announce that Prismo now supports federated follows! It means you ca...",
-        "url": {
-            "type": "Link",
-            "mimeType": "text/html",
-            "href": "https://prismo.news/posts/83"
-        },
-        "votes": 12,
-        "attributedTo": [
-            {
-                "type": "Person",
-                "id": "https://prismo.news/@mxb"
-            }
-        ],
-        "to": [
-            "https://www.w3.org/ns/activitystreams#Public"
-        ],
-        "tags": [
-            {
-                "type": "Hashtag",
-                "href": "https://prismo.news/tags/prismo",
-                "name": "#prismo"
-            },
-            {
-                "type": "Hashtag",
-                "href": "https://prismo.news/tags/prismodev",
-                "name": "#prismodev"
-            },
-            {
-                "type": "Hashtag",
-                "href": "https://prismo.news/tags/meta",
-                "name": "#meta"
-            }
-        ],
-        "@context": [
-            "https://www.w3.org/ns/activitystreams",
-            "https://w3id.org/security/v1",
-            {
-                "Hashtag": "as:Hashtag"
-            },
-            {
-                "votes": {
-                    "@id": "as:votes",
-                    "@type": "@id"
-                }
-            }
-        ]
     }
+  ],
+  "to": ["https://www.w3.org/ns/activitystreams#Public"],
+  "object": {
+    "id": "https://prismo.news/posts/83",
+    "type": "Article",
+    "name": "Introducing: Federated follows!",
+    "published": "2018-11-01T07:10:05Z",
+    "content": "We are more than thrilled to announce that Prismo now supports federated follows! It means you ca...",
+    "url": {
+      "type": "Link",
+      "mimeType": "text/html",
+      "href": "https://prismo.news/posts/83"
+    },
+    "votes": 12,
+    "attributedTo": [
+      {
+        "type": "Person",
+        "id": "https://prismo.news/@mxb"
+      }
+    ],
+    "to": ["https://www.w3.org/ns/activitystreams#Public"],
+    "tags": [
+      {
+        "type": "Hashtag",
+        "href": "https://prismo.news/tags/prismo",
+        "name": "#prismo"
+      },
+      {
+        "type": "Hashtag",
+        "href": "https://prismo.news/tags/prismodev",
+        "name": "#prismodev"
+      },
+      {
+        "type": "Hashtag",
+        "href": "https://prismo.news/tags/meta",
+        "name": "#meta"
+      }
+    ],
+    "@context": [
+      "https://www.w3.org/ns/activitystreams",
+      "https://w3id.org/security/v1",
+      {
+        "Hashtag": "as:Hashtag"
+      },
+      {
+        "votes": {
+          "@id": "as:votes",
+          "@type": "@id"
+        }
+      }
+    ]
+  }
 }