Dev

.gitignore

@@ -6,6 +6,9 @@ yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
 
+git-deps
+git-install-lock
+
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 

Dockerfile

@@ -4,6 +4,7 @@ WORKDIR /var/app
 COPY . /var/app
 RUN yarn install
 RUN yarn build
+RUN node git-install.js -c
 
 FROM node:16.1-alpine
 

config-overrides.js

@@ -33,6 +33,7 @@ module.exports = function override(config, env) {
             'process.env.IS_APP': JSON.stringify(!!process.env.IS_APP),
             'process.env.DESKTOP_APP': JSON.stringify(!!process.env.DESKTOP_APP),
             'process.env.MOBILE_APP': JSON.stringify(!!process.env.MOBILE_APP),
+            //'process.env.NO_NOTIFY': JSON.stringify(true),
         }),
     )
 

config/mobile.json

@@ -17,7 +17,8 @@
       "custom_client": "blogs"
     },
     "notify_service": {
-      "host": "https://notify.golos.app"
+      "host": "https://notify.golos.app",
+      "host_ws": "wss://notify.golos.app/ws"
     },
     "blogs_service": {
       "host": "https://golos.id"

git-install.js

@@ -0,0 +1,125 @@
+const fs = require('fs')
+const util = require('util')
+const exec = util.promisify(require('child_process').exec)
+
+const package = require('./package.json')
+
+const { dependencies, gitDependencies } = package
+
+const dir = 'git-deps'
+
+let clc = {}
+for (const [key, code] of Object.entries({
+    cyanBright: '\x1b[36m',
+    yellowBright: '\x1b[33m',
+    greenBright: '\x1b[32m',
+})) {
+    clc[key] = (...args) => {
+        return code + [...args].join(' ') + '\x1b[0m'
+    }
+}
+
+const logDep = (color, ...args) => {
+    let msg = [' -', ...args]
+    if (color) {
+        msg = [clc[color](...msg)]
+    }
+    console.log(...msg)
+}
+
+async function main() {
+    const { argv } = process
+    if (argv[2] === '-c' || argv[2] === '--cleanup') {
+      const files = await fs.promises.readdir(dir)
+      for (const f of files) {
+        if (f !== '.gitignore') {
+          fs.rmSync(dir + '/' + f, { recursive: true, force: true })
+        }
+      }
+      return
+    }
+
+    if (!gitDependencies) {
+        console.log('No gitDependencies in package.json, so nothing to preinstall.')
+        return
+    }
+
+    const lockFile = 'git-install-lock'
+    if (fs.existsSync(lockFile)) {
+        console.error(lockFile, 'exists, so cannot run. It is for recursion protection.')
+        return
+    }
+    fs.writeFileSync(lockFile, '1')
+
+    console.log(clc.cyanBright('preinstalling deps...'))
+
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir)
+    }
+    process.chdir(dir)
+
+    const gitDeps = Object.entries(gitDependencies)
+    const deps = {}
+    for (const [ key, dep ] of gitDeps) {
+        const url = new URL(dep)
+
+        const { pathname } = url
+        const [ repo, branchFolder ] = pathname.split('/tree/')
+        let branch = '', folder = ''
+        if (branchFolder) {
+            const parts = branchFolder.split('/')
+            branch = ' -b ' + parts[0]
+            if (parts[1]) {
+                parts.shift()
+                folder = parts.join('/')
+            }
+        }
+
+        const commit = url.hash.replace('#', '')
+        const repoName = repo.split('/')[2]
+
+        deps[key] = { dep, repo, branch, folder, repoName, commit }
+
+        if (fs.existsSync(repoName)) {
+            logDep('yellowBright', repoName, 'already cloned, using as cache.')
+            continue
+        }
+
+        deps[key].cloned = true
+
+        const clone = 'git clone ' + url.origin + repo + branch
+        logDep('greenBright', clone)
+        await exec(clone)
+
+        if (commit) {
+            process.chdir(repoName)
+            const resetTo = 'git reset --hard ' + commit
+            logDep(null, '-', resetTo)
+            await exec(resetTo)
+            process.chdir('..')
+        }
+    }
+
+    console.log(' ')
+    console.log(clc.cyanBright('yarn-adding cloned deps (if not added)...'))
+
+    for (const [ key, dep ] of Object.entries(deps)) {
+        let path = './' + dir + '/' + dep.repoName
+        if (dep.folder) {
+            path += '/' + dep.folder
+        }
+
+        if (argv[2] === '-f' || dependencies[key] !== path) {
+            const add = 'yarn add ' + path
+            logDep('greenBright', add)
+            await exec(add)
+        }
+    }
+
+    console.log(clc.greenBright('ok'))
+    console.log('')
+
+    fs.unlinkSync('../' + lockFile)
+}
+
+main()

package.json

@@ -16,9 +16,9 @@
     "connected-react-router": "^6.9.2",
     "counterpart": "^0.18.6",
     "emoji-picker-element": "^1.10.1",
-    "formik": "https://gitpkg.now.sh/golos-blockchain/formik/packages/formik?b697b6ef3f13c795bb862b35589fffde442ab465",
+    "formik": "./git-deps/formik/packages/formik",
     "git-rev-sync": "^3.0.2",
-    "golos-lib-js": "^0.9.34",
+    "golos-lib-js": "^0.9.76",
     "history": "4.10.1",
     "immutable": "^4.0.0",
     "koa": "^2.13.4",
@@ -32,18 +32,20 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-dom-confetti": "^0.2.0",
-    "react-dropzone": "^12.0.4",
-    "react-foundation-components": "git+https://github.com/golos-blockchain/react-foundation-components.git#6606fd5529f1ccbc77cd8d33a8ce139fdf8f9a11",
+    "react-dropzone": "^14.2.3",
+    "react-foundation-components": "./git-deps/react-foundation-components",
     "react-intl": "^5.24.6",
     "react-notification": "^6.8.5",
     "react-redux": "^7.2.6",
     "react-router-dom": "^5.3.0",
+    "react-select": "^5.8.0",
     "react-textarea-autosize": "^8.3.3",
     "redux": "^4.1.2",
     "redux-logger": "^3.0.6",
     "redux-modules": "0.0.5",
     "redux-saga": "^1.1.3",
-    "sass": "^1.49.7"
+    "sass": "^1.49.7",
+    "speakingurl": "^14.0.1"
   },
   "devDependencies": {
     "@red-mobile/cordova-plugin-shortcuts-android": "^1.0.1",
@@ -64,9 +66,14 @@
     "react-app-rewired": "^2.1.11",
     "react-scripts": "^5.0.0"
   },
+  "gitDependencies": {
+    "formik": "https://github.com/golos-blockchain/formik/tree/master/packages/formik#3b21166c33ade760d562091e1fa0b71d172a7aaf",
+    "react-foundation-components": "https://github.com/golos-blockchain/react-foundation-components#45bcb22dd3e078a515a9f7dfb33f834b31f83a43"
+  },
   "scripts": {
+    "preinstall": "node git-install.js",
     "cordova": "cordova",
-    "dev": "react-app-rewired start",
+    "dev": "cross-env react-app-rewired start",
     "dev:server": "nodemon server",
     "build": "react-app-rewired build",
     "prod": "NODE_ENV=production node server/index.js",

server/index.js

@@ -7,6 +7,7 @@ const cors = require('@koa/cors')
 const coBody = require('co-body')
 const config = require('config')
 const git = require('git-rev-sync')
+const fs = require('fs')
 const path = require('path')
 const { convertEntriesToArrays, } = require('./utils/misc')
 
@@ -70,14 +71,22 @@ if (env === 'production') {
 }
 
 if (env === 'production') {
+    const buildPath = path.join(__dirname, '../build')
     app.use(async (ctx, next) => {
-        if (ctx.path.startsWith('/@')) {
-            ctx.url = '/'
+        const parts = ctx.path.split('/')
+        // /
+        // /@user
+        // /group
+        if (parts.length === 2 && parts[1] !== 'api') {
+            const filePath = path.join(buildPath, parts[1])
+            if (!fs.existsSync(filePath)) {
+                ctx.url = '/'
+            }
         }
         await next()
     })
     const cacheOpts = { maxage: 0, gzip: true }
-    app.use(static(path.join(__dirname, '../build'), cacheOpts))
+    app.use(static(buildPath, cacheOpts))
 }
 
 app.use(router.routes())

src/_themes.scss

@@ -57,6 +57,7 @@ $themes: (
     navBackgroundColor: $color-white,
     highlightBackgroundColor: #f3faf0,
     tableRowEvenBackgroundColor: #f4f4f4,
+    borderColor: $light-gray,
     border: 1px solid $light-gray,
     borderLight: 1px solid $color-border-light-lightest,
     borderDark: 1px solid $color-text-gray,
@@ -98,6 +99,7 @@ $themes: (
     zebra: $black-gray,
     highlighted: $black-gray,
     tableRowEvenBackgroundColor: #212C33,
+    borderColor: $color-border-dark,
     border: 1px solid $color-border-dark,
     borderLight: 1px solid $color-border-dark-lightest,
     textColorPrimaryborderDark: 1px solid $color-text-gray-light,