diff --git a/client/src/components/ymap.vue b/client/src/components/ymap.vue new file mode 100644 index 0000000..044e0bc --- /dev/null +++ b/client/src/components/ymap.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/client/src/router/index.js b/client/src/router/index.js index 200f989..9e29984 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -49,7 +49,9 @@ export default route(function (/* { store, ssrContext } */) { }); Router.beforeEach((to, from, next) => { - if (to.meta.isAuth) { + console.log(process.env.SERVER); + //уточнить зачем нужен process.env.SERVER + if (to.meta.isAuth && !process.env.SERVER) { if (store.state.user) { next(); } else { diff --git a/client/src/services/app.js b/client/src/services/app.js index 2781502..94b24bd 100644 --- a/client/src/services/app.js +++ b/client/src/services/app.js @@ -5,6 +5,8 @@ import { REST, RESTError } from './rest'; // console.log(settings); export default class extends REST { + // export default class Django extends REST { + static get settings() { return settings; } @@ -237,4 +239,16 @@ export default class extends REST { ); }); } + + static getSupportInfo() { + return this._get('radio/support_info', {}, {}) + .then((data) => { + return data; + }) + .catch((error) => { + throw new RESTError(error, 'Ошибка при получении контактов'); + }); + } } + +// window.django = Django; diff --git a/client/src/views/contacts.vue b/client/src/views/contacts.vue index 7d41275..94fc10d 100644 --- a/client/src/views/contacts.vue +++ b/client/src/views/contacts.vue @@ -8,29 +8,29 @@ />