Skip to content
This repository has been archived by the owner on Mar 17, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' into snyk-upgrade-7e9fbb1e60471f6d5fa6016a8ca1962e
Browse files Browse the repository at this point in the history
  • Loading branch information
Asthriona committed Dec 12, 2019
2 parents 1e85b06 + 91f76b4 commit 8857b2f
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -20,4 +20,5 @@ yarn-error.log*
*.njsproj
*.sln
*.sw?
package-lock.json


4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -12,12 +12,12 @@
"bootstrap-vue": "^2.0.4",
"core-js": "^2.6.5",
"jquery": "^3.4.1",
"popper.js": "^1.15.0",
"popper.js": "^1.16.0",
"register-service-worker": "^1.6.2",
"vue": "^2.6.10",
"vue-router": "^3.0.3",
"vue-xhr": "^1.0.6",
"vuex": "^3.0.1"
"vuex": "^3.1.2"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.11.0",
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
@@ -1,7 +1,7 @@
<template>
<div id="app">
<router-view/>
<TheFooter />
<!--<TheFooter />-->
</div>
</template>

Expand Down
4 changes: 0 additions & 4 deletions src/components/ThePlayer.vue
Expand Up @@ -15,16 +15,12 @@ export default {
Axios.get('https://broadcaster.animefm.co/api/nowplaying/3')
.then((response)=>{
this.meta = response.data.now_playing
console.log(response)
console.log(this.meta.song.art)
})
var refreshMeta = this;
setInterval(() => {
Axios.get('https://broadcaster.animefm.co/api/nowplaying/3')
.then((response)=>{
this.meta = response.data.now_playing
console.log(response)
console.log(this.meta.song.art)
})
}, 10000);
},
Expand Down
4 changes: 0 additions & 4 deletions src/components/ThePlayerCR.vue
Expand Up @@ -16,16 +16,12 @@ export default {
Axios.get('https://broadcaster.animefm.co/api/nowplaying/1')
.then((response)=>{
this.meta = response.data.now_playing
console.log(response)
console.log(this.meta.song.art)
})
var refreshMeta = this;
setInterval(() => {
Axios.get('https://broadcaster.animefm.co/api/nowplaying/1')
.then((response)=>{
this.meta = response.data.now_playing
console.log(response)
console.log(this.meta.song.art)
})
}, 10000);
},
Expand Down
17 changes: 17 additions & 0 deletions src/components/exPlayer.vue
@@ -0,0 +1,17 @@
<template>
<vue-audio :file="file" />
</template>

<script>
import VueAudio from 'vue-audio';
export default {
data(){
return {
file: 'http://broadcaster.animefm.co:8020/radio.mp3'
};
},
components: {
'vue-audio': VueAudio
}
}
</script>
8 changes: 7 additions & 1 deletion src/router.js
Expand Up @@ -54,6 +54,12 @@ export default new Router({
path: '/prototype',
name: 'Cloudsdale Radio - prototype',
component: () => import(/* webpackChunkName: "about" */ './views/prototype.vue')
}
},
{
path: '/exPlayer',
name: 'AnimeFM - prototype',
component: () => import(/* webpackChunkName: "about" */ './views/AnotherPlayer.vue')
},

]
})
11 changes: 11 additions & 0 deletions src/views/AnotherPlayer.vue
@@ -0,0 +1,11 @@
<template>
<section>
<vue-audio :file="file" />
</section>
</template>
<script>
export default {
}
</script>
21 changes: 11 additions & 10 deletions src/views/popup.vue
@@ -1,18 +1,19 @@
<template>
<section class="crstream">
<ThePlayer />
<ThePlayer />
</section>
</template>

<style scoped>
body {
background-color: black !important;
}
.crstream {
background-image: url(https://cdn.asthriona.com/BeFunky-photo.jpg);
background-repeat: no-repeat;
background-size: cover;
overflow: hidden;
}
.player{
height: 100%;
width: 100%;
margin: 0;
padding: 0;
position: relative;
left: -12px;
right: 12px;
}
</style>
<script>
// @ is an alias to /src
Expand Down

0 comments on commit 8857b2f

Please sign in to comment.