-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #287 from dataswift/dev
Merge Dev to main
- Loading branch information
Showing
31 changed files
with
1,339 additions
and
2,706 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,27 @@ | ||
{ | ||
"name": "rumpel-react", | ||
"version": "4.2.9", | ||
"version": "4.2.11", | ||
"private": true, | ||
"dependencies": { | ||
"@dataswift/hat-js": "^0.3.2", | ||
"@dataswift/hat-js": "^0.4.0", | ||
"@dataswift/shared": "v0.0.3", | ||
"@material-ui/core": "^4.11.3", | ||
"@reduxjs/toolkit": "^1.3.5", | ||
"@testing-library/jest-dom": "^5.11.6", | ||
"@testing-library/react": "^11.2.2", | ||
"date-fns": "^2.12.0", | ||
"hmi": "git+ssh://[email protected]:dataswift/hmi-react.git#v0.3.4", | ||
"@reduxjs/toolkit": "^1.5.1", | ||
"@testing-library/jest-dom": "^5.11.10", | ||
"@testing-library/react": "^11.2.6", | ||
"date-fns": "^2.19.0", | ||
"hmi": "git+ssh://[email protected]:dataswift/hmi-react.git#v0.4.0", | ||
"js-cookie": "^2.2.1", | ||
"lodash": "^4.17.21", | ||
"lodash-es": "^4.17.21", | ||
"markdown-to-jsx": "^7.1.0", | ||
"query-string": "^6.14.1", | ||
"react": "^17.0.1", | ||
"markdown-to-jsx": "^7.1.2", | ||
"material-icons": "^0.5.4", | ||
"query-string": "^7.0.0", | ||
"react": "^17.0.2", | ||
"react-date-range": "^1.1.3", | ||
"react-dom": "^17.0.1", | ||
"react-dropzone": "^11.3.1", | ||
"react-redux": "^7.2.2", | ||
"react-dom": "^17.0.2", | ||
"react-dropzone": "^11.3.2", | ||
"react-redux": "^7.2.3", | ||
"react-router": "^5.1.2", | ||
"react-router-dom": "^5.1.2", | ||
"react-scripts": "^4.0.3", | ||
|
@@ -57,32 +58,30 @@ | |
] | ||
}, | ||
"devDependencies": { | ||
"@types/enzyme": "^3.10.8", | ||
"@types/enzyme-adapter-react-16": "^1.0.5", | ||
"@types/jest": "^26.0.20", | ||
"@types/jest": "^26.0.22", | ||
"@types/js-cookie": "^2.2.5", | ||
"@types/lodash": "^4.14.168", | ||
"@types/lodash.debounce": "^4.0.6", | ||
"@types/markdown-to-jsx": "^6.11.3", | ||
"@types/node": "14.14.32", | ||
"@types/node": "14.14.37", | ||
"@types/node-sass": "^4.11.0", | ||
"@types/react": "17.0.3", | ||
"@types/react-dom": "17.0.1", | ||
"@types/react-dom": "17.0.3", | ||
"@types/react-redux": "^7.1.16", | ||
"@types/react-router": "^5.1.2", | ||
"@types/react-router-dom": "^5.1.0", | ||
"@typescript-eslint/eslint-plugin": "^4.16.1", | ||
"@typescript-eslint/parser": "^4.16.1", | ||
"@types/react-router": "^5.1.13", | ||
"@types/react-router-dom": "^5.1.7", | ||
"@typescript-eslint/eslint-plugin": "^4.20.0", | ||
"@typescript-eslint/parser": "^4.20.0", | ||
"env-cmd": "^10.1.0", | ||
"eslint-plugin-react": "^7.21.5", | ||
"eslint-plugin-react": "^7.23.1", | ||
"eslint-plugin-react-hooks": "^4.2.0", | ||
"eslint-plugin-standard": "^5.0.0", | ||
"husky": "^5.1.3", | ||
"husky": "^6.0.0", | ||
"jest-environment-jsdom-sixteen": "^1.0.3", | ||
"jest-transform-stub": "^2.0.0", | ||
"lodash.debounce": "^4.0.8", | ||
"node-sass": "^4.14.1", | ||
"prettier": "^2.2.0", | ||
"ts-jest": "^26.5.3" | ||
"node-sass": "^5.0.0", | ||
"prettier": "^2.2.1", | ||
"ts-jest": "^26.5.4" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,8 +13,6 @@ | |
<meta property="og:description" content="Welcome to HAT Web app, the personal hyperdata browser for your HAT data. Dashboard is a service that allows you to acquire, visualise and exchange your HAT data." /> | ||
<meta property="og:image" content="https://rumpel.hubofallthings.com/assets/icons/[email protected]" /> | ||
<meta property="og:site_name" content="HAT Web app" /> | ||
<link href="https://fonts.googleapis.com/css2?family=Mulish:wght@400;600;700;900&family=Roboto:wght@400;500;700&display=swap" rel="stylesheet"> | ||
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> | ||
|
||
<!-- | ||
manifest.json provides metadata used when your web app is installed on a | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
@import "branding"; | ||
@import 'material-icons/iconfont/material-icons.scss'; | ||
|
||
* { | ||
margin: 0; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* mulish-regular - latin */ | ||
@font-face { | ||
font-family: 'Mulish'; | ||
font-style: normal; | ||
font-weight: 400; | ||
src: url('../fonts/mulish-v3-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ | ||
url('../fonts/mulish-v3-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ | ||
} | ||
/* mulish-600 - latin */ | ||
@font-face { | ||
font-family: 'Mulish'; | ||
font-style: normal; | ||
font-weight: 600; | ||
src: url('../fonts/mulish-v3-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ | ||
url('../fonts/mulish-v3-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ | ||
} | ||
/* mulish-700 - latin */ | ||
@font-face { | ||
font-family: 'Mulish'; | ||
font-style: normal; | ||
font-weight: 700; | ||
src: url('../fonts/mulish-v3-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ | ||
url('../fonts/mulish-v3-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ | ||
} | ||
/* mulish-900 - latin */ | ||
@font-face { | ||
font-family: 'Mulish'; | ||
font-style: normal; | ||
font-weight: 900; | ||
src: url('../fonts/mulish-v3-latin-900.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ | ||
url('../fonts/mulish-v3-latin-900.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ | ||
} | ||
|
||
/* roboto-regular - latin */ | ||
@font-face { | ||
font-family: 'Roboto'; | ||
font-style: normal; | ||
font-weight: 400; | ||
src: url('../fonts/roboto-v20-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ | ||
url('../fonts/roboto-v20-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ | ||
} | ||
/* roboto-500 - latin */ | ||
@font-face { | ||
font-family: 'Roboto'; | ||
font-style: normal; | ||
font-weight: 500; | ||
src: url('../fonts/roboto-v20-latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ | ||
url('../fonts/roboto-v20-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ | ||
} | ||
/* roboto-700 - latin */ | ||
@font-face { | ||
font-family: 'Roboto'; | ||
font-style: normal; | ||
font-weight: 700; | ||
src: url('../fonts/roboto-v20-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ | ||
url('../fonts/roboto-v20-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,3 +7,4 @@ | |
@import 'headers'; | ||
@import 'list'; | ||
@import 'menus'; | ||
@import "fonts"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.