Skip to content

Commit cff5d81

Browse files
committed
2 parents b647590 + 5f3ca7e commit cff5d81

File tree

4 files changed

+44
-23
lines changed

4 files changed

+44
-23
lines changed

package.json

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@
1313
"@tensorflow/tfjs-backend-wasm": "^3.10.0",
1414
"@tensorflow/tfjs-converter": "^3.10.0",
1515
"@tensorflow/tfjs-core": "^3.10.0",
16-
"axios": "^0.21.1",
16+
"axios": "^1.7.9",
1717
"core-js": "^3.6.5",
18-
"firebase": "^8.6.3",
18+
"firebase": "^8.10.1",
1919
"heatmap.js": "^2.0.5",
2020
"vue": "^2.6.11",
2121
"vue-router": "^3.2.0",
2222
"vuetify": "^2.4.0",
2323
"vuex": "^3.4.0"
2424
},
2525
"devDependencies": {
26-
"@vue/cli-plugin-babel": "~4.5.0",
27-
"@vue/cli-plugin-eslint": "~4.5.0",
28-
"@vue/cli-plugin-router": "~4.5.0",
29-
"@vue/cli-plugin-vuex": "~4.5.0",
30-
"@vue/cli-service": "~4.5.0",
31-
"babel-eslint": "^10.1.0",
32-
"eslint": "^6.7.2",
33-
"eslint-plugin-vue": "^6.2.2",
34-
"sass": "~1.32.6",
35-
"sass-loader": "^10.0.0",
36-
"vue-cli-plugin-vuetify": "~2.3.1",
37-
"vue-template-compiler": "^2.6.11",
38-
"vuetify-loader": "^1.7.0"
26+
"@vue/cli-plugin-babel": "~5.0.0",
27+
"@vue/cli-plugin-eslint": "~5.0.0",
28+
"@vue/cli-plugin-router": "~5.0.0",
29+
"@vue/cli-plugin-vuex": "~5.0.0",
30+
"@vue/cli-service": "~5.0.0",
31+
"@babel/eslint-parser": "^7.16.0",
32+
"eslint": "^7.32.0",
33+
"eslint-plugin-vue": "^8.0.3",
34+
"sass": "~1.32.0",
35+
"sass-loader": "^12.0.0",
36+
"vue-cli-plugin-vuetify": "~2.5.8",
37+
"vue-template-compiler": "^2.7.16",
38+
"vuetify-loader": "^1.9.2"
3939
},
4040
"eslintConfig": {
4141
"root": true,
@@ -47,9 +47,12 @@
4747
"eslint:recommended"
4848
],
4949
"parserOptions": {
50-
"parser": "babel-eslint"
50+
"parser": "@babel/eslint-parser"
5151
},
52-
"rules": {}
52+
"rules": {
53+
"vue/multi-word-component-names": "off",
54+
"vue/no-mutating-props": "off"
55+
}
5356
},
5457
"browserslist": [
5558
"> 1%",

src/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import store from './store'
55
import vuetify from './plugins/vuetify';
66
import './services/axios'
77
import firebase from 'firebase/app'
8+
import 'firebase/firestore'
89

910
Vue.config.productionTip = false
1011

src/store/calibration.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import axios from "axios";
2-
import firebase from "firebase/app";
3-
import router from "@/router";
1+
import axios from 'axios';
2+
import firebase from 'firebase/app';
3+
import 'firebase/firestore';
4+
import router from '@/router';
45
export default {
56
state: {
67
calibName: "",

src/views/DoubleCalibrationRecord.vue

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,8 +705,14 @@ export default {
705705
706706
// Init record webcam
707707
this.recordWebCam.start();
708-
video.onloadeddata = () => {
709-
this.detectFace();
708+
709+
// Wait for video to be fully ready with proper dimensions
710+
video.onloadedmetadata = async () =>{
711+
// Additional wait to ensure video renders properly
712+
await new Promise(resolve => setTimeout(resolve, 200));
713+
if (video.videoWidth > 0 && video.videoHeight > 0) {
714+
this.detectFace();
715+
}
710716
}
711717
})
712718
.catch((e) => {
@@ -737,8 +743,18 @@ export default {
737743
},
738744
739745
async detectFace() {
746+
const video = document.getElementById("video-tag");
747+
748+
// Ensure video has valid dimensions before processing
749+
if (!video || video.videoWidth === 0 || video.videoHeight === 0) {
750+
console.warn('Video not ready yet, waiting...');
751+
// Wait a bit and try again
752+
await new Promise(resolve => setTimeout(resolve, 100));
753+
return this.detectFace(); // Retry
754+
}
755+
740756
const lastPrediction = await this.model.estimateFaces({
741-
input: document.getElementById("video-tag"),
757+
input: video,
742758
});
743759
return lastPrediction
744760
},

0 commit comments

Comments
 (0)