From 1d7dde6f051ed41ae87197fe70f5e0b30a6d6bfd Mon Sep 17 00:00:00 2001 From: bkfox Date: Mon, 30 Sep 2019 14:07:29 +0200 Subject: [PATCH] update requirements --- aircox/static/aircox/streamer.js | 2 +- aircox/views/mixins.py | 1 - assets/streamer/index.js | 4 +++- instance/dev.py | 2 +- instance/sample_settings.py | 1 - requirements.txt | 3 +++ 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/aircox/static/aircox/streamer.js b/aircox/static/aircox/streamer.js index 0604aa5..768eec0 100644 --- a/aircox/static/aircox/streamer.js +++ b/aircox/static/aircox/streamer.js @@ -223,7 +223,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) * /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue */ \"./node_modules/vue/dist/vue.esm.browser.js\");\n/* harmony import */ var buefy_dist_components_button__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! buefy/dist/components/button */ \"./node_modules/buefy/dist/components/button/index.js\");\n/* harmony import */ var buefy_dist_components_button__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(buefy_dist_components_button__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var public_app__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! public/app */ \"./assets/public/app.js\");\n/* harmony import */ var public_model__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! public/model */ \"./assets/public/model.js\");\n/* harmony import */ var public_sound__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! public/sound */ \"./assets/public/sound.js\");\n/* harmony import */ var _controllers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./controllers */ \"./assets/streamer/controllers.js\");\n\n\n\nvue__WEBPACK_IMPORTED_MODULE_0__[\"default\"].use(buefy_dist_components_button__WEBPACK_IMPORTED_MODULE_1___default.a)\n\n\n\n\n\n\nwindow.aircox.appConfig = {\n data() {\n return {\n // current streamer\n streamer: null,\n // all streamers\n streamers: [],\n // fetch interval id\n fetchInterval: null,\n\n Sound: public_sound__WEBPACK_IMPORTED_MODULE_4__[\"default\"],\n }\n },\n\n computed: {\n apiUrl() {\n return this.$el && this.$el.dataset.apiUrl;\n },\n\n sources() {\n var sources = this.streamer ? this.streamer.sources : [];\n return sources.filter(s => s.data)\n },\n },\n\n methods: {\n fetchStreamers() {\n _controllers__WEBPACK_IMPORTED_MODULE_5__[\"Streamer\"].fetchAll(this.apiUrl, null)\n .then(streamers => {\n vue__WEBPACK_IMPORTED_MODULE_0__[\"default\"].set(this, 'streamers', streamers);\n vue__WEBPACK_IMPORTED_MODULE_0__[\"default\"].set(this, 'streamer', streamers ? streamers[0] : null);\n })\n },\n },\n\n mounted() {\n this.fetchStreamers();\n this.fetchInterval = setInterval(() => this.streamer && this.streamer.fetch(), 5000)\n },\n\n destroyed() {\n if(this.fetchInterval !== null)\n clearInterval(this.fetchInterval)\n }\n}\n\n\n\n//# sourceURL=webpack:///./assets/streamer/index.js?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue */ \"./node_modules/vue/dist/vue.esm.browser.js\");\n/* harmony import */ var buefy_dist_components_button__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! buefy/dist/components/button */ \"./node_modules/buefy/dist/components/button/index.js\");\n/* harmony import */ var buefy_dist_components_button__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(buefy_dist_components_button__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var public_app__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! public/app */ \"./assets/public/app.js\");\n/* harmony import */ var public_model__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! public/model */ \"./assets/public/model.js\");\n/* harmony import */ var public_sound__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! public/sound */ \"./assets/public/sound.js\");\n/* harmony import */ var public_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! public/utils */ \"./assets/public/utils.js\");\n/* harmony import */ var _controllers__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./controllers */ \"./assets/streamer/controllers.js\");\n\n\n\nvue__WEBPACK_IMPORTED_MODULE_0__[\"default\"].use(buefy_dist_components_button__WEBPACK_IMPORTED_MODULE_1___default.a)\n\n\n\n\n\n\n\n\nwindow.aircox.appConfig = {\n data() {\n return {\n // current streamer\n streamer: null,\n // all streamers\n streamers: [],\n // fetch interval id\n fetchInterval: null,\n\n Sound: public_sound__WEBPACK_IMPORTED_MODULE_4__[\"default\"],\n }\n },\n\n computed: {\n apiUrl() {\n return this.$el && this.$el.dataset.apiUrl;\n },\n\n sources() {\n var sources = this.streamer ? this.streamer.sources : [];\n return sources.filter(s => s.data)\n },\n },\n\n methods: {\n fetchStreamers() {\n _controllers__WEBPACK_IMPORTED_MODULE_6__[\"Streamer\"].fetchAll(this.apiUrl, null)\n .then(streamers => {\n vue__WEBPACK_IMPORTED_MODULE_0__[\"default\"].set(this, 'streamers', streamers);\n vue__WEBPACK_IMPORTED_MODULE_0__[\"default\"].set(this, 'streamer', streamers ? streamers[0] : null);\n })\n },\n },\n\n mounted() {\n this.fetchStreamers();\n this.fetchInterval = Object(public_utils__WEBPACK_IMPORTED_MODULE_5__[\"setEcoInterval\"])(() => this.streamer && this.streamer.fetch(), 5000)\n },\n\n destroyed() {\n if(this.fetchInterval !== null)\n clearInterval(this.fetchInterval)\n }\n}\n\n\n\n//# sourceURL=webpack:///./assets/streamer/index.js?"); /***/ }) diff --git a/aircox/views/mixins.py b/aircox/views/mixins.py index 28d3dc9..8b69ab9 100644 --- a/aircox/views/mixins.py +++ b/aircox/views/mixins.py @@ -1,4 +1,3 @@ -import dateutil from django.shortcuts import get_object_or_404, redirect from django.urls import reverse diff --git a/assets/streamer/index.js b/assets/streamer/index.js index 64edcf0..0bd4a7d 100644 --- a/assets/streamer/index.js +++ b/assets/streamer/index.js @@ -6,6 +6,8 @@ Vue.use(Button) import {setAppConfig} from 'public/app'; import Model from 'public/model'; import Sound from 'public/sound'; +import {setEcoInterval} from 'public/utils'; + import {Streamer, Queue} from './controllers'; window.aircox.appConfig = { @@ -45,7 +47,7 @@ window.aircox.appConfig = { mounted() { this.fetchStreamers(); - this.fetchInterval = setInterval(() => this.streamer && this.streamer.fetch(), 5000) + this.fetchInterval = setEcoInterval(() => this.streamer && this.streamer.fetch(), 5000) }, destroyed() { diff --git a/instance/dev.py b/instance/dev.py index c123ad9..b51ed30 100755 --- a/instance/dev.py +++ b/instance/dev.py @@ -1,6 +1,6 @@ import os -LOCALE_PATHS = ['aircox/locale', 'aircox_cms/locale'] +LOCALE_PATHS = ['aircox/locale', 'aircox_streamer/locale'] LOGGING = { 'version': 1, diff --git a/instance/sample_settings.py b/instance/sample_settings.py index 77712ef..b0f43e5 100755 --- a/instance/sample_settings.py +++ b/instance/sample_settings.py @@ -172,7 +172,6 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'django.contrib.admin', ) MIDDLEWARE = ( diff --git a/requirements.txt b/requirements.txt index 2cd3016..fd9abd6 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,16 @@ Django>=2.2.0 djangorestframework>=3.9.4 django-model-utils>=3.2.0 +django-filter>=2.2.0 +pytz>=2019.2 watchdog>=0.8.3 psutil>=5.0.1 tzlocal>=1.4 mutagen>=1.37 pyyaml>=3.12 +django-taggit>=1.1.0 django-filer>=1.5.0 django-ckeditor>=5.7.1 django-admin-sortable2>=0.7.2