diff --git a/.gitignore b/.gitignore index 10c4cad..3fb83e7 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ share/python-wheels/ .installed.cfg *.egg MANIFEST - +*.js # PyInstaller # Usually these files are written by a python script from a template # before PyInstaller builds the exe, so as to inject date/other infos into it. diff --git a/web/src/components/fileUpload.vue b/web/src/components/fileUpload.vue index abf5bb3..94e9649 100644 --- a/web/src/components/fileUpload.vue +++ b/web/src/components/fileUpload.vue @@ -48,7 +48,7 @@ export default defineComponent({ formData.append("driverId", selectedDriver.value.toString()); try { - const response = await fetch('/track', { + const response = await fetch('http://localhost:5000/track', { method: 'POST', body: formData, }); diff --git a/web/src/views/route.vue b/web/src/views/route.vue index 0b64e04..856a727 100644 --- a/web/src/views/route.vue +++ b/web/src/views/route.vue @@ -6,7 +6,7 @@ import '@vuepic/vue-datepicker/dist/main.css' import Map from '../components/map.vue'; import FileUpload from '../components/fileUpload.vue'; -type driver = { +type DriverType = { id:number name:string } @@ -14,7 +14,7 @@ type driver = { type track = { id:number name:string - driver: driver + driver: DriverType } export default defineComponent({ @@ -24,7 +24,7 @@ export default defineComponent({ const showMap:Ref = ref(false); const showCloud:Ref = ref(false); const search:Ref = ref(false); - const showUpload:Ref = ref(true); + const showUpload:Ref = ref(false); const tracks:Ref = ref([]) const startSearchDate = ref(); const endSearchDate = ref(); @@ -40,7 +40,7 @@ export default defineComponent({ headers.set('Content-Type', 'application/json') headers.set('Accept', 'application/json') - const request: RequestInfo = new Request("/track?id=" + id, { + const request: RequestInfo = new Request("http://localhost:5000/track?id=" + id, { method:"GET", headers:headers }) @@ -52,7 +52,7 @@ export default defineComponent({ // convert vehicles from json response to processable data mapData.value = await response.json() } else { - alert(response.text) + console.log(await response.text()) } } @@ -62,7 +62,7 @@ export default defineComponent({ headers.set('Content-Type', 'application/json') headers.set('Accept', 'application/json') - const request: RequestInfo = new Request("/track", { + const request: RequestInfo = new Request("http://localhost:5000/track", { method:"GET", headers:headers }) @@ -74,10 +74,12 @@ export default defineComponent({ // convert vehicles from json response to processable data for(let i = 0; i < jsonBody.length; i++) { - tracks.value.push({id: jsonBody[i]["id"], name: jsonBody[i]["name"]}) + tracks.value.push({id: jsonBody[i]["id"], name: jsonBody[i]["name"], driver: { + id: jsonBody[i]["driver"]["id"], name: jsonBody[i]["driver"]["name"] + }}) } } else { - alert(response.text) + console.log(await response.text()) } } @@ -86,7 +88,7 @@ export default defineComponent({ headers.set('Content-Type', 'application/json') headers.set('Accept', 'application/json') - const request: RequestInfo = new Request("/track?start="+startSearchDate.value+"&end="+endSearchDate.value, { + const request: RequestInfo = new Request("http://localhost:5000/track?start="+startSearchDate.value+"&end="+endSearchDate.value, { method:"GET", headers:headers }) @@ -108,7 +110,7 @@ export default defineComponent({ }) } } else { - alert(response.text) + console.log(await response.text()) } }