oceanprotocol/commons
1
0
Fork 0
mirror of https://github.com/oceanprotocol/commons.git synced 2023-03-15 18:03:00 +01:00
Code Releases Activity

Merge branch 'master' into feature/compute

Browse Source
This commit is contained in:
Matthias Kretschmann 2020-05-19 10:10:23 +02:00
commit fe37382833
Signed by: m
GPG Key ID: 606EEEF3C479A91F
37 changed files with 471 additions and 3814 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.stylelintrc
View File

@ -1,11 +0,0 @@
{
"extends": [
"stylelint-config-bigchaindb",
"stylelint-config-css-modules",
"./node_modules/prettier-stylelint/config.js"
],
"syntax": "scss",
"rules": {
"no-descending-specificity": null
}
}

2
.travis.yml
View File

@ -42,7 +42,6 @@ env:
before_install:
- npm install -g npm
- npm install -g codacy-coverage
# Fixes an issue where the max file watch count is exceeded, triggering ENOSPC
# https://stackoverflow.com/questions/22475849/node-js-error-enospc#32600959
- echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
@ -62,7 +61,6 @@ script:
- npm run lint || travis_terminate 1
- ./scripts/keeper.sh
- ./scripts/test.sh
- ./scripts/coverage.sh
# Pipe the coverage data to Code Climate
- ./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.client.json client/coverage/lcov.info
- ./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.server.json server/coverage/lcov.info

5
README.md
View File

@ -6,13 +6,10 @@
> https://commons.oceanprotocol.com
[![Build Status](https://travis-ci.com/oceanprotocol/commons.svg?branch=master)](https://travis-ci.com/oceanprotocol/commons)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6a19987e62344b1c9c1d5bc9f315c733)](https://www.codacy.com/app/ocean-protocol/commons)
[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/6a19987e62344b1c9c1d5bc9f315c733)](https://www.codacy.com/app/ocean-protocol/commons)
[![Maintainability](https://api.codeclimate.com/v1/badges/ed6e8212a8d294b6aa88/maintainability)](https://codeclimate.com/github/oceanprotocol/commons/maintainability)
[![Test Coverage](https://api.codeclimate.com/v1/badges/ed6e8212a8d294b6aa88/test_coverage)](https://codeclimate.com/github/oceanprotocol/commons/test_coverage)
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-7b1173.svg?style=flat-square)](https://github.com/prettier/prettier)
[![js oceanprotocol](https://img.shields.io/badge/js-oceanprotocol-7b1173.svg)](https://github.com/oceanprotocol/eslint-config-oceanprotocol)
[![css bigchaindb](https://img.shields.io/badge/css-bigchaindb-39BA91.svg)](https://github.com/bigchaindb/stylelint-config-bigchaindb)
<img width="1218" alt="Commons UI" src="https://user-images.githubusercontent.com/90316/55874266-296ef080-5b92-11e9-8ac6-2423cb2a80fb.png">
@ -204,7 +201,7 @@ npm run cypress:open
For linting and auto-formatting you can use from the root of the project:
```bash
# auto format all ts & css with eslint & stylelint
# auto format all ts & css with eslint
npm run lint
# auto format all ts & css with prettier, taking all configs into account

1
client/package.json
View File

@ -9,7 +9,6 @@
"test": "react-scripts test --coverage --watchAll=false --silent",
"test:watch": "react-scripts test --coverage",
"eject": "react-scripts eject",
"coverage": "cat coverage/lcov.info | codacy-coverage --token 8801f827fe1144ffa85cd7da94f2bbf7",
"analyze": "source-map-explorer 'build/static/js/*.js'"
},
"dependencies": {

2
client/src/components/atoms/Account.module.scss
View File

@ -21,7 +21,7 @@
}
.unlock {
font-size: $font-size-small !important; // stylelint-disable-line
font-size: $font-size-small !important;
margin-left: $spacer / 2;
}

12
client/src/components/atoms/Button.module.scss
View File

@ -13,10 +13,10 @@
font-weight: $font-weight-bold;
text-transform: uppercase;
border-radius: 2px;
transition: .2s ease-out;
transition: 0.2s ease-out;
color: $brand-white;
background: $brand-grey-light;
box-shadow: 0 9px 18px 0 rgba(0, 0, 0, .1);
box-shadow: 0 9px 18px 0 rgba(0, 0, 0, 0.1);
min-height: 45px;
user-select: none;
@ -25,21 +25,21 @@
color: $brand-white;
background: $brand-grey-light;
text-decoration: none;
transform: translate3d(0, -.05rem, 0);
box-shadow: 0 12px 30px 0 rgba(0, 0, 0, .1);
transform: translate3d(0, -0.05rem, 0);
box-shadow: 0 12px 30px 0 rgba(0, 0, 0, 0.1);
}
&:active {
background: $brand-grey-light;
transition: none;
transform: none;
box-shadow: 0 5px 18px 0 rgba(0, 0, 0, .1);
box-shadow: 0 5px 18px 0 rgba(0, 0, 0, 0.1);
}
&:disabled {
cursor: not-allowed;
pointer-events: none;
opacity: .5;
opacity: 0.5;
}
}

10
client/src/components/atoms/CategoryImage.module.scss
View File

@ -8,22 +8,18 @@
background-color: $body-background;
border-radius: $border-radius;
overflow: hidden;
opacity: .85;
transition: .2s ease-out;
opacity: 0.85;
transition: 0.2s ease-out;
border: 1px solid $brand-grey-lighter;
}
.header {
// stylelint-disable value-keyword-case
composes: categoryImage;
// stylelint-enable value-keyword-case
height: 8rem;
margin-top: $spacer / $line-height;
}
.dimmed {
// stylelint-disable value-keyword-case
composes: categoryImage;
// stylelint-enable value-keyword-case
opacity: .6;
opacity: 0.6;
}

4
client/src/components/atoms/Form/Input.module.scss
View File

@ -19,9 +19,7 @@
}
.inputWrapSearch {
// stylelint-disable value-keyword-case
composes: inputWrap;
// stylelint-enable value-keyword-case
.input {
padding-left: $spacer * 1.5;
@ -97,7 +95,6 @@
border: 0;
// custom arrow
// stylelint-disable
background-image: linear-gradient(45deg, transparent 50%, $brand-purple 50%),
linear-gradient(135deg, $brand-purple 50%, transparent 50%),
linear-gradient(
@ -109,7 +106,6 @@
background-position: calc(100% - 18px) calc(1rem + 5px),
calc(100% - 13px) calc(1rem + 5px), 100% 0;
background-size: 5px 5px, 5px 5px, 2.5rem 3rem;
// stylelint-enable
background-repeat: no-repeat;
&:focus {

4
client/src/components/atoms/Form/InputDate.module.scss
View File

@ -39,7 +39,9 @@
max-width: 16rem;
}
:global .react-datepicker-popper[data-placement^='top'] .react-datepicker__triangle:before,
:global
.react-datepicker-popper[data-placement^='top']
.react-datepicker__triangle:before,
:global .react-datepicker__year-read-view--down-arrow:before,
:global .react-datepicker__month-read-view--down-arrow:before,
:global .react-datepicker__month-year-read-view--down-arrow:before {

2
client/src/components/atoms/Form/Label.module.scss
View File

@ -17,6 +17,6 @@
font-size: $font-size-base;
color: $brand-grey-light;
display: inline-block;
margin-left: .1rem;
margin-left: 0.1rem;
}
}

8
client/src/components/atoms/Modal.module.scss
View File

@ -11,11 +11,11 @@
left: 0;
right: 0;
bottom: 0;
background: rgba($brand-black, .7);
background: rgba($brand-black, 0.7);
overflow-x: hidden;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
animation: fadeIn .2s ease-out backwards;
animation: fadeIn 0.2s ease-out backwards;
}
.modal {
@ -25,7 +25,7 @@
margin: $spacer auto;
max-width: $break-point--small;
position: relative;
animation: moveUp .2s ease-out backwards;
animation: moveUp 0.2s ease-out backwards;
@media (min-width: $break-point--small) {
padding: $spacer * 2 $spacer * 1.5;
@ -68,7 +68,7 @@
&:hover,
&:focus {
opacity: .7;
opacity: 0.7;
}
}

4
client/src/components/atoms/Spinner.module.scss
View File

@ -20,7 +20,7 @@
border-radius: 50%;
border: 2px solid $brand-purple;
border-top-color: $brand-violet;
animation: spinner .6s linear infinite;
animation: spinner 0.6s linear infinite;
}
}
@ -39,7 +39,7 @@
height: $font-size-small;
margin-top: -($font-size-small);
margin-left: -($font-size-small / 2);
border-width: .1rem;
border-width: 0.1rem;
}
}

6
client/src/components/molecules/AccountStatus/Indicator.module.scss
View File

@ -4,7 +4,7 @@
display: inline-block;
position: relative;
cursor: help;
padding: .5rem;
padding: 0.5rem;
}
/* default: red square */
@ -17,9 +17,7 @@
/* yellow triangle */
.statusIndicatorCloseEnough {
// stylelint-disable value-keyword-case
composes: statusIndicator;
// stylelint-enable value-keyword-case
background: none;
width: 0;
height: 0;
@ -30,9 +28,7 @@
/* green circle */
.statusIndicatorActive {
// stylelint-disable value-keyword-case
composes: statusIndicator;
// stylelint-enable value-keyword-case
border-radius: 50%;
background: $green;
}

3
client/src/components/molecules/AccountStatus/Popover.module.scss
View File

@ -40,15 +40,12 @@ $popoverWidth: 18rem;
border-bottom: 0;
}
/* stylelint-disable */
button {
svg,
&[data-action] {
display: none;
}
}
/* stylelint-enable */
}
.balance {

6
client/src/components/molecules/Dropzone.module.scss
View File

@ -3,11 +3,11 @@
.dropzone {
margin-top: $spacer;
margin-bottom: $spacer;
border: .2rem dashed $brand-grey-lighter;
border: 0.2rem dashed $brand-grey-lighter;
border-radius: $border-radius * 2;
padding: $spacer;
background: $brand-white;
transition: .2s ease-out;
transition: 0.2s ease-out;
cursor: pointer;
p {
@ -32,7 +32,7 @@
.disabled {
composes: dropzone;
opacity: .5;
opacity: 0.5;
pointer-events: none;
}

4
client/src/components/molecules/VersionNumbers/VersionStatus.module.scss
View File

@ -19,10 +19,9 @@
.indicatorActive {
display: inline-block;
margin-right: $spacer / 4;
margin-bottom: -.1rem;
margin-bottom: -0.1rem;
}
// stylelint-disable value-keyword-case
.indicator {
composes: statusindicator from '../AccountStatus/Indicator.module.scss';
}
@ -30,7 +29,6 @@
.indicatorActive {
composes: statusindicatoractive from '../AccountStatus/Indicator.module.scss';
}
// stylelint-enable value-keyword-case
.indicatorLabel {
font-family: $font-family-title;

2
client/src/components/molecules/VersionNumbers/VersionTable.module.scss
View File

@ -17,7 +17,6 @@
td {
padding: $spacer / 6 $spacer / 2;
// stylelint-disable-next-line selector-max-compound-selectors
&,
code {
font-size: $font-size-mini;
@ -33,7 +32,6 @@
text-align: right;
}
// stylelint-disable-next-line selector-no-qualifying-type
&[colspan] {
padding: 0;
}

6
client/src/components/molecules/VersionNumbers/VersionTableRow.module.scss
View File

@ -8,13 +8,13 @@
padding: 0;
margin: 0;
margin-left: -1rem;
margin-top: -.1rem;
padding-right: .5rem;
margin-top: -0.1rem;
padding-right: 0.5rem;
cursor: pointer;
svg {
fill: $brand-grey-light;
transition: .2s ease-out;
transition: 0.2s ease-out;
}
}

1
client/src/components/organisms/ChannelTeaser.module.scss
View File

@ -62,7 +62,6 @@
transform: none;
// category image
// stylelint-disable-next-line
.channelTitle + div {
opacity: 1;
background-size: 105%;

2
client/src/components/organisms/Footer.module.scss
View File

@ -77,7 +77,7 @@
width: 100px;
height: auto;
vertical-align: middle;
margin-top: -.05rem;
margin-top: -0.05rem;
margin-left: $spacer / 6;
fill: currentColor;
}

4
client/src/components/organisms/Header.module.scss
View File

@ -70,7 +70,7 @@
&::-webkit-scrollbar {
width: 3px;
height: 3px;
transition: opacity .2s ease-out;
transition: opacity 0.2s ease-out;
}
}
@ -99,5 +99,5 @@
.accountStatus {
margin-left: $spacer / 2;
margin-bottom: -.5rem;
margin-bottom: -0.5rem;
}

2
client/src/components/organisms/WalletSelector.module.scss
View File

@ -1,7 +1,7 @@
@import '../../styles/variables';
.openLink {
font-size: $font-size-small !important; // stylelint-disable-line
font-size: $font-size-small !important;
margin-left: $spacer / 2;
}

3
client/src/components/templates/Asset/AssetDetails.module.scss
View File

@ -119,15 +119,12 @@
overflow-wrap: break-word;
}
/* stylelint-disable declaration-no-important */
code {
display: block;
padding: 0 !important;
background: none !important;
}
/* stylelint-enable declaration-no-important */
@media (min-width: $break-point--small) {
width: 70%;
}

2
client/src/components/templates/Asset/AssetFile.module.scss
View File

@ -60,7 +60,7 @@
.empty {
font-size: $font-size-mini;
font-weight: $font-weight-base;
opacity: .75;
opacity: 0.75;
}
// move spinner a bit up

1
client/src/routes/Home/index.module.scss
View File

@ -14,7 +14,6 @@
}
// grab the channel teaser on front page
// stylelint-disable-next-line
article > div > h2 + div {
padding-top: $spacer / 2;
}

4
client/src/routes/Publish/Files/Ipfs/Form.module.scss
View File

@ -11,12 +11,12 @@
display: block;
width: 100%;
cursor: pointer;
border: .1rem solid $brand-grey-lighter;
border: 0.1rem solid $brand-grey-lighter;
border-radius: $border-radius;
padding: $spacer / 2 $spacer / 2;
margin-top: $spacer / 2;
background: $brand-white;
transition: border .2s ease-out;
transition: border 0.2s ease-out;
&:hover {
border-color: $brand-grey-light;

6
client/src/routes/Publish/Files/Ipfs/Status.module.scss
View File

@ -7,13 +7,13 @@
&:before {
content: '';
width: .5rem;
height: .5rem;
width: 0.5rem;
height: 0.5rem;
display: inline-block;
background: $yellow;
border-radius: 50%;
margin-right: $spacer / 6;
margin-bottom: .1rem;
margin-bottom: 0.1rem;
}
}

4
client/src/routes/Publish/Files/Item.module.scss
View File

@ -26,11 +26,11 @@
position: absolute;
top: $spacer / 8;
right: 0;
transition: .2s ease-out;
transition: 0.2s ease-out;
&:hover,
&:focus {
opacity: .7;
opacity: 0.7;
}
}

2
client/src/routes/Publish/Progress.module.scss
View File

@ -18,7 +18,7 @@
content: '';
display: block;
width: 60%;
height: .1rem;
height: 0.1rem;
background: $brand-grey-lighter;
position: absolute;
top: 20%;

2
client/src/routes/Publish/StepRegisterContent.module.scss
View File

@ -21,7 +21,7 @@
a,
button {
transition: color .2s ease-out;
transition: color 0.2s ease-out;
&:hover,
&:focus {

8
client/src/styles/_animations.scss
View File

@ -1,6 +1,6 @@
.fade {
&-enter {
opacity: .01;
opacity: 0.01;
}
&-enter-active {
@ -13,14 +13,14 @@
}
&-exit-active {
opacity: .01;
opacity: 0.01;
transition: opacity 400ms ease-in;
}
}
.grow {
&-enter {
opacity: .01;
opacity: 0.01;
max-height: 0;
}
@ -36,7 +36,7 @@
}
&-exit-active {
opacity: .01;
opacity: 0.01;
max-height: 0;
transition: 200ms ease-in;
}

10
client/src/styles/_variables.scss
View File

@ -21,20 +21,18 @@ $brand-gradient: linear-gradient(to right bottom, $brand-purple, $brand-pink);
$body-background: darken($brand-white, 1%);
// Fonts
// stylelint-disable value-keyword-case
$font-family-base: 'Sharp Sans', -apple-system, blinkmacsystemfont, 'Segoe UI',
helvetica, arial, sans-serif;
$font-family-title: 'Sharp Sans Display', -apple-system, blinkmacsystemfont,
'Segoe UI', helvetica, arial, sans-serif;
$font-family-monospace: 'Fira Code', 'Fira Mono', menlo, monaco, consolas,
'Courier New', monospace;
// stylelint-enable value-keyword-case
$font-size-root: 16px;
$font-size-base: 1rem;
$font-size-large: 1.2rem;
$font-size-small: .85rem;
$font-size-mini: .65rem;
$font-size-small: 0.85rem;
$font-size-mini: 0.65rem;
$font-size-text: $font-size-base;
$font-size-label: $font-size-base;
$font-size-title: 1.4rem;
@ -51,7 +49,7 @@ $line-height: 1.6;
// Sizes
$spacer: 2rem;
$page-frame: .75rem;
$page-frame: 0.75rem;
$break-point--small: 640px;
$break-point--medium: 860px;
@ -59,6 +57,6 @@ $break-point--large: 1140px;
$break-point--huge: 1400px;
$brand-border-width: 1px;
$border-radius: .2rem;
$border-radius: 0.2rem;
$narrowWidth: 35rem;

17
client/src/styles/global.scss
View File

@ -1,5 +1,3 @@
// stylelint-disable selector-no-qualifying-type, declaration-no-important, selector-no-vendor-prefix
@import 'variables';
@import 'animations';
@import '../../node_modules/@oceanprotocol/typographies/sass/ocean-typo.scss';
@ -10,15 +8,12 @@
box-sizing: border-box;
}
/* stylelint-disable selector-max-id */
html,
body,
#root {
height: 100%;
}
/* stylelint-enable selector-max-id */
html {
font-size: $font-size-root;
}
@ -44,13 +39,13 @@ body {
a {
text-decoration: none;
color: $brand-pink;
transition: .2s ease-out;
transition: 0.2s ease-out;
&:hover,
&:focus {
color: darken($brand-pink, 15%);
text-decoration: none;
transform: translate3d(0, -.1rem, 0);
transform: translate3d(0, -0.1rem, 0);
}
&:active {
@ -206,7 +201,7 @@ picture {
hr {
margin: $spacer 0;
border: 0;
border-bottom: .1rem solid $brand-grey-lighter;
border-bottom: 0.1rem solid $brand-grey-lighter;
}
// Quotes
@ -230,7 +225,7 @@ blockquote > p {
blockquote {
margin: 0 0 $spacer;
padding-left: $spacer / 2;
border-left: .2rem solid $brand-grey-lighter;
border-left: 0.2rem solid $brand-grey-lighter;
@media screen and (min-width: $break-point--small) {
padding-left: $spacer / $line-height;
@ -295,8 +290,8 @@ samp {
:not(pre) > code {
color: $brand-grey-dark;
display: inline-block;
padding-left: .15rem;
padding-right: .15rem;
padding-left: 0.15rem;
padding-right: 0.15rem;
}
a > code {

4095
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

15
package.json
View File

@ -10,13 +10,9 @@
"test": "npm run lint && scripts/test.sh && npm run test:e2e",
"test:e2e": "start-test start http-get://localhost:3000 cypress:run",
"test:watch": "npm run lint && concurrently \"cd client && npm run test:watch\" \"cd server && npm run test:watch\"",
"format:js": "prettier --parser typescript --write '**/*.{js,jsx,ts,tsx}'",
"format:css": "prettier-stylelint --ignore-path .gitignore --write --quiet '**/*.{css,scss}'",
"format": "npm run format:js && npm run format:css",
"lint:css": "stylelint --ignore-path .gitignore './**/*.{css,scss}'",
"lint:js": "eslint --ignore-path .gitignore --ignore-path .prettierignore --ext .ts,.tsx .",
"format": "prettier --write '**/*.{js,jsx,ts,tsx,css,scss}'",
"lint": "eslint --ignore-path .gitignore --ignore-path .prettierignore --ext .ts,.tsx .",
"lint:fix": "eslint --fix --ignore-path .gitignore --ignore-path .prettierignore --ext .ts,.tsx .",
"lint": "npm run lint:js",
"release": "release-it --non-interactive",
"changelog": "auto-changelog -p",
"cypress:run": "cypress run --browser chrome",
@ -24,7 +20,7 @@
},
"dependencies": {},
"devDependencies": {
"@release-it/bumper": "^1.1.1",
"@release-it/bumper": "^1.1.0",
"@typescript-eslint/eslint-plugin": "^2.33.0",
"@typescript-eslint/parser": "^2.33.0",
"auto-changelog": "^2.0.0",
@ -37,13 +33,8 @@
"eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-prettier": "^3.1.2",
"prettier": "^1.19.1",
"prettier-stylelint": "^0.4.2",
"release-it": "^13.6.1",
"start-server-and-test": "^1.11.0",
"stylelint": "^13.3.3",
"stylelint-config-bigchaindb": "^1.2.2",
"stylelint-config-css-modules": "^2.2.0",
"stylelint-config-standard": "^20.0.0",
"typescript": "^3.8.3"
},
"repository": {

12
scripts/coverage.sh
View File

@ -1,12 +0,0 @@
#/usr/bin/env/sh
set -e
components="server client"
for component in $components
do
printf "\n\nReporting coverage: $component\n"
cd $component
npm run coverage
cd ..
done

3
server/package.json
View File

@ -9,8 +9,7 @@
"serve": "node dist/src/server.js",
"build": "tsc",
"test": "jest --coverage --silent",
"test:watch": "jest --coverage --watch",
"coverage": "cat coverage/lcov.info | codacy-coverage --token 8801f827fe1144ffa85cd7da94f2bbf7"
"test:watch": "jest --coverage --watch"
},
"dependencies": {
"@sendgrid/mail": "^7.1.1",