Skip to content

Commit

Permalink
Merge pull request #82 from OpenHausIO/dev
Browse files Browse the repository at this point in the history
Release v1.1.0
  • Loading branch information
mStirner authored Mar 27, 2023
2 parents 1f447fe + 8948d20 commit 434c60c
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "frontend",
"private": true,
"version": "1.0.0",
"version": "1.1.0",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand Down
4 changes: 3 additions & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,15 @@ function fetchData() {
request("/api/rooms"),
request("/api/endpoints"),
request("/api/devices"),
]).then(([rooms, endpoints, devices]) => {
request("/api/scenes"),
]).then(([rooms, endpoints, devices, scenes]) => {

const store = itemStore();

store.rooms = rooms;
store.endpoints = endpoints;
store.devices = devices;
store.scenes = scenes;

console.log("API resrouces fetched");

Expand Down
2 changes: 1 addition & 1 deletion src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const routes = reactive([{
icon: "fa-solid fa-tv",
visible: true,
component: () => import("../views/Devices.vue")
}/*, {
}, {
path: "/scenes",
name: "Scenes",
icon: "fa-solid fa-clone",
Expand Down
2 changes: 2 additions & 0 deletions src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const settingsStore = defineStore("settings", {
showRoomsButton: true,
showEndpointsButton: true,
showDevicesButton: true,
showScenesButton: true,
showVueTourOnNextVisit: true,
showGradientBackground: true,
editDashboardWidgets: false,
Expand All @@ -50,6 +51,7 @@ export const itemStore = defineStore("items", {
rooms: [],
endpoints: [],
devices: [],
scenes: []
}
},
actions: {
Expand Down
48 changes: 46 additions & 2 deletions src/views/Scenes.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,56 @@
<script setup>
import Collapsable from "@/components/Collapsable.vue";
import Tile from "@/components/Tile.vue";
import { request } from "@/helper";
</script>

<script>
export default {};
import { itemStore } from "../store.js";
const store = itemStore();
export default {
components: {
Collapsable,
Tile,
},
data() {
return {
};
},
computed: {
items() {
return store.scenes;
},
},
methods: {
trigger(item) {
request(
`/api/scenes/${item._id}/trigger`,
{
method: "POST",
},
(err, result) => {
console.log(err, result);
}
);
}
}
};
</script>

<template>
<div class="container-fluid">Scenes page</div>
<div class="container-fluid">
<!-- COMMANDS/STATES/SCENES -->
<div class="row display-flex text-center" style="height: 100%">
<!-- COMMANDS -->
<div class="p-0 col-6 col-md-3 col-xl-2" v-bind:key="item._id" v-for="item in items">
<Tile style="background: transparent; border: 1px solid rgb(0, 0, 0)" @click="trigger(item, $event)">
{{ item.name }}
</Tile>
</div>
<!-- COMMANDS -->

</div>
<!-- COMMANDS/STATES/SCENES -->
</div>
</template>

0 comments on commit 434c60c

Please sign in to comment.