Skip to content

Commit

Permalink
Merge pull request #2 from cuesto/feat-redesign-scheduled-meetings
Browse files Browse the repository at this point in the history 
Feat redesign scheduled meetings
  • Loading branch information
@cuesto
cuesto authored Nov 14, 2024
2 parents f0f15bb + 012db5d commit 27d0470
Show file tree
Hide file tree
Showing 14 changed files with 2,655 additions and 1,224 deletions.
41 changes: 22 additions & 19 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,32 @@
"build": "vue-cli-service build"
},
"dependencies": {
"@amcharts/amcharts4": "^4.9.26",
"axios": "^0.19.2",
"core-js": "^2.6.11",
"@amcharts/amcharts4": "^4.10.39",
"axios": "^0.21.2",
"core-js": "^3.8.3",
"html2canvas": "^1.0.0-rc.5",
"jspdf": "^1.5.3",
"jspdf-autotable": "^3.5.3",
"ics": "^3.8.1",
"jspdf": "^2.5.1",
"jspdf-autotable": "^3.8.3",
"jwt-decode": "^2.2.0",
"papaparse": "^5.2.0",
"vue": "^2.6.11",
"vue-router": "^3.3.2",
"vue-sweetalert2": "^2.1.5",
"material-design-icons-iconfont": "^5.0.1",
"papaparse": "^5.3.0",
"vue": "^2.7.13",
"vue-excel-xlsx": "^1.2.2",
"vue-router": "^3.5.1",
"vue-sweetalert2": "^2.1.5",
"vue-the-mask": "^0.11.1",
"vuetify": "^2.2.33",
"vuex": "^3.4.0"
"vuetify": "^2.6.0",
"vuex": "^3.6.2"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.12.1",
"@vue/cli-service": "^3.12.1",
"sass": "^1.26.8",
"sass-loader": "^7.3.1",
"vue-cli-plugin-vuetify": "^0.6.3",
"vue-template-compiler": "^2.6.11",
"vuetify-loader": "^1.4.4"
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-service": "~5.0.0",
"sass": "^1.32.0",
"sass-loader": "^10.0.0",
"vue-cli-plugin-vuetify": "^2.5.8",
"vue-template-compiler": "^2.7.13",
"vuetify-loader": "^1.7.0"
},
"postcss": {
"plugins": {
Expand All @@ -39,6 +41,7 @@
},
"browserslist": [
"> 1%",
"last 2 versions"
"last 2 versions",
"not dead"
]
}
62 changes: 37 additions & 25 deletions src/App.vue
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,63 @@
<template>
<v-app id="inspire">
<v-navigation-drawer v-model="drawer" :clipped="$vuetify.breakpoint.lgAndUp" v-if="logged" app>
<v-navigation-drawer
v-model="drawer"
:clipped="$vuetify.breakpoint.lgAndUp"
v-if="logged"
app
>
<template>
<v-list dense>
<template v-if="isAdmin || isRecep">
<v-list-item :to="{name:'home'}">
<v-list-item :to="{ name: 'home' }">
<v-list-item-action>
<v-icon>home</v-icon>
</v-list-item-action>
<v-list-item-title>Inicio</v-list-item-title>
</v-list-item>
</template>
<template v-if="isAdmin || isRecep">
<v-list-item :to="{name:'visitors'}">
<v-list-item :to="{ name: 'visitors' }">
<v-list-item-action>
<v-icon>person_add</v-icon>
</v-list-item-action>
<v-list-item-title>Visitantes</v-list-item-title>
</v-list-item>
</template>
<template v-if="isAdmin">
<v-list-item :to="{name:'employeerequests'}">
<template v-if="isAdmin || isRecep">
<v-list-item :to="{ name: 'employeerequests' }">
<v-list-item-action>
<v-icon>today</v-icon>
</v-list-item-action>
<v-list-item-title>Solicitudes</v-list-item-title>
</v-list-item>
</template>
<template v-if="isAdmin">
<v-list-item :to="{name:'employees'}">
<template v-if="isAdmin || isRecep">
<v-list-item :to="{ name: 'employees' }">
<v-list-item-action>
<v-icon>people</v-icon>
</v-list-item-action>
<v-list-item-title>Empleados</v-list-item-title>
</v-list-item>
</template>
<template v-if="isAdmin">
<v-list-item :to="{name:'blacklists'}">
<v-list-item :to="{ name: 'blacklists' }">
<v-list-item-action>
<v-icon>block</v-icon>
</v-list-item-action>
<v-list-item-title>Bloqueados</v-list-item-title>
</v-list-item>
</template>
<template v-if="isAdmin">
<v-list-item :to="{name:'reports'}">
<v-list-item :to="{ name: 'reports' }">
<v-list-item-action>
<v-icon>assessment</v-icon>
</v-list-item-action>
<v-list-item-title>Reportes</v-list-item-title>
</v-list-item>
</template>
<template v-if="isAdmin">
<v-list-item :to="{name:'users'}">
<v-list-item :to="{ name: 'users' }">
<v-list-item-action>
<v-icon>security</v-icon>
</v-list-item-action>
Expand All @@ -63,7 +68,12 @@
</template>
</v-navigation-drawer>

<v-app-bar :clipped-left="$vuetify.breakpoint.lgAndUp" app color="blue darken-3" dark>
<v-app-bar
:clipped-left="$vuetify.breakpoint.lgAndUp"
app
color="blue darken-3"
dark
>
<v-toolbar-title style="width: 300px" class="ml-0 pl-4">
<v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
<span class="hidden-sm-and-down">Sistema de Visitas</span>
Expand All @@ -72,25 +82,26 @@
<v-btn @click="logout" v-if="logged" text>
<v-icon>logout</v-icon>Salir
</v-btn>
<v-btn :to="{name: 'login'}" v-else text>
<v-btn :to="{ name: 'login' }" v-else text>
<v-icon>apps</v-icon>Login
</v-btn>
</v-app-bar>
<v-content>
<v-main>
<v-container fluid fill-height>
<v-slide-y-transition mode="out-in">
<router-view />
</v-slide-y-transition>
</v-container>
</v-content>
</v-main>

<v-footer blue height="auto">
<v-layout justify-center>
<v-flex text-xs-center>
<v-card flat tile color="primary" class="white--text">
<v-card-text class="white--text pt-0">InfoSocial &copy;2021</v-card-text>
</v-card>
</v-flex>
</v-layout>
<v-layout justify-center>
<v-flex text-md-right>
<v-card flat tile color="primary" class="white--text">
<v-card-text class="white--text pt-0">APITechnology &copy;{{year}}</v-card-text>
</v-card>
</v-flex>
</v-layout>
</v-footer>
</v-app>
</template>
Expand All @@ -109,7 +120,8 @@ export default {
name: "App",
data: () => ({
//
drawer: null
drawer: null,
year: new Date().getFullYear(),
}),
computed: {
logged() {
Expand All @@ -124,15 +136,15 @@ export default {
return (
this.$store.state.user && this.$store.state.user.role == "recepionist"
);
}
},
},
created() {
this.$store.dispatch("autoLogin");
},
methods: {
logout() {
this.$store.dispatch("logOut");
}
}
},
},
};
</script>
Binary file added src/assets/agrifeed.jpeg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions src/components/Employee.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<v-spacer></v-spacer>
<v-dialog v-model="dialog" persistent max-width="600px">
<template v-slot:activator="{ on }">
<v-btn color="green" dark v-on="on">
<v-btn color="green" dark v-on="on" v-if="!isRecep">
<v-icon left dark>person_add</v-icon>Nuevo Empleado
</v-btn>
</template>
Expand Down Expand Up @@ -112,7 +112,7 @@
</v-dialog>
</v-toolbar>
</template>
<template v-slot:item.options="{ item }">
<template v-slot:item.options="{ item }" v-if="!isRecep">
<v-icon
size="sm"
variant="outline-info"
Expand Down Expand Up @@ -172,7 +172,12 @@ export default {
computed: {
formTitle() {
return this.editedIndex === -1 ? "Nuevo Empleado" : "Actualizar Empleado";
}
},
isRecep() {
return (
this.$store.state.user && this.$store.state.user.role == "recepionist"
);
},
},
watch: {
Expand Down
Loading

0 comments on commit 27d0470

Please sign in to comment.