diff --git a/public/img/Modules.PNG b/public/img/Modules.PNG new file mode 100644 index 0000000..64da9f1 Binary files /dev/null and b/public/img/Modules.PNG differ diff --git a/public/img/Routing/tsp/Step1.gif b/public/img/Routing/tsp/Step1.gif new file mode 100644 index 0000000..8d6d1fc Binary files /dev/null and b/public/img/Routing/tsp/Step1.gif differ diff --git a/public/img/Routing/tsp/Step2.gif b/public/img/Routing/tsp/Step2.gif new file mode 100644 index 0000000..a11f371 Binary files /dev/null and b/public/img/Routing/tsp/Step2.gif differ diff --git a/public/img/Routing/tsp/Step3.gif b/public/img/Routing/tsp/Step3.gif new file mode 100644 index 0000000..609e7c3 Binary files /dev/null and b/public/img/Routing/tsp/Step3.gif differ diff --git a/public/img/cierreVIP.PNG b/public/img/cierreVIP.PNG new file mode 100644 index 0000000..254c720 Binary files /dev/null and b/public/img/cierreVIP.PNG differ diff --git a/public/img/locationsVIP.PNG b/public/img/locationsVIP.PNG new file mode 100644 index 0000000..44d7e77 Binary files /dev/null and b/public/img/locationsVIP.PNG differ diff --git a/public/img/logoVIP.png b/public/img/logoVIP.png new file mode 100644 index 0000000..a5b1c4e Binary files /dev/null and b/public/img/logoVIP.png differ diff --git a/public/img/reuVIP.PNG b/public/img/reuVIP.PNG new file mode 100644 index 0000000..df59337 Binary files /dev/null and b/public/img/reuVIP.PNG differ diff --git a/public/img/video1.gif b/public/img/video1.gif new file mode 100644 index 0000000..da6a8bd Binary files /dev/null and b/public/img/video1.gif differ diff --git a/src/components/SidebarPlugin/SideBar.vue b/src/components/SidebarPlugin/SideBar.vue index 6c694d6..2c77612 100644 --- a/src/components/SidebarPlugin/SideBar.vue +++ b/src/components/SidebarPlugin/SideBar.vue @@ -2,10 +2,10 @@
diff --git a/src/pages/Forms/Wizard.vue b/src/pages/Forms/Wizard.vue index 9f5707b..23d9c6a 100644 --- a/src/pages/Forms/Wizard.vue +++ b/src/pages/Forms/Wizard.vue @@ -4,7 +4,7 @@
- + \ No newline at end of file diff --git a/src/pages/Forms/Wizard/ThirdStep.vue b/src/pages/Forms/Wizard/ThirdStep.vue index d2d827a..5768dcb 100644 --- a/src/pages/Forms/Wizard/ThirdStep.vue +++ b/src/pages/Forms/Wizard/ThirdStep.vue @@ -1,110 +1,34 @@ diff --git a/src/pages/Starter/SampleLayout.vue b/src/pages/Starter/SampleLayout.vue index 22233ac..26cbc9d 100644 --- a/src/pages/Starter/SampleLayout.vue +++ b/src/pages/Starter/SampleLayout.vue @@ -142,6 +142,37 @@ }" > + + + + + +
diff --git a/src/pages/Starter/SamplePage.vue b/src/pages/Starter/SamplePage.vue index 48c54be..43f79c6 100644 --- a/src/pages/Starter/SamplePage.vue +++ b/src/pages/Starter/SamplePage.vue @@ -1,18 +1,438 @@ + + - \ No newline at end of file diff --git a/src/repositories/Modules/Networks/SHPath.js b/src/repositories/Modules/Networks/SHPath.js new file mode 100644 index 0000000..cfb606c --- /dev/null +++ b/src/repositories/Modules/Networks/SHPath.js @@ -0,0 +1,25 @@ +import axios from 'axios'; +import store from './../../../store'; + +class SHPath{ + + constructor(){ + this.basePath = store.state.backend; + } + + solveDijkstra(GraphDTO){ + return axios.post(`${this.basePath}/networksModule/solveDijkstra`,GraphDTO); + } + getPath(GraphDTO){ + return axios.post(`${this.basePath}/networksModule/getShortestPath`,GraphDTO); + } + solveFlow(GraphDTO){ + return axios.post(`${this.basePath}/networksModule/solveFlow`,GraphDTO); + } + solveMST(GraphDTO){ + return axios.post(`${this.basePath}/networksModule/solveMST`,GraphDTO); + } + +} + +export default new SHPath(); \ No newline at end of file diff --git a/src/repositories/Modules/Routing/Routing.js b/src/repositories/Modules/Routing/Routing.js new file mode 100644 index 0000000..e014e15 --- /dev/null +++ b/src/repositories/Modules/Routing/Routing.js @@ -0,0 +1,23 @@ +import axios from 'axios'; +import store from '../../../store'; + +class Routing{ + + constructor(){ + this.basePath = store.state.backend; + } + + solveNearestNeighbours(NodesDTO){ + return axios.post(`${this.basePath}/routingModule/solveNearestNeighbours`,NodesDTO); + } + + solveClarkAndWright(NodesDTO){ + return axios.post(`${this.basePath}/routingModule/solveClarkAndWright`,NodesDTO); + } + + solveSweep(NodesDTO){ + return axios.post(`${this.basePath}/routingModule/solveSweep`,NodesDTO); + } +} + +export default new Routing(); \ No newline at end of file diff --git a/src/routes/starterRouter.js b/src/routes/starterRouter.js index 8831075..a71a8df 100644 --- a/src/routes/starterRouter.js +++ b/src/routes/starterRouter.js @@ -24,7 +24,15 @@ import MFP from 'src/views/Modules/Networks/MFP'; import NEOSServer from 'src/views/Modules/LinearProgramming/NEOSServer'; import InteriorPoint from 'src/views/Modules/LinearProgramming/InteriorPoint'; +import NearestNeighbour from 'src/views/Modules/Routing/NearestNeighbor'; +import ClarkeAndWright from 'src/views/Modules/Routing/ClarkeAndWright'; +import Opt3Move from 'src/views/Modules/Routing/Opt3Move'; +import Sweep from 'src/views/Modules/Routing/Sweep'; +import TSP from 'src/views/Modules/Routing/TSPMainPage'; +import VRP from 'src/views/Modules/Routing/VRPMainPage'; + +import KMeans from 'src/views/Modules/Clustering/KMeans'; Vue.use(Router); @@ -123,6 +131,46 @@ export default new Router({ name: 'mfp', components: { default: MFP } }, + { + path: 'maximum-flow-problem', + name: 'mfp', + components: { default: MFP } + }, + { + path: 'nearest-neighbor', + name: 'nn', + components: { default: NearestNeighbour } + }, + { + path: 'clark-and-wright', + name: 'ck', + components: { default: ClarkeAndWright } + }, + { + path: 'opt-3-move', + name: 'o3p', + components: { default: Opt3Move } + }, + { + path: 'sweep', + name: 'sp', + components: { default: Sweep } + }, + { + path: 'K-Means', + name: 'km', + components: {default: KMeans} + }, + { + path: 'TSP', + name: 'tsp', + components: {default: TSP} + }, + { + path: 'VRP', + name: 'vrp', + components: { default: VRP} + } ] } ], diff --git a/src/store.js b/src/store.js index 090d7a3..8bc75e1 100644 --- a/src/store.js +++ b/src/store.js @@ -5,6 +5,13 @@ Vue.use(Vuex); export default new Vuex.Store({ state: { + //backend: 'http://localhost:8080/api', //Development backend + //backend: 'https://icesi-vip-alien-backend.herokuapp.com/api', //Production backend + //token: '', backend: process.env.NODE_ENV=='production' ? 'https://icesi-vip-alien-backend.herokuapp.com/api' : 'http://localhost:8080/api' + /* backend: 'http://localhost:8080/api', + token: '', */ } }) + + diff --git a/src/views/Modules/Clustering/KMeans.vue b/src/views/Modules/Clustering/KMeans.vue new file mode 100644 index 0000000..9285ad6 --- /dev/null +++ b/src/views/Modules/Clustering/KMeans.vue @@ -0,0 +1,39 @@ + + + + + \ No newline at end of file diff --git a/src/views/Modules/LinearProgramming/CraftMethod.vue b/src/views/Modules/LinearProgramming/CraftMethod.vue index c4d0d93..fe400fd 100644 --- a/src/views/Modules/LinearProgramming/CraftMethod.vue +++ b/src/views/Modules/LinearProgramming/CraftMethod.vue @@ -338,7 +338,7 @@ export default { }, log() { axios - .post("http://proyectovip.icesi.edu.co/craft", this.requestBody) + .post("http://proyectovip.icesi.edu.co/craftMethodModule/craft", this.requestBody) .then(response => { // console.log(response); this.succesMessage(); diff --git a/src/views/Modules/Networks/MFP.vue b/src/views/Modules/Networks/MFP.vue index e00fbc7..3e1261d 100644 --- a/src/views/Modules/Networks/MFP.vue +++ b/src/views/Modules/Networks/MFP.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/src/views/Modules/Routing/LoadFileComponent.vue b/src/views/Modules/Routing/LoadFileComponent.vue new file mode 100644 index 0000000..17bcab3 --- /dev/null +++ b/src/views/Modules/Routing/LoadFileComponent.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/NearestNeighbor.vue b/src/views/Modules/Routing/NearestNeighbor.vue new file mode 100644 index 0000000..5ebac1b --- /dev/null +++ b/src/views/Modules/Routing/NearestNeighbor.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/NodesTable.vue b/src/views/Modules/Routing/NodesTable.vue new file mode 100644 index 0000000..7d8d7bb --- /dev/null +++ b/src/views/Modules/Routing/NodesTable.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/src/views/Modules/Routing/Opt3Move.vue b/src/views/Modules/Routing/Opt3Move.vue new file mode 100644 index 0000000..83a8fb7 --- /dev/null +++ b/src/views/Modules/Routing/Opt3Move.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/RoutingSolution.vue b/src/views/Modules/Routing/RoutingSolution.vue new file mode 100644 index 0000000..f50252c --- /dev/null +++ b/src/views/Modules/Routing/RoutingSolution.vue @@ -0,0 +1,95 @@ + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/Sweep.vue b/src/views/Modules/Routing/Sweep.vue new file mode 100644 index 0000000..b722dcd --- /dev/null +++ b/src/views/Modules/Routing/Sweep.vue @@ -0,0 +1,67 @@ + + + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/TSPMainPage.vue b/src/views/Modules/Routing/TSPMainPage.vue new file mode 100644 index 0000000..6848cd8 --- /dev/null +++ b/src/views/Modules/Routing/TSPMainPage.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/VRPCapacitive.vue b/src/views/Modules/Routing/VRPCapacitive.vue new file mode 100644 index 0000000..b846e90 --- /dev/null +++ b/src/views/Modules/Routing/VRPCapacitive.vue @@ -0,0 +1,87 @@ + + + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/VRPInputTable.vue b/src/views/Modules/Routing/VRPInputTable.vue new file mode 100644 index 0000000..39acc2a --- /dev/null +++ b/src/views/Modules/Routing/VRPInputTable.vue @@ -0,0 +1,251 @@ + + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/VRPMainPage.vue b/src/views/Modules/Routing/VRPMainPage.vue new file mode 100644 index 0000000..93d24d7 --- /dev/null +++ b/src/views/Modules/Routing/VRPMainPage.vue @@ -0,0 +1,64 @@ + + + + + \ No newline at end of file diff --git a/src/views/Modules/Routing/fileReader.js b/src/views/Modules/Routing/fileReader.js new file mode 100644 index 0000000..465d890 --- /dev/null +++ b/src/views/Modules/Routing/fileReader.js @@ -0,0 +1,75 @@ +var f = document.getElementById("file"); +var fileList; +//var fs = document.getElementById("fs"); +var customButton = document.getElementById("customBTN"); +var customText = document.getElementById("customTXT"); + +customButton.addEventListener("click",function(e){ + f.click(); +}); + +f.addEventListener("change",function(e){ + if (f.value){ + customTXT.innerHTML = f.value; + }else{ + customTXT.innerHTML = "Nothing loaded yet"; + } +}); + + + + +f.addEventListener('change', (event) => { + fileList = event.target.files; + console.log(fileList); + getMetadataForFileList(fileList); + }); + + const dropArea = document.getElementById('DropArea'); + + dropArea.addEventListener('dragover', (event) => { + event.stopPropagation(); + event.preventDefault(); + // Style the drag-and-drop as a "copy file" operation. + event.dataTransfer.dropEffect = 'copy'; + }); + + dropArea.addEventListener('drop', (event) => { + event.stopPropagation(); + event.preventDefault(); + fileList = event.dataTransfer.files; + console.log(fileList); + getMetadataForFileList(fileList); + }); + + + function getMetadataForFileList(data) { + for (const file of fileList) { + // Not supported in Safari for iOS. + const name = file.name ? file.name : 'NOT SUPPORTED'; + // Not supported in Firefox for Android or Opera for Android. + const type = file.type ? file.type : 'NOT SUPPORTED'; + // Unknown cross-browser support. + const size = file.size ? file.size : 'NOT SUPPORTED'; + console.log({file, name, type, size}); + + readFile(file); + + } + } + + function readFile(file) { + var reader = new FileReader(); + reader.addEventListener('load', (event) => { + console.log(event.target.result); + customTXT.innerHTML = file.name; + }); + + reader.addEventListener('progress', (event) => { + if (event.loaded && event.total) { + const percent = (event.loaded / event.total) * 100; + console.log(`Progress: ${Math.round(percent)}`); + } + }); + reader.readAsText(file); +}