Skip to content

Commit

Permalink
Merge pull request #90 from LordTocs/tocs
Browse files Browse the repository at this point in the history
Refactor, Logging, Imports UI, and other Improvements
  • Loading branch information
LordTocs authored Jun 4, 2021
2 parents 0a0977e + 7503553 commit 55dfdc1
Show file tree
Hide file tree
Showing 49 changed files with 990 additions and 601 deletions.
153 changes: 146 additions & 7 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "castmate",
"version": "0.0.3",
"private": "true",
"description": "",
"description": "CastMate is a broadcaster tool that allows Twitch viewers to interact with a broadcasters stream components through Chat Commands, Channel Point rewards, and more.",
"author": "LordTocs & FitzBro",
"scripts": {
"serve": "vue-cli-service serve",
Expand Down Expand Up @@ -52,6 +52,7 @@
"vuex": "^3.6.2",
"websocket": "^1.0.33",
"win32-api": "^9.6.0",
"winston": "^3.3.3",
"yaml": "^1.10.0"
},
"devDependencies": {
Expand Down
37 changes: 28 additions & 9 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@
</v-list-item-content>
</v-list-item>

<v-list-item @click="openSoundsFolder">
<v-list-item-icon>
<v-icon>mdi-folder-music</v-icon>
</v-list-item-icon>

<v-list-item-content>
<v-list-item-title> Open Sounds Folder </v-list-item-title>
</v-list-item-content>
</v-list-item>

<v-list-group n-action>
<template v-slot:activator>
<v-list-item-title>Plugins</v-list-item-title>
Expand All @@ -65,14 +75,18 @@
<v-main style="max-height: 100%" v-else>
<v-container fluid class="fill-height">
<v-row align="center" justify="center">
<v-col cols="12" sm="4" style="justify-content: center; text-align: center">
<h1>Loading CastMate</h1>
<v-progress-circular
indeterminate
color="cyan"
:size="100"
:width="15"
/>
<v-col
cols="12"
sm="4"
style="justify-content: center; text-align: center"
>
<h1>Loading CastMate</h1>
<v-progress-circular
indeterminate
color="cyan"
:size="100"
:width="15"
/>
</v-col>
</v-row>
</v-container>
Expand All @@ -87,6 +101,8 @@
<script>
import { mapGetters, mapActions } from "vuex";
import SystemBar from "./components/layout/SystemBar.vue";
import path from "path";
import { shell } from "electron";
export default {
components: {
Expand All @@ -99,7 +115,7 @@ export default {
};
},
computed: {
...mapGetters("ipc", ["inited", "plugins"]),
...mapGetters("ipc", ["inited", "plugins", "paths"]),
uiPlugins() {
return this.plugins
.filter(
Expand All @@ -120,6 +136,9 @@ export default {
methods: {
...mapActions("ipc", ["init"]),
...mapActions("rewards", ["loadRewards"]),
openSoundsFolder() {
shell.openPath(path.join(this.paths.userFolder, "sounds"));
},
},
async mounted() {
await this.init();
Expand Down
File renamed without changes.
File renamed without changes.
30 changes: 30 additions & 0 deletions src/components/commands/CommandCard.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<template>
<key-card
:key-value="actionKey"
@key-change="keyChange"
color="grey darken-3"
defaultLabel="New Command"
>
<command-editor :value="value" @input="(v) => $emit('input', v)" />
</key-card>
</template>

<script>
import KeyCard from "../data/KeyCard.vue";
import CommandEditor from "./CommandEditor.vue";
export default {
components: { KeyCard, CommandEditor },
props: {
value: {},
actionKey: {},
},
methods: {
keyChange(newKey) {
this.$emit("key-change", newKey);
}
},
};
</script>

<style>
</style>
Loading

0 comments on commit 55dfdc1

Please sign in to comment.