chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].1
 - @standardnotes/[email protected]

packages/components/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.7.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-11)
+
+### Bug Fixes
+
+* focus mode & dynamic panels on small screens ([#1246](https://github.com/standardnotes/app/issues/1246)) ([9d230d4](https://github.com/standardnotes/app/commit/9d230d4b81c92b826ef9e8b89cd7192f5b4c8b13))
+
 ## [2.7.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
 
 ### Bug Fixes

packages/components/dist/assets/org.standardnotes.theme-dynamic/dist/dist.css

@@ -1,23 +1,22 @@
-#navigation {
-  flex: none !important;
-  width: 10px !important;
-  transition: width 0.25s;
-}
-
-#navigation:hover {
-  flex: initial;
-  width: 200px !important;
-  transition: width 0.25s;
-}
-
-#items-column {
-  flex: none !important;
-  width: 270px !important;
-  transition: width 0.25s;
-}
-
-#items-column:hover {
-  flex: initial;
-  width: 380px !important;
-  transition: width 0.25s;
+@media screen and (min-width: 768px) {
+  #navigation {
+    flex: none !important;
+    width: 10px !important;
+    transition: width 0.25s;
+  }
+  #navigation:hover {
+    flex: initial;
+    width: 200px !important;
+    transition: width 0.25s;
+  }
+  #items-column {
+    flex: none !important;
+    width: 270px !important;
+    transition: width 0.25s;
+  }
+  #items-column:hover {
+    flex: initial;
+    width: 380px !important;
+    transition: width 0.25s;
+  }
 }

packages/components/dist/zips/checksums.json

@@ -30,9 +30,9 @@
     "binary": "5a00749f8930a41541589f704fff2b6e1d84224305750c7880e941085a8fef62"
   },
   "org.standardnotes.theme-dynamic": {
-    "version": "1.1.0",
-    "base64": "1214db7ca8962d7f56937c16463ca3131f2073a718f993e47c1dfcf233eefab8",
-    "binary": "6da8d19f03e724b058950eb6869e4fe9c6ba5e57d995e268aecc823a235af43d"
+    "version": "1.1.1",
+    "base64": "74f26661963f857a0dfa2d37d22c371c231bdf468c4cc8662b5bb25337a9b262",
+    "binary": "8353de29ec88472a87fd24349844569e9e468893de40c1fafbb0a237fd7410dd"
   },
   "org.standardnotes.code-editor": {
     "version": "1.3.17",

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/components-meta",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "private": true,
   "author": "Standard Notes.",
   "main": "dist",

packages/components/src/Packages/Themes/org.standardnotes.theme-dynamic/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-11)
+
+### Bug Fixes
+
+* focus mode & dynamic panels on small screens ([#1246](https://github.com/standardnotes/app/issues/1246)) ([9d230d4](https://github.com/standardnotes/app/commit/9d230d4b81c92b826ef9e8b89cd7192f5b4c8b13))
+
 # [1.1.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-06)
 
 ### Bug Fixes

packages/components/src/Packages/Themes/org.standardnotes.theme-dynamic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/dynamic-theme",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "dist/dist.css",
   "private": true,
   "sn": {

packages/components/src/Packages/Themes/org.standardnotes.theme-dynamic/src/main.scss

@@ -1,23 +1,25 @@
-#navigation {
-  flex: none !important;
-  width: 10px !important;
-  transition: width 0.25s;
-}
+@media screen and (min-width: 768px) {
+  #navigation {
+    flex: none !important;
+    width: 10px !important;
+    transition: width 0.25s;
+  }
 
-#navigation:hover {
-  flex: initial;
-  width: 200px !important;
-  transition: width 0.25s;
-}
+  #navigation:hover {
+    flex: initial;
+    width: 200px !important;
+    transition: width 0.25s;
+  }
 
-#items-column {
-  flex: none !important;
-  width: 270px !important;
-  transition: width 0.25s;
-}
+  #items-column {
+    flex: none !important;
+    width: 270px !important;
+    transition: width 0.25s;
+  }
 
-#items-column:hover {
-  flex: initial;
-  width: 380px !important;
-  transition: width 0.25s;
+  #items-column:hover {
+    flex: initial;
+    width: 380px !important;
+    transition: width 0.25s;
+  }
 }

packages/desktop/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.23.71](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-11)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.23.70](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-09)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.23.70",
+  "version": "3.23.71",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/docs/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.1.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-11)
+
+### Features
+
+* **docs:** improve docker page ([#1240](https://github.com/standardnotes/app/issues/1240)) ([b025e39](https://github.com/standardnotes/app/commit/b025e394c129a53f41cb5835943901cf40fc92b6))
+
 ## [0.0.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-09)
 
 ### Bug Fixes

packages/docs/docs/self-hosting/docker.md

@@ -17,113 +17,223 @@ hide_title: false
 hide_table_of_contents: false
 ---
 
-## Requirements
+This guide walks you through the process of installing the self-hosted backend of Standard Notes. In this example, we used a server running Ubuntu 20.04, with 2GB RAM and 1 CPU.
 
-These instructions make the following assumptions:
+Due to mounted volumes, we recommend running the setup as a root user. If you wish to run it as a non-root user, please see Docker's [post-installation steps for Linux](https://docs.docker.com/engine/install/linux-postinstall#manage-docker-as-a-non-root-user).
 
-- The machine you will be running the infrastructure on has at least 2GB of memory.
-- You've just finished setting up a Linux server (say, Ubuntu 20.04 64-bit) and have installed [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/) on it.
-- Due to mounted volumes we recommend running the setup as a root user. If you wish to run it as non-root user please remember about the [post-installation steps for Linux](https://docs.docker.com/engine/install/linux-postinstall#manage-docker-as-a-non-root-user).
-- You've configured your security groups to allow for incoming SSH connections from your local IP.
-- You've configured your security groups to allow for incoming TCP connections on port 80 and 443 from at least your local IP.
-- You've configured a domain name (or subdomain) to point to your server's IP address.
+## Prerequisities
 
-## Getting started
+1. Update your `apt` repositories and upgrade any out-of-date packages:
 
-> **Note** If you are a user with an already existing legacy database of the Syncing Server, we've prepared a [Migrating from Legacy guide](./legacy-migration.md).
+    ```shell
+    sudo apt update -y && sudo apt upgrade -y
+    ```
 
-SSH into your server and follow the steps below:
+2. Install Docker Engine:
 
-1. Make sure you are in your home directory and clone the [Standard Notes Standalone Infrastructure](https://github.com/standardnotes/standalone) project:
+    ```shell
+    # Remove any old Docker installations.
+    sudo apt-get remove docker docker-engine docker.io containerd runc
 
-   ```bash
-   $ cd ~
-   $ git clone --single-branch --branch main https://github.com/standardnotes/standalone.git
-   $ cd standalone
-   ```
+    # Install dependencies.
+    sudo apt install git ca-certificates curl gnupg lsb-release -y
 
-1. Initialize default configuration files by typing:
+    # Add Docker's GPG key.
+    sudo mkdir -p /etc/apt/keyrings
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 
-   ```bash
-   $ ./server.sh setup
-   ```
+    # Set the Docker repo.
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 
-1. Customize your configuration
+    # Install Docker Engine.
+    sudo apt update -y
+    sudo apt install docker-ce docker-ce-cli containerd.io docker-compose-plugin -y
+    ```
 
-  There are 5 environment variables that need to be filled in with generated secret keys:
+3. Verify that Docker is installed:
 
-   - `AUTH_JWT_SECRET` in the `.env` file
-   - `JWT_SECRET`, `LEGACY_JWT_SECRET`, `PSEUDO_KEY_PARAMS_KEY`, and `ENCRYPTION_SERVER_KEY` in the `docker/auth.env` file
+    ```shell
+    sudo docker run hello-world
+    ```
 
-  You can generate values for them by using:
+    This should output something like:
 
-  ```bash
-   $ openssl rand -hex 32
-   ```
+    ```plaintext
+    ...
 
-  > **Note** The server must be restarted any time environment variables are changed.
+    Unable to find image 'hello-world:latest' locally
+    latest: Pulling from library/hello-world
+    2db29710123e: Pull complete
+    Digest: sha256:13e367d31ae85359f42d637adf6da428f76d75dc9afeb3c21faea0d976f5c651
+    Status: Downloaded newer image for hello-world:latest
 
-1. (Optional) Customize the port
+    Hello from Docker!
+    This message shows that your installation appears to be working correctly.
 
-  By default the syncing server will run on port 3000. If you have a different service running on that port, you can customize the port on which you want to run the infrastructure on. To do so, edit the `EXPOSED_PORT` variable in the `.env` file.
+    ...
+    ```
 
-2. Simply run:
+4. Verify that Docker Compose is correctly installed:
 
-   ```bash
-   $ ./server.sh start
-   ```
+    ```shell
+    docker compose version
+    ```
 
-   This should load all the microservices that the infrastructure consists of.
+    This should output something like:
 
-  > **Note** The first run might take a few minutes as there are Docker images that need be pulled and built as well as migrations to be run for initializing the database.
+    ```plaintext
+    Docker Compose version v2.6.0
+    ```
 
-3. Wait for the infrastructure to bootstrap
+5. Enable the `ufw` firewall:
 
-   It takes a moment for the infrastructure to bootstrap and all the microservices to start. You can observe the process by typing:
+    ```shell
+    sudo ufw enable
+    ```
 
-   ```bash
-   $ ./server.sh logs
-   ```
+    Enter `y` when prompted.
 
-  > **Note** You can safely escape from logs with CTRL+C
+6. Enable SSH connections:
 
-  > **Note** Microservices depend on each other and start sequentially in our setup. In the logs you will likely observe that one service is waiting for another to start with lines like: "XYZ is unavailable yet - waiting for it to start" where XYZ is the dependent service name. This is expected.
+    ```shell
+    sudo ufw allow ssh
+    ```
 
-   Everything should be up and running once you observe that the `API Gateway` service has started by seeing the following line as one of the last ones in logs:
+    This should output something like:
 
-   ```
-   api-gateway_1 | {"message":"Server started on port 3000","level":"info"}
-   ```
+    ```plaintext
+    Skipping adding existing rule
+    Skipping adding existing rule (v6)
+    ```
 
-   You can also check the state of all services via:
+7. Allow incoming TPC connections on ports `80` and `443`:
 
-   ```bash
-   $ ./server.sh status
-   ```
+    ```shell
+    sudo ufw allow http
+    sudo ufw allow https
+    ```
 
-   All services should be in `Up` state at this stage.
+8. Check the status of your `ufw` settings:
 
-4. Test your access to the server locally:
+    ```shell
+    ufw status verbose
+    ```
 
-   You should be able now to check that the syncing server is running by checking `http://localhost:3000/healthcheck`:
+    This should output something like:
 
-   ```bash
-   $ curl http://localhost:3000/healthcheck
-   OK
-   ```
+    ```plaintext
+    Status: active
+    Logging: on (low)
+    Default: deny (incoming), allow (outgoing), deny (routed)
+    New profiles: skip
 
-   > **Note** If you changed the `EXPOSED_PORT` variable you will have to check `http://localhost:{EXPOSED_PORT}/healthcheck`.
+    To                         Action      From
+    --                         ------      ----
+    22/tcp                     ALLOW IN    Anywhere
+    80/tcp                     ALLOW IN    Anywhere
+    443/tcp                    ALLOW IN    Anywhere
+    22/tcp (v6)                ALLOW IN    Anywhere (v6)
+    80/tcp (v6)                ALLOW IN    Anywhere (v6)
+    443/tcp (v6)               ALLOW IN    Anywhere (v6)
+    ```
 
-5. You're done!
+9. Configure a domain name (or subdomain) to point to your server's IP address. Consult your domain registration provider for how to configure your domain name.
 
-## Securing Your Server
+## Install Standard Notes
 
-In order to start using your new server with the Standard Notes app at https://app.standardnotes.com you will have to configure an HTTPS reverse proxy.
+1. Clone the `standalone` repo:
 
-Unless you already have an HTTP/HTTPS server running that will serve as a reverse proxy to the standalone infrastructure, head over to [Securing HTTP traffic of your Sync server](./https-support.md).
+    ```shell
+    cd ~
+    git clone --single-branch --branch main https://github.com/standardnotes/standalone.git
+    cd standalone
+    ```
+
+1. Initialize default configuration files:
+
+    ```shell
+    ./server.sh setup
+    ```
+
+    This will output something like:
+
+    ```plaintext
+    Initializing default configuration
+    Default configuration files created as .env and docker/*.env files. Feel free to modify values if needed.
+    ```
+
+1. Generate random values for the necessary environment variables:
+
+    ```shell
+    sed -i "s/auth_jwt_secret/$(openssl rand -hex 32)/g" .env
+    sed -i "s/secret/$(openssl rand -hex 32)/g" docker/auth.env
+    sed -i "s/legacy_jwt_secret/$(openssl rand -hex 32)/g" docker/auth.env
+    sed -i "s/secret_key/$(openssl rand -hex 32)/g" docker/auth.env
+    sed -i "s/server_key/$(openssl rand -hex 32)/g" docker/auth.env
+    ```
+
+    **Note:** If you are running `sed` on macOS or BSD, change instances of `sed -i` to `sed -i ''`.
+
+1. (Optional) Restart the server:
+
+    ```shell
+    reboot
+    ```
+
+1. (Optional) By default, the syncing server will run on port `3000`. If you have a different service running on that port, you can customize the port on which you want to run the infrastructure by editing the `EXPOSED_PORT` variable in the `.env` file.
+1. Once the server has finished rebooting, log back into the server and start the Standard Notes server process:
+
+    ```shell
+    cd standalone
+    ./server.sh start
+    ```
+
+    Docker will start outputting lots of information about the containers it is pulling in and installing. This process took about 8 minutes on a Ubuntu 20.04 server with 2GB RAM and 1 CPU.
+
+1. Once Docker has finished installing, the Standard Notes install script will output:
+
+    ```plaintext
+    Infrastructure started. Give it a moment to warm up. If you wish, please run the './server.sh logs' command to see details.
+    ```
+
+1. Check the status of your server:
+
+    ```shell
+    ./server.sh status
+    ```
+
+    This will output something like:
+
+    ```plaintext
+    Services State:
+    NAME                                  COMMAND                  SERVICE                    STATUS              PORTS
+    api-gateway-standalone                "./wait-for.sh auth …"   api-gateway                running             0.0.0.0:3000->3000/tcp, :::3000->3000/tcp
+    auth-standalone                       "./wait-for.sh db 33…"   auth                       running
+    auth-worker-standalone                "./wait-for.sh db 33…"   auth-worker                running
+    cache-standalone                      "docker-entrypoint.s…"   cache                      running             6379/tcp
+    db-standalone                         "docker-entrypoint.s…"   db                         running             3306/tcp
+    files-standalone                      "./wait-for.sh db 33…"   files                      running             0.0.0.0:3125->3000/tcp, :::3125->3000/tcp
+    syncing-server-js-standalone          "./wait-for.sh db 33…"   syncing-server-js          running
+    syncing-server-js-worker-standalone   "./wait-for.sh db 33…"   syncing-server-js-worker   running
+    ```
+
+    Your Standard Notes server is ready once all the services have a `STATUS` of `Up`. This process took about 11 minutes on a Ubuntu 20.04 server with 2GB RAM and 1 CPU.
+
+1. You should be able now to check that the syncing server is running by checking `http://localhost:3000/healthcheck`. You must do this on the server:
+
+    ```bash
+    curl http://localhost:3000/healthcheck
+    OK
+    ```
+
+    If you changed the `EXPOSED_PORT` variable, check `http://localhost:{EXPOSED_PORT}/healthcheck`.
+
+1. You're done!
+
+## Securing your server
+
+To start using your new server with the Standard Notes app at `app.standardnotes.com,` you have to configure an HTTPS reverse proxy. Head over to [Securing HTTP traffic of your Sync server](./https-support.md) for more information on how to set up a reverse proxy.
 
 ## Using your new server
 
-In the account menu, choose `Advanced options` and enter the address of your new server in `Custom sync server`.
-
-Then, register for a new account or log into an existing account and begin using your private new secure Standard Notes server!
+In the account menu, choose `Advanced options` and enter the address of your new server in `Custom sync server`. Then, register for a new account or log in to an existing account and begin using your private new secure Standard Notes server!

packages/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/docs",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/mobile/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.30.26](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-11)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.30.25](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-09)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.30.25",
+  "version": "3.30.26",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0-or-later",

packages/releases/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.92](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-11)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.2.91](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-09)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.2.91",
+  "version": "1.2.92",
   "license": "AGPL-3.0-or-later",
   "main": "dist/releases.json",
   "types": "dist/index.d.ts",

packages/web-server/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.94](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-11)
+
+**Note:** Version bump only for package @standardnotes/web-server
+
 ## [1.2.93](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-09)
 
 **Note:** Version bump only for package @standardnotes/web-server

packages/web-server/Capfile

@@ -1,36 +0,0 @@
-# Load DSL and set up stages
-require "capistrano/setup"
-
-# Include default deployment tasks
-require "capistrano/deploy"
-
-require "capistrano/scm/git"
-install_plugin Capistrano::SCM::Git
-
-require "capistrano/scm/git-with-submodules"
-install_plugin Capistrano::SCM::Git::WithSubmodules
-
-# Include tasks from other gems included in your Gemfile
-#
-# For documentation on these, see for example:
-#
-#   https://github.com/capistrano/rvm
-#   https://github.com/capistrano/rbenv
-#   https://github.com/capistrano/chruby
-#   https://github.com/capistrano/bundler
-#   https://github.com/capistrano/rails
-#   https://github.com/capistrano/passenger
-#
-require 'capistrano/rvm'
-# require 'capistrano/rbenv'
-# require 'capistrano/chruby'
-require 'capistrano/bundler'
-require 'capistrano/rails/assets'
-# require 'capistrano/rails/migrations'
-require 'capistrano/passenger'
-# require 'capistrano/sidekiq'
-# require "whenever/capistrano" # Update crontab on deploy
-
-
-# Load custom tasks from `lib/capistrano/tasks` if you have any defined
-Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }

packages/web-server/Gemfile

@@ -1,53 +1,16 @@
 source 'https://rubygems.org'
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'dotenv-rails'
+gem 'lograge', '~> 0.11.2'
+gem 'newrelic_rpm', '~> 7.0'
+gem 'non-stupid-digest-assets'
+gem 'rack-cors', require: 'rack/cors'
 gem 'rails', '5.1.7'
-
-gem 'sass'
-
-gem "non-stupid-digest-assets"
-
 gem 'secure_headers'
 
-gem 'uglifier'
-
-gem 'rack-cors', :require => 'rack/cors'
-
-gem 'dotenv-rails'
-
-# bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0', group: :doc
-
-# Used for 'respond_to' feature
-gem 'responders', '~> 2.0'
-
-gem 'tzinfo-data'
-
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
-
-  # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '3.5.1'
-
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring'
-
   gem 'puma'
-
-  gem 'haml'
-
-  # Deployment tools
-  gem 'capistrano'
-  gem 'capistrano-bundler'
-  gem 'capistrano-passenger', '>= 0.2.0'
-  gem 'capistrano-rails'
-  gem 'capistrano-rvm'
-  gem 'capistrano-sidekiq'
-  gem 'capistrano-git-with-submodules', '~> 2.0'
+  gem 'spring'
+  gem 'web-console', '3.5.1'
 end
-
-
-gem "lograge", "~> 0.11.2"
-
-gem "newrelic_rpm", "~> 7.0"

packages/web-server/Gemfile.lock

@@ -38,52 +38,21 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    airbrussh (1.4.0)
-      sshkit (>= 1.6.1, != 1.7.0)
     arel (8.0.0)
     bindex (0.8.1)
     builder (3.2.4)
     byebug (11.1.3)
-    capistrano (3.16.0)
-      airbrussh (>= 1.0.0)
-      i18n
-      rake (>= 10.0.0)
-      sshkit (>= 1.9.0)
-    capistrano-bundler (2.0.1)
-      capistrano (~> 3.1)
-    capistrano-git-with-submodules (2.0.4)
-      capistrano (~> 3.7)
-    capistrano-passenger (0.2.1)
-      capistrano (~> 3.0)
-    capistrano-rails (1.6.1)
-      capistrano (~> 3.1)
-      capistrano-bundler (>= 1.1, < 3)
-    capistrano-rvm (0.1.2)
-      capistrano (~> 3.0)
-      sshkit (~> 1.2)
-    capistrano-sidekiq (2.0.0)
-      capistrano (>= 3.9.0)
-      capistrano-bundler
-      sidekiq (>= 6.0)
     concurrent-ruby (1.1.9)
-    connection_pool (2.2.5)
     crass (1.0.6)
     dotenv (2.7.6)
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
       railties (>= 3.2)
     erubi (1.10.0)
-    execjs (2.8.1)
-    ffi (1.15.5)
-    ffi (1.15.5-x64-mingw32)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    haml (5.2.2)
-      temple (>= 0.8.0)
-      tilt
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    json (1.8.6)
     lograge (0.11.2)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -98,9 +67,6 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.7.1)
     minitest (5.15.0)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-ssh (6.1.0)
     newrelic_rpm (7.2.0)
     nio4r (2.5.8)
     nokogiri (1.13.1)
@@ -146,29 +112,9 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    rdoc (4.3.0)
-    redis (4.6.0)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (2.4.1)
-      actionpack (>= 4.2.0, < 6.0)
-      railties (>= 4.2.0, < 6.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sdoc (0.4.2)
-      json (~> 1.7, >= 1.7.7)
-      rdoc (~> 4.0)
     secure_headers (6.3.3)
-    sidekiq (6.4.1)
-      connection_pool (>= 2.2.2)
-      rack (~> 2.0)
-      redis (>= 4.2.0)
     spring (3.1.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
@@ -177,19 +123,10 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.21.2)
-      net-scp (>= 1.1.2)
-      net-ssh (>= 2.8.0)
-    temple (0.8.2)
     thor (1.2.1)
     thread_safe (0.3.6)
-    tilt (2.0.10)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2021.5)
-      tzinfo (>= 1.0.0)
-    uglifier (4.2.0)
-      execjs (>= 0.3.0, < 3)
     web-console (3.5.1)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -207,28 +144,15 @@ PLATFORMS
 
 DEPENDENCIES
   byebug
-  capistrano
-  capistrano-bundler
-  capistrano-git-with-submodules (~> 2.0)
-  capistrano-passenger (>= 0.2.0)
-  capistrano-rails
-  capistrano-rvm
-  capistrano-sidekiq
   dotenv-rails
-  haml
   lograge (~> 0.11.2)
   newrelic_rpm (~> 7.0)
   non-stupid-digest-assets
   puma
   rack-cors
   rails (= 5.1.7)
-  responders (~> 2.0)
-  sass
-  sdoc (~> 0.4.0)
   secure_headers
   spring
-  tzinfo-data
-  uglifier
   web-console (= 3.5.1)
 
 BUNDLED WITH

packages/web-server/Rakefile

@@ -1,5 +1,4 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+# Add your own tasks in files placed in lib/tasks ending in .rakeand they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
 

packages/web-server/config/application.rb

@@ -1,5 +1,4 @@
 require_relative 'boot'
-# require 'rails/all'
 
 require "active_model/railtie"
 require "action_controller/railtie"
@@ -24,10 +23,6 @@ module Web
       end
     end
 
-    # config.action_dispatch.default_headers = {
-    #   'X-Frame-Options' => 'ALLOWALL'
-    # }
-
     SecureHeaders::Configuration.default do |config|
       # Handled by server
       config.x_frame_options = SecureHeaders::OPT_OUT
@@ -59,8 +54,6 @@ module Web
       }
     end
 
-    # config.middleware.use Rack::Deflater
-
     config.middleware.insert_before(Rack::Sendfile, Rack::Deflater)
 
     # Disable auto creation of additional resources with "rails generate"
@@ -74,18 +67,5 @@ module Web
     end
 
     config.action_mailer.default_url_options = { host: ENV['APP_HOST'] }
-
-    # SMTP settings
-    config.action_mailer.delivery_method = :smtp
-    config.action_mailer.smtp_settings = {
-      :address => ENV['SMTP_HOST'],
-      :port => ENV['SMTP_PORT'],
-      :domain => ENV['SMTP_DOMAIN'],
-      :user_name => ENV['SMTP_USERNAME'],
-      :password => ENV['SMTP_PASSWORD'],
-      :authentication => 'login',
-      :enable_starttls_auto => true # detects and uses STARTTLS
-    }
-
   end
 end

packages/web-server/config/cap.example.yml

@@ -1,15 +0,0 @@
-default: &default
-  key_path: /path/to/key.pem
-  repo_url: https://github.com/sn-project/sn-web-client.git
-  user: ssh_username
-
-staging:
-  <<: *default
-  server: staging.yourdomain.com
-  branch: staging
-  deploy_to: ~/sn-staging-client
-
-production:
-  <<: *default
-  server: yourdomain.com
-  deploy_to: ~/sn-prod-client

packages/web-server/config/deploy.rb

@@ -1,49 +0,0 @@
-CAP_CONFIG = YAML.load_file("config/cap.yml")
-
-set :application, 'standard-notes'
-set :repo_url, CAP_CONFIG["default"]["repo_url"]
-
-# Default branch is :master
-set :branch, `git rev-parse --abbrev-ref main`.chomp
-
-# Default deploy_to directory is /var/www/my_app_name
-# set :deploy_to, '/var/www/my_app_name'
-
-# Default value for :format is :airbrussh.
-# set :format, :airbrussh
-
-# You can configure the Airbrussh format using :format_options.
-# These are the defaults.
-# set :format_options, command_output: true, log_file: 'log/capistrano.log', color: :auto, truncate: :auto
-
-# Default value for :pty is false
-# set :pty, true
-
-# Default value for :linked_files is []
-# set :linked_files, fetch(:linked_files, []).push('config/database.yml', 'config/secrets.yml')
-set :linked_files, fetch(:linked_files, []).push('.env')
-
-# Default value for linked_dirs is []
-# set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system')
-set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system', 'public/uploads')
-
-# Default value for keep_releases is 5
-# set :keep_releases, 5
-
-namespace :deploy do
-
-  after :restart, :clear_cache do
-    on roles(:web), in: :groups, limit: 3, wait: 5 do
-      # Here we can do anything such as:
-      within release_path do
-
-      end
-    end
-  end
-end
-
-set :ssh_options, {
-  keys: %W( #{CAP_CONFIG['default']['key_path']} ),
-  forward_agent: false,
-  auth_methods: %w(publickey)
-}

packages/web-server/config/deploy/production.rb

@@ -1,63 +0,0 @@
-# server-based syntax
-# ======================
-# Defines a single server with a list of roles and multiple properties.
-# You can define all roles on a single server, or split them:
-
-# server 'example.com', user: 'deploy', roles: %w{app db web}, my_property: :my_value
-# server 'example.com', user: 'deploy', roles: %w{app web}, other_property: :other_value
-# server 'db.example.com', user: 'deploy', roles: %w{db}
-
-server CAP_CONFIG['production']['server'], user: CAP_CONFIG['production']['user'], roles: %w{app db web}
-
-set :deploy_to, CAP_CONFIG['production']['deploy_to']
-
-# role-based syntax
-# ==================
-
-# Defines a role with one or multiple servers. The primary server in each
-# group is considered to be the first unless any  hosts have the primary
-# property set. Specify the username and a domain or IP for the server.
-# Don't use `:all`, it's a meta role.
-
-# role :app, %w{[email protected]}, my_property: :my_value
-# role :web, %w{[email protected] [email protected]}, other_property: :other_value
-# role :db,  %w{[email protected]}
-
-
-
-# Configuration
-# =============
-# You can set any configuration variable like in config/deploy.rb
-# These variables are then only loaded and set in this stage.
-# For available Capistrano configuration variables see the documentation page.
-# http://capistranorb.com/documentation/getting-started/configuration/
-# Feel free to add new variables to customise your setup.
-
-
-
-# Custom SSH Options
-# ==================
-# You may pass any option but keep in mind that net/ssh understands a
-# limited set of options, consult the Net::SSH documentation.
-# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
-#
-# Global options
-# --------------
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-#
-# The server-based syntax can be used to override options:
-# ------------------------------------
-# server 'example.com',
-#   user: 'user_name',
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: 'user_name', # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: 'please use keys'
-#   }

packages/web-server/config/deploy/staging.rb

@@ -1,65 +0,0 @@
-# server-based syntax
-# ======================
-# Defines a single server with a list of roles and multiple properties.
-# You can define all roles on a single server, or split them:
-
-# server 'example.com', user: 'deploy', roles: %w{app db web}, my_property: :my_value
-# server 'example.com', user: 'deploy', roles: %w{app web}, other_property: :other_value
-# server 'db.example.com', user: 'deploy', roles: %w{db}
-
-server CAP_CONFIG['staging']['server'], user: CAP_CONFIG['staging']['user'], roles: %w{app db web}
-
-set :branch, CAP_CONFIG['staging']['branch']
-
-set :deploy_to, CAP_CONFIG['staging']['deploy_to']
-
-# role-based syntax
-# ==================
-
-# Defines a role with one or multiple servers. The primary server in each
-# group is considered to be the first unless any  hosts have the primary
-# property set. Specify the username and a domain or IP for the server.
-# Don't use `:all`, it's a meta role.
-
-# role :app, %w{[email protected]}, my_property: :my_value
-# role :web, %w{[email protected] [email protected]}, other_property: :other_value
-# role :db,  %w{[email protected]}
-
-
-
-# Configuration
-# =============
-# You can set any configuration variable like in config/deploy.rb
-# These variables are then only loaded and set in this stage.
-# For available Capistrano configuration variables see the documentation page.
-# http://capistranorb.com/documentation/getting-started/configuration/
-# Feel free to add new variables to customise your setup.
-
-
-
-# Custom SSH Options
-# ==================
-# You may pass any option but keep in mind that net/ssh understands a
-# limited set of options, consult the Net::SSH documentation.
-# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
-#
-# Global options
-# --------------
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-#
-# The server-based syntax can be used to override options:
-# ------------------------------------
-# server 'example.com',
-#   user: 'user_name',
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: 'user_name', # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: 'please use keys'
-#   }

packages/web-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web-server",
-  "version": "1.2.93",
+  "version": "1.2.94",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": "Standard Notes.",

packages/web/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.40.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-11)
+
+### Bug Fixes
+
+* focus mode & dynamic panels on small screens ([#1246](https://github.com/standardnotes/app/issues/1246)) ([9d230d4](https://github.com/standardnotes/app/commit/9d230d4b81c92b826ef9e8b89cd7192f5b4c8b13))
+
 # [3.40.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-07-09)
 
 ### Features

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web",
-  "version": "3.40.0",
+  "version": "3.40.1",
   "license": "AGPL-3.0-or-later",
   "main": "dist/app.js",
   "author": "Standard Notes.",

packages/web/src/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx

@@ -33,7 +33,7 @@ const FocusModeSwitch: FunctionComponent<Props> = ({ application, onToggle, onCl
   return (
     <>
       <button
-        className="flex w-full cursor-pointer items-center justify-between border-0 bg-transparent px-3 py-1.5 text-left text-sm text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:bg-info-backdrop focus:shadow-none focus:shadow-none"
+        className="flex w-full cursor-pointer items-center justify-between border-0 bg-transparent px-3 py-1.5 text-left text-sm text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none"
         onClick={toggle}
       >
         <div className="flex items-center">

packages/web/src/stylesheets/_focused.scss

@@ -1,58 +1,60 @@
-.focus-mode {
-  .mac-desktop #editor-column {
-    // To offset colored circles in Mac
-    padding-top: 35px;
-  }
+@media screen and (min-width: 768px) {
+  .focus-mode {
+    .mac-desktop #editor-column {
+      // To offset colored circles in Mac
+      padding-top: 35px;
+    }
 
-  .mac-desktop #editor-column:before {
-    content: '';
-    display: block;
-    position: absolute;
-    top: 0;
-    width: 100%;
-    height: 38px;
-    -webkit-app-region: drag;
-  }
+    .mac-desktop #editor-column:before {
+      content: '';
+      display: block;
+      position: absolute;
+      top: 0;
+      width: 100%;
+      height: 38px;
+      -webkit-app-region: drag;
+    }
 
-  #editor-title-bar {
-    display: none;
-  }
+    #editor-title-bar {
+      display: none;
+    }
 
-  #editor-menu-bar {
-    display: none;
-  }
+    #editor-menu-bar {
+      display: none;
+    }
 
-  #editor-pane-component-stack {
-    display: none;
-  }
+    #editor-pane-component-stack {
+      display: none;
+    }
 
-  #footer-bar {
-    opacity: 0.08;
-    transition: opacity 0.25s;
-  }
+    #footer-bar {
+      opacity: 0.08;
+      transition: opacity 0.25s;
+    }
 
-  #footer-bar:hover {
-    opacity: 1;
-  }
+    #footer-bar:hover {
+      opacity: 1;
+    }
 
-  #navigation,
-  #items-column {
-    will-change: opacity;
-    animation: fade-out 1.25s forwards;
-    transition: width 1.25s;
-    transition-delay: 0s;
-    width: 0px !important;
-    flex: none !important;
-  }
+    #navigation,
+    #items-column {
+      will-change: opacity;
+      animation: fade-out 1.25s forwards;
+      transition: width 1.25s;
+      transition-delay: 0s;
+      width: 0px !important;
+      flex: none !important;
+    }
 
-  #navigation:hover {
-    flex: initial;
-    width: 0px !important;
-  }
+    #navigation:hover {
+      flex: initial;
+      width: 0px !important;
+    }
 
-  #items-column:hover {
-    flex: initial;
-    width: 0px !important;
+    #items-column:hover {
+      flex: initial;
+      width: 0px !important;
+    }
   }
 }