Merge remote-tracking branch 'origin/master' into accounts

This commit is contained in:
Karol Wypchlo 2021-01-25 13:34:11 +01:00
commit e961ed235d
6 changed files with 725 additions and 558 deletions

4
.gitignore vendored
View File

@ -55,10 +55,6 @@ typings/
.env* .env*
./docker/kratos/config/kratos.yml ./docker/kratos/config/kratos.yml
# gatsby files
.cache/
public
# Mac files # Mac files
.DS_Store .DS_Store

File diff suppressed because it is too large Load Diff

3
packages/webapp/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
# gatsby files
.cache/
public

View File

@ -4,48 +4,48 @@
"version": "1.0.0", "version": "1.0.0",
"author": "Nebulous", "author": "Nebulous",
"dependencies": { "dependencies": {
"axios": "0.21.0", "axios": "0.21.1",
"bytes": "3.1.0", "bytes": "3.1.0",
"classnames": "2.2.6", "classnames": "2.2.6",
"fontsource-metropolis": "3.0.1", "fontsource-metropolis": "4.0.0",
"gatsby": "2.24.92", "gatsby": "2.31.1",
"gatsby-image": "2.5.0", "gatsby-image": "2.10.0",
"gatsby-plugin-manifest": "2.4.35", "gatsby-plugin-manifest": "2.11.0",
"gatsby-plugin-matomo": "0.8.3", "gatsby-plugin-matomo": "0.8.3",
"gatsby-plugin-react-helmet": "3.3.14", "gatsby-plugin-react-helmet": "3.9.0",
"gatsby-plugin-remove-serviceworker": "1.0.0", "gatsby-plugin-remove-serviceworker": "1.0.0",
"gatsby-plugin-robots-txt": "1.5.3", "gatsby-plugin-robots-txt": "1.5.5",
"gatsby-plugin-sass": "2.5.1", "gatsby-plugin-sass": "3.1.0",
"gatsby-plugin-sharp": "2.8.0", "gatsby-plugin-sharp": "2.13.1",
"gatsby-source-filesystem": "2.4.0", "gatsby-source-filesystem": "2.10.0",
"gatsby-transformer-sharp": "2.5.21", "gatsby-transformer-sharp": "2.11.0",
"http-status-codes": "2.1.4", "http-status-codes": "2.1.4",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"jsonp": "0.2.1", "jsonp": "0.2.1",
"node-sass": "4.14.1", "node-sass": "5.0.0",
"path-browserify": "1.0.1", "path-browserify": "1.0.1",
"prop-types": "15.7.2", "prop-types": "15.7.2",
"react": "16.14.0", "react": "17.0.1",
"react-countup": "4.3.3", "react-countup": "4.3.3",
"react-dom": "16.14.0", "react-dom": "17.0.1",
"react-dropzone": "11.2.0", "react-dropzone": "11.2.4",
"react-helmet": "6.1.0", "react-helmet": "6.1.0",
"react-mailchimp-form": "1.0.2", "react-mailchimp-form": "1.0.2",
"react-mailchimp-subscribe": "2.1.0", "react-mailchimp-subscribe": "2.1.0",
"react-syntax-highlighter": "15.2.1", "react-syntax-highlighter": "15.4.3",
"react-visibility-sensor": "5.1.1", "react-visibility-sensor": "5.1.1",
"skynet-js": "2.4.0" "skynet-js": "2.4.0"
}, },
"devDependencies": { "devDependencies": {
"cypress": "5.5.0", "cypress": "6.3.0",
"cypress-file-upload": "4.1.1", "cypress-file-upload": "5.0.2",
"eslint": "7.13.0", "eslint": "7.18.0",
"eslint-config-prettier": "6.15.0", "eslint-config-prettier": "7.2.0",
"eslint-plugin-cypress": "2.11.2", "eslint-plugin-cypress": "2.11.2",
"eslint-plugin-react": "7.21.5", "eslint-plugin-react": "7.22.0",
"husky": "4.3.0", "husky": "4.3.8",
"lint-staged": "10.5.1", "lint-staged": "10.5.3",
"prettier": "2.1.2" "prettier": "2.2.1"
}, },
"keywords": [ "keywords": [
"sia", "sia",

16
scripts/maintenance-upgrade.sh Executable file
View File

@ -0,0 +1,16 @@
#! /usr/bin/env bash
###############################################################
# this script is an automation for restarting docker containers
# on maintenance nodes strictly built for purpose of siasky.net
###############################################################
set -e # exit on first error
docker build --no-cache --quiet --build-arg branch=master -t sia-master /home/user/sia-dockerfile
for container in `docker container ls --format '{{.Names}}'`; do
docker stop $container
docker rm $container
docker run -d -v /home/user/nodes/$container/sia-data:/sia-data --env-file /home/user/nodes/$container/.env --name $container --log-opt max-size=100m --log-opt max-file=3 sia-master
done

View File

@ -7925,9 +7925,9 @@ inherits@2.0.3:
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
version "1.3.5" version "1.3.8"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
inline-style-parser@0.1.1: inline-style-parser@0.1.1:
version "0.1.1" version "0.1.1"