merge

.github/workflows/master.yml

@@ -18,9 +18,6 @@ jobs:
     - name: npm install, lint and/or test
       run: |
         yarn
-        cd src/desktop
-        yarn
-        cd ../../
         yarn test --runInBand --updateSnapshot
       env:
         CI: true

.github/workflows/staging.yml

@@ -18,9 +18,6 @@ jobs:
     - name: npm install, lint and/or test
       run: |
         yarn
-        cd src/desktop
-        yarn
-        cd ../../
         yarn test --runInBand --updateSnapshot
       env:
         CI: true

Dockerfile

@@ -1,12 +1,10 @@
-FROM node:16.13.2 as base
+FROM node:16.15.1 as base
 
 WORKDIR /var/app
 
 COPY package.json yarn.lock ./
-COPY src/desktop/package.json src/desktop/yarn.lock ./src/desktop/
 
 RUN yarn install --non-interactive --frozen-lockfile --ignore-optional
-RUN yarn install --non-interactive --frozen-lockfile --ignore-optional --cwd src/desktop
 
 COPY . .
 
@@ -18,7 +16,7 @@ FROM base as dependencies
 RUN yarn install --non-interactive --frozen-lockfile --ignore-optional --production
 
 ### BUILD MINIFIED PRODUCTION ##
-FROM node:16.13.2 as production
+FROM node:16.15.1 as production
 
 # Add Tini
 ENV TINI_VERSION v0.18.0

README.md

@@ -1,6 +1,6 @@
 <a href="https://discord.gg/WywwJEu">![Discord](https://img.shields.io/discord/385034494555455488?label=Ecency%20discord&logo=discord)</a> <a href="https://twitter.com/ecency_official">![Twitter Follow](https://img.shields.io/twitter/follow/ecency_official?style=social)</a> <a href="https://github.com/ecency/ecency-vision">![GitHub Repo stars](https://img.shields.io/github/stars/ecency/ecency-vision?style=social)</a>
 
-# [Ecency vision][ecency_vision] – Ecency Web/Desktop client
+# [Ecency vision][ecency_vision] – Ecency Web client
 
 ![ecency](https://ecency.com/assets/github-cover.png)
 
@@ -13,14 +13,6 @@ Fast, simple and clean source code with Reactjs + Typescript.
 - [Production version][ecency_vision] - master branch
 - [Alpha version][ecency_alpha] - development branch
 
-## Desktop app
-
-Please check latest version on [Release page][ecency_release] or [Ecency link][ecency_desktop].
-
-- Mac users: `Ecency-3.x.x.dmg`
-- Windows users: `Ecency.Setup.3.x.x.exe`
-- Linux users: `ecency-surfer_3.x.x_amd_64.deb`, `Ecency-3.x.x.AppImage`, `ecency-surfer-3.x.x.x86_64.rpm`, `ecency-surfer-3.x.x.tar.gz`
-
 ## Developers
 
 Feel free to test it out and submit improvements and pull requests.
@@ -73,12 +65,6 @@ If you are setting up your own website other than Ecency.com, you can still leav
 
 `$ yarn start`
 
-##### Start desktop in dev
-
-`$ cd src/desktop`
-`$ yarn`
-`$ yarn dev`
-
 ##### Pushing new code / Pull requests
 
 - Make sure to branch off your changes from `development` branch.
@@ -133,6 +119,5 @@ We will evaluate the risk and make a patch available before filing the issue.
 
 [//]: # "LINKS"
 [ecency_vision]: https://ecency.com
-[ecency_desktop]: https://desktop.ecency.com
 [ecency_alpha]: https://alpha.ecency.com
 [ecency_release]: https://github.com/ecency/ecency-vision/releases

docker-compose.production.yml

@@ -12,7 +12,7 @@ services:
     command:
       - /bin/sh
       - -c
-      - redis-server --save 20 1 --loglevel warning --requirepass "$${REDIS_HOST_PASSWORD:?REDIS_HOST_PASSWORD variable is not set}"
+      - redis-server --save 20 1 --appendonly no --maxmemory 16gb --maxmemory-policy allkeys-lru --loglevel warning --requirepass "$${REDIS_HOST_PASSWORD:?REDIS_HOST_PASSWORD variable is not set}"
     volumes:
       - redis:/data
     networks:
@@ -109,4 +109,4 @@ volumes:
 
 networks:
   vision:
-    external: true
+    external: true

docker-compose.yml

@@ -12,7 +12,7 @@ services:
     command:
       - /bin/sh
       - -c
-      - redis-server --save 20 1 --loglevel warning --requirepass "$${REDIS_HOST_PASSWORD:?REDIS_HOST_PASSWORD variable is not set}"
+      - redis-server --save 20 1 --appendonly no --maxmemory 16gb --maxmemory-policy allkeys-lru --loglevel warning --requirepass "$${REDIS_HOST_PASSWORD:?REDIS_HOST_PASSWORD variable is not set}"
     volumes:
       - redis:/data
     networks:
@@ -109,4 +109,4 @@ volumes:
 
 networks:
   vision:
-    external: true
+    external: true

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecency-vision",
-  "version": "3.0.36",
+  "version": "3.2.0",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -13,7 +13,8 @@
     "start:prod": "NODE_ENV=production node build/server.js"
   },
   "dependencies": {
-    "@ecency/render-helper": "^2.2.26",
+    "@ecency/ns-query": "^1.2.5",
+    "@ecency/render-helper": "^2.2.32",
     "@ecency/render-helper-amp": "^1.1.0",
     "@emoji-mart/data": "^1.1.2",
     "@emoji-mart/react": "^1.1.1",
@@ -22,8 +23,10 @@
     "@firebase/messaging": "^0.9.16",
     "@hiveio/dhive": "^1.3.0",
     "@hiveio/hivescript": "^1.2.7",
+    "@iconscout/react-unicons": "^2.0.2",
     "@loadable/component": "^5.15.2",
     "@loadable/server": "^5.15.2",
+    "@noble/secp256k1": "^1.7.1",
     "@popperjs/core": "^2.11.8",
     "@tanstack/react-query": "^4.29.7",
     "@tanstack/react-query-devtools": "^4.29.7",
@@ -35,6 +38,7 @@
     "connected-react-router": "^6.8.0",
     "cookie-parser": "^1.4.5",
     "currency-symbol-map": "^4.0.4",
+    "date-fns": "^2.30.0",
     "debounce": "^1.2.1",
     "diff-match-patch": "^1.0.5",
     "emoji-mart": "^5.5.2",
@@ -55,6 +59,7 @@
     "moment": "^2.29.4",
     "node-cache": "^5.1.0",
     "node-html-parser": "^5.3.3",
+    "nostr-relaypool": "^0.6.28",
     "numeral": "^2.0.6",
     "path-to-regexp": "^6.1.0",
     "qrcode": "^1.5.1",
@@ -71,6 +76,7 @@
     "react-highcharts": "^16.1.0",
     "react-img-webp": "^2.0.2",
     "react-in-viewport": "^1.0.0-alpha.30",
+    "react-input-slider": "^6.0.1",
     "react-popper": "^2.2.5",
     "react-redux": "^7.2.0",
     "react-resize-detector": "^7.1.2",
@@ -89,14 +95,15 @@
     "sortablejs": "^1.13.0",
     "speakingurl": "^14.0.1",
     "tough-cookie": "^4.1.2",
-    "tus-js-client": "^3.1.0",
+    "tus-js-client": "3.1.0",
     "use-async-effect": "^2.2.6",
     "use-indexeddb": "^2.0.2",
     "uuid": "^9.0.0",
     "xss": "^1.0.8"
   },
   "devDependencies": {
     "@loadable/webpack-plugin": "^5.15.2",
+    "@testing-library/jest-dom": "^6.1.6",
     "@thoughtbot/tailwindcss-aria-attributes": "^0.2.0",
     "@types/bs58": "^4.0.1",
     "@types/bytebuffer": "^5.0.41",
@@ -135,19 +142,19 @@
     "@types/webpack-env": "^1.14.0",
     "@types/webscopeio__react-textarea-autocomplete": "^4.7.2",
     "autoprefixer": "^10.4.14",
-    "babel-preset-razzle": "^4.0.5",
+    "babel-preset-razzle": "^4.2.18",
     "html-webpack-plugin": "4.5.2",
     "husky": "^8.0.1",
     "jest": "^26.0.0",
     "lint-staged": "^13.0.3",
     "mini-css-extract-plugin": "0.9.0",
     "mockdate": "^3.0.2",
-    "postcss": "8.2.13",
+    "postcss": "8.4.31",
     "postcss-cli": "^10.1.0",
     "prettier": "^2.7.1",
-    "razzle": "^4.0.5",
-    "razzle-dev-utils": "^4.0.5",
-    "razzle-plugin-scss": "^4.0.5",
+    "razzle": "^4.2.18",
+    "razzle-dev-utils": "^4.2.18",
+    "razzle-plugin-scss": "^4.2.18",
     "razzle-plugin-typescript": "^3.0.0",
     "react-test-renderer": "^16.13.1",
     "tailwindcss": "^3.3.2",
@@ -171,6 +178,9 @@
     ]
   },
   "jest": {
+    "setupFilesAfterEnv": [
+      "<rootDir>/src/test-setup.ts"
+    ],
     "transform": {
       "\\.(ts|tsx)$": "ts-jest",
       "\\.css$": "<rootDir>/node_modules/razzle/config/jest/cssTransform.js",