diff --git a/config/routes/api.js b/config/routes/api.js index a8d8888..43b77ac 100644 --- a/config/routes/api.js +++ b/config/routes/api.js @@ -80,7 +80,11 @@ module.exports = function(server, db) { server.get('/api/buyers', checkAuthenticated, async (req, res) => { try { const buyers = await db.collection('buyers').find({}).toArray(); - res.json(buyers); + if (buyers.length > 0) { + res.json(buyers); + } else res.send({ + error: 'Покупателей в магазине пока что нет.' + }); } catch { res.status(500).render('main/404'); } diff --git a/dist/views/admin/assets/templates/header.pug b/dist/views/admin/assets/templates/header.pug index a05f858..6b03432 100644 --- a/dist/views/admin/assets/templates/header.pug +++ b/dist/views/admin/assets/templates/header.pug @@ -11,7 +11,7 @@ header.admin-header .user-view .background img(src="/img/admin/background-user.jpg", alt="#") - span(style="padding-top: 5px;padding-bottom:10px;display:block;").white-text Control Panel v1.0.0 + span(style="padding-top: 5px;padding-bottom:10px;display:block;").white-text Панель управления a(href="#") img(class="circle" src="/img/admin/avatar-user.jpg", alt="alt") a(href="#") diff --git a/dist/views/admin/icons.pug b/dist/views/admin/icons.pug index 8981517..ae22197 100644 --- a/dist/views/admin/icons.pug +++ b/dist/views/admin/icons.pug @@ -17,7 +17,7 @@ body.has-fixed-sidenav .file-field.input-field.col.s12 .btn.orange span Иконка - input(type="file" name="img" required) + input(type="file" accept="image/*" name="img" required) .file-path-wrapper input(type="text" class="file-path" placeholder="Загрузите иконку в формате .svg") button(type="submit" class="btn right" style="margin-right: 10px;") Добавить diff --git a/src/admin/components/pagination.component.js b/src/admin/components/pagination.component.js index 5b21f75..95f77cc 100644 --- a/src/admin/components/pagination.component.js +++ b/src/admin/components/pagination.component.js @@ -52,8 +52,8 @@ export class PaginationComponent extends Component { // выполняем запрос на сервер и выводим на данные async moveTo(page, insertTo, request) { this.loader.show(); - insertTo.innerHTML = ''; const response = await request(page); + insertTo.innerHTML = ''; if (response != '') { this.$el.setAttribute('data-page', page); insertTo.insertAdjacentHTML('afterbegin', response); diff --git a/src/admin/templates/buyers.template.js b/src/admin/templates/buyers.template.js index b72f718..e280257 100644 --- a/src/admin/templates/buyers.template.js +++ b/src/admin/templates/buyers.template.js @@ -1,3 +1,7 @@ export function renderBuyers(buyers) { - return buyers.map(buyer => `