Skip to content

Commit

Permalink
Merge branch 'feature/simple-redesign'
Browse files Browse the repository at this point in the history
  • Loading branch information
seanpierce committed Feb 8, 2024
2 parents 96b50ec + ccdfc44 commit 777ddaf
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
14 changes: 4 additions & 10 deletions app/src/components/Marquee.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="marquee-wrapper" v-if="loaded">
<div class="marquee-wrapper">
<div id="live-marquee" class="marquee">
{{ marqueeText }}
{{ text }}
</div>
</div>
</template>
Expand All @@ -10,14 +10,8 @@
import nodeMarquee from 'node-marquee'
export default {
computed: {
marqueeText() {
return this.$store.state.content.marqueeText
},
loaded() {
return this.marqueeText?.length > 0 || false
}
props: {
text: String
},
mounted() {
Expand Down
12 changes: 11 additions & 1 deletion app/src/views/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!-- <a href="/#chat">Chat</a> -->
</div>

<Marquee />
<Marquee v-if="loaded" :text="marqueeText" />
</div>
</template>

Expand All @@ -34,5 +34,15 @@ export default {
intro: require('@/assets/images/introtorhythm-orange.png')
}
},
computed: {
marqueeText() {
return this.$store.state.content.marqueeText
},
loaded() {
return this.marqueeText?.length > 0 || false
}
}
}
</script>

0 comments on commit 777ddaf

Please sign in to comment.