diff --git a/package.json b/package.json
index 38d35fa..119ea02 100644
--- a/package.json
+++ b/package.json
@@ -16,10 +16,12 @@
"dependencies": {
"es6-promise": "^4.1.1",
"isomorphic-fetch": "^2.2.1",
+ "quagga": "^0.12.1",
"vue": "^2.4.4",
"vue-router": "^2.7.0",
"vuetify": "^0.15.7",
- "vuex": "^2.4.0"
+ "vuex": "^2.4.0",
+ "webrtc-adapter": "^5.0.4"
},
"devDependencies": {
"autoprefixer": "^7.1.2",
diff --git a/src/components/ProductOverviewItem.vue b/src/components/ProductOverviewItem.vue
new file mode 100644
index 0000000..ee54046
--- /dev/null
+++ b/src/components/ProductOverviewItem.vue
@@ -0,0 +1,20 @@
+
+
+
+ {{ name }}
+
+
+ {{ icon }}
+
+
+
+
+
+
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 7e42723..9fc9bd6 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -3,8 +3,9 @@ export default {
appDescription: 'InFood is your grocery companion app, to help you scan quickly facts about products you are about to buy.',
licenseDescription: 'It is available under a {MITLicense} and source code is hosted by {Github}. Please report any bugs {there}.',
MITLicense: 'MIT license',
- OpenFoodFactsDescription: 'Products data is provided by {OpenFoodFacts} under {OpenDatabaseLicense}.',
+ OpenFoodFactsDescription: '{OpenFoodFacts} provides products data under {OpenDatabaseLicense} and illustrations under {CreativeCommonsBYSALicense}.',
OpenDatabaseLicense: 'Open Database License',
+ CreativeCommonsBYSALicense: 'CC BY SA',
},
misc: {
loading: 'Loading…',
diff --git a/src/router/index.js b/src/router/index.js
index 4933a06..6c55d2e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,7 +6,7 @@ import Home from '@/views/Home';
import ManualBarcode from '@/views/ManualBarcode';
import Product from '@/views/Product';
import Preferences from '@/views/Preferences';
-import Scan from '@/views/Scan';
+import Scan from '@/views/ScanQuagga';
Vue.use(Router);
diff --git a/src/views/About.vue b/src/views/About.vue
index 9d39340..01e9479 100644
--- a/src/views/About.vue
+++ b/src/views/About.vue
@@ -11,8 +11,11 @@
OpenFoodFacts
{{ $t('about.OpenDatabaseLicense') }}
+ {{ $t('about.CreativeCommonsBYSALicense') }}
-
+
+
+
diff --git a/src/views/Product.vue b/src/views/Product.vue
index a228c4e..bd304b1 100644
--- a/src/views/Product.vue
+++ b/src/views/Product.vue
@@ -1,46 +1,42 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Herta
+
{{ product.name }}
+
+
+
+
+
+
+
+ A
+
+
+ A
+
+
+ 300km away
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ props.item.name }} |
-
-
-
-
-
-
-
- Bidule
-
-
-
-
-
-
+
Overview
view_list
@@ -50,8 +46,8 @@
info_outline
- Labels
- info_outline
+ Alerts
+ warning
@@ -59,10 +55,12 @@
diff --git a/src/views/ScanQuagga.vue b/src/views/ScanQuagga.vue
index 7e1ee82..26d0d97 100644
--- a/src/views/ScanQuagga.vue
+++ b/src/views/ScanQuagga.vue
@@ -3,7 +3,7 @@
Let's scan something!
Found: {{ barcode }}
-
+
{{ error }}
@@ -26,48 +26,42 @@ export default {
},
},
mounted() {
- const videoElement = this.$refs.video;
- const barcodeHandler = this.handleBarcode;
-
Quagga.init({
inputStream: {
- name: 'Scan',
type: 'LiveStream',
constraints: {
+ width: { min: 640 },
+ height: { min: 480 },
facingMode: 'environment',
+ aspectRatio: { min: 1, max: 2 },
},
- target: videoElement,
},
+ /* locator: {
+ patchSize: 'medium',
+ halfSample: true,
+ },
+ frequency: 10,
decoder: {
readers: [
'ean_reader',
],
- debug: {
- drawBoundingBox: true,
- showFrequency: true,
- drawScanline: true,
- showPattern: true,
- },
},
+ locate: true, */
}, (err) => {
if (err) {
this.error = err.toString();
- return;
+ // return;
}
- Quagga.start();
- Quagga.onDetected(barcodeHandler);
+ // Quagga.start();
});
+ /* Quagga.onProcessed((result) => {
+ console.log(result);
+ }); */
},
beforeDestroy() {
- Quagga.offDetected(this.handleBarcode);
- Quagga.stop();
+ // Quagga.offDetected(this.handleBarcode);
+ // Quagga.stop();
},
};
-
-