Date: Thu, 17 Dec 2020 22:03:55 +0300
Subject: [PATCH 1/3] Add Vocabulary Select implementation instead of buefy
select
---
src/App.vue | 3 +-
src/Vocabulary/VSelect.vue | 80 +++++++++++++++++++++++++++++++++
src/components/DropdownStep.vue | 36 +++++++--------
3 files changed, 97 insertions(+), 22 deletions(-)
create mode 100644 src/Vocabulary/VSelect.vue
diff --git a/src/App.vue b/src/App.vue
index 898e500c8..fa57a3652 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -140,11 +140,10 @@ export default {
@import "~bulma";
@import '~buefy/src/scss/utils/_variables.scss';
@import '~buefy/src/scss/components/_modal.scss';
- @import '~buefy/src/scss/components/_select.scss';
@import '~buefy/src/scss/components/_form.scss';
@import '~buefy/src/scss/components/_icon.scss';
- @import "@creativecommons/vocabulary/scss/vocabulary.scss";
+ @import "~@creativecommons/vocabulary/scss/vocabulary.scss";
#app {
-webkit-font-smoothing: antialiased;
diff --git a/src/Vocabulary/VSelect.vue b/src/Vocabulary/VSelect.vue
new file mode 100644
index 000000000..b93b4b5f1
--- /dev/null
+++ b/src/Vocabulary/VSelect.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/DropdownStep.vue b/src/components/DropdownStep.vue
index 239919a85..bf8dd1e0d 100644
--- a/src/components/DropdownStep.vue
+++ b/src/components/DropdownStep.vue
@@ -1,33 +1,29 @@
-
-
+
-
-
+ {{ license }}
+
+
diff --git a/src/components/DropdownStep.vue b/src/components/DropdownStep.vue
index bf8dd1e0d..239919a85 100644
--- a/src/components/DropdownStep.vue
+++ b/src/components/DropdownStep.vue
@@ -1,29 +1,33 @@
-
-
-
+
+
+
import { mapGetters } from 'vuex'
-import VSelect from '@/Vocabulary/VSelect'
export default {
name: 'DropdownStep',
- components: { VSelect },
- inheritAttrs: false,
props: {
+ status: {
+ type: String,
+ validator(value) {
+ return ['active', 'previous', 'inactive'].includes(value)
+ }
+ },
id: Number
},
data() {
From 257eb5b257801e2bdc848a0f28c44abfbc590b16 Mon Sep 17 00:00:00 2001
From: Olga Bulat
Date: Tue, 5 Jan 2021 15:57:42 +0300
Subject: [PATCH 3/3] Replace sentry packages with `@sentry/vue`
---
package-lock.json | 164 +++++++++++++++++++++++++++++++++++++++-------
package.json | 3 +-
src/main.js | 11 +---
3 files changed, 144 insertions(+), 34 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 4ef5c87d1..cf2ae98ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1675,6 +1675,78 @@
"tslib": "^1.9.3"
}
},
+ "@sentry/vue": {
+ "version": "5.29.2",
+ "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-5.29.2.tgz",
+ "integrity": "sha512-u790tNqdDjeAwOTUmiP2NMBvEJIBC5A61rHdmpu1ZW//9w1ZodIUkkySM7ytK1YYgxzlX5LmXB6lZWFIcQ8tbg==",
+ "requires": {
+ "@sentry/browser": "5.29.2",
+ "@sentry/core": "5.29.2",
+ "@sentry/minimal": "5.29.2",
+ "@sentry/types": "5.29.2",
+ "@sentry/utils": "5.29.2",
+ "tslib": "^1.9.3"
+ },
+ "dependencies": {
+ "@sentry/browser": {
+ "version": "5.29.2",
+ "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.29.2.tgz",
+ "integrity": "sha512-uxZ7y7rp85tJll+RZtXRhXPbnFnOaxZqJEv05vJlXBtBNLQtlczV5iCtU9mZRLVHDtmZ5VVKUV8IKXntEqqDpQ==",
+ "requires": {
+ "@sentry/core": "5.29.2",
+ "@sentry/types": "5.29.2",
+ "@sentry/utils": "5.29.2",
+ "tslib": "^1.9.3"
+ }
+ },
+ "@sentry/core": {
+ "version": "5.29.2",
+ "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.29.2.tgz",
+ "integrity": "sha512-7WYkoxB5IdlNEbwOwqSU64erUKH4laavPsM0/yQ+jojM76ErxlgEF0u//p5WaLPRzh3iDSt6BH+9TL45oNZeZw==",
+ "requires": {
+ "@sentry/hub": "5.29.2",
+ "@sentry/minimal": "5.29.2",
+ "@sentry/types": "5.29.2",
+ "@sentry/utils": "5.29.2",
+ "tslib": "^1.9.3"
+ }
+ },
+ "@sentry/hub": {
+ "version": "5.29.2",
+ "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.29.2.tgz",
+ "integrity": "sha512-LaAIo2hwUk9ykeh9RF0cwLy6IRw+DjEee8l1HfEaDFUM6TPGlNNGObMJNXb9/95jzWp7jWwOpQjoIE3jepdQJQ==",
+ "requires": {
+ "@sentry/types": "5.29.2",
+ "@sentry/utils": "5.29.2",
+ "tslib": "^1.9.3"
+ }
+ },
+ "@sentry/minimal": {
+ "version": "5.29.2",
+ "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.29.2.tgz",
+ "integrity": "sha512-0aINSm8fGA1KyM7PavOBe1GDZDxrvnKt+oFnU0L+bTcw8Lr+of+v6Kwd97rkLRNOLw621xP076dL/7LSIzMuhw==",
+ "requires": {
+ "@sentry/hub": "5.29.2",
+ "@sentry/types": "5.29.2",
+ "tslib": "^1.9.3"
+ }
+ },
+ "@sentry/types": {
+ "version": "5.29.2",
+ "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.29.2.tgz",
+ "integrity": "sha512-dM9wgt8wy4WRty75QkqQgrw9FV9F+BOMfmc0iaX13Qos7i6Qs2Q0dxtJ83SoR4YGtW8URaHzlDtWlGs5egBiMA=="
+ },
+ "@sentry/utils": {
+ "version": "5.29.2",
+ "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.29.2.tgz",
+ "integrity": "sha512-nEwQIDjtFkeE4k6yIk4Ka5XjGRklNLThWLs2xfXlL7uwrYOH2B9UBBOOIRUraBm/g/Xrra3xsam/kRxuiwtXZQ==",
+ "requires": {
+ "@sentry/types": "5.29.2",
+ "tslib": "^1.9.3"
+ }
+ }
+ }
+ },
"@soda/friendly-errors-webpack-plugin": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz",
@@ -2496,17 +2568,6 @@
"unique-filename": "^1.1.1"
}
},
- "chalk": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
- "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
"chownr": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
@@ -2684,18 +2745,6 @@
"webpack-sources": "^1.4.3"
}
},
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.1.2",
- "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
- "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
- }
- },
"wrap-ansi": {
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -17803,6 +17852,75 @@
}
}
},
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.1.2",
+ "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
+ "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "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,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "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,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "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,
+ "optional": 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,
+ "optional": 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,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"vue-scrollto": {
"version": "2.20.0",
"resolved": "https://registry.npmjs.org/vue-scrollto/-/vue-scrollto-2.20.0.tgz",
diff --git a/package.json b/package.json
index 86fed04ef..d29a1ceee 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,7 @@
"@creativecommons/vocabulary": "^2020.11.3",
"@creativecommons/vue-vocabulary": "^2020.11.3",
"@linusborg/vue-simple-portal": "^0.1.4",
- "@sentry/browser": "^5.20.1",
- "@sentry/integrations": "^5.20.1",
+ "@sentry/vue": "^5.29.2",
"buefy": "^0.9.4",
"clipboard": "^2.0.6",
"core-js": "^3.6.5",
diff --git a/src/main.js b/src/main.js
index 843344613..80b24f5d3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,8 +8,7 @@ import './styles/vocab.scss'
import VueScrollTo from 'vue-scrollto'
// Analytics
-import * as Sentry from '@sentry/browser'
-import * as Integrations from '@sentry/integrations'
+import * as Sentry from '@sentry/vue'
import Hotjar from 'vue-hotjar'
import VueAnalytics from 'vue-analytics'
@@ -31,13 +30,7 @@ Sentry.init({
dsn: process.env.NODE_ENV === 'production'
? 'https://8c09726e231d4cf780c541f40d3639a9@sentry.io/3009295' // cc-chooser-prod project
: 'https://ab63acb8c1464466869182dd53c7046d@sentry.io/3009597', // cc-chooser-dev project
- integrations: [
- new Integrations.Vue({
- Vue,
- attachProps: true,
- logErrors: process.env.NODE_ENV !== 'production' // Only log errors in dev env
- })
- ]
+ logErrors: process.env.NODE_ENV !== 'production' // Only log errors in dev env
})
// Production only since we only have a prod id