Skip to content

Commit

Permalink
ADD: Vuetify
Browse files Browse the repository at this point in the history
  • Loading branch information
matiasmenares committed Dec 6, 2019
1 parent 5656596 commit 5d75d5b
Show file tree
Hide file tree
Showing 25 changed files with 424 additions and 44 deletions.
Binary file removed 16-11-19-21-30.hex
Binary file not shown.
Binary file removed 23-11-19-12-54.hex
Binary file not shown.
Binary file removed 23-11-19-13-03.hex
Binary file not shown.
Binary file removed 23-11-19-13-04.hex
Binary file not shown.
Binary file removed 23-11-19-13-05.hex
Binary file not shown.
Binary file removed 23-11-19-13-08.hex
Binary file not shown.
Binary file removed 23-11-19-13-10.hex
Binary file not shown.
121 changes: 120 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,19 @@
"axios": "^0.19.0",
"bootstrap": "^4.3.1",
"bootstrap-vue": "^2.0.4",
"chart.js": "^2.9.3",
"core-js": "^3.3.2",
"highcharts": "^7.2.1",
"highcharts-vue": "^1.3.5",
"vue": "^2.6.10",
"vue-axios": "^2.1.5",
"vue-canvas-gauges": "0.0.0",
"vue-chartjs": "^3.5.0",
"vue-route": "^1.5.1",
"vue-router": "^3.1.3",
"vue-socket.io": "^3.0.7",
"vue-svg-gauge": "^1.2.1"
"vue-svg-gauge": "^1.2.1",
"vuetify": "^2.1.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.0.0",
Expand All @@ -28,8 +33,11 @@
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.0.0",
"node-sass": "^4.13.0",
"sass": "^1.19.0",
"sass-loader": "^8.0.0",
"vue-template-compiler": "^2.6.10"
"vue-cli-plugin-vuetify": "^2.0.2",
"vue-template-compiler": "^2.6.10",
"vuetify-loader": "^1.3.0"
},
"eslintConfig": {
"root": true,
Expand Down
2 changes: 2 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>Apptec Sign</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
</head>
<body>
<noscript>
Expand Down
Empty file added requirements.txt
Empty file.
23 changes: 14 additions & 9 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
<template>
<div id="app">
<router-view/>
</div>
<v-app id="app">
<router-view/>
</v-app>
</template>

<script>
export default {
name: 'App'
}
</script>
name: 'App',
<style lang="scss">
@import "assets/sass/app";
</style>
components: {
},
data: () => ({
//
}),
};
</script>
¡
1 change: 1 addition & 0 deletions src/assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/assets/sass/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ $color-macal: #E4610C;
$color-macal-transparent: #E4610C60;
$color-macal-var: #E74327;
$color-grey: #707070;
$material-light.background = #fff;

@import '~bootstrap/scss/bootstrap';
@import '~bootstrap-vue/src/index.scss';
Expand All @@ -28,8 +29,8 @@ b{
.pointer{
cursor: pointer;
}
body {
background-image: url("/image/back.jpg");
#landing-page {
background-image: url("/image/back.jpg") !important ;
background-color: #000000;
background-size: cover;
background-repeat: no-repeat;
Expand Down
7 changes: 4 additions & 3 deletions src/components/public/application.vue
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<template>
<div>
<v-header></v-header>
<v-alert></v-alert>
<router-view></router-view>
<v-footer></v-footer>

</div>
</template>
<script>
import Header from "./components/header";
import Footer from "./components/footer";
import Alerts from "./components/alerts";
export default {
name: 'Application',
components: {
'v-header': Header,
'v-footer': Footer,
'v-footer': Footer,
'v-alert': Alerts,
}
}
</script>
Expand Down
31 changes: 31 additions & 0 deletions src/components/public/components/alerts.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<template>
<v-alert prominent type="error" dismissible>
<v-row align="center">
<v-col class="grow"><b>Alerta</b> Alta temperatura.</v-col>
<v-col class="shrink">
</v-col>
</v-row>
</v-alert>
</template>
<script>
export default {
name: 'Alerts',
data(){
return{
}
},
mounted () {
this.set_data()
},
methods:{
set_data(){
this.sockets.subscribe('ecuAlerts', (data) => {
this.ecu = data;
})
}
}
}
</script>
<style scoped>
</style>
49 changes: 46 additions & 3 deletions src/components/public/components/footer.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,52 @@
<template>
<div>
</div>
<v-footer absolute class="font-weight-medium">
<v-spacer></v-spacer>
<v-bottom-sheet v-model="sheet">
<template v-slot:activator="{ on }">
<v-btn class="ma-2" color="red" dark v-on="on">
<v-icon dark>mdi-wrench</v-icon>
</v-btn>
</template>
<v-sheet dark class="text-center" height="200px">
<v-btn class="mt-6" text color="red" @click="sheet = !sheet">Cerrar</v-btn>
<div>
<b-row>
<b-col>
<v-btn @click="send_to_dashboard()"><v-icon>fas fa-tachometer-alt</v-icon>Dashboard</v-btn>
</b-col>
<b-col>
<v-btn @click="send_to_chart_rpm()"><v-icon>fas fa-tachometer-alt</v-icon>Gráficos</v-btn>
</b-col>
<b-col>
<v-icon>mdi-history</v-icon>Configuración
</b-col>
</b-row>
</div>
</v-sheet>
</v-bottom-sheet>
</v-footer>
</template>
<script>
import Menu from "./menu";
export default {
name: "Footer"
name: "Footer",
data(){
return{
sheet: false,
}
},
component:{
'v-menu': Menu,
},
methods:{
send_to_chart_rpm(){
this.sheet = false
this.$router.push({ name: 'graph-rpm', params: {}});
},
send_to_dashboard(){
this.sheet = false
this.$router.push({ name: 'index', params: {}});
}
}
}
</script>
Loading

0 comments on commit 5d75d5b

Please sign in to comment.