Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
22a329a
the repository was updated with the network module
Nov 4, 2020
089dd8b
MFP of module Networks was update
Nov 5, 2020
6d39d30
Initialized routing module
Gallo9923 Nov 5, 2020
545ad28
Path to access backend was fixed
Nov 5, 2020
14180e1
Merge pull request #18 from Carlosches/master
ChristianFlor Nov 12, 2020
cc7565e
Added Nearest Neighbor algorithm page
Gallo9923 Nov 17, 2020
0a912d0
home page done
Nov 17, 2020
472fd82
Merge pull request #19 from ChristianFlor/development
ChristianFlor Nov 17, 2020
c988070
Merge pull request #20 from icesivip/development
ChristianFlor Nov 17, 2020
e8fa538
Update SamplePage.vue
Nov 18, 2020
87f35f1
Merge pull request #21 from icesivip/development
ChristianFlor Nov 18, 2020
053145a
Update store.js
Nov 18, 2020
1658c96
Merge pull request #22 from icesivip/development
ChristianFlor Nov 18, 2020
35c483e
Update SamplePage.vue
Nov 18, 2020
0524d38
graph centered
Gallo9923 Nov 19, 2020
fef35ac
update store.j
Gallo9923 Nov 19, 2020
3c95ba6
Merge pull request #23 from Gallo9923/development
ChristianFlor Nov 19, 2020
503f86a
Merge branch 'development'
Nov 19, 2020
fffbc3a
Merge pull request #2 from icesivip/master
Carlosches Nov 25, 2020
34833f7
the graph of the modules was updated so that it is now dynamic
Nov 25, 2020
8ae1745
Merge pull request #24 from Carlosches/master
Carlosches Nov 25, 2020
9a41eeb
Merge pull request #25 from icesivip/master
Carlosches Nov 25, 2020
4a76e77
Added new files
Gallo9923 Mar 10, 2021
e6890dd
Merge branch 'development' of https://github.com/icesivip/alienfronte…
Gallo9923 Mar 10, 2021
55c3e55
Starting point
Gallo9923 Mar 11, 2021
61ee4ed
Finished TSP Main page
Gallo9923 Mar 24, 2021
a750469
Data upload
Gallo9923 Jun 11, 2021
f11065b
gui started
JuanFernandoMartinez Sep 14, 2021
6530363
trucks table designed
JuanFernandoMartinez Sep 14, 2021
d71f71b
sidebar item added
JuanFernandoMartinez Oct 4, 2021
7c7dbce
half frontend vrp capacitive done
JuanFernandoMartinez Oct 4, 2021
f942030
fine derails advanced
JuanFernandoMartinez Oct 5, 2021
62be277
tutorial added to Nearest Neighbour view
JuanFernandoMartinez Nov 19, 2021
2d4da08
little changes on tsp frontend
JunaiCode Feb 25, 2022
a30110d
problem with responsive table component solved
JuanFernandoMartinez Mar 4, 2022
7a6b8f7
Changes to nodes table
DaniloErazo Mar 11, 2022
670e857
responsive details added to TSP view
JuanFernandoMartinez Mar 18, 2022
4d9471e
Merge branch 'development' of https://github.com/JuanFernandoMartinez…
JuanFernandoMartinez Mar 18, 2022
4a2f3cb
Added some responsive behavior
Dev-Pachon Mar 24, 2022
52e5c7c
New layout added to VRP view
JuanFernandoMartinez Apr 4, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/img/Modules.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/Routing/tsp/Step1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/Routing/tsp/Step2.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/Routing/tsp/Step3.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/cierreVIP.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/locationsVIP.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/logoVIP.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/reuVIP.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/video1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/SidebarPlugin/SideBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="sidebar" :data="backgroundColor">
<div class="sidebar-wrapper" ref="sidebarScrollArea">
<div class="logo">
<a href="http://www.creative-tim.com" class="simple-text logo-mini">
<a href="http://proyectovip.icesi.edu.co/index.html#/dashboard" class="simple-text logo-mini">
<img :src="logo" alt="app-logo" />
</a>
<a href="http://www.creative-tim.com" class="simple-text logo-normal">
<a href="http://proyectovip.icesi.edu.co/index.html#/dashboard" class="simple-text logo-normal">
{{ title }}
</a>
</div>
Expand Down
24 changes: 1 addition & 23 deletions src/pages/Forms/Wizard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="col-md-10">
<simple-wizard>
<template slot="header">
<h3 class="card-title">Build your profile</h3>
<h3 class="card-title">Contact us</h3>
<h3 class="description">
This information will let us know more about you.
</h3>
Expand All @@ -21,33 +21,13 @@
></first-step>
</wizard-tab>

<wizard-tab :before-change="() => validateStep('step2')">
<template slot="label">
<i class="tim-icons icon-settings-gear-63"></i>
<p>Account</p>
</template>
<second-step
ref="step2"
@on-validated="onStepValidated"
></second-step>
</wizard-tab>

<wizard-tab :before-change="() => validateStep('step3')">
<template slot="label">
<i class="tim-icons icon-delivery-fast"></i>
<p>Address</p>
</template>
<third-step ref="step3"></third-step>
</wizard-tab>
</simple-wizard>
</div>
</div>
</div>
</template>
<script>
import FirstStep from './Wizard/FirstStep.vue';
import SecondStep from './Wizard/SecondStep.vue';
import ThirdStep from './Wizard/ThirdStep.vue';
import swal from 'sweetalert2';
import { SimpleWizard, WizardTab } from 'src/components';

Expand All @@ -59,8 +39,6 @@ export default {
},
components: {
FirstStep,
SecondStep,
ThirdStep,
SimpleWizard,
WizardTab
},
Expand Down
28 changes: 21 additions & 7 deletions src/pages/Forms/Wizard/FirstStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,25 @@
</div>
<div class="col-sm-10">
<base-input
name="address"
placeholder="Address"
v-model="model.address"
v-validate="modelValidations.address"
:error="getError('address')"
name="university"
placeholder="University"
v-model="model.university"
v-validate="modelValidations.university"
:error="getError('university')"
addon-left-icon="tim-icons icon-square-pin"
>
</base-input>
</div>
<div class="col-sm-7">
<base-input
label="Comments"
name="comments"
v-model="model.comments"
:error="getError('comments')"
v-validate="modelValidations.comments"
>
</base-input>
</div>
</div>
</div>
</template>
Expand All @@ -73,7 +83,8 @@ export default {
lastName: '',
email: '',
phone: '',
address: ''
university: '',
comments: ''
},
modelValidations: {
firstName: {
Expand All @@ -91,7 +102,10 @@ export default {
phone: {
required: true,
numeric: true
}
},
comments: {
required: true
},
}
};
},
Expand Down
68 changes: 54 additions & 14 deletions src/pages/Forms/Wizard/SecondStep.vue
Original file line number Diff line number Diff line change
@@ -1,36 +1,76 @@
<template>
<div>
<h5 class="info-text">Who are you? (Fileinput)</h5>
<div class="row justify-content-center">
<div class="col-lg-10 text-center">
<image-upload @change="onFileChange"></image-upload>
</div>
<div class="row justify-content-center">
<div class="col-sm-12">
<h5 class="info-text">Are you living in a nice area?</h5>
</div>
<div class="col-sm-7">
<base-input
label="Comments"
name="street name"
v-model="model.street"
:error="getError('street name')"
v-validate="modelValidations.street"
>
</base-input>
</div>



</div>
</template>
<script>
import { ImageUpload } from 'src/components';
import { Select, Option } from 'element-ui';

export default {
components: {
ImageUpload
[Select.name]: Select,
[Option.name]: Option
},
data() {
return {
model: {
file: null
street: '',
streetNo: '',
city: '',
country: ''
},
countryOptions: [
'Australia',
'Germany',
'Netherlands',
'USA',
'UK',
'New Zealand'
],
modelValidations: {
street: {
required: true,
min: 5
},
streetNo: {
required: true,
min: 5
},
city: {
required: true
},
country: {
required: true
}
}
};
},
methods: {
onFileChange(file) {
this.file = file;
getError(fieldName) {
return this.errors.first(fieldName);
},
validate() {
this.$emit('on-validated', true, this.model);
return Promise.resolve(true);
return this.$validator.validateAll().then(res => {
this.$emit('on-validated', res, this.model);
return res;
});
}
}
};
</script>
<style></style>
<style></style>
102 changes: 13 additions & 89 deletions src/pages/Forms/Wizard/ThirdStep.vue
Original file line number Diff line number Diff line change
@@ -1,110 +1,34 @@
<template>
<div class="row justify-content-center">
<div class="col-sm-12">
<h5 class="info-text">Are you living in a nice area?</h5>
</div>
<div class="col-sm-7">
<base-input
label="Street Name"
name="street name"
v-model="model.street"
:error="getError('street name')"
v-validate="modelValidations.street"
>
</base-input>
</div>
<div class="col-sm-3">
<base-input
label="Street No"
name="street number"
v-model="model.streetNo"
:error="getError('street number')"
v-validate="modelValidations.streetNo"
>
</base-input>
</div>
<div class="col-sm-5">
<base-input
label="City"
name="city"
v-model="model.city"
:error="getError('city')"
v-validate="modelValidations.city"
>
</base-input>
</div>
<div class="col-sm-5">
<label>Country</label>
<base-input :error="getError('country')">
<el-select
v-model="model.country"
class="select-primary"
name="country"
v-validate="modelValidations.country"
>
<el-option
v-for="country in countryOptions"
class="select-primary"
:label="country"
:value="country"
:key="country"
></el-option>
</el-select>
</base-input>
<div>
<h5 class="info-text">Who are you? (Fileinput)</h5>
<div class="row justify-content-center">
<div class="col-lg-10 text-center">
<image-upload @change="onFileChange"></image-upload>
</div>
</div>
</div>
</template>
<script>
import { Select, Option } from 'element-ui';
import { ImageUpload } from 'src/components';

export default {
components: {
[Select.name]: Select,
[Option.name]: Option
ImageUpload
},
data() {
return {
model: {
street: '',
streetNo: '',
city: '',
country: ''
},
countryOptions: [
'Australia',
'Germany',
'Netherlands',
'USA',
'UK',
'New Zealand'
],
modelValidations: {
street: {
required: true,
min: 5
},
streetNo: {
required: true,
min: 5
},
city: {
required: true
},
country: {
required: true
}
file: null
}
};
},
methods: {
getError(fieldName) {
return this.errors.first(fieldName);
onFileChange(file) {
this.file = file;
},
validate() {
return this.$validator.validateAll().then(res => {
this.$emit('on-validated', res, this.model);
return res;
});
this.$emit('on-validated', true, this.model);
return Promise.resolve(true);
}
}
};
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Pages/UserProfile/EditProfileForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ export default {
company: 'Creative Code Inc.',
username: 'michael23',
email: '',
firstName: 'Mike',
lastName: 'Andrew',
firstName: 'CLAUDIA JOHANA',
lastName: 'AGUDELO ARANGO',
address: 'Bld Mihail Kogalniceanu, nr. 8 Bl 1, Sc 1, Ap 09',
city: 'New York',
country: 'USA',
Expand Down
38 changes: 17 additions & 21 deletions src/pages/Pages/UserProfile/UserCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,28 @@
<div class="block block-three"></div>
<div class="block block-four"></div>
<a href="javascript:void(0)">
<img class="avatar" src="img/emilyz.jpg" alt="..." />
<h5 class="title">Mike Andrew</h5>
<img class="avatar" src="https://cdn.icon-icons.com/icons2/1369/PNG/512/-person_90382.png" alt="..." />
<h5 class="title">{{name}}</h5>
</a>
<p class="description">Ceo/Co-Founder</p>
<p class="description">{{carrer}}</p>
</div>
<p></p>
<div class="card-description">
Do not be scared of the truth because we need to restart the human
foundation in truth And I love you like Kanye loves Kanye I love Rick
Owens’ bed design but the back is...
</div>

<div slot="footer" class="button-container">
<base-button class="btn-facebook" icon round>
<i class="fab fa-facebook"></i>
</base-button>
<base-button class="btn-twitter" icon round>
<i class="fab fa-twitter"></i>
<!--<div slot="footer" class="button-container">
<base-button class="btn-linkedin" icon round>
<i class="fab fa-linkedin" ><a href="https://www.linkedin.com/feed/"></a></i>
</base-button>
<base-button class="btn-google" icon round>
<i class="fab fa-google-plus"></i>
</base-button>
</div>
</div>-->
</card>
</template>
<script>
export default {};

export default {
props: {
name: String,
carrer: String,
img: String,
link: String
},

};
</script>
<style></style>
Loading