@@ -46,9 +38,9 @@
- {% if podcasts %}
+ {% if object.podcasts %}
-
@@ -81,5 +73,6 @@
{% endif %}
+
{% endblock %}
diff --git a/aircox/templates/aircox/widgets/episode_item.html b/aircox/templates/aircox/widgets/episode_item.html
index eea55d9..e89da25 100644
--- a/aircox/templates/aircox/widgets/episode_item.html
+++ b/aircox/templates/aircox/widgets/episode_item.html
@@ -41,3 +41,15 @@ Context variables:
{% endif %}
{% endblock %}
+
+{% block actions %}
+{% if object.sound_set.public.count %}
+
+{% endif %}
+{% endblock %}
+
diff --git a/aircox/templates/aircox/widgets/page_item.html b/aircox/templates/aircox/widgets/page_item.html
index d824d3c..6c15d79 100644
--- a/aircox/templates/aircox/widgets/page_item.html
+++ b/aircox/templates/aircox/widgets/page_item.html
@@ -30,7 +30,7 @@ Context variables:
{% if has_cover|default_if_none:True %}
+ class="cover is-small">
{% endif %}
+
+ {% block actions %}{% endblock %}
{% endif %}
diff --git a/aircox/views/episode.py b/aircox/views/episode.py
index 1c89cc7..fb23b0f 100644
--- a/aircox/views/episode.py
+++ b/aircox/views/episode.py
@@ -4,7 +4,6 @@ import datetime
from django.views.generic import ListView
from ..models import Diffusion, Episode, Program, StaticPage, Sound
-from ..serializers import PodcastSerializer
from .base import BaseView
from .program import ProgramPageDetailView
from .page import PageListView
@@ -20,8 +19,6 @@ class EpisodeDetailView(ProgramPageDetailView):
def get_context_data(self, **kwargs):
if not 'tracks' in kwargs:
kwargs['tracks'] = self.object.track_set.order_by('position')
- if not 'podcasts' in kwargs:
- kwargs['podcasts'] = [PodcastSerializer(s).data for s in self.object.sound_set.public() ]
return super().get_context_data(**kwargs)
diff --git a/assets/public/app.js b/assets/public/app.js
index 08b6e9f..07d8953 100644
--- a/assets/public/app.js
+++ b/assets/public/app.js
@@ -1,6 +1,5 @@
import Vue from 'vue';
-
export const defaultConfig = {
el: '#app',
delimiters: ['[[', ']]'],
@@ -12,12 +11,12 @@ export const defaultConfig = {
},
computed: {
- player() { return window.aircox.player; }
+ player() { return window.aircox.player; },
},
}
-export default function App(config) {
- return (new AppConfig(config)).load()
+export default function App(config, sync=false) {
+ return (new AppConfig(config)).load(sync)
}
/**
@@ -30,30 +29,36 @@ export class AppConfig {
get config() {
let config = this._config instanceof Function ? this._config() : this._config;
- return {...defaultConfig, ...config};
+ for(var k of new Set([...Object.keys(config || {}), ...Object.keys(defaultConfig)])) {
+ if(!config[k] && defaultConfig[k])
+ config[k] = defaultConfig[k]
+ else if(config[k] instanceof Object)
+ config[k] = {...defaultConfig[k], ...config[k]}
+ }
+ return config;
}
set config(value) {
this._config = value;
}
- load() {
+ load(sync=false) {
var self = this;
return new Promise(function(resolve, reject) {
- window.addEventListener('load', () => {
- try {
- let config = self.config;
- const el = document.querySelector(config.el)
- if(!el) {
- reject(`Error: missing element ${config.el}`);
- return;
- }
- resolve(new Vue(config))
- }
- catch(error) { reject(error) }
- })
+ let func = () => { try { resolve(self.build()) } catch(error) { reject(error) }};
+ sync ? func() : window.addEventListener('load', func);
});
}
+
+ build() {
+ let config = this.config;
+ const el = document.querySelector(config.el)
+ if(!el) {
+ reject(`Error: missing element ${config.el}`);
+ return;
+ }
+ return new Vue(config);
+ }
}
diff --git a/assets/public/episode.vue b/assets/public/episode.vue
new file mode 100644
index 0000000..459565c
--- /dev/null
+++ b/assets/public/episode.vue
@@ -0,0 +1,23 @@
+
+
@@ -55,6 +55,8 @@ Context variables:
{% endif %}
+
+
+
+
+
+
diff --git a/assets/public/index.js b/assets/public/index.js
index f001bf2..ccf74e4 100644
--- a/assets/public/index.js
+++ b/assets/public/index.js
@@ -16,12 +16,14 @@ import {Set} from './model';
import './styles.scss';
-import Autocomplete from './autocomplete.vue';
-import Player from './player.vue';
-import Playlist from './playlist.vue';
+import Autocomplete from './autocomplete';
+import Episode from './episode';
+import Player from './player';
+import Playlist from './playlist';
import SoundItem from './soundItem';
Vue.component('a-autocomplete', Autocomplete)
+Vue.component('a-episode', Episode)
Vue.component('a-player', Player)
Vue.component('a-playlist', Playlist)
Vue.component('a-sound-item', SoundItem)
@@ -42,14 +44,40 @@ window.aircox = {
return this.playerApp && this.playerApp.$refs.player
},
+ loadPage(url) {
+ fetch(url).then(response => response.text())
+ .then(response => {
+ let doc = new DOMParser().parseFromString(response, 'text/html');
+
+ aircox.app && aircox.app.$destroy();
+ document.getElementById('app').innerHTML = doc.getElementById('app').innerHTML;
+ App(() => window.aircox.appConfig, true).then(app => {
+ aircox.app = app;
+ document.title = doc.title;
+ })
+ });
+ },
+
Set: Set, Sound: Sound,
};
window.Vue = Vue;
-App({el: '#player'}).then(app => window.aircox.playerApp = app,
- () => undefined);
-App(() => window.aircox.appConfig).then(app => { window.aircox.app = app },
- () => undefined)
+App({el: '#player'}).then(app => window.aircox.playerApp = app);
+App(() => window.aircox.appConfig).then(app => {
+ window.aircox.app = app;
+ window.addEventListener('click', event => {
+ let target = event.target.tagName == 'A' ? event.target : event.target.closest('a');
+ if(!target || !target.hasAttribute('href'))
+ return;
+
+ let href = target.getAttribute('href');
+ if(href && href !='#') {
+ window.aircox.loadPage(href);
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ }, true);
+})
diff --git a/assets/public/list.vue b/assets/public/list.vue
index d5dcd9a..728d65d 100644
--- a/assets/public/list.vue
+++ b/assets/public/list.vue
@@ -42,9 +42,14 @@ export default {
find(pred) { return this.set.find(pred) },
findIndex(pred) { return this.set.findIndex(pred) },
- push(...items) {
+ /**
+ * Add items to list, return index of the first provided item.
+ */
+ push(item, ...items) {
+ let index = this.set.push(item);
for(var item of items)
this.set.push(item);
+ return index;
},
remove(index, select=False) {
diff --git a/assets/public/model.js b/assets/public/model.js
index 3053584..d4369d1 100644
--- a/assets/public/model.js
+++ b/assets/public/model.js
@@ -176,20 +176,21 @@ export class Set {
}
/**
- * Add item to set
+ * Add item to set, return index.
*/
push(item, {args={},save=true}={}) {
item = item instanceof this.model ? item : new this.model(item, args);
if(this.unique) {
let index = this.findIndex(item);
if(index > -1)
- return;
+ return index;
}
if(this.max && this.items.length >= this.max)
this.items.splice(0,this.items.length-this.max)
this.items.push(item);
save && this.save();
+ return this.items.length-1;
}
/**
diff --git a/assets/public/page.vue b/assets/public/page.vue
new file mode 100644
index 0000000..0a2825c
--- /dev/null
+++ b/assets/public/page.vue
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
diff --git a/assets/public/player.vue b/assets/public/player.vue
index 2e36d0b..1a49c02 100644
--- a/assets/public/player.vue
+++ b/assets/public/player.vue
@@ -3,6 +3,7 @@
-
-
-
-