release 3.3.0

hopefully removes the error that happens sometimes:
Illegal attempt to associate a collection with two open sessions. Collection : [com.commafeed.backend.model.Feed.subscriptions]

.bowerrc

@@ -1,3 +0,0 @@
-{
-    "directory": "src/main/app/lib"
-}

.dockerignore

@@ -0,0 +1,6 @@
+# ignore everything
+*
+
+# allow only what we need
+!commafeed-server/target/commafeed.jar
+!commafeed-server/config.yml.example

.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,89 @@
+name: Java CI
+
+on: [ push ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ "8", "11", "17" ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      # Setup
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: "temurin"
+          cache: "maven"
+
+      # Build
+      - name: Build with Maven
+        run: mvn --batch-mode --update-snapshots verify
+
+      - name: Upload JAR
+        uses: actions/upload-artifact@v3
+        if: ${{ matrix.java == '8' }}
+        with:
+          name: commafeed.jar
+          path: commafeed-server/target/commafeed.jar
+
+      # Docker
+      - name: Login to Container Registry
+        uses: docker/login-action@v2
+        if: ${{ matrix.java == '8' }}
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Docker build and push tag
+        uses: docker/build-push-action@v4
+        if: ${{ matrix.java == '8' && github.ref_type == 'tag' }}
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm/v7
+          tags: |
+            athou/commafeed:latest
+            athou/commafeed:${{ github.ref_name }}
+
+      - name: Docker build and push master
+        uses: docker/build-push-action@v4
+        if: ${{ matrix.java == '8' && github.ref_name == 'master' }}
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm/v7
+          tags: athou/commafeed:master
+
+      # Create GitHub release after Docker image has been published
+      - name: Extract Changelog Entry
+        uses: mindsers/changelog-reader-action@v2
+        if: ${{ matrix.java == '8' && github.ref_type == 'tag' }}
+        id: changelog_reader
+        with:
+          version: ${{ github.ref_name }}
+
+      - name: Create GitHub release
+        uses: softprops/action-gh-release@v1
+        if: ${{ matrix.java == '8' && github.ref_type == 'tag' }}
+        with:
+          name: CommaFeed ${{ github.ref_name }}
+          body: ${{ steps.changelog_reader.outputs.changes }}
+          draft: false
+          prerelease: false
+          files: |
+            commafeed-server/target/commafeed.jar
+            commafeed-server/config.yml.example

.gitignore

@@ -1,8 +1,12 @@
-# config gile
+# config file
 config.yml
 
 # build directory
 target
+target-ide
+
+# database files
+database
 
 # log files
 log
@@ -22,6 +26,7 @@ src/main/app/lib
 .classpath
 .settings
 .factorypath
+.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/README.md

@@ -1,3 +0,0 @@
-For information about .openshift directory, consult the documentation:
-
-http://openshift.github.io/documentation/oo_user_guide.html#the-openshift-directory

.openshift/action_hooks/README.md

@@ -1,3 +0,0 @@
-For information about action hooks, consult the documentation:
-
-http://openshift.github.io/documentation/oo_user_guide.html#action-hooks

.openshift/action_hooks/build

@@ -1,22 +0,0 @@
-#!/bin/bash
-cd $OPENSHIFT_REPO_DIR
-
-rm -rf $OPENSHIFT_REPO_DIR/node
-rm -rf $OPENSHIFT_REPO_DIR/node_modules
-rm -rf $OPENSHIFT_TMP_DIR/npm
-rm -rf $OPENSHIFT_TMP_DIR/npmrc
-rm -rf $OPENSHIFT_TMP_DIR/m2
-rm -rf $OPENSHIFT_TMP_DIR/local
-
-export NPM_CONFIG_PREFIX="$OPENSHIFT_TMP_DIR/npm"
-export NPM_CONFIG_USERCONFIG="$OPENSHIFT_TMP_DIR/npmrc"
-export NPM_CONFIG_CACHE="$OPENSHIFT_TMP_DIR/npm/cache" 
-export MAVEN_OPTS="-Dmaven.repo.local=$OPENSHIFT_TMP_DIR/m2" 
-export HOME="$OPENSHIFT_TMP_DIR/local" 
-
-export NPM_CONFIG_ARCH="x64"
-
-npm install npm
-export PATH="$OPENSHIFT_REPO_DIR/node_modules/.bin:$PATH"
-
-mvn clean package -DskipTests -Dos.arch=x64

.openshift/action_hooks/deploy

@@ -1,9 +0,0 @@
-#!/bin/bash
-cd $OPENSHIFT_REPO_DIR
-sed -i 's/@OPENSHIFT_DIY_IP@/'"$OPENSHIFT_DIY_IP"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_DIY_PORT@/'"$OPENSHIFT_DIY_PORT"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_APP_DNS@/'"$OPENSHIFT_APP_DNS"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_APP_NAME@/'"$OPENSHIFT_APP_NAME"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_MYSQL_DB_HOST@/'"$OPENSHIFT_MYSQL_DB_HOST"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_MYSQL_DB_USERNAME@/'"$OPENSHIFT_MYSQL_DB_USERNAME"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_MYSQL_DB_PASSWORD@/'"$OPENSHIFT_MYSQL_DB_PASSWORD"'/g' .openshift/config.mysql.yml

.openshift/action_hooks/start

@@ -1,3 +0,0 @@
-#!/bin/bash
-cd $OPENSHIFT_REPO_DIR
-nohup java -jar target/commafeed.jar server .openshift/config.mysql.yml > ${OPENSHIFT_DIY_LOG_DIR}/commafeed.log 2>&1 &

.openshift/action_hooks/stop

@@ -1,8 +0,0 @@
-#!/bin/bash
-source $OPENSHIFT_CARTRIDGE_SDK_BASH
-if [ -z "$(ps -ef | grep commafeed.jar | grep -v grep)" ]
-then
-    client_result "Application is already stopped"
-else
-    kill `ps -ef | grep commafeed.jar | grep -v grep | awk '{ print $2 }'` > /dev/null 2>&1
-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.md

@@ -1,3 +0,0 @@
-For information about markers, consult the documentation:
-
-http://openshift.github.io/documentation/oo_user_guide.html#markers

.openshift/settings.xml

@@ -1,3 +0,0 @@
-<settings>
-    <localRepository>$OPENSHIFT_DATA_DIR</localRepository>
-</settings>

.travis.yml

@@ -1,5 +0,0 @@
-language: java
-jdk:
-  - openjdk7
-  - oraclejdk7
-  - oraclejdk8

CHANGELOG

@@ -1,26 +0,0 @@
-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  

CHANGELOG.md

@@ -0,0 +1,141 @@
+# Changelog
+
+## [3.3.0]
+
+- there are now database changes, rolling back to 2.x will no longer be possible
+- restore support for user custom CSS rules
+- add support for user custom JS code that will be executed on page load
+
+
+## [3.2.0]
+
+- restore the welcome page
+- only apply hover effect for unread entries (same as commafeed v2)
+- move notifications at the bottom of the screen
+- always use https for sharing urls
+- add support for redis ACLs
+- transition to google analytics v4
+
+## [3.1.0]
+
+- add an even more compact layout
+- restore hover effect from commafeed 2.x
+- view mode (compact, expanded, ...) is now stored on the device so you can have a different view mode on desktop and
+  mobile
+- fix for the "Illegal attempt to associate a collection with two open sessions." error
+- feed fetching workflow is now orchestrated with rxjava, removing a lot of code
+
+## [3.0.1]
+
+- allow env variable substitution in config.yml
+    - e.g. having a custom config.yml file with `app.session.path=${SOME_ENV_VAR}` will substitute `SOME_ENV_VAR` with
+      its value
+- allow env variable prefixed with `CF_` to override config.yml properties
+    - e.g. setting `CF_APP_ALLOWREGISTRATIONS=true` will set `app.allowRegistrations` to `true`
+
+## [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
+- Docker images are now automatically built and available at https://hub.docker.com/r/athou/commafeed
+
+## [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
+
+## [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
+
+## [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
+
+## [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
+
+## [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
+
+## [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'
+
+## [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
+
+## [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
+
+## [2.0.1]
+
+- the redis pool no longer throws an exception when it is unable to aquire a new connection
+
+## [2.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  

Dockerfile

@@ -0,0 +1,12 @@
+FROM eclipse-temurin:17-jre
+
+EXPOSE 8082
+
+RUN mkdir -p /commafeed/data
+VOLUME /commafeed/data
+ENV CF_SESSION_PATH=/commafeed/data/sessions
+
+COPY commafeed-server/config.yml.example config.yml
+COPY commafeed-server/target/commafeed.jar .
+
+CMD ["java", "-Djava.net.preferIPv4Stack=true", "-jar", "commafeed.jar", "server", "config.yml"]

README.md

@@ -1,115 +1,99 @@
-CommaFeed [![Build Status](https://travis-ci.org/Athou/commafeed.svg?branch=master)](https://travis-ci.org/Athou/commafeed)
-=========
-Sources for [CommaFeed.com](http://www.commafeed.com/).
+# CommaFeed
 
-Google Reader inspired self-hosted RSS reader, based on Dropwizard and AngularJS.
+Google Reader inspired self-hosted RSS reader, based on Dropwizard and React/TypeScript.
 
-Related open-source projects
-----------------------------
+![preview](https://user-images.githubusercontent.com/1256795/184886828-1973f148-58a9-4c6d-9587-ee5e5d3cc2cb.png)
 
-Android apps: [News+ extension](https://github.com/Athou/commafeed-newsplus) - [Android app](https://github.com/doomrobo/CommaFeed-Android-Reader)
+## Features
 
-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)
+- 4 different layouts
+- Dark theme
+- Fully responsive
+- Keyboard shortcuts for almost everything
+- Support for right-to-left feeds
+- Translated in 25+ languages
+- Supports thousands of users and millions of feeds
+- OPML import/export
+- REST API
 
-Deployment on your own server
------------------------------
+## Related open-source projects
 
-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).
+Browser extensions:
 
-For storage, you can either use an embedded H2 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.
+- [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)
 
-To install maven and openjdk on Ubuntu, issue the following commands
+## Deployment on your own server
 
-    sudo apt-get install build-essential openjdk-7-jdk maven
-    # Make sure java7 is the selected java version
-    sudo update-alternatives --config java
-    sudo update-alternatives --config javac
-    
-    
-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.
-    
-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)
+### Docker
+
+Docker images are built automatically and are available at https://hub.docker.com/r/athou/commafeed
+
+### Download precompiled package
+
+    mkdir commafeed && cd commafeed
+    wget https://github.com/Athou/commafeed/releases/latest/download/commafeed.jar
+    wget https://github.com/Athou/commafeed/releases/latest/download/config.yml.example -O config.yml
+    java -Djava.net.preferIPv4Stack=true -jar commafeed.jar server config.yml
+
+The server will listen on http://localhost:8082. The default
+user is `admin` and the default password is `admin`.
+
+### Build from sources
 
     git clone https://github.com/Athou/commafeed.git
     cd commafeed
-    
-Now build the application
+    ./mvnw clean package
+    cp commafeed-server/config.yml.example config.yml
+    java -Djava.net.preferIPv4Stack=true -jar commafeed-server/target/commafeed.jar server config.yml
 
-    mvn clean package
-    
-Copy `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`.
+The server will listen on http://localhost:8082. The default
+user is `admin` and the default password is `admin`.
 
-	java -jar target/commafeed.jar server config.yml
+## Translation
 
-You can use a proxy http server such as nginx or apache.
+Files for internationalization are
+located [here](https://github.com/Athou/commafeed/tree/master/commafeed-client/src/locales).
 
-Deployment on OpenShift
------------------------------
+To add a new language:
 
- [OpenShift](https://openshift.redhat.com) is Red Hat's Platform-as-a-Service (PaaS) that allows developers to quickly develop, host, and scale applications in a cloud environment. CommaFeed runs perfectly on OpenShift and can even be used in the free tier. Follow the [Getting Started](https://developers.openshift.com/en/getting-started-overview.html) guide and after you sign up and install the Command Line Tools (RHC), do:
+- 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
 
-	rhc create-app commafeed diy-0.1 mysql-5.5
-	cd commafeed
-	git remote add upstream -m master https://github.com/Athou/commafeed.git
-	git pull -s recursive -X theirs upstream master
-	git push
+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).
 
-Translate CommaFeed into your language
---------------------------------------
+## Local development
 
-Files for internationalization are located [here](https://github.com/Athou/commafeed/tree/master/src/main/app/i18n).
+### Backend
 
-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 `src/main/app/js/i18n.js` file to be picked up.
+- Open `commafeed-server` in your preferred Java IDE.
+    - CommaFeed uses Lombok, you need the Lombok plugin for your IDE.
+- Start `CommaFeedApplication.java` in debug mode with `server config.dev.yml` as arguments
 
-Themes
----------------------
+### Frontend
 
-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.
+- Open `commafeed-client` in your preferred JavaScript IDE.
+- run `npm install`
+- run `npm run dev`
 
-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`).
+The frontend server is now running at http://localhost:8082 and is proxying REST requests to the backend running on
+port 8083
 
-See [_test.scss](https://github.com/Athou/commafeed/blob/master/src/main/webapp/sass/themes/_test.scss) for an example.
+## Copyright and license
 
-
-Local development
------------------
-
-Steps to configuring a development environment for CommaFeed may include, but may not be limited to:
-
-1. `git clone https://github.com/Athou/CommaFeed` into some folder to get the project files.
-2. Install Eclipse Luna (or latest) from http://www.eclipse.org/downloads/packages/eclipse-ide-java-developers/lunasr1 or your repo if available.
-3. In Eclipse, Window → Preferences → Maven → Annotation Processing. Check "Automatically configure JDT APT"
-    * You may have to install the m2e-apt connector to have "Annotation Processing" as an option. Do so from Window → Preferences → Maven → Discovery → Open Catalog → type "m2e-apt" in the search box
-        * If you have installed Eclipse EE instead of Luna, you may have trouble installing m2e-apt
-4. Install Lombok into Eclipse from http://projectlombok.org/download.html
-    * You may have to run `java -jar lombok.jar` as an administrator if your eclipse installation is not in your home folder 
-5. In Eclipse, File → Import → Maven → Existing Maven Projects. Navigate to where you cloned the CommaFeed files into, and select that as the root directory. Click Finish.
-    * You may notice some errors along the lines of "Plugin execution not covered by lifecycle configuration". These are inconsequential.
-6. Find the file "CommaFeedApplication.java" under the navigation pane. 
-7. Right click it to bring up the context menu → Debug as... → Debug Configurations
-8. Type `server config.dev.yml` under "Program arguments" in the "Arguments" tab for the Java Application setting "CommaFeedApplication"
-9. Apply and hit "Debug"
-10. The debugger is now working. To connect to it, open a terminal (or command prompt) and navigate to the directory where you cloned the CommaFeed files.
-11. Issue the command `gulp dev` on Unix based systems or `gulp.cmd dev` in Windows.
-12. The development server is now running at http://localhost:8082 and is proxying REST requests to dropwizard on port 8083.
-13. Connect to the server from your browser; you should have functional breakpoints and watches on assets.
-14. When you're done developing, create a fork at the top of https://github.com/Athou/CommaFeed page and commit your changes to it.
-15. If you'd like to contribute to CommaFeed, create a pull request from your repository to https://github.com/Athou/CommaFeed when your changes are ready. There's a button to do so at the top of https://github.com/Athou/CommaFeed.
-
-Copyright and license
----------------------
-
-Copyright 2013-2014 CommaFeed.
+Copyright 2013-2023 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
+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,

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 !

bower.json

@@ -1,33 +0,0 @@
-{
-  "name": "commafeed",
-  "version": "2.0.0",
-  "dependencies": {
-    "jquery": "1.11.0",
-    "jquery-ui": "1.10.3",
-    "jquery-mousewheel": "3.1.12",
-    "lodash": "2.4.1",
-    "bootstrap": "3.1.1",
-    "font-awesome": "3.2.1",
-    "angular": "1.2.16",
-    "angular-resource": "1.2.16",
-    "angular-route": "1.2.16",
-    "angular-sanitize": "1.2.16",
-    "angular-touch": "1.2.16",
-    "angular-animate": "1.2.16",
-    "angular-ui-router": "0.2.8",
-    "angular-ui-utils": "0.1.0",
-    "angular-ui-select2": "0.0.5",
-    "angular-bootstrap": "0.2.0",
-    "angular-loading-bar": "0.5.0",
-    "angular-translate": "2.2.0",
-    "angular-translate-loader-static-files": "2.2.0",
-    "ngInfiniteScroll": "1.0.0",
-    "ng-grid": "2.0.6",
-    "mousetrap": "1.4.6",
-    "momentjs": "2.6.0",
-    "device.js": "matthewhudson/device.js#2ae5c775e35ccc837589e5af34e292c54936778c",
-    "readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c",
-    "zocial": "samcollins/css-social-buttons#1f59ecacde475e563fb6771667597493ec4eecb6",
-	"swagger-ui": "2.0.21"
-  }
-}

commafeed-client/.eslintignore

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

commafeed-client/.eslintrc

@@ -0,0 +1,85 @@
+{
+    "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",
+                    "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,52 @@
+{
+    "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"
+    }
+}

commafeed-client/.prettierrc

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

commafeed-client/index.html

@@ -0,0 +1,16 @@
+<!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" />
+  <link rel="stylesheet" href="custom_css.css" />
+  <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>
+<script src="custom_js.js"></script>
+</body>
+</html>

commafeed-client/package.json

@@ -0,0 +1,84 @@
+{
+  "name": "commafeed-client",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite --host",
+    "dev:typescript": "tsc --watch",
+    "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.11.0",
+    "@fontsource/open-sans": "^4.5.14",
+    "@lingui/core": "^4.0.0",
+    "@lingui/macro": "^4.0.0",
+    "@lingui/react": "^4.0.0",
+    "@mantine/core": "^6.0.10",
+    "@mantine/form": "^6.0.10",
+    "@mantine/hooks": "^6.0.10",
+    "@mantine/modals": "^6.0.10",
+    "@mantine/notifications": "^6.0.10",
+    "@mantine/spotlight": "^6.0.10",
+    "@mantine/styles": "^6.0.10",
+    "@reduxjs/toolkit": "^1.9.5",
+    "axios": "^1.4.0",
+    "dayjs": "^1.11.7",
+    "interweave": "^13.1.0",
+    "lodash": "^4.17.21",
+    "mousetrap": "^1.6.5",
+    "react": "^18.2.0",
+    "react-async-hook": "^4.0.0",
+    "react-contexify": "^6.0.0",
+    "react-dom": "^18.2.0",
+    "react-ga4": "^2.1.0",
+    "react-icons": "^4.8.0",
+    "react-infinite-scroller": "^1.2.6",
+    "react-redux": "^8.0.5",
+    "react-router-dom": "^6.11.1",
+    "react-swipeable": "^7.0.0",
+    "swagger-ui-react": "^4.18.3",
+    "tinycon": "^0.6.8",
+    "use-local-storage": "^3.0.0",
+    "websocket-heartbeat-js": "^1.1.2"
+  },
+  "devDependencies": {
+    "@lingui/cli": "^4.0.0",
+    "@lingui/vite-plugin": "^4.0.0",
+    "@types/eslint": "^8.37.0",
+    "@types/lodash": "^4.14.194",
+    "@types/mousetrap": "^1.6.11",
+    "@types/react": "^18.2.6",
+    "@types/react-dom": "^18.2.4",
+    "@types/react-infinite-scroller": "^1.2.3",
+    "@types/swagger-ui-react": "^4.18.0",
+    "@types/tinycon": "^0.6.3",
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
+    "@typescript-eslint/parser": "^5.59.2",
+    "@vitejs/plugin-react": "^4.0.0",
+    "babel-plugin-macros": "^3.1.0",
+    "eslint": "^8.40.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^17.0.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-config-react-app": "^7.0.1",
+    "eslint-plugin-hooks": "^0.4.3",
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.8.8",
+    "rollup-plugin-visualizer": "^5.9.0",
+    "typescript": "^5.0.4",
+    "vite": "^4.3.5",
+    "vite-plugin-eslint": "^1.8.1",
+    "vite-tsconfig-paths": "^4.2.0",
+    "vitest": "^0.31.0",
+    "vitest-mock-extended": "^1.1.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.3.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,162 @@
+import { i18n } from "@lingui/core"
+import { I18nProvider } from "@lingui/react"
+import { ColorScheme, ColorSchemeProvider, MantineProvider } from "@mantine/core"
+import { useColorScheme } from "@mantine/hooks"
+import { ModalsProvider } from "@mantine/modals"
+import { Notifications } 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 { WelcomePage } from "pages/WelcomePage"
+import React, { useEffect } from "react"
+import ReactGA from "react-ga4"
+import { HashRouter, Navigate, Route, Routes, useLocation, useNavigate } from "react-router-dom"
+import Tinycon from "tinycon"
+import useLocalStorage from "use-local-storage"
+
+function Providers(props: { children: React.ReactNode }) {
+    const preferredColorScheme = useColorScheme()
+    const [colorScheme, setColorScheme] = useLocalStorage<ColorScheme>("color-scheme", preferredColorScheme)
+    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>
+                        <Notifications position="bottom-right" zIndex={9999} />
+                        <ErrorBoundary>{props.children}</ErrorBoundary>
+                    </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="welcome" element={<WelcomePage />} />
+            <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 GoogleAnalyticsHandler() {
+    const location = useLocation()
+    const googleAnalyticsCode = useAppSelector(state => state.server.serverInfos?.googleAnalyticsCode)
+
+    useEffect(() => {
+        if (googleAnalyticsCode) ReactGA.initialize(googleAnalyticsCode)
+    }, [googleAnalyticsCode])
+
+    useEffect(() => {
+        ReactGA.send({ hitType: "pageview", page: location.pathname })
+    }, [location])
+
+    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>
+                    <GoogleAnalyticsHandler />
+                    <RedirectHandler />
+                    <AppRoutes />
+                </HashRouter>
+            </>
+        </Providers>
+    )
+}

commafeed-client/src/app/client.ts

@@ -0,0 +1,115 @@
+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 && error.response.data === "Credentials are required to access this resource.") {
+            window.location.hash = "/welcome"
+        }
+        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),
+        refreshAll: () => axiosInstance.get("feed/refreshAll"),
+        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,101 @@
+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) => `https://twitter.com/share?text=${desc}&url=${url}`,
+    },
+    tumblr: {
+        label: "Tumblr",
+        icon: SiTumblr,
+        color: "#375672",
+        url: (url, desc) => `https://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}`,
+    },
+    bitcoinWalletAddress: "1dymfUxqCWpyD7a6rQSqNy4rLVDBsAr5e",
+}

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

@@ -0,0 +1,143 @@
+/* eslint-disable import/first */
+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 { beforeEach, describe, expect, it, vi } from "vitest"
+import { mockReset } from "vitest-mock-extended"
+import { loadEntries, loadMoreEntries, markAllEntries, markEntry } from "./entries"
+
+const mockClient = await vi.hoisted(async () => {
+    const mockModule = await import("vitest-mock-extended")
+    return mockModule.mockDeep<typeof client>()
+})
+vi.mock("app/client", () => ({ client: mockClient }))
+
+describe("entries", () => {
+    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,339 @@
+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(reloadEntries())
+        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,161 @@
+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 } 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 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(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
+    parentName?: 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
+    showRead: boolean
+    scrollMarks: boolean
+    customCss?: string
+    customJs?: 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" | "detailed" | "expanded"

commafeed-client/src/app/utils.ts

@@ -0,0 +1,66 @@
+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)
+}
+
+export const openLinkInBackgroundTab = (url: string) => {
+    // simulate ctrl+click to open tab in background
+    const a = document.createElement("a")
+    a.href = url
+    a.rel = "noreferrer"
+    a.dispatchEvent(
+        new MouseEvent("click", {
+            ctrlKey: true,
+            metaKey: true,
+        })
+    )
+}

commafeed-client/src/components/ActionButtton.tsx

@@ -0,0 +1,34 @@
+import { ActionIcon, Button, useMantineTheme } from "@mantine/core"
+import { ActionIconProps } from "@mantine/core/lib/ActionIcon/ActionIcon"
+import { ButtonProps } from "@mantine/core/lib/Button/Button"
+import { useMediaQuery } from "@mantine/hooks"
+import { forwardRef, MouseEventHandler, ReactNode } from "react"
+
+interface ActionButtonProps {
+    className?: string
+    icon?: ReactNode
+    label?: ReactNode
+    onClick?: MouseEventHandler
+    variant?: ActionIconProps["variant"] & ButtonProps["variant"]
+    showLabelOnMobile?: boolean
+}
+
+/**
+ * Switches between Button with label (desktop) and ActionIcon (mobile)
+ */
+export const ActionButton = forwardRef<HTMLButtonElement, ActionButtonProps>((props: ActionButtonProps, ref) => {
+    const theme = useMantineTheme()
+    const variant = props.variant ?? "subtle"
+    const mobile = !useMediaQuery(`(min-width: ${theme.breakpoints.lg})`)
+    const iconOnly = !props.showLabelOnMobile && (mobile || !props.label)
+    return iconOnly ? (
+        <ActionIcon ref={ref} color={theme.primaryColor} variant={variant} className={props.className} onClick={props.onClick}>
+            {props.icon}
+        </ActionIcon>
+    ) : (
+        <Button ref={ref} variant={variant} 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 { Trans } from "@lingui/macro"
+import { Box, Alert as MantineAlert } 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: React.ReactNode
+    let color: string
+    let icon: React.ReactNode
+
+    const level = props.level ?? "error"
+    switch (level) {
+        case "error":
+            title = <Trans>Error</Trans>
+            color = "red"
+            icon = <TbAlertCircle />
+            break
+        case "warning":
+            title = <Trans>Warning</Trans>
+            color = "orange"
+            icon = <TbAlertTriangle />
+            break
+        case "success":
+            title = <Trans>Success</Trans>
+            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,54 @@
+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
+    placeholderBackgroundColor?: string
+    placeholderIconSize?: number
+    placeholderIconColor?: string
+}
+
+const useStyles = createStyles((theme, props: ImageWithPlaceholderWhileLoadingProps) => ({
+    placeholder: {
+        width: props.placeholderWidth ?? 400,
+        height: props.placeholderHeight ?? 600,
+        maxWidth: "100%",
+        color: props.placeholderIconColor ?? theme.fn.variant({ color: theme.primaryColor, variant: "subtle" }).color,
+        backgroundColor: props.placeholderBackgroundColor ?? (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={props.placeholderIconSize ?? 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,183 @@
+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>
+                        <span>, </span>
+                        <Kbd>
+                            <Trans>Middle click</Trans>
+                        </Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Toggle read status of current entry</Trans>
+                    </td>
+                    <td>
+                        <Kbd>M</Kbd>
+                        <span>, </span>
+                        <Trans>Swipe header to the right</Trans>
+                    </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 entry menu (desktop)</Trans>
+                    </td>
+                    <td>
+                        <Kbd>
+                            <Trans>Right click</Trans>
+                        </Kbd>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <Trans>Show entry menu (mobile)</Trans>
+                    </td>
+                    <td>
+                        <Kbd>
+                            <Trans>Long press</Trans>
+                        </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 { 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={<Trans>Name</Trans>} {...form.getInputProps("name")} required />
+                    <PasswordInput label={<Trans>Password</Trans>} {...form.getInputProps("password")} required={!props.user} />
+                    <TextInput type="email" label={<Trans>E-mail</Trans>} {...form.getInputProps("email")} />
+                    <Checkbox label={<Trans>Admin</Trans>} {...form.getInputProps("admin", { type: "checkbox" })} />
+                    <Checkbox label={<Trans>Enabled</Trans>} {...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,97 @@
+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
+        if (!src) return undefined
+
+        const alt = node.getAttribute("alt") ?? "image"
+        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,273 @@
+import { Trans } 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 { openLinkInBackgroundTab } from "app/utils"
+import { KeyboardShortcutsHelp } from "components/KeyboardShortcutsHelp"
+import { Loader } from "components/Loader"
+import { useMousetrap } from "hooks/useMousetrap"
+import { useViewMode } from "hooks/useViewMode"
+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 } = useViewMode()
+    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
+        openLinkInBackgroundTab(selectedEntry.url)
+    })
+    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: <Trans>Keyboard shortcuts</Trans>,
+            size: "xl",
+            children: <KeyboardShortcutsHelp />,
+        })
+    )
+
+    if (!entries) return <Loader />
+    return (
+        <InfiniteScroll
+            id="entries"
+            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,125 @@
+import { Box, createStyles, Divider, Paper } from "@mantine/core"
+import { MantineNumberSize } from "@mantine/styles"
+import { Constants } from "app/constants"
+import { markEntry } from "app/slices/entries"
+import { useAppDispatch } from "app/store"
+import { Entry, ViewMode } from "app/types"
+import { useViewMode } from "hooks/useViewMode"
+import React from "react"
+import { useSwipeable } from "react-swipeable"
+import { FeedEntryBody } from "./FeedEntryBody"
+import { FeedEntryCompactHeader } from "./FeedEntryCompactHeader"
+import { FeedEntryContextMenu, useFeedEntryContextMenu } from "./FeedEntryContextMenu"
+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 & { viewMode?: ViewMode }) => {
+    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"
+
+    let marginY = 10
+    if (props.viewMode === "title") marginY = 2
+    else if (props.viewMode === "cozy") marginY = 6
+
+    let mobileMarginY = 6
+    if (props.viewMode === "title") mobileMarginY = 2
+    else if (props.viewMode === "cozy") mobileMarginY = 4
+
+    let backgroundHoverColor = backgroundColor
+    if (!props.expanded && !props.entry.read) {
+        backgroundHoverColor = theme.colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
+    }
+
+    const styles = {
+        paper: {
+            backgroundColor,
+            marginTop: marginY,
+            marginBottom: marginY,
+            [theme.fn.smallerThan(Constants.layout.mobileBreakpoint)]: {
+                marginTop: mobileMarginY,
+                marginBottom: mobileMarginY,
+            },
+            "@media (hover: hover)": {
+                "&:hover": {
+                    backgroundColor: backgroundHoverColor,
+                },
+            },
+        },
+        headerLink: {
+            color: "inherit",
+            textDecoration: "none",
+        },
+        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 { viewMode } = useViewMode()
+    const { classes } = useStyles({ ...props, viewMode })
+
+    const dispatch = useAppDispatch()
+
+    const swipeHandlers = useSwipeable({
+        onSwipedRight: () => dispatch(markEntry({ entry: props.entry, read: !props.entry.read })),
+    })
+
+    const { onContextMenu } = useFeedEntryContextMenu(props.entry)
+
+    let paddingX: MantineNumberSize = "xs"
+    if (viewMode === "title" || viewMode === "cozy") paddingX = 6
+
+    let paddingY: MantineNumberSize = "xs"
+    if (viewMode === "title") paddingY = 4
+    else if (viewMode === "cozy") paddingY = 8
+
+    let borderRadius: MantineNumberSize = "sm"
+    if (viewMode === "title") borderRadius = 0
+    else if (viewMode === "cozy") borderRadius = "xs"
+
+    const compactHeader = !props.expanded && (viewMode === "title" || viewMode === "cozy")
+    return (
+        <Paper withBorder radius={borderRadius} className={classes.paper}>
+            <a
+                className={classes.headerLink}
+                href={props.entry.url}
+                target="_blank"
+                rel="noreferrer"
+                onClick={props.onHeaderClick}
+                onAuxClick={props.onHeaderClick}
+                onContextMenu={onContextMenu}
+            >
+                <Box px={paddingX} py={paddingY} {...swipeHandlers}>
+                    {compactHeader && <FeedEntryCompactHeader entry={props.entry} />}
+                    {!compactHeader && <FeedEntryHeader entry={props.entry} expanded={props.expanded} />}
+                </Box>
+            </a>
+            {props.expanded && (
+                <Box px={paddingX} pb={paddingY}>
+                    <Box className={classes.body} sx={{ direction: props.entry.rtl ? "rtl" : "ltr" }}>
+                        <FeedEntryBody entry={props.entry} />
+                    </Box>
+                    <Divider variant="dashed" my={paddingY} />
+                    <FeedEntryFooter entry={props.entry} />
+                </Box>
+            )}
+
+            <FeedEntryContextMenu entry={props.entry} />
+        </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.enclosureType && 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,58 @@
+import { Box, createStyles, Text } from "@mantine/core"
+import { Entry } from "app/types"
+import { RelativeDate } from "components/RelativeDate"
+import { OnDesktop } from "components/responsive/OnDesktop"
+import { FeedEntryTitle } from "./FeedEntryTitle"
+import { FeedFavicon } from "./FeedFavicon"
+
+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>
+                <FeedFavicon url={props.entry.iconUrl} />
+            </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/FeedEntryContextMenu.tsx

@@ -0,0 +1,128 @@
+import { Trans } from "@lingui/macro"
+import { createStyles, Group } from "@mantine/core"
+import { Constants } from "app/constants"
+import { markEntriesUpToEntry, markEntry, starEntry } from "app/slices/entries"
+import { redirectToFeed } from "app/slices/redirect"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { Entry } from "app/types"
+import { openLinkInBackgroundTab } from "app/utils"
+import { throttle, truncate } from "lodash"
+import { useEffect } from "react"
+import { Item, Menu, Separator, useContextMenu } from "react-contexify"
+import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbRss, TbStar, TbStarOff } from "react-icons/tb"
+
+interface FeedEntryContextMenuProps {
+    entry: Entry
+}
+
+const iconSize = 16
+const useStyles = createStyles(theme => ({
+    menu: {
+        // apply mantine theme from MenuItem.styles.ts
+        fontSize: theme.fontSizes.sm,
+        "--contexify-item-color": `${theme.colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
+        "--contexify-activeItem-color": `${theme.colorScheme === "dark" ? theme.colors.dark[0] : theme.black} !important`,
+        "--contexify-activeItem-bgColor": `${
+            theme.colorScheme === "dark" ? theme.fn.rgba(theme.colors.dark[3], 0.35) : theme.colors.gray[1]
+        } !important`,
+    },
+}))
+
+const menuId = (entry: Entry) => entry.id
+
+export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
+    const { classes, theme } = useStyles()
+    const sourceType = useAppSelector(state => state.entries.source.type)
+    const dispatch = useAppDispatch()
+
+    return (
+        <Menu id={menuId(props.entry)} theme={theme.colorScheme} animation={false} className={classes.menu}>
+            <Item
+                onClick={() => {
+                    window.open(props.entry.url, "_blank", "noreferrer")
+                    dispatch(markEntry({ entry: props.entry, read: true }))
+                }}
+            >
+                <Group>
+                    <TbExternalLink size={iconSize} />
+                    <Trans>Open link in new tab</Trans>
+                </Group>
+            </Item>
+            <Item
+                onClick={() => {
+                    openLinkInBackgroundTab(props.entry.url)
+                    dispatch(markEntry({ entry: props.entry, read: true }))
+                }}
+            >
+                <Group>
+                    <TbExternalLink size={iconSize} />
+                    <Trans>Open link in new background tab</Trans>
+                </Group>
+            </Item>
+
+            <Separator />
+
+            <Item onClick={() => dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}>
+                <Group>
+                    {props.entry.starred ? <TbStarOff size={iconSize} /> : <TbStar size={iconSize} />}
+                    {props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
+                </Group>
+            </Item>
+            <Item onClick={() => dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}>
+                <Group>
+                    {props.entry.read ? <TbEyeOff size={iconSize} /> : <TbEyeCheck size={iconSize} />}
+                    {props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
+                </Group>
+            </Item>
+            <Item onClick={() => dispatch(markEntriesUpToEntry(props.entry))}>
+                <Group>
+                    <TbArrowBarToDown size={iconSize} />
+                    <Trans>Mark as read up to here</Trans>
+                </Group>
+            </Item>
+
+            {sourceType === "category" && (
+                <>
+                    <Separator />
+
+                    <Item
+                        onClick={() => {
+                            dispatch(redirectToFeed(props.entry.feedId))
+                        }}
+                    >
+                        <Group>
+                            <TbRss size={iconSize} />
+                            <Trans>Go to {truncate(props.entry.feedName)}</Trans>
+                        </Group>
+                    </Item>
+                </>
+            )}
+        </Menu>
+    )
+}
+
+export function useFeedEntryContextMenu(entry: Entry) {
+    const contextMenu = useContextMenu({
+        id: menuId(entry),
+    })
+
+    const onContextMenu = (event: React.MouseEvent) => {
+        event.preventDefault()
+        contextMenu.show({
+            event,
+        })
+    }
+
+    // close context menu on scroll
+    useEffect(() => {
+        const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
+
+        const listener = () => contextMenu.hideAll()
+        const throttledListener = throttle(listener, 100)
+
+        scrollArea?.addEventListener("scroll", throttledListener)
+        return () => scrollArea?.removeEventListener("scroll", throttledListener)
+    }, [contextMenu])
+
+    return { onContextMenu }
+}

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

@@ -0,0 +1,108 @@
+import { t, Trans } 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 { throttle } from "lodash"
+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})`)
+    const dispatch = useAppDispatch()
+
+    const showSharingButtons = sharingSettings && Object.values(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)
+        const throttledListener = throttle(listener, 100)
+
+        scrollArea?.addEventListener("scroll", throttledListener)
+        return () => scrollArea?.removeEventListener("scroll", throttledListener)
+    }, [])
+
+    return (
+        <Group position="apart">
+            <ButtonToolbar>
+                {props.entry.markable && (
+                    <ActionButton
+                        icon={props.entry.read ? <TbEyeOff size={18} /> : <TbEyeCheck size={18} />}
+                        label={props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
+                        onClick={readStatusButtonClicked}
+                    />
+                )}
+                <ActionButton
+                    icon={props.entry.starred ? <TbStarOff size={18} /> : <TbStar size={18} />}
+                    label={props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
+                    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={<Trans>Share</Trans>} />
+                        </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} disabled={props.entry.tags.length === 0} inline size={16}>
+                                <ActionButton icon={<TbTag size={18} />} label={<Trans>Tags</Trans>} />
+                            </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={<Trans>Open link</Trans>} />
+                </a>
+            </ButtonToolbar>
+
+            <ActionButton
+                icon={<TbArrowBarToDown size={18} />}
+                label={<Trans>Mark as read up to here</Trans>}
+                onClick={() => dispatch(markEntriesUpToEntry(props.entry))}
+            />
+        </Group>
+    )
+}

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

@@ -0,0 +1,60 @@
+import { Box, createStyles, Text } from "@mantine/core"
+import { Entry } from "app/types"
+import { RelativeDate } from "components/RelativeDate"
+import { FeedEntryTitle } from "./FeedEntryTitle"
+import { FeedFavicon } from "./FeedFavicon"
+
+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}>
+                    <FeedFavicon url={props.entry.iconUrl} />
+                </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/FeedFavicon.tsx

@@ -0,0 +1,22 @@
+import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
+
+export interface FeedFaviconProps {
+    url: string
+    size?: number
+}
+
+export function FeedFavicon({ url, size = 18 }: FeedFaviconProps) {
+    return (
+        <ImageWithPlaceholderWhileLoading
+            src={url}
+            alt="feed favicon"
+            width={size}
+            height={size}
+            placeholderWidth={size}
+            placeholderHeight={size}
+            placeholderBackgroundColor="inherit"
+            placeholderIconSize={size}
+            placeholderIconColor="inherit"
+        />
+    )
+}

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={<Trans>Category</Trans>} placeholder={t`Category`} {...form.getInputProps("name")} required />
+                    <CategorySelect label={<Trans>Parent</Trans>} {...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,31 @@
+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
+    withoutCategoryIds?: string[]
+}
+
+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)
+        .filter(c => !props.withoutCategoryIds || !props.withoutCategoryIds.includes(c.id))
+        .sort((c1, c2) => c1.name.localeCompare(c2.name))
+        .map(c => ({
+            label: c.parentName ? t`${c.name} (in ${c.parentName})` : 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,63 @@
+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={<Trans>OPML file</Trans>}
+                        placeholder={t`OPML file`}
+                        description={
+                            <Trans>
+                                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.
+                            </Trans>
+                        }
+                        {...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,126 @@
+import { 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={<Trans>Analyze feed</Trans>}
+                        description={<Trans>Check that the feed is working</Trans>}
+                        allowStepSelect={activeStep === 1}
+                    >
+                        <TextInput
+                            label={<Trans>Feed URL</Trans>}
+                            placeholder="http://www.mysite.com/rss"
+                            description={
+                                <Trans>
+                                    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.
+                                </Trans>
+                            }
+                            required
+                            autoFocus
+                            {...step0Form.getInputProps("url")}
+                        />
+                    </Stepper.Step>
+                    <Stepper.Step
+                        label={<Trans>Subscribe</Trans>}
+                        description={<Trans>Subscribe to the feed</Trans>}
+                        allowStepSelect={false}
+                    >
+                        <Stack>
+                            <TextInput label={<Trans>Feed URL</Trans>} {...step1Form.getInputProps("url")} disabled />
+                            <TextInput label={<Trans>Feed name</Trans>} {...step1Form.getInputProps("title")} required autoFocus />
+                            <CategorySelect label={<Trans>Category</Trans>} {...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,93 @@
+import { t, Trans } 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={<Trans>Refresh</Trans>}
+                    onClick={() => dispatch(reloadEntries())}
+                />
+                <MarkAllAsReadButton iconSize={iconSize} />
+
+                <HeaderDivider />
+
+                <ActionButton
+                    icon={settings.readingMode === "all" ? <TbEye size={iconSize} /> : <TbEyeOff size={iconSize} />}
+                    label={settings.readingMode === "all" ? <Trans>All</Trans> : <Trans>Unread</Trans>}
+                    onClick={() => dispatch(changeReadingMode(settings.readingMode === "all" ? "unread" : "all"))}
+                />
+                <ActionButton
+                    icon={settings.readingOrder === "asc" ? <TbArrowUp size={iconSize} /> : <TbArrowDown size={iconSize} />}
+                    label={settings.readingOrder === "asc" ? <Trans>Asc</Trans> : <Trans>Desc</Trans>}
+                    onClick={() => dispatch(changeReadingOrder(settings.readingOrder === "asc" ? "desc" : "asc"))}
+                />
+
+                <Popover>
+                    <Popover.Target>
+                        <Indicator disabled={!searchFromStore}>
+                            <ActionButton icon={<TbSearch size={iconSize} />} label={<Trans>Search</Trans>} />
+                        </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 { 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={<Trans>Mark all entries as read</Trans>}>
+                <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={<Trans>Mark all as read</Trans>}
+                onClick={() => {
+                    setThreshold(0)
+                    setOpened(true)
+                }}
+            />
+        </>
+    )
+}

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

@@ -0,0 +1,189 @@
+import { Trans } from "@lingui/macro"
+import { Box, Divider, Group, Menu, SegmentedControl, SegmentedControlItem, useMantineColorScheme } from "@mantine/core"
+import { showNotification } from "@mantine/notifications"
+import { client } from "app/client"
+import { redirectToAbout, redirectToAdminUsers, redirectToMetrics, redirectToSettings } from "app/slices/redirect"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { ViewMode } from "app/types"
+import { useViewMode } from "hooks/useViewMode"
+import { useState } from "react"
+import {
+    TbChartLine,
+    TbHelp,
+    TbLayoutList,
+    TbList,
+    TbListDetails,
+    TbMoon,
+    TbNotes,
+    TbPower,
+    TbSettings,
+    TbSun,
+    TbUsers,
+    TbWorldDownload,
+} 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: "detailed",
+        label: (
+            <Group>
+                <TbListDetails size={iconSize} />
+                <Box ml={6}>
+                    <Trans>Detailed</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, setViewMode } = useViewMode()
+    const profile = useAppSelector(state => state.user.profile)
+    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>
+                {profile && <Menu.Label>{profile.name}</Menu.Label>}
+                <Menu.Item
+                    icon={<TbSettings size={iconSize} />}
+                    onClick={() => {
+                        dispatch(redirectToSettings())
+                        setOpened(false)
+                    }}
+                >
+                    <Trans>Settings</Trans>
+                </Menu.Item>
+                <Menu.Item
+                    icon={<TbWorldDownload size={iconSize} />}
+                    onClick={() =>
+                        client.feed.refreshAll().then(() => {
+                            showNotification({
+                                message: <Trans>Your feeds have been queued for refresh.</Trans>,
+                                color: "green",
+                                autoClose: 1000,
+                            })
+                            setOpened(false)
+                        })
+                    }
+                >
+                    <Trans>Fetch all my feeds now</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 => setViewMode(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/CustomCodeSettings.tsx

@@ -0,0 +1,96 @@
+import { Trans } from "@lingui/macro"
+import { Box, Button, Group, Stack, Textarea } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { redirectToSelectedSource } from "app/slices/redirect"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { Alert } from "components/Alert"
+import { useEffect } from "react"
+import { useAsyncCallback } from "react-async-hook"
+import { TbDeviceFloppy } from "react-icons/tb"
+
+interface FormData {
+    customCss: string
+    customJs: string
+}
+
+export function CustomCodeSettings() {
+    const settings = useAppSelector(state => state.user.settings)
+    const dispatch = useAppDispatch()
+
+    const form = useForm<FormData>()
+    const { setValues } = form
+
+    const saveCustomCode = useAsyncCallback(
+        async (d: FormData) => {
+            if (!settings) return
+            await client.user.saveSettings({
+                ...settings,
+                customCss: d.customCss,
+                customJs: d.customJs,
+            })
+        },
+        {
+            onSuccess: () => {
+                window.location.reload()
+            },
+        }
+    )
+
+    useEffect(() => {
+        if (!settings) return
+        setValues({
+            customCss: settings.customCss,
+            customJs: settings.customJs,
+        })
+    }, [setValues, settings])
+
+    return (
+        <>
+            {saveCustomCode.error && (
+                <Box mb="md">
+                    <Alert messages={errorToStrings(saveCustomCode.error)} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(saveCustomCode.execute)}>
+                <Stack>
+                    <Textarea
+                        autosize
+                        minRows={4}
+                        maxRows={15}
+                        {...form.getInputProps("customCss")}
+                        description={<Trans>Custom CSS rules that will be applied</Trans>}
+                        styles={{
+                            input: {
+                                fontFamily: "monospace",
+                            },
+                        }}
+                    />
+
+                    <Textarea
+                        autosize
+                        minRows={4}
+                        maxRows={15}
+                        {...form.getInputProps("customJs")}
+                        description={<Trans>Custom JS code that will be executed on page load</Trans>}
+                        styles={{
+                            input: {
+                                fontFamily: "monospace",
+                            },
+                        }}
+                    />
+
+                    <Group>
+                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftIcon={<TbDeviceFloppy size={16} />} loading={saveCustomCode.loading}>
+                            <Trans>Save</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}

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

@@ -0,0 +1,61 @@
+import { Trans } 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={<Trans>Language</Trans>}
+                value={language}
+                data={locales.map(l => ({
+                    value: l.key,
+                    label: l.label,
+                }))}
+                onChange={s => s && dispatch(changeLanguage(s))}
+            />
+
+            <Switch
+                label={<Trans>Scroll smoothly when navigating between entries</Trans>}
+                checked={scrollSpeed ? scrollSpeed > 0 : false}
+                onChange={e => dispatch(changeScrollSpeed(e.currentTarget.checked))}
+            />
+
+            <Switch
+                label={<Trans>Show feeds and categories with no unread entries</Trans>}
+                checked={showRead}
+                onChange={e => dispatch(changeShowRead(e.currentTarget.checked))}
+            />
+
+            <Switch
+                label={<Trans>In expanded view, scrolling through entries mark them as read</Trans>}
+                checked={scrollMarks}
+                onChange={e => dispatch(changeScrollMarks(e.currentTarget.checked))}
+            />
+
+            <Divider label={<Trans>Sharing sites</Trans>} 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>
+    )
+}