From 5d692e84d9c27e311bb4f470a0b43ecc9cdf08fc Mon Sep 17 00:00:00 2001 From: Sean Chalmers <42610534+AQUASINE@users.noreply.github.com> Date: Tue, 16 Apr 2024 21:17:01 -0400 Subject: [PATCH 1/4] feat: rule card improvements --- src/components/AlwaysRuleContent.vue | 12 ++++ src/components/DefaultRuleContent.vue | 10 +++ src/components/MessagesView.vue | 6 +- src/components/PresentationModeCenterView.vue | 5 +- src/components/PrimaryCenterView.vue | 1 + ...gexConfigCard.vue => RegexRuleContent.vue} | 7 --- src/components/RuleConfigCard.vue | 63 +++++++++++++++++++ src/components/RuleTile.vue | 25 +++++--- src/rules.js | 2 +- src/store/store.js | 13 +++- 10 files changed, 123 insertions(+), 21 deletions(-) create mode 100644 src/components/AlwaysRuleContent.vue create mode 100644 src/components/DefaultRuleContent.vue rename src/components/{RegexConfigCard.vue => RegexRuleContent.vue} (89%) create mode 100644 src/components/RuleConfigCard.vue diff --git a/src/components/AlwaysRuleContent.vue b/src/components/AlwaysRuleContent.vue new file mode 100644 index 0000000..668afb1 --- /dev/null +++ b/src/components/AlwaysRuleContent.vue @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/src/components/DefaultRuleContent.vue b/src/components/DefaultRuleContent.vue new file mode 100644 index 0000000..732f611 --- /dev/null +++ b/src/components/DefaultRuleContent.vue @@ -0,0 +1,10 @@ + + \ No newline at end of file diff --git a/src/components/MessagesView.vue b/src/components/MessagesView.vue index 7df266a..b43e0df 100644 --- a/src/components/MessagesView.vue +++ b/src/components/MessagesView.vue @@ -6,7 +6,7 @@ Messages - +
@@ -144,6 +144,10 @@ export default { width: 100%; } +.item__message:last-child { + border-bottom: none; +} + .item__score { background-color: var(--bg2); width: 80px; diff --git a/src/components/PresentationModeCenterView.vue b/src/components/PresentationModeCenterView.vue index 92155b4..be7af25 100644 --- a/src/components/PresentationModeCenterView.vue +++ b/src/components/PresentationModeCenterView.vue @@ -15,7 +15,8 @@ const worstChatter = computed(() => { if (users.value.length === 0) { return null; } - return users.value[users.value.length - 1]; + return users.value[0] + // return users.value[users.value.length - 1]; }); onMounted(() => { @@ -112,7 +113,7 @@ onMounted(() => {
- Our worst chatter is: + Our best chatter is:
diff --git a/src/components/PrimaryCenterView.vue b/src/components/PrimaryCenterView.vue index a028c1f..fa90c42 100644 --- a/src/components/PrimaryCenterView.vue +++ b/src/components/PrimaryCenterView.vue @@ -27,6 +27,7 @@
Rule Tuning
+
diff --git a/src/components/RegexConfigCard.vue b/src/components/RegexRuleContent.vue similarity index 89% rename from src/components/RegexConfigCard.vue rename to src/components/RegexRuleContent.vue index 010d813..921b934 100644 --- a/src/components/RegexConfigCard.vue +++ b/src/components/RegexRuleContent.vue @@ -1,12 +1,5 @@ + + + + \ No newline at end of file diff --git a/src/components/DefaultRuleContent.vue b/src/components/DefaultRuleContent.vue index 732f611..2155e8d 100644 --- a/src/components/DefaultRuleContent.vue +++ b/src/components/DefaultRuleContent.vue @@ -1,10 +1,16 @@ \ No newline at end of file diff --git a/src/components/ExactMatchRuleContent.vue b/src/components/ExactMatchRuleContent.vue new file mode 100644 index 0000000..5afa3dc --- /dev/null +++ b/src/components/ExactMatchRuleContent.vue @@ -0,0 +1,27 @@ + + + + + \ No newline at end of file diff --git a/src/components/FuzzyMatchRuleContent.vue b/src/components/FuzzyMatchRuleContent.vue new file mode 100644 index 0000000..a4c14cb --- /dev/null +++ b/src/components/FuzzyMatchRuleContent.vue @@ -0,0 +1,26 @@ + + + + + \ No newline at end of file diff --git a/src/components/RuleConfigCard.vue b/src/components/RuleConfigCard.vue index a664d54..a53379e 100644 --- a/src/components/RuleConfigCard.vue +++ b/src/components/RuleConfigCard.vue @@ -8,8 +8,12 @@ {{ description }}
- - + + + + + +
@@ -17,6 +21,9 @@ import {defineProps} from 'vue'; import DefaultRuleContent from "./DefaultRuleContent.vue"; import RegexRuleContent from "./RegexRuleContent.vue"; +import AlwaysRuleContent from "./AlwaysRuleContent.vue"; +import ContainsRuleContent from "./ContainsRuleContent.vue"; +import ExactMatchRuleContent from "./ExactMatchRuleContent.vue"; const props = defineProps({ title: { diff --git a/src/components/RuleTile.vue b/src/components/RuleTile.vue index 121cfa3..ede19bf 100644 --- a/src/components/RuleTile.vue +++ b/src/components/RuleTile.vue @@ -25,7 +25,7 @@
-
@@ -73,7 +73,7 @@ const actionInfo = computed(() => { }) const conditionInfo = computed(() => { - return conditionTypes.find(c => c.id === condition.value.id); + return conditionTypes.find(c => c.id === condition.value); }) const ruleText = computed(() => { diff --git a/src/rules.js b/src/rules.js index a3e69fe..e114806 100644 --- a/src/rules.js +++ b/src/rules.js @@ -1,6 +1,6 @@ export const conditionTypes = [ { - id: 'none', + id: 'always', name: 'Always', description: "Match all messages.", }, diff --git a/src/style.css b/src/style.css index 2dfe876..3fdbfa8 100644 --- a/src/style.css +++ b/src/style.css @@ -56,6 +56,12 @@ a { a:hover { } +code { + font-family: 'Fira Code', 'Courier New', monospace; + font-size: 0.9em; + background-color: var(--bg1); +} + ::selection { background-color: var(--primary); color: var(--text); @@ -139,7 +145,6 @@ button:focus-visible { } code { - background-color: #1a1a1a; padding: 2px 4px; margin: 0 4px; border-radius: 4px; From 2e7656b60d21adb300d2a0dedfb40425980347c6 Mon Sep 17 00:00:00 2001 From: Sean Chalmers <42610534+AQUASINE@users.noreply.github.com> Date: Wed, 17 Apr 2024 00:35:52 -0400 Subject: [PATCH 4/4] feat: reusable checkbox component, rule content --- src/components/CompactCheckbox.vue | 38 ++++++++++++++ src/components/ConfigurationTab.vue | 63 +--------------------- src/components/ContainsRuleContent.vue | 7 ++- src/components/ExactMatchRuleContent.vue | 9 ++-- src/components/OutputCard.vue | 66 ++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 66 deletions(-) create mode 100644 src/components/CompactCheckbox.vue create mode 100644 src/components/OutputCard.vue diff --git a/src/components/CompactCheckbox.vue b/src/components/CompactCheckbox.vue new file mode 100644 index 0000000..96cb456 --- /dev/null +++ b/src/components/CompactCheckbox.vue @@ -0,0 +1,38 @@ + + + \ No newline at end of file diff --git a/src/components/ConfigurationTab.vue b/src/components/ConfigurationTab.vue index cf01a25..b64301d 100644 --- a/src/components/ConfigurationTab.vue +++ b/src/components/ConfigurationTab.vue @@ -9,21 +9,7 @@ Rules Output -
-
- -
- Output Port -
- -
-
- -
-
- -
-
+
Save
@@ -34,13 +20,13 @@ import DataSourceCard from "./DataSourceCard.vue"; import {ref} from "vue"; import RulesCard from "./RulesCard.vue"; import IconSectionHeader from "./IconSectionHeader.vue"; +import OutputCard from "./OutputCard.vue"; const dataSources = ref([ { name: 'AQUASINE', type: 'ttv', connected: true, startingScore: 100 }, { name: 'AQUASINE', type: 'youtube', connected: false, startingScore: 100 }, ]); -const outputPort = ref(8765); \ No newline at end of file diff --git a/src/components/ExactMatchRuleContent.vue b/src/components/ExactMatchRuleContent.vue index 5afa3dc..c146b74 100644 --- a/src/components/ExactMatchRuleContent.vue +++ b/src/components/ExactMatchRuleContent.vue @@ -1,7 +1,9 @@ @@ -9,7 +11,7 @@ const contains = ref('');
This will check each message to see if it exactly matches the following input: - +
@@ -20,8 +22,9 @@ const contains = ref(''); border-radius: 0.25rem; border: 1px solid var(--bg4); background-color: var(--bg2); - font-size: 0.95em; - margin-top: 0.5rem; + font-size: 1em; + margin-top: 0.75rem; + margin-bottom: 0.5rem; color: var(--text); } \ No newline at end of file diff --git a/src/components/OutputCard.vue b/src/components/OutputCard.vue new file mode 100644 index 0000000..886be57 --- /dev/null +++ b/src/components/OutputCard.vue @@ -0,0 +1,66 @@ + + + \ No newline at end of file