Merge branch 'main' of https://framagit.org/framasoft/mobilizon into fomo-3.1.0

Update to 3.1.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM elixir:alpine
+FROM elixir:1.13.4-alpine
 
 RUN apk add --no-cache inotify-tools postgresql-client yarn file make gcc libc-dev argon2 imagemagick cmake build-base libwebp-tools bash ncurses git python3
 
@@ -7,3 +7,4 @@ RUN mix local.hex --force && mix local.rebar --force
 WORKDIR /app
 
 EXPOSE 4000
+EXPOSE 5173

config/config.exs

@@ -189,7 +189,6 @@ config :mobilizon, Mobilizon.Service.Formatter,
 config :tesla, adapter: Tesla.Adapter.Hackney
 
 config :phoenix, :format_encoders, json: Jason, "activity-json": Jason
-config :phoenix, :json_library, Jason
 config :phoenix, :filter_parameters, ["password", "token"]
 
 config :absinthe, schema: Mobilizon.GraphQL.Schema

docker-compose.yml

@@ -19,6 +19,7 @@ services:
       - ".:/app"
     ports:
       - 4000:4000
+      - 5173:5173
     depends_on:
       - postgres
     environment:

flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1684215771,
+        "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,29 @@
+{
+  description = "A very basic flake";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+  outputs = { self, nixpkgs }: {
+
+    packages.x86_64-linux.hello = nixpkgs.legacyPackages.x86_64-linux.hello;
+
+    packages.x86_64-linux.default = self.packages.x86_64-linux.hello;
+
+    devShells.x86_64-linux.default = let
+      pkgs = import nixpkgs { system = "x86_64-linux"; };
+    in pkgs.mkShell {
+      buildInputs = with pkgs; [
+        elixir
+        mix2nix
+        cmake
+        imagemagick
+        (yarn.override {
+          nodejs = nodejs-16_x;
+        })
+        yarn2nix
+        nodejs-16_x
+      ];
+    };
+
+  };
+}

js/public/img/icons/favicon.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><path style="opacity:1;fill:#fea72b;fill-opacity:1;stroke:none;stroke-opacity:1" d="M-5.801-6.164h72.69v72.871h-72.69z"/><g data-name="Calque 2"><g data-name="header"><path d="M26.58 27.06q0 8-4.26 12.3a12.21 12.21 0 0 1-9 3.42 12.21 12.21 0 0 1-9-3.42Q0 35.1 0 27.06q0-8.04 4.26-12.3a12.21 12.21 0 0 1 9-3.42 12.21 12.21 0 0 1 9 3.42q4.32 4.24 4.32 12.3zM13.29 17q-5.67 0-5.67 10.06t5.67 10.08q5.71 0 5.71-10.08T13.29 17z" style="fill:#3a384c;fill-opacity:1" transform="translate(14.627 5.256) scale(1.15671)"/><path d="M9 6.78a7.37 7.37 0 0 1-.6-3 7.37 7.37 0 0 1 .6-3A8.09 8.09 0 0 1 12.83 0a7.05 7.05 0 0 1 3.69.84 7.37 7.37 0 0 1 .6 3 7.37 7.37 0 0 1-.6 3 7.46 7.46 0 0 1-3.87.84A6.49 6.49 0 0 1 9 6.78z" style="fill:#fff" transform="translate(14.627 5.256) scale(1.15671)"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><path style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#3c3c3c;stroke-opacity:0" d="m -5.801,-6.164 h 72.69 v 72.871 h -72.69 z"/><g data-name="icon"><g data-name="header"><path d="M 22.046275,57.767824 H 21.898116 L 15.171689,53.856422 Q 14.964267,53.737894 14.964267,53.50084 L 14.845739,16.223989 q 0.02963,-0.207422 0.207423,-0.32595 22.964673,-13.2750625 23.083201,-13.2750625 0.118527,0 6.874586,3.9410343 l 0.05926,0.059264 0.05926,0.029632 v 0.029632 h 0.02963 l 0.05926,0.1185274 0.02963,4.5040395 q -0.02963,0.237054 -0.207423,0.355582 L 26.165101,22.535571 v 3.407661 q 11.911998,-6.874586 12.030525,-6.874586 0.0889,0 3.496557,1.985333 3.407661,1.955701 3.407661,1.985333 h 0.02963 v 0.02963 q 0.02963,0.02963 0.02963,0.05926 0.02963,0 0.02963,0 0.02963,0 0.02963,0.02963 l 0.02963,0.148159 h 0.02963 v 4.444776 q 0,0.207423 -0.207423,0.32595 l -18.845848,10.904516 0.02963,16.208614 q 0,0.207423 -0.207423,0.32595 -3.852138,2.25202 -4.000298,2.25202 z M 26.194733,33.677141 44.06273,23.365262 38.195626,19.927969 26.194733,26.861819 Z m -4.563303,22.994305 -0.0889,-36.298999 -5.867103,-3.437294 0.0889,36.328632 z M 21.927748,19.661282 44.003466,6.9195928 38.136363,3.5119316 16.060645,16.253621 Z" style="stroke-opacity:1;fill:#ffffff;stroke:#ffffff;stroke-width:0.782;stroke-dasharray:none"/></g></g></svg>

js/public/img/icons/safari-pinned-tab.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><path style="opacity:1;fill:#fea72b;fill-opacity:1;stroke:none;stroke-opacity:1" d="M-5.801-6.164h72.69v72.871h-72.69z"/><g data-name="Calque 2"><g data-name="header"><path d="M26.58 27.06q0 8-4.26 12.3a12.21 12.21 0 0 1-9 3.42 12.21 12.21 0 0 1-9-3.42Q0 35.1 0 27.06q0-8.04 4.26-12.3a12.21 12.21 0 0 1 9-3.42 12.21 12.21 0 0 1 9 3.42q4.32 4.24 4.32 12.3zM13.29 17q-5.67 0-5.67 10.06t5.67 10.08q5.71 0 5.71-10.08T13.29 17z" style="fill:#3a384c;fill-opacity:1" transform="translate(14.627 5.256) scale(1.15671)"/><path d="M9 6.78a7.37 7.37 0 0 1-.6-3 7.37 7.37 0 0 1 .6-3A8.09 8.09 0 0 1 12.83 0a7.05 7.05 0 0 1 3.69.84 7.37 7.37 0 0 1 .6 3 7.37 7.37 0 0 1-.6 3 7.46 7.46 0 0 1-3.87.84A6.49 6.49 0 0 1 9 6.78z" style="fill:#fff" transform="translate(14.627 5.256) scale(1.15671)"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60"><path style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#3c3c3c;stroke-opacity:0" d="m -5.801,-6.164 h 72.69 v 72.871 h -72.69 z"/><g data-name="icon"><g data-name="header"><path d="M 22.046275,57.767824 H 21.898116 L 15.171689,53.856422 Q 14.964267,53.737894 14.964267,53.50084 L 14.845739,16.223989 q 0.02963,-0.207422 0.207423,-0.32595 22.964673,-13.2750625 23.083201,-13.2750625 0.118527,0 6.874586,3.9410343 l 0.05926,0.059264 0.05926,0.029632 v 0.029632 h 0.02963 l 0.05926,0.1185274 0.02963,4.5040395 q -0.02963,0.237054 -0.207423,0.355582 L 26.165101,22.535571 v 3.407661 q 11.911998,-6.874586 12.030525,-6.874586 0.0889,0 3.496557,1.985333 3.407661,1.955701 3.407661,1.985333 h 0.02963 v 0.02963 q 0.02963,0.02963 0.02963,0.05926 0.02963,0 0.02963,0 0.02963,0 0.02963,0.02963 l 0.02963,0.148159 h 0.02963 v 4.444776 q 0,0.207423 -0.207423,0.32595 l -18.845848,10.904516 0.02963,16.208614 q 0,0.207423 -0.207423,0.32595 -3.852138,2.25202 -4.000298,2.25202 z M 26.194733,33.677141 44.06273,23.365262 38.195626,19.927969 26.194733,26.861819 Z m -4.563303,22.994305 -0.0889,-36.298999 -5.867103,-3.437294 0.0889,36.328632 z M 21.927748,19.661282 44.003466,6.9195928 38.136363,3.5119316 16.060645,16.253621 Z" style="stroke-opacity:1;fill:#ffffff;stroke:#ffffff;stroke-width:0.782;stroke-dasharray:none"/></g></g></svg>

js/public/img/shape-1.svg

@@ -2,8 +2,8 @@
               <svg id="sw-js-blob-svg" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" version="1.1">
                     <defs> 
                         <linearGradient id="sw-gradient" x1="0" x2="1" y1="1" y2="0">
-                            <stop id="stop1" stop-color="rgba(255, 231.287, 78.545, 0.3)" offset="0%"></stop>
-                            <stop id="stop2" stop-color="rgba(254.848, 165.324, 149.009, 0.25)" offset="100%"></stop>
+                            <stop id="stop1" stop-color="rgba(33, 190, 243, 0.3)" offset="0%"></stop>
+                            <stop id="stop2" stop-color="rgba(50, 117, 191, 0.25)" offset="100%"></stop>
                         </linearGradient>
                     </defs>
                 <path fill="url(#sw-gradient)" d="M18.2,-13.5C23.5,-7.8,27.8,-0.2,27.7,8.7C27.5,17.6,22.9,27.8,14.1,33.9C5.3,39.9,-7.8,41.6,-17.7,36.8C-27.6,32,-34.2,20.7,-37.1,8.4C-39.9,-3.9,-39,-17.2,-32.2,-23.2C-25.4,-29.3,-12.7,-28.3,-3.1,-25.8C6.4,-23.3,12.8,-19.3,18.2,-13.5Z" width="100%" height="100%" transform="translate(50 50)" style="transition: all 0.3s ease 0s;" stroke-width="0" stroke="url(#sw-gradient)"></path>

js/public/img/shape-2.svg

@@ -2,8 +2,8 @@
               <svg id="sw-js-blob-svg" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" version="1.1">
                     <defs> 
                         <linearGradient id="sw-gradient" x1="0" x2="1" y1="1" y2="0">
-                            <stop id="stop1" stop-color="rgba(181.058, 255, 167.816, 0.2)" offset="0%"></stop>
-                            <stop id="stop2" stop-color="rgba(149.009, 254.848, 251.263, 0.25)" offset="100%"></stop>
+                            <stop id="stop1" stop-color="rgba(33, 190, 243, 0.2)" offset="0%"></stop>
+                            <stop id="stop2" stop-color="rgba(228, 76, 226, 0.25)" offset="100%"></stop>
                         </linearGradient>
                     </defs>
                 <path fill="url(#sw-gradient)" d="M20.2,-14.3C28.2,-6,38.3,2.5,37.6,9.8C36.9,17.1,25.5,23.1,15.5,25.2C5.6,27.3,-2.9,25.4,-11.2,21.9C-19.6,18.4,-27.9,13.3,-30.8,5.6C-33.7,-2.1,-31.2,-12.5,-25.2,-20.4C-19.1,-28.3,-9.6,-33.7,-1.8,-32.3C6.1,-30.9,12.1,-22.7,20.2,-14.3Z" width="100%" height="100%" transform="translate(50 50)" style="transition: all 0.3s ease 0s;" stroke-width="0" stroke="url(#sw-gradient)"></path>

js/public/img/shape-3.svg

@@ -2,8 +2,8 @@
               <svg id="sw-js-blob-svg" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" version="1.1">
                     <defs> 
                         <linearGradient id="sw-gradient" x1="0" x2="1" y1="1" y2="0">
-                            <stop id="stop1" stop-color="rgba(172.198, 167.816, 255, 0.2)" offset="0%"></stop>
-                            <stop id="stop2" stop-color="rgba(236.8, 149.009, 254.848, 0.25)" offset="100%"></stop>
+                            <stop id="stop1" stop-color="rgba(206, 61, 204, 0.2)" offset="0%"></stop>
+                            <stop id="stop2" stop-color="rgba(158, 158, 242, 0.25)" offset="100%"></stop>
                         </linearGradient>
                     </defs>
                 <path fill="url(#sw-gradient)" d="M25.3,-21.5C29.4,-15.2,26.8,-4.8,23.6,3.8C20.4,12.5,16.5,19.4,10.2,23.2C3.9,27,-4.8,27.6,-12.6,24.5C-20.3,21.4,-27,14.6,-30.1,5.6C-33.2,-3.4,-32.6,-14.4,-26.9,-21.1C-21.3,-27.8,-10.7,-30.1,0,-30.1C10.7,-30.1,21.3,-27.8,25.3,-21.5Z" width="100%" height="100%" transform="translate(50 50)" style="transition: all 0.3s ease 0s;" stroke-width="0" stroke="url(#sw-gradient)"></path>

js/src/App.vue

@@ -322,6 +322,11 @@ onBeforeUnmount(() => {
   }
 }
 
+.w-full .mbz-card {
+  width: 20rem;
+  max-width: 95%;
+}
+
 .vue-skip-to {
   z-index: 40;
 }

js/src/assets/images/default_logo.svg

@@ -0,0 +1,31 @@
+  <svg
+    class="bg-white dark:bg-zinc-900 dark:fill-white"
+    :class="{ 'bg-gray-900': invert }"
+    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="currentColor"
+      />
+      <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="currentColor"
+      />
+      <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="currentColor"
+      />
+    </g>
+  </svg>

js/src/assets/tailwind.css

@@ -24,7 +24,7 @@
 
 @layer components {
   .mbz-card {
-    @apply block bg-mbz-yellow-alt-300 hover:bg-mbz-yellow-alt-200 text-violet-title dark:text-white dark:hover:text-white rounded-lg dark:border-violet-title shadow-md dark:bg-mbz-purple dark:hover:dark:bg-mbz-purple-400 dark:text-white dark:hover:text-white;
+    @apply block bg-white hover:bg-gray-100 text-violet-title dark:text-white dark:hover:text-white rounded-lg dark:border-violet-title shadow-md dark:bg-mbz-purple dark:hover:dark:bg-mbz-purple-400 dark:text-white dark:hover:text-white;
   }
 }
 

js/src/components/Address/InlineAddress.vue

@@ -10,7 +10,7 @@
   >
     <MapMarker />
     <span v-if="physicalAddress.locality">
-      {{ physicalAddress.locality }}
+      {{ physicalAddress.description }}, {{ physicalAddress.locality }}
     </span>
     <span v-else>
       {{ physicalAddress.description }}

js/src/components/Event/DateCalendarIcon.vue

@@ -4,7 +4,11 @@
     :class="{ small }"
     :style="`--small: ${smallStyle}`"
   >
-    <div class="datetime-container-header" />
+    <div class="datetime-container-header">
+      <time :datetime="dateObj.toISOString()" class="weekday">{{
+        weekday
+      }}</time>
+    </div>
     <div class="datetime-container-content">
       <time :datetime="dateObj.toISOString()" class="day block font-semibold">{{
         day
@@ -12,12 +16,12 @@
       <time
         :datetime="dateObj.toISOString()"
         class="month font-semibold block uppercase py-1 px-0"
-        >{{ month }}</time
-      >
+        >{{ month }}</time>
     </div>
   </div>
 </template>
 <script lang="ts" setup>
+import { localeShortWeekDayNames } from "@/utils/datetime";
 import { computed } from "vue";
 
 const props = withDefaults(
@@ -38,6 +42,10 @@ const day = computed<string>(() =>
   dateObj.value.toLocaleString(undefined, { day: "numeric" })
 );
 
+const weekday = computed<string>(() =>
+  dateObj.value.toLocaleString(undefined, { weekday: "short" })
+);
+
 const smallStyle = computed<string>(() => (props.small ? "1.2" : "2"));
 </script>
 
@@ -51,6 +59,13 @@ div.datetime-container {
     height: calc(10px * var(--small));
     background: #f3425f;
   }
+  .datetime-container-header .weekday
+  {
+    font-size: calc(9px * var(--small));
+    font-weight: bold;
+    vertical-align: top;
+    line-height: calc(9px * var(--small));
+  }
   .datetime-container-content {
     height: calc(30px * var(--small));
   }

js/src/components/Event/EventCard.vue

@@ -3,7 +3,7 @@
     class="mbz-card snap-center dark:bg-mbz-purple"
     :class="{
       'sm:flex sm:items-start': mode === 'row',
-      'sm:max-w-xs w-[18rem] shrink-0 flex flex-col': mode === 'column',
+      'sm:max-w-xs shrink-0 flex flex-col': mode === 'column',
     }"
     :to="to"
     :isInternal="isInternal"
@@ -58,6 +58,16 @@
             :date="event.beginsOn.toString()"
           />
         </div>
+        <div
+          class="-mt-3 h-0 flex mb-3 ltr:ml-0 rtl:mr-0 items-end self-end"
+          :class="{ 'sm:hidden': mode === 'row' }"
+        >
+          <start-time-icon
+            :small="true"
+            v-if="!mergedOptions.hideDate"
+            :date="event.beginsOn.toString()"
+          />
+        </div>
         <span
           class="text-gray-700 dark:text-white font-semibold hidden"
           :class="{ 'sm:block': mode === 'row' }"
@@ -73,7 +83,7 @@
           </h2>
           <div class="">
             <div
-              class="flex items-center text-violet-3 dark:text-white"
+              class="bg-fomo-blue flex items-center text-violet-3 dark:text-white"
               dir="auto"
             >
               <figure class="" v-if="actorAvatarURL">
@@ -91,7 +101,7 @@
                 {{ organizerDisplayName(event) }}
               </span>
             </div>
-            <inline-address
+            <inline-address class="bg-fomo-purple"
               v-if="event.physicalAddress"
               :physical-address="event.physicalAddress"
             />
@@ -161,6 +171,7 @@ import {
   organizerAvatarUrl,
 } from "@/types/event.model";
 import DateCalendarIcon from "@/components/Event/DateCalendarIcon.vue";
+import StartTimeIcon from "@/components/Event/StartTimeIcon.vue";
 import LazyImageWrapper from "@/components/Image/LazyImageWrapper.vue";
 import { EventStatus } from "@/types/enums";
 import RouteName from "../../router/name";

js/src/components/Event/EventParticipationCard.vue

@@ -3,7 +3,7 @@
     class="bg-white dark:bg-mbz-purple dark:hover:bg-mbz-purple-400 mb-5 mt-4 pb-2 md:p-0 rounded-t-lg"
   >
     <div
-      class="bg-mbz-yellow-alt-100 flex p-2 text-violet-title rounded-t-lg"
+      class="bg-fomo-blue flex p-2 text-violet-title rounded-t-lg"
       dir="auto"
     >
       <figure

js/src/components/Event/StartTimeIcon.vue

@@ -0,0 +1,53 @@
+<template>
+  <div
+    class="starttime-container flex flex-col rounded-lg text-center justify-center overflow-hidden items-stretch bg-white dark:bg-gray-700 text-violet-3 dark:text-white"
+    :class="{ small }"
+    :style="`--small: ${smallStyle}`"
+  >
+    <div class="starttime-container-content font-semibold">
+      <Clock class="clock-icon"/><time :datetime="dateObj.toISOString()">{{
+        time 
+      }}</time>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { localeShortWeekDayNames } from "@/utils/datetime";
+import { computed } from "vue";
+import Clock from "vue-material-design-icons/ClockTimeTenOutline.vue";
+
+const props = withDefaults(
+  defineProps<{
+    date: string;
+    small?: boolean;
+  }>(),
+  { small: false }
+);
+
+const dateObj = computed<Date>(() => new Date(props.date));
+
+const time = computed<string>(() =>
+  dateObj.value.toLocaleTimeString(undefined, { hour: "2-digit", minute: "2-digit" })
+);
+
+const smallStyle = computed<string>(() => (props.small ? "1.2" : "2"));
+</script>
+
+<style lang="scss" scoped>
+div.starttime-container {
+  width: auto;
+  box-shadow: 0 0 12px rgba(0, 0, 0, 0.2);
+  height: calc(40px * var(--small));
+
+  }
+  .starttime-container-content {
+    font-size: calc(1rem * var(--small));
+    padding: 0 0.5rem;
+  }
+
+  .clock-icon { 
+    vertical-align: middle;
+    padding-right: 0.2rem;
+    display: inline-block;
+  }
+</style>

js/src/components/Group/GroupSection.vue

@@ -3,10 +3,10 @@
     class="flex flex-col mb-3 border-2"
     :class="{
       'border-mbz-purple': privateSection,
-      'border-yellow-1': !privateSection,
+      'border-fomo-blue': !privateSection,
     }"
   >
-    <div class="flex items-stretch py-3 px-1 bg-yellow-1 text-violet-title">
+    <div class="flex items-stretch py-3 px-1 bg-fomo-blue text-violet-title">
       <div class="flex flex-1 gap-1">
         <o-icon :icon="icon" custom-size="36" />
         <h2 class="text-2xl font-medium mt-0">{{ title }}</h2>

js/src/components/Local/CloseContent.vue

@@ -19,31 +19,29 @@
       </div>
       <slot name="subtitle" />
     </div>
-    <div class="" v-show="showScrollLeftButton">
+    <!-- <div class="hidden sm:block" v-show="showScrollLeftButton">
       <button
         @click="scrollLeft"
         class="absolute inset-y-0 my-auto z-10 rounded-full bg-white dark:bg-transparent w-10 h-10 border border-shadowColor -left-5 ml-2"
       >
         <span class="">&lt;</span>
       </button>
-    </div>
+    </div> -->
     <div class="overflow-hidden">
       <div
-        class="relative w-full snap-x snap-always snap-mandatory overflow-x-auto flex pb-6 gap-x-5 gap-y-8 p-1"
-        ref="scrollContainer"
-        @scroll="scrollHandler"
+        class="multi-card-event"
       >
         <slot name="content" />
       </div>
     </div>
-    <div class="" v-show="showScrollRightButton">
+    <!-- <div class="hidden sm:block" v-show="showScrollRightButton">
       <button
         @click="scrollRight"
-        class="absolute inset-y-0 my-auto z-10 rounded-full bg-white dark:bg-transparent w-10 h-10 border border-shadowColor -right-5 mr-2"
+        class="absolute inset-y-0 my-auto z-10 rounded-full bg-white dark:bg-transparent w-10 h-10 border border-shadowColor -right-5"
       >
         <span class="">&gt;</span>
       </button>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -63,56 +61,69 @@ const emit = defineEmits(["doGeoLoc"]);
 
 const { t } = useI18n({ useScope: "global" });
 
-const showScrollRightButton = ref(false);
-const showScrollLeftButton = ref(false);
+// const showScrollRightButton = ref(true);
+// const showScrollLeftButton = ref(false);
 
-const scrollContainer = ref<any>();
+// const scrollContainer = ref<any>();
 
-const scrollHandler = () => {
-  if (scrollContainer.value) {
-    showScrollRightButton.value =
-      scrollContainer.value.scrollLeft <
-      scrollContainer.value.scrollWidth - scrollContainer.value.clientWidth;
-    showScrollLeftButton.value = scrollContainer.value.scrollLeft > 0;
-  }
-};
+// const scrollHandler = () => {
+//   if (scrollContainer.value) {
+//     showScrollRightButton.value =
+//       scrollContainer.value.scrollLeft <
+//       scrollContainer.value.scrollWidth - scrollContainer.value.clientWidth;
+//     showScrollLeftButton.value = scrollContainer.value.scrollLeft > 0;
+//   }
+// };
 
-const doScroll = (e: Event, left: number) => {
-  e.preventDefault();
-  if (scrollContainer.value) {
-    scrollContainer.value.scrollBy({
-      left,
-      behavior: "smooth",
-    });
-  }
-};
+// const doScroll = (e: Event, left: number) => {
+//   e.preventDefault();
+//   if (scrollContainer.value) {
+//     scrollContainer.value.scrollBy({
+//       left,
+//       behavior: "smooth",
+//     });
+//   }
+// };
 
-const scrollLeft = (e: Event) => {
-  doScroll(e, -300);
-};
+// const scrollLeft = (e: Event) => {
+//   doScroll(e, -300);
+// };
 
-const scrollRight = (e: Event) => {
-  doScroll(e, 300);
-};
+// const scrollRight = (e: Event) => {
+//   doScroll(e, 300);
+// };
 
-const scrollHorizontalToVertical = (evt: WheelEvent) => {
-  evt.deltaY > 0 ? doScroll(evt, 300) : doScroll(evt, -300);
-};
+// const scrollHorizontalToVertical = (evt: WheelEvent) => {
+//   evt.deltaY > 0 ? doScroll(evt, 300) : doScroll(evt, -300);
+// };
 
-onMounted(async () => {
-  // Make sure everything is mounted properly
-  setTimeout(() => {
-    scrollHandler();
-  }, 1500);
-  scrollContainer.value.addEventListener("wheel", scrollHorizontalToVertical);
-});
+// onMounted(async () => {
+//   scrollContainer.value.addEventListener("wheel", scrollHorizontalToVertical);
+// });
 
-onUnmounted(() => {
-  if (scrollContainer.value) {
-    scrollContainer.value.removeEventListener(
-      "wheel",
-      scrollHorizontalToVertical
-    );
-  }
-});
+// onUnmounted(() => {
+//   if (scrollContainer.value) {
+//     scrollContainer.value.removeEventListener(
+//       "wheel",
+//       scrollHorizontalToVertical
+//     );
+//   }
+// });
 </script>
+
+<style lang="scss" scoped>
+.multi-card-event {
+  display: grid;
+  grid-auto-rows: 1fr;
+  grid-column-gap: 20px;
+  grid-row-gap: 30px;
+  grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+  margin-bottom: 2rem;
+  .event-card {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+</style>
+

js/src/components/Local/UpcomingEvents.vue

@@ -0,0 +1,78 @@
+<template>
+  <close-content
+    class="container mx-auto px-2"
+    v-show="loadingEvents || (events && events.total > 0)"
+    :suggestGeoloc="false"
+    v-on="attrs"
+  >
+    <template #title>
+      {{ t("Upcoming events") }}
+    </template>
+    <template #subtitle>
+      <i18n-t
+        class="text-slate-700 dark:text-slate-300"
+        tag="p"
+        keypath="On {instance} and other federated instances"
+      >
+        <template #instance>
+          <b>{{ instanceName }}</b>
+        </template>
+      </i18n-t>
+    </template>
+    <template #content>
+      <skeleton-event-result
+        v-for="i in 6"
+        class="scroll-ml-6 snap-center shrink-0 w-[18rem] my-4"
+        :key="i"
+        v-show="loadingEvents"
+      />
+      <event-card
+        v-for="event in events.elements"
+        :event="event"
+        :key="event.uuid"
+      />
+      <more-content
+        :to="{
+          name: RouteName.SEARCH,
+          query: {
+            contentType: 'EVENTS',
+          },
+        }"
+      >
+        {{ t("View more events") }}
+      </more-content>
+    </template>
+  </close-content>
+</template>
+
+<script lang="ts" setup>
+import MoreContent from "./MoreContent.vue";
+import CloseContent from "./CloseContent.vue";
+import { computed, useAttrs } from "vue";
+import { IEvent } from "@/types/event.model";
+import { useQuery } from "@vue/apollo-composable";
+import EventCard from "../Event/EventCard.vue";
+import { Paginate } from "@/types/paginate";
+import SkeletonEventResult from "../Event/SkeletonEventResult.vue";
+import { EventSortField, SortDirection } from "@/types/enums";
+import { FETCH_EVENTS } from "@/graphql/event";
+import { useI18n } from "vue-i18n";
+import RouteName from "@/router/name";
+
+defineProps<{
+  instanceName: string;
+}>();
+
+const { t } = useI18n({ useScope: "global" });
+const attrs = useAttrs();
+
+const { result: resultEvents, loading: loadingEvents } = useQuery<{
+  events: Paginate<IEvent>;
+}>(FETCH_EVENTS, {
+  orderBy: EventSortField.BEGINS_ON,
+  direction: SortDirection.ASC,
+});
+const events = computed(
+  () => resultEvents.value?.events ?? { total: 0, elements: [] }
+);
+</script>

js/src/components/MobilizonLogo.vue

@@ -1,42 +1,31 @@
 <template>
   <svg
-    class="bg-white dark:bg-zinc-900 dark:fill-white"
-    :class="{ 'bg-gray-900': invert }"
     xmlns="http://www.w3.org/2000/svg"
     viewBox="0 0 248.16 46.78"
   >
-    <title>Mobilizon Logo</title>
+    <title>Fomo 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"
+        d="M 62.099803,46.107167 H 61.977828 L 56.44017,42.887031 q -0.170765,-0.09758 -0.170765,-0.292739 L 56.171825,11.905419 Q 56.19622,11.734654 56.34259,11.637074 75.248692,0.70812735 75.346272,0.70812735 q 0.09758,0 5.659633,3.24453105 l 0.04879,0.04879 0.04879,0.024395 v 0.024395 h 0.02439 l 0.04879,0.09758 0.02439,3.7080355 Q 81.176669,8.0510134 81.0303,8.1485933 L 65.490704,17.101547 v 2.805422 q 9.806778,-5.659633 9.904357,-5.659633 0.07318,0 2.878607,1.634463 2.805422,1.610068 2.805422,1.634463 h 0.0244 v 0.02439 q 0.02439,0.0244 0.02439,0.04879 0.02439,0 0.02439,0 0.02439,0 0.02439,0.0244 l 0.02439,0.121975 h 0.02439 v 3.659245 q 0,0.170765 -0.170764,0.268345 l -15.515202,8.977349 0.0244,13.344049 q 0,0.170765 -0.170764,0.268344 -3.171347,1.854018 -3.293321,1.854018 z m 3.415295,-19.833111 14.710168,-8.489449 -4.830205,-2.829817 -9.879963,5.708423 z m -3.756825,18.930497 -0.07319,-29.883838 -4.830204,-2.829817 0.07319,29.908234 z M 62.002223,14.735235 80.176476,4.2453981 75.346272,1.4399765 57.172019,11.929814 Z m 0.414714,30.469318 2.488287,-1.414908 -0.04879,-13.344049 q 0.0244,-0.19516 0.170765,-0.292739 l 15.539596,-8.952955 v -2.854211 q -15.295646,8.830979 -15.368831,8.830979 -0.317135,0 -0.34153,-0.341529 l -0.02439,-9.928753 q 0,-0.170765 0.170765,-0.268345 L 80.518005,7.6606939 V 4.8308773 L 62.343752,15.320715 Z"
+        stroke="#ffffff"
+        stroke-opacity="1"
       />
       <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="currentColor"
+        d="m 98.667864,46.107167 q -0.09758,0 -0.09758,-0.02439 h -0.04879 l -5.513264,-3.220136 q -0.146369,-0.09758 -0.170764,-0.268344 l -0.07319,-30.688873 q 0.0244,-0.170765 0.170764,-0.268345 18.906104,-10.92894665 19.003684,-10.92894665 0.0732,0 2.8786,1.63446305 l 2.80543,1.634463 h 0.0244 v 0.024395 h 0.0244 v 0.024395 h 0.0244 l 0.0244,0.04879 v 0.024395 q 0.0244,0.09758 0.0244,0.09758 0.0244,0 0.0244,0.024395 l 0.0732,30.6888729 q 0,0.19516 -0.17076,0.292739 Q 98.789839,46.107167 98.667864,46.107167 Z M 98.35073,45.204553 98.25315,15.320715 93.422946,12.490898 93.520526,42.399132 Z M 98.59468,14.735235 116.76893,4.2453981 111.93873,1.4399765 93.764475,11.929814 Z M 99.009394,45.204553 117.18365,34.714716 117.11046,4.8064824 98.936209,15.320715 Z m 2.805426,-4.513069 q -0.34153,0 -0.34153,-0.317135 l -0.0732,-23.467961 q 0.0244,-0.170765 0.17077,-0.268345 12.6122,-7.3184911 12.73417,-7.3184911 0.31714,0 0.31714,0.3415296 l 0.0732,23.4923565 q -0.0244,0.14637 -0.17076,0.24395 -12.6122,7.294096 -12.70978,7.294096 z m 0.31713,-7.269701 6.39148,-3.708036 -0.0488,-16.320235 -6.39148,3.708035 z m 0,6.367087 11.56322,-6.684222 -4.83021,-2.805422 -6.73301,3.903196 z m 11.90475,-7.245306 -0.0732,-22.297003 -4.80581,2.781026 0.0488,16.68616 z"
+        stroke="#ffffff"
+        stroke-opacity="1"
       />
       <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"
+        d="m 135.28472,46.107167 q -0.12198,0 -0.12198,-0.02439 h -0.0488 l -5.51326,-3.220136 q -0.14637,-0.09758 -0.17077,-0.268344 l -0.0732,-30.688873 q 0.0244,-0.170765 0.17076,-0.268345 18.90611,-10.92894665 19.00369,-10.92894665 0.0732,0 2.903,1.63446305 l 2.80542,1.634463 v 0.024395 h 0.0244 v 0.024395 h 0.0244 l 0.0244,0.04879 0.0488,0.1463698 0.0732,30.6888729 q 0,0.19516 -0.14637,0.292739 -3.19574,1.829623 -3.24453,1.854018 -0.0244,0 -0.0732,0 l -0.12197,-0.02439 -4.26912,-2.488287 0.0244,4.903389 q -0.0244,0.170765 -0.17076,0.268345 -3.19574,1.854018 -3.24453,1.878413 -0.0244,0 -0.0732,0 -0.0488,0 -0.0976,0 -0.0244,-0.0244 -0.0488,-0.04879 l -4.24472,-2.463892 0.0244,4.878994 q 0,0.19516 -0.17076,0.292739 -3.19574,1.854018 -3.29332,1.854018 z m -0.34153,-0.902614 -0.0976,-29.883838 -4.83021,-2.829817 0.0976,29.908234 z m 0.24395,-30.469318 18.17425,-10.4898369 -4.8302,-2.8054216 -18.17426,10.4898375 z m 7.61123,25.931854 -0.0732,-25.907459 -4.04956,2.341917 0.0488,21.223625 z m 7.83078,-4.51307 -0.0732,-25.907458 -4.04957,2.317522 0.0732,21.223624 z m -15.0273,9.050534 2.48829,-1.414908 -0.0732,-26.883257 q 0,-0.170765 0.14637,-0.29274 4.78142,-2.756632 4.879,-2.756632 0.34153,0 0.34153,0.34153 l 0.0732,26.468543 2.46389,-1.414908 v -5.269314 l -0.0732,-21.589549 q 0,-0.19516 0.17076,-0.292739 4.78142,-2.7810271 4.879,-2.7810271 0.31713,0 0.31713,0.3415296 l 0.0976,26.4929375 2.46389,-1.439303 -0.0732,-29.9082336 -18.17425,10.5142326 z"
+        stroke="#ffffff"
+        stroke-opacity="1"
       />
       <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="currentColor"
-      />
-      <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="currentColor"
+        d="m 171.85278,46.107167 q -0.0976,0 -0.0976,-0.02439 h -0.0488 l -5.51326,-3.220136 q -0.14637,-0.09758 -0.17077,-0.268344 l -0.0732,-30.688873 q 0.0244,-0.170765 0.17076,-0.268345 18.90611,-10.92894665 19.00369,-10.92894665 0.0732,0 2.8786,1.63446305 l 2.80542,1.634463 h 0.0244 v 0.024395 h 0.0244 v 0.024395 h 0.0244 l 0.0244,0.04879 v 0.024395 q 0.0244,0.09758 0.0244,0.09758 0.0244,0 0.0244,0.024395 l 0.0732,30.6888729 q 0,0.19516 -0.17077,0.292739 -18.8817,10.904552 -19.00368,10.904552 z m -0.31713,-0.902614 -0.0976,-29.883838 -4.83021,-2.829817 0.0976,29.908234 z M 171.7796,14.735235 189.95385,4.2453981 185.12365,1.4399765 166.94939,11.929814 Z m 0.41471,30.469318 18.17425,-10.489837 -0.0732,-29.9082336 -18.17425,10.5142326 z m 2.80542,-4.513069 q -0.34153,0 -0.34153,-0.317135 l -0.0732,-23.467961 q 0.0244,-0.170765 0.17076,-0.268345 12.6122,-7.3184911 12.73418,-7.3184911 0.31713,0 0.31713,0.3415296 l 0.0732,23.4923565 q -0.0244,0.14637 -0.17077,0.24395 -12.6122,7.294096 -12.70978,7.294096 z m 0.31714,-7.269701 6.39148,-3.708036 -0.0488,-16.320235 -6.39148,3.708035 z m 0,6.367087 11.56321,-6.684222 -4.8302,-2.805422 -6.73301,3.903196 z m 11.90474,-7.245306 -0.0732,-22.297003 -4.80581,2.781026 0.0488,16.68616 z"
+        stroke="#ffffff"
+        stroke-opacity="1"
       />
     </g>
   </svg>
 </template>
 
-<script lang="ts" setup>
-withDefaults(
-  defineProps<{
-    invert?: boolean;
-  }>(),
-  { invert: false }
-);
-</script>

js/src/components/NavBar.vue

@@ -1,6 +1,6 @@
 <template>
   <nav
-    class="bg-white border-gray-200 px-2 sm:px-4 py-2.5 dark:bg-zinc-900"
+    class="bg-zinc-900 border-gray-200 px-2 sm:px-4 py-2.5"
     id="navbar"
   >
     <div
@@ -18,7 +18,7 @@
           <template #trigger>
             <button
               type="button"
-              class="flex sm:mr-3 text-sm rounded-full md:mr-0 focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600"
+              class="flex sm:mr-3 text-sm rounded-full md:mr-0 focus:ring-4 focus:ring-gray-600"
               id="user-menu-button"
               aria-expanded="false"
             >
@@ -33,10 +33,11 @@
                   loading="lazy"
                 />
               </figure>
-              <AccountCircle v-else :size="32" />
+              <AccountCircle style="color:white" v-else :size="32" />
             </button>
           </template>
 
+
           <!-- Dropdown menu -->
           <div
             class="z-50 text-base list-none bg-white rounded divide-y divide-gray-100 dark:bg-zinc-700 dark:divide-gray-600 max-w-xs"
@@ -167,28 +168,28 @@
           <li v-if="currentActor?.id">
             <router-link
               :to="{ name: RouteName.MY_EVENTS }"
-              class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
+              class="block py-2 pr-4 pl-3 border-b md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 text-zinc-400 md:dark:hover:text-white hover:bg-zinc-700 hover:text-white md:dark:hover:bg-transparent border-gray-700"
               >{{ t("My events") }}</router-link
             >
           </li>
           <li v-if="currentActor?.id">
             <router-link
               :to="{ name: RouteName.MY_GROUPS }"
-              class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
+              class="block py-2 pr-4 pl-3 border-b md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 text-zinc-400 md:dark:hover:text-white hover:bg-zinc-700 hover:text-white md:dark:hover:bg-transparent border-gray-700"
               >{{ t("My groups") }}</router-link
             >
           </li>
           <li v-if="!currentActor?.id">
             <router-link
               :to="{ name: RouteName.LOGIN }"
-              class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
+              class="block py-2 pr-4 pl-3 border-b md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 text-zinc-400 md:dark:hover:text-white hover:bg-zinc-700 hover:text-white md:dark:hover:bg-transparent border-gray-700"
               >{{ t("Login") }}</router-link
             >
           </li>
           <li v-if="!currentActor?.id && canRegister">
             <router-link
               :to="{ name: RouteName.REGISTER }"
-              class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
+              class="block py-2 pr-4 pl-3 border-b md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 text-zinc-400 md:dark:hover:text-white hover:bg-zinc-700 hover:text-white md:dark:hover:bg-transparent border-gray-700"
               >{{ t("Register") }}</router-link
             >
           </li>

js/src/components/PageFooter.vue

@@ -1,23 +1,10 @@
 <template>
   <footer
-    class="bg-violet-2 color-secondary flex flex-col items-center py-2 px-3"
+    class="bg-zinc-900 color-secondary flex flex-col items-center py-2 px-3"
     ref="footer"
   >
-    <picture class="flex max-w-xl">
-      <source
-        :srcset="`/img/pics/footer_${random}-1024w.webp 1x, /img/pics/footer_${random}-1920w.webp 2x`"
-        type="image/webp"
-      />
-      <img
-        :src="`/img/pics/footer_${random}-1024w.webp`"
-        alt=""
-        width="1024"
-        height="428"
-        loading="lazy"
-      />
-    </picture>
     <ul
-      class="inline-flex flex-wrap justify-around gap-3 text-lg text-white underline decoration-yellow-1"
+      class="inline-flex flex-wrap justify-around gap-3 text-lg text-white underline decoration-fomo-blue"
     >
       <li>
         <o-select
@@ -59,7 +46,7 @@
         <a href="#navbar">{{ t("Back to top") }}</a>
       </li>
     </ul>
-    <div class="text-center flex-1 pt-2 text-yellow-1">
+    <div class="text-center flex-1 pt-2 text-fomo-blue">
       <i18n-t
         tag="span"
         keypath="Powered by {mobilizon}. © 2018 - {date} The Mobilizon Contributors - Made with the financial support of {contributors}."
@@ -67,7 +54,7 @@
         <template #mobilizon>
           <a
             rel="external"
-            class="text-white underline decoration-yellow-1"
+            class="text-white underline decoration-fomo-blue"
             href="https://joinmobilizon.org"
             >{{ t("Mobilizon") }}</a
           >
@@ -78,7 +65,7 @@
         <template #contributors>
           <a
             rel="external"
-            class="text-white underline decoration-yellow-1"
+            class="text-white underline decoration-fomo-blue"
             href="https://joinmobilizon.org/hall-of-fame"
             >{{ t("more than 1360 contributors") }}</a
           >

js/src/components/Report/ReportCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    class="bg-mbz-yellow-alt-50 hover:bg-mbz-yellow-alt-100 dark:bg-zinc-700 hover:dark:bg-zinc-600 rounded"
+    class="bg-mbz-yellow-alt-50 hover:bg-fomo-blue dark:bg-zinc-700 hover:dark:bg-zinc-600 rounded"
     v-if="report"
   >
     <div class="flex justify-between gap-1 border-b p-2">

js/src/components/Settings/SettingMenuItem.vue

@@ -3,7 +3,7 @@
     class="setting-menu-item"
     :class="{
       'cursor-pointer bg-mbz-yellow-alt-500 dark:bg-mbz-purple-500': isActive,
-      'bg-mbz-yellow-alt-100 hover:bg-mbz-yellow-alt-200 dark:bg-mbz-purple-300 dark:hover:bg-mbz-purple-400 dark:text-white':
+      'bg-fomo-blue hover:bg-mbz-yellow-alt-200 dark:bg-mbz-purple-300 dark:hover:bg-mbz-purple-400 dark:text-white':
         !isActive,
     }"
   >

js/src/components/TagElement.vue

@@ -30,7 +30,7 @@ const typeClasses = computed(() => {
     case "info":
       return "bg-mbz-info dark:text-black";
     case "warning":
-      return "bg-yellow-1";
+      return "bg-fomo-blue";
     case "danger":
       return "bg-mbz-danger dark:text-white";
   }

js/src/extension.ts

@@ -0,0 +1,4 @@
+
+export const Images = {
+    appLogo: "/src/assets/images/default_logo.svg"
+};

js/src/extension/SvgComponent.vue

@@ -0,0 +1,20 @@
+<template>
+    <div v-html="svg"/>
+</template>
+
+<script lang="ts">
+export default {
+    props: ['src'],
+
+    data() {
+        return {
+            svg: ""
+        }
+    },
+
+    async created() {
+        const svgImport = await import(this.$props.src + '?raw');
+        this.svg = svgImport.default;
+    }
+}
+</script>

js/src/views/Event/EventView.vue

@@ -18,6 +18,13 @@
           />
         </div>
 
+        <div class="start-time-icon-wrapper relative" v-if="event?.beginsOn">
+          <start-time-icon
+            :date="event.beginsOn.toString()"
+            class="absolute right-3 -top-16"
+          />
+        </div>
+
         <section class="intro px-2 pt-4" dir="auto">
           <div class="flex flex-wrap gap-2">
             <div class="flex-1 min-w-[300px]">
@@ -290,6 +297,7 @@ import {
 } from "@/types/actor";
 import DateCalendarIcon from "@/components/Event/DateCalendarIcon.vue";
 import SkeletonDateCalendarIcon from "@/components/Event/SkeletonDateCalendarIcon.vue";
+import StartTimeIcon from "@/components/Event/StartTimeIcon.vue";
 import Earth from "vue-material-design-icons/Earth.vue";
 import Link from "vue-material-design-icons/Link.vue";
 import MultiCard from "@/components/Event/MultiCard.vue";

js/src/views/HomeView.vue

@@ -27,8 +27,8 @@
   <unlogged-introduction :config="config" v-if="config && !isLoggedIn" />
   <!-- Search fields -->
   <search-fields v-model:search="search" v-model:location="location" />
-  <!-- Categories preview -->
-  <categories-preview />
+  <!-- Categories preview
+  <categories-preview /> -->
   <!-- Welcome back -->
   <section
     class="container mx-auto"
@@ -135,17 +135,18 @@
       >
     </span>
   </section>
-  <!-- Recent events -->
+  <!-- Recent events
   <CloseEvents
     @doGeoLoc="performGeoLocation()"
     :userLocation="userLocation"
     :doingGeoloc="doingGeoloc"
   />
-  <CloseGroups :userLocation="userLocation" @doGeoLoc="performGeoLocation()" />
+  <CloseGroups :userLocation="userLocation" @doGeoLoc="performGeoLocation()" /> -->
   <OnlineEvents />
-  <LastEvents v-if="instanceName" :instanceName="instanceName" />
+  <UpcomingEvents v-if="instanceName" :instanceName="instanceName" />
+  <!-- <LastEvents v-if="instanceName" :instanceName="instanceName" /> -->
   <!-- Unlogged content section -->
-  <picture v-if="!currentUser?.isLoggedIn">
+  <!-- <picture v-if="!currentUser?.isLoggedIn">
     <source
       media="(max-width: 799px)"
       :srcset="`/img/pics/homepage-480w.webp`"
@@ -177,7 +178,7 @@
       alt=""
       loading="lazy"
     />
-  </picture>
+  </picture> -->
   <presentation v-if="!currentUser?.isLoggedIn" />
 </template>
 
@@ -193,9 +194,10 @@ import { HOME_USER_QUERIES } from "../graphql/home";
 import RouteName from "../router/name";
 import { IEvent } from "../types/event.model";
 // import { IFollowedGroupEvent } from "../types/followedGroupEvent.model";
-import CloseEvents from "@/components/Local/CloseEvents.vue";
-import CloseGroups from "@/components/Local/CloseGroups.vue";
-import LastEvents from "@/components/Local/LastEvents.vue";
+// import CloseEvents from "@/components/Local/CloseEvents.vue";
+// import CloseGroups from "@/components/Local/CloseGroups.vue";
+// import LastEvents from "@/components/Local/LastEvents.vue";
+import UpcomingEvents from "@/components/Local/UpcomingEvents.vue";
 import OnlineEvents from "@/components/Local/OnlineEvents.vue";
 import {
   computed,

js/src/views/Moderation/LogsView.vue

@@ -17,7 +17,7 @@
         <li
           v-for="log in actionLogs.elements"
           :key="log.id"
-          class="bg-mbz-yellow-alt-50 hover:bg-mbz-yellow-alt-100 dark:bg-zinc-700 hover:dark:bg-zinc-600 rounded p-2 my-1"
+          class="bg-mbz-yellow-alt-50 hover:bg-fomo-blue dark:bg-zinc-700 hover:dark:bg-zinc-600 rounded p-2 my-1"
         >
           <div class="flex gap-1">
             <div class="flex gap-1">

js/src/views/PageNotFound.vue

@@ -2,20 +2,6 @@
   <section class="container mx-auto pt-4 is-max-desktop max-w-2xl">
     <div class="">
       <div class="">
-        <picture>
-          <source
-            :srcset="`/img/pics/error-480w.webp 1x, /img/pics/error-1024w.webp 2x`"
-            type="image/webp"
-          />
-
-          <img
-            :src="`/img/pics/error-480w.webp`"
-            alt=""
-            width="2616"
-            height="1698"
-            loading="lazy"
-          />
-        </picture>
         <h1 class="text-4xl mb-3">
           {{ $t("The page you're looking for doesn't exist.") }}
         </h1>

js/tailwind.config.js

@@ -65,7 +65,7 @@ module.exports = {
         "violet-1": "#3a384c",
         "violet-2": "#474467",
         "violet-3": "#3c376e",
-        "yellow-1": "#ffd599",
+        "yellow-1": "#21bef3",
         "yellow-2": "#fff1de",
         "body-background-color": "#efeef4",
         "purple-1": "#757199",
@@ -75,6 +75,8 @@ module.exports = {
         "mbz-danger": "#cd2026",
         "mbz-success": "#0d8758",
         "mbz-warning": "#ffe08a",
+        "fomo-blue": "#21bef3",
+        "fomo-purple": "#9e9ef2",
         // primary: "#272633",
         // secondary: "#ED8D07",
       },

js/tests/unit/specs/components/Group/__snapshots__/GroupSection.spec.ts.snap

@@ -2,7 +2,7 @@
 
 exports[`GroupSection > renders group section with basic informations 1`] = `
 "<section class=\\"flex flex-col mb-3 border-2 border-mbz-purple\\">
-  <div class=\\"flex items-stretch py-3 px-1 bg-yellow-1 text-violet-title\\">
+  <div class=\\"flex items-stretch py-3 px-1 bg-fomo-blue text-violet-title\\">
     <div class=\\"flex flex-1 gap-1\\"><span class=\\"o-icon\\"><i class=\\"mdi mdi-bullhorn 36\\"></i></span>
       <h2 class=\\"text-2xl font-medium mt-0\\">My group section</h2>
     </div><a href=\\"/@my_group@remotedomain.net/p\\" class=\\"self-center\\">View all</a>
@@ -15,8 +15,8 @@ exports[`GroupSection > renders group section with basic informations 1`] = `
 `;
 
 exports[`GroupSection > renders public group section 1`] = `
-"<section class=\\"flex flex-col mb-3 border-2 border-yellow-1\\">
-  <div class=\\"flex items-stretch py-3 px-1 bg-yellow-1 text-violet-title\\">
+"<section class=\\"flex flex-col mb-3 border-2 border-fomo-blue\\">
+  <div class=\\"flex items-stretch py-3 px-1 bg-fomo-blue text-violet-title\\">
     <div class=\\"flex flex-1 gap-1\\"><span class=\\"o-icon\\"><i class=\\"mdi mdi-bullhorn 36\\"></i></span>
       <h2 class=\\"text-2xl font-medium mt-0\\">My group section</h2>
     </div><a href=\\"/@my_group@remotedomain.net/p\\" class=\\"self-center\\">View all</a>

js/vite.config.js

@@ -30,6 +30,9 @@ export default defineConfig(({ command }) => {
       }),
       visualizer(),
     ],
+    server: {
+      host: (isDev ? "0.0.0.0" : "localhost")
+    },
     build: {
       manifest: true,
       outDir: path.resolve(__dirname, "../priv/static"),

lib/mobilizon/config.ex

@@ -19,6 +19,7 @@ defmodule Mobilizon.Config do
           registration_email_denylist: list(String.t()),
           demo: boolean(),
           repository: String.t(),
+          version: String.t(),
           email_from: String.t(),
           email_reply_to: String.t(),
           federating: boolean(),
@@ -102,9 +103,7 @@ defmodule Mobilizon.Config do
   end
 
   @spec instance_version :: String.t()
-  def instance_version do
-    GitStatus.commit()
-  end
+  def instance_version, do: instance_config()[:version]
 
   @spec instance_hostname :: String.t()
   def instance_hostname, do: instance_config()[:hostname]

lib/mobilizon/events/categories.ex

@@ -28,126 +28,82 @@ defmodule Mobilizon.Events.Categories do
   defp build_in_categories do
     [
       %{
-        id: :arts,
-        label: gettext("Arts")
+        id: :ausflug,
+        label: gettext("Ausflug")
       },
       %{
-        id: :book_clubs,
-        label: gettext("Book clubs")
+        id: :ausstellung,
+        label: gettext("Ausstellung")
       },
       %{
-        id: :business,
-        label: gettext("Business")
+        id: :demonstration,
+        label: gettext("Demonstration")
       },
       %{
-        id: :causes,
-        label: gettext("Causes")
+        id: :einweihung,
+        label: gettext("Einweihung")
       },
       %{
-        id: :comedy,
-        label: gettext("Comedy")
+        id: :filmvorfuehrung,
+        label: gettext("Filmvorführung")
       },
       %{
-        id: :crafts,
-        label: gettext("Crafts")
+        id: :fussball,
+        label: gettext("Fußball")
       },
       %{
-        id: :food_drink,
-        label: gettext("Food & Drink")
+        id: :gedenken,
+        label: gettext("Gedenken")
       },
       %{
-        id: :health,
-        label: gettext("Health")
+        id: :infostand,
+        label: gettext("Infostand")
       },
       %{
-        id: :music,
-        label: gettext("Music")
+        id: :kuenstlerisches,
+        label: gettext("Künstlerisches")
       },
       %{
-        id: :auto_boat_air,
-        label: gettext("Auto, boat and air")
+        id: :kneipe,
+        label: gettext("Kneipe")
       },
       %{
-        id: :community,
-        label: gettext("Community")
+        id: :konzert,
+        label: gettext("Konzert")
       },
       %{
-        id: :family_education,
-        label: gettext("Family & Education")
+        id: :kuefa,
+        label: gettext("KüFa")
       },
       %{
-        id: :fashion_beauty,
-        label: gettext("Fashion & Beauty")
-      },
-      %{
-        id: :film_media,
-        label: gettext("Film & Media")
-      },
-      %{
-        id: :games,
-        label: gettext("Games")
-      },
-      %{
-        id: :language_culture,
-        label: gettext("Language & Culture")
-      },
-      %{
-        id: :learning,
-        label: gettext("Learning")
-      },
-      %{
-        id: :lgbtq,
-        label: gettext("LGBTQ")
-      },
-      %{
-        id: :movements_politics,
-        label: gettext("Movements and politics")
-      },
-      %{
-        id: :networking,
-        label: gettext("Networking")
+        id: :lesung,
+        label: gettext("Lesung")
       },
       %{
         id: :party,
         label: gettext("Party")
       },
       %{
-        id: :performing_visual_arts,
-        label: gettext("Performing & Visual Arts")
+        id: :sport,
+        label: gettext("Sport")
       },
       %{
-        id: :pets,
-        label: gettext("Pets")
+        id: :theater,
+        label: gettext("Theater")
       },
       %{
-        id: :photography,
-        label: gettext("Photography")
+        id: :verhandlung,
+        label: gettext("Verhandlung")
       },
       %{
-        id: :outdoors_adventure,
-        label: gettext("Outdoors & Adventure")
-      },
-      %{
-        id: :spirituality_religion_beliefs,
-        label: gettext("Spirituality, Religion & Beliefs")
-      },
-      %{
-        id: :science_tech,
-        label: gettext("Science & Tech")
-      },
-      %{
-        id: :sports,
-        label: gettext("Sports")
-      },
-      %{
-        id: :theatre,
-        label: gettext("Theatre")
+        id: :workshop,
+        label: gettext("Workshop")
       },
       # Legacy default value
       %{
         id: :meeting,
-        label: gettext("Meeting")
-      }
+        label: gettext("Infoveranstaltung")
+      },
     ]
   end
 

lib/mobilizon/events/events.ex

@@ -1860,7 +1860,7 @@ defmodule Mobilizon.Events do
   @spec filter_future_events(Ecto.Queryable.t(), boolean) :: Ecto.Query.t()
   defp filter_future_events(query, true) do
     from(q in query,
-      where: q.begins_on > ^DateTime.utc_now()
+          where: coalesce(q.ends_on, q.begins_on) > ^DateTime.utc_now()
     )
   end
 

lib/web/templates/email/instance_follow.text.eex

@@ -7,4 +7,4 @@
 <%= if @follower.type == :Application do %><%= gettext "Note: %{name} following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too.", name: Mobilizon.Actors.Actor.display_name_and_username(@follower) %><% end %>
 
 <%= if @follower.type == :Application do %><%= gettext "To accept this invitation, head over to the instance's admin settings." %><% else %><%= gettext "To accept this invitation, head over to the profile's admin page." %><% end %>
-<%= if @follower.type == :Application do %><%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/relays/followers" %><% else %><%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/profiles/#{@follower.id}" %><% end %>
+<%= if @follower.type == :Application do %><%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/instances/%{name}" %><% else %><%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/profiles/#{@follower.id}" %><% end %>

priv/gettext/de/LC_MESSAGES/default.po

@@ -2311,42 +2311,7 @@ msgstr "LGBTQ"
 msgid "Language & Culture"
 msgstr "Sprache & Kultur"
 
-#: lib/mobilizon/events/categories.ex:96
-#, elixir-autogen, elixir-format
-msgid "Learning"
-msgstr "Lernen"
-
-#: lib/mobilizon/events/categories.ex:149
-#, elixir-autogen, elixir-format
-msgid "Meeting"
-msgstr "Treffen"
-
-#: lib/mobilizon/events/categories.ex:104
-#, elixir-autogen, elixir-format
-msgid "Movements and politics"
-msgstr "Bewegungen und Politik"
-
-#: lib/mobilizon/events/categories.ex:64
-#, elixir-autogen, elixir-format
-msgid "Music"
-msgstr "Musik"
-
-#: lib/mobilizon/events/categories.ex:108
-#, elixir-autogen, elixir-format
-msgid "Networking"
-msgstr "Netzwerke"
-
-#: lib/mobilizon/events/categories.ex:128
-#, elixir-autogen, elixir-format
-msgid "Outdoors & Adventure"
-msgstr "Natur & Abenteuer"
-
-#: lib/mobilizon/events/categories.ex:112
-#, elixir-autogen, elixir-format
-msgid "Party"
-msgstr "Party"
-
-#: lib/mobilizon/events/categories.ex:116
+#: lib/mobilizon/events/categories.ex:100
 #, elixir-autogen, elixir-format
 msgid "Performing & Visual Arts"
 msgstr "Darstellende & bildende Kunst"
@@ -2371,16 +2336,63 @@ msgstr "Wissenschaft & Technologie"
 msgid "Spirituality, Religion & Beliefs"
 msgstr "Glauben, Religion & Spiritualität"
 
-#: lib/mobilizon/events/categories.ex:140
-#, elixir-autogen, elixir-format
-msgid "Sports"
+msgid  "Ausflug"
+msgstr "Ausflug"
+
+msgid  "Ausstellung"
+msgstr "Ausstellung"
+
+msgid  "Demonstration"
+msgstr "Demonstration"
+
+msgid  "Einweihung"
+msgstr "Einweihung"
+
+msgid  "Filmvorführung"
+msgstr "Filmvorführung"
+
+msgid  "Fußball"
+msgstr "Fußball"
+
+msgid  "Gedenken"
+msgstr "Gedenken"
+
+msgid  "Infostand"
+msgstr "Infostand"
+
+msgid  "Infoveranstaltung"
+msgstr "Infoveranstaltung"
+
+msgid  "Künstlerisches"
+msgstr "Künstlerisches"
+
+msgid  "Kneipe"
+msgstr "Kneipe"
+
+msgid  "Konzert"
+msgstr "Konzert"
+
+msgid  "KüFa"
+msgstr "KüFa"
+
+msgid  "Lesung"
+msgstr "Lesung"
+
+msgid  "Party"
+msgstr "Party"
+
+msgid  "Sport"
 msgstr "Sport"
 
-#: lib/mobilizon/events/categories.ex:144
-#, elixir-autogen, elixir-format
-msgid "Theatre"
+msgid  "Theater"
 msgstr "Theater"
 
+msgid  "Verhandlung"
+msgstr "Verhandlung"
+
+msgid  "Workshop"
+msgstr "Workshop"
+
 #: lib/web/templates/email/participation/event_card.text.eex:9
 #, elixir-autogen, elixir-format
 msgid "Read more: %{url}"

priv/gettext/en/LC_MESSAGES/default.po

@@ -1964,11 +1964,6 @@ msgstr ""
 
 #: lib/mobilizon/events/categories.ex:112
 #, elixir-autogen, elixir-format
-msgid "Party"
-msgstr ""
-
-#: lib/mobilizon/events/categories.ex:116
-#, elixir-autogen, elixir-format
 msgid "Performing & Visual Arts"
 msgstr ""
 
@@ -1992,15 +1987,62 @@ msgstr ""
 msgid "Spirituality, Religion & Beliefs"
 msgstr ""
 
-#: lib/mobilizon/events/categories.ex:140
-#, elixir-autogen, elixir-format
-msgid "Sports"
-msgstr ""
+msgid  "Ausflug"
+msgstr "Excursion"
 
-#: lib/mobilizon/events/categories.ex:144
-#, elixir-autogen, elixir-format
-msgid "Theatre"
-msgstr ""
+msgid  "Ausstellung"
+msgstr "Exhibition"
+
+msgid  "Demonstration"
+msgstr "Demonstration"
+
+msgid  "Einweihung"
+msgstr "Inauguration"
+
+msgid  "Filmvorführung"
+msgstr "Film screening"
+
+msgid  "Fußball"
+msgstr "Football"
+
+msgid  "Gedenken"
+msgstr "Remembrance"
+
+msgid  "Infostand"
+msgstr "Infostand"
+
+msgid  "Infoveranstaltung"
+msgstr "Info event"
+
+msgid  "Künstlerisches"
+msgstr "Art related"
+
+msgid  "Kneipe"
+msgstr "Bar"
+
+msgid  "Konzert"
+msgstr "Concert"
+
+msgid  "KüFa"
+msgstr "Kitchen for all"
+
+msgid  "Lesung"
+msgstr "Reading"
+
+msgid  "Party"
+msgstr "Party"
+
+msgid  "Sport"
+msgstr "Sport"
+
+msgid  "Theater"
+msgstr "Theater"
+
+msgid  "Verhandlung"
+msgstr "Trial"
+
+msgid  "Workshop"
+msgstr "Workshop"
 
 #: lib/web/templates/email/participation/event_card.text.eex:9
 #, elixir-autogen, elixir-format, fuzzy