✨ Add a full-screen social media post view without conference agenda c…

…loses #44

Signed-off-by: Marcus Fihlon <[email protected]>

CHANGELOG.md

@@ -13,6 +13,8 @@ For questions and support requests, please use
 
 ### New Features
 
+* Add a full-screen social media post view without conference agenda
+
 ### Fixed Bugs
 
 ### Maintenance Work

README.md

@@ -129,6 +129,7 @@ To modify the default configuration values, just specify environment variables w
 | MASTODON_IMAGE_LIMIT       | 1       | Limit number of images per post (0 = no limit).                              |
 | MASTODON_IMAGES_ENABLED    | true    | Enable or disable images in mastodon posts.                                  |
 | MASTODON_INSTANCE          |         | The Mastodon instance used to read the posts from (empty = disabled).        |
+| POST_COLUMNS               | 3       | How many columns to be used for social media posts.                          |
 | SESSIONIZE_EVENT_API       | [2]     | The URL of the Sessionize event API to read the conference agenda.           |
 | SESSIONIZE_EVENT_ID        | 0       | The ID of the Sessionize event to read the conference agenda (0 = disabled). |
 | TZ                         | UTC     | The timezone used for date and time calculations.                            |

frontend/themes/apus/views/social-view.css

@@ -30,6 +30,11 @@
     flex-direction: column;
 }
 
+.fullscreen-posts > #social-view {
+    left: 0;
+    width: 1900px;
+}
+
 #social-view * {
     color: var(--social-text-color);
 }
@@ -51,5 +56,9 @@
     flex-direction: column;
     row-gap: var(--lumo-space-s);
     justify-content: safe flex-start;
-    width: 33%;
+    width: calc(100% / 3);
+}
+
+.fullscreen-posts > #social-view .column {
+    width: calc(100% / 6);
 }

src/main/java/swiss/fihlon/apus/configuration/Configuration.java

@@ -38,6 +38,7 @@ public class Configuration {
     private AdminConfig admin;
     private CustomConfig custom;
     private EventConfig event;
+    private PostConfig post;
     private FilterConfig filter;
 
     // Event Plugin Configs
@@ -77,6 +78,14 @@ public void setAdmin(@NotNull final AdminConfig admin) {
         this.admin = admin;
     }
 
+    public PostConfig getPost() {
+        return post;
+    }
+
+    public void setPost(@NotNull final PostConfig post) {
+        this.post = post;
+    }
+
     public FilterConfig getFilter() {
         return filter;
     }

src/main/java/swiss/fihlon/apus/configuration/PostConfig.java

@@ -0,0 +1,20 @@
+/*
+ * Apus - A social wall for conferences with additional features.
+ * Copyright (C) Marcus Fihlon and the individual contributors to Apus.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package swiss.fihlon.apus.configuration;
+
+public record PostConfig(int numberOfColumns) { }

src/main/java/swiss/fihlon/apus/plugin/event/EventService.java

@@ -49,7 +49,7 @@ public EventService(@NotNull final TaskScheduler taskScheduler,
                         @NotNull final Configuration configuration,
                         @NotNull final List<EventPlugin> eventPlugins) {
         this.eventPlugins = eventPlugins;
-        if (eventPlugins.stream().anyMatch(EventPlugin::isEnabled)) {
+        if (isEnabled()) {
             updateSessions();
             final var updateFrequency = Duration.ofMinutes(configuration.getEvent().updateFrequency());
             if (updateFrequency.isPositive()) {
@@ -109,4 +109,8 @@ public Map<Room, List<Session>> getRoomsWithSessions() {
             return new TreeMap<>(roomsWithSessions);
         }
     }
+
+    public boolean isEnabled() {
+        return eventPlugins.stream().anyMatch(EventPlugin::isEnabled);
+    }
 }

src/main/java/swiss/fihlon/apus/ui/view/SocialView.java

@@ -38,6 +38,7 @@
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ScheduledFuture;
 
@@ -48,7 +49,7 @@ public final class SocialView extends Div {
 
     private final transient SocialService socialService;
     private final transient Configuration configuration;
-    private final List<Div> postsColumns = List.of(new Div(), new Div(), new Div());
+    private final List<Div> postsColumns;
     private final ContextMenu contextMenu;
     private boolean adminModeEnabled = false;
 
@@ -63,10 +64,15 @@ public SocialView(@NotNull final SocialService socialService,
         var postsColumnsDiv = new Div();
         postsColumnsDiv.addClassName("posts");
         add(postsColumnsDiv);
-        postsColumns.forEach(postsContainer -> {
-            postsColumnsDiv.add(postsContainer);
+
+        final int numberOfColumns = configuration.getPost().numberOfColumns();
+        postsColumns = new ArrayList<>(numberOfColumns);
+        for (int i = 0; i < numberOfColumns; i++) {
+            final var postsContainer = new Div();
+            postsColumns.add(postsContainer);
             postsContainer.addClassName("column");
-        });
+            postsColumnsDiv.add(postsContainer);
+        }
 
         if (adminModeEnabled || configuration.getAdmin().password().isBlank()) {
             contextMenu = null;

src/main/java/swiss/fihlon/apus/ui/view/SocialWallView.java

@@ -59,7 +59,11 @@ public SocialWallView(@NotNull final EventService eventService,
                     });
         }
         setId("social-wall-view");
-        add(new EventView(eventService, taskScheduler, configuration));
+        if (eventService.isEnabled()) {
+            add(new EventView(eventService, taskScheduler, configuration));
+        } else {
+            addClassName("fullscreen-posts");
+        }
         add(new SocialView(socialService, taskScheduler, configuration));
     }
 }

src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -85,6 +85,11 @@
       "type": "java.lang.String",
       "description": "The Mastodon instance used to read the posts from."
     },
+    {
+      "name": "apus.post.numberOfColumns",
+      "type": "java.lang.String",
+      "description" : "How many columns to be used for social media posts."
+    },
     {
       "name": "apus.sessionize.eventId",
       "type": "java.lang.String",

src/main/resources/application.properties

@@ -27,5 +27,6 @@ apus.mastodon.hashtag=${MASTODON_HASHTAG:}
 apus.mastodon.imageLimit=${MASTODON_IMAGE_LIMIT:1}
 apus.mastodon.imagesEnabled=${MASTODON_IMAGES_ENABLED:true}
 apus.mastodon.instance=${MASTODON_INSTANCE:}
+apus.post.numberOfColumns=${POST_COLUMNS:3}
 apus.sessionize.eventApi=${SESSIONIZE_EVENT_API:https://sessionize.com/api/v2/%s/view/Sessions}
 apus.sessionize.eventId=${SESSIONIZE_EVENT_ID:0}

src/test/resources/application.properties

@@ -17,5 +17,6 @@ apus.mastodon.hashtag=java
 apus.mastodon.imageLimit=1
 apus.mastodon.imagesEnabled=true
 apus.mastodon.instance=ijug.social
+apus.post.numberOfColumns=3
 apus.sessionize.eventApi=https://sessionize.com/api/v2/%s/view/Sessions
 apus.sessionize.eventId=0