From 08840ef60576a3a3c372f10ddcbebeb23d48bdba Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 25 Feb 2016 20:15:15 +0300 Subject: [PATCH] - data.js --- src/client/app.js | 2 -- src/client/components/PageDocuments.js | 5 +++-- src/client/data.js | 11 ----------- src/templates/main.html | 1 - 4 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 src/client/data.js diff --git a/src/client/app.js b/src/client/app.js index ba489dfb..1d762e90 100644 --- a/src/client/app.js +++ b/src/client/app.js @@ -40,7 +40,6 @@ import API from './services/api'; import {routes} from './config'; let app = angular.module('hudozka', [ - 'hudozhka.data', 'ngRoute', 'angulartics', 'angulartics.google.analytics', @@ -97,7 +96,6 @@ app.run(($location, $rootScope, $http) => { PageGalleryAlbum, PageDocuments, AppController, - DocumentsController, CopyrightController, ContactsController, Schedule, diff --git a/src/client/components/PageDocuments.js b/src/client/components/PageDocuments.js index d6d38d7f..2d301a86 100644 --- a/src/client/components/PageDocuments.js +++ b/src/client/components/PageDocuments.js @@ -1,12 +1,13 @@ import template from '../../templates/components/page-documents.html'; +import {docs} from '../../models/document'; export default function (app) { app.component('pageDocuments', { template: template, - controller: function(api, docs) { + controller: function (api) { this.pageClass = 'page-documents'; - this.documents = docs.docs; + this.documents = docs; api.document.awards() .success(data => { diff --git a/src/client/data.js b/src/client/data.js deleted file mode 100644 index 8ee3adc6..00000000 --- a/src/client/data.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Created by tmshv on 06/11/14. - */ - -angular.module("hudozhka.data", []) - .service("scheduleData", function () { - return require("../models/schedule"); - }) - .service("docs", function () { - return require("../models/document"); - }); \ No newline at end of file diff --git a/src/templates/main.html b/src/templates/main.html index f261d65f..c6743ec9 100644 --- a/src/templates/main.html +++ b/src/templates/main.html @@ -22,7 +22,6 @@ -