lirent/synapse-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into zh-cn

Browse Source
This commit is contained in:
Nya Candy 2021-04-21 17:48:23 +08:00 committed by GitHub
commit 07dfbbe5de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
README.md
View File

@ -37,23 +37,23 @@ Steps for 2):
- run the Docker container from the public docker registry: `docker run -p 8080:80 awesometechnologies/synapse-admin` or use the (docker-compose.yml)[docker-compose.yml]: `docker-compose up -d`
> note: if you're building on an architecture other than amd64 (for example a raspberry pi), make sure to define a maximum ram for node. otherwise the build will fail.
> note: if you're building on an architecture other than amd64 (for example a raspberry pi), make sure to define a maximum ram for node. otherwise the build will fail.
```yml
version: "3"
```yml
version: "3"
services:
synapse-admin:
container_name: synapse-admin
hostname: synapse-admin
build:
context: https://github.com/Awesome-Technologies/synapse-admin.git
# args:
# - NODE_OPTIONS="--max_old_space_size=1024"
ports:
- "8080:80"
restart: unless-stopped
```
services:
synapse-admin:
container_name: synapse-admin
hostname: synapse-admin
build:
context: https://github.com/Awesome-Technologies/synapse-admin.git
# args:
# - NODE_OPTIONS="--max_old_space_size=1024"
ports:
- "8080:80"
restart: unless-stopped
```
- browse to http://localhost:8080

16
docker-compose.yml
View File

@ -6,16 +6,16 @@ services:
hostname: synapse-admin
image: awesometechnologies/synapse-admin:latest
# build:
# context: .
# context: .
# to use the docker-compose as standalone without a local repo clone,
# replace the context definition with this:
# context: https://github.com/Awesome-Technologies/synapse-admin.git
# to use the docker-compose as standalone without a local repo clone,
# replace the context definition with this:
# context: https://github.com/Awesome-Technologies/synapse-admin.git
# if you're building on an architecture other than amd64, make sure
# to define a maximum ram for node. otherwise the build will fail.
# args:
# - NODE_OPTIONS="--max_old_space_size=1024"
# if you're building on an architecture other than amd64, make sure
# to define a maximum ram for node. otherwise the build will fail.
# args:
# - NODE_OPTIONS="--max_old_space_size=1024"
ports:
- "8080:80"
restart: unless-stopped

7
package.json
View File

@ -19,15 +19,16 @@
"eslint-config-prettier": "^6.10.1",
"eslint-plugin-prettier": "^3.1.2",
"jest-fetch-mock": "^3.0.3",
"prettier": "^2.0.0"
"prettier": "^2.0.0",
"ra-test": "^3.14.0"
},
"dependencies": {
"papaparse": "^5.2.0",
"prop-types": "^15.7.2",
"ra-language-chinese": "^2.0.10",
"ra-language-german": "^2.1.2",
"react": "^16.13.1",
"react-admin": "^3.10.0",
"react": "^17.0.0",
"react-admin": "^3.14.0",
"react-dom": "^16.14.0",
"react-scripts": "^3.4.4"
},

2
src/App.test.js
View File

@ -1,5 +1,5 @@
import React from "react";
import { TestContext } from "react-admin";
import { TestContext } from "ra-test";
import { shallow } from "enzyme";
import App from "./App";

2
src/components/LoginPage.test.js
View File

@ -1,5 +1,5 @@
import React from "react";
import { TestContext } from "react-admin";
import { TestContext } from "ra-test";
import { shallow } from "enzyme";
import LoginPage from "./LoginPage";

30
yarn.lock
View File

@ -1574,7 +1574,7 @@
"@svgr/plugin-svgo" "^4.3.1"
loader-utils "^1.2.3"
"@testing-library/dom@^7.22.3":
"@testing-library/dom@^7.22.3", "@testing-library/dom@^7.28.1":
version "7.30.3"
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.30.3.tgz#779ea9bbb92d63302461800a388a5a890ac22519"
integrity sha512-7JhIg2MW6WPwyikH2iL3o7z+FTVgSOd2jqCwTAHqK7Qal2gRRYiUQyURAxtbK9VXm/UTyG9bRihv8C5Tznr2zw==
@ -1610,6 +1610,14 @@
"@babel/runtime" "^7.10.3"
"@testing-library/dom" "^7.22.3"
"@testing-library/react@^11.2.3":
version "11.2.6"
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.6.tgz#586a23adc63615985d85be0c903f374dab19200b"
integrity sha512-TXMCg0jT8xmuU8BkKMtp8l7Z50Ykew5WNX8UoIKTaLFwKkP2+1YDhOLA2Ga3wY4x29jyntk7EWfum0kjlYiSjQ==
dependencies:
"@babel/runtime" "^7.12.5"
"@testing-library/dom" "^7.28.1"
"@testing-library/user-event@^12.0.11":
version "12.8.3"
resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-12.8.3.tgz#1aa3ed4b9f79340a1e1836bc7f57c501e838704a"
@ -9387,6 +9395,15 @@ ra-language-german@^2.1.2:
resolved "https://registry.yarnpkg.com/ra-language-german/-/ra-language-german-2.1.2.tgz#d183093d470ab499ece91838cb67222db88f2e4f"
integrity sha512-N+BaBP0z98ujaKVlAMIKTfWHgmTiWD8sPQrU5vA3+b5zY9U0mMB4VjvU8sQQPR7rZE0gsRgS/X4V6ycDtNL6iQ==
ra-test@^3.14.0:
version "3.14.4"
resolved "https://registry.yarnpkg.com/ra-test/-/ra-test-3.14.4.tgz#30c14d7b50a2c8700ca8265182018f43ea9f3077"
integrity sha512-Uc38b40t1I5iRMs9k7IZ904lFcXoYkK/lYZbIDJUCVYr5Rq1mdOtzUt+rY7+m1AsKvwiU8Ja91LiLJOjzOMV1A==
dependencies:
"@testing-library/react" "^11.2.3"
classnames "~2.2.5"
lodash "~4.17.5"
ra-ui-materialui@^3.14.4:
version "3.14.4"
resolved "https://registry.yarnpkg.com/ra-ui-materialui/-/ra-ui-materialui-3.14.4.tgz#967a778ae60c42417735926b6e13f46e50b75d63"
@ -9455,7 +9472,7 @@ raw-body@2.4.0:
iconv-lite "0.4.24"
unpipe "1.0.0"
react-admin@^3.10.0:
react-admin@^3.14.0:
version "3.14.4"
resolved "https://registry.yarnpkg.com/react-admin/-/react-admin-3.14.4.tgz#391008ec479f1b3edaa7e8e8e55914c5f711d89b"
integrity sha512-n52a8r0fYSVnz6Sec0+2QzSAUNKc0oqqQsGrSXrbXjcZLtMJvyECxZWb4Re2Mtm/K2Qb+PuoUCQg4tiUAdpt6A==
@ -9689,14 +9706,13 @@ react-transition-group@^4.4.0, react-transition-group@^4.4.1:
loose-envify "^1.4.0"
prop-types "^15.6.2"
react@^16.13.1:
version "16.14.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
react@^17.0.0:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
read-pkg-up@^2.0.0:
version "2.0.0"