diff --git a/package-lock.json b/package-lock.json index 2f6e837..e9abb84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1622,6 +1622,11 @@ "integrity": "sha512-ogq4NbUWf1uG/j66k0AmiO3GjqJAlQyF8n4w8a954cbCyFKmYGvRtgz6qkq2fWuduTXHibX7GyYL5Pg58Aks2g==", "dev": true }, + "canvas-exif-orientation": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/canvas-exif-orientation/-/canvas-exif-orientation-0.4.0.tgz", + "integrity": "sha1-tIfzcBmYqeh56xBAELKlgRU2i2s=" + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -10974,6 +10979,15 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.21.tgz", "integrity": "sha512-Aejvyyfhn0zjVeLvXd70h4hrE4zZDx1wfZqia6ekkobLmUZ+vNFQer53B4fu0EjWBSiqApxPejzkO1Znt3joxQ==" }, + "vue-croppa": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/vue-croppa/-/vue-croppa-1.3.8.tgz", + "integrity": "sha512-WwYgEKscTCD7BzhnbfRJfzWIU6RcMq2JRimB3aI5gGzpADmpKuqmDh9+oVfiZaEnpmRthgXZxcAvbxU6CeIU9w==", + "requires": { + "canvas-exif-orientation": "^0.4.0", + "object-assign": "^4.1.1" + } + }, "vue-hot-reload-api": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz", diff --git a/package.json b/package.json index 5262480..fb8765c 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "normalize.css": "^8.0.1", "pica": "^5.0.0", "vue": "^2.5.2", + "vue-croppa": "^1.3.8", "vue-worker": "^1.2.1" }, "devDependencies": { diff --git a/src/App.vue b/src/App.vue index c72749e..0601739 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,8 +11,8 @@
- - + +
@@ -102,24 +102,21 @@
-
-
- -
+
- +
-
@@ -127,9 +124,9 @@ - - diff --git a/src/components/SquiggleDataRetriever.vue b/src/components/SquiggleDataRetriever.vue deleted file mode 100644 index 9fd733d..0000000 --- a/src/components/SquiggleDataRetriever.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/src/components/SquiggleRenderer.vue b/src/components/SquiggleRenderer.vue deleted file mode 100644 index f854f3f..0000000 --- a/src/components/SquiggleRenderer.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/src/components/svgChart.vue b/src/components/svgChart.vue index 19d92d4..4d19474 100644 --- a/src/components/svgChart.vue +++ b/src/components/svgChart.vue @@ -23,5 +23,9 @@ diff --git a/src/components/svgChartLine.vue b/src/components/svgChartLine.vue index e9ae9a3..5f7af94 100644 --- a/src/components/svgChartLine.vue +++ b/src/components/svgChartLine.vue @@ -1,5 +1,5 @@ - - diff --git a/src/main.js b/src/main.js index dfbccd8..1c340f5 100644 --- a/src/main.js +++ b/src/main.js @@ -4,13 +4,18 @@ import 'normalize.css' import Vue from 'vue' import App from './App' import VueWorker from 'vue-worker'; +import Croppa from 'vue-croppa' //import './styles/index.scss' -import 'cropperjs/dist/cropper.css'; +//import 'cropperjs/dist/cropper.css'; -Vue.config.productionTip = false +import 'vue-croppa/dist/vue-croppa.css' + + +Vue.config.productionTip = false; Vue.use(VueWorker); +Vue.use(Croppa); /* eslint-disable no-new */ @@ -18,4 +23,4 @@ new Vue({ el: '#app', components: { App }, template: '' -}) +}); diff --git a/src/styles/index.scss b/src/styles/index.scss index a677ce7..56748ce 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -344,25 +344,6 @@ input[type="range"]:focus::-ms-fill-upper { align-content: space-between; } -.panel-toggle { - position: absolute; - right: -12px; - bottom: 50px; - z-index: 1; - //align-self: center; - - .btn { - z-index: 100; - background-color: #000; - padding: 20px 0; -} - .btn:hover { - color: #fff; - background-color: #0069d9; - border-color: #0062cc; -} -} - .image-webcam { position: relative;