-
+
{this.props.children}
diff --git a/assets/js/dashboard/stats/sources/search-terms.js b/assets/js/dashboard/stats/sources/search-terms.js
index 65018f8cd..77252269e 100644
--- a/assets/js/dashboard/stats/sources/search-terms.js
+++ b/assets/js/dashboard/stats/sources/search-terms.js
@@ -29,7 +29,7 @@ export default class SearchTerms extends React.Component {
loading: false,
searchTerms: res.search_terms || [],
notConfigured: res.not_configured,
- isOwner: res.is_owner
+ isAdmin: res.is_admin
}))
}
@@ -65,7 +65,7 @@ export default class SearchTerms extends React.Component {
The site is not connected to Google Search Keywords
Cannot show search terms
- {this.state.isOwner &&
Connect with Google }
+ {this.state.isAdmin &&
Connect with Google }
)
} else if (this.state.searchTerms.length > 0) {
diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js
index 40ae56550..94b3700cf 100644
--- a/assets/js/dashboard/stats/visitor-graph.js
+++ b/assets/js/dashboard/stats/visitor-graph.js
@@ -290,13 +290,15 @@ class LineGraph extends React.Component {
}
downloadLink() {
- const endpoint = `/${encodeURIComponent(this.props.site.domain)}/visitors.csv${api.serializeQuery(this.props.query)}`
+ if (this.props.query.period !== 'realtime') {
+ const endpoint = `/${encodeURIComponent(this.props.site.domain)}/visitors.csv${api.serializeQuery(this.props.query)}`
- return (
-
-
-
- )
+ return (
+
+
+
+ )
+ }
}
samplingNotice() {
diff --git a/assets/package-lock.json b/assets/package-lock.json
index 3620925f1..ecbb20a27 100644
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
@@ -19,9 +19,10 @@
"chart.js": "^3.3.2",
"copy-webpack-plugin": "^9.0.0",
"css-loader": "^5.2.6",
- "css-minimizer-webpack-plugin": "^3.0.0",
+ "css-minimizer-webpack-plugin": "^3.0.1",
"datamaps": "^0.5.9",
"iframe-resizer": "^4.3.2",
+ "lodash.debounce": "^4.0.8",
"mini-css-extract-plugin": "^1.6.0",
"phoenix": "file:../deps/phoenix",
"phoenix_html": "file:../deps/phoenix_html",
@@ -32,6 +33,7 @@
"react-flatpickr": "3.10.5",
"react-flip-move": "^3.0.4",
"react-router-dom": "^5.2.0",
+ "react-select": "^4.3.1",
"react-transition-group": "^4.4.2",
"tailwindcss": "^2.1.2",
"terser-webpack-plugin": "^5.1.2",
@@ -69,22 +71,25 @@
}
},
"node_modules/@babel/compat-data": {
- "version": "7.14.4",
- "license": "MIT"
+ "version": "7.14.5",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
"node_modules/@babel/core": {
- "version": "7.14.3",
- "license": "MIT",
- "dependencies": {
- "@babel/code-frame": "^7.12.13",
- "@babel/generator": "^7.14.3",
- "@babel/helper-compilation-targets": "^7.13.16",
- "@babel/helper-module-transforms": "^7.14.2",
- "@babel/helpers": "^7.14.0",
- "@babel/parser": "^7.14.3",
- "@babel/template": "^7.12.13",
- "@babel/traverse": "^7.14.2",
- "@babel/types": "^7.14.2",
+ "version": "7.14.5",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/code-frame": "^7.14.5",
+ "@babel/generator": "^7.14.5",
+ "@babel/helper-compilation-targets": "^7.14.5",
+ "@babel/helper-module-transforms": "^7.14.5",
+ "@babel/helpers": "^7.14.5",
+ "@babel/parser": "^7.14.5",
+ "@babel/template": "^7.14.5",
+ "@babel/traverse": "^7.14.5",
+ "@babel/types": "^7.14.5",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -108,38 +113,50 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.14.3",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.14.2",
+ "@babel/types": "^7.14.5",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-annotate-as-pure": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.12.13"
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-explode-assignable-expression": "^7.12.13",
- "@babel/types": "^7.12.13"
+ "@babel/helper-explode-assignable-expression": "^7.14.5",
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-compilation-targets": {
- "version": "7.14.4",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/compat-data": "^7.14.4",
- "@babel/helper-validator-option": "^7.12.17",
+ "@babel/compat-data": "^7.14.5",
+ "@babel/helper-validator-option": "^7.14.5",
"browserslist": "^4.16.6",
"semver": "^6.3.0"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0"
}
@@ -152,27 +169,33 @@
}
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.14.4",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
- "@babel/helper-function-name": "^7.14.2",
- "@babel/helper-member-expression-to-functions": "^7.13.12",
- "@babel/helper-optimise-call-expression": "^7.12.13",
- "@babel/helper-replace-supers": "^7.14.4",
- "@babel/helper-split-export-declaration": "^7.12.13"
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-function-name": "^7.14.5",
+ "@babel/helper-member-expression-to-functions": "^7.14.5",
+ "@babel/helper-optimise-call-expression": "^7.14.5",
+ "@babel/helper-replace-supers": "^7.14.5",
+ "@babel/helper-split-export-declaration": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
}
},
"node_modules/@babel/helper-create-regexp-features-plugin": {
- "version": "7.14.3",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
+ "@babel/helper-annotate-as-pure": "^7.14.5",
"regexpu-core": "^4.7.1"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0"
}
@@ -202,153 +225,209 @@
}
},
"node_modules/@babel/helper-explode-assignable-expression": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.13.0"
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-function-name": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-get-function-arity": "^7.12.13",
- "@babel/template": "^7.12.13",
- "@babel/types": "^7.14.2"
+ "@babel/helper-get-function-arity": "^7.14.5",
+ "@babel/template": "^7.14.5",
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-get-function-arity": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.12.13"
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-hoist-variables": {
- "version": "7.13.16",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/traverse": "^7.13.15",
- "@babel/types": "^7.13.16"
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-member-expression-to-functions": {
- "version": "7.13.12",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.13.12"
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-module-imports": {
- "version": "7.13.12",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.13.12"
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-imports": "^7.13.12",
- "@babel/helper-replace-supers": "^7.13.12",
- "@babel/helper-simple-access": "^7.13.12",
- "@babel/helper-split-export-declaration": "^7.12.13",
- "@babel/helper-validator-identifier": "^7.14.0",
- "@babel/template": "^7.12.13",
- "@babel/traverse": "^7.14.2",
- "@babel/types": "^7.14.2"
+ "@babel/helper-module-imports": "^7.14.5",
+ "@babel/helper-replace-supers": "^7.14.5",
+ "@babel/helper-simple-access": "^7.14.5",
+ "@babel/helper-split-export-declaration": "^7.14.5",
+ "@babel/helper-validator-identifier": "^7.14.5",
+ "@babel/template": "^7.14.5",
+ "@babel/traverse": "^7.14.5",
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-optimise-call-expression": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.12.13"
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-plugin-utils": {
- "version": "7.13.0",
- "license": "MIT"
+ "version": "7.14.5",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
"node_modules/@babel/helper-remap-async-to-generator": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
- "@babel/helper-wrap-function": "^7.13.0",
- "@babel/types": "^7.13.0"
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-wrap-function": "^7.14.5",
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-replace-supers": {
- "version": "7.14.4",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-member-expression-to-functions": "^7.13.12",
- "@babel/helper-optimise-call-expression": "^7.12.13",
- "@babel/traverse": "^7.14.2",
- "@babel/types": "^7.14.4"
+ "@babel/helper-member-expression-to-functions": "^7.14.5",
+ "@babel/helper-optimise-call-expression": "^7.14.5",
+ "@babel/traverse": "^7.14.5",
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-simple-access": {
- "version": "7.13.12",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.13.12"
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
- "version": "7.12.1",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.12.1"
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-split-export-declaration": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.12.13"
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.14.0",
- "license": "MIT"
+ "version": "7.14.5",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
"node_modules/@babel/helper-validator-option": {
- "version": "7.12.17",
- "license": "MIT"
+ "version": "7.14.5",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
"node_modules/@babel/helper-wrap-function": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-function-name": "^7.12.13",
- "@babel/template": "^7.12.13",
- "@babel/traverse": "^7.13.0",
- "@babel/types": "^7.13.0"
+ "@babel/helper-function-name": "^7.14.5",
+ "@babel/template": "^7.14.5",
+ "@babel/traverse": "^7.14.5",
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/helpers": {
- "version": "7.14.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/template": "^7.12.13",
- "@babel/traverse": "^7.14.0",
- "@babel/types": "^7.14.0"
+ "@babel/template": "^7.14.5",
+ "@babel/traverse": "^7.14.5",
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/highlight": {
- "version": "7.14.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-validator-identifier": "^7.14.0",
+ "@babel/helper-validator-identifier": "^7.14.5",
"chalk": "^2.0.0",
"js-tokens": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/parser": {
- "version": "7.14.4",
+ "version": "7.14.5",
"license": "MIT",
"bin": {
"parser": "bin/babel-parser.js"
@@ -358,185 +437,230 @@
}
},
"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
- "version": "7.13.12",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
- "@babel/plugin-proposal-optional-chaining": "^7.13.12"
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+ "@babel/plugin-proposal-optional-chaining": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.13.0"
}
},
"node_modules/@babel/plugin-proposal-async-generator-functions": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-remap-async-to-generator": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-remap-async-to-generator": "^7.14.5",
"@babel/plugin-syntax-async-generators": "^7.8.4"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-class-properties": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.13.0",
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-create-class-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-class-static-block": {
- "version": "7.14.3",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.14.3",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/plugin-syntax-class-static-block": "^7.12.13"
+ "@babel/helper-create-class-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/plugin-syntax-class-static-block": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.12.0"
}
},
"node_modules/@babel/plugin-proposal-dynamic-import": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-export-namespace-from": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-json-strings": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-json-strings": "^7.8.3"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-logical-assignment-operators": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-numeric-separator": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-numeric-separator": "^7.10.4"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-object-rest-spread": {
- "version": "7.14.4",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/compat-data": "^7.14.4",
- "@babel/helper-compilation-targets": "^7.14.4",
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/compat-data": "^7.14.5",
+ "@babel/helper-compilation-targets": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
- "@babel/plugin-transform-parameters": "^7.14.2"
+ "@babel/plugin-transform-parameters": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-optional-catch-binding": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-optional-chaining": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
"@babel/plugin-syntax-optional-chaining": "^7.8.3"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-private-methods": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.13.0",
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-create-class-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-private-property-in-object": {
- "version": "7.14.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
- "@babel/helper-create-class-features-plugin": "^7.14.0",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/plugin-syntax-private-property-in-object": "^7.14.0"
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-create-class-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-proposal-unicode-property-regex": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
},
"engines": {
"node": ">=4"
@@ -566,10 +690,13 @@
}
},
"node_modules/@babel/plugin-syntax-class-static-block": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
@@ -606,10 +733,13 @@
}
},
"node_modules/@babel/plugin-syntax-jsx": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
@@ -676,441 +806,555 @@
}
},
"node_modules/@babel/plugin-syntax-private-property-in-object": {
- "version": "7.14.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-syntax-top-level-await": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-arrow-functions": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-async-to-generator": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-imports": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-remap-async-to-generator": "^7.13.0"
+ "@babel/helper-module-imports": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-remap-async-to-generator": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-block-scoped-functions": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-block-scoping": {
- "version": "7.14.4",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-classes": {
- "version": "7.14.4",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
- "@babel/helper-function-name": "^7.14.2",
- "@babel/helper-optimise-call-expression": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-replace-supers": "^7.14.4",
- "@babel/helper-split-export-declaration": "^7.12.13",
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-function-name": "^7.14.5",
+ "@babel/helper-optimise-call-expression": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-replace-supers": "^7.14.5",
+ "@babel/helper-split-export-declaration": "^7.14.5",
"globals": "^11.1.0"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-computed-properties": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-destructuring": {
- "version": "7.14.4",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-dotall-regex": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-duplicate-keys": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-exponentiation-operator": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-for-of": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-function-name": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-function-name": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-function-name": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-literals": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-member-expression-literals": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-modules-amd": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-transforms": "^7.14.2",
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-module-transforms": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
"babel-plugin-dynamic-import-node": "^2.3.3"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-modules-commonjs": {
- "version": "7.14.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-transforms": "^7.14.0",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-simple-access": "^7.13.12",
+ "@babel/helper-module-transforms": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-simple-access": "^7.14.5",
"babel-plugin-dynamic-import-node": "^2.3.3"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-modules-systemjs": {
- "version": "7.13.8",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-hoist-variables": "^7.13.0",
- "@babel/helper-module-transforms": "^7.13.0",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-validator-identifier": "^7.12.11",
+ "@babel/helper-hoist-variables": "^7.14.5",
+ "@babel/helper-module-transforms": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-validator-identifier": "^7.14.5",
"babel-plugin-dynamic-import-node": "^2.3.3"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-modules-umd": {
- "version": "7.14.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-transforms": "^7.14.0",
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-module-transforms": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
}
},
"node_modules/@babel/plugin-transform-new-target": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-object-super": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13",
- "@babel/helper-replace-supers": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-replace-supers": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-parameters": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-property-literals": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-react-display-name": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-react-jsx": {
- "version": "7.14.3",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
- "@babel/helper-module-imports": "^7.13.12",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/plugin-syntax-jsx": "^7.12.13",
- "@babel/types": "^7.14.2"
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-module-imports": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/plugin-syntax-jsx": "^7.14.5",
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-react-jsx-development": {
- "version": "7.12.17",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/plugin-transform-react-jsx": "^7.12.17"
+ "@babel/plugin-transform-react-jsx": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-react-pure-annotations": {
- "version": "7.12.1",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.10.4",
- "@babel/helper-plugin-utils": "^7.10.4"
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-regenerator": {
- "version": "7.13.15",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
"regenerator-transform": "^0.14.2"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-reserved-words": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-shorthand-properties": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-spread": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-sticky-regex": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-template-literals": {
- "version": "7.13.0",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-typeof-symbol": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-unicode-escapes": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/plugin-transform-unicode-regex": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/preset-env": {
- "version": "7.14.4",
- "license": "MIT",
- "dependencies": {
- "@babel/compat-data": "^7.14.4",
- "@babel/helper-compilation-targets": "^7.14.4",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-validator-option": "^7.12.17",
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12",
- "@babel/plugin-proposal-async-generator-functions": "^7.14.2",
- "@babel/plugin-proposal-class-properties": "^7.13.0",
- "@babel/plugin-proposal-class-static-block": "^7.14.3",
- "@babel/plugin-proposal-dynamic-import": "^7.14.2",
- "@babel/plugin-proposal-export-namespace-from": "^7.14.2",
- "@babel/plugin-proposal-json-strings": "^7.14.2",
- "@babel/plugin-proposal-logical-assignment-operators": "^7.14.2",
- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2",
- "@babel/plugin-proposal-numeric-separator": "^7.14.2",
- "@babel/plugin-proposal-object-rest-spread": "^7.14.4",
- "@babel/plugin-proposal-optional-catch-binding": "^7.14.2",
- "@babel/plugin-proposal-optional-chaining": "^7.14.2",
- "@babel/plugin-proposal-private-methods": "^7.13.0",
- "@babel/plugin-proposal-private-property-in-object": "^7.14.0",
- "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",
+ "version": "7.14.5",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/compat-data": "^7.14.5",
+ "@babel/helper-compilation-targets": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-validator-option": "^7.14.5",
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
+ "@babel/plugin-proposal-async-generator-functions": "^7.14.5",
+ "@babel/plugin-proposal-class-properties": "^7.14.5",
+ "@babel/plugin-proposal-class-static-block": "^7.14.5",
+ "@babel/plugin-proposal-dynamic-import": "^7.14.5",
+ "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+ "@babel/plugin-proposal-json-strings": "^7.14.5",
+ "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+ "@babel/plugin-proposal-numeric-separator": "^7.14.5",
+ "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
+ "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
+ "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+ "@babel/plugin-proposal-private-methods": "^7.14.5",
+ "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
+ "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
"@babel/plugin-syntax-async-generators": "^7.8.4",
"@babel/plugin-syntax-class-properties": "^7.12.13",
- "@babel/plugin-syntax-class-static-block": "^7.12.13",
+ "@babel/plugin-syntax-class-static-block": "^7.14.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
"@babel/plugin-syntax-json-strings": "^7.8.3",
@@ -1120,48 +1364,51 @@
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
"@babel/plugin-syntax-optional-chaining": "^7.8.3",
- "@babel/plugin-syntax-private-property-in-object": "^7.14.0",
- "@babel/plugin-syntax-top-level-await": "^7.12.13",
- "@babel/plugin-transform-arrow-functions": "^7.13.0",
- "@babel/plugin-transform-async-to-generator": "^7.13.0",
- "@babel/plugin-transform-block-scoped-functions": "^7.12.13",
- "@babel/plugin-transform-block-scoping": "^7.14.4",
- "@babel/plugin-transform-classes": "^7.14.4",
- "@babel/plugin-transform-computed-properties": "^7.13.0",
- "@babel/plugin-transform-destructuring": "^7.14.4",
- "@babel/plugin-transform-dotall-regex": "^7.12.13",
- "@babel/plugin-transform-duplicate-keys": "^7.12.13",
- "@babel/plugin-transform-exponentiation-operator": "^7.12.13",
- "@babel/plugin-transform-for-of": "^7.13.0",
- "@babel/plugin-transform-function-name": "^7.12.13",
- "@babel/plugin-transform-literals": "^7.12.13",
- "@babel/plugin-transform-member-expression-literals": "^7.12.13",
- "@babel/plugin-transform-modules-amd": "^7.14.2",
- "@babel/plugin-transform-modules-commonjs": "^7.14.0",
- "@babel/plugin-transform-modules-systemjs": "^7.13.8",
- "@babel/plugin-transform-modules-umd": "^7.14.0",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",
- "@babel/plugin-transform-new-target": "^7.12.13",
- "@babel/plugin-transform-object-super": "^7.12.13",
- "@babel/plugin-transform-parameters": "^7.14.2",
- "@babel/plugin-transform-property-literals": "^7.12.13",
- "@babel/plugin-transform-regenerator": "^7.13.15",
- "@babel/plugin-transform-reserved-words": "^7.12.13",
- "@babel/plugin-transform-shorthand-properties": "^7.12.13",
- "@babel/plugin-transform-spread": "^7.13.0",
- "@babel/plugin-transform-sticky-regex": "^7.12.13",
- "@babel/plugin-transform-template-literals": "^7.13.0",
- "@babel/plugin-transform-typeof-symbol": "^7.12.13",
- "@babel/plugin-transform-unicode-escapes": "^7.12.13",
- "@babel/plugin-transform-unicode-regex": "^7.12.13",
+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+ "@babel/plugin-syntax-top-level-await": "^7.14.5",
+ "@babel/plugin-transform-arrow-functions": "^7.14.5",
+ "@babel/plugin-transform-async-to-generator": "^7.14.5",
+ "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
+ "@babel/plugin-transform-block-scoping": "^7.14.5",
+ "@babel/plugin-transform-classes": "^7.14.5",
+ "@babel/plugin-transform-computed-properties": "^7.14.5",
+ "@babel/plugin-transform-destructuring": "^7.14.5",
+ "@babel/plugin-transform-dotall-regex": "^7.14.5",
+ "@babel/plugin-transform-duplicate-keys": "^7.14.5",
+ "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
+ "@babel/plugin-transform-for-of": "^7.14.5",
+ "@babel/plugin-transform-function-name": "^7.14.5",
+ "@babel/plugin-transform-literals": "^7.14.5",
+ "@babel/plugin-transform-member-expression-literals": "^7.14.5",
+ "@babel/plugin-transform-modules-amd": "^7.14.5",
+ "@babel/plugin-transform-modules-commonjs": "^7.14.5",
+ "@babel/plugin-transform-modules-systemjs": "^7.14.5",
+ "@babel/plugin-transform-modules-umd": "^7.14.5",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.5",
+ "@babel/plugin-transform-new-target": "^7.14.5",
+ "@babel/plugin-transform-object-super": "^7.14.5",
+ "@babel/plugin-transform-parameters": "^7.14.5",
+ "@babel/plugin-transform-property-literals": "^7.14.5",
+ "@babel/plugin-transform-regenerator": "^7.14.5",
+ "@babel/plugin-transform-reserved-words": "^7.14.5",
+ "@babel/plugin-transform-shorthand-properties": "^7.14.5",
+ "@babel/plugin-transform-spread": "^7.14.5",
+ "@babel/plugin-transform-sticky-regex": "^7.14.5",
+ "@babel/plugin-transform-template-literals": "^7.14.5",
+ "@babel/plugin-transform-typeof-symbol": "^7.14.5",
+ "@babel/plugin-transform-unicode-escapes": "^7.14.5",
+ "@babel/plugin-transform-unicode-regex": "^7.14.5",
"@babel/preset-modules": "^0.1.4",
- "@babel/types": "^7.14.4",
- "babel-plugin-polyfill-corejs2": "^0.2.0",
- "babel-plugin-polyfill-corejs3": "^0.2.0",
- "babel-plugin-polyfill-regenerator": "^0.2.0",
- "core-js-compat": "^3.9.0",
+ "@babel/types": "^7.14.5",
+ "babel-plugin-polyfill-corejs2": "^0.2.2",
+ "babel-plugin-polyfill-corejs3": "^0.2.2",
+ "babel-plugin-polyfill-regenerator": "^0.2.2",
+ "core-js-compat": "^3.14.0",
"semver": "^6.3.0"
},
+ "engines": {
+ "node": ">=6.9.0"
+ },
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
@@ -1188,22 +1435,25 @@
}
},
"node_modules/@babel/preset-react": {
- "version": "7.13.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-validator-option": "^7.12.17",
- "@babel/plugin-transform-react-display-name": "^7.12.13",
- "@babel/plugin-transform-react-jsx": "^7.13.12",
- "@babel/plugin-transform-react-jsx-development": "^7.12.17",
- "@babel/plugin-transform-react-pure-annotations": "^7.12.1"
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-validator-option": "^7.14.5",
+ "@babel/plugin-transform-react-display-name": "^7.14.5",
+ "@babel/plugin-transform-react-jsx": "^7.14.5",
+ "@babel/plugin-transform-react-jsx-development": "^7.14.5",
+ "@babel/plugin-transform-react-pure-annotations": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/runtime": {
- "version": "7.12.5",
+ "version": "7.14.0",
"license": "MIT",
"dependencies": {
"regenerator-runtime": "^0.13.4"
@@ -1219,34 +1469,44 @@
}
},
"node_modules/@babel/template": {
- "version": "7.12.13",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/code-frame": "^7.12.13",
- "@babel/parser": "^7.12.13",
- "@babel/types": "^7.12.13"
+ "@babel/code-frame": "^7.14.5",
+ "@babel/parser": "^7.14.5",
+ "@babel/types": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/traverse": {
- "version": "7.14.2",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/code-frame": "^7.12.13",
- "@babel/generator": "^7.14.2",
- "@babel/helper-function-name": "^7.14.2",
- "@babel/helper-split-export-declaration": "^7.12.13",
- "@babel/parser": "^7.14.2",
- "@babel/types": "^7.14.2",
+ "@babel/code-frame": "^7.14.5",
+ "@babel/generator": "^7.14.5",
+ "@babel/helper-function-name": "^7.14.5",
+ "@babel/helper-hoist-variables": "^7.14.5",
+ "@babel/helper-split-export-declaration": "^7.14.5",
+ "@babel/parser": "^7.14.5",
+ "@babel/types": "^7.14.5",
"debug": "^4.1.0",
"globals": "^11.1.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@babel/types": {
- "version": "7.14.4",
+ "version": "7.14.5",
"license": "MIT",
"dependencies": {
- "@babel/helper-validator-identifier": "^7.14.0",
+ "@babel/helper-validator-identifier": "^7.14.5",
"to-fast-properties": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
"node_modules/@discoveryjs/json-ext": {
@@ -1256,6 +1516,86 @@
"node": ">=10.0.0"
}
},
+ "node_modules/@emotion/cache": {
+ "version": "11.4.0",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.4.0.tgz",
+ "integrity": "sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==",
+ "dependencies": {
+ "@emotion/memoize": "^0.7.4",
+ "@emotion/sheet": "^1.0.0",
+ "@emotion/utils": "^1.0.0",
+ "@emotion/weak-memoize": "^0.2.5",
+ "stylis": "^4.0.3"
+ }
+ },
+ "node_modules/@emotion/hash": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
+ },
+ "node_modules/@emotion/memoize": {
+ "version": "0.7.5",
+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",
+ "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
+ },
+ "node_modules/@emotion/react": {
+ "version": "11.4.0",
+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.4.0.tgz",
+ "integrity": "sha512-4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@emotion/cache": "^11.4.0",
+ "@emotion/serialize": "^1.0.2",
+ "@emotion/sheet": "^1.0.1",
+ "@emotion/utils": "^1.0.0",
+ "@emotion/weak-memoize": "^0.2.5",
+ "hoist-non-react-statics": "^3.3.1"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0",
+ "react": ">=16.8.0"
+ },
+ "peerDependenciesMeta": {
+ "@babel/core": {
+ "optional": true
+ },
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@emotion/serialize": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.2.tgz",
+ "integrity": "sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==",
+ "dependencies": {
+ "@emotion/hash": "^0.8.0",
+ "@emotion/memoize": "^0.7.4",
+ "@emotion/unitless": "^0.7.5",
+ "@emotion/utils": "^1.0.0",
+ "csstype": "^3.0.2"
+ }
+ },
+ "node_modules/@emotion/sheet": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz",
+ "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="
+ },
+ "node_modules/@emotion/unitless": {
+ "version": "0.7.5",
+ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+ },
+ "node_modules/@emotion/utils": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz",
+ "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA=="
+ },
+ "node_modules/@emotion/weak-memoize": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
+ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
+ },
"node_modules/@eslint/eslintrc": {
"version": "0.2.2",
"dev": true,
@@ -1356,9 +1696,8 @@
},
"node_modules/@polka/url": {
"version": "1.0.0-next.15",
- "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
- "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/@stylelint/postcss-css-in-js": {
"version": "0.37.2",
@@ -1393,7 +1732,7 @@
}
},
"node_modules/@tailwindcss/forms": {
- "version": "0.3.2",
+ "version": "0.3.3",
"license": "MIT",
"dependencies": {
"mini-svg-data-uri": "^1.2.3"
@@ -1417,7 +1756,8 @@
},
"node_modules/@trysound/sax": {
"version": "0.1.1",
- "license": "ISC",
+ "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz",
+ "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==",
"engines": {
"node": ">=10.13.0"
}
@@ -1427,7 +1767,7 @@
"license": "MIT"
},
"node_modules/@types/eslint": {
- "version": "7.2.12",
+ "version": "7.2.13",
"license": "MIT",
"dependencies": {
"@types/estree": "*",
@@ -1603,7 +1943,7 @@
}
},
"node_modules/@webpack-cli/configtest": {
- "version": "1.0.3",
+ "version": "1.0.4",
"license": "MIT",
"peerDependencies": {
"webpack": "4.x.x || 5.x.x",
@@ -1611,7 +1951,7 @@
}
},
"node_modules/@webpack-cli/info": {
- "version": "1.2.4",
+ "version": "1.3.0",
"license": "MIT",
"dependencies": {
"envinfo": "^7.7.3"
@@ -1621,7 +1961,7 @@
}
},
"node_modules/@webpack-cli/serve": {
- "version": "1.4.0",
+ "version": "1.5.1",
"license": "MIT",
"peerDependencies": {
"webpack-cli": "4.x.x"
@@ -1718,11 +2058,11 @@
}
},
"node_modules/ansi-regex": {
- "version": "4.1.0",
+ "version": "5.0.0",
"dev": true,
"license": "MIT",
"engines": {
- "node": ">=6"
+ "node": ">=8"
}
},
"node_modules/ansi-styles": {
@@ -1937,11 +2277,11 @@
"license": "ISC"
},
"node_modules/astral-regex": {
- "version": "1.0.0",
+ "version": "2.0.0",
"dev": true,
"license": "MIT",
"engines": {
- "node": ">=4"
+ "node": ">=8"
}
},
"node_modules/at-least-node": {
@@ -2248,7 +2588,7 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001230",
+ "version": "1.0.30001236",
"license": "CC-BY-4.0",
"funding": {
"type": "opencollective",
@@ -2296,8 +2636,7 @@
},
"node_modules/chart.js": {
"version": "3.3.2",
- "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.3.2.tgz",
- "integrity": "sha512-H0hSO7xqTIrwxoACqnSoNromEMfXvfuVnrbuSt2TuXfBDDofbnto4zuZlRtRvC73/b37q3wGAWZyUU41QPvNbA=="
+ "license": "MIT"
},
"node_modules/chokidar": {
"version": "3.5.1",
@@ -2398,8 +2737,12 @@
"license": "MIT"
},
"node_modules/commander": {
- "version": "2.20.0",
- "license": "MIT"
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+ "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+ "engines": {
+ "node": ">= 10"
+ }
},
"node_modules/commondir": {
"version": "1.0.1",
@@ -2479,7 +2822,7 @@
}
},
"node_modules/core-js-compat": {
- "version": "3.13.1",
+ "version": "3.14.0",
"license": "MIT",
"dependencies": {
"browserslist": "^4.16.6",
@@ -2662,11 +3005,11 @@
"license": "ISC"
},
"node_modules/css-minimizer-webpack-plugin": {
- "version": "3.0.0",
+ "version": "3.0.1",
"license": "MIT",
"dependencies": {
"cssnano": "^5.0.0",
- "jest-worker": "^26.3.0",
+ "jest-worker": "^27.0.2",
"p-limit": "^3.0.2",
"postcss": "^8.2.9",
"schema-utils": "^3.0.0",
@@ -3078,9 +3421,8 @@
},
"node_modules/duplexer": {
"version": "0.1.2",
- "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
- "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/duplexer2": {
"version": "0.1.4",
@@ -3094,7 +3436,7 @@
"license": "ISC"
},
"node_modules/emoji-regex": {
- "version": "7.0.3",
+ "version": "8.0.0",
"dev": true,
"license": "MIT"
},
@@ -3255,28 +3597,30 @@
}
},
"node_modules/eslint": {
- "version": "7.15.0",
+ "version": "7.28.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/code-frame": "^7.0.0",
- "@eslint/eslintrc": "^0.2.2",
+ "@babel/code-frame": "7.12.11",
+ "@eslint/eslintrc": "^0.4.2",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
"debug": "^4.0.1",
"doctrine": "^3.0.0",
"enquirer": "^2.3.5",
+ "escape-string-regexp": "^4.0.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^2.1.0",
"eslint-visitor-keys": "^2.0.0",
"espree": "^7.3.1",
- "esquery": "^1.2.0",
+ "esquery": "^1.4.0",
"esutils": "^2.0.2",
- "file-entry-cache": "^6.0.0",
+ "fast-deep-equal": "^3.1.3",
+ "file-entry-cache": "^6.0.1",
"functional-red-black-tree": "^1.0.1",
- "glob-parent": "^5.0.0",
- "globals": "^12.1.0",
+ "glob-parent": "^5.1.2",
+ "globals": "^13.6.0",
"ignore": "^4.0.6",
"import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
@@ -3284,7 +3628,7 @@
"js-yaml": "^3.13.1",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1",
- "lodash": "^4.17.19",
+ "lodash.merge": "^4.6.2",
"minimatch": "^3.0.4",
"natural-compare": "^1.4.0",
"optionator": "^0.9.1",
@@ -3293,7 +3637,7 @@
"semver": "^7.2.1",
"strip-ansi": "^6.0.0",
"strip-json-comments": "^3.1.0",
- "table": "^5.2.3",
+ "table": "^6.0.9",
"text-table": "^0.2.0",
"v8-compile-cache": "^2.0.3"
},
@@ -3675,7 +4019,7 @@
}
},
"node_modules/eslint/node_modules/chalk": {
- "version": "4.1.0",
+ "version": "4.1.1",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -3706,7 +4050,7 @@
"license": "MIT"
},
"node_modules/eslint/node_modules/glob-parent": {
- "version": "5.1.1",
+ "version": "5.1.2",
"dev": true,
"license": "ISC",
"dependencies": {
@@ -3717,11 +4061,11 @@
}
},
"node_modules/eslint/node_modules/globals": {
- "version": "12.4.0",
+ "version": "13.9.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "type-fest": "^0.8.1"
+ "type-fest": "^0.20.2"
},
"engines": {
"node": ">=8"
@@ -3747,7 +4091,7 @@
}
},
"node_modules/eslint/node_modules/import-fresh": {
- "version": "3.2.2",
+ "version": "3.3.0",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -3756,6 +4100,9 @@
},
"engines": {
"node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/eslint/node_modules/levn": {
@@ -3814,7 +4161,7 @@
}
},
"node_modules/eslint/node_modules/semver": {
- "version": "7.3.4",
+ "version": "7.3.5",
"dev": true,
"license": "ISC",
"dependencies": {
@@ -3974,7 +4321,7 @@
}
},
"node_modules/execa": {
- "version": "5.0.0",
+ "version": "5.1.1",
"license": "MIT",
"dependencies": {
"cross-spawn": "^7.0.3",
@@ -4092,7 +4439,7 @@
}
},
"node_modules/file-entry-cache": {
- "version": "6.0.0",
+ "version": "6.0.1",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -4410,9 +4757,8 @@
},
"node_modules/gzip-size": {
"version": "6.0.0",
- "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
- "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"duplexer": "^0.1.2"
},
@@ -4908,12 +5254,12 @@
}
},
"node_modules/jest-worker": {
- "version": "26.6.2",
+ "version": "27.0.2",
"license": "MIT",
"dependencies": {
"@types/node": "*",
"merge-stream": "^2.0.0",
- "supports-color": "^7.0.0"
+ "supports-color": "^8.0.0"
},
"engines": {
"node": ">= 10.13.0"
@@ -4927,13 +5273,16 @@
}
},
"node_modules/jest-worker/node_modules/supports-color": {
- "version": "7.2.0",
+ "version": "8.1.1",
"license": "MIT",
"dependencies": {
"has-flag": "^4.0.0"
},
"engines": {
- "node": ">=8"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/supports-color?sponsor=1"
}
},
"node_modules/js-tokens": {
@@ -5344,6 +5693,11 @@
"version": "2.0.14",
"license": "CC0-1.0"
},
+ "node_modules/memoize-one": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+ "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
+ },
"node_modules/meow": {
"version": "8.0.0",
"dev": true,
@@ -5568,9 +5922,8 @@
},
"node_modules/mime": {
"version": "2.5.2",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
- "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
"dev": true,
+ "license": "MIT",
"bin": {
"mime": "cli.js"
},
@@ -5579,17 +5932,17 @@
}
},
"node_modules/mime-db": {
- "version": "1.47.0",
+ "version": "1.48.0",
"license": "MIT",
"engines": {
"node": ">= 0.6"
}
},
"node_modules/mime-types": {
- "version": "2.1.30",
+ "version": "2.1.31",
"license": "MIT",
"dependencies": {
- "mime-db": "1.47.0"
+ "mime-db": "1.48.0"
},
"engines": {
"node": ">= 0.6"
@@ -5746,13 +6099,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/normalize-url": {
- "version": "4.5.1",
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/npm-run-path": {
"version": "4.0.1",
"license": "MIT",
@@ -5955,9 +6301,8 @@
},
"node_modules/opener": {
"version": "1.5.2",
- "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
- "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
"dev": true,
+ "license": "(WTFPL OR MIT)",
"bin": {
"opener": "bin/opener-bin.js"
}
@@ -6148,8 +6493,9 @@
}
},
"node_modules/postcss": {
- "version": "8.3.0",
- "license": "MIT",
+ "version": "8.3.5",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz",
+ "integrity": "sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==",
"dependencies": {
"colorette": "^1.2.2",
"nanoid": "^3.1.23",
@@ -6323,7 +6669,7 @@
}
},
"node_modules/postcss-less/node_modules/postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -6720,6 +7066,14 @@
"postcss": "^8.2.15"
}
},
+ "node_modules/postcss-normalize-url/node_modules/normalize-url": {
+ "version": "4.5.1",
+ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+ "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
"version": "4.1.0",
"license": "MIT"
@@ -6808,7 +7162,7 @@
}
},
"node_modules/postcss-safe-parser/node_modules/postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -6853,7 +7207,7 @@
}
},
"node_modules/postcss-sass/node_modules/postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -6900,7 +7254,7 @@
}
},
"node_modules/postcss-scss/node_modules/postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -7103,8 +7457,9 @@
}
},
"node_modules/react": {
- "version": "16.13.1",
- "license": "MIT",
+ "version": "16.14.0",
+ "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
+ "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
"dependencies": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
@@ -7115,8 +7470,9 @@
}
},
"node_modules/react-dom": {
- "version": "16.13.1",
- "license": "MIT",
+ "version": "16.14.0",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
+ "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
"dependencies": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
@@ -7124,12 +7480,13 @@
"scheduler": "^0.19.1"
},
"peerDependencies": {
- "react": "^16.13.1"
+ "react": "^16.14.0"
}
},
"node_modules/react-flatpickr": {
"version": "3.10.5",
- "license": "MIT",
+ "resolved": "https://registry.npmjs.org/react-flatpickr/-/react-flatpickr-3.10.5.tgz",
+ "integrity": "sha512-MZlBN9Ml4FLFoR5tS61T9BjJRIrwF0mKDqC+ni5ZgdtIbWVebp6emx9jpg8QuXv5hSr1W1by3Tqv3ebZXU7rhg==",
"dependencies": {
"flatpickr": "^4.6.2",
"prop-types": "^15.5.10"
@@ -7143,6 +7500,17 @@
"react-dom": ">=16.3.x"
}
},
+ "node_modules/react-input-autosize": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",
+ "integrity": "sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==",
+ "dependencies": {
+ "prop-types": "^15.5.8"
+ },
+ "peerDependencies": {
+ "react": "^16.3.0 || ^17.0.0"
+ }
+ },
"node_modules/react-is": {
"version": "16.11.0",
"license": "MIT"
@@ -7182,6 +7550,24 @@
"react": ">=15"
}
},
+ "node_modules/react-select": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/react-select/-/react-select-4.3.1.tgz",
+ "integrity": "sha512-HBBd0dYwkF5aZk1zP81Wx5UsLIIT2lSvAY2JiJo199LjoLHoivjn9//KsmvQMEFGNhe58xyuOITjfxKCcGc62Q==",
+ "dependencies": {
+ "@babel/runtime": "^7.12.0",
+ "@emotion/cache": "^11.4.0",
+ "@emotion/react": "^11.1.1",
+ "memoize-one": "^5.0.0",
+ "prop-types": "^15.6.0",
+ "react-input-autosize": "^3.0.0",
+ "react-transition-group": "^4.3.0"
+ },
+ "peerDependencies": {
+ "react": "^16.8.0 || ^17.0.0",
+ "react-dom": "^16.8.0 || ^17.0.0"
+ }
+ },
"node_modules/react-transition-group": {
"version": "4.4.2",
"license": "BSD-3-Clause",
@@ -7540,7 +7926,8 @@
},
"node_modules/scheduler": {
"version": "0.19.1",
- "license": "MIT",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
+ "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
"dependencies": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
@@ -7688,9 +8075,8 @@
},
"node_modules/sirv": {
"version": "1.0.12",
- "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
- "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@polka/url": "^1.0.0-next.15",
"mime": "^2.3.1",
@@ -7981,14 +8367,14 @@
}
},
"node_modules/strip-ansi": {
- "version": "5.2.0",
+ "version": "6.0.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "ansi-regex": "^4.1.0"
+ "ansi-regex": "^5.0.0"
},
"engines": {
- "node": ">=6"
+ "node": ">=8"
}
},
"node_modules/strip-bom": {
@@ -8263,7 +8649,7 @@
}
},
"node_modules/stylelint/node_modules/postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -8432,6 +8818,11 @@
"node": ">=10.0.0"
}
},
+ "node_modules/stylis": {
+ "version": "4.0.10",
+ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz",
+ "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="
+ },
"node_modules/sugarss": {
"version": "2.0.0",
"dev": true,
@@ -8441,7 +8832,7 @@
}
},
"node_modules/sugarss/node_modules/postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -8492,7 +8883,8 @@
},
"node_modules/svgo": {
"version": "2.3.0",
- "license": "MIT",
+ "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.0.tgz",
+ "integrity": "sha512-fz4IKjNO6HDPgIQxu4IxwtubtbSfGEAJUq/IXyTPIkGhWck/faiiwfkvsB8LnBkKLvSoyNNIY6d13lZprJMc9Q==",
"dependencies": {
"@trysound/sax": "0.1.1",
"chalk": "^4.1.0",
@@ -8550,13 +8942,6 @@
"version": "1.1.4",
"license": "MIT"
},
- "node_modules/svgo/node_modules/commander": {
- "version": "7.2.0",
- "license": "MIT",
- "engines": {
- "node": ">= 10"
- }
- },
"node_modules/svgo/node_modules/has-flag": {
"version": "4.0.0",
"license": "MIT",
@@ -8589,7 +8974,7 @@
}
},
"node_modules/tailwindcss": {
- "version": "2.1.2",
+ "version": "2.1.4",
"license": "MIT",
"dependencies": {
"@fullhuman/postcss-purgecss": "^3.1.3",
@@ -8727,10 +9112,10 @@
}
},
"node_modules/terser-webpack-plugin": {
- "version": "5.1.2",
+ "version": "5.1.3",
"license": "MIT",
"dependencies": {
- "jest-worker": "^26.6.2",
+ "jest-worker": "^27.0.2",
"p-limit": "^3.1.0",
"schema-utils": "^3.0.0",
"serialize-javascript": "^5.0.1",
@@ -8838,9 +9223,8 @@
},
"node_modules/totalist": {
"version": "1.1.0",
- "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
- "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=6"
}
@@ -9192,9 +9576,8 @@
},
"node_modules/webpack-bundle-analyzer": {
"version": "4.4.2",
- "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz",
- "integrity": "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"acorn": "^8.0.4",
"acorn-walk": "^8.0.0",
@@ -9215,9 +9598,8 @@
},
"node_modules/webpack-bundle-analyzer/node_modules/acorn": {
"version": "8.3.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz",
- "integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==",
"dev": true,
+ "license": "MIT",
"bin": {
"acorn": "bin/acorn"
},
@@ -9227,18 +9609,16 @@
},
"node_modules/webpack-bundle-analyzer/node_modules/acorn-walk": {
"version": "8.1.0",
- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz",
- "integrity": "sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=0.4.0"
}
},
"node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {
"version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"color-convert": "^2.0.1"
},
@@ -9251,9 +9631,8 @@
},
"node_modules/webpack-bundle-analyzer/node_modules/chalk": {
"version": "4.1.1",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
- "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -9267,9 +9646,8 @@
},
"node_modules/webpack-bundle-analyzer/node_modules/color-convert": {
"version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"color-name": "~1.1.4"
},
@@ -9279,33 +9657,29 @@
},
"node_modules/webpack-bundle-analyzer/node_modules/color-name": {
"version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/webpack-bundle-analyzer/node_modules/commander": {
"version": "6.2.1",
- "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
- "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">= 6"
}
},
"node_modules/webpack-bundle-analyzer/node_modules/has-flag": {
"version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=8"
}
},
"node_modules/webpack-bundle-analyzer/node_modules/supports-color": {
"version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"has-flag": "^4.0.0"
},
@@ -9314,13 +9688,13 @@
}
},
"node_modules/webpack-cli": {
- "version": "4.7.0",
+ "version": "4.7.2",
"license": "MIT",
"dependencies": {
"@discoveryjs/json-ext": "^0.5.0",
- "@webpack-cli/configtest": "^1.0.3",
- "@webpack-cli/info": "^1.2.4",
- "@webpack-cli/serve": "^1.4.0",
+ "@webpack-cli/configtest": "^1.0.4",
+ "@webpack-cli/info": "^1.3.0",
+ "@webpack-cli/serve": "^1.5.1",
"colorette": "^1.2.1",
"commander": "^7.0.0",
"execa": "^5.0.0",
@@ -9355,15 +9729,8 @@
}
}
},
- "node_modules/webpack-cli/node_modules/commander": {
- "version": "7.2.0",
- "license": "MIT",
- "engines": {
- "node": ">= 10"
- }
- },
"node_modules/webpack-merge": {
- "version": "5.7.3",
+ "version": "5.8.0",
"license": "MIT",
"dependencies": {
"clone-deep": "^4.0.1",
@@ -9389,7 +9756,7 @@
}
},
"node_modules/webpack/node_modules/acorn": {
- "version": "8.2.4",
+ "version": "8.3.0",
"license": "MIT",
"bin": {
"acorn": "bin/acorn"
@@ -9462,9 +9829,8 @@
},
"node_modules/ws": {
"version": "7.4.6",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
- "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=8.3.0"
},
@@ -9523,20 +9889,20 @@
}
},
"@babel/compat-data": {
- "version": "7.14.4"
+ "version": "7.14.5"
},
"@babel/core": {
- "version": "7.14.3",
- "requires": {
- "@babel/code-frame": "^7.12.13",
- "@babel/generator": "^7.14.3",
- "@babel/helper-compilation-targets": "^7.13.16",
- "@babel/helper-module-transforms": "^7.14.2",
- "@babel/helpers": "^7.14.0",
- "@babel/parser": "^7.14.3",
- "@babel/template": "^7.12.13",
- "@babel/traverse": "^7.14.2",
- "@babel/types": "^7.14.2",
+ "version": "7.14.5",
+ "requires": {
+ "@babel/code-frame": "^7.14.5",
+ "@babel/generator": "^7.14.5",
+ "@babel/helper-compilation-targets": "^7.14.5",
+ "@babel/helper-module-transforms": "^7.14.5",
+ "@babel/helpers": "^7.14.5",
+ "@babel/parser": "^7.14.5",
+ "@babel/template": "^7.14.5",
+ "@babel/traverse": "^7.14.5",
+ "@babel/types": "^7.14.5",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -9551,31 +9917,31 @@
}
},
"@babel/generator": {
- "version": "7.14.3",
+ "version": "7.14.5",
"requires": {
- "@babel/types": "^7.14.2",
+ "@babel/types": "^7.14.5",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
}
},
"@babel/helper-annotate-as-pure": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/types": "^7.12.13"
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-builder-binary-assignment-operator-visitor": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-explode-assignable-expression": "^7.12.13",
- "@babel/types": "^7.12.13"
+ "@babel/helper-explode-assignable-expression": "^7.14.5",
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-compilation-targets": {
- "version": "7.14.4",
+ "version": "7.14.5",
"requires": {
- "@babel/compat-data": "^7.14.4",
- "@babel/helper-validator-option": "^7.12.17",
+ "@babel/compat-data": "^7.14.5",
+ "@babel/helper-validator-option": "^7.14.5",
"browserslist": "^4.16.6",
"semver": "^6.3.0"
},
@@ -9586,20 +9952,20 @@
}
},
"@babel/helper-create-class-features-plugin": {
- "version": "7.14.4",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
- "@babel/helper-function-name": "^7.14.2",
- "@babel/helper-member-expression-to-functions": "^7.13.12",
- "@babel/helper-optimise-call-expression": "^7.12.13",
- "@babel/helper-replace-supers": "^7.14.4",
- "@babel/helper-split-export-declaration": "^7.12.13"
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-function-name": "^7.14.5",
+ "@babel/helper-member-expression-to-functions": "^7.14.5",
+ "@babel/helper-optimise-call-expression": "^7.14.5",
+ "@babel/helper-replace-supers": "^7.14.5",
+ "@babel/helper-split-export-declaration": "^7.14.5"
}
},
"@babel/helper-create-regexp-features-plugin": {
- "version": "7.14.3",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
+ "@babel/helper-annotate-as-pure": "^7.14.5",
"regexpu-core": "^4.7.1"
}
},
@@ -9622,254 +9988,253 @@
}
},
"@babel/helper-explode-assignable-expression": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/types": "^7.13.0"
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-function-name": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-get-function-arity": "^7.12.13",
- "@babel/template": "^7.12.13",
- "@babel/types": "^7.14.2"
+ "@babel/helper-get-function-arity": "^7.14.5",
+ "@babel/template": "^7.14.5",
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-get-function-arity": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/types": "^7.12.13"
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-hoist-variables": {
- "version": "7.13.16",
+ "version": "7.14.5",
"requires": {
- "@babel/traverse": "^7.13.15",
- "@babel/types": "^7.13.16"
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-member-expression-to-functions": {
- "version": "7.13.12",
+ "version": "7.14.5",
"requires": {
- "@babel/types": "^7.13.12"
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-module-imports": {
- "version": "7.13.12",
+ "version": "7.14.5",
"requires": {
- "@babel/types": "^7.13.12"
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-module-transforms": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-module-imports": "^7.13.12",
- "@babel/helper-replace-supers": "^7.13.12",
- "@babel/helper-simple-access": "^7.13.12",
- "@babel/helper-split-export-declaration": "^7.12.13",
- "@babel/helper-validator-identifier": "^7.14.0",
- "@babel/template": "^7.12.13",
- "@babel/traverse": "^7.14.2",
- "@babel/types": "^7.14.2"
+ "@babel/helper-module-imports": "^7.14.5",
+ "@babel/helper-replace-supers": "^7.14.5",
+ "@babel/helper-simple-access": "^7.14.5",
+ "@babel/helper-split-export-declaration": "^7.14.5",
+ "@babel/helper-validator-identifier": "^7.14.5",
+ "@babel/template": "^7.14.5",
+ "@babel/traverse": "^7.14.5",
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-optimise-call-expression": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/types": "^7.12.13"
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-plugin-utils": {
- "version": "7.13.0"
+ "version": "7.14.5"
},
"@babel/helper-remap-async-to-generator": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
- "@babel/helper-wrap-function": "^7.13.0",
- "@babel/types": "^7.13.0"
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-wrap-function": "^7.14.5",
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-replace-supers": {
- "version": "7.14.4",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-member-expression-to-functions": "^7.13.12",
- "@babel/helper-optimise-call-expression": "^7.12.13",
- "@babel/traverse": "^7.14.2",
- "@babel/types": "^7.14.4"
+ "@babel/helper-member-expression-to-functions": "^7.14.5",
+ "@babel/helper-optimise-call-expression": "^7.14.5",
+ "@babel/traverse": "^7.14.5",
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-simple-access": {
- "version": "7.13.12",
+ "version": "7.14.5",
"requires": {
- "@babel/types": "^7.13.12"
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-skip-transparent-expression-wrappers": {
- "version": "7.12.1",
+ "version": "7.14.5",
"requires": {
- "@babel/types": "^7.12.1"
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-split-export-declaration": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/types": "^7.12.13"
+ "@babel/types": "^7.14.5"
}
},
"@babel/helper-validator-identifier": {
- "version": "7.14.0"
+ "version": "7.14.5"
},
"@babel/helper-validator-option": {
- "version": "7.12.17"
+ "version": "7.14.5"
},
"@babel/helper-wrap-function": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-function-name": "^7.12.13",
- "@babel/template": "^7.12.13",
- "@babel/traverse": "^7.13.0",
- "@babel/types": "^7.13.0"
+ "@babel/helper-function-name": "^7.14.5",
+ "@babel/template": "^7.14.5",
+ "@babel/traverse": "^7.14.5",
+ "@babel/types": "^7.14.5"
}
},
"@babel/helpers": {
- "version": "7.14.0",
+ "version": "7.14.5",
"requires": {
- "@babel/template": "^7.12.13",
- "@babel/traverse": "^7.14.0",
- "@babel/types": "^7.14.0"
+ "@babel/template": "^7.14.5",
+ "@babel/traverse": "^7.14.5",
+ "@babel/types": "^7.14.5"
}
},
"@babel/highlight": {
- "version": "7.14.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-validator-identifier": "^7.14.0",
+ "@babel/helper-validator-identifier": "^7.14.5",
"chalk": "^2.0.0",
"js-tokens": "^4.0.0"
}
},
"@babel/parser": {
- "version": "7.14.4"
+ "version": "7.14.5"
},
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
- "version": "7.13.12",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
- "@babel/plugin-proposal-optional-chaining": "^7.13.12"
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+ "@babel/plugin-proposal-optional-chaining": "^7.14.5"
}
},
"@babel/plugin-proposal-async-generator-functions": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-remap-async-to-generator": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-remap-async-to-generator": "^7.14.5",
"@babel/plugin-syntax-async-generators": "^7.8.4"
}
},
"@babel/plugin-proposal-class-properties": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.13.0",
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-create-class-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-proposal-class-static-block": {
- "version": "7.14.3",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.14.3",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/plugin-syntax-class-static-block": "^7.12.13"
+ "@babel/helper-create-class-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/plugin-syntax-class-static-block": "^7.14.5"
}
},
"@babel/plugin-proposal-dynamic-import": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3"
}
},
"@babel/plugin-proposal-export-namespace-from": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
}
},
"@babel/plugin-proposal-json-strings": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-json-strings": "^7.8.3"
}
},
"@babel/plugin-proposal-logical-assignment-operators": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
}
},
"@babel/plugin-proposal-nullish-coalescing-operator": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
}
},
"@babel/plugin-proposal-numeric-separator": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-numeric-separator": "^7.10.4"
}
},
"@babel/plugin-proposal-object-rest-spread": {
- "version": "7.14.4",
+ "version": "7.14.5",
"requires": {
- "@babel/compat-data": "^7.14.4",
- "@babel/helper-compilation-targets": "^7.14.4",
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/compat-data": "^7.14.5",
+ "@babel/helper-compilation-targets": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
- "@babel/plugin-transform-parameters": "^7.14.2"
+ "@babel/plugin-transform-parameters": "^7.14.5"
}
},
"@babel/plugin-proposal-optional-catch-binding": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-plugin-utils": "^7.14.5",
"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
}
},
"@babel/plugin-proposal-optional-chaining": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
"@babel/plugin-syntax-optional-chaining": "^7.8.3"
}
},
"@babel/plugin-proposal-private-methods": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.13.0",
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-create-class-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-proposal-private-property-in-object": {
- "version": "7.14.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
- "@babel/helper-create-class-features-plugin": "^7.14.0",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/plugin-syntax-private-property-in-object": "^7.14.0"
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-create-class-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
}
},
"@babel/plugin-proposal-unicode-property-regex": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-syntax-async-generators": {
@@ -9885,9 +10250,9 @@
}
},
"@babel/plugin-syntax-class-static-block": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-syntax-dynamic-import": {
@@ -9909,9 +10274,9 @@
}
},
"@babel/plugin-syntax-jsx": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-syntax-logical-assignment-operators": {
@@ -9951,288 +10316,288 @@
}
},
"@babel/plugin-syntax-private-property-in-object": {
- "version": "7.14.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-syntax-top-level-await": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-arrow-functions": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-async-to-generator": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-module-imports": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-remap-async-to-generator": "^7.13.0"
+ "@babel/helper-module-imports": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-remap-async-to-generator": "^7.14.5"
}
},
"@babel/plugin-transform-block-scoped-functions": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-block-scoping": {
- "version": "7.14.4",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-classes": {
- "version": "7.14.4",
- "requires": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
- "@babel/helper-function-name": "^7.14.2",
- "@babel/helper-optimise-call-expression": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-replace-supers": "^7.14.4",
- "@babel/helper-split-export-declaration": "^7.12.13",
+ "version": "7.14.5",
+ "requires": {
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-function-name": "^7.14.5",
+ "@babel/helper-optimise-call-expression": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-replace-supers": "^7.14.5",
+ "@babel/helper-split-export-declaration": "^7.14.5",
"globals": "^11.1.0"
}
},
"@babel/plugin-transform-computed-properties": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-destructuring": {
- "version": "7.14.4",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-dotall-regex": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-duplicate-keys": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-exponentiation-operator": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-for-of": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-function-name": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-function-name": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-function-name": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-literals": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-member-expression-literals": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-modules-amd": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-module-transforms": "^7.14.2",
- "@babel/helper-plugin-utils": "^7.13.0",
+ "@babel/helper-module-transforms": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
"babel-plugin-dynamic-import-node": "^2.3.3"
}
},
"@babel/plugin-transform-modules-commonjs": {
- "version": "7.14.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-module-transforms": "^7.14.0",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-simple-access": "^7.13.12",
+ "@babel/helper-module-transforms": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-simple-access": "^7.14.5",
"babel-plugin-dynamic-import-node": "^2.3.3"
}
},
"@babel/plugin-transform-modules-systemjs": {
- "version": "7.13.8",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-hoist-variables": "^7.13.0",
- "@babel/helper-module-transforms": "^7.13.0",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-validator-identifier": "^7.12.11",
+ "@babel/helper-hoist-variables": "^7.14.5",
+ "@babel/helper-module-transforms": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-validator-identifier": "^7.14.5",
"babel-plugin-dynamic-import-node": "^2.3.3"
}
},
"@babel/plugin-transform-modules-umd": {
- "version": "7.14.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-module-transforms": "^7.14.0",
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-module-transforms": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin": "^7.14.5"
}
},
"@babel/plugin-transform-new-target": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-object-super": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13",
- "@babel/helper-replace-supers": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-replace-supers": "^7.14.5"
}
},
"@babel/plugin-transform-parameters": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-property-literals": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-react-display-name": {
- "version": "7.14.2",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-react-jsx": {
- "version": "7.14.3",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.12.13",
- "@babel/helper-module-imports": "^7.13.12",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/plugin-syntax-jsx": "^7.12.13",
- "@babel/types": "^7.14.2"
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-module-imports": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/plugin-syntax-jsx": "^7.14.5",
+ "@babel/types": "^7.14.5"
}
},
"@babel/plugin-transform-react-jsx-development": {
- "version": "7.12.17",
+ "version": "7.14.5",
"requires": {
- "@babel/plugin-transform-react-jsx": "^7.12.17"
+ "@babel/plugin-transform-react-jsx": "^7.14.5"
}
},
"@babel/plugin-transform-react-pure-annotations": {
- "version": "7.12.1",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.10.4",
- "@babel/helper-plugin-utils": "^7.10.4"
+ "@babel/helper-annotate-as-pure": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-regenerator": {
- "version": "7.13.15",
+ "version": "7.14.5",
"requires": {
"regenerator-transform": "^0.14.2"
}
},
"@babel/plugin-transform-reserved-words": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-shorthand-properties": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-spread": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
}
},
"@babel/plugin-transform-sticky-regex": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-template-literals": {
- "version": "7.13.0",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-typeof-symbol": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-unicode-escapes": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/plugin-transform-unicode-regex": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5"
}
},
"@babel/preset-env": {
- "version": "7.14.4",
- "requires": {
- "@babel/compat-data": "^7.14.4",
- "@babel/helper-compilation-targets": "^7.14.4",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-validator-option": "^7.12.17",
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12",
- "@babel/plugin-proposal-async-generator-functions": "^7.14.2",
- "@babel/plugin-proposal-class-properties": "^7.13.0",
- "@babel/plugin-proposal-class-static-block": "^7.14.3",
- "@babel/plugin-proposal-dynamic-import": "^7.14.2",
- "@babel/plugin-proposal-export-namespace-from": "^7.14.2",
- "@babel/plugin-proposal-json-strings": "^7.14.2",
- "@babel/plugin-proposal-logical-assignment-operators": "^7.14.2",
- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2",
- "@babel/plugin-proposal-numeric-separator": "^7.14.2",
- "@babel/plugin-proposal-object-rest-spread": "^7.14.4",
- "@babel/plugin-proposal-optional-catch-binding": "^7.14.2",
- "@babel/plugin-proposal-optional-chaining": "^7.14.2",
- "@babel/plugin-proposal-private-methods": "^7.13.0",
- "@babel/plugin-proposal-private-property-in-object": "^7.14.0",
- "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",
+ "version": "7.14.5",
+ "requires": {
+ "@babel/compat-data": "^7.14.5",
+ "@babel/helper-compilation-targets": "^7.14.5",
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-validator-option": "^7.14.5",
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
+ "@babel/plugin-proposal-async-generator-functions": "^7.14.5",
+ "@babel/plugin-proposal-class-properties": "^7.14.5",
+ "@babel/plugin-proposal-class-static-block": "^7.14.5",
+ "@babel/plugin-proposal-dynamic-import": "^7.14.5",
+ "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+ "@babel/plugin-proposal-json-strings": "^7.14.5",
+ "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+ "@babel/plugin-proposal-numeric-separator": "^7.14.5",
+ "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
+ "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
+ "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+ "@babel/plugin-proposal-private-methods": "^7.14.5",
+ "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
+ "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
"@babel/plugin-syntax-async-generators": "^7.8.4",
"@babel/plugin-syntax-class-properties": "^7.12.13",
- "@babel/plugin-syntax-class-static-block": "^7.12.13",
+ "@babel/plugin-syntax-class-static-block": "^7.14.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
"@babel/plugin-syntax-json-strings": "^7.8.3",
@@ -10242,46 +10607,46 @@
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
"@babel/plugin-syntax-optional-chaining": "^7.8.3",
- "@babel/plugin-syntax-private-property-in-object": "^7.14.0",
- "@babel/plugin-syntax-top-level-await": "^7.12.13",
- "@babel/plugin-transform-arrow-functions": "^7.13.0",
- "@babel/plugin-transform-async-to-generator": "^7.13.0",
- "@babel/plugin-transform-block-scoped-functions": "^7.12.13",
- "@babel/plugin-transform-block-scoping": "^7.14.4",
- "@babel/plugin-transform-classes": "^7.14.4",
- "@babel/plugin-transform-computed-properties": "^7.13.0",
- "@babel/plugin-transform-destructuring": "^7.14.4",
- "@babel/plugin-transform-dotall-regex": "^7.12.13",
- "@babel/plugin-transform-duplicate-keys": "^7.12.13",
- "@babel/plugin-transform-exponentiation-operator": "^7.12.13",
- "@babel/plugin-transform-for-of": "^7.13.0",
- "@babel/plugin-transform-function-name": "^7.12.13",
- "@babel/plugin-transform-literals": "^7.12.13",
- "@babel/plugin-transform-member-expression-literals": "^7.12.13",
- "@babel/plugin-transform-modules-amd": "^7.14.2",
- "@babel/plugin-transform-modules-commonjs": "^7.14.0",
- "@babel/plugin-transform-modules-systemjs": "^7.13.8",
- "@babel/plugin-transform-modules-umd": "^7.14.0",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",
- "@babel/plugin-transform-new-target": "^7.12.13",
- "@babel/plugin-transform-object-super": "^7.12.13",
- "@babel/plugin-transform-parameters": "^7.14.2",
- "@babel/plugin-transform-property-literals": "^7.12.13",
- "@babel/plugin-transform-regenerator": "^7.13.15",
- "@babel/plugin-transform-reserved-words": "^7.12.13",
- "@babel/plugin-transform-shorthand-properties": "^7.12.13",
- "@babel/plugin-transform-spread": "^7.13.0",
- "@babel/plugin-transform-sticky-regex": "^7.12.13",
- "@babel/plugin-transform-template-literals": "^7.13.0",
- "@babel/plugin-transform-typeof-symbol": "^7.12.13",
- "@babel/plugin-transform-unicode-escapes": "^7.12.13",
- "@babel/plugin-transform-unicode-regex": "^7.12.13",
+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+ "@babel/plugin-syntax-top-level-await": "^7.14.5",
+ "@babel/plugin-transform-arrow-functions": "^7.14.5",
+ "@babel/plugin-transform-async-to-generator": "^7.14.5",
+ "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
+ "@babel/plugin-transform-block-scoping": "^7.14.5",
+ "@babel/plugin-transform-classes": "^7.14.5",
+ "@babel/plugin-transform-computed-properties": "^7.14.5",
+ "@babel/plugin-transform-destructuring": "^7.14.5",
+ "@babel/plugin-transform-dotall-regex": "^7.14.5",
+ "@babel/plugin-transform-duplicate-keys": "^7.14.5",
+ "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
+ "@babel/plugin-transform-for-of": "^7.14.5",
+ "@babel/plugin-transform-function-name": "^7.14.5",
+ "@babel/plugin-transform-literals": "^7.14.5",
+ "@babel/plugin-transform-member-expression-literals": "^7.14.5",
+ "@babel/plugin-transform-modules-amd": "^7.14.5",
+ "@babel/plugin-transform-modules-commonjs": "^7.14.5",
+ "@babel/plugin-transform-modules-systemjs": "^7.14.5",
+ "@babel/plugin-transform-modules-umd": "^7.14.5",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.5",
+ "@babel/plugin-transform-new-target": "^7.14.5",
+ "@babel/plugin-transform-object-super": "^7.14.5",
+ "@babel/plugin-transform-parameters": "^7.14.5",
+ "@babel/plugin-transform-property-literals": "^7.14.5",
+ "@babel/plugin-transform-regenerator": "^7.14.5",
+ "@babel/plugin-transform-reserved-words": "^7.14.5",
+ "@babel/plugin-transform-shorthand-properties": "^7.14.5",
+ "@babel/plugin-transform-spread": "^7.14.5",
+ "@babel/plugin-transform-sticky-regex": "^7.14.5",
+ "@babel/plugin-transform-template-literals": "^7.14.5",
+ "@babel/plugin-transform-typeof-symbol": "^7.14.5",
+ "@babel/plugin-transform-unicode-escapes": "^7.14.5",
+ "@babel/plugin-transform-unicode-regex": "^7.14.5",
"@babel/preset-modules": "^0.1.4",
- "@babel/types": "^7.14.4",
- "babel-plugin-polyfill-corejs2": "^0.2.0",
- "babel-plugin-polyfill-corejs3": "^0.2.0",
- "babel-plugin-polyfill-regenerator": "^0.2.0",
- "core-js-compat": "^3.9.0",
+ "@babel/types": "^7.14.5",
+ "babel-plugin-polyfill-corejs2": "^0.2.2",
+ "babel-plugin-polyfill-corejs3": "^0.2.2",
+ "babel-plugin-polyfill-regenerator": "^0.2.2",
+ "core-js-compat": "^3.14.0",
"semver": "^6.3.0"
},
"dependencies": {
@@ -10301,18 +10666,18 @@
}
},
"@babel/preset-react": {
- "version": "7.13.13",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/helper-validator-option": "^7.12.17",
- "@babel/plugin-transform-react-display-name": "^7.12.13",
- "@babel/plugin-transform-react-jsx": "^7.13.12",
- "@babel/plugin-transform-react-jsx-development": "^7.12.17",
- "@babel/plugin-transform-react-pure-annotations": "^7.12.1"
+ "@babel/helper-plugin-utils": "^7.14.5",
+ "@babel/helper-validator-option": "^7.14.5",
+ "@babel/plugin-transform-react-display-name": "^7.14.5",
+ "@babel/plugin-transform-react-jsx": "^7.14.5",
+ "@babel/plugin-transform-react-jsx-development": "^7.14.5",
+ "@babel/plugin-transform-react-pure-annotations": "^7.14.5"
}
},
"@babel/runtime": {
- "version": "7.12.5",
+ "version": "7.14.0",
"requires": {
"regenerator-runtime": "^0.13.4"
}
@@ -10326,36 +10691,105 @@
}
},
"@babel/template": {
- "version": "7.12.13",
+ "version": "7.14.5",
"requires": {
- "@babel/code-frame": "^7.12.13",
- "@babel/parser": "^7.12.13",
- "@babel/types": "^7.12.13"
+ "@babel/code-frame": "^7.14.5",
+ "@babel/parser": "^7.14.5",
+ "@babel/types": "^7.14.5"
}
},
"@babel/traverse": {
- "version": "7.14.2",
- "requires": {
- "@babel/code-frame": "^7.12.13",
- "@babel/generator": "^7.14.2",
- "@babel/helper-function-name": "^7.14.2",
- "@babel/helper-split-export-declaration": "^7.12.13",
- "@babel/parser": "^7.14.2",
- "@babel/types": "^7.14.2",
+ "version": "7.14.5",
+ "requires": {
+ "@babel/code-frame": "^7.14.5",
+ "@babel/generator": "^7.14.5",
+ "@babel/helper-function-name": "^7.14.5",
+ "@babel/helper-hoist-variables": "^7.14.5",
+ "@babel/helper-split-export-declaration": "^7.14.5",
+ "@babel/parser": "^7.14.5",
+ "@babel/types": "^7.14.5",
"debug": "^4.1.0",
"globals": "^11.1.0"
}
},
"@babel/types": {
- "version": "7.14.4",
+ "version": "7.14.5",
"requires": {
- "@babel/helper-validator-identifier": "^7.14.0",
+ "@babel/helper-validator-identifier": "^7.14.5",
"to-fast-properties": "^2.0.0"
}
},
"@discoveryjs/json-ext": {
"version": "0.5.3"
},
+ "@emotion/cache": {
+ "version": "11.4.0",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.4.0.tgz",
+ "integrity": "sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==",
+ "requires": {
+ "@emotion/memoize": "^0.7.4",
+ "@emotion/sheet": "^1.0.0",
+ "@emotion/utils": "^1.0.0",
+ "@emotion/weak-memoize": "^0.2.5",
+ "stylis": "^4.0.3"
+ }
+ },
+ "@emotion/hash": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
+ },
+ "@emotion/memoize": {
+ "version": "0.7.5",
+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",
+ "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
+ },
+ "@emotion/react": {
+ "version": "11.4.0",
+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.4.0.tgz",
+ "integrity": "sha512-4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg==",
+ "requires": {
+ "@babel/runtime": "^7.13.10",
+ "@emotion/cache": "^11.4.0",
+ "@emotion/serialize": "^1.0.2",
+ "@emotion/sheet": "^1.0.1",
+ "@emotion/utils": "^1.0.0",
+ "@emotion/weak-memoize": "^0.2.5",
+ "hoist-non-react-statics": "^3.3.1"
+ }
+ },
+ "@emotion/serialize": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.2.tgz",
+ "integrity": "sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==",
+ "requires": {
+ "@emotion/hash": "^0.8.0",
+ "@emotion/memoize": "^0.7.4",
+ "@emotion/unitless": "^0.7.5",
+ "@emotion/utils": "^1.0.0",
+ "csstype": "^3.0.2"
+ }
+ },
+ "@emotion/sheet": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz",
+ "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="
+ },
+ "@emotion/unitless": {
+ "version": "0.7.5",
+ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+ },
+ "@emotion/utils": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz",
+ "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA=="
+ },
+ "@emotion/weak-memoize": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
+ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
+ },
"@eslint/eslintrc": {
"version": "0.2.2",
"dev": true,
@@ -10422,8 +10856,6 @@
},
"@polka/url": {
"version": "1.0.0-next.15",
- "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
- "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
"dev": true
},
"@stylelint/postcss-css-in-js": {
@@ -10446,7 +10878,7 @@
"requires": {}
},
"@tailwindcss/forms": {
- "version": "0.3.2",
+ "version": "0.3.3",
"requires": {
"mini-svg-data-uri": "^1.2.3"
}
@@ -10461,13 +10893,15 @@
}
},
"@trysound/sax": {
- "version": "0.1.1"
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz",
+ "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow=="
},
"@types/d3": {
"version": "3.5.38"
},
"@types/eslint": {
- "version": "7.2.12",
+ "version": "7.2.13",
"requires": {
"@types/estree": "*",
"@types/json-schema": "*"
@@ -10617,17 +11051,17 @@
}
},
"@webpack-cli/configtest": {
- "version": "1.0.3",
+ "version": "1.0.4",
"requires": {}
},
"@webpack-cli/info": {
- "version": "1.2.4",
+ "version": "1.3.0",
"requires": {
"envinfo": "^7.7.3"
}
},
"@webpack-cli/serve": {
- "version": "1.4.0",
+ "version": "1.5.1",
"requires": {}
},
"@xtuc/ieee754": {
@@ -10682,7 +11116,7 @@
"dev": true
},
"ansi-regex": {
- "version": "4.1.0",
+ "version": "5.0.0",
"dev": true
},
"ansi-styles": {
@@ -10827,7 +11261,7 @@
"dev": true
},
"astral-regex": {
- "version": "1.0.0",
+ "version": "2.0.0",
"dev": true
},
"at-least-node": {
@@ -11011,7 +11445,7 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001230"
+ "version": "1.0.30001236"
},
"chalk": {
"version": "2.4.2",
@@ -11034,9 +11468,7 @@
"dev": true
},
"chart.js": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.3.2.tgz",
- "integrity": "sha512-H0hSO7xqTIrwxoACqnSoNromEMfXvfuVnrbuSt2TuXfBDDofbnto4zuZlRtRvC73/b37q3wGAWZyUU41QPvNbA=="
+ "version": "3.3.2"
},
"chokidar": {
"version": "3.5.1",
@@ -11110,7 +11542,9 @@
"version": "1.2.2"
},
"commander": {
- "version": "2.20.0"
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+ "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
},
"commondir": {
"version": "1.0.1"
@@ -11162,7 +11596,7 @@
}
},
"core-js-compat": {
- "version": "3.13.1",
+ "version": "3.14.0",
"requires": {
"browserslist": "^4.16.6",
"semver": "7.0.0"
@@ -11272,10 +11706,10 @@
}
},
"css-minimizer-webpack-plugin": {
- "version": "3.0.0",
+ "version": "3.0.1",
"requires": {
"cssnano": "^5.0.0",
- "jest-worker": "^26.3.0",
+ "jest-worker": "^27.0.2",
"p-limit": "^3.0.2",
"postcss": "^8.2.9",
"schema-utils": "^3.0.0",
@@ -11536,8 +11970,6 @@
},
"duplexer": {
"version": "0.1.2",
- "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
- "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
"dev": true
},
"duplexer2": {
@@ -11550,7 +11982,7 @@
"version": "1.3.742"
},
"emoji-regex": {
- "version": "7.0.3",
+ "version": "8.0.0",
"dev": true
},
"emojis-list": {
@@ -11643,27 +12075,29 @@
}
},
"eslint": {
- "version": "7.15.0",
+ "version": "7.28.0",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.0.0",
- "@eslint/eslintrc": "^0.2.2",
+ "@babel/code-frame": "7.12.11",
+ "@eslint/eslintrc": "^0.4.2",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
"debug": "^4.0.1",
"doctrine": "^3.0.0",
"enquirer": "^2.3.5",
+ "escape-string-regexp": "^4.0.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^2.1.0",
"eslint-visitor-keys": "^2.0.0",
"espree": "^7.3.1",
- "esquery": "^1.2.0",
+ "esquery": "^1.4.0",
"esutils": "^2.0.2",
- "file-entry-cache": "^6.0.0",
+ "fast-deep-equal": "^3.1.3",
+ "file-entry-cache": "^6.0.1",
"functional-red-black-tree": "^1.0.1",
- "glob-parent": "^5.0.0",
- "globals": "^12.1.0",
+ "glob-parent": "^5.1.2",
+ "globals": "^13.6.0",
"ignore": "^4.0.6",
"import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
@@ -11671,7 +12105,7 @@
"js-yaml": "^3.13.1",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1",
- "lodash": "^4.17.19",
+ "lodash.merge": "^4.6.2",
"minimatch": "^3.0.4",
"natural-compare": "^1.4.0",
"optionator": "^0.9.1",
@@ -11680,7 +12114,7 @@
"semver": "^7.2.1",
"strip-ansi": "^6.0.0",
"strip-json-comments": "^3.1.0",
- "table": "^5.2.3",
+ "table": "^6.0.9",
"text-table": "^0.2.0",
"v8-compile-cache": "^2.0.3"
},
@@ -11697,7 +12131,7 @@
}
},
"chalk": {
- "version": "4.1.0",
+ "version": "4.1.1",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
@@ -11716,17 +12150,17 @@
"dev": true
},
"glob-parent": {
- "version": "5.1.1",
+ "version": "5.1.2",
"dev": true,
"requires": {
"is-glob": "^4.0.1"
}
},
"globals": {
- "version": "12.4.0",
+ "version": "13.9.0",
"dev": true,
"requires": {
- "type-fest": "^0.8.1"
+ "type-fest": "^0.20.2"
}
},
"has-flag": {
@@ -11738,7 +12172,7 @@
"dev": true
},
"import-fresh": {
- "version": "3.2.2",
+ "version": "3.3.0",
"dev": true,
"requires": {
"parent-module": "^1.0.0",
@@ -11781,7 +12215,7 @@
"dev": true
},
"semver": {
- "version": "7.3.4",
+ "version": "7.3.5",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -12105,7 +12539,7 @@
"version": "3.3.0"
},
"execa": {
- "version": "5.0.0",
+ "version": "5.1.1",
"requires": {
"cross-spawn": "^7.0.3",
"get-stream": "^6.0.0",
@@ -12192,7 +12626,7 @@
}
},
"file-entry-cache": {
- "version": "6.0.0",
+ "version": "6.0.1",
"dev": true,
"requires": {
"flat-cache": "^3.0.4"
@@ -12387,8 +12821,6 @@
},
"gzip-size": {
"version": "6.0.0",
- "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
- "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
"dev": true,
"requires": {
"duplexer": "^0.1.2"
@@ -12668,18 +13100,18 @@
"version": "3.0.1"
},
"jest-worker": {
- "version": "26.6.2",
+ "version": "27.0.2",
"requires": {
"@types/node": "*",
"merge-stream": "^2.0.0",
- "supports-color": "^7.0.0"
+ "supports-color": "^8.0.0"
},
"dependencies": {
"has-flag": {
"version": "4.0.0"
},
"supports-color": {
- "version": "7.2.0",
+ "version": "8.1.1",
"requires": {
"has-flag": "^4.0.0"
}
@@ -12943,6 +13375,11 @@
"mdn-data": {
"version": "2.0.14"
},
+ "memoize-one": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+ "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
+ },
"meow": {
"version": "8.0.0",
"dev": true,
@@ -13086,17 +13523,15 @@
},
"mime": {
"version": "2.5.2",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
- "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
"dev": true
},
"mime-db": {
- "version": "1.47.0"
+ "version": "1.48.0"
},
"mime-types": {
- "version": "2.1.30",
+ "version": "2.1.31",
"requires": {
- "mime-db": "1.47.0"
+ "mime-db": "1.48.0"
}
},
"mimic-fn": {
@@ -13187,9 +13622,6 @@
"version": "0.2.0",
"dev": true
},
- "normalize-url": {
- "version": "4.5.1"
- },
"npm-run-path": {
"version": "4.0.1",
"requires": {
@@ -13319,8 +13751,6 @@
},
"opener": {
"version": "1.5.2",
- "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
- "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
"dev": true
},
"optimist": {
@@ -13441,7 +13871,9 @@
}
},
"postcss": {
- "version": "8.3.0",
+ "version": "8.3.5",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz",
+ "integrity": "sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==",
"requires": {
"colorette": "^1.2.2",
"nanoid": "^3.1.23",
@@ -13545,7 +13977,7 @@
},
"dependencies": {
"postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -13781,6 +14213,11 @@
"postcss-value-parser": "^4.1.0"
},
"dependencies": {
+ "normalize-url": {
+ "version": "4.5.1",
+ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+ "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="
+ },
"postcss-value-parser": {
"version": "4.1.0"
}
@@ -13840,7 +14277,7 @@
},
"dependencies": {
"postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -13870,7 +14307,7 @@
},
"dependencies": {
"postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -13899,7 +14336,7 @@
},
"dependencies": {
"postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -14024,7 +14461,9 @@
}
},
"react": {
- "version": "16.13.1",
+ "version": "16.14.0",
+ "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
+ "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
@@ -14032,7 +14471,9 @@
}
},
"react-dom": {
- "version": "16.13.1",
+ "version": "16.14.0",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
+ "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
@@ -14042,6 +14483,8 @@
},
"react-flatpickr": {
"version": "3.10.5",
+ "resolved": "https://registry.npmjs.org/react-flatpickr/-/react-flatpickr-3.10.5.tgz",
+ "integrity": "sha512-MZlBN9Ml4FLFoR5tS61T9BjJRIrwF0mKDqC+ni5ZgdtIbWVebp6emx9jpg8QuXv5hSr1W1by3Tqv3ebZXU7rhg==",
"requires": {
"flatpickr": "^4.6.2",
"prop-types": "^15.5.10"
@@ -14051,6 +14494,14 @@
"version": "3.0.4",
"requires": {}
},
+ "react-input-autosize": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",
+ "integrity": "sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==",
+ "requires": {
+ "prop-types": "^15.5.8"
+ }
+ },
"react-is": {
"version": "16.11.0"
},
@@ -14081,6 +14532,20 @@
"tiny-warning": "^1.0.0"
}
},
+ "react-select": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/react-select/-/react-select-4.3.1.tgz",
+ "integrity": "sha512-HBBd0dYwkF5aZk1zP81Wx5UsLIIT2lSvAY2JiJo199LjoLHoivjn9//KsmvQMEFGNhe58xyuOITjfxKCcGc62Q==",
+ "requires": {
+ "@babel/runtime": "^7.12.0",
+ "@emotion/cache": "^11.4.0",
+ "@emotion/react": "^11.1.1",
+ "memoize-one": "^5.0.0",
+ "prop-types": "^15.6.0",
+ "react-input-autosize": "^3.0.0",
+ "react-transition-group": "^4.3.0"
+ }
+ },
"react-transition-group": {
"version": "4.4.2",
"requires": {
@@ -14317,6 +14782,8 @@
},
"scheduler": {
"version": "0.19.1",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
+ "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
@@ -14419,8 +14886,6 @@
},
"sirv": {
"version": "1.0.12",
- "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
- "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
"dev": true,
"requires": {
"@polka/url": "^1.0.0-next.15",
@@ -14624,10 +15089,10 @@
}
},
"strip-ansi": {
- "version": "5.2.0",
+ "version": "6.0.0",
"dev": true,
"requires": {
- "ansi-regex": "^4.1.0"
+ "ansi-regex": "^5.0.0"
}
},
"strip-bom": {
@@ -14781,7 +15246,7 @@
}
},
"postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -14911,6 +15376,11 @@
"stylelint-config-recommended": "^3.0.0"
}
},
+ "stylis": {
+ "version": "4.0.10",
+ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz",
+ "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="
+ },
"sugarss": {
"version": "2.0.0",
"dev": true,
@@ -14919,7 +15389,7 @@
},
"dependencies": {
"postcss": {
- "version": "7.0.35",
+ "version": "7.0.36",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -14952,6 +15422,8 @@
},
"svgo": {
"version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.0.tgz",
+ "integrity": "sha512-fz4IKjNO6HDPgIQxu4IxwtubtbSfGEAJUq/IXyTPIkGhWck/faiiwfkvsB8LnBkKLvSoyNNIY6d13lZprJMc9Q==",
"requires": {
"@trysound/sax": "0.1.1",
"chalk": "^4.1.0",
@@ -14984,9 +15456,6 @@
"color-name": {
"version": "1.1.4"
},
- "commander": {
- "version": "7.2.0"
- },
"has-flag": {
"version": "4.0.0"
},
@@ -15009,7 +15478,7 @@
}
},
"tailwindcss": {
- "version": "2.1.2",
+ "version": "2.1.4",
"requires": {
"@fullhuman/postcss-purgecss": "^3.1.3",
"bytes": "^3.0.0",
@@ -15096,9 +15565,9 @@
}
},
"terser-webpack-plugin": {
- "version": "5.1.2",
+ "version": "5.1.3",
"requires": {
- "jest-worker": "^26.6.2",
+ "jest-worker": "^27.0.2",
"p-limit": "^3.1.0",
"schema-utils": "^3.0.0",
"serialize-javascript": "^5.0.1",
@@ -15159,8 +15628,6 @@
},
"totalist": {
"version": "1.1.0",
- "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
- "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
"dev": true
},
"trim-newlines": {
@@ -15367,7 +15834,7 @@
},
"dependencies": {
"acorn": {
- "version": "8.2.4"
+ "version": "8.3.0"
},
"source-map": {
"version": "0.6.1"
@@ -15383,8 +15850,6 @@
},
"webpack-bundle-analyzer": {
"version": "4.4.2",
- "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz",
- "integrity": "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==",
"dev": true,
"requires": {
"acorn": "^8.0.4",
@@ -15400,20 +15865,14 @@
"dependencies": {
"acorn": {
"version": "8.3.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz",
- "integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==",
"dev": true
},
"acorn-walk": {
"version": "8.1.0",
- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz",
- "integrity": "sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg==",
"dev": true
},
"ansi-styles": {
"version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"requires": {
"color-convert": "^2.0.1"
@@ -15421,8 +15880,6 @@
},
"chalk": {
"version": "4.1.1",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
- "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
@@ -15431,8 +15888,6 @@
},
"color-convert": {
"version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
"color-name": "~1.1.4"
@@ -15440,26 +15895,18 @@
},
"color-name": {
"version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
"commander": {
"version": "6.2.1",
- "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
- "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
"dev": true
},
"has-flag": {
"version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
"supports-color": {
"version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"requires": {
"has-flag": "^4.0.0"
@@ -15468,12 +15915,12 @@
}
},
"webpack-cli": {
- "version": "4.7.0",
+ "version": "4.7.2",
"requires": {
"@discoveryjs/json-ext": "^0.5.0",
- "@webpack-cli/configtest": "^1.0.3",
- "@webpack-cli/info": "^1.2.4",
- "@webpack-cli/serve": "^1.4.0",
+ "@webpack-cli/configtest": "^1.0.4",
+ "@webpack-cli/info": "^1.3.0",
+ "@webpack-cli/serve": "^1.5.1",
"colorette": "^1.2.1",
"commander": "^7.0.0",
"execa": "^5.0.0",
@@ -15483,15 +15930,10 @@
"rechoir": "^0.7.0",
"v8-compile-cache": "^2.2.0",
"webpack-merge": "^5.7.3"
- },
- "dependencies": {
- "commander": {
- "version": "7.2.0"
- }
}
},
"webpack-merge": {
- "version": "5.7.3",
+ "version": "5.8.0",
"requires": {
"clone-deep": "^4.0.1",
"wildcard": "^2.0.0"
@@ -15540,8 +15982,6 @@
},
"ws": {
"version": "7.4.6",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
- "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
"dev": true,
"requires": {}
},
diff --git a/assets/package.json b/assets/package.json
index 33ed60ec4..28fb50eea 100644
--- a/assets/package.json
+++ b/assets/package.json
@@ -19,9 +19,10 @@
"chart.js": "^3.3.2",
"copy-webpack-plugin": "^9.0.0",
"css-loader": "^5.2.6",
- "css-minimizer-webpack-plugin": "^3.0.0",
+ "css-minimizer-webpack-plugin": "^3.0.1",
"datamaps": "^0.5.9",
"iframe-resizer": "^4.3.2",
+ "lodash.debounce": "^4.0.8",
"mini-css-extract-plugin": "^1.6.0",
"phoenix": "file:../deps/phoenix",
"phoenix_html": "file:../deps/phoenix_html",
@@ -32,6 +33,7 @@
"react-flatpickr": "3.10.5",
"react-flip-move": "^3.0.4",
"react-router-dom": "^5.2.0",
+ "react-select": "^4.3.1",
"react-transition-group": "^4.4.2",
"tailwindcss": "^2.1.2",
"terser-webpack-plugin": "^5.1.2",
diff --git a/assets/tailwind.config.js b/assets/tailwind.config.js
index a56552449..f36c7b823 100644
--- a/assets/tailwind.config.js
+++ b/assets/tailwind.config.js
@@ -14,6 +14,7 @@ module.exports = {
extend: {
colors: {
orange: colors.orange,
+ 'gray-950': 'rgb(13, 18, 30)',
'gray-850': 'rgb(26, 32, 44)',
'gray-825': 'rgb(37, 47, 63)'
},
@@ -30,7 +31,7 @@ module.exports = {
'9': 9,
},
maxWidth: {
- '2xs': '16rem',
+ '2xs': '15rem',
'3xs': '12rem',
}
},
@@ -44,7 +45,8 @@ module.exports = {
backgroundOpacity: ['dark'],
display: ['dark'],
cursor: ['hover'],
- justifyContent: ['responsive']
+ justifyContent: ['responsive'],
+ backgroundColor: ['odd', 'even'],
}
},
plugins: [
diff --git a/config/.env.dev b/config/.env.dev
index 104e77284..4149f265d 100644
--- a/config/.env.dev
+++ b/config/.env.dev
@@ -7,3 +7,4 @@ MAILER_ADAPTER=Bamboo.LocalAdapter
LOG_LEVEL=debug
SELFHOST=false
DISABLE_CRON=true
+ADMIN_USER_IDS=1
diff --git a/config/runtime.exs b/config/runtime.exs
index b03608247..da73e0ff2 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -49,9 +49,15 @@ db_socket_dir = get_var_from_path_or_env(config_dir, "DATABASE_SOCKET_DIR")
admin_user = get_var_from_path_or_env(config_dir, "ADMIN_USER_NAME")
admin_email = get_var_from_path_or_env(config_dir, "ADMIN_USER_EMAIL")
-admin_emails =
- get_var_from_path_or_env(config_dir, "ADMIN_EMAILS", "")
+admin_user_ids =
+ get_var_from_path_or_env(config_dir, "ADMIN_USER_IDS", "")
|> String.split(",")
+ |> Enum.map(fn id -> Integer.parse(id) end)
+ |> Enum.map(fn
+ {int, ""} -> int
+ _ -> nil
+ end)
+ |> Enum.filter(& &1)
admin_pwd = get_var_from_path_or_env(config_dir, "ADMIN_USER_PWD")
env = get_var_from_path_or_env(config_dir, "ENVIRONMENT", "prod")
@@ -162,7 +168,7 @@ config :plausible,
admin_pwd: admin_pwd,
environment: env,
mailer_email: mailer_email,
- admin_emails: admin_emails,
+ admin_user_ids: admin_user_ids,
site_limit: site_limit,
site_limit_exempt: site_limit_exempt,
is_selfhost: is_selfhost
@@ -272,7 +278,9 @@ if config_env() == :prod && !disable_cron do
# Every 15 minutes
{"*/15 * * * *", Plausible.Workers.SpikeNotifier},
# Every day at midnight
- {"0 0 * * *", Plausible.Workers.CleanEmailVerificationCodes}
+ {"0 0 * * *", Plausible.Workers.CleanEmailVerificationCodes},
+ # Every day at 1am
+ {"0 1 * * *", Plausible.Workers.CleanInvitations}
]
extra_cron = [
@@ -283,7 +291,9 @@ if config_env() == :prod && !disable_cron do
# Daily at 15
{"0 15 * * *", Plausible.Workers.NotifyAnnualRenewal},
# Every 10 minutes
- {"*/10 * * * *", Plausible.Workers.ProvisionSslCertificates}
+ {"*/10 * * * *", Plausible.Workers.ProvisionSslCertificates},
+ # Every midnight
+ {"0 0 * * *", Plausible.Workers.LockSites}
]
base_queues = [
@@ -292,16 +302,18 @@ if config_env() == :prod && !disable_cron do
send_email_reports: 1,
spike_notifications: 1,
fetch_tweets: 1,
- clean_email_verification_codes: 1,
check_stats_emails: 1,
- site_setup_emails: 1
+ site_setup_emails: 1,
+ clean_email_verification_codes: 1,
+ clean_invitations: 1
]
extra_queues = [
provision_ssl_certificates: 1,
trial_notification_emails: 1,
check_usage: 1,
- notify_annual_renewal: 1
+ notify_annual_renewal: 1,
+ lock_sites: 1
]
# Keep 30 days history
diff --git a/lib/plausible/auth/auth.ex b/lib/plausible/auth/auth.ex
index ecd4f5357..ac3c78643 100644
--- a/lib/plausible/auth/auth.ex
+++ b/lib/plausible/auth/auth.ex
@@ -59,8 +59,7 @@ defmodule Plausible.Auth do
end
def create_user(name, email, pwd) do
- %Auth.User{}
- |> Auth.User.new(%{name: name, email: email, password: pwd, password_confirmation: pwd})
+ Auth.User.new(%{name: name, email: email, password: pwd, password_confirmation: pwd})
|> Repo.insert()
end
@@ -68,13 +67,14 @@ defmodule Plausible.Auth do
Repo.get_by(Auth.User, opts)
end
- def user_completed_setup?(user) do
+ def has_active_sites?(user, roles \\ [:owner, :admin, :viewer]) do
domains =
Repo.all(
from u in Plausible.Auth.User,
where: u.id == ^user.id,
join: sm in Plausible.Site.Membership,
on: sm.user_id == u.id,
+ where: sm.role in ^roles,
join: s in Plausible.Site,
on: s.id == sm.site_id,
select: s.domain
@@ -82,4 +82,15 @@ defmodule Plausible.Auth do
Stats.has_pageviews?(domains)
end
+
+ def user_owns_sites?(user) do
+ Repo.exists?(
+ from(s in Plausible.Site,
+ join: sm in Plausible.Site.Membership,
+ on: sm.site_id == s.id,
+ where: sm.user_id == ^user.id,
+ where: sm.role == :owner
+ )
+ )
+ end
end
diff --git a/lib/plausible/auth/invitation.ex b/lib/plausible/auth/invitation.ex
new file mode 100644
index 000000000..189255732
--- /dev/null
+++ b/lib/plausible/auth/invitation.ex
@@ -0,0 +1,23 @@
+defmodule Plausible.Auth.Invitation do
+ use Ecto.Schema
+ import Ecto.Changeset
+
+ @derive {Jason.Encoder, only: [:invitation_id, :role, :site]}
+ @required [:email, :role, :site_id, :inviter_id]
+ schema "invitations" do
+ field :invitation_id, :string
+ field :email, :string
+ field :role, Ecto.Enum, values: [:owner, :admin, :viewer]
+
+ belongs_to :inviter, Plausible.Auth.User
+ belongs_to :site, Plausible.Site
+
+ timestamps()
+ end
+
+ def new(attrs \\ %{}) do
+ %__MODULE__{invitation_id: Nanoid.generate()}
+ |> cast(attrs, @required)
+ |> validate_required(@required)
+ end
+end
diff --git a/lib/plausible/auth/user.ex b/lib/plausible/auth/user.ex
index aff7c1b3b..1c163fe5f 100644
--- a/lib/plausible/auth/user.ex
+++ b/lib/plausible/auth/user.ex
@@ -29,8 +29,8 @@ defmodule Plausible.Auth.User do
timestamps()
end
- def new(user, attrs \\ %{}) do
- user
+ def new(attrs \\ %{}) do
+ %Plausible.Auth.User{}
|> cast(attrs, @required)
|> validate_required(@required)
|> validate_length(:password, min: 6, message: "has to be at least 6 characters")
diff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.ex
index 0ecb75903..ec4db077e 100644
--- a/lib/plausible/auth/user_admin.ex
+++ b/lib/plausible/auth/user_admin.ex
@@ -2,7 +2,8 @@ defmodule Plausible.Auth.UserAdmin do
use Plausible.Repo
def custom_index_query(_conn, _schema, query) do
- from(r in query, preload: [:subscription])
+ subscripton_q = from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at])
+ from(r in query, preload: [subscription: ^subscripton_q])
end
def form_fields(_) do
diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.ex
index 4e0768649..af6b927a8 100644
--- a/lib/plausible/billing/billing.ex
+++ b/lib/plausible/billing/billing.ex
@@ -18,7 +18,7 @@ defmodule Plausible.Billing do
changeset = Subscription.changeset(%Subscription{}, format_subscription(params))
- Repo.insert(changeset)
+ Repo.insert(changeset) |> check_lock_status
end
def subscription_updated(params) do
@@ -119,10 +119,10 @@ defmodule Plausible.Billing do
subscription.next_bill_date && !Timex.before?(subscription.next_bill_date, Timex.today())
end
- defp subscription_is_active?(_), do: false
+ defp subscription_is_active?(%Subscription{}), do: false
+ defp subscription_is_active?(nil), do: false
def on_trial?(user) do
- user = Repo.preload(user, :subscription)
!subscription_is_active?(user.subscription) && trial_days_left(user) >= 0
end
@@ -135,8 +135,8 @@ defmodule Plausible.Billing do
pageviews + custom_events
end
- defp get_usage_for_billing_cycle(user, cycle) do
- domains = Enum.map(user.sites, & &1.domain)
+ defp get_usage_for_billing_cycle(sites, cycle) do
+ domains = Enum.map(sites, & &1.domain)
ClickhouseRepo.one(
from e in "events",
@@ -149,11 +149,11 @@ defmodule Plausible.Billing do
def last_two_billing_months_usage(user, today \\ Timex.today()) do
{first, second} = last_two_billing_cycles(user, today)
- user = Repo.preload(user, :sites)
+ sites = Plausible.Sites.owned_by(user)
{
- get_usage_for_billing_cycle(user, first),
- get_usage_for_billing_cycle(user, second)
+ get_usage_for_billing_cycle(sites, first),
+ get_usage_for_billing_cycle(sites, second)
}
end
@@ -178,9 +178,9 @@ defmodule Plausible.Billing do
end
def usage_breakdown(user) do
- user = Repo.preload(user, :sites)
+ sites = Plausible.Sites.owned_by(user)
- Enum.reduce(user.sites, {0, 0}, fn site, {pageviews, custom_events} ->
+ Enum.reduce(sites, {0, 0}, fn site, {pageviews, custom_events} ->
usage = Plausible.Stats.Clickhouse.usage(site)
{pageviews + Map.get(usage, "pageviews", 0),
@@ -221,5 +221,16 @@ defmodule Plausible.Billing do
defp present?(nil), do: false
defp present?(_), do: true
+ defp check_lock_status({:ok, subscription}) do
+ user =
+ Repo.get(Plausible.Auth.User, subscription.user_id)
+ |> Map.put(:subscription, subscription)
+
+ Plausible.Billing.SiteLocker.check_sites_for(user)
+ {:ok, subscription}
+ end
+
+ defp check_lock_status(err), do: err
+
defp paddle_api(), do: Application.fetch_env!(:plausible, :paddle_api)
end
diff --git a/lib/plausible/billing/site_locker.ex b/lib/plausible/billing/site_locker.ex
new file mode 100644
index 000000000..e7cbedb65
--- /dev/null
+++ b/lib/plausible/billing/site_locker.ex
@@ -0,0 +1,29 @@
+defmodule Plausible.Billing.SiteLocker do
+ use Plausible.Repo
+
+ def check_sites_for(user) do
+ if Plausible.Billing.needs_to_upgrade?(user) do
+ set_lock_status_for(user, true)
+ else
+ set_lock_status_for(user, false)
+ end
+ end
+
+ defp set_lock_status_for(user, status) do
+ site_ids =
+ Repo.all(
+ from s in Plausible.Site.Membership,
+ where: s.user_id == ^user.id,
+ where: s.role == :owner,
+ select: s.site_id
+ )
+
+ site_q =
+ from(
+ s in Plausible.Site,
+ where: s.id in ^site_ids
+ )
+
+ Repo.update_all(site_q, set: [locked: status])
+ end
+end
diff --git a/lib/plausible/site/membership.ex b/lib/plausible/site/membership.ex
index 2732dd8cd..52e7c94e8 100644
--- a/lib/plausible/site/membership.ex
+++ b/lib/plausible/site/membership.ex
@@ -3,15 +3,16 @@ defmodule Plausible.Site.Membership do
import Ecto.Changeset
schema "site_memberships" do
+ field :role, Ecto.Enum, values: [:owner, :admin, :viewer]
belongs_to :site, Plausible.Site
belongs_to :user, Plausible.Auth.User
timestamps()
end
- def changeset(user, attrs) do
- user
- |> cast(attrs, [:user_id, :site_id])
+ def changeset(schema, attrs) do
+ schema
+ |> cast(attrs, [:user_id, :site_id, :role])
|> validate_required([:user_id, :site_id])
end
end
diff --git a/lib/plausible/site/schema.ex b/lib/plausible/site/schema.ex
index b0f907160..ade0ffc2c 100644
--- a/lib/plausible/site/schema.ex
+++ b/lib/plausible/site/schema.ex
@@ -9,8 +9,11 @@ defmodule Plausible.Site do
field :domain, :string
field :timezone, :string, default: "Etc/UTC"
field :public, :boolean
+ field :locked, :boolean
many_to_many :members, User, join_through: Plausible.Site.Membership
+ has_many :memberships, Plausible.Site.Membership
+ has_many :invitations, Plausible.Auth.Invitation
has_one :google_auth, GoogleAuth
has_one :weekly_report, Plausible.Site.WeeklyReport
has_one :monthly_report, Plausible.Site.MonthlyReport
diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex
index 353d8e33c..f50f034dc 100644
--- a/lib/plausible/sites.ex
+++ b/lib/plausible/sites.ex
@@ -3,7 +3,7 @@ defmodule Plausible.Sites do
alias Plausible.Site.{CustomDomain, SharedLink}
def create(user, params) do
- count = count_for(user)
+ count = Enum.count(owned_by(user))
limit = Plausible.Billing.sites_limit(user)
if count >= limit do
@@ -45,28 +45,23 @@ defmodule Plausible.Sites do
base <> domain <> "?auth=" <> link.slug
end
- def get_for_user!(user_id, domain), do: Repo.one!(get_for_user_q(user_id, domain))
- def get_for_user(user_id, domain), do: Repo.one(get_for_user_q(user_id, domain))
+ def get_for_user!(user_id, domain, roles \\ [:owner, :admin, :viewer]),
+ do: Repo.one!(get_for_user_q(user_id, domain, roles))
- def get_for_user_q(user_id, domain) do
+ def get_for_user(user_id, domain, roles \\ [:owner, :admin, :viewer]),
+ do: Repo.one(get_for_user_q(user_id, domain, roles))
+
+ defp get_for_user_q(user_id, domain, roles) do
from(s in Plausible.Site,
join: sm in Plausible.Site.Membership,
on: sm.site_id == s.id,
where: sm.user_id == ^user_id,
+ where: sm.role in ^roles,
where: s.domain == ^domain,
select: s
)
end
- def count_for(user) do
- Repo.aggregate(
- from(sm in Plausible.Site.Membership,
- where: sm.user_id == ^user.id
- ),
- :count
- )
- end
-
def has_goals?(site) do
Repo.exists?(
from g in Plausible.Goal,
@@ -74,10 +69,39 @@ defmodule Plausible.Sites do
)
end
- def is_owner?(user_id, site) do
- Repo.exists?(
+ def is_member?(user_id, site) do
+ role(user_id, site) !== nil
+ end
+
+ def has_admin_access?(user_id, site) do
+ role(user_id, site) in [:admin, :owner]
+ end
+
+ def role(user_id, site) do
+ Repo.one(
from sm in Plausible.Site.Membership,
- where: sm.user_id == ^user_id and sm.site_id == ^site.id
+ where: sm.user_id == ^user_id and sm.site_id == ^site.id,
+ select: sm.role
+ )
+ end
+
+ def owned_by(user) do
+ Repo.all(
+ from s in Plausible.Site,
+ join: sm in Plausible.Site.Membership,
+ on: sm.site_id == s.id,
+ where: sm.role == :owner,
+ where: sm.user_id == ^user.id
+ )
+ end
+
+ def owner_for(site) do
+ Repo.one(
+ from u in Plausible.Auth.User,
+ join: sm in Plausible.Site.Membership,
+ on: sm.user_id == u.id,
+ where: sm.site_id == ^site.id,
+ where: sm.role == :owner
)
end
diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex
index c16a4ec47..60607f6a8 100644
--- a/lib/plausible/stats/clickhouse.ex
+++ b/lib/plausible/stats/clickhouse.ex
@@ -257,13 +257,7 @@ defmodule Plausible.Stats.Clickhouse do
from(s in referrers, where: s.referrer_source != "")
end
- referrers =
- if query.filters["page"] do
- page = query.filters["page"]
- from(s in referrers, where: s.entry_page == ^page)
- else
- referrers
- end
+ referrers = apply_page_as_entry_page(referrers, site, query)
referrers =
if include_details do
@@ -326,13 +320,7 @@ defmodule Plausible.Stats.Clickhouse do
end
defp apply_page_as_entry_page(db_query, _site, query) do
- page = query.filters["page"]
-
- if is_binary(page) do
- from(s in db_query, where: s.entry_page == ^page)
- else
- db_query
- end
+ include_path_filter_entry(db_query, query.filters["page"])
end
def utm_mediums(site, query, limit \\ 9, page \\ 1, show_noref \\ false) do
@@ -691,6 +679,55 @@ defmodule Plausible.Stats.Clickhouse do
|> Enum.into(%{})
end
+ def page_times_by_page_url(site, query, page_list \\ nil)
+
+ def page_times_by_page_url(site, query, _page_list = nil) do
+ {negated, updated_page_selection} = query.filters["page"] |> check_negated_filter()
+ {_, page_regex} = updated_page_selection |> convert_path_regex()
+
+ q =
+ from(
+ e in base_query_w_sessions(site, %Query{
+ query
+ | filters: Map.delete(query.filters, "page")
+ }),
+ select: {
+ fragment("? as p", e.pathname),
+ fragment("? as t", e.timestamp),
+ fragment("? as s", e.session_id)
+ },
+ order_by: [e.session_id, e.timestamp]
+ )
+
+ {base_query_raw, base_query_raw_params} = ClickhouseRepo.to_sql(:all, q)
+
+ time_query = "
+ SELECT
+ avg(ifNotFinite(avgTime, null))
+ FROM
+ (SELECT
+ p,
+ sum(td)/count(case when p2 != p then 1 end) as avgTime
+ FROM
+ (SELECT
+ p,
+ p2,
+ sum(t2-t) as td
+ FROM
+ (SELECT
+ *,
+ neighbor(t, 1) as t2,
+ neighbor(p, 1) as p2,
+ neighbor(s, 1) as s2
+ FROM (#{base_query_raw}))
+ WHERE s=s2 AND
+ #{if negated, do: "not(match(p, ?))", else: "match(p, ?)"}
+ GROUP BY p,p2,s)
+ GROUP BY p)"
+
+ time_query |> ClickhouseRepo.query(base_query_raw_params ++ [page_regex])
+ end
+
def page_times_by_page_url(site, query, page_list) do
q =
from(
@@ -708,24 +745,27 @@ defmodule Plausible.Stats.Clickhouse do
{base_query_raw, base_query_raw_params} = ClickhouseRepo.to_sql(:all, q)
- "SELECT
- p,
- sum(td)/count(case when p2 != p then 1 end) as avgTime
- FROM
- (SELECT
+ time_query = "
+ SELECT
p,
- p2,
- sum(t2-t) as td
+ sum(td)/count(case when p2 != p then 1 end) as avgTime
FROM
(SELECT
- *,
- neighbor(t, 1) as t2,
- neighbor(p, 1) as p2,
- neighbor(s, 1) as s2
- FROM (#{base_query_raw}))
- WHERE s=s2 AND p IN tuple(?)
- GROUP BY p,p2,s)
- GROUP BY p"
+ p,
+ p2,
+ sum(t2-t) as td
+ FROM
+ (SELECT
+ *,
+ neighbor(t, 1) as t2,
+ neighbor(p, 1) as p2,
+ neighbor(s, 1) as s2
+ FROM (#{base_query_raw}))
+ WHERE s=s2 AND p IN tuple(?)
+ GROUP BY p,p2,s)
+ GROUP BY p"
+
+ time_query
|> ClickhouseRepo.query(
base_query_raw_params ++ [(Enum.count(page_list) > 0 && page_list) || ["/"]]
)
@@ -1156,21 +1196,9 @@ defmodule Plausible.Stats.Clickhouse do
sessions_q
end
- sessions_q =
- if query.filters["entry_page"] do
- entry_page = query.filters["entry_page"]
- from(s in sessions_q, where: s.entry_page == ^entry_page)
- else
- sessions_q
- end
+ sessions_q = include_path_filter_entry(sessions_q, query.filters["entry_page"])
- sessions_q =
- if query.filters["exit_page"] do
- exit_page = query.filters["exit_page"]
- from(s in sessions_q, where: s.exit_page == ^exit_page)
- else
- sessions_q
- end
+ sessions_q = include_path_filter_exit(sessions_q, query.filters["exit_page"])
q =
from(e in "events",
@@ -1194,13 +1222,7 @@ defmodule Plausible.Stats.Clickhouse do
q
end
- q =
- if query.filters["page"] do
- page = query.filters["page"]
- from(e in q, where: e.pathname == ^page)
- else
- q
- end
+ q = include_path_filter(q, query.filters["page"])
if query.filters["props"] do
[{key, val}] = query.filters["props"] |> Enum.into([])
@@ -1350,21 +1372,9 @@ defmodule Plausible.Stats.Clickhouse do
q
end
- q =
- if query.filters["entry_page"] do
- entry_page = query.filters["entry_page"]
- from(s in q, where: s.entry_page == ^entry_page)
- else
- q
- end
+ q = include_path_filter_entry(q, query.filters["entry_page"])
- q =
- if query.filters["exit_page"] do
- exit_page = query.filters["exit_page"]
- from(s in q, where: s.exit_page == ^exit_page)
- else
- q
- end
+ q = include_path_filter_exit(q, query.filters["exit_page"])
if query.filters["referrer"] do
ref = query.filters["referrer"]
@@ -1464,13 +1474,7 @@ defmodule Plausible.Stats.Clickhouse do
q
end
- q =
- if query.filters["page"] do
- page = query.filters["page"]
- from(e in q, where: e.pathname == ^page)
- else
- q
- end
+ q = include_path_filter(q, query.filters["page"])
if query.filters["props"] do
[{key, val}] = query.filters["props"] |> Enum.into([])
@@ -1550,12 +1554,9 @@ defmodule Plausible.Stats.Clickhouse do
end
if path do
- if String.match?(path, ~r/\*/) do
- path_regex =
- "^#{path}\/?$"
- |> String.replace(~r/\*\*/, ".*")
- |> String.replace(~r/(? String.replace(~r/\*\*/, ".*")
+ |> String.replace(~r/(? Enum.map(fn c -> Plausible.Stats.CountryName.to_alpha2(c) end)
+
+ q =
+ from(
+ e in base_session_query(site, query),
+ group_by: e.country_code,
+ order_by: [desc: fragment("count(*)")],
+ select: {e.country_code}
+ )
+
+ ClickhouseRepo.all(q)
+ |> Enum.map(fn {x} -> x end)
+ |> Enum.filter(fn c -> Enum.find(filter_search, false, fn x -> x == c end) end)
+ |> Enum.map(fn c -> Plausible.Stats.CountryName.to_alpha3(c) end)
+ |> Enum.slice(0..24)
+ end
+
+ def make_suggestions(site, _query, "goal", filter_search) do
+ Repo.all(from g in Plausible.Goal, where: g.domain == ^site.domain)
+ |> Enum.map(fn x -> if x.event_name, do: x.event_name, else: "Visit #{x.page_path}" end)
+ |> Enum.filter(fn goal ->
+ String.contains?(
+ String.downcase(goal),
+ String.downcase(filter_search)
+ )
+ end)
+ end
+
+ def make_suggestions(site, query, filter_name, filter_search) do
+ filter_search = if filter_search == nil, do: "", else: filter_search
+
+ filter_query =
+ if Enum.member?(["entry_page", "page", "exit_page"], filter_name),
+ do: "%#{String.replace(filter_search, "*", "")}%",
+ else: "%#{filter_search}%"
+
+ filter_name =
+ case filter_name do
+ "page" -> "pathname"
+ "source" -> "referrer_source"
+ "os" -> "operating_system"
+ "os_version" -> "operating_system_version"
+ "screen" -> "screen_size"
+ _ -> filter_name
+ end
+
+ q =
+ if(filter_name == "pathname",
+ do: base_query(site, query),
+ else: base_session_query(site, query)
+ )
+ |> from(
+ group_by: ^String.to_atom(filter_name),
+ order_by: [desc: fragment("count(*)")],
+ limit: 25
+ )
+
+ q =
+ case filter_name do
+ "pathname" ->
+ from(e in q,
+ select: {e.pathname},
+ where: fragment("? ilike ?", e.pathname, ^filter_query)
+ )
+
+ "entry_page" ->
+ from(e in q,
+ select: {e.entry_page},
+ where: fragment("? ilike ?", e.entry_page, ^filter_query)
+ )
+
+ "exit_page" ->
+ from(e in q,
+ select: {e.exit_page},
+ where: fragment("? ilike ?", e.exit_page, ^filter_query)
+ )
+
+ "referrer_source" ->
+ from(e in q,
+ select: {e.referrer_source},
+ where: fragment("? ilike ?", e.referrer_source, ^filter_query)
+ )
+
+ "utm_medium" ->
+ from(e in q,
+ select: {e.utm_medium},
+ where: fragment("? ilike ?", e.utm_medium, ^filter_query)
+ )
+
+ "utm_source" ->
+ from(e in q,
+ select: {e.utm_source},
+ where: fragment("? ilike ?", e.utm_source, ^filter_query)
+ )
+
+ "utm_campaign" ->
+ from(e in q,
+ select: {e.utm_campaign},
+ where: fragment("? ilike ?", e.utm_campaign, ^filter_query)
+ )
+
+ "referrer" ->
+ from(e in q,
+ select: {e.referrer},
+ where: fragment("? ilike ?", e.referrer, ^filter_query)
+ )
+
+ "browser" ->
+ from(e in q, select: {e.browser}, where: fragment("? ilike ?", e.browser, ^filter_query))
+
+ "browser_version" ->
+ from(e in q,
+ select: {e.browser_version},
+ where: fragment("? ilike ?", e.browser_version, ^filter_query)
+ )
+
+ "operating_system" ->
+ from(e in q,
+ select: {e.operating_system},
+ where: fragment("? ilike ?", e.operating_system, ^filter_query)
+ )
+
+ "operating_system_version" ->
+ from(e in q,
+ select: {e.operating_system_version},
+ where: fragment("? ilike ?", e.operating_system_version, ^filter_query)
+ )
+
+ "screen_size" ->
+ from(e in q,
+ select: {e.screen_size},
+ where: fragment("? ilike ?", e.screen_size, ^filter_query)
+ )
+ end
+
+ ClickhouseRepo.all(q)
+ |> Enum.map(fn {suggestion} -> suggestion end)
+ |> Enum.filter(fn suggestion -> suggestion != "" end)
+ end
end
diff --git a/lib/plausible_web/controllers/api/external_sites_controller.ex b/lib/plausible_web/controllers/api/external_sites_controller.ex
index 444477707..bfff82719 100644
--- a/lib/plausible_web/controllers/api/external_sites_controller.ex
+++ b/lib/plausible_web/controllers/api/external_sites_controller.ex
@@ -37,7 +37,8 @@ defmodule PlausibleWeb.Api.ExternalSitesController do
def find_or_create_shared_link(conn, params) do
with {:ok, site_id} <- expect_param_key(params, "site_id"),
{:ok, link_name} <- expect_param_key(params, "name"),
- site when not is_nil(site) <- Sites.get_for_user(conn.assigns[:current_user].id, site_id) do
+ site when not is_nil(site) <-
+ Sites.get_for_user(conn.assigns[:current_user].id, site_id, [:owner, :admin]) do
shared_link = Repo.get_by(Plausible.Site.SharedLink, site_id: site.id, name: link_name)
shared_link =
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex
index 33d7f510f..afaa9e0bb 100644
--- a/lib/plausible_web/controllers/api/stats_controller.ex
+++ b/lib/plausible_web/controllers/api/stats_controller.ex
@@ -110,14 +110,12 @@ defmodule PlausibleWeb.Api.StatsController do
Task.yield_many(
[
Task.async(fn ->
- {:ok, page_times} =
- Stats.page_times_by_page_url(site, query, [query.filters["page"]])
+ {:ok, page_times} = Stats.page_times_by_page_url(site, query)
page_times
end),
Task.async(fn ->
- {:ok, page_times} =
- Stats.page_times_by_page_url(site, prev_query, [query.filters["page"]])
+ {:ok, page_times} = Stats.page_times_by_page_url(site, prev_query)
page_times
end)
@@ -132,8 +130,8 @@ defmodule PlausibleWeb.Api.StatsController do
{:ok, page_times} ->
result = Enum.at(page_times.rows, 0)
- result = if result, do: Enum.at(result, 1), else: nil
- if result, do: {:ok, round(result)}, else: {:ok, 0}
+ result = if result, do: Enum.at(result, 0), else: nil
+ if result, do: {:ok, round(result)}, else: {nil, nil}
_ ->
response
@@ -233,8 +231,8 @@ defmodule PlausibleWeb.Api.StatsController do
nil ->
{_, total_visitors} = Stats.pageviews_and_visitors(site, query)
user_id = get_session(conn, :current_user_id)
- is_owner = user_id && Plausible.Sites.is_owner?(user_id, site)
- json(conn, %{not_configured: true, is_owner: is_owner, total_visitors: total_visitors})
+ is_admin = user_id && Plausible.Sites.has_admin_access?(user_id, site)
+ json(conn, %{not_configured: true, is_admin: is_admin, total_visitors: total_visitors})
{:ok, terms} ->
{_, total_visitors} = Stats.pageviews_and_visitors(site, query)
@@ -386,4 +384,11 @@ defmodule PlausibleWeb.Api.StatsController do
def handle_errors(conn, %{kind: kind, reason: reason}) do
json(conn, %{error: Exception.format_banner(kind, reason)})
end
+
+ def filter_suggestions(conn, params) do
+ site = conn.assigns[:site]
+ query = Query.from(site.timezone, params)
+
+ json(conn, Stats.make_suggestions(site, query, params["filter_name"], params["q"]))
+ end
end
diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex
index be5540077..1a9556bcc 100644
--- a/lib/plausible_web/controllers/auth_controller.ex
+++ b/lib/plausible_web/controllers/auth_controller.ex
@@ -36,7 +36,7 @@ defmodule PlausibleWeb.AuthController do
conn
|> redirect(to: "/login")
else
- user = Plausible.Auth.User.new(%Plausible.Auth.User{}, params["user"])
+ user = Plausible.Auth.User.new(params["user"])
if PlausibleWeb.Captcha.verify(params["h-captcha-response"]) do
case Repo.insert(user) do
@@ -70,9 +70,77 @@ defmodule PlausibleWeb.AuthController do
end
end
+ def register_from_invitation_form(conn, %{"invitation_id" => invitation_id}) do
+ if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do
+ conn
+ |> redirect(to: "/login")
+ else
+ invitation = Repo.get_by(Plausible.Auth.Invitation, invitation_id: invitation_id)
+ changeset = Plausible.Auth.User.changeset(%Plausible.Auth.User{})
+
+ if invitation do
+ render(conn, "register_from_invitation_form.html",
+ changeset: changeset,
+ invitation: invitation,
+ layout: {PlausibleWeb.LayoutView, "focus.html"}
+ )
+ else
+ render(conn, "invitation_expired.html", layout: {PlausibleWeb.LayoutView, "focus.html"})
+ end
+ end
+ end
+
+ def register_from_invitation(conn, %{"invitation_id" => invitation_id} = params) do
+ if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do
+ conn
+ |> redirect(to: "/login")
+ else
+ invitation = Repo.get_by(Plausible.Auth.Invitation, invitation_id: invitation_id)
+ user = Plausible.Auth.User.new(params["user"])
+
+ if PlausibleWeb.Captcha.verify(params["h-captcha-response"]) do
+ case Repo.insert(user) do
+ {:ok, user} ->
+ code = Auth.issue_email_verification(user)
+ Logger.info("VERIFICATION CODE: #{code}")
+ email_template = PlausibleWeb.Email.activation_email(user, code)
+ Plausible.Mailer.send_email(email_template)
+
+ conn
+ |> put_session(:current_user_id, user.id)
+ |> put_resp_cookie("logged_in", "true",
+ http_only: false,
+ max_age: 60 * 60 * 24 * 365 * 5000
+ )
+ |> redirect(to: "/activate")
+
+ {:error, changeset} ->
+ render(conn, "register_from_invitation_form.html",
+ invitation: invitation,
+ changeset: changeset,
+ layout: {PlausibleWeb.LayoutView, "focus.html"}
+ )
+ end
+ else
+ render(conn, "register_from_invitation_form.html",
+ invitation: invitation,
+ changeset: user,
+ captcha_error: "Please complete the captcha to register",
+ layout: {PlausibleWeb.LayoutView, "focus.html"}
+ )
+ end
+ end
+ end
+
def activate_form(conn, _params) do
user = conn.assigns[:current_user]
+ has_invitation =
+ Repo.exists?(
+ from i in Plausible.Auth.Invitation,
+ where: i.email == ^user.email
+ )
+
has_code =
Repo.exists?(
from c in "email_verification_codes",
@@ -81,22 +149,35 @@ defmodule PlausibleWeb.AuthController do
render(conn, "activate.html",
has_pin: has_code,
+ has_invitation: has_invitation,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
end
def activate(conn, %{"code" => code}) do
user = conn.assigns[:current_user]
+
+ has_invitation =
+ Repo.exists?(
+ from i in Plausible.Auth.Invitation,
+ where: i.email == ^user.email
+ )
+
{code, ""} = Integer.parse(code)
case Auth.verify_email(user, code) do
:ok ->
- redirect(conn, to: "/sites/new")
+ if has_invitation do
+ redirect(conn, to: "/sites")
+ else
+ redirect(conn, to: "/sites/new")
+ end
{:error, :incorrect} ->
render(conn, "activate.html",
error: "Incorrect activation code",
has_pin: true,
+ has_invitation: has_invitation,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
@@ -104,6 +185,7 @@ defmodule PlausibleWeb.AuthController do
render(conn, "activate.html",
error: "Code is expired, please request another one",
has_pin: false,
+ has_invitation: has_invitation,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
end
diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.ex
new file mode 100644
index 000000000..db1020ab2
--- /dev/null
+++ b/lib/plausible_web/controllers/invitation_controller.ex
@@ -0,0 +1,108 @@
+defmodule PlausibleWeb.InvitationController do
+ use PlausibleWeb, :controller
+ use Plausible.Repo
+ alias Ecto.Multi
+ alias Plausible.Auth.Invitation
+ alias Plausible.Site.Membership
+
+ plug PlausibleWeb.RequireAccountPlug
+
+ def accept_invitation(conn, %{"invitation_id" => invitation_id}) do
+ invitation =
+ Repo.get_by!(Invitation, invitation_id: invitation_id)
+ |> Repo.preload([:site, :inviter])
+
+ user = conn.assigns[:current_user]
+ existing_membership = Repo.get_by(Membership, user_id: user.id, site_id: invitation.site.id)
+
+ multi =
+ if invitation.role == :owner do
+ downgrade_previous_owner(Multi.new(), invitation.site)
+ else
+ Multi.new()
+ end
+
+ membership_changeset =
+ Membership.changeset(existing_membership || %Membership{}, %{
+ user_id: user.id,
+ site_id: invitation.site.id,
+ role: invitation.role
+ })
+
+ multi =
+ multi
+ |> Multi.insert_or_update(:membership, membership_changeset)
+ |> Multi.delete(:invitation, invitation)
+
+ case Repo.transaction(multi) do
+ {:ok, _} ->
+ notify_invitation_accepted(invitation)
+ Plausible.Billing.SiteLocker.check_sites_for(user)
+
+ conn
+ |> put_flash(:success, "You now have access to #{invitation.site.domain}")
+ |> redirect(to: "/#{URI.encode_www_form(invitation.site.domain)}")
+
+ {:error, _} ->
+ conn
+ |> put_flash(:error, "Something went wrong, please try again")
+ |> redirect(to: "/sites")
+ end
+ end
+
+ defp downgrade_previous_owner(multi, site) do
+ prev_owner =
+ from(
+ sm in Plausible.Site.Membership,
+ where: sm.site_id == ^site.id,
+ where: sm.role == :owner
+ )
+
+ Multi.update_all(multi, :prev_owner, prev_owner, set: [role: :admin])
+ end
+
+ def reject_invitation(conn, %{"invitation_id" => invitation_id}) do
+ invitation =
+ Repo.get_by!(Invitation, invitation_id: invitation_id)
+ |> Repo.preload([:site, :inviter])
+
+ Repo.delete!(invitation)
+ notify_invitation_rejected(invitation)
+
+ conn
+ |> put_flash(:success, "You have rejected the invitation to #{invitation.site.domain}")
+ |> redirect(to: "/sites")
+ end
+
+ defp notify_invitation_accepted(%Invitation{role: :owner} = invitation) do
+ PlausibleWeb.Email.ownership_transfer_accepted(invitation)
+ |> Plausible.Mailer.send_email()
+ end
+
+ defp notify_invitation_accepted(invitation) do
+ PlausibleWeb.Email.invitation_accepted(invitation)
+ |> Plausible.Mailer.send_email()
+ end
+
+ defp notify_invitation_rejected(%Invitation{role: :owner} = invitation) do
+ PlausibleWeb.Email.ownership_transfer_rejected(invitation)
+ |> Plausible.Mailer.send_email()
+ end
+
+ defp notify_invitation_rejected(invitation) do
+ PlausibleWeb.Email.invitation_rejected(invitation)
+ |> Plausible.Mailer.send_email()
+ end
+
+ def remove_invitation(conn, %{"invitation_id" => invitation_id}) do
+ invitation =
+ Repo.get_by!(Invitation, invitation_id: invitation_id)
+ |> Repo.preload(:site)
+
+ Repo.delete!(invitation)
+
+ conn
+ |> put_flash(:success, "You have removed the invitation for #{invitation.email}")
+ |> redirect(to: Routes.site_path(conn, :settings_general, invitation.site.domain))
+ end
+end
diff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.ex
new file mode 100644
index 000000000..c8bb3f677
--- /dev/null
+++ b/lib/plausible_web/controllers/site/membership_controller.ex
@@ -0,0 +1,149 @@
+defmodule PlausibleWeb.Site.MembershipController do
+ use PlausibleWeb, :controller
+ use Plausible.Repo
+ alias Plausible.Sites
+ alias Plausible.Site.Membership
+ alias Plausible.Auth.Invitation
+
+ @only_owner_is_allowed_to [:transfer_ownership_form, :transfer_ownership]
+
+ plug PlausibleWeb.RequireAccountPlug
+ plug PlausibleWeb.AuthorizeSiteAccess, [:owner] when action in @only_owner_is_allowed_to
+
+ plug PlausibleWeb.AuthorizeSiteAccess,
+ [:owner, :admin] when action not in @only_owner_is_allowed_to
+
+ def invite_member_form(conn, %{"website" => site_domain}) do
+ site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)
+
+ render(
+ conn,
+ "invite_member_form.html",
+ site: site,
+ layout: {PlausibleWeb.LayoutView, "focus.html"}
+ )
+ end
+
+ def invite_member(conn, %{"website" => site_domain, "email" => email, "role" => role}) do
+ site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)
+ user = Plausible.Auth.find_user_by(email: email)
+
+ if user && Sites.is_member?(user.id, site) do
+ msg = "Cannot send invite because #{user.email} is already a member of #{site.domain}"
+
+ render(conn, "invite_member_form.html",
+ error: msg,
+ site: site,
+ layout: {PlausibleWeb.LayoutView, "focus.html"}
+ )
+ else
+ invitation =
+ Invitation.new(%{
+ email: email,
+ role: role,
+ site_id: site.id,
+ inviter_id: conn.assigns[:current_user].id
+ })
+ |> Repo.insert!()
+ |> Repo.preload([:site, :inviter])
+
+ email_template =
+ if user do
+ PlausibleWeb.Email.existing_user_invitation(invitation)
+ else
+ PlausibleWeb.Email.new_user_invitation(invitation)
+ end
+
+ Plausible.Mailer.send_email(email_template)
+
+ conn
+ |> put_flash(
+ :success,
+ "#{email} has been invited to #{site_domain} as #{
+ PlausibleWeb.SiteView.with_indefinite_article(role)
+ }"
+ )
+ |> redirect(to: Routes.site_path(conn, :settings_people, site.domain))
+ end
+ end
+
+ def transfer_ownership_form(conn, %{"website" => site_domain}) do
+ site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)
+
+ render(
+ conn,
+ "transfer_ownership_form.html",
+ site: site,
+ layout: {PlausibleWeb.LayoutView, "focus.html"}
+ )
+ end
+
+ def transfer_ownership(conn, %{"website" => site_domain, "email" => email}) do
+ site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)
+ user = Plausible.Auth.find_user_by(email: email)
+
+ invitation =
+ Invitation.new(%{
+ email: email,
+ role: :owner,
+ site_id: site.id,
+ inviter_id: conn.assigns[:current_user].id
+ })
+ |> Repo.insert!()
+ |> Repo.preload([:site, :inviter])
+
+ PlausibleWeb.Email.ownership_transfer_request(invitation, user)
+ |> Plausible.Mailer.send_email()
+
+ conn
+ |> put_flash(:success, "Site transfer request has been sent to #{email}")
+ |> redirect(to: Routes.site_path(conn, :settings_people, site.domain))
+ end
+
+ def update_role(conn, %{"id" => id, "new_role" => new_role}) do
+ membership =
+ Repo.get!(Membership, id)
+ |> Repo.preload([:site, :user])
+ |> Membership.changeset(%{role: new_role})
+ |> Repo.update!()
+
+ redirect_target =
+ if membership.user.id == conn.assigns[:current_user].id && new_role == "viewer" do
+ "/#{URI.encode_www_form(membership.site.domain)}"
+ else
+ Routes.site_path(conn, :settings_people, membership.site.domain)
+ end
+
+ conn
+ |> put_flash(
+ :success,
+ "#{membership.user.name} is now #{PlausibleWeb.SiteView.with_indefinite_article(new_role)}"
+ )
+ |> redirect(to: redirect_target)
+ end
+
+ def remove_member(conn, %{"id" => id}) do
+ membership =
+ Repo.get!(Membership, id)
+ |> Repo.preload([:user, :site])
+
+ Repo.delete!(membership)
+
+ PlausibleWeb.Email.site_member_removed(membership)
+ |> Plausible.Mailer.send_email()
+
+ redirect_target =
+ if membership.user.id == conn.assigns[:current_user].id do
+ "/#{URI.encode_www_form(membership.site.domain)}"
+ else
+ Routes.site_path(conn, :settings_people, membership.site.domain)
+ end
+
+ conn
+ |> put_flash(
+ :success,
+ "#{membership.user.name} has been removed from #{membership.site.domain}"
+ )
+ |> redirect(to: redirect_target)
+ end
+end
diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex
index 0599ed929..7a981aa72 100644
--- a/lib/plausible_web/controllers/site_controller.ex
+++ b/lib/plausible_web/controllers/site_controller.ex
@@ -5,27 +5,53 @@ defmodule PlausibleWeb.SiteController do
plug PlausibleWeb.RequireAccountPlug
+ plug PlausibleWeb.AuthorizeSiteAccess,
+ [:owner, :admin] when action not in [:index, :new, :create_site]
+
def index(conn, params) do
user = conn.assigns[:current_user]
+ invitations =
+ Repo.all(
+ from i in Plausible.Auth.Invitation,
+ where: i.email == ^user.email
+ )
+ |> Repo.preload(:site)
+
+ invitation_site_ids = Enum.map(invitations, & &1.site.id)
+
{sites, pagination} =
Repo.paginate(
from(s in Plausible.Site,
join: sm in Plausible.Site.Membership,
on: sm.site_id == s.id,
where: sm.user_id == ^user.id,
- order_by: s.domain
+ where: s.id not in ^invitation_site_ids,
+ order_by: s.domain,
+ preload: [memberships: sm]
),
params
)
- visitors = Plausible.Stats.Clickhouse.last_24h_visitors(sites)
- render(conn, "index.html", sites: sites, visitors: visitors, pagination: pagination)
+ user_owns_sites =
+ Enum.any?(sites, fn site -> List.first(site.memberships).role == :owner end) ||
+ Plausible.Auth.user_owns_sites?(user)
+
+ visitors =
+ Plausible.Stats.Clickhouse.last_24h_visitors(sites ++ Enum.map(invitations, & &1.site))
+
+ render(conn, "index.html",
+ invitations: invitations,
+ sites: sites,
+ visitors: visitors,
+ pagination: pagination,
+ needs_to_upgrade: user_owns_sites && Plausible.Billing.needs_to_upgrade?(user)
+ )
end
def new(conn, _params) do
current_user = conn.assigns[:current_user]
- site_count = Plausible.Sites.count_for(current_user)
+ site_count = Enum.count(Plausible.Sites.owned_by(current_user))
site_limit = Plausible.Billing.sites_limit(current_user)
is_at_limit = site_limit && site_count >= site_limit
is_first_site = site_count == 0
@@ -43,7 +69,7 @@ defmodule PlausibleWeb.SiteController do
def create_site(conn, %{"site" => site_params}) do
user = conn.assigns[:current_user]
- site_count = Plausible.Sites.count_for(user)
+ site_count = Enum.count(Plausible.Sites.owned_by(user))
is_first_site = site_count == 0
case Sites.create(user, site_params) do
@@ -72,12 +98,9 @@ defmodule PlausibleWeb.SiteController do
end
end
- def add_snippet(conn, %{"website" => website}) do
+ def add_snippet(conn, _params) do
user = conn.assigns[:current_user]
-
- site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
- |> Repo.preload(:custom_domain)
+ site = conn.assigns[:site] |> Repo.preload(:custom_domain)
is_first_site =
!Repo.exists?(
@@ -96,8 +119,8 @@ defmodule PlausibleWeb.SiteController do
)
end
- def new_goal(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def new_goal(conn, _params) do
+ site = conn.assigns[:site]
changeset = Plausible.Goal.changeset(%Plausible.Goal{})
conn
@@ -109,8 +132,8 @@ defmodule PlausibleWeb.SiteController do
)
end
- def create_goal(conn, %{"website" => website, "goal" => goal}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def create_goal(conn, %{"goal" => goal}) do
+ site = conn.assigns[:site]
case Plausible.Goals.create(site, goal) do
{:ok, _} ->
@@ -141,9 +164,9 @@ defmodule PlausibleWeb.SiteController do
redirect(conn, to: "/#{URI.encode_www_form(website)}/settings/general")
end
- def settings_general(conn, %{"website" => website}) do
+ def settings_general(conn, _params) do
site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ conn.assigns[:site]
|> Repo.preload(:custom_domain)
conn
@@ -155,8 +178,21 @@ defmodule PlausibleWeb.SiteController do
)
end
- def settings_visibility(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def settings_people(conn, _params) do
+ site =
+ conn.assigns[:site]
+ |> Repo.preload(memberships: :user, invitations: [], custom_domain: [])
+
+ conn
+ |> assign(:skip_plausible_tracking, true)
+ |> render("settings_people.html",
+ site: site,
+ layout: {PlausibleWeb.LayoutView, "site_settings.html"}
+ )
+ end
+
+ def settings_visibility(conn, _params) do
+ site = conn.assigns[:site] |> Repo.preload(:custom_domain)
shared_links = Repo.all(from l in Plausible.Site.SharedLink, where: l.site_id == ^site.id)
conn
@@ -168,8 +204,8 @@ defmodule PlausibleWeb.SiteController do
)
end
- def settings_goals(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def settings_goals(conn, _params) do
+ site = conn.assigns[:site] |> Repo.preload(:custom_domain)
goals = Goals.for_site(site.domain)
conn
@@ -181,10 +217,10 @@ defmodule PlausibleWeb.SiteController do
)
end
- def settings_search_console(conn, %{"website" => website}) do
+ def settings_search_console(conn, _params) do
site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
- |> Repo.preload(:google_auth)
+ conn.assigns[:site]
+ |> Repo.preload([:google_auth, :custom_domain])
search_console_domains =
if site.google_auth do
@@ -200,8 +236,8 @@ defmodule PlausibleWeb.SiteController do
)
end
- def settings_email_reports(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def settings_email_reports(conn, _params) do
+ site = conn.assigns[:site] |> Repo.preload(:custom_domain)
conn
|> assign(:skip_plausible_tracking, true)
@@ -214,9 +250,9 @@ defmodule PlausibleWeb.SiteController do
)
end
- def settings_custom_domain(conn, %{"website" => website}) do
+ def settings_custom_domain(conn, _params) do
site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ conn.assigns[:site]
|> Repo.preload(:custom_domain)
conn
@@ -227,8 +263,8 @@ defmodule PlausibleWeb.SiteController do
)
end
- def settings_danger_zone(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def settings_danger_zone(conn, _params) do
+ site = conn.assigns[:site] |> Repo.preload(:custom_domain)
conn
|> assign(:skip_plausible_tracking, true)
@@ -238,10 +274,8 @@ defmodule PlausibleWeb.SiteController do
)
end
- def update_google_auth(conn, %{"website" => website, "google_auth" => attrs}) do
- site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
- |> Repo.preload(:google_auth)
+ def update_google_auth(conn, %{"google_auth" => attrs}) do
+ site = conn.assigns[:site] |> Repo.preload(:google_auth)
Plausible.Site.GoogleAuth.set_property(site.google_auth, attrs)
|> Repo.update!()
@@ -251,9 +285,9 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/search-console")
end
- def delete_google_auth(conn, %{"website" => website}) do
+ def delete_google_auth(conn, _params) do
site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ conn.assigns[:site]
|> Repo.preload(:google_auth)
Repo.delete!(site.google_auth)
@@ -263,8 +297,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/search-console")
end
- def update_settings(conn, %{"website" => website, "site" => site_params}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def update_settings(conn, %{"site" => site_params}) do
+ site = conn.assigns[:site]
changeset = site |> Plausible.Site.changeset(site_params)
res = changeset |> Repo.update()
@@ -282,8 +316,8 @@ defmodule PlausibleWeb.SiteController do
end
end
- def reset_stats(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def reset_stats(conn, _params) do
+ site = conn.assigns[:site]
Plausible.ClickhouseRepo.clear_stats_for(site.domain)
conn
@@ -291,8 +325,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/danger-zone")
end
- def delete_site(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def delete_site(conn, _params) do
+ site = conn.assigns[:site]
Repo.delete!(site)
Plausible.ClickhouseRepo.clear_stats_for(site.domain)
@@ -302,9 +336,9 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/sites")
end
- def make_public(conn, %{"website" => website}) do
+ def make_public(conn, _params) do
site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ conn.assigns[:site]
|> Plausible.Site.make_public()
|> Repo.update!()
@@ -313,9 +347,9 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")
end
- def make_private(conn, %{"website" => website}) do
+ def make_private(conn, _params) do
site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ conn.assigns[:site]
|> Plausible.Site.make_private()
|> Repo.update!()
@@ -324,8 +358,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")
end
- def enable_weekly_report(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def enable_weekly_report(conn, _params) do
+ site = conn.assigns[:site]
Plausible.Site.WeeklyReport.changeset(%Plausible.Site.WeeklyReport{}, %{
site_id: site.id,
@@ -338,8 +372,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def disable_weekly_report(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def disable_weekly_report(conn, _params) do
+ site = conn.assigns[:site]
Repo.delete_all(from wr in Plausible.Site.WeeklyReport, where: wr.site_id == ^site.id)
conn
@@ -347,8 +381,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def add_weekly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def add_weekly_report_recipient(conn, %{"recipient" => recipient}) do
+ site = conn.assigns[:site]
Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)
|> Plausible.Site.WeeklyReport.add_recipient(recipient)
@@ -359,8 +393,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def remove_weekly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def remove_weekly_report_recipient(conn, %{"recipient" => recipient}) do
+ site = conn.assigns[:site]
Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)
|> Plausible.Site.WeeklyReport.remove_recipient(recipient)
@@ -374,8 +408,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def enable_monthly_report(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def enable_monthly_report(conn, _params) do
+ site = conn.assigns[:site]
Plausible.Site.MonthlyReport.changeset(%Plausible.Site.MonthlyReport{}, %{
site_id: site.id,
@@ -388,8 +422,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def disable_monthly_report(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def disable_monthly_report(conn, _params) do
+ site = conn.assigns[:site]
Repo.delete_all(from mr in Plausible.Site.MonthlyReport, where: mr.site_id == ^site.id)
conn
@@ -397,8 +431,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def add_monthly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def add_monthly_report_recipient(conn, %{"recipient" => recipient}) do
+ site = conn.assigns[:site]
Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id)
|> Plausible.Site.MonthlyReport.add_recipient(recipient)
@@ -409,8 +443,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def remove_monthly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def remove_monthly_report_recipient(conn, %{"recipient" => recipient}) do
+ site = conn.assigns[:site]
Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id)
|> Plausible.Site.MonthlyReport.remove_recipient(recipient)
@@ -424,8 +458,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def enable_spike_notification(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def enable_spike_notification(conn, _params) do
+ site = conn.assigns[:site]
res =
Plausible.Site.SpikeNotification.changeset(%Plausible.Site.SpikeNotification{}, %{
@@ -448,8 +482,8 @@ defmodule PlausibleWeb.SiteController do
end
end
- def disable_spike_notification(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def disable_spike_notification(conn, _params) do
+ site = conn.assigns[:site]
Repo.delete_all(from mr in Plausible.Site.SpikeNotification, where: mr.site_id == ^site.id)
conn
@@ -457,8 +491,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def update_spike_notification(conn, %{"website" => website, "spike_notification" => params}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def update_spike_notification(conn, %{"spike_notification" => params}) do
+ site = conn.assigns[:site]
notification = Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
Plausible.Site.SpikeNotification.changeset(notification, params)
@@ -469,8 +503,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def add_spike_notification_recipient(conn, %{"website" => website, "recipient" => recipient}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def add_spike_notification_recipient(conn, %{"recipient" => recipient}) do
+ site = conn.assigns[:site]
Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
|> Plausible.Site.SpikeNotification.add_recipient(recipient)
@@ -481,8 +515,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def remove_spike_notification_recipient(conn, %{"website" => website, "recipient" => recipient}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def remove_spike_notification_recipient(conn, %{"recipient" => recipient}) do
+ site = conn.assigns[:site]
Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
|> Plausible.Site.SpikeNotification.remove_recipient(recipient)
@@ -496,8 +530,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
- def new_shared_link(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def new_shared_link(conn, _params) do
+ site = conn.assigns[:site]
changeset = Plausible.Site.SharedLink.changeset(%Plausible.Site.SharedLink{}, %{})
conn
@@ -509,8 +543,8 @@ defmodule PlausibleWeb.SiteController do
)
end
- def create_shared_link(conn, %{"website" => website, "shared_link" => link}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def create_shared_link(conn, %{"shared_link" => link}) do
+ site = conn.assigns[:site]
case Sites.create_shared_link(site, link["name"], link["password"]) do
{:ok, _created} ->
@@ -527,8 +561,8 @@ defmodule PlausibleWeb.SiteController do
end
end
- def edit_shared_link(conn, %{"website" => website, "slug" => slug}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def edit_shared_link(conn, %{"slug" => slug}) do
+ site = conn.assigns[:site]
shared_link = Repo.get_by(Plausible.Site.SharedLink, slug: slug)
changeset = Plausible.Site.SharedLink.changeset(shared_link, %{})
@@ -541,8 +575,8 @@ defmodule PlausibleWeb.SiteController do
)
end
- def update_shared_link(conn, %{"website" => website, "slug" => slug, "shared_link" => params}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def update_shared_link(conn, %{"slug" => slug, "shared_link" => params}) do
+ site = conn.assigns[:site]
shared_link = Repo.get_by(Plausible.Site.SharedLink, slug: slug)
changeset = Plausible.Site.SharedLink.changeset(shared_link, params)
@@ -561,8 +595,8 @@ defmodule PlausibleWeb.SiteController do
end
end
- def delete_shared_link(conn, %{"website" => website, "slug" => slug}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def delete_shared_link(conn, %{"slug" => slug}) do
+ site = conn.assigns[:site]
Repo.get_by(Plausible.Site.SharedLink, slug: slug)
|> Repo.delete!()
@@ -570,8 +604,8 @@ defmodule PlausibleWeb.SiteController do
redirect(conn, to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")
end
- def new_custom_domain(conn, %{"website" => website}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def new_custom_domain(conn, _params) do
+ site = conn.assigns[:site]
changeset = Plausible.Site.CustomDomain.changeset(%Plausible.Site.CustomDomain{}, %{})
conn
@@ -583,10 +617,8 @@ defmodule PlausibleWeb.SiteController do
)
end
- def custom_domain_dns_setup(conn, %{"website" => website}) do
- site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
- |> Repo.preload(:custom_domain)
+ def custom_domain_dns_setup(conn, _params) do
+ site = conn.assigns[:site] |> Repo.preload(:custom_domain)
conn
|> assign(:skip_plausible_tracking, true)
@@ -596,9 +628,9 @@ defmodule PlausibleWeb.SiteController do
)
end
- def custom_domain_snippet(conn, %{"website" => website}) do
+ def custom_domain_snippet(conn, _params) do
site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ conn.assigns[:site]
|> Repo.preload(:custom_domain)
conn
@@ -609,8 +641,8 @@ defmodule PlausibleWeb.SiteController do
)
end
- def add_custom_domain(conn, %{"website" => website, "custom_domain" => domain}) do
- site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ def add_custom_domain(conn, %{"custom_domain" => domain}) do
+ site = conn.assigns[:site]
case Sites.add_custom_domain(site, domain["domain"]) do
{:ok, _custom_domain} ->
@@ -627,15 +659,15 @@ defmodule PlausibleWeb.SiteController do
end
end
- def delete_custom_domain(conn, %{"website" => website}) do
+ def delete_custom_domain(conn, _params) do
site =
- Sites.get_for_user!(conn.assigns[:current_user].id, website)
+ conn.assigns[:site]
|> Repo.preload(:custom_domain)
Repo.delete!(site.custom_domain)
conn
|> put_flash(:success, "Custom domain deleted successfully")
- |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/custom-domain")
+ |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general")
end
end
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index 7becf8aa4..cdd2023f4 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -4,33 +4,37 @@ defmodule PlausibleWeb.StatsController do
alias Plausible.Stats.Clickhouse, as: Stats
alias Plausible.Stats.Query
- plug PlausibleWeb.AuthorizeStatsPlug when action in [:stats, :csv_export]
- plug PlausibleWeb.UpgradeBillingPlug when action in [:stats]
-
- def base_domain() do
- PlausibleWeb.Endpoint.host()
- end
+ plug PlausibleWeb.AuthorizeSiteAccess when action in [:stats, :csv_export]
def stats(%{assigns: %{site: site}} = conn, _params) do
- if Stats.has_pageviews?(site) do
- demo = site.domain == base_domain()
- offer_email_report = get_session(conn, site.domain <> "_offer_email_report")
+ has_pageviews = Stats.has_pageviews?(site)
- conn
- |> assign(:skip_plausible_tracking, !demo)
- |> remove_email_report_banner(site)
- |> put_resp_header("x-robots-tag", "noindex")
- |> render("stats.html",
- site: site,
- has_goals: Plausible.Sites.has_goals?(site),
- title: "Plausible · " <> site.domain,
- offer_email_report: offer_email_report,
- demo: demo
- )
- else
- conn
- |> assign(:skip_plausible_tracking, true)
- |> render("waiting_first_pageview.html", site: site)
+ cond do
+ !site.locked && has_pageviews ->
+ demo = site.domain == PlausibleWeb.Endpoint.host()
+ offer_email_report = get_session(conn, site.domain <> "_offer_email_report")
+
+ conn
+ |> assign(:skip_plausible_tracking, !demo)
+ |> remove_email_report_banner(site)
+ |> put_resp_header("x-robots-tag", "noindex")
+ |> render("stats.html",
+ site: site,
+ has_goals: Plausible.Sites.has_goals?(site),
+ title: "Plausible · " <> site.domain,
+ offer_email_report: offer_email_report,
+ demo: demo
+ )
+
+ !site.locked && !has_pageviews ->
+ conn
+ |> assign(:skip_plausible_tracking, true)
+ |> render("waiting_first_pageview.html", site: site)
+
+ site.locked ->
+ conn
+ |> assign(:skip_plausible_tracking, true)
+ |> render("site_locked.html", site: site)
end
end
diff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.ex
index ab2eef03b..c63782f87 100644
--- a/lib/plausible_web/email.ex
+++ b/lib/plausible_web/email.ex
@@ -164,6 +164,103 @@ defmodule PlausibleWeb.Email do
|> render("cancellation_email.html", name: user.name)
end
+ def new_user_invitation(invitation) do
+ base_email()
+ |> to(invitation.email)
+ |> tag("new-user-invitation")
+ |> subject("[Plausible Analytics] You've been invited to #{invitation.site.domain}")
+ |> render("new_user_invitation.html",
+ invitation: invitation
+ )
+ end
+
+ def existing_user_invitation(invitation) do
+ base_email()
+ |> to(invitation.email)
+ |> tag("existing-user-invitation")
+ |> subject("[Plausible Analytics] You've been invited to #{invitation.site.domain}")
+ |> render("existing_user_invitation.html",
+ invitation: invitation
+ )
+ end
+
+ def ownership_transfer_request(invitation, new_owner_account) do
+ base_email()
+ |> to(invitation.email)
+ |> tag("ownership-transfer-request")
+ |> subject("[Plausible Analytics] Request to transfer ownership of #{invitation.site.domain}")
+ |> render("ownership_transfer_request.html",
+ invitation: invitation,
+ new_owner_account: new_owner_account
+ )
+ end
+
+ def invitation_accepted(invitation) do
+ base_email()
+ |> to(invitation.inviter.email)
+ |> tag("invitation-accepted")
+ |> subject(
+ "[Plausible Analytics] #{invitation.email} accepted your invitation to #{
+ invitation.site.domain
+ }"
+ )
+ |> render("invitation_accepted.html",
+ invitation: invitation
+ )
+ end
+
+ def invitation_rejected(invitation) do
+ base_email()
+ |> to(invitation.inviter.email)
+ |> tag("invitation-rejected")
+ |> subject(
+ "[Plausible Analytics] #{invitation.email} rejected your invitation to #{
+ invitation.site.domain
+ }"
+ )
+ |> render("invitation_rejected.html",
+ invitation: invitation
+ )
+ end
+
+ def ownership_transfer_accepted(invitation) do
+ base_email()
+ |> to(invitation.inviter.email)
+ |> tag("ownership-transfer-accepted")
+ |> subject(
+ "[Plausible Analytics] #{invitation.email} accepted the ownership transfer of #{
+ invitation.site.domain
+ }"
+ )
+ |> render("ownership_transfer_accepted.html",
+ invitation: invitation
+ )
+ end
+
+ def ownership_transfer_rejected(invitation) do
+ base_email()
+ |> to(invitation.inviter.email)
+ |> tag("ownership-transfer-rejected")
+ |> subject(
+ "[Plausible Analytics] #{invitation.email} rejected the ownership transfer of #{
+ invitation.site.domain
+ }"
+ )
+ |> render("ownership_transfer_rejected.html",
+ invitation: invitation
+ )
+ end
+
+ def site_member_removed(membership) do
+ base_email()
+ |> to(membership.user.email)
+ |> tag("site-member-removed")
+ |> subject("[Plausible Analytics] Your access to #{membership.site.domain} has been revoked")
+ |> render("site_member_removed.html",
+ membership: membership
+ )
+ end
+
defp base_email() do
mailer_from = Application.get_env(:plausible, :mailer_email)
diff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.ex
new file mode 100644
index 000000000..2b1ccd7e0
--- /dev/null
+++ b/lib/plausible_web/plugs/authorize_site_access.ex
@@ -0,0 +1,50 @@
+defmodule PlausibleWeb.AuthorizeSiteAccess do
+ import Plug.Conn
+ use Plausible.Repo
+
+ def init([]), do: [:public, :viewer, :admin, :owner]
+ def init(allowed_roles), do: allowed_roles
+
+ def call(conn, allowed_roles) do
+ site = Repo.get_by(Plausible.Site, domain: conn.params["domain"] || conn.params["website"])
+ shared_link_auth = conn.params["auth"]
+
+ shared_link_record =
+ shared_link_auth && Repo.get_by(Plausible.Site.SharedLink, slug: shared_link_auth)
+
+ if !site do
+ PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt
+ else
+ user_id = get_session(conn, :current_user_id)
+ membership_role = user_id && Plausible.Sites.role(user_id, site)
+
+ role =
+ cond do
+ user_id && membership_role ->
+ membership_role
+
+ site.public ->
+ :public
+
+ shared_link_record && shared_link_record.site_id == site.id ->
+ :public
+
+ user_id in admin_user_ids() ->
+ :admin
+
+ true ->
+ nil
+ end
+
+ if role in allowed_roles do
+ merge_assigns(conn, site: site, current_user_role: role)
+ else
+ PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt
+ end
+ end
+ end
+
+ defp admin_user_ids() do
+ Application.get_env(:plausible, :admin_user_ids)
+ end
+end
diff --git a/lib/plausible_web/plugs/authorize_stats_api.ex b/lib/plausible_web/plugs/authorize_stats_api.ex
index 6b76ec2e2..e16ce6437 100644
--- a/lib/plausible_web/plugs/authorize_stats_api.ex
+++ b/lib/plausible_web/plugs/authorize_stats_api.ex
@@ -45,10 +45,10 @@ defmodule PlausibleWeb.AuthorizeStatsApiPlug do
defp verify_access(api_key, site_id) do
site = Repo.get_by(Plausible.Site, domain: site_id)
- is_owner = site && Plausible.Sites.is_owner?(api_key.user_id, site)
+ is_member = site && Plausible.Sites.is_member?(api_key.user_id, site)
cond do
- site && is_owner -> {:ok, site}
+ site && is_member -> {:ok, site}
true -> {:error, :invalid_api_key}
end
end
diff --git a/lib/plausible_web/plugs/authorize_stats_plug.ex b/lib/plausible_web/plugs/authorize_stats_plug.ex
deleted file mode 100644
index 37076c092..000000000
--- a/lib/plausible_web/plugs/authorize_stats_plug.ex
+++ /dev/null
@@ -1,33 +0,0 @@
-defmodule PlausibleWeb.AuthorizeStatsPlug do
- import Plug.Conn
- use Plausible.Repo
-
- def init(options) do
- options
- end
-
- def call(conn, _opts) do
- site = Repo.get_by(Plausible.Site, domain: conn.params["domain"])
- shared_link_auth = conn.params["auth"]
-
- shared_link_record =
- shared_link_auth && Repo.get_by(Plausible.Site.SharedLink, slug: shared_link_auth)
-
- if !site do
- PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt
- else
- user_id = get_session(conn, :current_user_id)
-
- can_access =
- site.public ||
- (user_id && Plausible.Sites.is_owner?(user_id, site)) ||
- (shared_link_auth && shared_link_record && shared_link_record.site_id == site.id)
-
- if !can_access do
- PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt
- else
- assign(conn, :site, site)
- end
- end
- end
-end
diff --git a/lib/plausible_web/plugs/crm_auth_plug.ex b/lib/plausible_web/plugs/crm_auth_plug.ex
index bfffad092..2c42600e8 100644
--- a/lib/plausible_web/plugs/crm_auth_plug.ex
+++ b/lib/plausible_web/plugs/crm_auth_plug.ex
@@ -14,7 +14,7 @@ defmodule PlausibleWeb.CRMAuthPlug do
id ->
user = Repo.get_by(Plausible.Auth.User, id: id)
- if user && user.email in admin_emails() do
+ if user && user.id in admin_user_ids() do
assign(conn, :current_user, user)
else
conn |> send_resp(403, "Not allowed") |> halt
@@ -22,5 +22,5 @@ defmodule PlausibleWeb.CRMAuthPlug do
end
end
- defp admin_emails(), do: Application.get_env(:plausible, :admin_emails)
+ defp admin_user_ids(), do: Application.get_env(:plausible, :admin_user_ids)
end
diff --git a/lib/plausible_web/plugs/tracker.ex b/lib/plausible_web/plugs/tracker.ex
index ee399fa01..61a808e20 100644
--- a/lib/plausible_web/plugs/tracker.ex
+++ b/lib/plausible_web/plugs/tracker.ex
@@ -2,7 +2,7 @@ defmodule PlausibleWeb.Tracker do
import Plug.Conn
use Agent
- base_variants = ["hash", "outbound-links", "exclusions"]
+ base_variants = ["hash", "outbound-links", "exclusions", "compat"]
# Generates Power Set of all variants
variants =
diff --git a/lib/plausible_web/plugs/upgrade_billing_plug.ex b/lib/plausible_web/plugs/upgrade_billing_plug.ex
deleted file mode 100644
index 7cef0b9f3..000000000
--- a/lib/plausible_web/plugs/upgrade_billing_plug.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule PlausibleWeb.UpgradeBillingPlug do
- import Phoenix.Controller
- import Plug.Conn
- use Plausible.Repo
-
- def init(options) do
- options
- end
-
- def call(conn, _opts) do
- user = conn.assigns[:current_user]
-
- if user && Plausible.Billing.needs_to_upgrade?(conn.assigns[:current_user]) do
- conn
- |> redirect(to: "/settings")
- |> halt
- else
- conn
- end
- end
-end
diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex
index c7cbf68f4..ab5f7ee87 100644
--- a/lib/plausible_web/router.ex
+++ b/lib/plausible_web/router.ex
@@ -33,7 +33,7 @@ defmodule PlausibleWeb.Router do
plug :accepts, ["json"]
plug PlausibleWeb.Firewall
plug :fetch_session
- plug PlausibleWeb.AuthorizeStatsPlug
+ plug PlausibleWeb.AuthorizeSiteAccess
end
pipeline :public_api do
@@ -69,6 +69,7 @@ defmodule PlausibleWeb.Router do
get "/:domain/screen-sizes", StatsController, :screen_sizes
get "/:domain/conversions", StatsController, :conversions
get "/:domain/property/:prop_name", StatsController, :prop_breakdown
+ get "/:domain/suggestions/:filter_name", StatsController, :filter_suggestions
end
scope "/api/v1/stats", PlausibleWeb.Api do
@@ -105,6 +106,8 @@ defmodule PlausibleWeb.Router do
get "/register", AuthController, :register_form
post "/register", AuthController, :register
+ get "/register/invitation/:invitation_id", AuthController, :register_from_invitation_form
+ post "/register/invitation/:invitation_id", AuthController, :register_from_invitation
get "/activate", AuthController, :activate_form
post "/activate/request-code", AuthController, :request_activation_code
post "/activate", AuthController, :activate
@@ -195,12 +198,26 @@ defmodule PlausibleWeb.Router do
post "/sites/:website/custom-domains", SiteController, :add_custom_domain
delete "/sites/:website/custom-domains/:id", SiteController, :delete_custom_domain
+ get "/sites/:website/memberships/invite", Site.MembershipController, :invite_member_form
+ post "/sites/:website/memberships/invite", Site.MembershipController, :invite_member
+
+ post "/sites//invitations/:invitation_id/accept", InvitationController, :accept_invitation
+ post "/sites//invitations/:invitation_id/reject", InvitationController, :reject_invitation
+ delete "/sites//invitations/:invitation_id", InvitationController, :remove_invitation
+
+ get "/sites/:website/transfer-ownership", Site.MembershipController, :transfer_ownership_form
+ post "/sites/:website/transfer-ownership", Site.MembershipController, :transfer_ownership
+
+ put "/sites/:website/memberships/:id/role/:new_role", Site.MembershipController, :update_role
+ delete "/sites/:website/memberships/:id", Site.MembershipController, :remove_member
+
get "/sites/:website/weekly-report/unsubscribe", UnsubscribeController, :weekly_report
get "/sites/:website/monthly-report/unsubscribe", UnsubscribeController, :monthly_report
get "/:website/snippet", SiteController, :add_snippet
get "/:website/settings", SiteController, :settings
get "/:website/settings/general", SiteController, :settings_general
+ get "/:website/settings/people", SiteController, :settings_people
get "/:website/settings/visibility", SiteController, :settings_visibility
get "/:website/settings/goals", SiteController, :settings_goals
get "/:website/settings/search-console", SiteController, :settings_search_console
diff --git a/lib/plausible_web/templates/auth/activate.html.eex b/lib/plausible_web/templates/auth/activate.html.eex
index 34e7a9246..723b77ea8 100644
--- a/lib/plausible_web/templates/auth/activate.html.eex
+++ b/lib/plausible_web/templates/auth/activate.html.eex
@@ -47,7 +47,9 @@
- <%= render(PlausibleWeb.AuthView, "_onboarding_steps.html", current_step: 1) %>
-
+ <%= render(PlausibleWeb.AuthView, "_onboarding_steps.html", current_step: 1) %>
+