angulared
This commit is contained in:
tmshv committed
1 parent
7391872813
commit
efd77a62e3
36 files changed
+1149
-547
No files matched your search
@@ -3,4 +3,5 @@
|
||||
*.sublime*
|
||||
|
||||
/node_modules
|
||||
/bower_components
|
||||
/public
|
||||
@@ -1,3 +1,15 @@
|
||||
.page-docs {
|
||||
&.ng-leave {
|
||||
transform-origin: 50% 50%;
|
||||
animation: rotateOutNewspaper .3s both ease-in;
|
||||
}
|
||||
|
||||
&.ng-enter {
|
||||
animation: scaleUp 0.3s both ease-in
|
||||
// animation: slideInUp 0.5s both ease-in;
|
||||
}
|
||||
}
|
||||
|
||||
.act{
|
||||
text-decoration: none;
|
||||
border-bottom: 1px dashed #688fff;
|
||||
|
||||
+23
-28
@@ -1,10 +1,28 @@
|
||||
* {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
.document-block {
|
||||
h1{
|
||||
font-size: 14pt;
|
||||
margin-left: 15px;
|
||||
}
|
||||
|
||||
.menu{
|
||||
position: fixed;
|
||||
background-color: white;
|
||||
box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.5);
|
||||
|
||||
&.transparent{
|
||||
opacity: 0.95;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: "PT Sans";
|
||||
.document {
|
||||
padding-top: 50px;
|
||||
|
||||
.page {
|
||||
img {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.norm {
|
||||
@@ -19,29 +37,6 @@ body {
|
||||
/* box-shadow: 1px 1px 3px 1px #333;*/
|
||||
}
|
||||
|
||||
.menu {
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
height: 45px;
|
||||
background-color: #fff;
|
||||
z-index: 100;
|
||||
box-shadow: 0 1px 5px 0px rgba(0, 0, 0, 0.5);
|
||||
&.opac {
|
||||
opacity: .97;
|
||||
}
|
||||
.panel {
|
||||
width: auto;
|
||||
display: inline-block;
|
||||
margin: 10px 25px 0;
|
||||
&.right {
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
h1 {
|
||||
font-size: 14pt;
|
||||
}
|
||||
}
|
||||
|
||||
.controls {
|
||||
display: inline-block;
|
||||
margin-top: -4px;
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
.page-home {
|
||||
&.ng-leave {
|
||||
transform-origin: 0% 0%;
|
||||
animation: rotateFall .3s both ease-in;
|
||||
}
|
||||
|
||||
&.ng-enter {
|
||||
animation: scaleUp 0.3s both ease-in;
|
||||
}
|
||||
}
|
||||
+12
-65
@@ -1,70 +1,17 @@
|
||||
* {
|
||||
//html {
|
||||
// overflow-y: hidden;
|
||||
//}
|
||||
|
||||
body {
|
||||
font-family: "PT Sans", Arial, sans-serif;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: "PT Sans", Arial, sans-serif;
|
||||
}
|
||||
|
||||
.menu {
|
||||
$text_color: #666;
|
||||
|
||||
width: 100%;
|
||||
background-color: black;
|
||||
|
||||
font-size: 13pt;
|
||||
color: $text_color;
|
||||
|
||||
ul{
|
||||
margin-left: 50px;
|
||||
}
|
||||
|
||||
li {
|
||||
display: inline-block;
|
||||
padding: 5px 3px 13px 3px;
|
||||
margin-right: 30px;
|
||||
}
|
||||
|
||||
:link, :visited{
|
||||
text-decoration: none;
|
||||
border-bottom: 1px solid #333;
|
||||
color: $text_color;
|
||||
}
|
||||
a:hover{
|
||||
color: white;
|
||||
}
|
||||
|
||||
.vk {
|
||||
float: right;
|
||||
margin: 13px 15px 0 0;
|
||||
border: none;
|
||||
}
|
||||
}
|
||||
|
||||
.selected {
|
||||
border-top: 4px solid white;
|
||||
font-weight: bold;
|
||||
|
||||
a:link, a:visited{
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
&.blue{
|
||||
border-top: 4px solid #3f9cea;
|
||||
}
|
||||
|
||||
&.green{
|
||||
border-top: 4px solid #5cbe40;
|
||||
}
|
||||
|
||||
&.yellow{
|
||||
border-top: 4px solid #ffee00;
|
||||
}
|
||||
|
||||
&.pink {
|
||||
border-top: 4px solid #f655a0;
|
||||
}
|
||||
.background-picture{
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
top:0;
|
||||
left: 0;
|
||||
z-index: -999;
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
.menu {
|
||||
$text_color: #666;
|
||||
|
||||
position:relative;
|
||||
width: 100%;
|
||||
background-color: black;
|
||||
color: $text_color;
|
||||
font-size: 13pt;
|
||||
|
||||
ul {
|
||||
margin: 0 0 0 20px;
|
||||
|
||||
li {
|
||||
display: inline-block;
|
||||
padding: 5px 3px 13px 3px;
|
||||
margin-right: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
:link, :visited {
|
||||
text-decoration: none;
|
||||
border-bottom: 1px solid #333;
|
||||
color: $text_color;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
color: white;
|
||||
}
|
||||
|
||||
.vk {
|
||||
float: right;
|
||||
margin: 13px 15px 0 0;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.selected {
|
||||
border-top: 4px solid white;
|
||||
font-weight: bold;
|
||||
|
||||
a:link, a:visited{
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
&.blue{
|
||||
border-top: 4px solid #3f9cea;
|
||||
}
|
||||
|
||||
&.green{
|
||||
border-top: 4px solid #5cbe40;
|
||||
}
|
||||
|
||||
&.yellow{
|
||||
border-top: 4px solid #ffee00;
|
||||
}
|
||||
|
||||
&.pink {
|
||||
border-top: 4px solid #f655a0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
.page {
|
||||
// position: absolute;
|
||||
// bottom: 0;
|
||||
// top: 0;
|
||||
padding-top: 0px;
|
||||
width: 100%;
|
||||
// z-index: -1;
|
||||
}
|
||||
|
||||
.page.ng-leave {
|
||||
// z-index: 9999;
|
||||
}
|
||||
|
||||
.page.ng-enter {
|
||||
// z-index: 8888;
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
@keyframes rotateFall {
|
||||
0% {
|
||||
transform: rotateZ(0deg);
|
||||
}
|
||||
20% {
|
||||
transform: rotateZ(10deg);
|
||||
animation-timing-function: ease-out;
|
||||
}
|
||||
40% {
|
||||
transform: rotateZ(17deg);
|
||||
}
|
||||
60% {
|
||||
transform: rotateZ(16deg);
|
||||
}
|
||||
100% {
|
||||
transform: translateY(100%) rotateZ(17deg);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes scaleUp {
|
||||
from {
|
||||
opacity: 0.0;
|
||||
transform: scale(0.5);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes slideInRight {
|
||||
from {
|
||||
transform: translateX(100%);
|
||||
}
|
||||
to {
|
||||
transform: translateX(0);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes slideInUp {
|
||||
from {
|
||||
transform: translateY(100%);
|
||||
}
|
||||
to {
|
||||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes slideOutLeft {
|
||||
to {
|
||||
transform: translateX(-100%);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes rotateOutNewspaper {
|
||||
to {
|
||||
transform: translateZ(-3000px) rotateZ(360deg);
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
+26
-11
@@ -1,3 +1,14 @@
|
||||
.page-schedule {
|
||||
&.ng-leave {
|
||||
transform-origin: 0% 0%;
|
||||
animation: rotateFall 0.3s both ease-in;
|
||||
}
|
||||
|
||||
&.ng-enter {
|
||||
animation: scaleUp 0.3s both ease-in;
|
||||
}
|
||||
}
|
||||
|
||||
.schedule{
|
||||
position: relative;
|
||||
margin: 30px auto 0 auto;
|
||||
@@ -30,17 +41,9 @@
|
||||
vertical-align:baseline;
|
||||
|
||||
p.name{
|
||||
// position: absolute;
|
||||
width:30px;
|
||||
height: 30px;
|
||||
left: 0;
|
||||
right: 0;
|
||||
margin: 7px auto 10px auto;
|
||||
padding: 7px;
|
||||
border: 1px solid #e8e8e8;
|
||||
// background-color: white;
|
||||
border-radius: 50%;
|
||||
font-size: 1.4em;
|
||||
font-weight: 800;
|
||||
color: #242424;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -144,7 +147,7 @@
|
||||
display: inline-block;
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
thead.fix{
|
||||
position: fixed;
|
||||
@@ -162,6 +165,8 @@
|
||||
}
|
||||
|
||||
th{
|
||||
height: auto;
|
||||
|
||||
:not(.group){
|
||||
min-width: 150px;
|
||||
/* width: 15%;*/
|
||||
@@ -172,6 +177,16 @@
|
||||
&.group{
|
||||
width: 63px;
|
||||
}
|
||||
|
||||
.day{
|
||||
margin: 0;
|
||||
line-height: 0;
|
||||
}
|
||||
|
||||
.date{
|
||||
margin: 15px 0;
|
||||
line-height: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
.main-picture{
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
margin: 0;
|
||||
left: 0;
|
||||
z-index: -999;
|
||||
.page-team {
|
||||
&.ng-leave {
|
||||
animation: slideOutLeft 0.3s both ease-in;
|
||||
}
|
||||
|
||||
&.ng-enter {
|
||||
animation: slideInRight 0.3s both ease-in;
|
||||
}
|
||||
}
|
||||
|
||||
ul{
|
||||
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"name": "hudozhka",
|
||||
"version": "2.0.0",
|
||||
"authors": [
|
||||
"Roman Timashev <roman@tmshv.ru>"
|
||||
],
|
||||
"moduleType": [
|
||||
"amd",
|
||||
"es6",
|
||||
"globals",
|
||||
"node"
|
||||
],
|
||||
"license": "MIT",
|
||||
"private": true,
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"node_modules",
|
||||
"bower_components",
|
||||
"test",
|
||||
"tests"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
/**
|
||||
* Created by tmshv on 04/11/14.
|
||||
*/
|
||||
|
||||
var app = angular.module("hudozhka", ["ngRoute", "data.hudozhka"]);
|
||||
|
||||
app.config(function ($locationProvider, $routeProvider) {
|
||||
$locationProvider.html5Mode(true);
|
||||
|
||||
var routes = [
|
||||
{
|
||||
name: "/",
|
||||
templateUrl: "/views/home.html",
|
||||
controller: "HomePageController"
|
||||
},
|
||||
{
|
||||
name: "/schedule",
|
||||
templateUrl: "/views/schedule.html",
|
||||
controller: "SchedulePageController"
|
||||
},
|
||||
{
|
||||
name: "/team",
|
||||
templateUrl: "/views/team.html",
|
||||
controller: "TeamPageController"
|
||||
},
|
||||
{
|
||||
name: "/docs",
|
||||
templateUrl: "/views/docs.html",
|
||||
controller: "DocsPageController"
|
||||
}
|
||||
];
|
||||
|
||||
routes.forEach(function (route) {
|
||||
$routeProvider.when(route.name, route);
|
||||
});
|
||||
|
||||
$routeProvider.otherwise({
|
||||
redirectTo: "/"
|
||||
});
|
||||
});
|
||||
|
||||
require("./ui/menu")(app);
|
||||
require("./filters/uppercase-first")(app);
|
||||
require("./pages/schedule")(app);
|
||||
require("./pages/team")(app);
|
||||
require("./pages/docs")(app);
|
||||
|
||||
app.controller("HomePageController", function ($scope) {
|
||||
$scope.pageClass = "page-home";
|
||||
});
|
||||
|
||||
app.controller("SchedulePageController", function ($scope) {
|
||||
$scope.pageClass = "page-schedule";
|
||||
});
|
||||
|
||||
app.controller("TeamPageController", function ($scope) {
|
||||
$scope.pageClass = "page-team";
|
||||
});
|
||||
|
||||
app.controller("DocsPageController", function ($scope) {
|
||||
$scope.pageClass = "page-docs";
|
||||
});
|
||||
@@ -0,0 +1,14 @@
|
||||
/**
|
||||
* Created by tmshv on 06/11/14.
|
||||
*/
|
||||
|
||||
angular.module("data.hudozhka", [])
|
||||
.service("team", function () {
|
||||
return require("../models/team");
|
||||
})
|
||||
.service("schedule", function () {
|
||||
return require("../models/schedule");
|
||||
})
|
||||
.service("docs", function () {
|
||||
return require("../models/document");
|
||||
});
|
||||
+148
-128
@@ -1,132 +1,152 @@
|
||||
var Doc = (function(){
|
||||
var Document = function(baseURL){
|
||||
this.pages = [];
|
||||
this.baseURL = baseURL;
|
||||
}
|
||||
|
||||
Document.prototype.hasPage = function(index){
|
||||
return index >= 0 && index < this.pages.length;
|
||||
}
|
||||
|
||||
Document.prototype.getPageURL = function(pageNumber){
|
||||
var s = pageNumber <2 ? "" : "/" + pageNumber;
|
||||
return this.baseURL + s;
|
||||
}
|
||||
|
||||
Document.prototype.page = function(index){
|
||||
return index + 1;
|
||||
}
|
||||
|
||||
return Document;
|
||||
})();
|
||||
var app = angular.module("document.hudozhka", ["ngRoute", "data.hudozhka"]);
|
||||
|
||||
(function(){
|
||||
const PAGES = [];
|
||||
var currentPageIndex = 0;
|
||||
var doc = new Doc(location.pathname.replace(/\/\d+$/, ""));
|
||||
$(document).ready(function(){
|
||||
try{
|
||||
var hrefPage = /\/(\d+)$/.exec(location.href)[1];
|
||||
currentPageIndex = parseInt(hrefPage) - 1;
|
||||
}catch(error){
|
||||
app.config(function ($locationProvider, $routeProvider) {
|
||||
$locationProvider.html5Mode(true);
|
||||
//$routeProvider
|
||||
// .when("/document/:doc", {
|
||||
// controller: "DocumentPageController"
|
||||
// })
|
||||
// .otherwise({
|
||||
// redirectTo: "/"
|
||||
// });
|
||||
});
|
||||
|
||||
}
|
||||
app.controller("DocumentPageController", function ($scope, $location, docs) {
|
||||
$scope.pageClass = "page-document";
|
||||
|
||||
$("#buttonNext").click(function(event){
|
||||
loadNext();
|
||||
});
|
||||
var doc = $location.$$path.replace("/document/", "");
|
||||
$scope.doc = docs.doc(doc);
|
||||
});
|
||||
|
||||
$("#buttonPrev").click(function(event){
|
||||
loadPrevious();
|
||||
});
|
||||
|
||||
$("#page-container .pf").each(function(index, elem){
|
||||
var url = $(elem).data("page-url");
|
||||
doc.pages.push(url);
|
||||
});
|
||||
|
||||
$("#currentPage").attr("max", doc.pages.length);
|
||||
$("#totalPages").text(doc.pages.length);
|
||||
$("#currentPage").change(function(){
|
||||
var i = parseInt($(this).val()) - 1;
|
||||
if(i && doc.hasPage(i)){
|
||||
loadPage(i);
|
||||
}
|
||||
});
|
||||
|
||||
$("#page-container").html("");
|
||||
loadPage(currentPageIndex);
|
||||
|
||||
window.addEventListener("popstate", function(event){
|
||||
console.log("pops");
|
||||
console.log(event);
|
||||
var i = event.state;
|
||||
loadPage(i);
|
||||
});
|
||||
});
|
||||
|
||||
function loadNext(){
|
||||
var i = currentPageIndex + 1;
|
||||
if(doc.hasPage(i)){
|
||||
loadPage(i);
|
||||
}else{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function loadPrevious(){
|
||||
var i = currentPageIndex - 1;
|
||||
if(doc.hasPage(i)){
|
||||
loadPage(i);
|
||||
}else{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function loadPage(index){
|
||||
if(doc.hasPage(index)){
|
||||
var url = doc.pages[index];
|
||||
// $.ajax(
|
||||
// url,
|
||||
|
||||
// {
|
||||
// xhrFields: {
|
||||
// crossDomain: true,
|
||||
// withCredentials: true
|
||||
// },
|
||||
|
||||
// success: function(data, status){
|
||||
// currentPageIndex = index;
|
||||
// $("#currentPage").val(doc.page(currentPageIndex));
|
||||
// $("#page-container").html(data);
|
||||
|
||||
// var p = doc.page(currentPageIndex);
|
||||
// console.log("look at page ", p);
|
||||
// window.history.pushState(
|
||||
// currentPageIndex,
|
||||
// "State 2013 — " + p,
|
||||
// doc.getPageURL(p)
|
||||
// );
|
||||
// },
|
||||
|
||||
// error: function(xhr, aaa, error){
|
||||
// console.log(error);
|
||||
// }
|
||||
// }
|
||||
// );
|
||||
$.get(url, function(data){
|
||||
currentPageIndex = index;
|
||||
$("#currentPage").val(doc.page(currentPageIndex));
|
||||
$("#page-container").html(data);
|
||||
|
||||
var p = doc.page(currentPageIndex);
|
||||
console.log("look at page ", p);
|
||||
window.history.pushState(
|
||||
currentPageIndex,
|
||||
"State 2013 — " + p,
|
||||
doc.getPageURL(p)
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
})();
|
||||
//var Doc = (function(){
|
||||
// var Document = function(baseURL){
|
||||
// this.pages = [];
|
||||
// this.baseURL = baseURL;
|
||||
// }
|
||||
//
|
||||
// Document.prototype.hasPage = function(index){
|
||||
// return index >= 0 && index < this.pages.length;
|
||||
// }
|
||||
//
|
||||
// Document.prototype.getPageURL = function(pageNumber){
|
||||
// var s = pageNumber <2 ? "" : "/" + pageNumber;
|
||||
// return this.baseURL + s;
|
||||
// }
|
||||
//
|
||||
// Document.prototype.page = function(index){
|
||||
// return index + 1;
|
||||
// }
|
||||
//
|
||||
// return Document;
|
||||
//})();
|
||||
//
|
||||
//(function(){
|
||||
// const PAGES = [];
|
||||
// var currentPageIndex = 0;
|
||||
// var doc = new Doc(location.pathname.replace(/\/\d+$/, ""));
|
||||
// $(document).ready(function(){
|
||||
// try{
|
||||
// var hrefPage = /\/(\d+)$/.exec(location.href)[1];
|
||||
// currentPageIndex = parseInt(hrefPage) - 1;
|
||||
// }catch(error){
|
||||
//
|
||||
// }
|
||||
//
|
||||
// $("#buttonNext").click(function(event){
|
||||
// loadNext();
|
||||
// });
|
||||
//
|
||||
// $("#buttonPrev").click(function(event){
|
||||
// loadPrevious();
|
||||
// });
|
||||
//
|
||||
// $("#page-container .pf").each(function(index, elem){
|
||||
// var url = $(elem).data("page-url");
|
||||
// doc.pages.push(url);
|
||||
// });
|
||||
//
|
||||
// $("#currentPage").attr("max", doc.pages.length);
|
||||
// $("#totalPages").text(doc.pages.length);
|
||||
// $("#currentPage").change(function(){
|
||||
// var i = parseInt($(this).val()) - 1;
|
||||
// if(i && doc.hasPage(i)){
|
||||
// loadPage(i);
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// $("#page-container").html("");
|
||||
// loadPage(currentPageIndex);
|
||||
//
|
||||
// window.addEventListener("popstate", function(event){
|
||||
// console.log("pops");
|
||||
// console.log(event);
|
||||
// var i = event.state;
|
||||
// loadPage(i);
|
||||
// });
|
||||
// });
|
||||
//
|
||||
// function loadNext(){
|
||||
// var i = currentPageIndex + 1;
|
||||
// if(doc.hasPage(i)){
|
||||
// loadPage(i);
|
||||
// }else{
|
||||
//
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// function loadPrevious(){
|
||||
// var i = currentPageIndex - 1;
|
||||
// if(doc.hasPage(i)){
|
||||
// loadPage(i);
|
||||
// }else{
|
||||
//
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// function loadPage(index){
|
||||
// if(doc.hasPage(index)){
|
||||
// var url = doc.pages[index];
|
||||
// // $.ajax(
|
||||
// // url,
|
||||
//
|
||||
// // {
|
||||
// // xhrFields: {
|
||||
// // crossDomain: true,
|
||||
// // withCredentials: true
|
||||
// // },
|
||||
//
|
||||
// // success: function(data, status){
|
||||
// // currentPageIndex = index;
|
||||
// // $("#currentPage").val(doc.page(currentPageIndex));
|
||||
// // $("#page-container").html(data);
|
||||
//
|
||||
// // var p = doc.page(currentPageIndex);
|
||||
// // console.log("look at page ", p);
|
||||
// // window.history.pushState(
|
||||
// // currentPageIndex,
|
||||
// // "State 2013 — " + p,
|
||||
// // doc.getPageURL(p)
|
||||
// // );
|
||||
// // },
|
||||
//
|
||||
// // error: function(xhr, aaa, error){
|
||||
// // console.log(error);
|
||||
// // }
|
||||
// // }
|
||||
// // );
|
||||
// $.get(url, function(data){
|
||||
// currentPageIndex = index;
|
||||
// $("#currentPage").val(doc.page(currentPageIndex));
|
||||
// $("#page-container").html(data);
|
||||
//
|
||||
// var p = doc.page(currentPageIndex);
|
||||
// console.log("look at page ", p);
|
||||
// window.history.pushState(
|
||||
// currentPageIndex,
|
||||
// "State 2013 — " + p,
|
||||
// doc.getPageURL(p)
|
||||
// );
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
//})();
|
||||
@@ -0,0 +1,11 @@
|
||||
/**
|
||||
* Created by tmshv on 21/11/14.
|
||||
*/
|
||||
|
||||
module.exports = function(app) {
|
||||
app.filter("uppercaseFirst", function () {
|
||||
return function(string) {
|
||||
return string.charAt(0).toUpperCase() + string.slice(1);
|
||||
};
|
||||
});
|
||||
};
|
||||
@@ -0,0 +1,48 @@
|
||||
module.exports = function (app) {
|
||||
app.controller("DocumentsController", function ($scope, docs) {
|
||||
$scope.documents = docs.docs;
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Generates list of numbers
|
||||
* @param {Number} start starting value
|
||||
* @param {Number} num amount of numbers in list
|
||||
* @param {Number} step difference value
|
||||
* @return {Array} list of numbers
|
||||
*/
|
||||
function range(start, num, step) {
|
||||
var list = [];
|
||||
var val = start;
|
||||
for (var i = 0; i < num; i++) {
|
||||
list.push(val);
|
||||
val += step;
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
///**
|
||||
// * Monday date of current week
|
||||
// * @param {[type]} d [description]
|
||||
// * @return {[type]} [description]
|
||||
// */
|
||||
//function getMonday(d) {
|
||||
// d = new Date(d);
|
||||
// var day = d.getDay();
|
||||
// var diff = d.getDate() - day + (day == 0 ? -6 : 1); // adjust when day is sunday
|
||||
// return new Date(d.setDate(diff));
|
||||
//}
|
||||
|
||||
function getDates(day) {
|
||||
var dates = [];
|
||||
var prev = day == 0 ? 0 : day - 1;
|
||||
var next = 6 - prev;
|
||||
var dayMask = range(-1, prev, -1).concat([0]).concat(range(1, next, 1));
|
||||
|
||||
dayMask.forEach(function (m) {
|
||||
var time = Date.now() + (1000 * 60 * 60 * 24) * m;
|
||||
var date = new Date(time);
|
||||
dates.push(date.getDate());
|
||||
});
|
||||
return dates;
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
var populate = require("../../utils/populate").populate;
|
||||
const course = require("../../models/course");
|
||||
|
||||
module.exports = function (app) {
|
||||
app.controller("ScheduleController", function ($scope, schedule, team) {
|
||||
var now = new Date();
|
||||
var day = now.getDay();
|
||||
var dates = getDates(day);
|
||||
|
||||
var sem = "late";
|
||||
$scope.sem = [["early", "весеннего"], ["late", "осеннего"]].reduce(function (s, word) {
|
||||
if (word[0] === sem) return word[1];
|
||||
});
|
||||
$scope.year = 2014;
|
||||
|
||||
$scope.schedule = schedule($scope.year, sem, [
|
||||
populate(team.short, "teacher"),
|
||||
populate(course.name, "lesson")
|
||||
]);
|
||||
|
||||
$scope.isToday = function (weekDayIndex) {
|
||||
return (now.getDay() - 1) === weekDayIndex;
|
||||
};
|
||||
|
||||
$scope.weekDay = function (weekDayIndex) {
|
||||
return dates[weekDayIndex];
|
||||
};
|
||||
|
||||
$(window).scroll(function () {
|
||||
if ($(this).scrollTop() >= 220) {
|
||||
$(".schedule table thead").addClass("fix animated fadeInDown");
|
||||
$(".schedule table tbody").addClass("fix");
|
||||
} else {
|
||||
$(".schedule table thead").removeClass("fix animated fadeInDown");
|
||||
$(".schedule table tbody").removeClass("fix");
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Generates list of numbers
|
||||
* @param {Number} start starting value
|
||||
* @param {Number} num amount of numbers in list
|
||||
* @param {Number} step difference value
|
||||
* @return {Array} list of numbers
|
||||
*/
|
||||
function range(start, num, step) {
|
||||
var list = [];
|
||||
var val = start;
|
||||
for (var i = 0; i < num; i++) {
|
||||
list.push(val);
|
||||
val += step;
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
///**
|
||||
// * Monday date of current week
|
||||
// * @param {[type]} d [description]
|
||||
// * @return {[type]} [description]
|
||||
// */
|
||||
//function getMonday(d) {
|
||||
// d = new Date(d);
|
||||
// var day = d.getDay();
|
||||
// var diff = d.getDate() - day + (day == 0 ? -6 : 1); // adjust when day is sunday
|
||||
// return new Date(d.setDate(diff));
|
||||
//}
|
||||
|
||||
function getDates(day) {
|
||||
var dates = [];
|
||||
var prev = day == 0 ? 0 : day - 1;
|
||||
var next = 6 - prev;
|
||||
var dayMask = range(-1, prev, -1).concat([0]).concat(range(1, next, 1));
|
||||
|
||||
dayMask.forEach(function (m) {
|
||||
var time = Date.now() + (1000 * 60 * 60 * 24) * m;
|
||||
var date = new Date(time);
|
||||
dates.push(date.getDate());
|
||||
});
|
||||
return dates;
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
var populate = require("../../utils/populate").populate;
|
||||
const course = require("../../models/course");
|
||||
|
||||
module.exports = function (app) {
|
||||
app.controller("TeamController", function ($scope, team) {
|
||||
$scope.team = team.team.map(function (person) {
|
||||
person.names = team.splitName(person.name);
|
||||
return person;
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Generates list of numbers
|
||||
* @param {Number} start starting value
|
||||
* @param {Number} num amount of numbers in list
|
||||
* @param {Number} step difference value
|
||||
* @return {Array} list of numbers
|
||||
*/
|
||||
function range(start, num, step) {
|
||||
var list = [];
|
||||
var val = start;
|
||||
for (var i = 0; i < num; i++) {
|
||||
list.push(val);
|
||||
val += step;
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
///**
|
||||
// * Monday date of current week
|
||||
// * @param {[type]} d [description]
|
||||
// * @return {[type]} [description]
|
||||
// */
|
||||
//function getMonday(d) {
|
||||
// d = new Date(d);
|
||||
// var day = d.getDay();
|
||||
// var diff = d.getDate() - day + (day == 0 ? -6 : 1); // adjust when day is sunday
|
||||
// return new Date(d.setDate(diff));
|
||||
//}
|
||||
|
||||
function getDates(day) {
|
||||
var dates = [];
|
||||
var prev = day == 0 ? 0 : day - 1;
|
||||
var next = 6 - prev;
|
||||
var dayMask = range(-1, prev, -1).concat([0]).concat(range(1, next, 1));
|
||||
|
||||
dayMask.forEach(function (m) {
|
||||
var time = Date.now() + (1000 * 60 * 60 * 24) * m;
|
||||
var date = new Date(time);
|
||||
dates.push(date.getDate());
|
||||
});
|
||||
return dates;
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
$(document).ready(function(){
|
||||
$(window).scroll(function(){
|
||||
if ($(window).scrollTop() >= 220) {
|
||||
$(".schedule table thead").addClass("fix animated fadeInDown");
|
||||
$(".schedule table tbody").addClass("fix");
|
||||
}else{
|
||||
$(".schedule table thead").removeClass("fix animated fadeInDown");
|
||||
$(".schedule table tbody").removeClass("fix");
|
||||
}
|
||||
});
|
||||
|
||||
var now = new Date();
|
||||
var day = now.getDay();
|
||||
// day = 3;
|
||||
if(day == 0) deselectDays();
|
||||
else selectDay(day);
|
||||
|
||||
var dates = getDates(day);
|
||||
$(".schedule thead .date").each(function(index, elem){
|
||||
$(elem).text(dates[index]);
|
||||
});
|
||||
|
||||
function selectDay(day){
|
||||
deselectDays();
|
||||
// day = Math.min(1, day);
|
||||
// day = Math.max(6, day);
|
||||
|
||||
$($(".schedule thead th")[day]).addClass("current first");
|
||||
$(".schedule tbody tr").each(function(index, elem){
|
||||
$($(elem).find("td")[day]).addClass("current");
|
||||
});
|
||||
$($(".schedule tbody tr").last().find("td")[day]).addClass("last");
|
||||
}
|
||||
|
||||
function deselectDays(){
|
||||
$(".schedule thead th").removeClass("current first");
|
||||
$(".schedule tbody td").removeClass("current last");
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Generates list of numbers
|
||||
* @param {Number} start starting value
|
||||
* @param {Number} num amount of numbers in list
|
||||
* @param {Number} step difference value
|
||||
* @return {Array} list of numbers
|
||||
*/
|
||||
function range(start, num, step){
|
||||
var list= [];
|
||||
var val = start;
|
||||
for(var i = 0; i<num; i++){
|
||||
list.push(val);
|
||||
val += step;
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* Monday date of current week
|
||||
* @param {[type]} d [description]
|
||||
* @return {[type]} [description]
|
||||
*/
|
||||
function getMonday(d) {
|
||||
d = new Date(d);
|
||||
var day = d.getDay();
|
||||
var diff = d.getDate() - day + (day == 0 ? -6:1); // adjust when day is sunday
|
||||
return new Date(d.setDate(diff));
|
||||
}
|
||||
|
||||
function getDates(day){
|
||||
var dates = [];
|
||||
var prev = day == 0 ? 0 : day - 1;
|
||||
var next = 6 - prev;
|
||||
var dayMask = range(-1, prev, -1).concat([0]).concat(range(1, next, 1));
|
||||
console.log("day mask", dayMask);
|
||||
dayMask.forEach(function(m){
|
||||
var time = Date.now() + (1000 * 60 * 60 * 24) * m;
|
||||
var date = new Date(time);
|
||||
console.log(date);
|
||||
dates.push(date.getDate());
|
||||
});
|
||||
return dates;
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
/**
|
||||
* Created by tmshv on 05/11/14.
|
||||
*/
|
||||
|
||||
var menu = require("../../models/menu.json");
|
||||
|
||||
module.exports = function(app) {
|
||||
app.service("menu", function ($route) {
|
||||
menu.isActive = function (path) {
|
||||
if ($route.current && $route.current.regexp) {
|
||||
return $route.current.regexp.test(path);
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
return menu;
|
||||
});
|
||||
|
||||
app.controller("MenuController", function ($scope, menu) {
|
||||
$scope.vkgroup = menu.vkgroup;
|
||||
$scope.menu = menu.menu;
|
||||
|
||||
$scope.isCurrent = function(item) {
|
||||
return menu.isActive(item.url);
|
||||
};
|
||||
|
||||
$scope.isValid = function(item) {
|
||||
return Boolean(item.url);
|
||||
};
|
||||
});
|
||||
};
|
||||
@@ -1,5 +1,3 @@
|
||||
var populate = require("./utils/populate").populate;
|
||||
|
||||
const MENU = require("./models/menu.json");
|
||||
|
||||
const team = require("./models/team");
|
||||
@@ -10,15 +8,11 @@ const schedule = require("./models/schedule");
|
||||
module.exports = {
|
||||
port: 18010,
|
||||
pub: "./",
|
||||
data:{
|
||||
data: {
|
||||
menu: MENU,
|
||||
documents: document.docs,
|
||||
team: team.team,
|
||||
courses: course.courses,
|
||||
schedule: schedule([
|
||||
populate(team.short, "teacher"),
|
||||
populate(course.name, "lesson")
|
||||
])
|
||||
courses: course.courses
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
+20
-9
@@ -5,15 +5,18 @@ var minifyCSS = require("gulp-minify-css");
|
||||
var autoprefixer = require("gulp-autoprefixer");
|
||||
var imageMin = require("gulp-imagemin");
|
||||
var uglify = require("gulp-uglify");
|
||||
var concat = require("gulp-concat");
|
||||
var browserify = require("gulp-browserify");
|
||||
|
||||
var pub = "./public/";
|
||||
|
||||
gulp.task("sass", function () {
|
||||
gulp.src("./assets/style/*.scss")
|
||||
.pipe(sass())
|
||||
.pipe(minifyCSS())
|
||||
.pipe(autoprefixer())
|
||||
.pipe(gulp.dest("./public/s"));
|
||||
.pipe(concat("style.css"))
|
||||
.pipe(autoprefixer())
|
||||
//.pipe(minifyCSS({processImport:false}))
|
||||
.pipe(gulp.dest("public"));
|
||||
});
|
||||
|
||||
gulp.task("copy", function(){
|
||||
@@ -24,10 +27,18 @@ gulp.task("copy", function(){
|
||||
.pipe(gulp.dest("./public/s"));
|
||||
});
|
||||
|
||||
gulp.task("uglify", function(){
|
||||
gulp.src("./client/*.js")
|
||||
// .pipe(uglify())
|
||||
.pipe(gulp.dest("./public/c"));
|
||||
gulp.task("compile", function(){
|
||||
gulp.src("client/app.js")
|
||||
.pipe(browserify())
|
||||
.pipe(gulp.dest("public"));
|
||||
|
||||
gulp.src("client/document.js")
|
||||
.pipe(browserify())
|
||||
.pipe(gulp.dest("public"));
|
||||
|
||||
gulp.src("client/data.js")
|
||||
.pipe(browserify())
|
||||
.pipe(gulp.dest("public"));
|
||||
});
|
||||
|
||||
gulp.task("imagemin", function(){
|
||||
@@ -36,5 +47,5 @@ gulp.task("imagemin", function(){
|
||||
.pipe(gulp.dest("./public/img"));
|
||||
});
|
||||
|
||||
gulp.task("default", ["sass", "copy", "uglify"]);
|
||||
gulp.task("deploy", ["default", "imagemin"]);
|
||||
gulp.task("default", ["sass", "compile"]);
|
||||
gulp.task("deploy", ["default", "copy", "imagemin"]);
|
||||
+31
-31
@@ -1,33 +1,33 @@
|
||||
{
|
||||
"items":[
|
||||
{
|
||||
"text":"Школа",
|
||||
"url":"/",
|
||||
"class":"selected blue"
|
||||
},
|
||||
{
|
||||
"text":"Расписание",
|
||||
"url":"/schedule",
|
||||
"class":"selected green"
|
||||
},
|
||||
{
|
||||
"text":"Занятия",
|
||||
"class":"selected"
|
||||
},
|
||||
{
|
||||
"text":"Коллектив",
|
||||
"url":"/team",
|
||||
"class":"selected pink"
|
||||
},
|
||||
{
|
||||
"text":"Галерея",
|
||||
"class":"selected"
|
||||
},
|
||||
{
|
||||
"text":"Документы",
|
||||
"url":"/docs",
|
||||
"class":"selected yellow"
|
||||
}
|
||||
],
|
||||
"vkgroup":"https://vk.com/club10436104"
|
||||
"menu": [
|
||||
{
|
||||
"text": "Школа",
|
||||
"url": "/",
|
||||
"color": "blue"
|
||||
},
|
||||
{
|
||||
"text": "Расписание",
|
||||
"url": "/schedule",
|
||||
"color": "green"
|
||||
},
|
||||
{
|
||||
"text": "Занятия",
|
||||
"color": ""
|
||||
},
|
||||
{
|
||||
"text": "Коллектив",
|
||||
"url": "/team",
|
||||
"color": "pink"
|
||||
},
|
||||
{
|
||||
"text": "Галерея",
|
||||
"color": ""
|
||||
},
|
||||
{
|
||||
"text": "Документы",
|
||||
"url": "/docs",
|
||||
"color": "yellow"
|
||||
}
|
||||
],
|
||||
"vkgroup": "https://vk.com/club10436104"
|
||||
}
|
||||
@@ -5,24 +5,24 @@
|
||||
"lesson": "composition",
|
||||
"teacher": "vv-voronova",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"thursday": {
|
||||
"lesson": "painting",
|
||||
"teacher": "od-gogoleva",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"saturday": {
|
||||
"lesson": "sculpting",
|
||||
"teacher": "in-vturina",
|
||||
"time": [
|
||||
"11:00 – 11:45",
|
||||
"11:55 – 12:40"
|
||||
"11:00 11:45",
|
||||
"11:55 12:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -32,24 +32,24 @@
|
||||
"lesson": "composition",
|
||||
"teacher": "vv-voronova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"thursday": {
|
||||
"lesson": "painting",
|
||||
"teacher": "od-gogoleva",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"saturday": {
|
||||
"lesson": "sculpting",
|
||||
"teacher": "in-vturina",
|
||||
"time": [
|
||||
"13:00 – 13:45",
|
||||
"13:55 – 14:40"
|
||||
"13:00 13:45",
|
||||
"13:55 14:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -59,24 +59,24 @@
|
||||
"lesson": "painting",
|
||||
"teacher": "od-gogoleva",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"friday": {
|
||||
"lesson": "composition",
|
||||
"teacher": "vv-voronova",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"saturday": {
|
||||
"lesson": "sculpting",
|
||||
"teacher": "in-vturina",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -84,26 +84,26 @@
|
||||
"name": "2-1",
|
||||
"monday": {
|
||||
"lesson": "composition",
|
||||
"teacher": ".",
|
||||
"teacher": "nv-andreeva",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"wednesday": {
|
||||
"lesson": "painting",
|
||||
"teacher": "od-gogoleva",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"saturday": {
|
||||
"lesson": "composition",
|
||||
"teacher": "Тимашева А.С.",
|
||||
"teacher": "as-timasheva",
|
||||
"time": [
|
||||
"11:00 – 11:45",
|
||||
"11:55 – 12:40"
|
||||
"11:00 11:45",
|
||||
"11:55 12:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -113,24 +113,24 @@
|
||||
"lesson": "composition",
|
||||
"teacher": "nv-andreeva",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"wednesday": {
|
||||
"lesson": "painting",
|
||||
"teacher": "od-gogoleva",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"saturday": {
|
||||
"lesson": "composition",
|
||||
"teacher": "Тимашева А.С.",
|
||||
"teacher": "as-timasheva",
|
||||
"time": [
|
||||
"13:00 – 13:45",
|
||||
"13:55 – 14:40"
|
||||
"13:00 13:45",
|
||||
"13:55 14:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -138,26 +138,26 @@
|
||||
"name": "2-3",
|
||||
"monday": {
|
||||
"lesson": "painting",
|
||||
"teacher": " ",
|
||||
"teacher": "od-gogoleva",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"thursday": {
|
||||
"lesson": "cg",
|
||||
"lesson": "composition",
|
||||
"teacher": "nv-andreeva",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"friday": {
|
||||
"lesson": "composition",
|
||||
"teacher": "Тимашева А.С.",
|
||||
"teacher": "as-timasheva",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -167,23 +167,23 @@
|
||||
"lesson": "drawing",
|
||||
"teacher": "sa-latipova",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"tuesday": {
|
||||
"lesson": "composition",
|
||||
"teacher": "nv-andreeva",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"wednesday": {
|
||||
"lesson": "history",
|
||||
"teacher": "my-valkova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:00 17:45",
|
||||
""
|
||||
]
|
||||
},
|
||||
@@ -191,16 +191,16 @@
|
||||
"lesson": "painting",
|
||||
"teacher": "sa-latipova",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"saturday": {
|
||||
"lesson": "cg",
|
||||
"teacher": "rk-timashev",
|
||||
"time": [
|
||||
"13:00 – 13:45",
|
||||
"13:55 – 14:40"
|
||||
"13:00 13:45",
|
||||
"13:55 14:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -210,40 +210,40 @@
|
||||
"lesson": "drawing",
|
||||
"teacher": "sa-latipova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"tuesday": {
|
||||
"lesson": "composition",
|
||||
"teacher": "nv-andreeva",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"wednesday": {
|
||||
"lesson": "history",
|
||||
"teacher": "my-valkova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:00 17:45",
|
||||
""
|
||||
]
|
||||
},
|
||||
"thursday": {
|
||||
"lesson": "painting",
|
||||
"teacher": ".",
|
||||
"teacher": "sa-latipova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"saturday": {
|
||||
"lesson": "cg",
|
||||
"teacher": "rk-timashev",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -253,7 +253,7 @@
|
||||
"lesson": "history",
|
||||
"teacher": "my-valkova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:00 17:45",
|
||||
""
|
||||
]
|
||||
},
|
||||
@@ -261,24 +261,24 @@
|
||||
"lesson": "composition",
|
||||
"teacher": "nv-andreeva",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"friday": {
|
||||
"lesson": "painting",
|
||||
"teacher": "Тимашева А.С.",
|
||||
"teacher": "as-timasheva",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"saturday": {
|
||||
"lesson": "drawing",
|
||||
"teacher": "Тимашева А.С.",
|
||||
"teacher": "as-timasheva",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -288,23 +288,23 @@
|
||||
"lesson": "composition",
|
||||
"teacher": "vv-voronova",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"tuesday": {
|
||||
"lesson": "painting",
|
||||
"teacher": "va-sarzhin",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"wednesday": {
|
||||
"lesson": "history",
|
||||
"teacher": "my-valkova",
|
||||
"time": [
|
||||
"18:00 – 18:45",
|
||||
"18:00 18:45",
|
||||
""
|
||||
]
|
||||
},
|
||||
@@ -312,8 +312,8 @@
|
||||
"lesson": "drawing",
|
||||
"teacher": "sa-latipova",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -323,23 +323,23 @@
|
||||
"lesson": "composition",
|
||||
"teacher": "vv-voronova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"tuesday": {
|
||||
"lesson": "painting",
|
||||
"teacher": "va-sarzhin",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"wednesday": {
|
||||
"lesson": "history",
|
||||
"teacher": "my-valkova",
|
||||
"time": [
|
||||
"18:00 – 18:45",
|
||||
"18:00 18:45",
|
||||
""
|
||||
]
|
||||
},
|
||||
@@ -347,8 +347,8 @@
|
||||
"lesson": "drawing",
|
||||
"teacher": "sa-latipova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -356,17 +356,17 @@
|
||||
"name": "5-1",
|
||||
"monday": {
|
||||
"lesson": "painting",
|
||||
"teacher": ".",
|
||||
"teacher": "va-sarzhin",
|
||||
"time": [
|
||||
"15:00 – 15:45",
|
||||
"15:55 – 16:40"
|
||||
"15:00 15:45",
|
||||
"15:55 16:40"
|
||||
]
|
||||
},
|
||||
"thursday": {
|
||||
"lesson": "history",
|
||||
"teacher": "my-valkova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:00 17:45",
|
||||
""
|
||||
]
|
||||
}
|
||||
@@ -377,23 +377,23 @@
|
||||
"lesson": "painting",
|
||||
"teacher": "va-sarzhin",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"tuesday": {
|
||||
"lesson": "drawing",
|
||||
"teacher": "mg-timasheva",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"thursday": {
|
||||
"lesson": "history",
|
||||
"teacher": "my-valkova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:00 17:45",
|
||||
""
|
||||
]
|
||||
}
|
||||
@@ -404,15 +404,15 @@
|
||||
"lesson": "painting",
|
||||
"teacher": "va-sarzhin",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 – 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
},
|
||||
"thursday": {
|
||||
"lesson": "drawing",
|
||||
"teacher": "mg-timasheva",
|
||||
"time": [
|
||||
"16:00 – 17:45",
|
||||
"16:00 17:45",
|
||||
""
|
||||
]
|
||||
},
|
||||
@@ -420,8 +420,8 @@
|
||||
"lesson": "composition",
|
||||
"teacher": "vv-voronova",
|
||||
"time": [
|
||||
"17:00 – 17:45",
|
||||
"17:55 18:40"
|
||||
"17:00 17:45",
|
||||
"17:55 18:40"
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -430,7 +430,7 @@
|
||||
"lesson": "history",
|
||||
"teacher": "my-valkova",
|
||||
"time": [
|
||||
"18:00 – 18:45",
|
||||
"18:00 18:45",
|
||||
""
|
||||
]
|
||||
}
|
||||
+34
-21
@@ -1,56 +1,69 @@
|
||||
var pop = require("../utils/populate").pop;
|
||||
var populate = require("../utils/populate").populate;
|
||||
|
||||
const SCHEDULE = require("./schedule-2014-early.json");
|
||||
const WEEK = ["monday", "tuesday", "wednesday", "thursday", "friday", "saturday"];
|
||||
module.exports = schedule;
|
||||
const SCHEDULES = {
|
||||
"2014-early": require("./schedule-2014-early.json"),
|
||||
"2014-late": require("./schedule-2014-late.json")
|
||||
};
|
||||
|
||||
function schedule(pops){
|
||||
var days = function(group){
|
||||
module.exports = function (year, name, pops) {
|
||||
//var s = require(
|
||||
// [year, name].reduce(function (r, v, i) {
|
||||
// var n = "{i}".replace("i", i);
|
||||
// return r.replace(n, v);
|
||||
// }, "./schedule-{0}-{1}.json")
|
||||
//);
|
||||
|
||||
var s = SCHEDULES[year + "-" + name];
|
||||
return populateSchedule(s, pops);
|
||||
};
|
||||
|
||||
function populateSchedule(s, pops){
|
||||
var days = function (group) {
|
||||
var result = [];
|
||||
|
||||
WEEK.forEach(function(i){
|
||||
|
||||
WEEK.forEach(function (i) {
|
||||
var lesson = group[i];
|
||||
if(lesson){
|
||||
if (lesson) {
|
||||
result.push(
|
||||
pop(lesson)
|
||||
.populate(time())
|
||||
.populate(pops)
|
||||
.result()
|
||||
)
|
||||
}else{
|
||||
} else {
|
||||
result.push(null);
|
||||
}
|
||||
});
|
||||
return result;
|
||||
}
|
||||
};
|
||||
|
||||
var time = function(){
|
||||
return function(lesson){
|
||||
for(var i=0; i < lesson.time.length; i++){
|
||||
var time = function () {
|
||||
return function (lesson) {
|
||||
for (var i = 0; i < lesson.time.length; i++) {
|
||||
lesson.time[i] = lesson.time[i].replace(" ", "—");
|
||||
}
|
||||
return lesson;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var mondayTime = function(group){
|
||||
var mondayTime = function (group) {
|
||||
var day;
|
||||
for(var i=0; i<WEEK.length; i++){
|
||||
if(group[WEEK[i]]){
|
||||
for (var i = 0; i < WEEK.length; i++) {
|
||||
if (group[WEEK[i]]) {
|
||||
day = WEEK[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(day){
|
||||
if (day) {
|
||||
return group[day].time[0].substr(0, 5);
|
||||
}else{
|
||||
} else {
|
||||
return "00:00"
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var result = [];
|
||||
SCHEDULE.forEach(function(group){
|
||||
s.forEach(function (group) {
|
||||
result.push({
|
||||
name: group.name,
|
||||
days: days(group),
|
||||
|
||||
+12
-5
@@ -1,9 +1,12 @@
|
||||
const TEAM = require("./team.json");
|
||||
|
||||
exports.team = TEAM;
|
||||
exports.person = getPersonByID;
|
||||
exports.name = getNameByID;
|
||||
exports.short = getShortNameByID;
|
||||
module.exports = {
|
||||
team: TEAM,
|
||||
person: getPersonByID,
|
||||
name: getNameByID,
|
||||
short: getShortNameByID,
|
||||
splitName: splitName
|
||||
};
|
||||
|
||||
function getPersonByID(id){
|
||||
for(var i=0; i<TEAM.length; i++){
|
||||
@@ -28,9 +31,13 @@ function getShortNameByID(id){
|
||||
}
|
||||
|
||||
function shortifyName(name){
|
||||
var m = /(.+)\s(.+)\s(.+)/.exec(name);
|
||||
var m = splitName(name);
|
||||
var n = m[1].replace(/^(.).+/, "$1. ") +
|
||||
m[2].replace(/^(.).+/, "$1. ") +
|
||||
m[3];
|
||||
return n;
|
||||
}
|
||||
|
||||
function splitName(name){
|
||||
return /(.+)\s(.+)\s(.+)/.exec(name);
|
||||
}
|
||||
+12
-12
@@ -4,7 +4,7 @@
|
||||
"name": "Марина Геннадьевна Тимашева",
|
||||
"position": "Директор",
|
||||
"edu": "Ленинградский инженерно-строительный институт",
|
||||
"diplom": "НВ №222567",
|
||||
"diploma": "НВ №222567",
|
||||
"status": "",
|
||||
"picture": "http://static.shburg.org/art/team/teacher5.jpg"
|
||||
},
|
||||
@@ -13,7 +13,7 @@
|
||||
"name": "Валерий Александрович Саржин",
|
||||
"position": "Преподаватель живописи",
|
||||
"edu": "Академия художеств имени И. Е. Репина",
|
||||
"diplom": "B-I №259798",
|
||||
"diploma": "B-I №259798",
|
||||
"status": "Первая квалификационная категория по живописи и станковой композиции",
|
||||
"picture": "http://static.shburg.org/art/team/teacher10.jpg"
|
||||
},
|
||||
@@ -22,7 +22,7 @@
|
||||
"name": "Ольга Дмитриевна Гоголева",
|
||||
"position": "Преподаватель живописи",
|
||||
"edu": "Ленинградский инженерно-строительный институт",
|
||||
"diplom": "B-I №222572",
|
||||
"diploma": "B-I №222572",
|
||||
"status": "Высшая квалификационная категория по живописи и станковой композиции",
|
||||
"picture": "http://static.shburg.org/art/team/teacher11.jpg"
|
||||
},
|
||||
@@ -31,7 +31,7 @@
|
||||
"name": "Наталья Викторовна Андреева",
|
||||
"position": "Преподаватель композиции",
|
||||
"edu": "Санкт-Петербургский государственный университет технологии и дизайна",
|
||||
"diplom": "ИВС 0514253",
|
||||
"diploma": "ИВС 0514253",
|
||||
"status": "Вторая квалификационная категория по прикладной композиции",
|
||||
"picture": "http://static.shburg.org/art/team/teacher2.jpg"
|
||||
},
|
||||
@@ -40,7 +40,7 @@
|
||||
"name": "Вера Викторовна Воронова",
|
||||
"position": "Преподаватель композииции",
|
||||
"edu": "Российский государственный университет имени А. И. Герцена",
|
||||
"diplom": "ВСГ 0530340",
|
||||
"diploma": "ВСГ 0530340",
|
||||
"status": "Вторая квалификационная категория по прикладной композиции",
|
||||
"picture": "http://static.shburg.org/art/team/teacher1.jpg"
|
||||
},
|
||||
@@ -49,7 +49,7 @@
|
||||
"name": "Ирина Николаевна Втюрина",
|
||||
"position": "Преподаватель скульптуры",
|
||||
"edu": "Кировский государственный педагогический институт имени В. И. Ленина",
|
||||
"diplom": "ШВ №164501",
|
||||
"diploma": "ШВ №164501",
|
||||
"status": "Первая квалификационная категория по скульптуре",
|
||||
"picture": "http://static.shburg.org/art/team/teacher8.jpg"
|
||||
},
|
||||
@@ -58,7 +58,7 @@
|
||||
"name": "Мария Юрьевна Валькова",
|
||||
"position": "Преподаватель истории искусства",
|
||||
"edu": "Педагогический институт имени А. И. Герцена",
|
||||
"diplom": "ПП №224197",
|
||||
"diploma": "ПП №224197",
|
||||
"status": "Высшая квалификационная категория по истории искусства",
|
||||
"picture": "http://static.shburg.org/art/team/teacher.jpg"
|
||||
},
|
||||
@@ -67,16 +67,16 @@
|
||||
"name": "Руслан Камилевич Тимашев",
|
||||
"position": "Преподаватель компьютерной графики",
|
||||
"edu": "Санкт-Петербургский государственный архитектурно-строительный университет",
|
||||
"diplom": "ВСГ 5344910",
|
||||
"diploma": "ВСГ 5344910",
|
||||
"status": "",
|
||||
"picture": "http://static.shburg.org/art/team/teacher4.jpg"
|
||||
},
|
||||
{
|
||||
"id": "as-timasheva",
|
||||
"name": "Анна Сергеевна Манцева",
|
||||
"name": "Анна Сергеевна Тимашева",
|
||||
"position": "Преподаватель рисунка",
|
||||
"edu": "Московский архитектурный институт",
|
||||
"diplom": "РН 70241",
|
||||
"diploma": "РН 70241",
|
||||
"status": "",
|
||||
"picture": "http://static.shburg.org/art/team/teacher3.jpg"
|
||||
},
|
||||
@@ -85,7 +85,7 @@
|
||||
"name": "Серафима Александровна Латыпова",
|
||||
"position": "Преподаватель рисунка",
|
||||
"edu": "Незаконченный Ленинградский государственный педагогический университет имени А. С. Пушкина",
|
||||
"diplom": "",
|
||||
"diploma": "",
|
||||
"status": "",
|
||||
"picture": "http://static.shburg.org/art/team/teacher9.jpg"
|
||||
},
|
||||
@@ -94,7 +94,7 @@
|
||||
"name": "Евгения Юрьевна Тарасова",
|
||||
"position": "Преподаватель гравюры",
|
||||
"edu": "Санкт-Петербургский государственный архитектурно-строительный университет",
|
||||
"diplom": "ВСВ 1321444",
|
||||
"diploma": "ВСВ 1321444",
|
||||
"status": "",
|
||||
"picture": "http://static.shburg.org/art/team/teacher.jpg"
|
||||
}
|
||||
|
||||
+10
-10
@@ -16,18 +16,18 @@
|
||||
"author": "Roman Timashev",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"consolidate": "~0.10.0",
|
||||
"jade": "~1.1.5",
|
||||
"express": "~3.4.8",
|
||||
"gulp-uglify": "^0.2.1"
|
||||
"express": "^4.10.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"gulp": "~3.5.2",
|
||||
"should": "~3.1.2",
|
||||
"mocha": "~1.17.1",
|
||||
"gulp-sass": "~0.6.0",
|
||||
"gulp-minify-css": "~0.3.0",
|
||||
"gulp": "^3.8.10",
|
||||
"gulp-autoprefixer": "0.0.6",
|
||||
"gulp-browserify": "^0.5.0",
|
||||
"gulp-concat": "^2.4.1",
|
||||
"gulp-imagemin": "~0.1.5",
|
||||
"gulp-autoprefixer": "0.0.6"
|
||||
"gulp-minify-css": "~0.3.0",
|
||||
"gulp-sass": "^1.2.2",
|
||||
"gulp-uglify": "^0.2.1",
|
||||
"mocha": "~1.17.1",
|
||||
"should": "~3.1.2"
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
var Router = require("express").Router;
|
||||
var config = require("../config");
|
||||
var route = require("./route");
|
||||
|
||||
var router = new Router();
|
||||
module.exports = router.middleware;
|
||||
|
||||
router.get("/schedule", function(req, res){
|
||||
var url = "/schedule";
|
||||
|
||||
res.render("schedule/schedule", {
|
||||
menu: route.menu(url),
|
||||
groups: config.data.schedule
|
||||
});
|
||||
});
|
||||
@@ -1,30 +1,39 @@
|
||||
var express = require("express");
|
||||
var consolidate = require("consolidate");
|
||||
var path = require("path");
|
||||
var config = require("./config");
|
||||
|
||||
var pub = "./public";
|
||||
// var pub = path.resolve("~/Dropbox/Dev/Hud school/public/");
|
||||
// var pub = pacth.resolve("~/Dropbox/Dev/Hud school/public/");
|
||||
// console.log(pub);
|
||||
// console.log(pub);
|
||||
|
||||
var server = express();
|
||||
server.engine("jade", consolidate.jade);
|
||||
server.set("view engine", "jade");
|
||||
server.set("views", [__dirname, "/pages"].join(""));
|
||||
server.use(express.static(pub));
|
||||
//server.engine("jade", require("consolidate").jade);
|
||||
//server.set("view engine", "jade");
|
||||
//server.set("views", [__dirname, "/pages"].join(""));
|
||||
server.use("/bower_components", express.static(path.join(__dirname, "bower_components")));
|
||||
server.use("/views", express.static(path.join(__dirname, "views")));
|
||||
server.use(express.static(path.join(__dirname, "public")));
|
||||
|
||||
server.get("/", function(req, res){
|
||||
var url = "/";
|
||||
var route = require("./routers/route");
|
||||
res.render("main/main", {
|
||||
menu: route.menu(url)
|
||||
});
|
||||
//server.get("/", function(req, res){
|
||||
// var url = "/";
|
||||
// var route = require("./routers/route");
|
||||
// res.render("main/main", {
|
||||
// menu: route.menu(url)
|
||||
// });
|
||||
//});
|
||||
//
|
||||
//server.use(require("./routers/schedule"));
|
||||
//server.use(require("./routers/team.router").middleware);
|
||||
//server.use(require("./routers/docs"));
|
||||
|
||||
server.get("/document/*", function (req, res) {
|
||||
res.sendFile(path.join(__dirname, "views/document.html"));
|
||||
});
|
||||
|
||||
server.use(require("./routers/schedule"));
|
||||
server.use(require("./routers/team.router").middleware);
|
||||
server.use(require("./routers/docs"));
|
||||
server.get("*", function (req, res) {
|
||||
res.sendFile(path.join(__dirname, "views/index.html"));
|
||||
});
|
||||
|
||||
server.listen(config.port);
|
||||
console.log("welcome!");
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
<div class="main" ng-controller="DocumentsController">
|
||||
<div class="docblock"><h2>Лицензии, свидетельства и уставы</h2>
|
||||
<div class="doc" ng-repeat="doc in documents">
|
||||
<a href="{{doc.path}}" target="_blank">
|
||||
<img ng-src="{{doc.preview}}">
|
||||
<span>{{doc.title | uppercaseFirst}}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,69 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<base href="/document">
|
||||
<link rel="stylesheet" href="/style.css">
|
||||
<link rel="stylesheet" href="/s/animate.min.css">
|
||||
<link rel="stylesheet" href="/fonts/stylesheet.css">
|
||||
<meta name="google-site-verification" content="8BxOTw-Q02DS2KAdcGcnIMwiPZ58DVB18XpOfRibCcg">
|
||||
|
||||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<script src="/bower_components/angular/angular.min.js"></script>
|
||||
<script src="/bower_components/angular-route/angular-route.min.js"></script>
|
||||
<script src="/bower_components/angular-animate/angular-animate.min.js"></script>
|
||||
<script src="data.js"></script>
|
||||
<script src="document.js"></script>
|
||||
</head>
|
||||
|
||||
<body ng-app="document.hudozhka" ng-controller="DocumentPageController">
|
||||
<div class="document-block">
|
||||
<div class="menu transparent">
|
||||
<div class="panel">
|
||||
<h1>
|
||||
<span class="bold">ДХШ</span>
|
||||
<span class="norm">Шлиссельбурга</span> ,
|
||||
<span class="norm">{{doc.title}}</span>
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="document">
|
||||
<div class="page {{pageClass}}">
|
||||
<img ng-src="{{url}}" alt="" ng-repeat="url in doc.url"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Yandex.Metrika counter -->
|
||||
<script>(function (d, w, c) {
|
||||
(w[c] = w[c] || []).push(function () {
|
||||
try {
|
||||
w.yaCounter24027460 = new Ya.Metrika({
|
||||
id: 24027460,
|
||||
webvisor: true,
|
||||
clickmap: true,
|
||||
trackLinks: true,
|
||||
accurateTrackBounce: true
|
||||
});
|
||||
} catch (e) {
|
||||
}
|
||||
});
|
||||
var n = d.getElementsByTagName("script")[0], s = d.createElement("script"), f = function () {
|
||||
n.parentNode.insertBefore(s, n);
|
||||
};
|
||||
s.type = "text/javascript";
|
||||
s.async = true;
|
||||
s.src = (d.location.protocol == "https:" ? "https:" : "http:") + "//mc.yandex.ru/metrika/watch.js";
|
||||
if (w.opera == "[object Opera]") {
|
||||
d.addEventListener("DOMContentLoaded", f, false);
|
||||
} else {
|
||||
f();
|
||||
}
|
||||
})(document, window, "yandex_metrika_callbacks");</script>
|
||||
<noscript>
|
||||
<div><img src="//mc.yandex.ru/watch/24027460" style="position: absolute; left: -9999px;" alt=""></div>
|
||||
</noscript>
|
||||
<!-- Yandex.Metrika counter -->
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1 @@
|
||||
<div>HELLO</div>
|
||||
@@ -0,0 +1,61 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<base href="/">
|
||||
<link rel="stylesheet" href="/style.css">
|
||||
<link rel="stylesheet" href="/s/animate.min.css">
|
||||
<link rel="stylesheet" href="/fonts/stylesheet.css">
|
||||
<meta name="google-site-verification" content="8BxOTw-Q02DS2KAdcGcnIMwiPZ58DVB18XpOfRibCcg">
|
||||
|
||||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<script src="/bower_components/angular/angular.min.js"></script>
|
||||
<script src="/bower_components/angular-route/angular-route.min.js"></script>
|
||||
<script src="/bower_components/angular-animate/angular-animate.min.js"></script>
|
||||
<script src="data.js"></script>
|
||||
<script src="/app.js"></script>
|
||||
</head>
|
||||
<body ng-app="hudozhka">
|
||||
<div class="menu" ng-controller="MenuController">
|
||||
<ul>
|
||||
<li ng-repeat="item in menu" class="{{item.color}}" ng-class="{selected:isCurrent(item)}">
|
||||
<span ng-hide="isValid(item)">{{item.text}}</span>
|
||||
<a href="{{item.url}}" ng-show="isValid(item)">{{item.text}}</a>
|
||||
</li>
|
||||
<a href="{{vkgroup}}" class="vk"><img src="/img/icon.vk.png"></a>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="page {{pageClass}}" ng-view></div>
|
||||
|
||||
<!-- Yandex.Metrika counter -->
|
||||
<script>(function (d, w, c) {
|
||||
(w[c] = w[c] || []).push(function () {
|
||||
try {
|
||||
w.yaCounter24027460 = new Ya.Metrika({
|
||||
id: 24027460,
|
||||
webvisor: true,
|
||||
clickmap: true,
|
||||
trackLinks: true,
|
||||
accurateTrackBounce: true
|
||||
});
|
||||
} catch (e) {
|
||||
}
|
||||
});
|
||||
var n = d.getElementsByTagName("script")[0], s = d.createElement("script"), f = function () {
|
||||
n.parentNode.insertBefore(s, n);
|
||||
};
|
||||
s.type = "text/javascript";
|
||||
s.async = true;
|
||||
s.src = (d.location.protocol == "https:" ? "https:" : "http:") + "//mc.yandex.ru/metrika/watch.js";
|
||||
if (w.opera == "[object Opera]") {
|
||||
d.addEventListener("DOMContentLoaded", f, false);
|
||||
} else {
|
||||
f();
|
||||
}
|
||||
})(document, window, "yandex_metrika_callbacks");</script>
|
||||
<noscript>
|
||||
<div><img src="//mc.yandex.ru/watch/24027460" style="position: absolute; left: -9999px;" alt=""></div>
|
||||
</noscript>
|
||||
<!-- Yandex.Metrika counter -->
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,49 @@
|
||||
<div class="schedule" ng-controller="ScheduleController">
|
||||
<p> Расписание {{sem}} семестра {{year}} года</p>
|
||||
<table>
|
||||
<thead class="">
|
||||
<tr>
|
||||
<th class="group">Гр.</th>
|
||||
<th ng-class="{current: isToday(0)}">
|
||||
<p class="day">Понедельник</p>
|
||||
<p class="date">{{weekDay(0)}}</p>
|
||||
</th>
|
||||
<th ng-class="{current: isToday(1)}">
|
||||
<p class="day">Вторник</p>
|
||||
<p class="date">{{weekDay(1)}}</p>
|
||||
</th>
|
||||
<th ng-class="{current: isToday(2)}">
|
||||
<p class="day">Среда</p>
|
||||
<p class="date">{{weekDay(2)}}</p>
|
||||
</th>
|
||||
<th ng-class="{current: isToday(3)}">
|
||||
<p class="day">Четверг</p>
|
||||
<p class="date">{{weekDay(3)}}</p>
|
||||
</th>
|
||||
<th ng-class="{current: isToday(4)}">
|
||||
<p class="day">Пятница</p>
|
||||
<p class="date">{{weekDay(4)}}</p>
|
||||
</th>
|
||||
<th ng-class="{current: isToday(5)}">
|
||||
<p class="day">Суббота</p>
|
||||
<p class="date">{{weekDay(5)}}</p>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="">
|
||||
<tr ng-repeat="group in schedule">
|
||||
<td class="group">
|
||||
<p class="name">{{group.name}}</p>
|
||||
<p class="time">{{group.time}}</p>
|
||||
</td>
|
||||
|
||||
<td ng-repeat="day in group.days track by $index" ng-class="{current: isToday($index)}">
|
||||
<p class="lesson"><a href="">{{day.lesson}}</a></p>
|
||||
<p class="teacher"><a href="">{{day.teacher}}</a></p>
|
||||
<p class="time">{{day.time[0]}}</p>
|
||||
<p class="time">{{day.time[1]}}</p>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -0,0 +1,15 @@
|
||||
<img class="background-picture" src="http://static.shlisselburg.org/art/team/team.jpg">
|
||||
|
||||
<ul class="team-list" ng-controller="TeamController">
|
||||
<li class="team-member" ng-repeat="person in team">
|
||||
<img ng-src="{{person.picture}}">
|
||||
<div class="info">
|
||||
<h3>{{person.names[1]}} {{person.names[2]}} <span>{{person.names[3]}}</span></h3>
|
||||
<p>{{person.position}}</p>
|
||||
<p>{{person.status}}</p>
|
||||
<p></p>
|
||||
<p class="edu">{{person.edu}} </p>
|
||||
<p class="diploma">Диплом {{person.diploma}}</p>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
Reference in new issue
Block a user