restore title ellipsis when overflowing

Bump postgresql from 42.3.3 to 42.4.1

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - enhancement
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/build.yml

@@ -0,0 +1,27 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: ["8", "11", "17"]
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: "temurin"
+      - name: Build with Maven
+        run: mvn --batch-mode --update-snapshots verify
+      - uses: actions/upload-artifact@v3
+        if: ${{ matrix.java == '8' }}
+        with:
+          name: commafeed.jar
+          path: commafeed-server/target/commafeed.jar

.gitignore

@@ -1,19 +1,32 @@
-#runtime files
-commafeed.log
-derby.log
-data/
-java_pid*
+# config file
+config.yml
 
-# Maven build directory
+# build directory
 target
-deployments/ROOT.war
+target-ide
+
+# database files
+database
+
+# log files
+log
+
+# jetty sessions
+sessions
+
+# node
+node
+node_modules
+
+# bower
+src/main/app/lib
 
 # Eclipse files
 .project
 .classpath
 .settings
 .factorypath
-/target
+.checkstyle
 
 # IntelliJ Idea files
 .idea

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

.openshift/action_hooks/README.md

@@ -1,3 +0,0 @@
-For information about which action hooks are supported, consult the OpenShift documentation:
-
-https://github.com/openshift/origin-server/blob/master/node/README.writing_applications.md

.openshift/action_hooks/build

@@ -1,5 +0,0 @@
-#!/bin/bash
-# This is a simple build script and will be executed on your CI system if 
-# available.  Otherwise it will execute while your application is stopped
-# before the deploy step.  This script gets executed directly, so it
-# could be python, php, ruby, etc.

.openshift/action_hooks/deploy

@@ -1,5 +0,0 @@
-#!/bin/bash
-# This deploy hook gets executed after dependencies are resolved and the
-# build hook has been run but before the application has been started back
-# up again.  This script gets executed directly, so it could be python, php,
-# ruby, etc.

.openshift/action_hooks/post_deploy

@@ -1,4 +0,0 @@
-#!/bin/bash
-# This is a simple post deploy hook executed after your application 
-# is deployed and started.  This script gets executed directly, so 
-# it could be python, php, ruby, etc.

.openshift/action_hooks/post_start_jbosseap-6.0

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# The pre_start_cartridge and pre_stop_cartridge hooks are *SOURCED*
-# immediately before (re)starting or stopping the specified cartridge.
-# They are able to make any desired environment variable changes as
-# well as other adjustments to the application environment.
-
-# The post_start_cartridge and post_stop_cartridge hooks are executed
-# immediately after (re)starting or stopping the specified cartridge.
-
-# Exercise caution when adding commands to these hooks.  They can
-# prevent your application from stopping cleanly or starting at all.
-# Application start and stop is subject to different timeouts
-# throughout the system.

.openshift/action_hooks/post_stop_jbosseap-6.0

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# The pre_start_cartridge and pre_stop_cartridge hooks are *SOURCED*
-# immediately before (re)starting or stopping the specified cartridge.
-# They are able to make any desired environment variable changes as
-# well as other adjustments to the application environment.
-
-# The post_start_cartridge and post_stop_cartridge hooks are executed
-# immediately after (re)starting or stopping the specified cartridge.
-
-# Exercise caution when adding commands to these hooks.  They can
-# prevent your application from stopping cleanly or starting at all.
-# Application start and stop is subject to different timeouts
-# throughout the system.

.openshift/action_hooks/pre_build

@@ -1,5 +0,0 @@
-#!/bin/bash
-# This is a simple script and will be executed on your CI system if 
-# available.  Otherwise it will execute while your application is stopped
-# before the build step.  This script gets executed directly, so it
-# could be python, php, ruby, etc.

.openshift/action_hooks/pre_build_jbosseap-6.0

@@ -1,7 +0,0 @@
-#!/bin/bash
-# This is a simple bash script and will be sourced prior to building 
-# your application. This script can be used to modify the Maven build
-# arguments for non-CI/Jenkins builds by exporting MAVEN_ARGS. The default
-# is "clean package -Popenshift -DskipTests"
-export MAVEN_ARGS="clean package -Popenshift -Pprod -DskipTests=true"
-export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m -Dmaven.artifact.threads=20"

.openshift/action_hooks/pre_start_jbosseap-6.0

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# The pre_start_cartridge and pre_stop_cartridge hooks are *SOURCED*
-# immediately before (re)starting or stopping the specified cartridge.
-# They are able to make any desired environment variable changes as
-# well as other adjustments to the application environment.
-
-# The post_start_cartridge and post_stop_cartridge hooks are executed
-# immediately after (re)starting or stopping the specified cartridge.
-
-# Exercise caution when adding commands to these hooks.  They can
-# prevent your application from stopping cleanly or starting at all.
-# Application start and stop is subject to different timeouts
-# throughout the system.

.openshift/action_hooks/pre_stop_jbosseap-6.0

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# The pre_start_cartridge and pre_stop_cartridge hooks are *SOURCED*
-# immediately before (re)starting or stopping the specified cartridge.
-# They are able to make any desired environment variable changes as
-# well as other adjustments to the application environment.
-
-# The post_start_cartridge and post_stop_cartridge hooks are executed
-# immediately after (re)starting or stopping the specified cartridge.
-
-# Exercise caution when adding commands to these hooks.  They can
-# prevent your application from stopping cleanly or starting at all.
-# Application start and stop is subject to different timeouts
-# throughout the system.

.openshift/config/modules/README

@@ -1,3 +0,0 @@
-Place your jboss-as7 modules in this directory. This directory is added to the
-module path of the jboss-as7 server associated with your application. It has the
-same structure as the jboss-as7/modules directory.

.openshift/config/standalone.xml

@@ -1,517 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:1.3">
-
-	<extensions>
-		<extension module="org.jboss.as.clustering.infinispan" />
-		<extension module="org.jboss.as.clustering.jgroups" />
-		<extension module="org.jboss.as.cmp" />
-		<extension module="org.jboss.as.configadmin" />
-		<extension module="org.jboss.as.connector" />
-		<extension module="org.jboss.as.deployment-scanner" />
-		<extension module="org.jboss.as.ee" />
-		<extension module="org.jboss.as.ejb3" />
-		<extension module="org.jboss.as.jacorb" />
-		<extension module="org.jboss.as.jaxr" />
-		<extension module="org.jboss.as.jaxrs" />
-		<extension module="org.jboss.as.jdr" />
-		<extension module="org.jboss.as.jmx" />
-		<extension module="org.jboss.as.jpa" />
-		<extension module="org.jboss.as.jsr77" />
-		<extension module="org.jboss.as.logging" />
-		<extension module="org.jboss.as.mail" />
-		<extension module="org.jboss.as.messaging" />
-		<extension module="org.jboss.as.naming" />
-		<extension module="org.jboss.as.osgi" />
-		<extension module="org.jboss.as.pojo" />
-		<extension module="org.jboss.as.remoting" />
-		<extension module="org.jboss.as.sar" />
-		<extension module="org.jboss.as.security" />
-		<extension module="org.jboss.as.threads" />
-		<extension module="org.jboss.as.transactions" />
-		<extension module="org.jboss.as.web" />
-		<extension module="org.jboss.as.webservices" />
-		<extension module="org.jboss.as.weld" />
-	</extensions>
-	
-	<system-properties>
-       <property name="org.apache.coyote.http11.Http11Protocol.COMPRESSION" value="on"/>
-    </system-properties>
-
-	<management>
-		<management-interfaces>
-            <native-interface>
-                <socket-binding native="management-native"/>
-            </native-interface>
-            <http-interface>
-                <socket-binding http="management-http"/>
-            </http-interface>
-        </management-interfaces>
-	</management>
-
-	<profile>
-		<subsystem xmlns="urn:jboss:domain:logging:1.1">
-			<!--console-handler name="CONSOLE"> <level name="INFO"/> <formatter> <pattern-formatter 
-				pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> </formatter> </console-handler -->
-			<periodic-rotating-file-handler name="FILE">
-				<formatter>
-					<pattern-formatter
-						pattern="%d{yyyy/MM/dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" />
-				</formatter>
-				<file relative-to="jboss.server.log.dir" path="server.log" />
-				<suffix value=".yyyy-MM-dd" />
-				<append value="true" />
-			</periodic-rotating-file-handler>
-			<logger category="com.arjuna">
-				<level name="WARN" />
-			</logger>
-			<logger category="org.apache.tomcat.util.modeler">
-				<level name="WARN" />
-			</logger>
-			<logger category="sun.rmi">
-				<level name="WARN" />
-			</logger>
-			<logger category="jacorb">
-				<level name="WARN" />
-			</logger>
-			<logger category="jacorb.config">
-				<level name="ERROR" />
-			</logger>
-			<root-logger>
-				<level name="INFO" />
-				<handlers>
-					<!--handler name="CONSOLE"/ -->
-					<handler name="FILE" />
-				</handlers>
-			</root-logger>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:cmp:1.0" />
-		<subsystem xmlns="urn:jboss:domain:configadmin:1.0" />
-		<subsystem xmlns="urn:jboss:domain:datasources:1.1">
-			<datasources>
-				<datasource jndi-name="java:jboss/datasources/MysqlDS"
-					enabled="${mysql.enabled}" use-java-context="true" pool-name="MysqlDS">
-					<connection-url>jdbc:mysql://${env.OPENSHIFT_MYSQL_DB_HOST}:${env.OPENSHIFT_MYSQL_DB_PORT}/${env.OPENSHIFT_APP_NAME}?useUnicode=true&amp;characterEncoding=UTF-8
-					</connection-url>
-					<driver>mysql</driver>
-					<security>
-						<user-name>${env.OPENSHIFT_MYSQL_DB_USERNAME}</user-name>
-						<password>${env.OPENSHIFT_MYSQL_DB_PASSWORD}</password>
-					</security>
-				</datasource>
-				<drivers>
-					<driver name="mysql" module="com.mysql.jdbc">
-                        <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
-                    </driver>
-				</drivers>
-			</datasources>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
-			<deployment-scanner path="deployments"
-				relative-to="jboss.server.base.dir" scan-interval="5000"
-				deployment-timeout="300" />
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:ee:1.1">
-			<spec-descriptor-property-replacement>false
-			</spec-descriptor-property-replacement>
-			<jboss-descriptor-property-replacement>true
-			</jboss-descriptor-property-replacement>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:ejb3:1.3">
-			<session-bean>
-				<stateless>
-					<bean-instance-pool-ref pool-name="slsb-strict-max-pool" />
-				</stateless>
-				<stateful default-access-timeout="5000" cache-ref="simple"
-					clustered-cache-ref="clustered" />
-				<singleton default-access-timeout="5000" />
-			</session-bean>
-			<mdb>
-				<resource-adapter-ref resource-adapter-name="hornetq-ra" />
-				<bean-instance-pool-ref pool-name="mdb-strict-max-pool" />
-			</mdb>
-			<pools>
-				<bean-instance-pools>
-					<strict-max-pool name="slsb-strict-max-pool"
-						max-pool-size="20" instance-acquisition-timeout="5"
-						instance-acquisition-timeout-unit="MINUTES" />
-					<strict-max-pool name="mdb-strict-max-pool"
-						max-pool-size="20" instance-acquisition-timeout="5"
-						instance-acquisition-timeout-unit="MINUTES" />
-				</bean-instance-pools>
-			</pools>
-			<caches>
-				<cache name="simple" aliases="NoPassivationCache" />
-				<cache name="passivating" passivation-store-ref="file"
-					aliases="SimpleStatefulCache" />
-				<cache name="clustered" passivation-store-ref="infinispan"
-					aliases="StatefulTreeCache" />
-			</caches>
-			<passivation-stores>
-				<file-passivation-store name="file" />
-				<cluster-passivation-store name="infinispan"
-					cache-container="ejb" />
-			</passivation-stores>
-			<async thread-pool-name="default" />
-			<timer-service thread-pool-name="default">
-				<data-store path="timer-service-data" relative-to="jboss.server.data.dir" />
-			</timer-service>
-			<remote connector-ref="remoting-connector" thread-pool-name="default" />
-			<thread-pools>
-				<thread-pool name="default">
-					<max-threads count="10" />
-					<keepalive-time time="100" unit="milliseconds" />
-				</thread-pool>
-			</thread-pools>
-			<iiop enable-by-default="false" use-qualified-name="false" />
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:infinispan:1.3">
-			<cache-container name="cluster" aliases="ha-partition"
-				default-cache="default">
-				<transport lock-timeout="60000" />
-				<replicated-cache name="default" mode="SYNC"
-					batching="true">
-					<locking isolation="REPEATABLE_READ" />
-				</replicated-cache>
-			</cache-container>
-			<cache-container name="web" aliases="standard-session-cache"
-				default-cache="repl">
-				<transport lock-timeout="60000" />
-				<replicated-cache name="repl" mode="ASYNC"
-					batching="true">
-					<file-store />
-				</replicated-cache>
-				<replicated-cache name="sso" mode="SYNC" batching="true" />
-				<distributed-cache name="dist" mode="ASYNC"
-					batching="true" l1-lifespan="0">
-					<file-store />
-				</distributed-cache>
-			</cache-container>
-			<cache-container name="ejb" aliases="sfsb sfsb-cache"
-				default-cache="repl">
-				<transport lock-timeout="60000" />
-				<replicated-cache name="repl" mode="ASYNC"
-					batching="true">
-					<eviction strategy="LRU" max-entries="10000" />
-					<file-store />
-				</replicated-cache>
-				<!-- ~ Clustered cache used internally by EJB subsytem for managing the 
-					client-mapping(s) of ~ the socketbinding referenced by the EJB remoting connector -->
-				<replicated-cache name="remote-connector-client-mappings"
-					mode="SYNC" batching="true" />
-				<distributed-cache name="dist" mode="ASYNC"
-					batching="true" l1-lifespan="0">
-					<eviction strategy="LRU" max-entries="10000" />
-					<file-store />
-				</distributed-cache>
-			</cache-container>
-			<cache-container name="hibernate" default-cache="local-query"
-				module="org.jboss.as.jpa.hibernate:4">
-				<transport lock-timeout="60000" />
-				<local-cache name="local-query">
-					<transaction mode="NONE" />
-					<eviction strategy="LRU" max-entries="10000" />
-					<expiration max-idle="100000" />
-				</local-cache>
-				<invalidation-cache name="entity" mode="SYNC">
-					<transaction mode="NON_XA" />
-					<eviction strategy="LRU" max-entries="10000" />
-					<expiration max-idle="100000" />
-				</invalidation-cache>
-				<replicated-cache name="timestamps" mode="ASYNC">
-					<transaction mode="NONE" />
-					<eviction strategy="NONE" />
-				</replicated-cache>
-			</cache-container>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:jacorb:1.2">
-			<orb>
-				<initializers transactions="spec" security="on" />
-			</orb>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:jaxr:1.1">
-			<connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory" />
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:jaxrs:1.0" />
-		<subsystem xmlns="urn:jboss:domain:jca:1.1">
-			<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
-            <bean-validation enabled="true"/>
-			<default-workmanager>
-				<short-running-threads>
-					<core-threads count="50" />
-					<queue-length count="50" />
-					<max-threads count="50" />
-					<keepalive-time time="10" unit="seconds" />
-				</short-running-threads>
-				<long-running-threads>
-					<core-threads count="50" />
-					<queue-length count="50" />
-					<max-threads count="50" />
-					<keepalive-time time="10" unit="seconds" />
-				</long-running-threads>
-			</default-workmanager>
-			<cached-connection-manager />
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:jdr:1.0" />
-		<subsystem xmlns="urn:jboss:domain:jgroups:1.1"
-			default-stack="tcp">
-			<stack name="tcp">
-				<transport type="TCP" socket-binding="jgroups-tcp">
-					<property name="external_addr">${env.OPENSHIFT_GEAR_DNS}</property>
-					<property name="external_port">${env.OPENSHIFT_JBOSSEAP_CLUSTER_PROXY_PORT}
-					</property>
-					<property name="bind_port">7600</property>
-					<property name="bind_addr">${env.OPENSHIFT_JBOSSEAP_IP}</property>
-				</transport>
-				<protocol type="TCPPING">
-					<property name="timeout">3000</property>
-					<property name="initial_hosts">${env.OPENSHIFT_JBOSSEAP_CLUSTER}</property>
-					<property name="port_range">0</property>
-					<property name="num_initial_members">1</property>
-				</protocol>
-				<protocol type="MERGE2" />
-				<protocol type="FD" />
-				<protocol type="VERIFY_SUSPECT" />
-				<protocol type="BARRIER" />
-				<protocol type="pbcast.NAKACK" />
-				<protocol type="UNICAST2" />
-				<protocol type="pbcast.STABLE" />
-				<protocol type="AUTH">
-					<property name="auth_class">org.jgroups.auth.MD5Token</property>
-					<property name="token_hash">SHA</property>
-					<property name="auth_value">${env.OPENSHIFT_APP_UUID}</property>
-				</protocol>
-				<protocol type="pbcast.GMS" />
-				<protocol type="UFC" />
-				<protocol type="MFC" />
-				<protocol type="FRAG2" />
-				<!--protocol type="pbcast.STATE_TRANSFER"/> <protocol type="pbcast.FLUSH"/ -->
-			</stack>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:jmx:1.1">
-			<show-model value="true" />
-			<remoting-connector />
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:jpa:1.0">
-			<jpa default-datasource="" />
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:jsr77:1.0" />
-		<subsystem xmlns="urn:jboss:domain:mail:1.0">
-			<mail-session jndi-name="java:jboss/mail/Default">
-				<smtp-server outbound-socket-binding-ref="mail-smtp" />
-			</mail-session>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:messaging:1.2">
-			<hornetq-server>
-				<clustered>false</clustered>
-				<persistence-enabled>false</persistence-enabled>
-				<security-enabled>false</security-enabled>
-				<journal-file-size>102400</journal-file-size>
-				<journal-min-files>2</journal-min-files>
-				
-				<thread-pool-max-size>${messaging.thread.pool.max.size}</thread-pool-max-size>
- 	            <scheduled-thread-pool-max-size>${messaging.scheduled.thread.pool.max.size}</scheduled-thread-pool-max-size>
- 	            
-				<connectors>
-					<netty-connector name="netty" socket-binding="messaging" />
-					<netty-connector name="netty-throughput"
-						socket-binding="messaging-throughput">
-						<param key="batch-delay" value="50" />
-					</netty-connector>
-					<in-vm-connector name="in-vm" server-id="0" />
-				</connectors>
-				<acceptors>
-					<netty-acceptor name="netty" socket-binding="messaging" />
-					<netty-acceptor name="netty-throughput"
-						socket-binding="messaging-throughput">
-						<param key="batch-delay" value="50" />
-						<param key="direct-deliver" value="false" />
-					</netty-acceptor>
-					<in-vm-acceptor name="in-vm" server-id="0" />
-				</acceptors>
-				<!--broadcast-groups> <broadcast-group name="bg-group1"> <socket-binding>messaging-group</socket-binding> 
-					<broadcast-period>5000</broadcast-period> <connector-ref>netty</connector-ref> 
-					</broadcast-group> </broadcast-groups> <discovery-groups> <discovery-group 
-					name="dg-group1"> <socket-binding>messaging-group</socket-binding> <refresh-timeout>10000</refresh-timeout> 
-					</discovery-group> </discovery-groups> <cluster-connections> <cluster-connection 
-					name="my-cluster"> <address>jms</address> <connector-ref>netty</connector-ref> 
-					<discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> 
-					</cluster-connections -->
-				<address-settings>
-					<!--default for catch all -->
-					<address-setting match="#">
-						<dead-letter-address>jms.queue.DLQ</dead-letter-address>
-						<expiry-address>jms.queue.ExpiryQueue</expiry-address>
-						<redelivery-delay>0</redelivery-delay>
-						<redistribution-delay>1000</redistribution-delay>
-						<max-size-bytes>10485760</max-size-bytes>
-						<address-full-policy>BLOCK</address-full-policy>
-						<message-counter-history-day-limit>10
-						</message-counter-history-day-limit>
-					</address-setting>
-				</address-settings>
-				<jms-connection-factories>
-					<connection-factory name="InVmConnectionFactory">
-						<connectors>
-							<connector-ref connector-name="in-vm" />
-						</connectors>
-						<entries>
-							<entry name="java:/ConnectionFactory" />
-						</entries>
-					</connection-factory>
-					<!--
-					<connection-factory name="RemoteConnectionFactory">
-						<connectors>
-							<connector-ref connector-name="netty" />
-						</connectors>
-						<entries>
-							<entry name="java:jboss/exported/jms/RemoteConnectionFactory" />
-						</entries>
-					</connection-factory>
-					-->
-					<pooled-connection-factory name="hornetq-ra">
-						<transaction mode="xa" />
-						<connectors>
-							<connector-ref connector-name="in-vm" />
-						</connectors>
-						<entries>
-							<entry name="java:/JmsXA" />
-						</entries>
-					</pooled-connection-factory>
-				</jms-connection-factories>
-				<jms-destinations>
-					<jms-queue name="refreshQueue">
-						<entry name="jms/refreshQueue"/>
-						<entry name="java:jboss/exported/jms/refreshQueue"/>
-					</jms-queue>
-				</jms-destinations>
-			</hornetq-server>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:naming:1.2">
-			<remote-naming />
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
-			<properties>
-				<!-- Specifies the beginning start level of the framework -->
-				<property name="org.osgi.framework.startlevel.beginning">1</property>
-			</properties>
-			<capabilities>
-				<!-- modules registered with the OSGi layer on startup -->
-				<capability name="javax.servlet.api:v25" />
-				<capability name="javax.transaction.api" />
-				<!-- bundles started in startlevel 1 -->
-				<capability name="org.apache.felix.log" startlevel="1" />
-				<capability name="org.jboss.osgi.logging" startlevel="1" />
-				<capability name="org.apache.felix.configadmin"
-					startlevel="1" />
-				<capability name="org.jboss.as.osgi.configadmin"
-					startlevel="1" />
-			</capabilities>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:pojo:1.0" />
-		<subsystem xmlns="urn:jboss:domain:remoting:1.1">
-			<connector name="remoting-connector" socket-binding="remoting" />
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" />
-		<subsystem xmlns="urn:jboss:domain:sar:1.0" />
-		<subsystem xmlns="urn:jboss:domain:security:1.2">
-            <security-domains>
-                <security-domain name="other" cache-type="default">
-                    <authentication>
-                        <login-module code="Remoting" flag="optional">
-                            <module-option name="password-stacking" value="useFirstPass"/>
-                        </login-module>
-                        <login-module code="RealmDirect" flag="required">
-                            <module-option name="password-stacking" value="useFirstPass"/>
-                        </login-module>
-                    </authentication>
-                </security-domain>
-                <security-domain name="jboss-web-policy" cache-type="default">
-                    <authorization>
-                        <policy-module code="Delegating" flag="required"/>
-                    </authorization>
-                </security-domain>
-                <security-domain name="jboss-ejb-policy" cache-type="default">
-                    <authorization>
-                        <policy-module code="Delegating" flag="required"/>
-                    </authorization>
-                </security-domain>
-            </security-domains>
-        </subsystem>
-		<subsystem xmlns="urn:jboss:domain:threads:1.1" />
-		<subsystem xmlns="urn:jboss:domain:transactions:1.2">
-			<core-environment>
-				<process-id>
-					<uuid />
-				</process-id>
-			</core-environment>
-			<recovery-environment socket-binding="txn-recovery-environment"
-				status-socket-binding="txn-status-manager" />
-			<coordinator-environment default-timeout="300" />
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:web:1.1"
-			default-virtual-server="default-host" native="false">
-			<connector name="http" protocol="HTTP/1.1" scheme="http"
-				socket-binding="http" />
-			<virtual-server name="default-host"
-				enable-welcome-root="false">
-				<alias name="localhost" />
-			</virtual-server>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:webservices:1.1">
-			<modify-wsdl-address>true</modify-wsdl-address>
-			<wsdl-host>${env.OPENSHIFT_GEAR_DNS}</wsdl-host>
-            <wsdl-port>80</wsdl-port>
-			<endpoint-config name="Standard-Endpoint-Config" />
-			<endpoint-config name="Recording-Endpoint-Config">
-				<pre-handler-chain name="recording-handlers"
-					protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
-					<handler name="RecordingHandler"
-						class="org.jboss.ws.common.invocation.RecordingServerHandler" />
-				</pre-handler-chain>
-			</endpoint-config>
-		</subsystem>
-		<subsystem xmlns="urn:jboss:domain:weld:1.0" />
-	</profile>
-
-	<interfaces>
-		<interface name="management">
-			<loopback-address value="${env.OPENSHIFT_JBOSSEAP_IP}" />
-		</interface>
-		<interface name="public">
-			<loopback-address value="${env.OPENSHIFT_JBOSSEAP_IP}" />
-		</interface>
-		<interface name="unsecure">
-			<!-- Used for IIOP sockets in the standarad configuration. To secure JacORB 
-				you need to setup SSL -->
-			<loopback-address value="${env.OPENSHIFT_JBOSSEAP_IP}" />
-		</interface>
-	</interfaces>
-
-	<socket-binding-group name="standard-sockets"
-		default-interface="public" port-offset="0">
-		<socket-binding name="management-native" interface="management"
-			port="9999" />
-		<socket-binding name="management-http" interface="management"
-			port="9990" />
-
-		<socket-binding name="http" port="8080" />
-		<socket-binding name="jacorb" interface="unsecure"
-			port="3528" />
-		<socket-binding name="jacorb-ssl" interface="unsecure"
-			port="3529" />
-		<socket-binding name="jgroups-tcp" port="7600" />
-		<socket-binding name="messaging" port="5445" />
-		<!--socket-binding name="messaging-group" multicast-address="${jboss.messaging.group.address:231.7.7.7}" 
-			multicast-port="${jboss.messaging.group.port:9876}"/ -->
-		<socket-binding name="messaging-throughput" port="5455" />
-		<socket-binding name="osgi-http" interface="management"
-			port="8090" />
-		<socket-binding name="remoting" port="4447" />
-		<socket-binding name="txn-recovery-environment" port="4712" />
-		<socket-binding name="txn-status-manager" port="4713" />
-		<outbound-socket-binding name="mail-smtp">
-			<remote-destination host="localhost" port="25" />
-		</outbound-socket-binding>
-	</socket-binding-group>
-</server>

.openshift/cron/README.cron

@@ -1,22 +0,0 @@
-Run scripts or jobs on a periodic basis
-=======================================
-Any scripts or jobs added to the minutely, hourly, daily, weekly or monthly
-directories will be run on a scheduled basis (frequency is as indicated by the
-name of the directory) using run-parts.
-
-run-parts ignores any files that are hidden or dotfiles (.*) or backup
-files (*~ or *,)  or named *.{rpmsave,rpmorig,rpmnew,swp,cfsaved}
-
-The presence of two specially named files jobs.deny and jobs.allow controls
-how run-parts executes your scripts/jobs.
-   jobs.deny  ===> Prevents specific scripts or jobs from being executed.
-   jobs.allow ===> Only execute the named scripts or jobs (all other/non-named
-                   scripts that exist in this directory are ignored).
-
-The principles of jobs.deny and jobs.allow are the same as those of cron.deny
-and cron.allow and are described in detail at: 
-   http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/ch-Automating_System_Tasks.html#s2-autotasks-cron-access
-
-See: man crontab or above link for more details and see the the weekly/
-     directory for an example.
-

.openshift/cron/daily/log-cleanup.sh

@@ -1,7 +0,0 @@
-if [ $OPENSHIFT_JBOSSAS_LOG_DIR ]; then
-	rm -rf $OPENSHIFT_JBOSSAS_LOG_DIR/*.log.*
-fi
-
-if [ $OPENSHIFT_JBOSSEAP_LOG_DIR ]; then
-	rm -rf $OPENSHIFT_JBOSSEAP_LOG_DIR/*.log.*
-fi

.openshift/cron/weekly/README

@@ -1,16 +0,0 @@
-Run scripts or jobs on a weekly basis
-=====================================
-Any scripts or jobs added to this directory will be run on a scheduled basis
-(weekly) using run-parts.
-
-run-parts ignores any files that are hidden or dotfiles (.*) or backup
-files (*~ or *,)  or named *.{rpmsave,rpmorig,rpmnew,swp,cfsaved} and handles
-the files named jobs.deny and jobs.allow specially.
-
-In this specific example, the chronograph script is the only script or job file
-executed on a weekly basis (due to white-listing it in jobs.allow). And the
-README and chrono.dat file are ignored either as a result of being black-listed
-in jobs.deny or because they are NOT white-listed in the jobs.allow file.
-
-For more details, please see ../README.cron file.
-

.openshift/cron/weekly/chrono.dat

@@ -1 +0,0 @@
-Time And Relative D...n In Execution (Open)Shift!

.openshift/cron/weekly/chronograph

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-echo "`date`: `cat $(dirname \"$0\")/chrono.dat`"

.openshift/cron/weekly/jobs.allow

@@ -1,12 +0,0 @@
-#
-#  Script or job files listed in here (one entry per line) will be
-#  executed on a weekly-basis.
-#
-#  Example: The chronograph script will be executed weekly but the README 
-#           and chrono.dat files in this directory will be ignored.
-#
-#           The README file is actually ignored due to the entry in the
-#           jobs.deny which is checked before jobs.allow (this file).
-#
-chronograph
-

.openshift/cron/weekly/jobs.deny

@@ -1,7 +0,0 @@
-#
-#  Any script or job files listed in here (one entry per line) will NOT be
-#  executed (read as ignored by run-parts).
-#
-
-README
-

.openshift/markers/README

@@ -1,22 +0,0 @@
-Markers
-===========
-
-Adding marker files to this directory will have the following effects:
-
-enable_jpda - Will enable the JPDA socket based transport on the java virtual
-              machine running the JBoss AS 7 application server. This enables
-              you to remotely debug code running inside the JBoss AS 7
-              application server.
-
-skip_maven_build - Maven build step will be skipped
-
-force_clean_build - Will start the build process by removing all non 
-essential Maven dependencies.  Any current dependencies specified in 
-your pom.xml file will then be re-downloaded.
-
-hot_deploy - Will prevent a JBoss container restart during build/deployment.
-             Newly build archives will be re-deployed automatically by the
-             JBoss HDScanner component.
-             
-java7 - Will run JBoss AS7 with Java7 if present. If no marker is present then the 
-			baseline Java version will be used (currently Java6)

CHANGELOG

@@ -0,0 +1,80 @@
+v 3.0.0
+  - complete overhaul of the UI
+  - backend and frontend are now in separate maven modules
+  - no changes to the api or the database
+
+v 2.6.0
+  - add support for media content as a backup for missing content (useful for youtube feeds)
+  - correctly follow http error code 308 redirects
+  - fixed a bug that prevented users from deleting their account
+  - fixed a bug that made commafeed store entry contents multiple times
+  - fixed a bug that prevented the app to be used as an installed app on mobile devices if the context path of commafeed was not "/"
+  - fixed a bug that prevented entries from being "marked as read older than xxx" for a feed that was just added
+  - removed support for google+ and readability as those services no longer exist
+  - removed support for deploying on openshift
+  - removed alphabetical sorting of entries because of really poor performance (title cannot be indexed)
+  - improve performance for instances with the heavy load setting enabled by preventing CommaFeed from fetching feeds from users that did not log in for a long time
+  - various dependencies upgrades (notably dropwizard from 1.3 to 2.1)
+  - add support for mariadb
+  - add support for java17+ runtime
+  - various security improvements
+v 2.5.0
+  - unread count is now displayed in a favicon badge when supported
+  - the user agent string for the bot fetching feeds is now configurable
+  - feed parsing performance improvements
+  - support for java9+ runtime
+  - can now properly start from an empty postgresql database
+v 2.4.0
+  - users were not able to change password or delete account
+  - fix api key generation
+  - feed entries can now be sorted alphabetically
+  - fix facebook sharing
+  - fix layout on iOS
+  - postgresql driver update (fix for postgres 9.6)
+  - various internationalization fixes
+  - security fixes
+v 2.3.0
+  - dropwizard upgrade 0.9.1
+  - feed enclosures are hidden if they already displayed in the content 
+  - fix youtube favicons
+  - various internationalization fixes
+v 2.2.0
+  - fix youtube and instagram favicon fetching
+  - mark as read filter was lost when a feed was rearranged with drag&drop
+  - feed entry categories are now displayed if available
+  - various performance and dependencies upgrades
+  - java8 is now required
+v 2.1.0
+  - dropwizard upgrade to 0.8.0
+  - you have to remove the "app.contextPath" setting from your yml file, you can optionally use server.applicationContextPath instead
+  - new setting app.maxFeedCapacity for deleting old entries
+  - ability to set filtering expressions for subscriptions to automatically mark new entries as read based on title, content, author or url.
+  - ability to use !keyword or -keyword to exclude a keyword from a search query
+  - facebook feeds now show user favicon instead of facebook favicon
+  - new dark theme 'nightsky'
+v 2.0.3
+  - internet explorer ajax cache workaround
+  - categories are now deletable again
+  - openshift support is back
+  - youtube feeds now show user favicon instead of youtube favicon
+v 2.0.2
+  - api using the api key is now working again
+  - context path is now configurable in config.yml (see app.contextPath in config.yml.example)
+  - fix login on firefox when fields are autofilled by the browser
+  - fix scrolling of subscriptions list on mobile
+  - user is now logged in after registration
+  - fix link to documentation on home page and about page
+  - fields autocomplete is disabled on the profile page
+  - users are able to delete their account again
+  - chinese and malaysian translation files are now correctly loaded
+  - software version in user-agent when fetching feeds is no longer hardcoded
+  - admin settings page is now read only, settings are configured in config.yml 
+  - added link to metrics on the admin settings page
+  - Rome (rss library) upgrade to 1.5.0
+v 2.0.1
+  - the redis pool no longer throws an exception when it is unable to aquire a new connection
+v2.0.0
+  - The backend has been completely rewritten using Dropwizard instead of TomEE, resulting in a lot less memory consumption and better overall performances.
+    See the README on how to build CommaFeed from now on.
+  - CommaFeed should no longer fetch the same feed multiple times in a row  
+  - Users can use their username or email to log in  

README.md

@@ -1,132 +1,120 @@
-CommaFeed [![Build Status](https://buildhive.cloudbees.com/job/Athou/job/commafeed/badge/icon)](https://buildhive.cloudbees.com/job/Athou/job/commafeed/)
-=========
-Sources for [CommaFeed.com](http://www.commafeed.com/).
-
-Google Reader inspired self-hosted RSS reader, based on JAX-RS, Wicket and AngularJS.
-
-Deploy on your own server (using TomEE, a lightweight JavaEE6 container based on Tomcat) or even in the cloud for free on OpenShift.
-
-Related open-source projects
-----------------------------
-
-Android apps: [News+ extension](https://github.com/Athou/commafeed-newsplus) - [Android app](https://github.com/doomrobo/CommaFeed-Android-Reader)
-
-Browser extensions: [Chrome](https://github.com/Athou/commafeed-chrome) - [Firefox](https://github.com/Athou/commafeed-firefox) - [Opera](https://github.com/Athou/commafeed-opera) - [Safari](https://github.com/Athou/commafeed-safari)
-
-Deployment on OpenShift
------------------------
-
-Hosting an application on OpenShift is free. 
-At the moment those instructions are not working because the application takes too long to build on OpenShift and causes a timeout. 
-See [here](http://jasonwryan.com/blog/2013/05/25/greader/) for an alternative method.
-
-* Create an account on [OpenShift](http://www.openshift.com/).
-* Add an application, select `JBoss Enterprise Application Platform 6.0`.
-* For the `Public URL` set the name you want (e.g. `commafeed`).
-* For the `Source Code` option, click `Change` and set this repository (`https://github.com/Athou/commafeed.git`).
-* Click `Create Application`.
-* Click `Add cartridge` and select `MySQL`.
-* Wait a couple of minutes and access your application.
-* The default user is `admin` and the password is `admin`.
-
-Deployment on your own server
------------------------------
-
-For storage, you can either use an embedded HSQLDB database or an external MySQL, PostgreSQL or SQLServer database.
-You also need Maven 3.x (and a Java 1.7+ JDK) installed in order to build the application.
-
-To install maven and openjdk on Ubuntu, issue the following commands
-
-    sudo add-apt-repository ppa:natecarlson/maven3
-    sudo apt-get update
-    sudo apt-get install openjdk-7-jdk maven3
-    
-    # Not required but if you don't, use 'mvn3' instead of 'mvn' for the rest of the instructions.
-    sudo ln -s /usr/bin/mvn3 /usr/bin/mvn
-    
-On Windows and other operating systems, just download maven 3.x from the [official site](http://maven.apache.org/), extract it somewhere and add the `bin` directory to your `PATH` environment variable.
-    
-Download the sources (it doesn't matter where, you can delete the directory when you're done).
-If you don't have git you can download the sources as a zip file from [here](https://github.com/Athou/commafeed/archive/master.zip)
-
-    git clone https://github.com/Athou/commafeed.git
-    cd commafeed
-    
-Now build the application
-
-	# Embedded HSQL database:
-    mvn clean package tomee:build -Pprod
-    
-	# External MySQL database:
-    mvn clean package tomee:build -Pprod -Pmysql
-    
-    # External PostgreSQL database:
-    mvn clean package tomee:build -Pprod -Ppgsql
-    
-    # External Microsoft SQL Server database:
-    mvn clean package tomee:build -Pprod -Pmssql
-    
-It will generate a zip file at `target/commafeed.zip` with everything you need to run the application.
-
-* Create a directory somewhere (e.g. `/opt/commafeed/`) and extract the generated zip inside this directory.
-* Create a directory called `logs` (e.g. `/opt/commafeed/logs`)
-* Copy the file `conf/setenv.sh` (Linux) or `conf/setenv.bat` (Windows) to `bin/`
-* If you don't use the embedded database, create a database in your external database instance, then uncomment the `Resource` element corresponding to the database engine you use from `conf/tomee.xml` and edit the default credentials.
-* If you'd like to change the default port (8082), edit `conf/server.xml` and look for `<Connector port="8082" protocol="HTTP/1.1"`. Change the port to the value you'd like to use.
-* CommaFeed will run on the `/commafeed` context. If you'd like to change the context, go to `webapps` and rename `commafeed.war`. Use the special name `ROOT.war` to deploy to the root context.
-* To start and stop the application, use `bin/startup.sh` and `bin/shutdown.sh` on Linux (you need to `chmod +x bin/*.sh`) or `bin\startup.bat` and `bin\shutdown.bat` on Windows. 
-If you use the embedded database, note that the database file will be created in the current directory, so make sure you always start the app in the same directory. You can optionally set an absolute path instead of a relative one in `tomee.xml`.
-* To update the application with a newer version, pull the latest changes and use the same command you used to build the complete TomEE package, but without the `tomee:build` part (keep `-Pprod -P<database>`). 
-This will generate the file `target/commafeed.war`. Copy this file to your tomee `webapps/` directory.
-* The application is online at [http://localhost:8082/commafeed](http://localhost:8082/commafeed). Don't forget to set the public URL in the admin settings.
-* The default user is `admin` and the password is `admin`.
-
-You can use nginx or apache as a proxy http server. Note that when using apache, the `ProxyPreserveHost on` option should be set in your config file.
-
-Local development
------------------
-
-Checkout the code and use maven to build and start a local TomEE instance.
-
- `mvn clean package tomee:run`
-
-The application is online at [http://localhost:8082/commafeed](http://localhost:8082/commafeed). Any change to the source code will be applied immediatly.
-The default user is `admin` and the password is `admin`.
-
-Translate CommaFeed into your language
---------------------------------------
-
-Files for internationalization are located [here](https://github.com/Athou/commafeed/tree/master/src/main/resources/i18n).
-
-To add a new language, create a new file in that directory.
-The name of the file should be the two-letters [ISO-639-1 language code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
-The language has to be referenced in the `languages.properties` file to be picked up.
-
-When adding new translations, add them in en.properties then run `mvn -e groovy:execute -Pi18n`. It will parse the english file and add placeholders in the other translation files. 
-
-Themes
----------------------
-
-To create a theme, create a new file  `src/main/webapp/sass/themes/_<theme>.scss`. Your styles should be wrapped in a `#theme-<theme>` element and use the [SCSS format](http://sass-lang.com/) which is a superset of CSS.
-
-Don't forget to reference your theme in `src/main/webapp/sass/app.scss` and in `src/main/webapp/js/controllers.js` (look for `$scope.themes`).
-
-See [_test.scss](https://github.com/Athou/commafeed/blob/master/src/main/webapp/sass/themes/_test.scss) for an example.
-
-
-Copyright and license
----------------------
-
-Copyright 2013 CommaFeed.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this work except in compliance with the License.
-You may obtain a copy of the License in the LICENSE file, or at:
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
+# CommaFeed
+
+Sources for [CommaFeed.com](http://www.commafeed.com/).
+
+Google Reader inspired self-hosted RSS reader, based on Dropwizard and AngularJS.
+CommaFeed is now considered feature-complete and is in maintenance mode.
+
+## Related open-source projects
+
+Browser extensions:
+
+- [Chrome](https://github.com/Athou/commafeed-chrome)
+- [Firefox](https://github.com/Athou/commafeed-firefox)
+- [Opera](https://github.com/Athou/commafeed-opera)
+- [Safari](https://github.com/Athou/commafeed-safari)
+
+## Deployment on your own server
+
+### The very short version (download precompiled package)
+
+    mkdir commafeed && cd commafeed
+    wget https://github.com/Athou/commafeed/releases/download/3.0.0/commafeed.jar
+    wget https://raw.githubusercontent.com/Athou/commafeed/3.0.0/commafeed-server/config.yml.example -O config.yml
+    vi config.yml
+    java -Djava.net.preferIPv4Stack=true -jar commafeed.jar server config.yml
+
+### The short version (build from sources)
+
+    git clone https://github.com/Athou/commafeed.git
+    cd commafeed
+    ./mvnw clean package
+    cp commafeed-server/config.yml.example config.yml
+    vi config.yml
+    java -Djava.net.preferIPv4Stack=true -jar commafeed-server/target/commafeed.jar server config.yml
+
+### The long version (same as the short version, but more detailed)
+
+CommaFeed 2.0 has been rewritten to use Dropwizard and gulp instead of using tomee and wro4j. The latest version of the 1.x branch is available [here](https://github.com/Athou/commafeed/tree/1.x).
+
+For storage, you can either use an embedded file-based H2 database or an external MySQL, PostgreSQL or SQLServer database.
+You also need the Java 1.8+ JDK in order to build the application.
+
+To install the required packages to build CommaFeed on Ubuntu, issue the following commands
+
+    # if this commands works and returns a version >= 1.8.0 you're good to go and you can skip JDK installation
+    javac -version
+
+    # if openjdk-8-jdk is not available on your ubuntu version (14.04 LTS), add the following repo first
+    sudo add-apt-repository ppa:openjdk-r/ppa
+    sudo apt-get update
+
+    sudo apt-get install g++ build-essential openjdk-8-jdk
+
+    # Make sure java8 is the selected java version
+    sudo update-alternatives --config java
+    sudo update-alternatives --config javac
+
+Clone this repository. If you don't have git you can download the sources as a zip file from [here](https://github.com/Athou/commafeed/archive/master.zip)
+
+    git clone https://github.com/Athou/commafeed.git
+    cd commafeed
+
+Now build the application
+
+    ./mvnw clean package
+
+Copy `commafeed-server/config.yml.example` to `./config.yml` then edit the file to your liking.
+Issue the following command to run the app, the server will listen by default on `http://localhost:8082`. The default user is `admin` and the default password is `admin`.
+
+    java -Djava.net.preferIPv4Stack=true -jar commafeed-server/target/commafeed.jar server config.yml
+
+You can use a proxy http server such as nginx or apache.
+
+## Translate CommaFeed into your language
+
+Files for internationalization are located [here](https://github.com/Athou/commafeed/tree/master/commafeed-client/src/locales).
+
+To add a new language:
+
+- edit `commafeed-client/src/i18n.ts`
+  - add the new locale to the `locales` array.
+  - import the dayjs locale
+- edit `commafeed-client/.linguirc` and add the new locale to the `locales` array.
+- run `npm run i18n` and add translations to the newly created `commafeed-client/src/locales/[locale]/messages.po` file
+
+The name of the locale should be the two-letters [ISO-639-1 language code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
+
+## Local development
+
+- `git clone https://github.com/Athou/CommaFeed`
+
+### Backend
+
+- Open `commafeed-server` in your preferred Java IDE.
+  - CommaFeed uses Lombok, you need the Lombok plugin for your IDE.
+  - If using Eclipse, Go to Window → Preferences → Maven → Annotation Processing and check "Automatically configure JDT APT"
+- Start `CommaFeedApplication.java` in debug mode with `server config.dev.yml` as arguments
+
+### Frontend
+
+- Open `commafeed-client` in your preferred JavaScript IDE.
+- run `npm install`
+- run `npm run dev`
+- the frontend server is now running at http://localhost:8082 and is proxying REST requests to the backend running on port 8083
+
+## Copyright and license
+
+Copyright 2013-2022 CommaFeed.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this work except in compliance with the License.
+You may obtain a copy of the License in the LICENSE file, or at:
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
 limitations under the License.

SECURITY.md

@@ -0,0 +1,6 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you found a vulnerability that you deem too sensitive to disclose publicly in a Github issue, please send an email at jeremiepanzer at gmail dot com.
+Thanks !

commafeed-client/.eslintignore

@@ -0,0 +1,6 @@
+dist
+node_modules
+
+vite.config.ts
+
+src/locales/**/*.ts

commafeed-client/.eslintrc

@@ -0,0 +1,87 @@
+{
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:react/recommended",
+        "react-app",
+        "airbnb",
+        "airbnb-typescript",
+        "prettier"
+    ],
+    "plugins": ["@typescript-eslint", "prettier", "hooks"],
+    "parserOptions": {
+        "project": "./tsconfig.json"
+    },
+    "rules": {
+        // make eslint check prettier rules
+        "prettier/prettier": "error",
+
+        // enforce consistent curly braces usage
+        "curly": ["error", "multi-line", "consistent"],
+
+        // set "props" to false because it cases false positives with immer
+        "no-param-reassign": ["error", { "props": false }],
+
+        "prefer-destructuring": [
+            "error",
+            {
+                "array": false,
+                "object": true
+            },
+            {
+                "enforceForRenamedProperties": false
+            }
+        ],
+
+        // causes issues in thunks when we want to dispatch an action that is defined in the reducer
+        "@typescript-eslint/no-use-before-define": "off",
+
+        // make sure the key prop is filled when required
+        "react/jsx-key": ["error", { "checkFragmentShorthand": true }],
+
+        // configure additional hooks
+        "react-hooks/exhaustive-deps": [
+            "warn",
+            {
+                "additionalHooks": "(^useAsync$|useDidUpdate)"
+            }
+        ],
+
+        // trigger even if props is used only in createStyles()
+        "react/no-unused-prop-types": "off",
+
+        // no longer required with modern react versions
+        "react/react-in-jsx-scope": "off",
+
+        // not required with typescript
+        "react/prop-types": "off",
+        "react/require-default-props": "off",
+
+        // matter of taste
+        "react/destructuring-assignment": "off",
+        "react/jsx-props-no-spreading": "off",
+        "react/no-unescaped-entities": "off",
+        "import/prefer-default-export": "off",
+
+        // enforce hook call order
+        "hooks/sort": [
+            2,
+            {
+                "groups": [
+                    "useLocation",
+                    "useParams",
+                    "useStyles",
+                    "useMantineTheme",
+                    "useState",
+                    "useAppSelector",
+                    "useAppDispatch",
+                    "useAsync",
+                    "useForm",
+                    "useAsyncCallback",
+                    "useCallback",
+                    "useEffect"
+                ]
+            }
+        ]
+    }
+}

commafeed-client/.gitignore

@@ -0,0 +1,33 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+# rollup-plugin-visualizer
+/stats.html
+
+# vite
+vite.config.ts.timestamp-*.mjs
+
+# compiled locales
+src/locales/**/*.ts

commafeed-client/.linguirc

@@ -0,0 +1,57 @@
+{
+    "locales": [
+        "ar",
+        "ca",
+        "cs",
+        "cy",
+        "da",
+        "de",
+        "en",
+        "es",
+        "fa",
+        "fi",
+        "fr",
+        "gl",
+        "hu",
+        "id",
+        "it",
+        "ja",
+        "ko",
+        "ms",
+        "nb",
+        "nl",
+        "nn",
+        "pl",
+        "pt",
+        "ru",
+        "sk",
+        "sv",
+        "tr",
+        "zh"
+    ],
+    "catalogs": [
+        {
+            "path": "src/locales/{locale}/messages",
+            "include": [
+                "src"
+            ],
+            "exclude": [
+                "src/locales/**"
+            ]
+        }
+    ],
+    "format": "po",
+    "formatOptions": {
+        "origins": true,
+        "lineNumbers": false
+    },
+    "sourceLocale": "en",
+    "fallbackLocales": {
+        "default": "en"
+    },
+    "extractBabelOptions": {
+        "presets": [
+            "@babel/preset-typescript"
+        ]
+    }
+}

commafeed-client/.prettierrc

@@ -0,0 +1,7 @@
+{
+    "printWidth": 140,
+    "semi": false,
+    "tabWidth": 4,
+    "arrowParens": "avoid",
+    "endOfLine": "auto"
+}

commafeed-client/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <link rel="icon" type="image/x-icon" href="favicon.ico" />
+        <link rel="manifest" href="manifest.json" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+        <title>CommaFeed</title>
+    </head>
+    <body>
+        <div id="root"></div>
+        <script type="module" src="/src/main.tsx"></script>
+    </body>
+</html>

commafeed-client/package.json

@@ -0,0 +1,76 @@
+{
+    "name": "commafeed-client",
+    "private": true,
+    "version": "0.0.0",
+    "type": "module",
+    "scripts": {
+        "dev": "vite",
+        "build": "npm run i18n:compile && tsc && vite build",
+        "preview": "vite preview",
+        "test": "vitest",
+        "test:ci": "vitest run",
+        "eslint": "eslint --ext=.js,.jsx,.ts,.tsx src",
+        "i18n": "npm run i18n:extract && npm run i18n:compile",
+        "i18n:extract": "lingui extract --clean",
+        "i18n:compile": "lingui compile --typescript",
+        "postinstall": "npm run i18n:compile"
+    },
+    "dependencies": {
+        "@emotion/react": "^11.10.5",
+        "@fontsource/open-sans": "^4.5.13",
+        "@lingui/core": "^3.14.0",
+        "@lingui/macro": "^3.14.0",
+        "@lingui/react": "^3.14.0",
+        "@mantine/core": "^5.6.3",
+        "@mantine/form": "^5.6.3",
+        "@mantine/hooks": "^5.6.3",
+        "@mantine/modals": "^5.6.3",
+        "@mantine/notifications": "^5.6.3",
+        "@mantine/spotlight": "^5.6.3",
+        "@reduxjs/toolkit": "^1.8.6",
+        "axios": "^1.1.3",
+        "dayjs": "^1.11.6",
+        "interweave": "^13.0.0",
+        "lodash": "^4.17.21",
+        "make-plural": "^7.1.0",
+        "mousetrap": "^1.6.5",
+        "react": "^18.2.0",
+        "react-async-hook": "^4.0.0",
+        "react-dom": "^18.2.0",
+        "react-icons": "^4.6.0",
+        "react-infinite-scroller": "^1.2.6",
+        "react-redux": "^8.0.4",
+        "react-router-dom": "^6.4.2",
+        "swagger-ui-react": "^4.15.2",
+        "tinycon": "^0.6.8"
+    },
+    "devDependencies": {
+        "@lingui/cli": "^3.14.0",
+        "@types/eslint": "^8.4.8",
+        "@types/lodash": "^4.14.186",
+        "@types/mousetrap": "^1.6.10",
+        "@types/react": "^18.0.24",
+        "@types/react-dom": "^18.0.8",
+        "@types/react-infinite-scroller": "^1.2.3",
+        "@types/swagger-ui-react": "^4.11.0",
+        "@types/tinycon": "^0.6.3",
+        "@typescript-eslint/eslint-plugin": "^5.41.0",
+        "@typescript-eslint/parser": "^5.41.0",
+        "@vitejs/plugin-react": "^2.2.0",
+        "eslint": "^8.26.0",
+        "eslint-config-airbnb": "^19.0.4",
+        "eslint-config-airbnb-typescript": "^17.0.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-config-react-app": "^7.0.1",
+        "eslint-plugin-hooks": "^0.4.3",
+        "eslint-plugin-prettier": "^4.2.1",
+        "prettier": "^2.7.1",
+        "rollup-plugin-visualizer": "^5.8.3",
+        "typescript": "^4.8.4",
+        "vite": "^3.2.0",
+        "vite-plugin-eslint": "^1.8.1",
+        "vite-tsconfig-paths": "^3.5.2",
+        "vitest": "^0.24.3",
+        "vitest-mock-extended": "^1.0.3"
+    }
+}

commafeed-client/pom.xml

@@ -0,0 +1,98 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.commafeed</groupId>
+		<artifactId>commafeed</artifactId>
+		<version>3.0.0</version>
+	</parent>
+	<artifactId>commafeed-client</artifactId>
+	<name>CommaFeed Client</name>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.github.eirslett</groupId>
+				<artifactId>frontend-maven-plugin</artifactId>
+				<version>1.12.1</version>
+				<?m2e ignore?>
+				<executions>
+					<execution>
+						<id>install node and npm</id>
+						<goals>
+							<goal>install-node-and-npm</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<nodeVersion>v16.16.0</nodeVersion>
+							<npmVersion>8.15.0</npmVersion>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm install</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<arguments>ci</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm run eslint</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<arguments>run eslint</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm run test</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<arguments>run test:ci</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm run build</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<arguments>run build</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<id>copy web interface to resources</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/classes/assets</outputDirectory>
+							<resources>
+								<resource>
+									<directory>dist</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

commafeed-client/public/manifest.json

@@ -0,0 +1,34 @@
+{
+    "$schema": "https://json.schemastore.org/web-manifest-combined.json",
+    "name": "CommaFeed",
+    "scope": ".",
+    "start_url": "./",
+    "display": "standalone",
+    "theme_color": "#f88a14",
+    "icons": [
+        {
+            "src": "app-icon-72.png",
+            "sizes": "72x72",
+            "type": "image/png",
+            "density": "1.5"
+        },
+        {
+            "src": "app-icon-114.png",
+            "sizes": "96x96",
+            "type": "image/png",
+            "density": "2.0"
+        },
+        {
+            "src": "app-icon-144.png",
+            "sizes": "144x144",
+            "type": "image/png",
+            "density": "3.0"
+        },
+        {
+            "src": "app-icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "density": "4.0"
+        }
+    ]
+}

commafeed-client/src/App.tsx

@@ -0,0 +1,147 @@
+import { i18n } from "@lingui/core"
+import { I18nProvider } from "@lingui/react"
+import { ColorScheme, ColorSchemeProvider, MantineProvider } from "@mantine/core"
+import { useColorScheme, useLocalStorage } from "@mantine/hooks"
+import { ModalsProvider } from "@mantine/modals"
+import { NotificationsProvider } from "@mantine/notifications"
+import { Constants } from "app/constants"
+import { redirectTo } from "app/slices/redirect"
+import { reloadServerInfos } from "app/slices/server"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { categoryUnreadCount } from "app/utils"
+import { ErrorBoundary } from "components/ErrorBoundary"
+import { Header } from "components/header/Header"
+import { Tree } from "components/sidebar/Tree"
+import { useI18n } from "i18n"
+import { AdminUsersPage } from "pages/admin/AdminUsersPage"
+import { MetricsPage } from "pages/admin/MetricsPage"
+import { AboutPage } from "pages/app/AboutPage"
+import { AddPage } from "pages/app/AddPage"
+import { CategoryDetailsPage } from "pages/app/CategoryDetailsPage"
+import { FeedDetailsPage } from "pages/app/FeedDetailsPage"
+import { FeedEntriesPage } from "pages/app/FeedEntriesPage"
+import Layout from "pages/app/Layout"
+import { SettingsPage } from "pages/app/SettingsPage"
+import { TagDetailsPage } from "pages/app/TagDetailsPage"
+import { LoginPage } from "pages/auth/LoginPage"
+import { PasswordRecoveryPage } from "pages/auth/PasswordRecoveryPage"
+import { RegistrationPage } from "pages/auth/RegistrationPage"
+import React, { useEffect } from "react"
+import { HashRouter, Navigate, Route, Routes, useNavigate } from "react-router-dom"
+import Tinycon from "tinycon"
+
+function Providers(props: { children: React.ReactNode }) {
+    const preferredColorScheme = useColorScheme()
+    const [colorScheme, setColorScheme] = useLocalStorage<ColorScheme>({
+        key: "color-scheme",
+        defaultValue: preferredColorScheme,
+        getInitialValueInEffect: true,
+    })
+    const toggleColorScheme = (value?: ColorScheme) => setColorScheme(value || (colorScheme === "dark" ? "light" : "dark"))
+
+    return (
+        <I18nProvider i18n={i18n}>
+            <ColorSchemeProvider colorScheme={colorScheme} toggleColorScheme={toggleColorScheme}>
+                <MantineProvider
+                    withGlobalStyles
+                    withNormalizeCSS
+                    theme={{
+                        primaryColor: "orange",
+                        colorScheme,
+                        fontFamily: "Open Sans",
+                    }}
+                >
+                    <ModalsProvider>
+                        <NotificationsProvider position="top-center" zIndex={9999}>
+                            <ErrorBoundary>{props.children}</ErrorBoundary>
+                        </NotificationsProvider>
+                    </ModalsProvider>
+                </MantineProvider>
+            </ColorSchemeProvider>
+        </I18nProvider>
+    )
+}
+
+// swagger-ui is very large, load only on-demand
+const ApiDocumentationPage = React.lazy(() => import("pages/app/ApiDocumentationPage"))
+
+function AppRoutes() {
+    return (
+        <Routes>
+            <Route path="/" element={<Navigate to={`/app/category/${Constants.categories.all.id}`} replace />} />
+            <Route path="login" element={<LoginPage />} />
+            <Route path="register" element={<RegistrationPage />} />
+            <Route path="passwordRecovery" element={<PasswordRecoveryPage />} />
+            <Route path="app" element={<Layout header={<Header />} sidebar={<Tree />} />}>
+                <Route path="category">
+                    <Route path=":id" element={<FeedEntriesPage sourceType="category" />} />
+                    <Route path=":id/details" element={<CategoryDetailsPage />} />
+                </Route>
+                <Route path="feed">
+                    <Route path=":id" element={<FeedEntriesPage sourceType="feed" />} />
+                    <Route path=":id/details" element={<FeedDetailsPage />} />
+                </Route>
+                <Route path="tag">
+                    <Route path=":id" element={<FeedEntriesPage sourceType="tag" />} />
+                    <Route path=":id/details" element={<TagDetailsPage />} />
+                </Route>
+                <Route path="add" element={<AddPage />} />
+                <Route path="settings" element={<SettingsPage />} />
+                <Route path="admin">
+                    <Route path="users" element={<AdminUsersPage />} />
+                    <Route path="metrics" element={<MetricsPage />} />
+                </Route>
+                <Route path="about" element={<AboutPage />} />
+                <Route path="api" element={<ApiDocumentationPage />} />
+            </Route>
+            <Route path="*" element={<Navigate to="/" replace />} />
+        </Routes>
+    )
+}
+
+function RedirectHandler() {
+    const target = useAppSelector(state => state.redirect.to)
+    const dispatch = useAppDispatch()
+    const navigate = useNavigate()
+    useEffect(() => {
+        if (target) {
+            // pages can subscribe to state.timestamp in order to refresh when navigating to an url matching the current page
+            navigate(target, { state: { timestamp: new Date() } })
+            dispatch(redirectTo(undefined))
+        }
+    }, [target, dispatch, navigate])
+
+    return null
+}
+
+function FaviconHandler() {
+    const root = useAppSelector(state => state.tree.rootCategory)
+    useEffect(() => {
+        const unreadCount = categoryUnreadCount(root)
+        if (unreadCount === 0) Tinycon.reset()
+        else Tinycon.setBubble(unreadCount)
+    }, [root])
+
+    return null
+}
+
+export function App() {
+    useI18n()
+    const dispatch = useAppDispatch()
+
+    useEffect(() => {
+        dispatch(reloadServerInfos())
+    }, [dispatch])
+
+    return (
+        <Providers>
+            <>
+                <FaviconHandler />
+                <HashRouter>
+                    <RedirectHandler />
+                    <AppRoutes />
+                </HashRouter>
+            </>
+        </Providers>
+    )
+}

commafeed-client/src/app/client.ts

@@ -0,0 +1,112 @@
+import axios from "axios"
+import {
+    AddCategoryRequest,
+    Category,
+    CategoryModificationRequest,
+    CollapseRequest,
+    Entries,
+    FeedInfo,
+    FeedInfoRequest,
+    FeedModificationRequest,
+    GetEntriesPaginatedRequest,
+    IDRequest,
+    LoginRequest,
+    MarkRequest,
+    Metrics,
+    MultipleMarkRequest,
+    PasswordResetRequest,
+    ProfileModificationRequest,
+    RegistrationRequest,
+    ServerInfo,
+    Settings,
+    StarRequest,
+    SubscribeRequest,
+    Subscription,
+    TagRequest,
+    UserModel,
+} from "./types"
+
+const axiosInstance = axios.create({ baseURL: "./rest", withCredentials: true })
+axiosInstance.interceptors.response.use(
+    response => response,
+    error => {
+        if (error.response.status === 401) window.location.hash = "/login"
+        throw error
+    }
+)
+
+export const client = {
+    category: {
+        getRoot: () => axiosInstance.get<Category>("category/get"),
+        modify: (req: CategoryModificationRequest) => axiosInstance.post("category/modify", req),
+        collapse: (req: CollapseRequest) => axiosInstance.post("category/collapse", req),
+        getEntries: (req: GetEntriesPaginatedRequest) => axiosInstance.get<Entries>("category/entries", { params: req }),
+        markEntries: (req: MarkRequest) => axiosInstance.post("category/mark", req),
+        add: (req: AddCategoryRequest) => axiosInstance.post("category/add", req),
+        delete: (req: IDRequest) => axiosInstance.post("category/delete", req),
+    },
+    entry: {
+        mark: (req: MarkRequest) => axiosInstance.post("entry/mark", req),
+        markMultiple: (req: MultipleMarkRequest) => axiosInstance.post("entry/markMultiple", req),
+        star: (req: StarRequest) => axiosInstance.post("entry/star", req),
+        getTags: () => axiosInstance.get<string[]>("entry/tags"),
+        tag: (req: TagRequest) => axiosInstance.post("entry/tag", req),
+    },
+    feed: {
+        get: (id: string) => axiosInstance.get<Subscription>(`feed/get/${id}`),
+        modify: (req: FeedModificationRequest) => axiosInstance.post("feed/modify", req),
+        getEntries: (req: GetEntriesPaginatedRequest) => axiosInstance.get<Entries>("feed/entries", { params: req }),
+        markEntries: (req: MarkRequest) => axiosInstance.post("feed/mark", req),
+        fetchFeed: (req: FeedInfoRequest) => axiosInstance.post<FeedInfo>("feed/fetch", req),
+        subscribe: (req: SubscribeRequest) => axiosInstance.post<number>("feed/subscribe", req),
+        unsubscribe: (req: IDRequest) => axiosInstance.post("feed/unsubscribe", req),
+        importOpml: (req: File) => {
+            const formData = new FormData()
+            formData.append("file", req)
+            return axiosInstance.post("feed/import", formData, {
+                headers: {
+                    "Content-Type": "multipart/form-data",
+                },
+            })
+        },
+    },
+    user: {
+        login: (req: LoginRequest) => axiosInstance.post("user/login", req),
+        register: (req: RegistrationRequest) => axiosInstance.post("user/register", req),
+        passwordReset: (req: PasswordResetRequest) => axiosInstance.post("user/passwordReset", req),
+        getSettings: () => axiosInstance.get<Settings>("user/settings"),
+        saveSettings: (settings: Settings) => axiosInstance.post("user/settings", settings),
+        getProfile: () => axiosInstance.get<UserModel>("user/profile"),
+        saveProfile: (req: ProfileModificationRequest) => axiosInstance.post("user/profile", req),
+        deleteProfile: () => axiosInstance.post("user/profile/deleteAccount"),
+    },
+    server: {
+        getServerInfos: () => axiosInstance.get<ServerInfo>("server/get"),
+    },
+    admin: {
+        getAllUsers: () => axiosInstance.get<UserModel[]>("admin/user/getAll"),
+        saveUser: (req: UserModel) => axiosInstance.post("admin/user/save", req),
+        deleteUser: (req: IDRequest) => axiosInstance.post("admin/user/delete", req),
+        getMetrics: () => axiosInstance.get<Metrics>("admin/metrics"),
+    },
+}
+
+/**
+ * transform an error object to an array of strings that can be displayed to the user
+ * @param err an error object (e.g. from axios)
+ * @returns an array of messages to show the user
+ */
+export const errorToStrings = (err: unknown) => {
+    let strings: string[] = []
+
+    if (axios.isAxiosError(err)) {
+        if (err.response) {
+            const { data } = err.response
+            if (typeof data === "string") strings.push(data)
+            if (typeof data === "object" && data.message) strings.push(data.message)
+            if (typeof data === "object" && data.errors) strings = [...strings, ...data.errors]
+        }
+    }
+
+    return strings
+}

commafeed-client/src/app/constants.ts

@@ -0,0 +1,100 @@
+import { t } from "@lingui/macro"
+import { DEFAULT_THEME } from "@mantine/core"
+import { IconType } from "react-icons"
+import { FaAt } from "react-icons/fa"
+import { SiBuffer, SiFacebook, SiGmail, SiInstapaper, SiPocket, SiTumblr, SiTwitter } from "react-icons/si"
+import { Category, Entry, SharingSettings } from "./types"
+
+const categories: { [key: string]: Category } = {
+    all: {
+        id: "all",
+        name: t`All`,
+        expanded: false,
+        children: [],
+        feeds: [],
+        position: 0,
+    },
+    starred: {
+        id: "starred",
+        name: t`Starred`,
+        expanded: false,
+        children: [],
+        feeds: [],
+        position: 1,
+    },
+}
+
+const sharing: {
+    [key in keyof SharingSettings]: {
+        label: string
+        icon: IconType
+        color: `#${string}`
+        url: (url: string, description: string) => string
+    }
+} = {
+    email: {
+        label: "Email",
+        icon: FaAt,
+        color: "#000000",
+        url: (url, desc) => `mailto:?subject=${desc}&body=${url}`,
+    },
+    gmail: {
+        label: "Gmail",
+        icon: SiGmail,
+        color: "#EA4335",
+        url: (url, desc) => `https://mail.google.com/mail/?view=cm&fs=1&tf=1&source=mailto&su=${desc}&body=${url}`,
+    },
+    facebook: {
+        label: "Facebook",
+        icon: SiFacebook,
+        color: "#1B74E4",
+        url: url => `https://www.facebook.com/sharer/sharer.php?u=${url}`,
+    },
+    twitter: {
+        label: "Twitter",
+        icon: SiTwitter,
+        color: "#1D9BF0",
+        url: (url, desc) => `http://twitter.com/share?text=${desc}&url=${url}`,
+    },
+    tumblr: {
+        label: "Tumblr",
+        icon: SiTumblr,
+        color: "#375672",
+        url: (url, desc) => `http://www.tumblr.com/share/link?url=${url}&name=${desc}`,
+    },
+    pocket: {
+        label: "Pocket",
+        icon: SiPocket,
+        color: "#EF4154",
+        url: (url, desc) => `https://getpocket.com/save?url=${url}&title=${desc}`,
+    },
+    instapaper: {
+        label: "Instapaper",
+        icon: SiInstapaper,
+        color: "#010101",
+        url: (url, desc) => `https://www.instapaper.com/hello2?url=${url}&title=${desc}`,
+    },
+    buffer: {
+        label: "Buffer",
+        icon: SiBuffer,
+        color: "#000000",
+        url: (url, desc) => `https://bufferapp.com/add?url=${url}&text=${desc}`,
+    },
+}
+
+export const Constants = {
+    categories,
+    sharing,
+    layout: {
+        mobileBreakpoint: DEFAULT_THEME.breakpoints.md,
+        headerHeight: 60,
+        sidebarWidth: 350,
+        entryMaxWidth: 650,
+        isTopVisible: (div: HTMLElement) => div.getBoundingClientRect().top >= Constants.layout.headerHeight,
+        isBottomVisible: (div: HTMLElement) => div.getBoundingClientRect().bottom <= window.innerHeight,
+    },
+    dom: {
+        mainScrollAreaId: "main-scroll-area-id",
+        entryId: (entry: Entry) => `entry-id-${entry.id}`,
+    },
+}

commafeed-client/src/app/slices/entries.test.ts

@@ -0,0 +1,142 @@
+/* eslint-disable import/first */
+import { beforeEach, describe, expect, it, vi } from "vitest"
+import { DeepMockProxy, mockDeep, mockReset } from "vitest-mock-extended"
+
+vi.doMock("app/client", () => ({ client: mockDeep() }))
+
+import { configureStore } from "@reduxjs/toolkit"
+import { client } from "app/client"
+import { reducers } from "app/store"
+import { Entries, Entry } from "app/types"
+import { AxiosResponse } from "axios"
+import { loadEntries, loadMoreEntries, markAllEntries, markEntry } from "./entries"
+
+describe("entries", () => {
+    const mockClient = client as DeepMockProxy<typeof client>
+
+    beforeEach(() => {
+        mockReset(mockClient)
+    })
+
+    it("loads entries", async () => {
+        mockClient.feed.getEntries.mockResolvedValue({
+            data: {
+                entries: [{ id: "3" } as Entry],
+                hasMore: false,
+                name: "my-feed",
+                errorCount: 3,
+                feedLink: "https://mysite.com/feed",
+                timestamp: 123,
+                ignoredReadStatus: false,
+            },
+        } as AxiosResponse<Entries>)
+
+        const store = configureStore({ reducer: reducers })
+        const promise = store.dispatch(loadEntries({ source: { type: "feed", id: "feed-id" }, clearSearch: true }))
+
+        expect(store.getState().entries.source.type).toBe("feed")
+        expect(store.getState().entries.source.id).toBe("feed-id")
+        expect(store.getState().entries.entries).toStrictEqual([])
+        expect(store.getState().entries.hasMore).toBe(true)
+        expect(store.getState().entries.sourceLabel).toBe("")
+        expect(store.getState().entries.sourceWebsiteUrl).toBe("")
+        expect(store.getState().entries.timestamp).toBeUndefined()
+
+        await promise
+        expect(store.getState().entries.source.type).toBe("feed")
+        expect(store.getState().entries.source.id).toBe("feed-id")
+        expect(store.getState().entries.entries).toStrictEqual([{ id: "3" }])
+        expect(store.getState().entries.hasMore).toBe(false)
+        expect(store.getState().entries.sourceLabel).toBe("my-feed")
+        expect(store.getState().entries.sourceWebsiteUrl).toBe("https://mysite.com/feed")
+        expect(store.getState().entries.timestamp).toBe(123)
+    })
+
+    it("loads more entries", async () => {
+        mockClient.category.getEntries.mockResolvedValue({
+            data: {
+                entries: [{ id: "4" } as Entry],
+                hasMore: false,
+                name: "my-feed",
+                errorCount: 3,
+                feedLink: "https://mysite.com/feed",
+                timestamp: 123,
+                ignoredReadStatus: false,
+            },
+        } as AxiosResponse<Entries>)
+
+        const store = configureStore({
+            reducer: reducers,
+            preloadedState: {
+                entries: {
+                    source: {
+                        type: "category",
+                        id: "category-id",
+                    },
+                    sourceLabel: "",
+                    sourceWebsiteUrl: "",
+                    entries: [{ id: "3" } as Entry],
+                    hasMore: true,
+                    scrollingToEntry: false,
+                },
+            },
+        })
+        const promise = store.dispatch(loadMoreEntries())
+
+        await promise
+        expect(store.getState().entries.entries).toStrictEqual([{ id: "3" }, { id: "4" }])
+        expect(store.getState().entries.hasMore).toBe(false)
+    })
+
+    it("marks an entry as read", async () => {
+        const store = configureStore({
+            reducer: reducers,
+            preloadedState: {
+                entries: {
+                    source: {
+                        type: "category",
+                        id: "category-id",
+                    },
+                    sourceLabel: "",
+                    sourceWebsiteUrl: "",
+                    entries: [{ id: "3", read: false } as Entry, { id: "4", read: false } as Entry],
+                    hasMore: true,
+                    scrollingToEntry: false,
+                },
+            },
+        })
+
+        store.dispatch(markEntry({ entry: { id: "3" } as Entry, read: true }))
+        expect(store.getState().entries.entries).toStrictEqual([
+            { id: "3", read: true },
+            { id: "4", read: false },
+        ])
+        expect(mockClient.entry.mark).toHaveBeenCalledWith({ id: "3", read: true })
+    })
+
+    it("marks all entries as read", async () => {
+        const store = configureStore({
+            reducer: reducers,
+            preloadedState: {
+                entries: {
+                    source: {
+                        type: "category",
+                        id: "category-id",
+                    },
+                    sourceLabel: "",
+                    sourceWebsiteUrl: "",
+                    entries: [{ id: "3", read: false } as Entry, { id: "4", read: false } as Entry],
+                    hasMore: true,
+                    scrollingToEntry: false,
+                },
+            },
+        })
+
+        store.dispatch(markAllEntries({ sourceType: "category", req: { id: "all", read: true } }))
+        expect(store.getState().entries.entries).toStrictEqual([
+            { id: "3", read: true },
+            { id: "4", read: true },
+        ])
+        expect(mockClient.category.markEntries).toHaveBeenCalledWith({ id: "all", read: true })
+    })
+})

commafeed-client/src/app/slices/entries.ts

@@ -0,0 +1,338 @@
+import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"
+import { client } from "app/client"
+import { Constants } from "app/constants"
+import { RootState } from "app/store"
+import { Entries, Entry, MarkRequest, TagRequest } from "app/types"
+import { scrollToWithCallback } from "app/utils"
+import { flushSync } from "react-dom"
+// eslint-disable-next-line import/no-cycle
+import { reloadTree } from "./tree"
+// eslint-disable-next-line import/no-cycle
+import { reloadTags } from "./user"
+
+export type EntrySourceType = "category" | "feed" | "tag"
+export type EntrySource = { type: EntrySourceType; id: string }
+export type ExpendableEntry = Entry & { expanded?: boolean }
+
+interface EntriesState {
+    /** selected source */
+    source: EntrySource
+    sourceLabel: string
+    sourceWebsiteUrl: string
+    entries: ExpendableEntry[]
+    /** stores when the first batch of entries were retrieved
+     *
+     * this is used when marking all entries of a feed/category to only mark entries up to that timestamp as newer entries were potentially never shown
+     */
+    timestamp?: number
+    selectedEntryId?: string
+    hasMore: boolean
+    search?: string
+    scrollingToEntry: boolean
+}
+
+const initialState: EntriesState = {
+    source: {
+        type: "category",
+        id: Constants.categories.all.id,
+    },
+    sourceLabel: "",
+    sourceWebsiteUrl: "",
+    entries: [],
+    hasMore: true,
+    scrollingToEntry: false,
+}
+
+const getEndpoint = (sourceType: EntrySourceType) =>
+    sourceType === "category" || sourceType === "tag" ? client.category.getEntries : client.feed.getEntries
+export const loadEntries = createAsyncThunk<Entries, { source: EntrySource; clearSearch: boolean }, { state: RootState }>(
+    "entries/load",
+    async (arg, thunkApi) => {
+        if (arg.clearSearch) thunkApi.dispatch(setSearch(""))
+
+        const state = thunkApi.getState()
+        const endpoint = getEndpoint(arg.source.type)
+        const result = await endpoint(buildGetEntriesPaginatedRequest(state, arg.source, 0))
+        return result.data
+    }
+)
+export const loadMoreEntries = createAsyncThunk<Entries, void, { state: RootState }>("entries/loadMore", async (_, thunkApi) => {
+    const state = thunkApi.getState()
+    const { source } = state.entries
+    const offset =
+        state.user.settings?.readingMode === "all" ? state.entries.entries.length : state.entries.entries.filter(e => !e.read).length
+    const endpoint = getEndpoint(state.entries.source.type)
+    const result = await endpoint(buildGetEntriesPaginatedRequest(state, source, offset))
+    return result.data
+})
+const buildGetEntriesPaginatedRequest = (state: RootState, source: EntrySource, offset: number) => ({
+    id: source.type === "tag" ? Constants.categories.all.id : source.id,
+    order: state.user.settings?.readingOrder,
+    readType: state.user.settings?.readingMode,
+    offset,
+    limit: 50,
+    tag: source.type === "tag" ? source.id : undefined,
+    keywords: state.entries.search,
+})
+export const reloadEntries = createAsyncThunk<void, void, { state: RootState }>("entries/reload", async (arg, thunkApi) => {
+    const state = thunkApi.getState()
+    thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
+})
+export const search = createAsyncThunk<void, string, { state: RootState }>("entries/search", async (arg, thunkApi) => {
+    const state = thunkApi.getState()
+    thunkApi.dispatch(setSearch(arg))
+    thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
+})
+export const markEntry = createAsyncThunk(
+    "entries/entry/mark",
+    (arg: { entry: Entry; read: boolean }) => {
+        client.entry.mark({
+            id: arg.entry.id,
+            read: arg.read,
+        })
+    },
+    {
+        condition: arg => arg.entry.read !== arg.read,
+    }
+)
+export const markMultipleEntries = createAsyncThunk(
+    "entries/entry/markMultiple",
+    async (arg: { entries: Entry[]; read: boolean }, thunkApi) => {
+        const requests: MarkRequest[] = arg.entries.map(e => ({
+            id: e.id,
+            read: arg.read,
+        }))
+        await client.entry.markMultiple({ requests })
+        thunkApi.dispatch(reloadTree())
+    }
+)
+export const markEntriesUpToEntry = createAsyncThunk<void, Entry, { state: RootState }>(
+    "entries/entry/upToEntry",
+    async (arg, thunkApi) => {
+        const state = thunkApi.getState()
+        const { entries } = state.entries
+
+        const index = entries.findIndex(e => e.id === arg.id)
+        if (index === -1) return
+
+        thunkApi.dispatch(
+            markMultipleEntries({
+                entries: entries.slice(0, index + 1),
+                read: true,
+            })
+        )
+    }
+)
+export const markAllEntries = createAsyncThunk<void, { sourceType: EntrySourceType; req: MarkRequest }, { state: RootState }>(
+    "entries/entry/markAll",
+    async (arg, thunkApi) => {
+        const endpoint = arg.sourceType === "category" ? client.category.markEntries : client.feed.markEntries
+        await endpoint(arg.req)
+        thunkApi.dispatch(reloadTree())
+    }
+)
+export const starEntry = createAsyncThunk("entries/entry/star", (arg: { entry: Entry; starred: boolean }) => {
+    client.entry.star({
+        id: arg.entry.id,
+        feedId: +arg.entry.feedId,
+        starred: arg.starred,
+    })
+})
+export const selectEntry = createAsyncThunk<
+    void,
+    {
+        entry: Entry
+        expand: boolean
+        markAsRead: boolean
+        scrollToEntry: boolean
+    },
+    { state: RootState }
+>("entries/entry/select", (arg, thunkApi) => {
+    const state = thunkApi.getState()
+    const entry = state.entries.entries.find(e => e.id === arg.entry.id)
+    if (!entry) return
+
+    // flushSync is required because we need the newly selected entry to be expanded
+    // and the previously selected entry to be collapsed to be able to scroll to the right position
+    flushSync(() => {
+        // mark as read if requested
+        if (arg.markAsRead) {
+            thunkApi.dispatch(markEntry({ entry, read: true }))
+        }
+
+        // set entry as selected
+        thunkApi.dispatch(entriesSlice.actions.setSelectedEntry(entry))
+
+        // expand if requested
+        const previouslySelectedEntry = state.entries.entries.find(e => e.id === state.entries.selectedEntryId)
+        if (previouslySelectedEntry) {
+            thunkApi.dispatch(entriesSlice.actions.setEntryExpanded({ entry: previouslySelectedEntry, expanded: false }))
+        }
+        thunkApi.dispatch(entriesSlice.actions.setEntryExpanded({ entry, expanded: arg.expand }))
+    })
+
+    if (arg.scrollToEntry) {
+        const entryElement = document.getElementById(Constants.dom.entryId(entry))
+        if (entryElement) {
+            const scrollSpeed = state.user.settings?.scrollSpeed
+            thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(true))
+            scrollToEntry(entryElement, scrollSpeed, () => thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(false)))
+        }
+    }
+})
+const scrollToEntry = (entryElement: HTMLElement, scrollSpeed: number | undefined, onScrollEnded: () => void) => {
+    // the entry is entirely visible, no need to scroll
+    if (Constants.layout.isTopVisible(entryElement) && Constants.layout.isBottomVisible(entryElement)) {
+        onScrollEnded()
+        return
+    }
+
+    const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
+    if (scrollArea) {
+        scrollToWithCallback({
+            element: scrollArea,
+            options: {
+                // add a small gap between the top of the content and the top of the page
+                top: entryElement.offsetTop - 3,
+                behavior: scrollSpeed && scrollSpeed > 0 ? "smooth" : "auto",
+            },
+            onScrollEnded,
+        })
+    }
+}
+
+export const selectPreviousEntry = createAsyncThunk<
+    void,
+    {
+        expand: boolean
+        markAsRead: boolean
+        scrollToEntry: boolean
+    },
+    { state: RootState }
+>("entries/entry/selectPrevious", (arg, thunkApi) => {
+    const state = thunkApi.getState()
+    const { entries } = state.entries
+    const previousIndex = entries.findIndex(e => e.id === state.entries.selectedEntryId) - 1
+    if (previousIndex >= 0) {
+        thunkApi.dispatch(
+            selectEntry({
+                entry: entries[previousIndex],
+                expand: arg.expand,
+                markAsRead: arg.markAsRead,
+                scrollToEntry: arg.scrollToEntry,
+            })
+        )
+    }
+})
+export const selectNextEntry = createAsyncThunk<
+    void,
+    {
+        expand: boolean
+        markAsRead: boolean
+        scrollToEntry: boolean
+    },
+    { state: RootState }
+>("entries/entry/selectNext", (arg, thunkApi) => {
+    const state = thunkApi.getState()
+    const { entries } = state.entries
+    const nextIndex = entries.findIndex(e => e.id === state.entries.selectedEntryId) + 1
+    if (nextIndex < entries.length) {
+        thunkApi.dispatch(
+            selectEntry({
+                entry: entries[nextIndex],
+                expand: arg.expand,
+                markAsRead: arg.markAsRead,
+                scrollToEntry: arg.scrollToEntry,
+            })
+        )
+    }
+})
+export const tagEntry = createAsyncThunk<void, TagRequest, { state: RootState }>("entries/entry/tag", async (arg, thunkApi) => {
+    await client.entry.tag(arg)
+    thunkApi.dispatch(reloadTags())
+})
+
+export const entriesSlice = createSlice({
+    name: "entries",
+    initialState,
+    reducers: {
+        setSelectedEntry: (state, action: PayloadAction<Entry>) => {
+            state.selectedEntryId = action.payload.id
+        },
+        setEntryExpanded: (state, action: PayloadAction<{ entry: Entry; expanded: boolean }>) => {
+            state.entries
+                .filter(e => e.id === action.payload.entry.id)
+                .forEach(e => {
+                    e.expanded = action.payload.expanded
+                })
+        },
+        setScrollingToEntry: (state, action: PayloadAction<boolean>) => {
+            state.scrollingToEntry = action.payload
+        },
+        setSearch: (state, action: PayloadAction<string>) => {
+            state.search = action.payload
+        },
+    },
+    extraReducers: builder => {
+        builder.addCase(markEntry.pending, (state, action) => {
+            state.entries
+                .filter(e => e.id === action.meta.arg.entry.id)
+                .forEach(e => {
+                    e.read = action.meta.arg.read
+                })
+        })
+        builder.addCase(markMultipleEntries.pending, (state, action) => {
+            state.entries
+                .filter(e => action.meta.arg.entries.some(e2 => e2.id === e.id))
+                .forEach(e => {
+                    e.read = action.meta.arg.read
+                })
+        })
+        builder.addCase(markAllEntries.pending, (state, action) => {
+            state.entries
+                .filter(e => (action.meta.arg.req.olderThan ? e.date < action.meta.arg.req.olderThan : true))
+                .forEach(e => {
+                    e.read = true
+                })
+        })
+        builder.addCase(starEntry.pending, (state, action) => {
+            state.entries
+                .filter(e => action.meta.arg.entry.id === e.id && action.meta.arg.entry.feedId === e.feedId)
+                .forEach(e => {
+                    e.starred = action.meta.arg.starred
+                })
+        })
+        builder.addCase(loadEntries.pending, (state, action) => {
+            state.source = action.meta.arg.source
+            state.entries = []
+            state.timestamp = undefined
+            state.sourceLabel = ""
+            state.sourceWebsiteUrl = ""
+            state.hasMore = true
+            state.selectedEntryId = undefined
+        })
+        builder.addCase(loadEntries.fulfilled, (state, action) => {
+            state.entries = action.payload.entries
+            state.timestamp = action.payload.timestamp
+            state.sourceLabel = action.payload.name
+            state.sourceWebsiteUrl = action.payload.feedLink
+            state.hasMore = action.payload.hasMore
+        })
+        builder.addCase(loadMoreEntries.fulfilled, (state, action) => {
+            // remove already existing entries
+            const entriesToAdd = action.payload.entries.filter(e => !state.entries.some(e2 => e.id === e2.id))
+            state.entries = [...state.entries, ...entriesToAdd]
+            state.hasMore = action.payload.hasMore
+        })
+        builder.addCase(tagEntry.pending, (state, action) => {
+            state.entries
+                .filter(e => +e.id === action.meta.arg.entryId)
+                .forEach(e => {
+                    e.tags = action.meta.arg.tags
+                })
+        })
+    },
+})
+
+export const { setSearch } = entriesSlice.actions
+export default entriesSlice.reducer

commafeed-client/src/app/slices/redirect.test.ts

@@ -0,0 +1,10 @@
+import { store } from "app/store"
+import { describe, expect, it } from "vitest"
+import { redirectToCategory } from "./redirect"
+
+describe("redirects", () => {
+    it("redirects to category", async () => {
+        await store.dispatch(redirectToCategory("1"))
+        expect(store.getState().redirect.to).toBe("/app/category/1")
+    })
+})

commafeed-client/src/app/slices/redirect.ts

@@ -0,0 +1,61 @@
+import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"
+import { Constants } from "app/constants"
+import { RootState } from "app/store"
+
+interface RedirectState {
+    to?: string
+}
+
+const initialState: RedirectState = {}
+
+export const redirectToLogin = createAsyncThunk("redirect/login", (_, thunkApi) => thunkApi.dispatch(redirectTo("/login")))
+export const redirectToRegistration = createAsyncThunk("redirect/register", (_, thunkApi) => thunkApi.dispatch(redirectTo("/register")))
+export const redirectToPasswordRecovery = createAsyncThunk("redirect/passwordRecovery", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/passwordRecovery"))
+)
+export const redirectToSelectedSource = createAsyncThunk<void, void, { state: RootState }>("redirect/selectedSource", (_, thunkApi) => {
+    const { source } = thunkApi.getState().entries
+    thunkApi.dispatch(redirectTo(`/app/${source.type}/${source.id}`))
+})
+export const redirectToCategory = createAsyncThunk("redirect/category", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/category/${id}`))
+)
+export const redirectToRootCategory = createAsyncThunk("redirect/category/root", (_, thunkApi) =>
+    thunkApi.dispatch(redirectToCategory(Constants.categories.all.id))
+)
+export const redirectToCategoryDetails = createAsyncThunk("redirect/category/details", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/category/${id}/details`))
+)
+export const redirectToFeed = createAsyncThunk("redirect/feed", (id: string | number, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/feed/${id}`))
+)
+export const redirectToFeedDetails = createAsyncThunk("redirect/feed/details", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/feed/${id}/details`))
+)
+export const redirectToTag = createAsyncThunk("redirect/tag", (id: string, thunkApi) => thunkApi.dispatch(redirectTo(`/app/tag/${id}`)))
+export const redirectToTagDetails = createAsyncThunk("redirect/tag/details", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/tag/${id}/details`))
+)
+export const redirectToAdd = createAsyncThunk("redirect/add", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/add")))
+export const redirectToSettings = createAsyncThunk("redirect/settings", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/settings")))
+export const redirectToAdminUsers = createAsyncThunk("redirect/admin/users", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/app/admin/users"))
+)
+export const redirectToMetrics = createAsyncThunk("redirect/admin/metrics", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/app/admin/metrics"))
+)
+export const redirectToAbout = createAsyncThunk("redirect/about", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/about")))
+export const redirectToApiDocumentation = createAsyncThunk("redirect/api", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/api")))
+
+export const redirectSlice = createSlice({
+    name: "redirect",
+    initialState,
+    reducers: {
+        redirectTo: (state, action: PayloadAction<string | undefined>) => {
+            state.to = action.payload
+        },
+    },
+})
+
+export const { redirectTo } = redirectSlice.actions
+export default redirectSlice.reducer

commafeed-client/src/app/slices/server.ts

@@ -0,0 +1,23 @@
+import { createAsyncThunk, createSlice } from "@reduxjs/toolkit"
+import { client } from "app/client"
+import { ServerInfo } from "app/types"
+
+interface ServerState {
+    serverInfos?: ServerInfo
+}
+
+const initialState: ServerState = {}
+
+export const reloadServerInfos = createAsyncThunk("server/infos", () => client.server.getServerInfos().then(r => r.data))
+export const serverSlice = createSlice({
+    name: "server",
+    initialState,
+    reducers: {},
+    extraReducers: builder => {
+        builder.addCase(reloadServerInfos.fulfilled, (state, action) => {
+            state.serverInfos = action.payload
+        })
+    },
+})
+
+export default serverSlice.reducer

commafeed-client/src/app/slices/tree.ts

@@ -0,0 +1,58 @@
+import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"
+import { client } from "app/client"
+import { Category, CollapseRequest } from "app/types"
+import { visitCategoryTree } from "app/utils"
+// eslint-disable-next-line import/no-cycle
+import { markEntry } from "./entries"
+import { redirectTo } from "./redirect"
+
+interface TreeState {
+    rootCategory?: Category
+    mobileMenuOpen: boolean
+}
+
+const initialState: TreeState = {
+    mobileMenuOpen: false,
+}
+
+export const reloadTree = createAsyncThunk("tree/reload", () => client.category.getRoot().then(r => r.data))
+export const collapseTreeCategory = createAsyncThunk("tree/category/collapse", async (req: CollapseRequest) =>
+    client.category.collapse(req)
+)
+
+export const treeSlice = createSlice({
+    name: "tree",
+    initialState,
+    reducers: {
+        setMobileMenuOpen: (state, action: PayloadAction<boolean>) => {
+            state.mobileMenuOpen = action.payload
+        },
+    },
+    extraReducers: builder => {
+        builder.addCase(reloadTree.fulfilled, (state, action) => {
+            state.rootCategory = action.payload
+        })
+        builder.addCase(collapseTreeCategory.pending, (state, action) => {
+            if (!state.rootCategory) return
+            visitCategoryTree(state.rootCategory, c => {
+                if (+c.id === action.meta.arg.id) c.expanded = !action.meta.arg.collapse
+            })
+        })
+        builder.addCase(markEntry.pending, (state, action) => {
+            if (!state.rootCategory) return
+            visitCategoryTree(state.rootCategory, c =>
+                c.feeds
+                    .filter(f => f.id === +action.meta.arg.entry.feedId)
+                    .forEach(f => {
+                        f.unread = action.meta.arg.read ? f.unread - 1 : f.unread + 1
+                    })
+            )
+        })
+        builder.addCase(redirectTo, state => {
+            state.mobileMenuOpen = false
+        })
+    },
+})
+
+export const { setMobileMenuOpen } = treeSlice.actions
+export default treeSlice.reducer

commafeed-client/src/app/slices/user.ts

@@ -0,0 +1,144 @@
+import { t } from "@lingui/macro"
+import { showNotification } from "@mantine/notifications"
+import { createAsyncThunk, createSlice, isAnyOf } from "@reduxjs/toolkit"
+import { client } from "app/client"
+import { RootState } from "app/store"
+import { ReadingMode, ReadingOrder, Settings, SharingSettings, UserModel, ViewMode } from "app/types"
+// eslint-disable-next-line import/no-cycle
+import { reloadEntries } from "./entries"
+
+interface UserState {
+    settings?: Settings
+    profile?: UserModel
+    tags?: string[]
+}
+
+const initialState: UserState = {}
+
+export const reloadSettings = createAsyncThunk("settings/reload", () => client.user.getSettings().then(r => r.data))
+export const reloadProfile = createAsyncThunk("profile/reload", () => client.user.getProfile().then(r => r.data))
+export const reloadTags = createAsyncThunk("entries/tags", () => client.entry.getTags().then(r => r.data))
+export const changeReadingMode = createAsyncThunk<void, ReadingMode, { state: RootState }>(
+    "settings/readingMode",
+    (readingMode, thunkApi) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        client.user.saveSettings({ ...settings, readingMode })
+        thunkApi.dispatch(reloadEntries())
+    }
+)
+export const changeReadingOrder = createAsyncThunk<void, ReadingOrder, { state: RootState }>(
+    "settings/readingOrder",
+    (readingOrder, thunkApi) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        client.user.saveSettings({ ...settings, readingOrder })
+        thunkApi.dispatch(reloadEntries())
+    }
+)
+export const changeViewMode = createAsyncThunk<void, ViewMode, { state: RootState }>("settings/viewMode", (viewMode, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, viewMode })
+    thunkApi.dispatch(reloadEntries())
+})
+export const changeLanguage = createAsyncThunk<void, string, { state: RootState }>("settings/language", (language, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, language })
+})
+export const changeScrollSpeed = createAsyncThunk<void, boolean, { state: RootState }>("settings/scrollSpeed", (speed, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, scrollSpeed: speed ? 400 : 0 })
+})
+export const changeShowRead = createAsyncThunk<void, boolean, { state: RootState }>("settings/showRead", (showRead, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, showRead })
+})
+export const changeScrollMarks = createAsyncThunk<void, boolean, { state: RootState }>("settings/scrollMarks", (scrollMarks, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, scrollMarks })
+})
+export const changeSharingSetting = createAsyncThunk<void, { site: keyof SharingSettings; value: boolean }, { state: RootState }>(
+    "settings/sharingSetting",
+    (sharingSetting, thunkApi) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        client.user.saveSettings({
+            ...settings,
+            sharingSettings: {
+                ...settings.sharingSettings,
+                [sharingSetting.site]: sharingSetting.value,
+            },
+        })
+    }
+)
+
+export const userSlice = createSlice({
+    name: "user",
+    initialState,
+    reducers: {},
+    extraReducers: builder => {
+        builder.addCase(reloadSettings.fulfilled, (state, action) => {
+            state.settings = action.payload
+        })
+        builder.addCase(reloadProfile.fulfilled, (state, action) => {
+            state.profile = action.payload
+        })
+        builder.addCase(reloadTags.fulfilled, (state, action) => {
+            state.tags = action.payload
+        })
+        builder.addCase(changeReadingMode.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.readingMode = action.meta.arg
+        })
+        builder.addCase(changeReadingOrder.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.readingOrder = action.meta.arg
+        })
+        builder.addCase(changeViewMode.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.viewMode = action.meta.arg
+        })
+        builder.addCase(changeLanguage.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.language = action.meta.arg
+        })
+        builder.addCase(changeScrollSpeed.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.scrollSpeed = action.meta.arg ? 400 : 0
+        })
+        builder.addCase(changeShowRead.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.showRead = action.meta.arg
+        })
+        builder.addCase(changeScrollMarks.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.scrollMarks = action.meta.arg
+        })
+        builder.addCase(changeSharingSetting.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.sharingSettings[action.meta.arg.site] = action.meta.arg.value
+        })
+        builder.addMatcher(
+            isAnyOf(
+                changeLanguage.fulfilled,
+                changeScrollSpeed.fulfilled,
+                changeShowRead.fulfilled,
+                changeScrollMarks.fulfilled,
+                changeSharingSetting.fulfilled
+            ),
+            () => {
+                showNotification({
+                    message: t`Settings saved.`,
+                    color: "green",
+                })
+            }
+        )
+    },
+})
+
+export default userSlice.reducer

commafeed-client/src/app/store.ts

@@ -0,0 +1,26 @@
+import { configureStore } from "@reduxjs/toolkit"
+import { setupListeners } from "@reduxjs/toolkit/query"
+import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
+import entriesReducer from "./slices/entries"
+import redirectReducer from "./slices/redirect"
+import serverReducer from "./slices/server"
+import treeReducer from "./slices/tree"
+import userReducer from "./slices/user"
+
+export const reducers = {
+    entries: entriesReducer,
+    redirect: redirectReducer,
+    tree: treeReducer,
+    server: serverReducer,
+    user: userReducer,
+}
+
+export const store = configureStore({ reducer: reducers })
+
+setupListeners(store.dispatch)
+
+export type RootState = ReturnType<typeof store.getState>
+export type AppDispatch = typeof store.dispatch
+
+export const useAppDispatch: () => AppDispatch = useDispatch
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector

commafeed-client/src/app/types.ts

@@ -0,0 +1,308 @@
+export interface AddCategoryRequest {
+    name: string
+    parentId?: string
+}
+
+export interface ApplicationSettings {
+    publicUrl: string
+    allowRegistrations: boolean
+    createDemoAccount: boolean
+    googleAnalyticsTrackingCode?: string
+    googleAuthKey?: string
+    backgroundThreads: number
+    databaseUpdateThreads: number
+    smtpHost?: string
+    smtpPort?: number
+    smtpTls?: boolean
+    smtpUserName?: string
+    smtpPassword?: string
+    smtpFromAddress?: string
+    graphiteEnabled?: boolean
+    graphitePrefix?: string
+    graphiteHost?: string
+    graphitePort?: number
+    graphiteInterval?: number
+    heavyLoad: boolean
+    pubsubhubbub: boolean
+    imageProxyEnabled: boolean
+    queryTimeout: number
+    keepStatusDays: number
+    maxFeedCapacity: number
+    refreshIntervalMinutes: number
+    cache: ApplicationSettingsCache
+    announcement?: string
+    userAgent?: string
+    unreadThreshold?: Date
+}
+
+export interface Category {
+    id: string
+    parentId?: string
+    name: string
+    children: Category[]
+    feeds: Subscription[]
+    expanded: boolean
+    position: number
+}
+
+export interface CategoryModificationRequest {
+    id: number
+    name?: string
+    parentId?: string
+    position?: number
+}
+
+export interface CollapseRequest {
+    id: number
+    collapse: boolean
+}
+
+export interface Entries {
+    name: string
+    message?: string
+    errorCount: number
+    feedLink: string
+    timestamp: number
+    hasMore: boolean
+    offset?: number
+    limit?: number
+    entries: Entry[]
+    ignoredReadStatus: boolean
+}
+
+export interface Entry {
+    id: string
+    guid: string
+    title: string
+    content: string
+    categories?: string
+    rtl: boolean
+    author?: string
+    enclosureUrl?: string
+    enclosureType?: string
+    mediaDescription?: string
+    mediaThumbnailUrl?: string
+    mediaThumbnailWidth?: number
+    mediaThumbnailHeight?: number
+    date: number
+    insertedDate: number
+    feedId: string
+    feedName: string
+    feedUrl: string
+    feedLink: string
+    iconUrl: string
+    url: string
+    read: boolean
+    starred: boolean
+    markable: boolean
+    tags: string[]
+}
+
+export interface FeedInfo {
+    url: string
+    title: string
+}
+
+export interface FeedInfoRequest {
+    url: string
+}
+
+export interface FeedModificationRequest {
+    id: number
+    name?: string
+    categoryId?: string
+    position?: number
+    filter?: string
+}
+
+export interface GetEntriesRequest {
+    id: string
+    readType?: ReadingMode
+    newerThan?: number
+    order?: ReadingOrder
+    keywords?: string
+    onlyIds?: boolean
+    excludedSubscriptionIds?: string
+    tag?: string
+}
+
+export interface GetEntriesPaginatedRequest extends GetEntriesRequest {
+    offset: number
+    limit: number
+}
+
+export interface IDRequest {
+    id: number
+}
+
+export interface LoginRequest {
+    name: string
+    password: string
+}
+
+export interface MarkRequest {
+    id: string
+    read: boolean
+    olderThan?: number
+    keywords?: string
+    excludedSubscriptions?: number[]
+}
+
+export interface MetricCounter {
+    count: number
+}
+
+export interface MetricGauge {
+    value: number
+}
+
+export interface MetricMeter {
+    count: number
+    m15_rate: number
+    m1_rate: number
+    m5_rate: number
+    mean_rate: number
+    units: string
+}
+
+export type MetricTimer = {
+    count: number
+    max: number
+    mean: number
+    min: number
+    p50: number
+    p75: number
+    p95: number
+    p98: number
+    p99: number
+    p999: number
+    stddev: number
+    m15_rate: number
+    m1_rate: number
+    m5_rate: number
+    mean_rate: number
+    duration_units: string
+    rate_units: string
+}
+
+export interface Metrics {
+    counters: { [key: string]: MetricCounter }
+    gauges: { [key: string]: MetricGauge }
+    meters: { [key: string]: MetricMeter }
+    timers: { [key: string]: MetricTimer }
+}
+
+export interface MultipleMarkRequest {
+    requests: MarkRequest[]
+}
+
+export interface PasswordResetRequest {
+    email: string
+}
+
+export interface ProfileModificationRequest {
+    currentPassword: string
+    email: string
+    newPassword?: string
+    newApiKey?: boolean
+}
+
+export interface RegistrationRequest {
+    name: string
+    password: string
+    email: string
+}
+
+export interface ServerInfo {
+    announcement?: string
+    version: string
+    gitCommit: string
+    allowRegistrations: boolean
+    googleAnalyticsCode?: string
+    smtpEnabled: boolean
+    demoAccountEnabled: boolean
+}
+
+export interface Settings {
+    language: string
+    readingMode: ReadingMode
+    readingOrder: ReadingOrder
+    viewMode: ViewMode
+    showRead: boolean
+    scrollMarks: boolean
+    theme?: string
+    customCss?: string
+    scrollSpeed: number
+    sharingSettings: SharingSettings
+}
+
+export interface SharingSettings {
+    email: boolean
+    gmail: boolean
+    facebook: boolean
+    twitter: boolean
+    tumblr: boolean
+    pocket: boolean
+    instapaper: boolean
+    buffer: boolean
+}
+
+export interface StarRequest {
+    id: string
+    feedId: number
+    starred: boolean
+}
+
+export interface SubscribeRequest {
+    url: string
+    title: string
+    categoryId?: string
+}
+
+export interface Subscription {
+    id: number
+    name: string
+    message?: string
+    errorCount: number
+    lastRefresh?: number
+    nextRefresh?: number
+    feedUrl: string
+    feedLink: string
+    iconUrl: string
+    unread: number
+    categoryId?: string
+    position?: number
+    newestItemTime?: number
+    filter?: string
+}
+
+export interface TagRequest {
+    entryId: number
+    tags: string[]
+}
+
+export interface UnreadCount {
+    feedId?: number
+    unreadCount?: number
+    newestItemTime?: number
+}
+
+export interface UserModel {
+    id: number
+    name: string
+    email?: string
+    apiKey?: string
+    password?: string
+    enabled: boolean
+    created: number
+    lastLogin?: number
+    admin: boolean
+}
+
+export type ApplicationSettingsCache = "NOOP" | "REDIS"
+
+export type ReadingMode = "all" | "unread"
+
+export type ReadingOrder = "asc" | "desc"
+
+export type ViewMode = "title" | "cozy" | "expanded"

commafeed-client/src/app/utils.ts

@@ -0,0 +1,53 @@
+import { Category } from "./types"
+
+export function visitCategoryTree(category: Category, visitor: (category: Category) => void): void {
+    visitor(category)
+    category.children.forEach(child => visitCategoryTree(child, visitor))
+}
+
+export function flattenCategoryTree(category: Category): Category[] {
+    const categories: Category[] = []
+    visitCategoryTree(category, c => categories.push(c))
+    return categories
+}
+
+export function categoryUnreadCount(category?: Category): number {
+    if (!category) return 0
+
+    return flattenCategoryTree(category)
+        .flatMap(c => c.feeds)
+        .map(f => f.unread)
+        .reduce((total, current) => total + current, 0)
+}
+
+export const calculatePlaceholderSize = ({ width, height, maxWidth }: { width?: number; height?: number; maxWidth: number }) => {
+    const placeholderWidth = width && Math.min(width, maxWidth)
+    const placeholderHeight = height && width && width > maxWidth ? height * (maxWidth / width) : height
+    return { width: placeholderWidth, height: placeholderHeight }
+}
+
+export const scrollToWithCallback = ({
+    element,
+    options,
+    onScrollEnded,
+}: {
+    element: HTMLElement
+    options: ScrollToOptions
+    onScrollEnded: () => void
+}) => {
+    const offset = (options.top ?? 0).toFixed()
+
+    const onScroll = () => {
+        if (element.offsetTop.toFixed() === offset) {
+            element.removeEventListener("scroll", onScroll)
+            onScrollEnded()
+        }
+    }
+
+    element.addEventListener("scroll", onScroll)
+
+    // scrollTo does not trigger if there's nothing to do, trigger it manually
+    onScroll()
+
+    element.scrollTo(options)
+}

commafeed-client/src/components/ActionButtton.tsx

@@ -0,0 +1,28 @@
+import { ActionIcon, Button, useMantineTheme } from "@mantine/core"
+import { useMediaQuery } from "@mantine/hooks"
+import { forwardRef } from "react"
+
+interface ActionButtonProps {
+    className?: string
+    icon?: React.ReactNode
+    label?: string
+    onClick?: React.MouseEventHandler
+}
+
+/**
+ * Switches between Button with label (desktop) and ActionIcon (mobile)
+ */
+export const ActionButton = forwardRef<HTMLButtonElement, ActionButtonProps>((props: ActionButtonProps, ref) => {
+    const theme = useMantineTheme()
+    const mobile = !useMediaQuery(`(min-width: ${theme.breakpoints.lg}px)`)
+    return mobile ? (
+        <ActionIcon ref={ref} color={theme.primaryColor} variant="subtle" className={props.className} onClick={props.onClick}>
+            {props.icon}
+        </ActionIcon>
+    ) : (
+        <Button ref={ref} variant="subtle" size="xs" className={props.className} leftIcon={props.icon} onClick={props.onClick}>
+            {props.label}
+        </Button>
+    )
+})
+ActionButton.displayName = "HeaderButton"

commafeed-client/src/components/Alert.tsx

@@ -0,0 +1,48 @@
+import { t } from "@lingui/macro"
+import { Alert as MantineAlert, Box } from "@mantine/core"
+import { Fragment } from "react"
+import { TbAlertCircle, TbAlertTriangle, TbCircleCheck } from "react-icons/tb"
+
+type Level = "error" | "warning" | "success"
+export interface ErrorsAlertProps {
+    level?: Level
+    messages: string[]
+}
+
+export function Alert(props: ErrorsAlertProps) {
+    let title: string
+    let color: string
+    let icon: React.ReactNode
+
+    const level = props.level ?? "error"
+    switch (level) {
+        case "error":
+            title = t`Error`
+            color = "red"
+            icon = <TbAlertCircle />
+            break
+        case "warning":
+            title = t`Warning`
+            color = "orange"
+            icon = <TbAlertTriangle />
+            break
+        case "success":
+            title = t`Success`
+            color = "green"
+            icon = <TbCircleCheck />
+            break
+        default:
+            throw Error(`unsupported level: ${level}`)
+    }
+
+    return (
+        <MantineAlert title={title} color={color} icon={icon}>
+            {props.messages.map((m, i) => (
+                <Fragment key={m}>
+                    <Box>{m}</Box>
+                    {i !== props.messages.length - 1 && <br />}
+                </Fragment>
+            ))}
+        </MantineAlert>
+    )
+}

commafeed-client/src/components/ButtonToolbar.tsx

@@ -0,0 +1,5 @@
+import { Group } from "@mantine/core"
+
+export function ButtonToolbar(props: { children: React.ReactNode }) {
+    return <Group spacing={14}>{props.children}</Group>
+}

commafeed-client/src/components/ErrorBoundary.tsx

@@ -0,0 +1,26 @@
+import { ErrorPage } from "pages/ErrorPage"
+import React, { ReactNode } from "react"
+
+interface ErrorBoundaryProps {
+    children?: ReactNode
+}
+
+interface ErrorBoundaryState {
+    error?: Error
+}
+
+export class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundaryState> {
+    constructor(props: ErrorBoundaryProps) {
+        super(props)
+        this.state = {}
+    }
+
+    componentDidCatch(error: Error) {
+        this.setState({ error })
+    }
+
+    render() {
+        if (this.state.error) return <ErrorPage error={this.state.error} />
+        return this.props.children
+    }
+}

commafeed-client/src/components/ImageWithPlaceholderWhileLoading.tsx

@@ -0,0 +1,51 @@
+import { Box, Center, createStyles } from "@mantine/core"
+import { useState } from "react"
+import { TbPhoto } from "react-icons/tb"
+
+interface ImageWithPlaceholderWhileLoadingProps {
+    src?: string
+    alt?: string
+    title?: string
+    width?: number
+    height?: number | "auto"
+    placeholderWidth?: number
+    placeholderHeight?: number
+}
+
+const useStyles = createStyles((theme, props: ImageWithPlaceholderWhileLoadingProps) => ({
+    placeholder: {
+        width: props.placeholderWidth ?? 400,
+        height: props.placeholderHeight ?? 600,
+        maxWidth: "100%",
+        color: theme.fn.variant({ color: theme.primaryColor, variant: "subtle" }).color,
+        backgroundColor: theme.colorScheme === "dark" ? theme.colors.dark[5] : theme.colors.gray[1],
+    },
+}))
+
+export function ImageWithPlaceholderWhileLoading(props: ImageWithPlaceholderWhileLoadingProps) {
+    const { classes } = useStyles(props)
+    const [loading, setLoading] = useState(true)
+
+    return (
+        <>
+            {loading && (
+                <Box>
+                    <Center className={classes.placeholder}>
+                        <div>
+                            <TbPhoto size={48} />
+                        </div>
+                    </Center>
+                </Box>
+            )}
+            <img
+                src={props.src}
+                alt={props.alt}
+                title={props.title}
+                width={props.width}
+                height={props.height}
+                onLoad={() => setLoading(false)}
+                style={{ display: loading ? "none" : "block" }}
+            />
+        </>
+    )
+}

commafeed-client/src/components/KeyboardShortcutsHelp.tsx

@@ -0,0 +1,157 @@
+import { Trans } from "@lingui/macro"
+import { Kbd, Table } from "@mantine/core"
+
+export function KeyboardShortcutsHelp() {
+    return (
+        <Table striped highlightOnHover>
+            <tbody>
+                <tr>
+                    <td>
+                        <Trans>Refresh</Trans>
+                    </td>
+                    <td>
+                        <Kbd>R</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Open next entry</Trans>
+                    </td>
+                    <td>
+                        <Kbd>J</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Open previous entry</Trans>
+                    </td>
+                    <td>
+                        <Kbd>K</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Set focus on next entry without opening it</Trans>
+                    </td>
+                    <td>
+                        <Kbd>N</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Set focus on previous entry without opening it</Trans>
+                    </td>
+                    <td>
+                        <Kbd>P</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Move the page down</Trans>
+                    </td>
+                    <td>
+                        <Kbd>
+                            <Trans>Space</Trans>
+                        </Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Move the page up</Trans>
+                    </td>
+                    <td>
+                        <Kbd>
+                            <Trans>Shift</Trans>
+                        </Kbd>
+                        <span> + </span>
+                        <Kbd>
+                            <Trans>Space</Trans>
+                        </Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Open/close current entry</Trans>
+                    </td>
+                    <td>
+                        <Kbd>O</Kbd>
+                        <span>, </span>
+                        <Kbd>
+                            <Trans>Enter</Trans>
+                        </Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Open current entry in a new tab</Trans>
+                    </td>
+                    <td>
+                        <Kbd>V</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Open current entry in a new tab in the background</Trans>
+                    </td>
+                    <td>
+                        <Kbd>B</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Toggle read status of current entry</Trans>
+                    </td>
+                    <td>
+                        <Kbd>M</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Mark all entries as read</Trans>
+                    </td>
+                    <td>
+                        <Kbd>
+                            <Trans>Shift</Trans>
+                        </Kbd>
+                        <span> + </span>
+                        <Kbd>A</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Go to the All view</Trans>
+                    </td>
+                    <td>
+                        <Kbd>G</Kbd>
+                        <span> </span>
+                        <Kbd>A</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Navigate to a subscription by entering its name</Trans>
+                    </td>
+                    <td>
+                        <Kbd>
+                            <Trans>Ctrl</Trans>
+                        </Kbd>
+                        <span> + </span>
+                        <Kbd>K</Kbd>
+                        <span>, </span>
+                        <Kbd>G</Kbd>
+                        <span> </span>
+                        <Kbd>U</Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Show keyboard shortcut help</Trans>
+                    </td>
+                    <td>
+                        <Kbd>?</Kbd>
+                    </td>
+                </tr>
+            </tbody>
+        </Table>
+    )
+}

commafeed-client/src/components/Loader.tsx

@@ -0,0 +1,9 @@
+import { Center, Loader as MantineLoader } from "@mantine/core"
+
+export function Loader() {
+    return (
+        <Center>
+            <MantineLoader size="xl" variant="bars" />
+        </Center>
+    )
+}

commafeed-client/src/components/Logo.tsx

@@ -0,0 +1,10 @@
+import { Image } from "@mantine/core"
+import logo from "assets/logo.svg"
+
+export interface LogoProps {
+    size: number
+}
+
+export function Logo(props: LogoProps) {
+    return <Image src={logo} width={props.size} />
+}

commafeed-client/src/components/RelativeDate.tsx

@@ -0,0 +1,14 @@
+import { Trans } from "@lingui/macro"
+import dayjs from "dayjs"
+import { useEffect, useState } from "react"
+
+export function RelativeDate(props: { date: Date | number | undefined }) {
+    const [now, setNow] = useState(new Date())
+    useEffect(() => {
+        const interval = setInterval(() => setNow(new Date()), 60 * 1000)
+        return () => clearInterval(interval)
+    }, [])
+
+    if (!props.date) return <Trans>N/A</Trans>
+    return <>{dayjs(props.date).from(dayjs(now))}</>
+}

commafeed-client/src/components/admin/UserEdit.tsx

@@ -0,0 +1,50 @@
+import { t, Trans } from "@lingui/macro"
+import { Box, Button, Checkbox, Group, PasswordInput, Stack, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { UserModel } from "app/types"
+import { Alert } from "components/Alert"
+import { useAsyncCallback } from "react-async-hook"
+import { TbDeviceFloppy } from "react-icons/tb"
+
+interface UserEditProps {
+    user?: UserModel
+    onCancel: () => void
+    onSave: () => void
+}
+
+export function UserEdit(props: UserEditProps) {
+    const form = useForm<UserModel>({
+        initialValues: props.user ?? ({ enabled: true } as UserModel),
+    })
+    const saveUser = useAsyncCallback(client.admin.saveUser, { onSuccess: props.onSave })
+
+    return (
+        <>
+            {saveUser.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(saveUser.error)} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(saveUser.execute)}>
+                <Stack>
+                    <TextInput label={t`Name`} {...form.getInputProps("name")} required />
+                    <PasswordInput label={t`Password`} {...form.getInputProps("password")} required={!props.user} />
+                    <TextInput type="email" label={t`E-mail`} {...form.getInputProps("email")} />
+                    <Checkbox label={t`Admin`} {...form.getInputProps("admin", { type: "checkbox" })} />
+                    <Checkbox label={t`Enabled`} {...form.getInputProps("enabled", { type: "checkbox" })} />
+
+                    <Group>
+                        <Button variant="default" onClick={props.onCancel}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftIcon={<TbDeviceFloppy size={16} />} loading={saveUser.loading}>
+                            <Trans>Save</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}

commafeed-client/src/components/content/Content.tsx

@@ -0,0 +1,94 @@
+import { Box, createStyles, Mark, TypographyStylesProvider } from "@mantine/core"
+import { Constants } from "app/constants"
+import { useAppSelector } from "app/store"
+import { calculatePlaceholderSize } from "app/utils"
+import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { ChildrenNode, Interweave, Matcher, MatchResponse, Node, TransformCallback } from "interweave"
+
+export interface ContentProps {
+    content: string
+}
+
+const useStyles = createStyles(theme => ({
+    content: {
+        // break long links or long words
+        overflowWrap: "anywhere",
+        "& a": {
+            color: theme.fn.variant({ color: theme.primaryColor, variant: "subtle" }).color,
+        },
+        "& iframe": {
+            maxWidth: "100%",
+        },
+        "& pre, & code": {
+            whiteSpace: "pre-wrap",
+        },
+    },
+}))
+
+const transform: TransformCallback = node => {
+    if (node.tagName === "IMG") {
+        // show placeholders for loading img tags, this allows the entry to have its final height immediately
+        const src = node.getAttribute("src") ?? undefined
+        const alt = node.getAttribute("alt") ?? undefined
+        const title = node.getAttribute("title") ?? undefined
+        const nodeWidth = node.getAttribute("width")
+        const nodeHeight = node.getAttribute("height")
+        const width = nodeWidth ? parseInt(nodeWidth, 10) : undefined
+        const height = nodeHeight ? parseInt(nodeHeight, 10) : undefined
+        const placeholderSize = calculatePlaceholderSize({
+            width,
+            height,
+            maxWidth: Constants.layout.entryMaxWidth,
+        })
+        return (
+            <ImageWithPlaceholderWhileLoading
+                src={src}
+                alt={alt}
+                title={title}
+                width={width}
+                height="auto"
+                placeholderWidth={placeholderSize.width}
+                placeholderHeight={placeholderSize.height}
+            />
+        )
+    }
+    return undefined
+}
+
+class HighlightMatcher extends Matcher {
+    private search: string
+
+    constructor(search: string) {
+        super("highlight")
+        this.search = search
+    }
+
+    match(string: string): MatchResponse<unknown> | null {
+        const pattern = this.search.split(" ").join("|")
+        return this.doMatch(string, new RegExp(pattern, "i"), () => ({}))
+    }
+
+    // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars
+    replaceWith(children: ChildrenNode, props: unknown): Node {
+        return <Mark>{children}</Mark>
+    }
+
+    // eslint-disable-next-line class-methods-use-this
+    asTag(): string {
+        return "span"
+    }
+}
+
+export function Content(props: ContentProps) {
+    const { classes } = useStyles()
+    const search = useAppSelector(state => state.entries.search)
+    const matchers = search ? [new HighlightMatcher(search)] : []
+
+    return (
+        <TypographyStylesProvider>
+            <Box className={classes.content}>
+                <Interweave content={props.content} transform={transform} matchers={matchers} />
+            </Box>
+        </TypographyStylesProvider>
+    )
+}

commafeed-client/src/components/content/Enclosure.tsx

@@ -0,0 +1,26 @@
+import { TypographyStylesProvider } from "@mantine/core"
+import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+
+export function Enclosure(props: { enclosureType?: string; enclosureUrl?: string }) {
+    const hasVideo = props.enclosureType && props.enclosureType.indexOf("video") === 0
+    const hasAudio = props.enclosureType && props.enclosureType.indexOf("audio") === 0
+    const hasImage = props.enclosureType && props.enclosureType.indexOf("image") === 0
+
+    return (
+        <TypographyStylesProvider>
+            {hasVideo && (
+                // eslint-disable-next-line jsx-a11y/media-has-caption
+                <video controls>
+                    <source src={props.enclosureUrl} type={props.enclosureType} />
+                </video>
+            )}
+            {hasAudio && (
+                // eslint-disable-next-line jsx-a11y/media-has-caption
+                <audio controls>
+                    <source src={props.enclosureUrl} type={props.enclosureType} />
+                </audio>
+            )}
+            {hasImage && <ImageWithPlaceholderWhileLoading src={props.enclosureUrl} alt="enclosure" />}
+        </TypographyStylesProvider>
+    )
+}

commafeed-client/src/components/content/FeedEntries.tsx

@@ -0,0 +1,272 @@
+import { t } from "@lingui/macro"
+import { openModal } from "@mantine/modals"
+import { Constants } from "app/constants"
+import {
+    ExpendableEntry,
+    loadMoreEntries,
+    markAllEntries,
+    markEntry,
+    reloadEntries,
+    selectEntry,
+    selectNextEntry,
+    selectPreviousEntry,
+} from "app/slices/entries"
+import { redirectToRootCategory } from "app/slices/redirect"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { KeyboardShortcutsHelp } from "components/KeyboardShortcutsHelp"
+import { Loader } from "components/Loader"
+import { useMousetrap } from "hooks/useMousetrap"
+import throttle from "lodash/throttle"
+import { useEffect } from "react"
+import InfiniteScroll from "react-infinite-scroller"
+import { FeedEntry } from "./FeedEntry"
+
+export function FeedEntries() {
+    const source = useAppSelector(state => state.entries.source)
+    const entries = useAppSelector(state => state.entries.entries)
+    const entriesTimestamp = useAppSelector(state => state.entries.timestamp)
+    const selectedEntryId = useAppSelector(state => state.entries.selectedEntryId)
+    const hasMore = useAppSelector(state => state.entries.hasMore)
+    const viewMode = useAppSelector(state => state.user.settings?.viewMode)
+    const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
+    const scrollingToEntry = useAppSelector(state => state.entries.scrollingToEntry)
+    const dispatch = useAppDispatch()
+
+    const selectedEntry = entries.find(e => e.id === selectedEntryId)
+
+    const headerClicked = (entry: ExpendableEntry, event: React.MouseEvent) => {
+        if (event.button === 1 || event.ctrlKey || event.metaKey) {
+            // middle click
+            dispatch(markEntry({ entry, read: true }))
+        } else if (event.button === 0) {
+            // main click
+            // don't trigger the link
+            event.preventDefault()
+
+            dispatch(
+                selectEntry({
+                    entry,
+                    expand: !entry.expanded,
+                    markAsRead: !entry.expanded,
+                    scrollToEntry: true,
+                })
+            )
+        }
+    }
+
+    useEffect(() => {
+        const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
+
+        const listener = () => {
+            if (viewMode !== "expanded") return
+            if (scrollingToEntry) return
+
+            const currentEntry = entries
+                // use slice to get a copy of the array because reverse mutates the array in-place
+                .slice()
+                .reverse()
+                .find(e => {
+                    const el = document.getElementById(Constants.dom.entryId(e))
+                    return el && !Constants.layout.isTopVisible(el)
+                })
+            if (currentEntry) {
+                dispatch(
+                    selectEntry({
+                        entry: currentEntry,
+                        expand: false,
+                        markAsRead: !!scrollMarks,
+                        scrollToEntry: false,
+                    })
+                )
+            }
+        }
+        const throttledListener = throttle(listener, 100)
+        scrollArea?.addEventListener("scroll", throttledListener)
+        return () => scrollArea?.removeEventListener("scroll", throttledListener)
+    }, [dispatch, entries, viewMode, scrollMarks, scrollingToEntry])
+
+    useMousetrap("r", () => dispatch(reloadEntries()))
+    useMousetrap("j", () =>
+        dispatch(
+            selectNextEntry({
+                expand: true,
+                markAsRead: true,
+                scrollToEntry: true,
+            })
+        )
+    )
+    useMousetrap("n", () =>
+        dispatch(
+            selectNextEntry({
+                expand: false,
+                markAsRead: false,
+                scrollToEntry: true,
+            })
+        )
+    )
+    useMousetrap("k", () =>
+        dispatch(
+            selectPreviousEntry({
+                expand: true,
+                markAsRead: true,
+                scrollToEntry: true,
+            })
+        )
+    )
+    useMousetrap("p", () =>
+        dispatch(
+            selectPreviousEntry({
+                expand: false,
+                markAsRead: false,
+                scrollToEntry: true,
+            })
+        )
+    )
+    useMousetrap("space", () => {
+        if (selectedEntry) {
+            if (selectedEntry.expanded) {
+                const entryElement = document.getElementById(Constants.dom.entryId(selectedEntry))
+                if (entryElement && Constants.layout.isBottomVisible(entryElement)) {
+                    dispatch(
+                        selectNextEntry({
+                            expand: true,
+                            markAsRead: true,
+                            scrollToEntry: true,
+                        })
+                    )
+                } else {
+                    const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
+                    scrollArea?.scrollTo({
+                        top: scrollArea.scrollTop + scrollArea.clientHeight * 0.8,
+                        behavior: "smooth",
+                    })
+                }
+            } else {
+                dispatch(
+                    selectEntry({
+                        entry: selectedEntry,
+                        expand: true,
+                        markAsRead: true,
+                        scrollToEntry: true,
+                    })
+                )
+            }
+        } else {
+            dispatch(
+                selectNextEntry({
+                    expand: true,
+                    markAsRead: true,
+                    scrollToEntry: true,
+                })
+            )
+        }
+    })
+    useMousetrap("shift+space", () => {
+        if (selectedEntry) {
+            if (selectedEntry.expanded) {
+                const entryElement = document.getElementById(Constants.dom.entryId(selectedEntry))
+                if (entryElement && Constants.layout.isTopVisible(entryElement)) {
+                    dispatch(
+                        selectPreviousEntry({
+                            expand: true,
+                            markAsRead: true,
+                            scrollToEntry: true,
+                        })
+                    )
+                } else {
+                    const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
+                    scrollArea?.scrollTo({
+                        top: scrollArea.scrollTop - scrollArea.clientHeight * 0.8,
+                        behavior: "smooth",
+                    })
+                }
+            } else {
+                dispatch(
+                    selectPreviousEntry({
+                        expand: true,
+                        markAsRead: true,
+                        scrollToEntry: true,
+                    })
+                )
+            }
+        }
+    })
+    useMousetrap(["o", "enter"], () => {
+        // toggle expanded status
+        if (!selectedEntry) return
+        dispatch(
+            selectEntry({
+                entry: selectedEntry,
+                expand: !selectedEntry.expanded,
+                markAsRead: !selectedEntry.expanded,
+                scrollToEntry: true,
+            })
+        )
+    })
+    useMousetrap("v", () => {
+        // open tab in foreground
+        if (!selectedEntry) return
+        window.open(selectedEntry.url, "_blank", "noreferrer")
+    })
+    useMousetrap("b", () => {
+        // simulate ctrl+click to open tab in background
+        if (!selectedEntry) return
+        const a = document.createElement("a")
+        a.href = selectedEntry.url
+        a.rel = "noreferrer"
+        a.dispatchEvent(
+            new MouseEvent("click", {
+                ctrlKey: true,
+                metaKey: true,
+            })
+        )
+    })
+    useMousetrap("m", () => {
+        // toggle read status
+        if (!selectedEntry) return
+        dispatch(markEntry({ entry: selectedEntry, read: !selectedEntry.read }))
+    })
+    useMousetrap("shift+a", () => {
+        // mark all entries as read
+        dispatch(
+            markAllEntries({
+                sourceType: source.type,
+                req: {
+                    id: source.id,
+                    read: true,
+                    olderThan: entriesTimestamp,
+                },
+            })
+        )
+    })
+    useMousetrap("g a", () => dispatch(redirectToRootCategory()))
+    useMousetrap("?", () => openModal({ title: t`Keyboard shortcuts`, size: "xl", children: <KeyboardShortcutsHelp /> }))
+
+    if (!entries) return <Loader />
+    return (
+        <InfiniteScroll
+            initialLoad={false}
+            loadMore={() => dispatch(loadMoreEntries())}
+            hasMore={hasMore}
+            loader={<Loader key={0} />}
+            useWindow={false}
+            getScrollParent={() => document.getElementById(Constants.dom.mainScrollAreaId)}
+        >
+            {entries.map(entry => (
+                <div
+                    key={entry.id}
+                    ref={el => {
+                        if (el) el.id = Constants.dom.entryId(entry)
+                    }}
+                >
+                    <FeedEntry
+                        entry={entry}
+                        expanded={!!entry.expanded || viewMode === "expanded"}
+                        showSelectionIndicator={entry.id === selectedEntryId && (!entry.expanded || viewMode === "expanded")}
+                        onHeaderClick={event => headerClicked(entry, event)}
+                    />
+                </div>
+            ))}
+        </InfiniteScroll>
+    )
+}

commafeed-client/src/components/content/FeedEntry.tsx

@@ -0,0 +1,76 @@
+import { Anchor, Box, createStyles, Divider, Paper } from "@mantine/core"
+import { Constants } from "app/constants"
+import { useAppSelector } from "app/store"
+import { Entry } from "app/types"
+import React from "react"
+import { FeedEntryBody } from "./FeedEntryBody"
+import { FeedEntryCompactHeader } from "./FeedEntryCompactHeader"
+import { FeedEntryFooter } from "./FeedEntryFooter"
+import { FeedEntryHeader } from "./FeedEntryHeader"
+
+interface FeedEntryProps {
+    entry: Entry
+    expanded: boolean
+    showSelectionIndicator: boolean
+    onHeaderClick: (e: React.MouseEvent) => void
+}
+
+const useStyles = createStyles((theme, props: FeedEntryProps) => {
+    let backgroundColor
+    if (theme.colorScheme === "dark") backgroundColor = props.entry.read ? "inherit" : theme.colors.dark[5]
+    else backgroundColor = props.entry.read && !props.expanded ? theme.colors.gray[0] : "inherit"
+
+    const styles = {
+        paper: {
+            backgroundColor,
+            marginTop: theme.spacing.xs,
+            marginBottom: theme.spacing.xs,
+            [theme.fn.smallerThan(Constants.layout.mobileBreakpoint)]: {
+                marginTop: "6px",
+                marginBottom: "6px",
+            },
+        },
+        body: {
+            maxWidth: Constants.layout.entryMaxWidth,
+        },
+    }
+
+    if (props.showSelectionIndicator) {
+        styles.paper.borderLeftColor = theme.colorScheme === "dark" ? theme.colors.orange[4] : theme.colors.orange[6]
+    }
+
+    return styles
+})
+
+export function FeedEntry(props: FeedEntryProps) {
+    const { classes } = useStyles(props)
+    const viewMode = useAppSelector(state => state.user.settings?.viewMode)
+    const compactHeader = viewMode === "title" && !props.expanded
+
+    return (
+        <Paper withBorder className={classes.paper}>
+            <Anchor
+                variant="text"
+                href={props.entry.url}
+                target="_blank"
+                rel="noreferrer"
+                onClick={props.onHeaderClick}
+                onAuxClick={props.onHeaderClick}
+            >
+                <Box p="xs">
+                    {compactHeader && <FeedEntryCompactHeader entry={props.entry} />}
+                    {!compactHeader && <FeedEntryHeader entry={props.entry} expanded={props.expanded} />}
+                </Box>
+            </Anchor>
+            {props.expanded && (
+                <Box px="xs" pb="xs">
+                    <Box className={classes.body} sx={{ direction: props.entry.rtl ? "rtl" : "ltr" }}>
+                        <FeedEntryBody entry={props.entry} />
+                    </Box>
+                    <Divider variant="dashed" my="xs" />
+                    <FeedEntryFooter entry={props.entry} />
+                </Box>
+            )}
+        </Paper>
+    )
+}

commafeed-client/src/components/content/FeedEntryBody.tsx

@@ -0,0 +1,35 @@
+import { Box } from "@mantine/core"
+import { Entry } from "app/types"
+import { Content } from "./Content"
+import { Enclosure } from "./Enclosure"
+import { Media } from "./Media"
+
+export interface FeedEntryBodyProps {
+    entry: Entry
+}
+
+export function FeedEntryBody(props: FeedEntryBodyProps) {
+    return (
+        <Box>
+            <Box>
+                <Content content={props.entry.content} />
+            </Box>
+            {props.entry.enclosureUrl && (
+                <Box pt="md">
+                    <Enclosure enclosureType={props.entry.enclosureType} enclosureUrl={props.entry.enclosureUrl} />
+                </Box>
+            )}
+            {/* show media only if we don't have content to avoid duplicate content */}
+            {!props.entry.content && props.entry.mediaThumbnailUrl && (
+                <Box pt="md">
+                    <Media
+                        thumbnailUrl={props.entry.mediaThumbnailUrl}
+                        thumbnailWidth={props.entry.mediaThumbnailWidth}
+                        thumbnailHeight={props.entry.mediaThumbnailHeight}
+                        description={props.entry.mediaDescription}
+                    />
+                </Box>
+            )}
+        </Box>
+    )
+}

commafeed-client/src/components/content/FeedEntryCompactHeader.tsx

@@ -0,0 +1,57 @@
+import { Box, createStyles, Image, Text } from "@mantine/core"
+import { Entry } from "app/types"
+import { RelativeDate } from "components/RelativeDate"
+import { OnDesktop } from "components/responsive/OnDesktop"
+import { FeedEntryTitle } from "./FeedEntryTitle"
+
+export interface FeedEntryHeaderProps {
+    entry: Entry
+}
+
+const useStyles = createStyles((theme, props: FeedEntryHeaderProps) => ({
+    wrapper: {
+        display: "flex",
+        alignItems: "center",
+        columnGap: "10px",
+    },
+    title: {
+        flexGrow: 1,
+        fontWeight: theme.colorScheme === "light" && !props.entry.read ? "bold" : "inherit",
+        whiteSpace: "nowrap",
+        overflow: "hidden",
+        textOverflow: "ellipsis",
+    },
+    feedName: {
+        width: "145px",
+        minWidth: "145px",
+        whiteSpace: "nowrap",
+        overflow: "hidden",
+        textOverflow: "ellipsis",
+    },
+    date: {
+        whiteSpace: "nowrap",
+    },
+}))
+export function FeedEntryCompactHeader(props: FeedEntryHeaderProps) {
+    const { classes } = useStyles(props)
+    return (
+        <Box className={classes.wrapper}>
+            <Box>
+                <Image withPlaceholder src={props.entry.iconUrl} alt="feed icon" width={18} height={18} />
+            </Box>
+            <OnDesktop>
+                <Text color="dimmed" className={classes.feedName}>
+                    {props.entry.feedName}
+                </Text>
+            </OnDesktop>
+            <Box className={classes.title}>
+                <FeedEntryTitle entry={props.entry} />
+            </Box>
+            <OnDesktop>
+                <Text color="dimmed" className={classes.date}>
+                    <RelativeDate date={props.entry.date} />
+                </Text>
+            </OnDesktop>
+        </Box>
+    )
+}

commafeed-client/src/components/content/FeedEntryFooter.tsx

@@ -0,0 +1,106 @@
+import { t } from "@lingui/macro"
+import { Group, Indicator, MultiSelect, Popover } from "@mantine/core"
+import { useMediaQuery } from "@mantine/hooks"
+import { Constants } from "app/constants"
+import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/slices/entries"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { Entry } from "app/types"
+import { ActionButton } from "components/ActionButtton"
+import { ButtonToolbar } from "components/ButtonToolbar"
+import { useEffect, useState } from "react"
+import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbShare, TbStar, TbStarOff, TbTag } from "react-icons/tb"
+import { ShareButtons } from "./ShareButtons"
+
+interface FeedEntryFooterProps {
+    entry: Entry
+}
+
+export function FeedEntryFooter(props: FeedEntryFooterProps) {
+    const [scrollPosition, setScrollPosition] = useState(0)
+    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
+    const tags = useAppSelector(state => state.user.tags)
+    const mobile = !useMediaQuery(`(min-width: ${Constants.layout.mobileBreakpoint}px)`)
+    const dispatch = useAppDispatch()
+
+    const showSharingButtons =
+        sharingSettings && (Object.values(sharingSettings) as Array<typeof sharingSettings[keyof typeof sharingSettings]>).some(v => v)
+
+    const readStatusButtonClicked = () => dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))
+    const onTagsChange = (values: string[]) =>
+        dispatch(
+            tagEntry({
+                entryId: +props.entry.id,
+                tags: values,
+            })
+        )
+
+    useEffect(() => {
+        const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
+
+        const listener = () => setScrollPosition(scrollArea ? scrollArea.scrollTop : 0)
+        scrollArea?.addEventListener("scroll", listener)
+        return () => scrollArea?.removeEventListener("scroll", listener)
+    }, [])
+
+    return (
+        <Group position="apart">
+            <ButtonToolbar>
+                {props.entry.markable && (
+                    <ActionButton
+                        icon={props.entry.read ? <TbEyeOff size={18} /> : <TbEyeCheck size={18} />}
+                        label={props.entry.read ? t`Keep unread` : t`Mark as read`}
+                        onClick={readStatusButtonClicked}
+                    />
+                )}
+                <ActionButton
+                    icon={props.entry.starred ? <TbStarOff size={18} /> : <TbStar size={18} />}
+                    label={props.entry.starred ? t`Unstar` : t`Star`}
+                    onClick={() => dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}
+                />
+
+                {showSharingButtons && (
+                    <Popover withArrow withinPortal shadow="md" positionDependencies={[scrollPosition]} closeOnClickOutside={!mobile}>
+                        <Popover.Target>
+                            <ActionButton icon={<TbShare size={18} />} label={t`Share`} />
+                        </Popover.Target>
+                        <Popover.Dropdown>
+                            <ShareButtons url={props.entry.url} description={props.entry.title} />
+                        </Popover.Dropdown>
+                    </Popover>
+                )}
+
+                {tags && (
+                    <Popover withArrow withinPortal shadow="md" positionDependencies={[scrollPosition]} closeOnClickOutside={!mobile}>
+                        <Popover.Target>
+                            <Indicator label={props.entry.tags.length} showZero={false} dot={false} inline size={16}>
+                                <ActionButton icon={<TbTag size={18} />} label={t`Tags`} />
+                            </Indicator>
+                        </Popover.Target>
+                        <Popover.Dropdown>
+                            <MultiSelect
+                                data={tags}
+                                placeholder="Tags"
+                                searchable
+                                creatable
+                                autoFocus
+                                getCreateLabel={query => t`Create tag: ${query}`}
+                                value={props.entry.tags}
+                                onChange={onTagsChange}
+                            />
+                        </Popover.Dropdown>
+                    </Popover>
+                )}
+
+                <a href={props.entry.url} target="_blank" rel="noreferrer">
+                    <ActionButton icon={<TbExternalLink size={18} />} label={t`Open link`} />
+                </a>
+            </ButtonToolbar>
+
+            <ActionButton
+                icon={<TbArrowBarToDown size={18} />}
+                label={t`Mark as read up to here`}
+                onClick={() => dispatch(markEntriesUpToEntry(props.entry))}
+            />
+        </Group>
+    )
+}

commafeed-client/src/components/content/FeedEntryHeader.tsx

@@ -0,0 +1,59 @@
+import { Box, createStyles, Image, Text } from "@mantine/core"
+import { Entry } from "app/types"
+import { RelativeDate } from "components/RelativeDate"
+import { FeedEntryTitle } from "./FeedEntryTitle"
+
+export interface FeedEntryHeaderProps {
+    entry: Entry
+    expanded: boolean
+}
+
+const useStyles = createStyles((theme, props: FeedEntryHeaderProps) => ({
+    headerText: {
+        fontWeight: theme.colorScheme === "light" && !props.entry.read ? "bold" : "inherit",
+        whiteSpace: props.expanded ? "inherit" : "nowrap",
+        overflow: "hidden",
+        textOverflow: "ellipsis",
+    },
+    headerSubtext: {
+        display: "flex",
+        alignItems: "center",
+        fontSize: "90%",
+        whiteSpace: props.expanded ? "inherit" : "nowrap",
+        overflow: "hidden",
+        textOverflow: "ellipsis",
+    },
+}))
+export function FeedEntryHeader(props: FeedEntryHeaderProps) {
+    const { classes } = useStyles(props)
+    return (
+        <Box>
+            <Box className={classes.headerText}>
+                <FeedEntryTitle entry={props.entry} />
+            </Box>
+            <Box className={classes.headerSubtext}>
+                <Box mr={6}>
+                    <Image withPlaceholder src={props.entry.iconUrl} alt="feed icon" width={18} height={18} />
+                </Box>
+                <Box>
+                    <Text color="dimmed">{props.entry.feedName}</Text>
+                </Box>
+                <Box>
+                    <Text color="dimmed">
+                        <span>&nbsp;·&nbsp;</span>
+                        <RelativeDate date={props.entry.date} />
+                    </Text>
+                </Box>
+            </Box>
+            {props.expanded && (
+                <Box className={classes.headerSubtext}>
+                    <Text color="dimmed">
+                        {props.entry.author && <span>by {props.entry.author}</span>}
+                        {props.entry.author && props.entry.categories && <span>&nbsp;·&nbsp;</span>}
+                        {props.entry.categories && <span>{props.entry.categories}</span>}
+                    </Text>
+                </Box>
+            )}
+        </Box>
+    )
+}

commafeed-client/src/components/content/FeedEntryTitle.tsx

@@ -0,0 +1,21 @@
+import { Highlight } from "@mantine/core"
+import { useAppSelector } from "app/store"
+import { Entry } from "app/types"
+
+export interface FeedEntryTitleProps {
+    entry: Entry
+}
+
+export function FeedEntryTitle(props: FeedEntryTitleProps) {
+    const search = useAppSelector(state => state.entries.search)
+    const keywords = search?.split(" ")
+    return (
+        <Highlight
+            highlight={keywords ?? ""}
+            // make sure ellipsis is shown when title is too long
+            span
+        >
+            {props.entry.title}
+        </Highlight>
+    )
+}

commafeed-client/src/components/content/Media.tsx

@@ -0,0 +1,39 @@
+import { Box, TypographyStylesProvider } from "@mantine/core"
+import { Constants } from "app/constants"
+import { calculatePlaceholderSize } from "app/utils"
+import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+import { Content } from "./Content"
+
+export interface MediaProps {
+    thumbnailUrl: string
+    thumbnailWidth?: number
+    thumbnailHeight?: number
+    description?: string
+}
+
+export function Media(props: MediaProps) {
+    const width = props.thumbnailWidth
+    const height = props.thumbnailHeight
+    const placeholderSize = calculatePlaceholderSize({
+        width,
+        height,
+        maxWidth: Constants.layout.entryMaxWidth,
+    })
+    return (
+        <TypographyStylesProvider>
+            <ImageWithPlaceholderWhileLoading
+                src={props.thumbnailUrl}
+                alt="media thumbnail"
+                width={props.thumbnailWidth}
+                height={props.thumbnailHeight}
+                placeholderWidth={placeholderSize.width}
+                placeholderHeight={placeholderSize.height}
+            />
+            {props.description && (
+                <Box pt="md">
+                    <Content content={props.description} />
+                </Box>
+            )}
+        </TypographyStylesProvider>
+    )
+}

commafeed-client/src/components/content/ShareButtons.tsx

@@ -0,0 +1,55 @@
+import { ActionIcon, Box, createStyles, SimpleGrid } from "@mantine/core"
+import { Constants } from "app/constants"
+import { useAppSelector } from "app/store"
+import { SharingSettings } from "app/types"
+import { IconType } from "react-icons"
+
+type Color = `#${string}`
+
+const useStyles = createStyles((theme, props: { color: Color }) => ({
+    socialIcon: {
+        color: props.color,
+        backgroundColor: theme.colorScheme === "dark" ? theme.colors.gray[2] : "white",
+        borderRadius: "50%",
+    },
+}))
+
+function ShareButton({ url, icon, color }: { url: string; icon: IconType; color: Color }) {
+    const { classes } = useStyles({ color })
+
+    const onClick = (e: React.MouseEvent) => {
+        e.preventDefault()
+        window.open(url, "", "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,width=800,height=600")
+    }
+
+    return (
+        <ActionIcon>
+            <a href={url} target="_blank" rel="noreferrer" onClick={onClick}>
+                <Box p={6} className={classes.socialIcon}>
+                    {icon({ size: 18 })}
+                </Box>
+            </a>
+        </ActionIcon>
+    )
+}
+
+export function ShareButtons(props: { url: string; description: string }) {
+    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
+    const url = encodeURIComponent(props.url)
+    const desc = encodeURIComponent(props.description)
+
+    return (
+        <SimpleGrid cols={4}>
+            {(Object.keys(Constants.sharing) as Array<keyof SharingSettings>)
+                .filter(site => sharingSettings && sharingSettings[site])
+                .map(site => (
+                    <ShareButton
+                        key={site}
+                        icon={Constants.sharing[site].icon}
+                        color={Constants.sharing[site].color}
+                        url={Constants.sharing[site].url(url, desc)}
+                    />
+                ))}
+        </SimpleGrid>
+    )
+}

commafeed-client/src/components/content/add/AddCategory.tsx

@@ -0,0 +1,50 @@
+import { t, Trans } from "@lingui/macro"
+import { Box, Button, Group, Stack, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { redirectToSelectedSource } from "app/slices/redirect"
+import { reloadTree } from "app/slices/tree"
+import { useAppDispatch } from "app/store"
+import { AddCategoryRequest } from "app/types"
+import { Alert } from "components/Alert"
+import { useAsyncCallback } from "react-async-hook"
+import { TbFolderPlus } from "react-icons/tb"
+import { CategorySelect } from "./CategorySelect"
+
+export function AddCategory() {
+    const dispatch = useAppDispatch()
+
+    const form = useForm<AddCategoryRequest>()
+
+    const addCategory = useAsyncCallback(client.category.add, {
+        onSuccess: () => {
+            dispatch(reloadTree())
+            dispatch(redirectToSelectedSource())
+        },
+    })
+
+    return (
+        <>
+            {addCategory.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(addCategory.error)} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(addCategory.execute)}>
+                <Stack>
+                    <TextInput label={t`Category`} placeholder={t`Category`} {...form.getInputProps("name")} required />
+                    <CategorySelect label={t`Parent`} {...form.getInputProps("parentId")} clearable />
+                    <Group position="center">
+                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftIcon={<TbFolderPlus size={16} />} loading={addCategory.loading}>
+                            <Trans>Add</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}

commafeed-client/src/components/content/add/CategorySelect.tsx

@@ -0,0 +1,27 @@
+import { t } from "@lingui/macro"
+import { Select, SelectItem, SelectProps } from "@mantine/core"
+import { Constants } from "app/constants"
+import { useAppSelector } from "app/store"
+import { flattenCategoryTree } from "app/utils"
+
+type CategorySelectProps = Partial<SelectProps> & { withAll?: boolean }
+
+export function CategorySelect(props: CategorySelectProps) {
+    const rootCategory = useAppSelector(state => state.tree.rootCategory)
+    const categories = rootCategory && flattenCategoryTree(rootCategory)
+    const selectData: SelectItem[] | undefined = categories
+        ?.filter(c => c.id !== Constants.categories.all.id)
+        .sort((c1, c2) => c1.name.localeCompare(c2.name))
+        .map(c => ({
+            label: c.name,
+            value: c.id,
+        }))
+    if (props.withAll) {
+        selectData?.unshift({
+            label: t`All`,
+            value: Constants.categories.all.id,
+        })
+    }
+
+    return <Select {...props} data={selectData ?? []} disabled={!selectData} />
+}

commafeed-client/src/components/content/add/ImportOpml.tsx

@@ -0,0 +1,58 @@
+import { t, Trans } from "@lingui/macro"
+import { Box, Button, FileInput, Group, Stack } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { redirectToSelectedSource } from "app/slices/redirect"
+import { reloadTree } from "app/slices/tree"
+import { useAppDispatch } from "app/store"
+import { Alert } from "components/Alert"
+import { useAsyncCallback } from "react-async-hook"
+import { TbFileImport } from "react-icons/tb"
+
+export function ImportOpml() {
+    const dispatch = useAppDispatch()
+
+    const form = useForm<{ file: File }>({
+        validate: {
+            file: v => (v ? null : t`file is required`),
+        },
+    })
+
+    const importOpml = useAsyncCallback(client.feed.importOpml, {
+        onSuccess: () => {
+            dispatch(reloadTree())
+            dispatch(redirectToSelectedSource())
+        },
+    })
+
+    return (
+        <>
+            {importOpml.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(importOpml.error)} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(v => importOpml.execute(v.file))}>
+                <Stack>
+                    <FileInput
+                        label={t`OPML file`}
+                        placeholder={t`OPML file`}
+                        description={t`An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your data from other feed reading services.`}
+                        {...form.getInputProps("file")}
+                        required
+                        accept="application/xml"
+                    />
+                    <Group position="center">
+                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftIcon={<TbFileImport size={16} />} loading={importOpml.loading}>
+                            <Trans>Import</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}

commafeed-client/src/components/content/add/Subscribe.tsx

@@ -0,0 +1,117 @@
+import { t, Trans } from "@lingui/macro"
+import { Box, Button, Group, Stack, Stepper, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { Constants } from "app/constants"
+import { redirectToFeed, redirectToSelectedSource } from "app/slices/redirect"
+import { reloadTree } from "app/slices/tree"
+import { useAppDispatch } from "app/store"
+import { FeedInfoRequest, SubscribeRequest } from "app/types"
+import { Alert } from "components/Alert"
+import { useState } from "react"
+import { useAsyncCallback } from "react-async-hook"
+import { TbRss } from "react-icons/tb"
+import { CategorySelect } from "./CategorySelect"
+
+export function Subscribe() {
+    const [activeStep, setActiveStep] = useState(0)
+    const dispatch = useAppDispatch()
+
+    const step0Form = useForm<FeedInfoRequest>({
+        initialValues: {
+            url: "",
+        },
+    })
+
+    const step1Form = useForm<SubscribeRequest>({
+        initialValues: {
+            url: "",
+            title: "",
+            categoryId: Constants.categories.all.id,
+        },
+    })
+
+    const fetchFeed = useAsyncCallback(client.feed.fetchFeed, {
+        onSuccess: ({ data }) => {
+            step1Form.setFieldValue("url", data.url)
+            step1Form.setFieldValue("title", data.title)
+            setActiveStep(step => step + 1)
+        },
+    })
+    const subscribe = useAsyncCallback(client.feed.subscribe, {
+        onSuccess: sub => {
+            dispatch(reloadTree())
+            dispatch(redirectToFeed(sub.data))
+        },
+    })
+
+    const previousStep = () => {
+        if (activeStep === 0) dispatch(redirectToSelectedSource())
+        else setActiveStep(activeStep - 1)
+    }
+    const nextStep = (e: React.FormEvent<HTMLFormElement>) => {
+        if (activeStep === 0) {
+            step0Form.onSubmit(fetchFeed.execute)(e)
+        } else if (activeStep === 1) {
+            step1Form.onSubmit(subscribe.execute)(e)
+        }
+    }
+
+    return (
+        <>
+            {fetchFeed.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(fetchFeed.error)} />
+                </Box>
+            )}
+
+            {subscribe.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(subscribe.error)} />
+                </Box>
+            )}
+
+            <form onSubmit={nextStep}>
+                <Stepper active={activeStep} onStepClick={setActiveStep}>
+                    <Stepper.Step
+                        label={t`Analyze feed`}
+                        description={t`Check that the feed is working`}
+                        allowStepSelect={activeStep === 1}
+                    >
+                        <TextInput
+                            label={t`Feed URL`}
+                            placeholder="http://www.mysite.com/rss"
+                            description={t`The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page.`}
+                            required
+                            autoFocus
+                            {...step0Form.getInputProps("url")}
+                        />
+                    </Stepper.Step>
+                    <Stepper.Step label={t`Subscribe`} description={t`Subscribe to the feed`} allowStepSelect={false}>
+                        <Stack>
+                            <TextInput label={t`Feed URL`} {...step1Form.getInputProps("url")} disabled />
+                            <TextInput label={t`Feed name`} {...step1Form.getInputProps("title")} required autoFocus />
+                            <CategorySelect label={t`Category`} {...step1Form.getInputProps("categoryId")} clearable />
+                        </Stack>
+                    </Stepper.Step>
+                </Stepper>
+
+                <Group position="center" mt="xl">
+                    <Button variant="default" onClick={previousStep}>
+                        <Trans>Back</Trans>
+                    </Button>
+                    {activeStep === 0 && (
+                        <Button type="submit" loading={fetchFeed.loading}>
+                            <Trans>Next</Trans>
+                        </Button>
+                    )}
+                    {activeStep === 1 && (
+                        <Button type="submit" leftIcon={<TbRss size={16} />} loading={fetchFeed.loading || subscribe.loading}>
+                            <Trans>Subscribe</Trans>
+                        </Button>
+                    )}
+                </Group>
+            </form>
+        </>
+    )
+}

commafeed-client/src/components/header/Header.tsx

@@ -0,0 +1,88 @@
+import { t } from "@lingui/macro"
+import { ActionIcon, Center, Divider, Indicator, Popover, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { reloadEntries, search } from "app/slices/entries"
+import { changeReadingMode, changeReadingOrder } from "app/slices/user"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { ActionButton } from "components/ActionButtton"
+import { ButtonToolbar } from "components/ButtonToolbar"
+import { Loader } from "components/Loader"
+import { useEffect } from "react"
+import { TbArrowDown, TbArrowUp, TbEye, TbEyeOff, TbRefresh, TbSearch, TbUser, TbX } from "react-icons/tb"
+import { MarkAllAsReadButton } from "./MarkAllAsReadButton"
+import { ProfileMenu } from "./ProfileMenu"
+
+function HeaderDivider() {
+    return <Divider orientation="vertical" />
+}
+
+const iconSize = 18
+export function Header() {
+    const settings = useAppSelector(state => state.user.settings)
+    const profile = useAppSelector(state => state.user.profile)
+    const searchFromStore = useAppSelector(state => state.entries.search)
+    const dispatch = useAppDispatch()
+
+    const searchForm = useForm<{ search: string }>({
+        validate: {
+            search: value => (value.length > 0 && value.length < 3 ? t`Search requires at least 3 characters` : null),
+        },
+    })
+    const { setValues } = searchForm
+
+    useEffect(() => {
+        setValues({
+            search: searchFromStore,
+        })
+    }, [setValues, searchFromStore])
+
+    if (!settings) return <Loader />
+    return (
+        <Center>
+            <ButtonToolbar>
+                <ActionButton icon={<TbRefresh size={iconSize} />} label={t`Refresh`} onClick={() => dispatch(reloadEntries())} />
+                <MarkAllAsReadButton iconSize={iconSize} />
+
+                <HeaderDivider />
+
+                <ActionButton
+                    icon={settings.readingMode === "all" ? <TbEye size={iconSize} /> : <TbEyeOff size={iconSize} />}
+                    label={settings.readingMode === "all" ? t`All` : t`Unread`}
+                    onClick={() => dispatch(changeReadingMode(settings.readingMode === "all" ? "unread" : "all"))}
+                />
+                <ActionButton
+                    icon={settings.readingOrder === "asc" ? <TbArrowUp size={iconSize} /> : <TbArrowDown size={iconSize} />}
+                    label={settings.readingOrder === "asc" ? t`Asc` : t`Desc`}
+                    onClick={() => dispatch(changeReadingOrder(settings.readingOrder === "asc" ? "desc" : "asc"))}
+                />
+
+                <Popover>
+                    <Popover.Target>
+                        <Indicator disabled={!searchFromStore}>
+                            <ActionButton icon={<TbSearch size={iconSize} />} label={t`Search`} />
+                        </Indicator>
+                    </Popover.Target>
+                    <Popover.Dropdown>
+                        <form onSubmit={searchForm.onSubmit(values => dispatch(search(values.search)))}>
+                            <TextInput
+                                placeholder={t`Search`}
+                                {...searchForm.getInputProps("search")}
+                                icon={<TbSearch size={iconSize} />}
+                                rightSection={
+                                    <ActionIcon onClick={() => searchFromStore && dispatch(search(""))}>
+                                        <TbX />
+                                    </ActionIcon>
+                                }
+                                autoFocus
+                            />
+                        </form>
+                    </Popover.Dropdown>
+                </Popover>
+
+                <HeaderDivider />
+
+                <ProfileMenu control={<ActionButton icon={<TbUser size={iconSize} />} label={profile?.name} />} />
+            </ButtonToolbar>
+        </Center>
+    )
+}

commafeed-client/src/components/header/MarkAllAsReadButton.tsx

@@ -0,0 +1,83 @@
+import { t, Trans } from "@lingui/macro"
+
+import { Button, Code, Group, Modal, Slider, Stack, Text } from "@mantine/core"
+import { markAllEntries } from "app/slices/entries"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { ActionButton } from "components/ActionButtton"
+import { useState } from "react"
+import { TbChecks } from "react-icons/tb"
+
+export function MarkAllAsReadButton(props: { iconSize: number }) {
+    const [opened, setOpened] = useState(false)
+    const [threshold, setThreshold] = useState(0)
+    const source = useAppSelector(state => state.entries.source)
+    const sourceLabel = useAppSelector(state => state.entries.sourceLabel)
+    const entriesTimestamp = useAppSelector(state => state.entries.timestamp) ?? Date.now()
+    const dispatch = useAppDispatch()
+
+    return (
+        <>
+            <Modal opened={opened} onClose={() => setOpened(false)} title={t`Mark all entries as read`}>
+                <Stack>
+                    <Text size="sm">
+                        {threshold === 0 && (
+                            <Trans>
+                                Are you sure you want to mark all entries of <Code>{sourceLabel}</Code> as read?
+                            </Trans>
+                        )}
+                        {threshold > 0 && (
+                            <Trans>
+                                Are you sure you want to mark entries older than {threshold} days of <Code>{sourceLabel}</Code> as read?
+                            </Trans>
+                        )}
+                    </Text>
+                    <Slider
+                        py="xl"
+                        min={0}
+                        max={28}
+                        marks={[
+                            { value: 0, label: "0" },
+                            { value: 7, label: "7" },
+                            { value: 14, label: "14" },
+                            { value: 21, label: "21" },
+                            { value: 28, label: "28" },
+                        ]}
+                        value={threshold}
+                        onChange={setThreshold}
+                    />
+                    <Group position="right">
+                        <Button variant="default" onClick={() => setOpened(false)}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button
+                            color="red"
+                            onClick={() => {
+                                setOpened(false)
+                                dispatch(
+                                    markAllEntries({
+                                        sourceType: source.type,
+                                        req: {
+                                            id: source.id,
+                                            read: true,
+                                            olderThan: entriesTimestamp - threshold * 24 * 60 * 60 * 1000,
+                                        },
+                                    })
+                                )
+                            }}
+                        >
+                            <Trans>Confirm</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </Modal>
+            <ActionButton
+                icon={<TbChecks size={props.iconSize} />}
+                label={t`Mark all as read`}
+                onClick={() => {
+                    setThreshold(0)
+                    setOpened(true)
+                }}
+            />
+        </>
+    )
+}

commafeed-client/src/components/header/ProfileMenu.tsx

@@ -0,0 +1,146 @@
+import { Trans } from "@lingui/macro"
+import { Box, Divider, Group, Menu, SegmentedControl, SegmentedControlItem, useMantineColorScheme } from "@mantine/core"
+import { redirectToAbout, redirectToAdminUsers, redirectToMetrics, redirectToSettings } from "app/slices/redirect"
+import { changeViewMode } from "app/slices/user"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { ViewMode } from "app/types"
+import { useState } from "react"
+import { TbChartLine, TbHelp, TbLayoutList, TbList, TbMoon, TbNotes, TbPower, TbSettings, TbSun, TbUsers } from "react-icons/tb"
+
+interface ProfileMenuProps {
+    control: React.ReactElement
+}
+
+interface ViewModeControlItem extends SegmentedControlItem {
+    value: ViewMode
+}
+
+const iconSize = 16
+
+const viewModeData: ViewModeControlItem[] = [
+    {
+        value: "title",
+        label: (
+            <Group>
+                <TbList size={iconSize} />
+                <Box ml={6}>
+                    <Trans>Compact</Trans>
+                </Box>
+            </Group>
+        ),
+    },
+    {
+        value: "cozy",
+        label: (
+            <Group>
+                <TbLayoutList size={iconSize} />
+                <Box ml={6}>
+                    <Trans>Cozy</Trans>
+                </Box>
+            </Group>
+        ),
+    },
+    {
+        value: "expanded",
+        label: (
+            <Group>
+                <TbNotes size={iconSize} />
+                <Box ml={6}>
+                    <Trans>Expanded</Trans>
+                </Box>
+            </Group>
+        ),
+    },
+]
+
+export function ProfileMenu(props: ProfileMenuProps) {
+    const [opened, setOpened] = useState(false)
+    const viewMode = useAppSelector(state => state.user.settings?.viewMode)
+    const admin = useAppSelector(state => state.user.profile?.admin)
+    const dispatch = useAppDispatch()
+    const { colorScheme, toggleColorScheme } = useMantineColorScheme()
+    const dark = colorScheme === "dark"
+
+    const logout = () => {
+        window.location.href = "logout"
+    }
+
+    return (
+        <Menu position="bottom-end" closeOnItemClick={false} opened={opened} onChange={setOpened}>
+            <Menu.Target>{props.control}</Menu.Target>
+            <Menu.Dropdown>
+                <Menu.Item
+                    icon={<TbSettings size={iconSize} />}
+                    onClick={() => {
+                        dispatch(redirectToSettings())
+                        setOpened(false)
+                    }}
+                >
+                    <Trans>Settings</Trans>
+                </Menu.Item>
+
+                <Divider />
+                <Menu.Label>
+                    <Trans>Theme</Trans>
+                </Menu.Label>
+                <Menu.Item icon={dark ? <TbSun size={iconSize} /> : <TbMoon size={iconSize} />} onClick={() => toggleColorScheme()}>
+                    {dark ? <Trans>Switch to light theme</Trans> : <Trans>Switch to dark theme</Trans>}
+                </Menu.Item>
+
+                <Divider />
+                <Menu.Label>
+                    <Trans>Display</Trans>
+                </Menu.Label>
+                <SegmentedControl
+                    fullWidth
+                    orientation="vertical"
+                    data={viewModeData}
+                    value={viewMode}
+                    onChange={e => dispatch(changeViewMode(e as ViewMode))}
+                    mb="xs"
+                />
+
+                {admin && (
+                    <>
+                        <Divider />
+                        <Menu.Label>
+                            <Trans>Admin</Trans>
+                        </Menu.Label>
+                        <Menu.Item
+                            icon={<TbUsers size={iconSize} />}
+                            onClick={() => {
+                                dispatch(redirectToAdminUsers())
+                                setOpened(false)
+                            }}
+                        >
+                            <Trans>Manage users</Trans>
+                        </Menu.Item>
+                        <Menu.Item
+                            icon={<TbChartLine size={iconSize} />}
+                            onClick={() => {
+                                dispatch(redirectToMetrics())
+                                setOpened(false)
+                            }}
+                        >
+                            <Trans>Metrics</Trans>
+                        </Menu.Item>
+                    </>
+                )}
+
+                <Divider />
+                <Menu.Item
+                    icon={<TbHelp size={iconSize} />}
+                    onClick={() => {
+                        dispatch(redirectToAbout())
+                        setOpened(false)
+                    }}
+                >
+                    <Trans>About</Trans>
+                </Menu.Item>
+                <Menu.Item icon={<TbPower size={iconSize} />} onClick={logout}>
+                    <Trans>Logout</Trans>
+                </Menu.Item>
+            </Menu.Dropdown>
+        </Menu>
+    )
+}

commafeed-client/src/components/metrics/Gauge.tsx

@@ -0,0 +1,9 @@
+import { MetricGauge } from "app/types"
+
+interface MeterProps {
+    gauge: MetricGauge
+}
+
+export function Gauge(props: MeterProps) {
+    return <span>{props.gauge.value}</span>
+}

commafeed-client/src/components/metrics/Meter.tsx

@@ -0,0 +1,19 @@
+import { Box } from "@mantine/core"
+import { MetricMeter } from "app/types"
+
+interface MeterProps {
+    meter: MetricMeter
+}
+
+export function Meter(props: MeterProps) {
+    return (
+        <Box>
+            <Box>Mean: {props.meter.mean_rate.toFixed(2)}</Box>
+            <Box>Last minute: {props.meter.m1_rate.toFixed(2)}</Box>
+            <Box>Last 5 minutes: {props.meter.m5_rate.toFixed(2)}</Box>
+            <Box>Last 15 minutes: {props.meter.m15_rate.toFixed(2)}</Box>
+            <Box>Units: {props.meter.units}</Box>
+            <Box>Total: {props.meter.count}</Box>
+        </Box>
+    )
+}

commafeed-client/src/components/metrics/MetricAccordionItem.tsx

@@ -0,0 +1,22 @@
+import { Accordion, Box, Group } from "@mantine/core"
+
+interface MetricAccordionItemProps {
+    metricKey: string
+    name: string
+    headerValue: number
+    children: React.ReactNode
+}
+
+export function MetricAccordionItem({ metricKey, name, headerValue, children }: MetricAccordionItemProps) {
+    return (
+        <Accordion.Item value={metricKey} key={metricKey}>
+            <Accordion.Control>
+                <Group position="apart">
+                    <Box>{name}</Box>
+                    <Box>{headerValue}</Box>
+                </Group>
+            </Accordion.Control>
+            <Accordion.Panel>{children}</Accordion.Panel>
+        </Accordion.Item>
+    )
+}

commafeed-client/src/components/metrics/Timer.tsx

@@ -0,0 +1,19 @@
+import { Box } from "@mantine/core"
+import { MetricTimer } from "app/types"
+
+interface MetricTimerProps {
+    timer: MetricTimer
+}
+
+export function Timer(props: MetricTimerProps) {
+    return (
+        <Box>
+            <Box>Mean: {props.timer.mean_rate.toFixed(2)}</Box>
+            <Box>Last minute: {props.timer.m1_rate.toFixed(2)}</Box>
+            <Box>Last 5 minutes: {props.timer.m5_rate.toFixed(2)}</Box>
+            <Box>Last 15 minutes: {props.timer.m15_rate.toFixed(2)}</Box>
+            <Box>Units: {props.timer.rate_units}</Box>
+            <Box>Total: {props.timer.count}</Box>
+        </Box>
+    )
+}

commafeed-client/src/components/responsive/OnDesktop.tsx

@@ -0,0 +1,11 @@
+import { Box, MediaQuery } from "@mantine/core"
+import { Constants } from "app/constants"
+import React from "react"
+
+export function OnDesktop(props: { children: React.ReactNode }) {
+    return (
+        <MediaQuery smallerThan={Constants.layout.mobileBreakpoint} styles={{ display: "none" }}>
+            <Box>{props.children}</Box>
+        </MediaQuery>
+    )
+}

commafeed-client/src/components/responsive/OnMobile.tsx

@@ -0,0 +1,11 @@
+import { Box, MediaQuery } from "@mantine/core"
+import { Constants } from "app/constants"
+import React from "react"
+
+export function OnMobile(props: { children: React.ReactNode }) {
+    return (
+        <MediaQuery largerThan={Constants.layout.mobileBreakpoint} styles={{ display: "none" }}>
+            <Box>{props.children}</Box>
+        </MediaQuery>
+    )
+}

commafeed-client/src/components/settings/DisplaySettings.tsx

@@ -0,0 +1,61 @@
+import { t } from "@lingui/macro"
+import { Divider, Select, SimpleGrid, Stack, Switch } from "@mantine/core"
+import { Constants } from "app/constants"
+import { changeLanguage, changeScrollMarks, changeScrollSpeed, changeSharingSetting, changeShowRead } from "app/slices/user"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { SharingSettings } from "app/types"
+import { locales } from "i18n"
+
+export function DisplaySettings() {
+    const language = useAppSelector(state => state.user.settings?.language)
+    const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
+    const showRead = useAppSelector(state => state.user.settings?.showRead)
+    const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
+    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
+    const dispatch = useAppDispatch()
+
+    return (
+        <Stack>
+            <Select
+                description={t`Language`}
+                value={language}
+                data={locales.map(l => ({
+                    value: l.key,
+                    label: l.label,
+                }))}
+                onChange={s => s && dispatch(changeLanguage(s))}
+            />
+
+            <Switch
+                label={t`Scroll smoothly when navigating between entries`}
+                checked={scrollSpeed ? scrollSpeed > 0 : false}
+                onChange={e => dispatch(changeScrollSpeed(e.currentTarget.checked))}
+            />
+
+            <Switch
+                label={t`Show feeds and categories with no unread entries`}
+                checked={showRead}
+                onChange={e => dispatch(changeShowRead(e.currentTarget.checked))}
+            />
+
+            <Switch
+                label={t`In expanded view, scrolling through entries mark them as read`}
+                checked={scrollMarks}
+                onChange={e => dispatch(changeScrollMarks(e.currentTarget.checked))}
+            />
+
+            <Divider label={t`Sharing sites`} labelPosition="center" />
+
+            <SimpleGrid cols={2}>
+                {(Object.keys(Constants.sharing) as Array<keyof SharingSettings>).map(site => (
+                    <Switch
+                        key={site}
+                        label={Constants.sharing[site].label}
+                        checked={sharingSettings && sharingSettings[site]}
+                        onChange={e => dispatch(changeSharingSetting({ site, value: e.currentTarget.checked }))}
+                    />
+                ))}
+            </SimpleGrid>
+        </Stack>
+    )
+}

commafeed-client/src/components/settings/ProfileSettings.tsx

@@ -0,0 +1,130 @@
+import { t, Trans } from "@lingui/macro"
+import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { openConfirmModal } from "@mantine/modals"
+import { client, errorToStrings } from "app/client"
+import { redirectToLogin, redirectToSelectedSource } from "app/slices/redirect"
+import { reloadProfile } from "app/slices/user"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { ProfileModificationRequest } from "app/types"
+import { Alert } from "components/Alert"
+import { useEffect } from "react"
+import { useAsyncCallback } from "react-async-hook"
+import { TbDeviceFloppy, TbTrash } from "react-icons/tb"
+
+interface FormData extends ProfileModificationRequest {
+    newPasswordConfirmation?: string
+}
+
+export function ProfileSettings() {
+    const profile = useAppSelector(state => state.user.profile)
+    const dispatch = useAppDispatch()
+
+    const form = useForm<FormData>({
+        validate: {
+            newPasswordConfirmation: (value: string, values: FormData) => (value !== values.newPassword ? t`Passwords do not match` : null),
+        },
+    })
+    const { setValues } = form
+
+    const saveProfile = useAsyncCallback(client.user.saveProfile, {
+        onSuccess: () => {
+            dispatch(reloadProfile())
+            dispatch(redirectToSelectedSource())
+        },
+    })
+    const deleteProfile = useAsyncCallback(client.user.deleteProfile, {
+        onSuccess: () => {
+            dispatch(redirectToLogin())
+        },
+    })
+
+    const openDeleteProfileModal = () =>
+        openConfirmModal({
+            title: t`Delete account`,
+            children: (
+                <Text size="sm">
+                    <Trans>Are you sure you want to delete your account? There's no turning back!</Trans>
+                </Text>
+            ),
+            labels: { confirm: t`Confirm`, cancel: t`Cancel` },
+            confirmProps: { color: "red" },
+            onConfirm: () => deleteProfile.execute(),
+        })
+
+    useEffect(() => {
+        if (!profile) return
+        setValues({
+            currentPassword: "",
+            email: profile.email ?? "",
+            newApiKey: false,
+        })
+    }, [setValues, profile])
+
+    return (
+        <>
+            {saveProfile.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(saveProfile.error)} />
+                </Box>
+            )}
+
+            {deleteProfile.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(deleteProfile.error)} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(saveProfile.execute)}>
+                <Stack>
+                    <Input.Wrapper label={t`User name`}>
+                        <Box>{profile?.name}</Box>
+                    </Input.Wrapper>
+                    <Input.Wrapper
+                        label={t`OPML export`}
+                        description={t`Export your subscriptions and categories as an OPML file that can be imported in other feed reading services`}
+                    >
+                        <Box>
+                            <Anchor href="rest/feed/export" download="commafeed_opml.xml">
+                                <Trans>Download</Trans>
+                            </Anchor>
+                        </Box>
+                    </Input.Wrapper>
+                    <PasswordInput
+                        label={t`Current password`}
+                        description={t`Enter your current password to change profile settings`}
+                        required
+                        {...form.getInputProps("currentPassword")}
+                    />
+                    <TextInput type="email" label={t`E-mail`} {...form.getInputProps("email")} required />
+                    <PasswordInput
+                        label={t`New password`}
+                        description={t`Changing password will generate a new API key`}
+                        {...form.getInputProps("newPassword")}
+                    />
+                    <PasswordInput label={t`Confirm password`} {...form.getInputProps("newPasswordConfirmation")} />
+                    <TextInput label={t`API key`} readOnly value={profile?.apiKey} />
+                    <Checkbox label={t`Generate new API key`} {...form.getInputProps("newApiKey", { type: "checkbox" })} />
+
+                    <Group>
+                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftIcon={<TbDeviceFloppy size={16} />} loading={saveProfile.loading}>
+                            <Trans>Save</Trans>
+                        </Button>
+                        <Divider orientation="vertical" />
+                        <Button
+                            color="red"
+                            leftIcon={<TbTrash size={16} />}
+                            onClick={() => openDeleteProfileModal()}
+                            loading={deleteProfile.loading}
+                        >
+                            <Trans>Delete account</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}

commafeed-client/src/components/sidebar/Tree.tsx

@@ -0,0 +1,168 @@
+import { t } from "@lingui/macro"
+import { Box, Stack } from "@mantine/core"
+import { Constants } from "app/constants"
+import {
+    redirectToCategory,
+    redirectToCategoryDetails,
+    redirectToFeed,
+    redirectToFeedDetails,
+    redirectToTag,
+    redirectToTagDetails,
+} from "app/slices/redirect"
+import { collapseTreeCategory } from "app/slices/tree"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { Category, Subscription } from "app/types"
+import { categoryUnreadCount, flattenCategoryTree } from "app/utils"
+import { Loader } from "components/Loader"
+import { OnDesktop } from "components/responsive/OnDesktop"
+import React from "react"
+import { TbChevronDown, TbChevronRight, TbInbox, TbStar, TbTag } from "react-icons/tb"
+import { TreeNode } from "./TreeNode"
+import { TreeSearch } from "./TreeSearch"
+
+const allIcon = <TbInbox size={16} />
+const starredIcon = <TbStar size={16} />
+const tagIcon = <TbTag size={16} />
+const expandedIcon = <TbChevronDown size={16} />
+const collapsedIcon = <TbChevronRight size={16} />
+
+const errorThreshold = 9
+export function Tree() {
+    const root = useAppSelector(state => state.tree.rootCategory)
+    const source = useAppSelector(state => state.entries.source)
+    const tags = useAppSelector(state => state.user.tags)
+    const showRead = useAppSelector(state => state.user.settings?.showRead)
+    const dispatch = useAppDispatch()
+
+    const feedClicked = (e: React.MouseEvent, id: string) => {
+        if (e.detail === 2) dispatch(redirectToFeedDetails(id))
+        else dispatch(redirectToFeed(id))
+    }
+    const categoryClicked = (e: React.MouseEvent, id: string) => {
+        if (e.detail === 2) {
+            dispatch(redirectToCategoryDetails(id))
+        } else {
+            dispatch(redirectToCategory(id))
+        }
+    }
+    const categoryIconClicked = (e: React.MouseEvent, category: Category) => {
+        e.stopPropagation()
+
+        dispatch(
+            collapseTreeCategory({
+                id: +category.id,
+                collapse: category.expanded,
+            })
+        )
+    }
+    const tagClicked = (e: React.MouseEvent, id: string) => {
+        if (e.detail === 2) dispatch(redirectToTagDetails(id))
+        else dispatch(redirectToTag(id))
+    }
+
+    const allCategoryNode = () => (
+        <TreeNode
+            id={Constants.categories.all.id}
+            name={t`All`}
+            icon={allIcon}
+            unread={categoryUnreadCount(root)}
+            selected={source.type === "category" && source.id === Constants.categories.all.id}
+            expanded={false}
+            level={0}
+            hasError={false}
+            onClick={categoryClicked}
+        />
+    )
+    const starredCategoryNode = () => (
+        <TreeNode
+            id={Constants.categories.starred.id}
+            name={t`Starred`}
+            icon={starredIcon}
+            unread={0}
+            selected={source.type === "category" && source.id === Constants.categories.starred.id}
+            expanded={false}
+            level={0}
+            hasError={false}
+            onClick={categoryClicked}
+        />
+    )
+
+    const categoryNode = (category: Category, level = 0) => {
+        const unreadCount = categoryUnreadCount(category)
+        if (unreadCount === 0 && !showRead) return null
+
+        const hasError = !category.expanded && flattenCategoryTree(category).some(c => c.feeds.some(f => f.errorCount > errorThreshold))
+        return (
+            <TreeNode
+                id={category.id}
+                name={category.name}
+                icon={category.expanded ? expandedIcon : collapsedIcon}
+                unread={unreadCount}
+                selected={source.type === "category" && source.id === category.id}
+                expanded={category.expanded}
+                level={level}
+                hasError={hasError}
+                onClick={categoryClicked}
+                onIconClick={e => categoryIconClicked(e, category)}
+                key={category.id}
+            />
+        )
+    }
+
+    const feedNode = (feed: Subscription, level = 0) => {
+        if (feed.unread === 0 && !showRead) return null
+
+        return (
+            <TreeNode
+                id={String(feed.id)}
+                name={feed.name}
+                icon={feed.iconUrl}
+                unread={feed.unread}
+                selected={source.type === "feed" && source.id === String(feed.id)}
+                level={level}
+                hasError={feed.errorCount > errorThreshold}
+                onClick={feedClicked}
+                key={feed.id}
+            />
+        )
+    }
+
+    const tagNode = (tag: string) => (
+        <TreeNode
+            id={tag}
+            name={tag}
+            icon={tagIcon}
+            unread={0}
+            selected={source.type === "tag" && source.id === tag}
+            level={0}
+            hasError={false}
+            onClick={tagClicked}
+            key={tag}
+        />
+    )
+
+    const recursiveCategoryNode = (category: Category, level = 0) => (
+        <React.Fragment key={`recursiveCategoryNode-${category.id}`}>
+            {categoryNode(category, level)}
+            {category.expanded && category.children.map(c => recursiveCategoryNode(c, level + 1))}
+            {category.expanded && category.feeds.map(f => feedNode(f, level + 1))}
+        </React.Fragment>
+    )
+
+    if (!root) return <Loader />
+    const feeds = flattenCategoryTree(root).flatMap(c => c.feeds)
+    return (
+        <Stack>
+            <OnDesktop>
+                <TreeSearch feeds={feeds} />
+            </OnDesktop>
+            <Box>
+                {allCategoryNode()}
+                {starredCategoryNode()}
+                {root.children.map(c => recursiveCategoryNode(c))}
+                {root.feeds.map(f => feedNode(f))}
+                {tags?.map(tag => tagNode(tag))}
+            </Box>
+        </Stack>
+    )
+}

commafeed-client/src/components/sidebar/TreeNode.tsx

@@ -0,0 +1,66 @@
+import { Box, createStyles, Image } from "@mantine/core"
+import React, { ReactNode } from "react"
+import { UnreadCount } from "./UnreadCount"
+
+interface TreeNodeProps {
+    id: string
+    name: string
+    icon: ReactNode | string
+    unread: number
+    selected: boolean
+    expanded?: boolean
+    level: number
+    hasError: boolean
+    onClick: (e: React.MouseEvent, id: string) => void
+    onIconClick?: (e: React.MouseEvent, id: string) => void
+}
+
+const useStyles = createStyles((theme, props: TreeNodeProps) => {
+    let backgroundColor = "inherit"
+    if (props.selected) backgroundColor = theme.colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[3]
+
+    let color
+    if (props.hasError) color = theme.colors.red[6]
+    else if (theme.colorScheme === "dark") color = props.unread > 0 ? theme.colors.dark[0] : theme.colors.dark[3]
+    else color = props.unread > 0 ? theme.black : theme.colors.gray[6]
+
+    return {
+        node: {
+            display: "flex",
+            alignItems: "center",
+            cursor: "pointer",
+            color,
+            backgroundColor,
+            "&:hover": {
+                backgroundColor: theme.colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[0],
+            },
+        },
+        nodeText: {
+            flexGrow: 1,
+            whiteSpace: "nowrap",
+            overflow: "hidden",
+            textOverflow: "ellipsis",
+        },
+    }
+})
+
+export function TreeNode(props: TreeNodeProps) {
+    const { classes } = useStyles(props)
+    return (
+        <Box py={1} pl={props.level * 20} className={classes.node} onClick={(e: React.MouseEvent) => props.onClick(e, props.id)}>
+            <Box mr={6} onClick={(e: React.MouseEvent) => props.onIconClick && props.onIconClick(e, props.id)}>
+                {typeof props.icon === "string" ? (
+                    <Image withPlaceholder src={props.icon} alt="favicon" width={18} height={18} />
+                ) : (
+                    props.icon
+                )}
+            </Box>
+            <Box className={classes.nodeText}>{props.name}</Box>
+            {!props.expanded && (
+                <Box>
+                    <UnreadCount unreadCount={props.unread} />
+                </Box>
+            )}
+        </Box>
+    )
+}

commafeed-client/src/components/sidebar/TreeSearch.tsx

@@ -0,0 +1,60 @@
+import { t } from "@lingui/macro"
+import { Box, Center, Image, Kbd, TextInput } from "@mantine/core"
+import { openSpotlight, SpotlightAction, SpotlightProvider } from "@mantine/spotlight"
+import { redirectToFeed } from "app/slices/redirect"
+import { useAppDispatch } from "app/store"
+import { Subscription } from "app/types"
+import { useMousetrap } from "hooks/useMousetrap"
+import { TbSearch } from "react-icons/tb"
+
+export interface TreeSearchProps {
+    feeds: Subscription[]
+}
+export function TreeSearch(props: TreeSearchProps) {
+    const dispatch = useAppDispatch()
+
+    const actions: SpotlightAction[] = props.feeds
+        .sort((f1, f2) => f1.name.localeCompare(f2.name))
+        .map(f => ({
+            title: f.name,
+            icon: <Image withPlaceholder src={f.iconUrl} alt="favicon" width={18} height={18} />,
+            onTrigger: () => dispatch(redirectToFeed(f.id)),
+        }))
+
+    const searchIcon = <TbSearch size={18} />
+    const rightSection = (
+        <Center>
+            <Kbd>Ctrl</Kbd>
+            <Box mx={5}>+</Box>
+            <Kbd>K</Kbd>
+        </Center>
+    )
+
+    // additional keyboard shortcut used by commafeed v1
+    useMousetrap("g u", () => openSpotlight())
+
+    return (
+        <SpotlightProvider
+            actions={actions}
+            searchIcon={searchIcon}
+            searchPlaceholder={t`Search`}
+            shortcut="ctrl+k"
+            nothingFoundMessage={t`Nothing found`}
+        >
+            <TextInput
+                placeholder={t`Search`}
+                icon={searchIcon}
+                rightSectionWidth={100}
+                rightSection={rightSection}
+                styles={{
+                    input: { cursor: "pointer" },
+                    rightSection: { pointerEvents: "none" },
+                }}
+                onClick={() => openSpotlight()}
+                // prevent focus
+                onFocus={e => e.target.blur()}
+                readOnly
+            />
+        </SpotlightProvider>
+    )
+}