nginx https conf

.bowerrc

@@ -0,0 +1,3 @@
+{
+    "directory" : "public/bower_components"
+}

.gitignore

@@ -2,6 +2,9 @@
 .idea
 *.sublime*
 
+private*.json
+
 /node_modules
 /bower_components
 /public
+/build

api/feed.js

@@ -1,22 +0,0 @@
-/**
- * Created by tmshv on 22/11/14.
- */
-
-var Router = require("express").Router;
-var Post = require("../schema/post");
-
-module.exports = function (app) {
-    var router;
-    router = new Router();
-    router.route("/api/feed")
-        .get(function (req, res) {
-            Post.find({}).exec(function (error, list) {
-                if (error) return res.error(error);
-
-                res.json(list.map(function (post) {
-                    return post.toObject();
-                }));
-            });
-        });
-    app.use(router);
-};

assets/style/background-picture.scss

@@ -0,0 +1,14 @@
+.background-picture {
+  overflow-x: hidden;
+  width: 100%;
+  height: 95vh;
+  background-repeat: no-repeat;
+
+  &.vertical {
+    background-size: 100% auto;
+  }
+
+  &.horizontal {
+    background-size: auto 100%;
+  }
+}

assets/style/breadcrumbs.scss

@@ -0,0 +1,57 @@
+nav.breadcrumbs{
+  width: 80%;
+  margin: 0 auto;
+  padding: .35em 0 0;
+  color: #bbb;
+
+  a {
+    color: #9990e0;
+  }
+
+  ul{
+    list-style: none;
+
+    li {
+      display: inline-block;
+
+      &:not(:first-child):before{
+        content: '⟶';
+        margin-left: .4em;
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 31.25em) {
+  nav.breadcrumbs{
+    width: 100%;
+    margin: 0;
+    font-size: 0.75em;
+
+    ul{
+      li {
+        &:not(:first-child):before{
+          content: '>';
+          margin-left: .2em;
+        }
+      }
+    }
+  }
+}
+
+@media screen and (min-width: 31.25em) and (max-width: 59.99999em){
+  nav.breadcrumbs{
+    width: 100%;
+    margin: 0;
+    font-size: 0.75em;
+
+    ul{
+      li {
+        &:not(:first-child):before{
+          content: '>';
+          margin-left: .2em;
+        }
+      }
+    }
+  }
+}

assets/style/docs.scss

@@ -9,56 +9,32 @@
   }
 }
 
-.act{
-	text-decoration: none;
-	border-bottom: 1px dashed #688fff;
-}
+.documents-block {
+  margin: 3em 0 0;
 
-.docblock{
-	// width:100%;
-	margin-bottom: 40px;
-
-	text-align: center;
-
-	// .docs{
-	// 	text-align: left;
-	// }
-
-	h2{
-		margin-left: 50px;
-		text-align: left;
-	}
-
-	.panel{
-		text-align: left;
-		li{
-			display: inline-block;
-			margin: 0 5px;
-		}
-
-		.select{
-			padding:2px 6px 2px 6px;
-			background-color: #688fff;
-			color: white;
-			border: none;
-		}
-	}
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  align-items: baseline;
 }
 
 .doc {
-	display: inline-block;
-	margin: 30px 35px;
+  margin: 0 1.2em 2.5em;
 
+  p {
+    text-align: center;
+  }
   img {
-		display: block;
-		margin-left: auto;
-		margin-right: auto;
-		max-width:360px;
+    max-width: 100%;
+  }
 }
 
-	.docinfo{
-		margin: 0;
-		padding: 0;
-		display: block;
+@media (max-width: 31.25em) {
+  .documents-block {
+    margin: 1em 0 0;
+  }
+
+  .doc {
+    margin: 0 0 2em;
   }
 }

assets/style/error-404.scss

@@ -0,0 +1,15 @@
+.error-404{
+  text-align: center;
+  margin: 40px;
+
+  h1{
+    font-size: 16pt;
+    font-weight: normal;
+  }
+
+  img{
+    margin: 20px;
+    width: 40%;
+    max-width: 800px;
+  }
+}

assets/style/footer.scss

@@ -1,31 +1,74 @@
 footer {
+  color: #e3e3e3;
+  background-color: #151515;
+  font-size: 0.9em;
+  padding: 0 0.5em 0.5em;
   position: relative;
-  background-color: black;
-  color: #ffffff;
 
   &:before {
     content: '';
     position: absolute;
     top: -3px;
+    left: 0;
     width: 100%;
     height: 3px;
+    z-index: 100;
     background-image: url('/graphics/rawline.png');
   }
 
-  .info-block{
-    display: flex;
-    margin: 0 20px;
+  h4{
+    font-size: 1.3em;
+    color: white;
+    margin: 0.5em 0 0.7em;
+  }
 
-    & > div{
-      margin: 0 30px 0 10px;
+  ul {
+    padding: 0 0.5em 0 1em;
+    list-style: none;
+
+    li {
+      margin: 0 0 0.5em;
     }
   }
 
   a {
+    padding: 0.15em 0;
+    line-height: 1.5em;
     color: #738cdb;
+    text-decoration: none;
+    border-bottom: 1px solid #2c3652;
   }
 
-  ul{
-    list-style: none;
+  .info-block {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    & > div {
+      box-sizing: border-box;
+      padding: 0 1em;
+    }
+  }
+
+  .contacts {
+    & > div {
+      padding: 0 1em;
+    }
+
+    p {
+      margin: 0.5em 1em;
+    }
+  }
+
+  .copyright {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: baseline;
+    justify-content: space-between;
+
+    span {
+      padding: 1.5em 1em 0.25em;
+      box-sizing: padding-box;
+    }
   }
 }

assets/style/gallery.scss

@@ -0,0 +1,184 @@
+.gallery-block {
+  margin: 2em 0 0;
+  display: block;
+}
+
+.gallery-period{
+  margin-bottom: 2em;
+  
+  & > div{
+    margin: 1.5em 0 0;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    align-items: flex-start;
+  }
+
+  p.period{
+    text-align: center;
+    font-size: 1.5em;
+    font-weight: bold;
+  }
+}
+
+.gallery-album {
+  margin: 0 1em 2em;
+
+  h3{
+    margin: 0 0 0.35em;
+  }
+
+  img {
+    max-width: 100%;
+  }
+}
+
+.album-block {
+  width: 100%;
+  margin: 1em auto 2em;
+
+  h3 {
+    text-align: center;
+    margin: 1.5em 0 1em;
+  }
+
+  .fotorama__nav-wrap {
+    margin: 6em 0 0;
+  }
+
+  .fotorama__stage{
+    overflow: inherit;
+  }
+
+  .fotorama__stage__frame{
+    overflow: inherit;
+  }
+
+  .album {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: center;
+  }
+
+  .album-info {
+    width: 80%;
+    margin: 0 0 3em;
+  }
+
+  .album-info p {
+    margin: 0 0 .5em;
+  }
+
+  .album-item {
+    width: 80%;
+    box-sizing: border-box;
+    margin: 0 0 4em;
+    position: relative;
+    background-color: white;
+    padding: 6em;
+    box-shadow: 0 4px 14px -10px rgba(0,0,0, .85);
+
+    &.vertical {
+      width: 47%;
+      min-width: 30em;
+      max-width: 35em;
+    }
+
+    img{
+      width: 100%;
+      box-sizing: border-box;
+      border: .25em solid #eee;
+      border-top-color: #bbb;
+      border-left-color: #ddd;
+    }
+  }
+
+  .product-info{
+    text-align: center;
+    position: absolute;
+    width: 100%;
+    left: 0;
+    bottom: 1em;
+
+    & > div {
+      display: inline-block;
+      padding: .5em 1em;
+      background-color: white;
+      border: 1px solid #f5f5f5;
+      border-radius: .25em;
+      box-shadow: 0 5p/x 4px -4px rgba(0,0,0, .5);
+    }
+
+    p {
+      font-size: 0.75em;
+    }
+    
+    .title {
+      font-weight: bold;
+    }
+  }
+}
+
+@media screen and (max-width: 31.25em) {
+  .album-block {
+    width: 100%;
+    margin: 1em auto 2em;
+
+    h3 {
+      text-align: left;
+      margin: 1em 0 0.5em;
+    }
+
+    .album-info{
+      width: 100%;
+      margin: 0 0 2em;
+    }
+
+    .album-item {
+      width: 100%;
+      padding: 1em 1em 5em;
+      margin: 0 0 2em;
+
+      img{
+        border: .1em solid #eee;
+        border-top-color: #bbb;
+        border-left-color: #ddd;
+      }
+    }
+
+    .product-info {
+      bottom: .5em;
+    }
+  }
+
+  .gallery-album {
+    margin: 0 0 1em;
+  }
+}
+
+@media screen and (min-width: 31.25em) and (max-width: 59.99999em){
+  .album-block {
+    .album-info{
+      width: 100%;
+      margin: 0 0 2em;
+      font-size: 0.75em;
+    }
+
+    .album-item {
+      width: 100%;
+      padding: 2em 2em 5em;
+      margin: 0 0 2em;
+
+      img{
+        border: .15em solid #eee;
+        border-top-color: #bbb;
+        border-left-color: #ddd;
+      }
+    }
+
+    .product-info {
+      bottom: .5em;
+    }
+  }
+}

assets/style/home.scss

@@ -8,3 +8,18 @@
     animation: scaleUp 0.3s both ease-in;
   }
 }
+
+.page.page-home{
+  width: 90%;
+  margin: 0 auto;
+}
+
+.main-block {
+  h1 {
+    font-size: 18pt;
+    text-align: center;
+    font-weight: normal;
+    margin: 1.2em 0 0;
+    padding: 0;
+  }
+}

assets/style/main.scss

@@ -1,43 +1,60 @@
-//html {
-//  overflow-y: hidden;
-//}
-
-body {
-	font-family: "PT Sans", Arial, sans-serif;
+* {
   margin: 0;
   padding: 0;
 }
 
-.main {
-  margin-top: 5px;
-
-  .telephone {
-	font-size: 1.25em;
-	margin-left: 30px;
+html, body {
+  height: 100%;
 }
 
-  h1 {
-    text-align: right;
-    margin: 20px 50px 0 0;
-    font-weight: normal;
-    padding: 0;
+body {
+  font-family: "PT Sans", Arial, sans-serif;
+  min-width: 320px;
 }
+
+.wrapper {
+  display: flex;
+  min-height: 100%;
+  flex-direction: column;
+}
+
+.content {
+  flex: 1;
+  margin: 41px auto 0;
 }
 
 a {
   color: #3f9cea;
   text-decoration: none;
   border-bottom: 1px solid rgba(63, 156, 234, 0.25);
-}
 
-a:hover {
+  &:hover {
     border-bottom: 1px solid rgba(63, 156, 234, 0.5);
   }
 
-a:active {
+  &:active {
     border-bottom: 1px solid rgb(63, 156, 234);
   }
 
+  &.invisible {
+    border-bottom: none;
+  }
+}
+
+h3 a {
+  color: black;
+  text-decoration: none;
+  border-bottom: 1px solid #ddd;
+
+  &:hover {
+    border-bottom: 1px solid #484848;
+  }
+
+  &:active {
+    border-bottom: 1px solid #000000;
+  }
+}
+
 ul.submenu {
   list-style: none;
   display: inline-block;

assets/style/menu.scss

@@ -1,26 +1,33 @@
-.menu {
-  $text_color: #666;
+.main-menu {
 
-  position:relative;
+  position: fixed;
+  z-index: 100;
+  overflow-x: scroll;
+  -webkit-overflow-scrolling: touch;
   width: 100%;
+  //max-height: 15em;
+
   background-color: black;
-  color: $text_color;
-  font-size: 13pt;
+  font-size: 1.1em;
+  color: #666;
 
-  ul {
-    margin: 0 0 0 20px;
+  list-style: none;
+  white-space: nowrap;
 
-    li {
-      display: inline-block;
-      padding: 5px 3px 13px 3px;
-      margin-right: 30px;
-    }
-  }
-
-  :link, :visited {
+  & :link, & :visited {
     text-decoration: none;
     border-bottom: 1px solid #333;
-    color: #ccc;
+    color: #a2a2a2;
+  }
+
+  li {
+    display: inline-block; /* 6 */
+    padding: 0.3em 0.2em 0.5em;
+    margin: 0 0.5em;
+
+    &:first-child {
+      margin-left: 1em;
+    }
   }
 
   a:hover {
@@ -28,12 +35,6 @@
     border-bottom: 1px solid #555;
   }
 
-  .vk {
-    float: right;
-    margin: 13px 15px 0 0;
-    border: none;
-  }
-
   .selected {
     border-top: 4px solid white;
     font-weight: bold;
@@ -59,6 +60,20 @@
     &.pink {
       border-top: 4px solid #f655a0;
     }
+
+    &.red {
+      border-top: 4px solid #f61b14;
+    }
   }
 }
 
+@media (min-width: 31.25em) {
+  header{
+    //max-height: none;
+    overflow: hidden;
+  }
+
+  .main-menu {
+    width: 100%;
+  }
+}

assets/style/page.scss

@@ -1,10 +1,6 @@
 .page {
-//  position: absolute;
-//  bottom: 0;
-//  top: 0;
-  padding-top: 0px;
+  padding-top: 0;
   width: 100%;
-//  z-index: -1;
 }
 
 .page.ng-leave {

assets/style/pdf.scss

@@ -1,179 +0,0 @@
-#page-container {
-  position: absolute;
-  top: 0;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  border: 0;
-  z-index: -1;
-}
-
-@media screen {
-  #page-container {
-    bottom: 0;
-    right: 0;
-    overflow: auto;
-  }
-  .loading-indicator {
-    display: none;
-    &.active {
-      display: block;
-      position: absolute;
-      width: 64px;
-      height: 64px;
-      top: 50%;
-      left: 50%;
-      margin-top: -32px;
-      margin-left: -32px;
-    }
-    img {
-      position: absolute;
-      top: 0;
-      left: 0;
-      bottom: 0;
-      right: 0;
-    }
-  }
-}
-
-@media print {
-  @page {
-    margin: 0;
-  }
-
-  html {
-    margin: 0;
-  }
-  body {
-    margin: 0;
-    -webkit-print-color-adjust: exact;
-  }
-  #page-container {
-    width: auto;
-    height: auto;
-    overflow: visible;
-    background-color: transparent;
-  }
-  .d {
-    display: none;
-  }
-}
-
-.pf {
-  position: relative;
-  background-color: white;
-  overflow: hidden;
-  border: 0;
-}
-
-.pc {
-  position: absolute;
-  border: 0;
-  padding: 0;
-  margin: 0;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  display: block;
-  transform-origin: 0 0;
-  -ms-transform-origin: 0 0;
-  -webkit-transform-origin: 0 0;
-  &.opened {
-    display: block;
-  }
-}
-
-.bf {
-  position: absolute;
-  border: 0;
-  margin: 0;
-  top: 0;
-  bottom: 0;
-  width: 100%;
-  height: 100%;
-  -ms-user-select: none;
-  -moz-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-}
-
-.bi {
-  position: absolute;
-  border: 0;
-  margin: 0;
-  -ms-user-select: none;
-  -moz-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-}
-
-@media print {
-  .pf {
-    margin: 0;
-    box-shadow: none;
-    page-break-after: always;
-    page-break-inside: avoid;
-  }
-  @-moz-document url-prefix() {
-    .pf {
-      overflow: visible;
-      border: 1px solid #fff;
-    }
-    .pc {
-      overflow: visible;
-    }
-  }
-}
-
-.c {
-  position: absolute;
-  border: 0;
-  padding: 0;
-  margin: 0;
-  overflow: hidden;
-  display: block;
-}
-
-.t {
-  position: absolute;
-  white-space: pre;
-  font-size: 1px;
-  transform-origin: 0 100%;
-  -ms-transform-origin: 0 100%;
-  -webkit-transform-origin: 0 100%;
-  unicode-bidi: bidi-override;
-  -moz-font-feature-settings: "liga" 0;
-}
-
-._ {
-  color: transparent;
-  z-index: -1;
-}
-
-::selection {
-  background: rgba(127, 255, 255, 0.4);
-}
-
-::-moz-selection {
-  background: rgba(127, 255, 255, 0.4);
-}
-
-.pi {
-  display: none;
-}
-
-.d {
-  position: absolute;
-  transform-origin: 0 100%;
-  -ms-transform-origin: 0 100%;
-  -webkit-transform-origin: 0 100%;
-}
-
-// .@CSS_LINK_CN span {
-//     position: relative;
-//     vertical-align: baseline;
-//     display: inline-block;
-//     unicode-bidi: bidi-override;
-// }

assets/style/schedule-mobile.scss

@@ -0,0 +1,61 @@
+.schedule-slider {
+  width: 100%;
+  max-width: 30em;
+  //width: 90%;
+  //margin: 0 auto;
+}
+
+.schedule-slider__slide {
+  height: 100%;
+  overflow-y: auto;
+
+  &.current {
+    border-left: .3em solid #4b8ff3;
+    border-right: .3em solid #4b8ff3;
+  }
+}
+
+.schedule-slider__body {
+}
+
+.schedule-slider__head {
+  text-align: center;
+  font-size: 2em;
+  margin: 0 0 .5em;
+}
+
+.schedule-record {
+  min-height: 10em;
+  text-align: center;
+
+  &.even{
+    background-color: #f3f3fd;
+  }
+
+  &.empty {
+    .schedule-record__head{
+      color: #bbb;
+    }
+  }
+
+  p {
+    margin: .2em 0;
+  }
+}
+
+.schedule-record__head {
+  padding: .25em 0;
+  font-size: 1.2em;
+}
+
+.schedule-record__main {
+}
+
+.schedule-record__name {
+  font-weight: bold;
+  font-size: 1.2em;
+}
+
+.schedule-record__group {
+  position: absolute;
+}

assets/style/schedule-table.scss

@@ -0,0 +1,121 @@
+$current-week-day-color: #4b8ff3;
+
+.schedule-table {
+  margin: 0 auto;
+  width: 100%;
+  min-width: 50em;
+  position: relative;
+
+  table {
+    margin: 2em auto;
+    border-spacing: 0;
+    text-align: center;
+
+    thead {
+      animation-duration: 0.3s;
+
+      th {
+        font-weight: normal;
+        vertical-align: baseline;
+        height: 80px;
+      }
+
+      .date {
+        font-size: 1.5em;
+      }
+
+      .group {
+        color: #666;
+      }
+    }
+
+    tbody tr:nth-child(even) {
+      background-color: #f0f2da;
+    }
+
+    td {
+      vertical-align: baseline;
+
+      &:not(.group) {
+        width: 15%;
+        padding: .75em 1em;
+      }
+
+      &.group {
+        width: 5%;
+
+        p.name {
+          font-size: 1.25em;
+          font-weight: 800;
+        }
+      }
+    }
+
+    thead.fix {
+      position: fixed;
+      top: 41px;
+      background-color: rgba(255, 255, 255, .95);
+      z-index: 50;
+      box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5);
+
+      .current {
+        border: none;
+        border-radius: 0;
+        color: $current-week-day-color;
+      }
+
+      th {
+        height: auto;
+
+        .day {
+          margin: .5em 0;
+        }
+
+        .date {
+          margin: 0 0 .25em;
+        }
+      }
+    }
+
+    tbody.fix:before {
+      content: '';
+      display: block;
+      margin-top: 80px;
+    }
+  }
+
+  p {
+    margin-bottom: .2em;
+  }
+
+  a {
+    color: black;
+
+    text-decoration: none;
+    border-bottom: 1px solid #ccc;
+  }
+
+  .lesson {
+    font-size: 1.1em;
+    font-weight: bold;
+  }
+
+  .teacher {
+    font-style: italic;
+  }
+
+  .current {
+    border-left: 2px solid $current-week-day-color;
+    border-right: 2px solid $current-week-day-color;
+  }
+
+  .canceled:before {
+    position: absolute;
+    content: "";
+    width: 70%;
+    height: 100%;
+    top: 0;
+    left: 15%;
+    background-image: url(lesson-canceled.svg);
+  }
+}

assets/style/schedule.scss

@@ -15,185 +15,7 @@
     padding-bottom: 50px;
     text-align: center;
 
-    table{
-        position: relative;
-        margin: 30px auto 0 auto;
-        
-        border-spacing: 0px;
-        text-align: center;
-
-        td{
-            position: relative;
-
-            &:not(.group){
-                min-width: 150px;
-            /*    width: 15%;*/
-                width: 150px;
-                padding: 8px 10px 8px;
-                
-                vertical-align:baseline;
-            }
-
-            &.group{
-                min-width: 60px;
-            /*    width: 5%;*/
-                width: 60px;
-                position: relative;
-                vertical-align:baseline;
-
-                p.name{
-                    font-size: 1.4em;
-                    font-weight: 800;
-                    color: #242424;
-                }
-            }
-        }
-    }
-
-    thead{
-        animation-duration: 0.3s;
-
-        th{
-            font-weight: normal;
-            vertical-align: baseline;
-            height: 80px;
-            padding: 10px 0 0;
-
-            &.weekend{
-                color: #f52;
-            }
-        }
-
-        .date{
-            font-size: 1.5em;
-        }
-
-        .group{
-            color: #666;
-        }
-    }
-
-    tbody tr:nth-child(even){
-        background-color: #f3f3fd;
-    }
-
-    .lesson{
-        font-size: 1.1em;
-        font-weight: bold;
-    }
-
-    .teacher{
-        font-style: italic;
-    }
-
-    p{
-        margin-bottom: 10px;
-    }
-
-    a{
-        color: black;
-        
-        text-decoration: none;
-        border-bottom: 1px solid #ccc;
-    }
-
-    .current{
-        border-left: 2px solid #4b8ff3;
-        border-right: 2px solid #4b8ff3;
-
-        &.first{
-            border-radius: 15px 15px 0 0;
-            border-top: 2px solid #4b8ff3;
-        }
-
-        &.last{
-            border-radius: 0 0 15px 15px;
-            border-bottom: 2px solid #4b8ff3;
-        }
-    }
-
-    .canceled:before{
-        position: absolute;
-        content: "";
-        width:70%;
-        height: 100%;
-        top: 0;
-        left: 15%;
-        background-image: url(lesson-canceled.svg);
-    }
-
-    ul{
-        margin: 0px auto 30px auto;
-        text-align: center;
-
-        li{
-            display: inline-block;
-            padding: 5px 10px;
-            margin: 0 5px;
-
-            &.current{
-                color: #68aeff;
-                border: none;
-                font-weight: bold;
-            /*    color: #555;*/
-            /*    padding: 5px 15px;*/
-            /*    border: 1px solid #4b8ff3;*/
-            /*    border-radius: 100px;*/
-            }
-        }
-
-        a{
-            color: #3f9cea;
-            border-bottom: 1px dashed #ccc;
-            display: inline-block;
-            padding: 0px;
-        }
-    }
-
-    thead.fix{
-        position: fixed;
-        top: 0;
-        background-color: rgba(255, 255, 255, 0.96);
-        z-index: 100;
-        box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5);
-        border-radius: 0 0 20px 20px;
-
-        .current{
-            border: none;
-            border-radius: 0px;
-            color: #3f9cea;
-            width: 155px;
-        }
-
-        th{
-            height: auto;
-
-            :not(.group){
-                min-width: 150px;
-            /*    width: 15%;*/
-                width: 150px;
-                padding: 8px 10px 8px;
-            }
-
-            &.group{
-                width: 63px;
-            }
-
-            .day{
-                margin: 0;
-                line-height: 0;
-            }
-
-            .date{
-                margin: 15px 0;
-                line-height: 0;
-            }
-        }
-    }
-
-    tbody.fix:before{
-        content: "";    
-        display: block;
-        margin-top: 90px;
+    & > p {
+        margin: 0 0 1em;
     }
 }

assets/style/tape-viewer.scss

@@ -1,12 +1,17 @@
 .tape-block{
-  width: 70%;
-  max-width: 700px;
-  min-width: 300px;
+  width: 60%;
+  max-width: 1000px;
 
-  margin: 100px auto 100px;
+  margin: 2em auto;
+
+  &.simplified{
+    .tape{
+      display: none;
+    }
+  }
 }
 
-.tape-block-content{
+.tape-block__body{
   position: relative;
   width: 100%;
 
@@ -41,3 +46,44 @@
     background-image: url(/graphics/tape-rb.png);
   }
 }
+
+@media screen and (max-device-width: 31.25em) {
+  .tape-block {
+    width: 90%;
+    margin: 1.5em auto;
+  }
+
+  .tape-block__body {
+    .tape {
+      width: 62px;
+      height: 62px;
+      position: absolute;
+      z-index: 10;
+    }
+
+    .tape-tl {
+      top: -20px;
+      left: -20px;
+      background-image: url(/graphics/m-tape-tl.png);
+      background-size: 100%;
+    }
+
+    .tape-tr {
+      top: -20px;
+      right: -20px;
+      background-image: url(/graphics/m-tape-tr.png);
+    }
+
+    .tape-bl {
+      bottom: 10px;
+      left: -20px;
+      background-image: url(/graphics/m-tape-bl.png);
+    }
+
+    .tape-br {
+      bottom: 10px;
+      right: -20px;
+      background-image: url(/graphics/m-tape-br.png);
+    }
+  }
+}

assets/style/team.scss

@@ -8,45 +8,37 @@
   }
 }
 
-.background-picture{
-    width: 100%;
-    position: fixed;
-    top:0;
-    left: 0;
-    z-index: -999;
-}
-
 .team-block {
   background-color: white;
   width: 100%;
-    min-height: 100px;
-    padding-top: 100px;
-    padding-bottom: 100px;
-    margin-top: 63%;
-
-    ul{
-        list-style:none;
-    }
+  padding-top: 3em;
 
   .team-member {
-        margin: 0 auto 50px auto;
-        width: 70%;
-
-        img{
-            width: 40%;
-            max-width: 600px;
-            min-width: 200px;
-            display: inline-block;
+    width: 80%;
+    margin: 0 auto 3em;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
   }
 
-        .info{
-            display: inline-block;
-            float: right;
-            width: 55%;
-            line-height: 2em;
+
+  .team-member__picture {
+    width: 20%;
+    max-width: 15em;
+    min-width: 12em;
+    margin: 0 1em;
+  }
+
+  .team-member__picture img {
+    width: 100%;
+  }
+
+  .team-member__info {
+    width: 60%;
+    margin: 0 1em;
 
     h3 {
-                font-weight: 100;
+      font-weight: 200;
 
       span {
         font-weight: 600;
@@ -54,4 +46,3 @@
     }
   }
 }
-}

assets/style/timeline-content.scss

@@ -1,45 +0,0 @@
-.timeline {
-  .post {
-    .user{
-      margin-top: 4px;
-
-      span{
-        vertical-align: top;
-        line-height: 40px;
-      }
-
-      img {
-        width: 40px;
-        height: 40px;
-        border-radius: 50%;
-      }
-    }
-
-    .date{
-      margin: 5px 0 0;
-      color: #999;
-      font-size: 0.75em;
-    }
-
-    .body{
-      padding: 20px 20px 50px;
-//      padding: 12px 0 0;
-//      h2{
-//
-//      }
-
-      a{
-        border-bottom: none;
-      }
-
-      img {
-        width: 100%;
-        max-width: 500px;
-        box-sizing: border-box;
-        border-radius: 5px;
-        border: 8px solid white;
-        box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.35);
-      }
-    }
-  }
-}

assets/style/timeline-instagram.scss

@@ -0,0 +1,34 @@
+.timeline-record {
+  .instagram {
+    margin: 0 auto;
+    max-width: 640px;
+
+    .head {
+      width: 100%;
+      margin: 0 0 .5em;
+
+      .user {
+        span {
+          vertical-align: top;
+          line-height: 40px;
+        }
+
+        img {
+          width: 40px;
+          height: 40px;
+          border-radius: 50%;
+        }
+      }
+    }
+
+    .body img {
+      width: 100%;
+      height: auto;
+      box-sizing: border-box;
+      border: .5em solid white;
+      box-shadow: 0 .2em 0.35em rgba(0, 0, 0, 0.35);
+      border-radius: .35em;
+      margin: 0 0 1em;
+    }
+  }
+}

assets/style/timeline-record.scss

@@ -0,0 +1,8 @@
+.timeline-record {
+  margin: 0 0 3em;
+  .date {
+    margin: 0 0 0.45em;
+    font-size: 0.75em;
+    color: #999;
+  }
+}

assets/style/timeline.scss

@@ -1,103 +1,38 @@
 .timeline{
-  min-width: 500px;
-  position: relative;
-  margin: 0 0 50px;
-
-  &:before{
-    content: '';
-    width: 10px;
-    height: 10px;
-    position: absolute;
-    background-color: black;
-    top: 0;
-    left: calc(50% - 6px);
-    border-radius: 50%;
-    z-index: 1;
-  }
-}
-
-.post{
-  position: relative;
   display: flex;
+  flex-direction: column;
+  width: 70%;
+  margin: 0 auto 2em;
+}
 
-  .head, .body{
+.timeline-footer{
+  display: flex;
+  justify-content: center;
+
+  button.more{
     position: relative;
-    width: 50%;
-    box-sizing: border-box;
-  }
+    top: -2px;
 
-  .head {
-    padding: 25px 20px;
-  }
-
-  .body {
-    padding: 0 20px;
-  }
-
-  &.left{
-    flex-flow: row-reverse;
-
-    .body{
-      text-align: right;
-    }
-
-    .head{
-      text-align: left;
-    }
-
-    .body:after{
-      content: '';
-      position: absolute;
-      width: 12px;
-      height: calc(100% - 98px);
-      top: 98px;
-      right: 0;
-      background: url(/graphics/timeline-line.png) no-repeat right;
-      background-size: 2px 100%;
-    }
-
-    .head:after{
-      content: '';
-      position: absolute;
-      width: 12px;
-      height: 98px;
-      top: 0;
-      left: -12px;
-      background: url(/graphics/timeline-arrow-left.png) no-repeat;
-    }
-  }
-
-  &.right{
-    flex-flow: row;
-
-    .body{
-      text-align: left;
-    }
-
-    .head{
-      text-align: right;
-      margin: 0 10px;
-    }
-
-    .body:after{
-      content: '';
-      position: absolute;
     width: 100px;
-      height: calc(100% - 98px);
-      top: 98px;
-      left: -12px;
-      background: url(/graphics/timeline-line.png) no-repeat;
-      background-size: 2px 100%;
+    height: 40px;
+    border: 2px solid black;
+    padding: 0 10px;
+    background: none;
+
+    font-size: 14pt;
+
+    &:hover{
+      background: gainsboro;
     }
 
-    .head:after{
-      content: '';
-      position: absolute;
-      width: 12px;
-      height: 98px;
+    &:active{
       top: 0;
-      left: calc(100% - 2px);
-      background: url(/graphics/timeline-arrow-right.png) no-repeat;
     }
   }
 }
+
+@media screen and (max-device-width: 31.25em) {
+  .timeline {
+    width: 98%;
+  }
+}

bin/insta.js

@@ -1,140 +0,0 @@
-/**
- * Created by tmshv on 22/11/14.
- */
-
-var config = require("../config");
-var db = require("../core/db");
-var instagram = require("../core/instagram");
-var express = require("express");
-var Promise = require("promise");
-var methodOverride = require("method-override");
-var logger = require("morgan");
-var cookieParser = require("cookie-parser");
-var bodyParser = require("body-parser");
-
-var Post = require("../schema/post");
-
-db.init(config.db)
-    .then(function () {
-        server(config.port);
-    });
-
-function server(port) {
-    var app = express();
-    app.use(logger("dev"));
-    app.use(cookieParser());
-    app.use(bodyParser.json());
-    app.use(bodyParser.urlencoded({extended: true}));
-    app.use(methodOverride());
-
-    require("../routers/instagram")(app);
-
-    var Router = express.Router;
-    var instagram = require("../core/instagram");
-    var router = new Router();
-    router.route("/").get(function (req, res) {
-        if ("instagram_code" in req.cookies) {
-            var client = instagram.client(req.cookies["instagram_code"]);
-            instagramSandbox(client, res);
-        } else {
-            var ig = instagram.client();
-            var url = ig.get_authorization_url(config.instagram.redirect_uri, {scope: ["basic"], state: "hello"});
-            res.redirect(url);
-        }
-    });
-    app.use(router);
-    app.listen(port);
-}
-
-function instagramSandbox(ig, res) {
-//    //{"username":"mlazareffa","bio":"","website":"","profile_picture":"http://images.ak.instagram.com/profiles/anonymousUser.jpg","full_name":"","id":"1549382451"}
-//    //ig.user_search("mlazareffa", [], function(err, users, remaining, limit) {
-//    //    console.log(err, users, remaining, limit);
-//    //    res.json(users);
-//    //});
-//
-//    // ig.user_media_recent("1549382451", [], function (err, medias, pagination, remaining, limit) {
-//    //     console.log(err, medias, pagination, remaining, limit);
-//    //     res.json(users);
-//    // });
-//
-//    //ig.subscriptions(function(err, result, remaining, limit){
-//    //    console.log(err, result, remaining, limit);
-//    //    res.json(result);
-//    //});
-//
-//    //ig.del_subscription({id: 14180526}, function (err, subscriptions, limit) {
-//    //        console.log(err, subscriptions, limit);
-//    //        res.json(subscriptions);
-//    //});
-//
-//    ///* OPTIONS: { [verify_token] }
-//    // ig.add_tag_subscription("hello", "http://home.tmshv.ru:1337/instagram/tag/hello", [], function(err, result, remaining, limit){
-//    //    console.log(err, result, remaining, limit);
-//    //    res.json(result);
-//    //});
-
-    findByTag(ig, "shlb_hudozka", 10)
-        .catch(function (error) {
-            console.log(error);
-        })
-        .then(function (params) {
-            var list = params.medias;
-            var pagination = params.pagination;
-            var remaining = params.remaining;
-            var limit = params.limit;
-
-            var posts = list.map(function (gram) {
-                //var post = new Post();
-                var post = {};
-                post.id = gram.id;
-                post.author = gram.user["username"];
-                post.publishDate = new Date(parseInt(gram["created_time"]) * 1000);
-                post.data = gram;
-                post.body = "";
-                post.type = "instagram";
-
-                return post;
-            });
-
-            Promise.all(posts.map(function (post) {
-                return new Promise(function (resolve, reject) {
-                    console.log('updating', post.id);
-                    Post.update({id: post.id}, post, {upsert: true}, function (error, num) {
-                        if (error) {
-                            reject(error);
-                        } else {
-                            resolve();
-                        }
-                    });
-                });
-            }))
-                .catch(function (error) {
-                    console.log(error);
-                })
-                .then(function () {
-                    res.send("LOL");
-                });
-
-            //if (pagination.next) {
-            //    pagination.next(mtr); // Will get second page results
-            //}
-        });
-}
-
-function findByTag(ig, tag, count) {
-    return new Promise(function (resolve, reject) {
-        ig.tag_media_recent(tag, {count: count}, function (err, medias, pagination, remaining, limit) {
-            if (err) {
-                reject(err);
-            } else {
-                resolve({
-                    medias: medias,
-                    pagination: pagination,
-                    remaining: remaining,
-                    limit: limit
-                });
-            }
-        });
-    });
-}

bin/www.js

@@ -5,8 +5,11 @@
 var config = require("../config");
 var db = require("../core/db");
 var server = require("../server");
+var instagram = require("../instagram");
 
-db.init(config.db)
+db.init(config.db.uri)
+    //.then(instagram)
     .then(function () {
-        server(config.port);
+        var app = server();
+        app.listen(config.port);
     });

bower.json

@@ -22,8 +22,11 @@
   "dependencies": {
     "fotorama": "~4.6.2",
     "jquery": "~2.1.1",
-    "angular-route": "~1.3.3",
-    "angular-animate": "~1.3.3",
-    "angular": "~1.3.3"
+    "angular-route": "~1.4.1",
+    "angular-animate": "~1.4.1",
+    "angular": "~1.4.1",
+    "angulartics": "~0.17.2",
+    "angular-spinner": "~0.6.1",
+    "socket.io-client": "~1.3.5"
   }
 }

client/api/api.js

@@ -2,11 +2,16 @@
  * Created by tmshv on 22/11/14.
  */
 
+var APINews = require("./news");
+var APIGallery = require("./gallery");
+
 module.exports = function(app) {
+    var minute = 1000 * 60;
+
     app.factory("api", function ($http) {
         var api = {};
-        var Endpoint = require("./feed");
-        api.feed = new Endpoint($http);
+        api.news = new APINews($http);
+        api.gallery = new APIGallery($http, minute);
 
         return api;
     });

client/api/feed.js

@@ -1,13 +0,0 @@
-/**
- * Created by tmshv on 22/11/14.
- */
-
-function APIFeed(http){
-    this.request = http;
-}
-
-APIFeed.prototype.post = function() {
-    return this.request.get("/api/feed");
-};
-
-module.exports = APIFeed;

client/api/gallery.js

@@ -0,0 +1,22 @@
+/**
+ * Created by tmshv on 22/11/14.
+ */
+
+function APIGallery(http){
+    this.request = http;
+}
+
+APIGallery.prototype.year = function(year) {
+    return this.request.get("/gallery/" + year, {cache: true});
+};
+
+APIGallery.prototype.album = function(year, course, album) {
+    var url = '/gallery/{year}/{course}/{album}'
+        .replace('{year}', year)
+        .replace('{course}', course)
+        .replace('{album}', album);
+
+    return this.request.get(url, {cache: true});
+};
+
+module.exports = APIGallery;

client/api/news.js

@@ -0,0 +1,15 @@
+/**
+ * Created by tmshv on 22/11/14.
+ */
+
+var query = require("../../utils/net").query;
+
+function APIFeed(http){
+    this.request = http;
+}
+
+APIFeed.prototype.feed = function(count, portion) {
+    return this.request.get("/news?"+query([["count", count], ["portion", portion]]));
+};
+
+module.exports = APIFeed;

client/app.js

@@ -2,60 +2,110 @@
  * Created by tmshv on 04/11/14.
  */
 
-var app = angular.module("hudozhka", ["ngRoute", "data.hudozhka"]);
+var deps = [
+    require('./modules/schedule')
+]
+    .map(function(m){
+        return m.name;
+    });
+
+var app = angular.module("hudozhka", deps.concat([
+    "hudozhka.data",
+    "ngRoute",
+    "angulartics",
+    "angulartics.google.analytics",
+    "angularSpinner"
+]));
 
 app.config(function ($locationProvider, $routeProvider) {
+    $locationProvider.hashPrefix("!");
     $locationProvider.html5Mode(true);
 
     var routes = [
         {
             name: "/",
             templateUrl: "/views/home.html",
-            controller: "HomePageController"
+            controller: "HomePageController",
+            title: "ДХШ Шлиссельбурга"
         },
         {
-            name: "/schedule",
+            name: "/schedule/:period?/:semester?",
             templateUrl: "/views/schedule.html",
-            controller: "SchedulePageController"
+            controller: "SchedulePageController",
+            title: "Расписание"
         },
         {
             name: "/team",
             templateUrl: "/views/team.html",
-            controller: "TeamPageController"
+            controller: "TeamPageController",
+            title: "Преподаватели"
+        },
+        {
+            name: "/gallery",
+            templateUrl: "/views/gallery.html",
+            controller: "GalleryPageController",
+            title: "Работы учащихся"
+        },
+        {
+            name: "/gallery/:year/:course/:album",
+            templateUrl: "/views/gallery-album.html",
+            controller: "AlbumPageController"
         },
         {
             name: "/docs",
             templateUrl: "/views/docs.html",
-            controller: "DocsPageController"
+            controller: "DocsPageController",
+            title: "Документы"
         }
     ];
 
     routes.forEach(function (route) {
+        if (typeof route === 'function') route = route();
         $routeProvider.when(route.name, route);
     });
 
     $routeProvider.otherwise({
-        redirectTo: "/"
+        templateUrl: "/404.html"
     });
 });
 
+app.run(function ($location, $rootScope, $http) {
+    $rootScope.$on("$routeChangeSuccess", function (event, current) {
+        var title = current["$$route"].title;
+        if (title) $rootScope.title = title;
+    });
+
+    $http.defaults.headers.common["Accept"] = "application/json";
+});
+
 require("./api/api")(app);
+require("./services/io")(app);
+require("./directives/mainMenu")(app);
+require("./directives/teamMemberProfile")(app);
+require("./directives/backgroundPicture")(app);
 require("./ui/menu")(app);
+require("./ui/breadcrumbs")(app);
 require("./ui/timeline")(app);
+require("./filters/strip")(app);
+require("./filters/remove-hashtags")(app);
+require("./filters/removeNewline")(app);
 require("./filters/uppercase-first")(app);
 require("./pages/home")(app);
 require("./pages/schedule")(app);
 require("./pages/team")(app);
+require("./pages/gallery")(app);
 require("./pages/docs")(app);
+require("./controllers/ContactsController")(app);
+require("./controllers/CopyrightController")(app);
 
 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";
 });
+
+app.controller("AppController", function ($scope, menu) {
+    $scope.menuProvider = menu.items;
+});

client/controllers/ContactsController.js

@@ -0,0 +1,7 @@
+module.exports = function (app) {
+    app.controller('ContactsController', function ($scope, config) {
+        $scope.address = config.address;
+        $scope.telephone = config.telephone;
+        $scope.email = config.email;
+    });
+};

client/controllers/CopyrightController.js

@@ -0,0 +1,17 @@
+module.exports = function (app) {
+    app.controller('CopyrightController', function ($scope, $rootScope) {
+        $scope.developer = true;
+        $scope.now = new Date().getFullYear();
+
+        $rootScope.$on('$routeChangeSuccess', function (event, current) {
+            var originalPath;
+            try{
+                originalPath = current['$$route'].originalPath;
+            }catch(e){
+                originalPath = null;
+            }
+
+            $scope.developer = originalPath == '/';
+        });
+    });
+};

client/data.js

@@ -2,11 +2,11 @@
  * Created by tmshv on 06/11/14.
  */
 
-angular.module("data.hudozhka", [])
+angular.module("hudozhka.data", [])
     .service("team", function () {
         return require("../models/team");
     })
-    .service("schedule", function () {
+    .service("scheduleData", function () {
         return require("../models/schedule");
     })
     .service("docs", function () {
@@ -14,6 +14,11 @@ angular.module("data.hudozhka", [])
     })
     .service("config", function(){
         return {
-            telephone: "8 (81362) 77-502"
+            telephone: "+7 (81362) 76-312",
+            email: "hudozka@gmail.com",
+            address: ["г. Шлиссельбург", "ул. 18 января", "д. 3"]
+                .reduce(function(address, item){
+                    return address + (address == '' ? '' : ' ') + item.replace(' ', String.fromCharCode(0xA0));
+                }, '')
         };
     });

client/directives/backgroundPicture.js

@@ -0,0 +1,26 @@
+module.exports = function (app) {
+    app.directive('backgroundPicture', function () {
+        return {
+            restrict: 'E',
+            template: '<div class="background-picture" />',
+            scope: {
+                src: '='
+            },
+            link: function($scope, $element){
+                var element = $element.find('.background-picture').get(0);
+                element.style.backgroundImage = `url('${$scope.src}')`;
+
+                setTimeout(function () {
+                    var w = element.offsetWidth;
+                    var h = element.offsetHeight;
+
+                    if (w > h) {
+                        element.classList.add('horizontal');
+                    } else {
+                        element.classList.add('vertical');
+                    }
+                }, 100);
+            }
+        }
+    });
+};

client/directives/mainMenu.js

@@ -0,0 +1,24 @@
+module.exports = function (app) {
+    app.directive('mainMenu', function (menu) {
+        return {
+            restrict: 'E',
+            templateUrl: '/views/menu.html',
+            scope: {
+                menu: '=items'
+            },
+            link: function(scope, element){
+                scope.isActive = function (item) {
+                    if (menu.current) {
+                        return item.url == menu.current.url;
+                    } else {
+                        return false;
+                    }
+                };
+
+                scope.isValid = function (item) {
+                    return 'url' in item;
+                };
+            }
+        }
+    });
+};

client/directives/teamMemberProfile.js

@@ -0,0 +1,13 @@
+module.exports = function (app) {
+    app.directive('teamMemberProfile', function (menu) {
+        return {
+            restrict: 'E',
+            templateUrl: '/views/team/profile.html',
+            scope: {
+                person: '=profile'
+            },
+            link: function(scope, element){
+            }
+        }
+    });
+};

client/document.js

@@ -1,36 +1,30 @@
-var app = angular.module("document.hudozhka", ["ngRoute", "data.hudozhka"]);
-
-app.config(function ($locationProvider, $sceDelegateProvider, $routeProvider) {
-    $locationProvider.html5Mode(true);
-    //$routeProvider
-    //    .when("/document/:doc", {
-    //        controller: "DocumentPageController"
-    //    })
-    //    .otherwise({
-    //        redirectTo: "/"
-    //    });
-
-    $sceDelegateProvider.resourceUrlWhitelist([
-        "self",
-        "http://static.shburg.org/**",
-        "http://static.shlisselburg.org/**"
+var app = angular.module("hudozhka.document", [
+    "hudozhka.data",
+    "angulartics",
+    "angulartics.google.analytics"
 ]);
+
+app.factory("docname", function ($location) {
+    return function(){
+        var abs = $location.absUrl();
+        var doc_uri = /\/([\w-]+)$/.exec(abs);
+        if(doc_uri.length >= 2) {
+            return doc_uri[1];
+        }else{
+            return null;
+        }
+    }
 });
 
-//app.factory("document", function () {
-//    var document;
-//    return {
-//        init:function(doc) {
-//            document = doc;
-//        },
-//
-//        document: document
-//    };
-//});
-
-app.controller("DocumentPageController", function ($scope) {
+app.controller("DocumentController", function ($rootScope, $scope, docs, docname) {
     $scope.pageClass = "page-document";
+
+    var n = docname();
+    if(n) {
+        var d = docs.doc(n);
+        $scope.document = d;
+        $rootScope.title = d.title;
+    }
 });
 
-require("./ui/pdf")(app);
-require("./ui/doc-controller")(app);
+require("./filters/uppercase-first")(app);

client/filters/remove-hashtags.js

@@ -0,0 +1,11 @@
+/**
+ * Created by tmshv on 21/11/14.
+ */
+
+module.exports = function(app) {
+    app.filter("removeHashtags", function () {
+        return function(string) {
+            return string.replace(/(#[^\s]+)/g, '');
+        };
+    });
+};

client/filters/removeNewline.js

@@ -0,0 +1,11 @@
+/**
+ * Created by tmshv on 21/11/14.
+ */
+
+module.exports = function(app) {
+    app.filter("removeNewline", function () {
+        return function(string) {
+            return string.replace(/(\n)/g, ' ');
+        };
+    });
+};

client/filters/strip.js

@@ -0,0 +1,13 @@
+/**
+ * Created by tmshv on 21/11/14.
+ */
+
+module.exports = function(app) {
+    app.filter("strip", function () {
+        return function(string) {
+            return string
+                .replace(/^\s+/, '')
+                .replace(/\s+$/, '');
+        };
+    });
+};

client/instagram.js

@@ -0,0 +1,28 @@
+/**
+ * Created by tmshv on 06/11/14.
+ */
+
+angular.module("hudozhka.instagram", [])
+    .controller("InstagramController", function($scope, $http, $window){
+        //$scope.auth = function() {
+        //    $http.get("/instagram/auth/url")
+        //        .success(function (data) {
+        //            $window.location.href = data.url;
+        //        });
+        //};
+
+        $http.get("/instagram/user")
+            .error(function() {
+
+            })
+            .success(function (user) {
+                $scope.user = user;
+            });
+
+        $scope.invite = function() {
+            $http.get("/instagram/invite")
+                .success(function (data) {
+                    $scope.inviteCode = data.code;
+                });
+        };
+    });

client/modules/schedule.js

@@ -0,0 +1,155 @@
+var getDates = require('../../utils/date').getDates;
+
+module.exports = angular.module('hudozka.schedule', [])
+    .directive('schedule', function ($compile) {
+        return {
+            restrict: 'E',
+            scope: {
+                groups: '='
+            },
+            link: function (scope, element) {
+                var template = `<schedule-table groups="${scope.groups}"></schedule-table>`;
+
+                try {
+                    if (window.matchMedia('(max-device-width: 30em)').matches) {
+                        template = `<schedule-slider groups="${scope.groups}"></schedule-slider>`
+                    }
+                } catch (e) {
+                }
+
+                element.html(template).show();
+                $compile(element.contents())(scope);
+            }
+        };
+    })
+    .directive('scheduleTable', function () {
+        return {
+            templateUrl: '/views/schedule/table.html',
+            link: function (scope, element) {
+                //var this_element = element[0];
+
+                var now = new Date();
+                var dates = getDates(now);
+
+                scope.isToday = function (weekDayIndex) {
+                    return (now.getDay() - 1) === weekDayIndex;
+                };
+
+                scope.weekDay = function (weekDayIndex) {
+                    return dates[weekDayIndex];
+                };
+
+                var $tbody = element.find('table tbody');
+                var $thead = element.find('table thead');
+                var $td_list = [];
+
+                var min;
+                var max;
+                $(window).scroll(function () {
+                    const scrollOffset = 150;
+                    if(!min) min = element.find('table tbody tr:first-child')[0].offsetTop + scrollOffset;
+                    if(!max) max = element.find('table tbody tr:last-child')[0].offsetTop + scrollOffset;
+
+                    if(!$td_list.length) $td_list = element.find('table tbody tr:first-child td');
+                    $td_list.each(function (i) {
+                        var w = this.offsetWidth;
+                        $thead.find('th')[i].style.width = `${w}px`;
+                    });
+
+                    var scroll = $(this).scrollTop();
+                    if (scroll >= min && scroll <= max) {
+                        $thead.addClass('fix animated fadeInDown');
+                        $tbody.addClass('fix');
+                    } else {
+                        $thead.removeClass('fix animated fadeInDown');
+                        $tbody.removeClass('fix');
+                    }
+                });
+            }
+        }
+    })
+    .directive('scheduleSlider', function ($compile) {
+        return {
+            restrict: 'E',
+            template: '<div class="schedule-slick"></div>',
+
+            link: function (scope, element) {
+                var $slick = element.find('.schedule-slick');
+
+                scope.$watch('groups', function (value) {
+                    try {
+                        $slick.slick('unslick');
+                    } catch (e) {
+
+                    }
+
+                    if (value) {
+                        var days = week(value);
+                        scope.days = days;
+
+                        $slick.html(
+                            days.map(function (day, i) {
+                                return `<schedule-slide day="days[${i}]"></schedule-slide>`
+                            }).join('')
+                        ).show();
+                        $compile($slick.contents())(scope);
+
+                        $slick.slick({
+                            mobileFirst: true,
+                            infinite: false,
+                            dots: false,
+                            arrows: false,
+                            touchThreshold: 20,
+                            speed: 250,
+                            slidesToShow: 1,
+                            centerMode: false
+                        });
+
+                        var now = new Date();
+                        var currentWeekIndex = now.getDay() - 1;
+                        $slick.slick('slickGoTo', currentWeekIndex);
+                    }
+                });
+            }
+        }
+    })
+    .directive('scheduleSlide', function () {
+        return {
+            restrict: 'E',
+            templateUrl: "/views/schedule/slide.html",
+            scope: {
+                day: '='
+            }
+        }
+    })
+    .directive('scheduleRecord', function () {
+        return {
+            restrict: 'E',
+            templateUrl: "/views/schedule/record.html",
+            scope: {
+                record: '=',
+                i: '='
+            }
+        }
+    });
+
+function week(schedule) {
+    var now = new Date();
+    var dates = getDates(now);
+
+    return ['Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота']
+        .map(function (day, i) {
+            return {
+                current: i === now.getDay() - 1,
+                day: day,
+                date: dates[i],
+                groups: schedule.map(function (group) {
+                    return {
+                        name: group.name,
+                        time: group.time,
+                        content: group.days[i]
+                    }
+                })
+            }
+        });
+}

client/pages/gallery.js

@@ -0,0 +1,114 @@
+module.exports = function (app) {
+    app.directive("gFotorama", function () {
+        return {
+            restrict: "A",
+            link: function (scope, element, attrs) {
+                element.addClass('fotorama');
+                var $fotorama = $(element.fotorama());
+                var fotorama = $fotorama.data('fotorama');
+                fotorama.setOptions({
+                    width: "100%",
+                    maxheight: 500,
+                    loop: true,
+                    nav: "thumbs"
+                });
+
+                //$fotorama.on('fotorama:show', function (e, fotorama, extra) {
+                $fotorama.on('fotorama:error', function (e, fotorama, extra) {
+                    console.log('## ' + e.type);
+                    console.log('active frame', fotorama.activeFrame);
+                    console.log('additional data', extra);
+                });
+
+                scope.$watch(attrs.gFotorama, function (value) {
+                    console.log(value);
+                    fotorama.load(value);
+                });
+            }
+        }
+    });
+
+    app.controller("GalleryPageController", function ($scope, api) {
+            $scope.years = [];
+            var years = [2015, 2014, 2013, 2012, 2011, 2010];
+            years.forEach(function (year, year_index) {
+                api.gallery.year(year)
+                    .success(function (albums) {
+                        if (albums.length) {
+                            $scope.years[year_index] = {
+                                year: year,
+                                albums: albums.map(function (album) {
+                                    var preview = album.content[0];
+                                    album.preview_url = preview.content.medium.url;
+                                    //album.fotorama = album.content.map(productToFotorama);
+
+                                    return album;
+                                })
+                            };
+                        }
+                    })
+            });
+        }
+    );
+
+    app.controller("AlbumPageController", function ($scope, $rootScope, $http, $routeParams, team, api, menu) {
+        menu.activate('/gallery');
+
+        var year_uri = $routeParams.year;
+        var course_uri = $routeParams.course;
+        var album_uri = $routeParams.album;
+        api.gallery.album(
+            year_uri,
+            course_uri,
+            album_uri
+        )
+            .success(function (album) {
+                //var preview = album.content[0];
+                //album.preview_url = preview.content.medium.url;
+                //album.fotorama = album.content.map(productToFotorama);
+
+                album.teacherName = team.name(album['teacher']);
+
+                $scope.album = album;
+                $scope.crumbs = [
+                    {
+                        url: '/gallery',
+                        name: 'Галерея'
+                    },
+                    {
+                        //url: '/gallery/{year}'.replace('{year}', year_uri),
+                        name: year_uri
+                    },
+                    {
+                        //url: '/gallery/{year}/{course}'
+                        //    .replace('{year}', year_uri)
+                        //    .replace('{course}', course_uri),
+                        name: album.course
+                    },
+                    {
+                        name: album.title
+                    }
+                ];
+                $rootScope.title = album.title;
+            });
+    });
+};
+
+function productToFotorama(product) {
+    //var tpl =  '<div class="album-item"><div><p>' + product.author + '</p><p>' + product.authorAge  + ' лет</p></div></div>';
+
+    var $e = $('<div class="album-item"><div></div></div>');
+    var $c = $e.find('.album-item div');
+    $('<p></p>').text(product.author).appendTo($c);
+    if (product['authorAge']) {
+        $('<p></p>').text(product['authorAge'] + ' лет').appendTo($c);
+    }
+
+    return {
+        img: product.content["big"].url,
+        thumb: product.content["small"].url,
+        full: product.content["original"].url,
+        //html: $.parseHTML(tpl)[0]
+        html: $e
+    };
+}

client/pages/home.js

@@ -3,10 +3,36 @@
  */
 
 module.exports = function (app) {
-    app.controller("HomePageController", function ($scope, config) {
-        $scope.pageClass = "page-home";
-        $scope.telephone = config.telephone;
+    app.controller('HomePageController', function ($scope, config) {
+        var fotorama;
 
-        $(".fotorama").fotorama();
+        $scope.pageClass = 'page-home';
+
+        var $tape = $('.tape-block');
+        var $fotorama = $tape.find('.tape-block__content');
+
+        $tape.addClass('simplified');
+        $fotorama.on('fotorama:ready', function () {
+            $tape.removeClass('simplified');
+            fotorama.setOptions({
+                nav: 'dots',
+                transition: 'crossfade',
+                autoplay: '6000',
+                arrows: 'false',
+                width: '100%',
+                fit: 'cover',
+                loop: 'true'
+            });
+        });
+
+        fotorama = $fotorama.fotorama().data('fotorama');
+
+        setTimeout(function(){
+            fotorama.load([
+                {img: 'https://static.shburg.org/art/img/cat1.jpg'},
+                {img: 'https://static.shburg.org/art/img/cat2.jpg'},
+                {img: 'https://static.shburg.org/art/img/cat3.jpg'}
+            ]);
+        }, 100);
     });
 };

client/pages/schedule.js

@@ -1,78 +1,81 @@
-var populate = require("../../utils/populate").populate;
-const course = require("../../models/course");
+var populate = require('../../utils/populate').populate;
+const course = require('../../models/course');
+
+function indexEquals(i) {
+    return function (_, index) {
+        return i === index;
+    }
+}
+
+function isRequested(period, semester) {
+    return function (schedule) {
+        return schedule.period === period && schedule.semester === semester;
+    }
+}
 
 module.exports = function (app) {
-    app.controller("ScheduleController", function ($scope, schedule, team) {
-        var now = new Date();
-        var dates = getDates(now);
+    app.controller('ScheduleController', function ($scope, $http, $location, $routeParams, scheduleData, team, menu) {
+        menu.activate('/schedule');
 
-        var sem = "late";
-        $scope.sem = [["early", "весеннего"], ["late", "осеннего"]].reduce(function (s, word) {
-            if (word[0] === sem) return word[1];
+        var current_period = $routeParams.period;
+        var current_semester = $routeParams.semester;
+        var isScheduleRequested = current_period && current_semester;
+
+        $http.get("/schedules", {cache: true})
+            .success(function (schedules) {
+                // By url params or last element
+                var select_fn = isScheduleRequested ? isRequested(current_period, current_semester) : indexEquals(schedules.length - 1);
+
+                schedules = schedules.map(function (schedule) {
+                    var sem = [['spring', 'Весена'], ['autumn', 'Осень']].reduce(function (s, word) {
+                        if (word[0] === schedule.semester) return word[1];
+                        else return s[1];
                     });
-        $scope.year = 2014;
+                    schedule.text = `${sem} ${schedule.period} года`;
 
-        $scope.schedule = schedule($scope.year, sem, [
-            populate(team.short, "teacher"),
-            populate(course.name, "lesson")
+                    return schedule;
+                });
+
+                schedules.forEach(function (schedule, i) {
+                    if (select_fn(schedule, i)) {
+                        $scope.currentSchedule = schedules[i];
+                    }
+                });
+
+                $scope.schedules = schedules;
+                $scope.loadSchedule($scope.currentSchedule, isScheduleRequested);
+            });
+
+        $scope.loadSchedule = function (s, updateURL) {
+            var id = s._id;
+            var schedule_item = getScheduleByID(id);
+
+            if (schedule_item) {
+                var sem = schedule_item.semester;
+                var period = schedule_item.period;
+
+                var url = `/schedule/${period}/${sem}`;
+                $http.get(url, {cache: true})
+                    .success(function (scheduleRecord) {
+                        $scope.groups = scheduleData.populate(scheduleRecord.schedule, [
+                            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");
+                        if (updateURL) {
+                            $location.url(url);
                         }
                     });
-    });
+            }
         };
 
-/**
- * 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;
+        function getScheduleByID(id) {
+            var schedules = $scope.schedules;
+            for (var i = 0, l = schedules.length; i < l; i++) {
+                var s = schedules[i];
+                if (id === s._id) return s;
             }
-    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(start) {
-    var day = start.getDay();
-    return range(0, 6, 1).reduce(function (dates, weekDay) {
-        var d = 1 + weekDay - day;
-        var time = start.getTime() + (1000 * 60 * 60 * 24) * d;
-        var date = new Date(time);
-        dates.push(date.getDate());
-        return dates;
-    }, []);
+            return null;
         }
+    });
+};

client/pages/team.js

@@ -1,9 +1,11 @@
-var populate = require("../../utils/populate").populate;
-const course = require("../../models/course");
+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) {
+    app.controller('TeamPageController', function ($scope, team) {
+        $scope.pageClass = 'page-team';
+
+        $scope.teamMembers = team.team.map(function (person) {
             person.names = team.splitName(person.name);
             return person;
         });

client/services/io.js

@@ -0,0 +1,15 @@
+/**
+ * Created by tmshv on 15/03/15.
+ */
+
+module.exports = function (app) {
+    var socket;
+    function init(){
+        socket = io();
+    }
+
+    app.service("io", function () {
+        if (!socket) init();
+        return socket;
+    }); 
+};

client/ui/breadcrumbs.js

@@ -0,0 +1,11 @@
+module.exports = function(app) {
+    app.directive('breadcrumbs', function () {
+        return {
+            restrict: 'E',
+            templateUrl: '/views/breadcrumbs.html',
+            scope: {
+                crumbs: '='
+            }
+        };
+    });
+};

client/ui/doc-controller.js

@@ -1,52 +0,0 @@
-/**
- * Created by tmshv on 24/11/14.
- */
-
-module.exports = function (app) {
-    app.controller("DocumentController", function ($scope, $location, docs) {
-        $scope.showControls = false;
-
-        var doc_uri = $location.$$path.replace("/document/", "");
-        $scope.document = docs.doc(doc_uri);
-        $scope.document.currentPage = 0;
-
-        $scope.viewDocument = function () {
-            switch ($scope.document.viewer) {
-                case "img-sheet":
-                    $scope.showControls = false;
-                    return "/views/document-image.html";
-
-                default:
-                    $scope.showControls = true;
-                    return "/views/document-paper.html";
-            }
-        };
-
-        $scope.totalPages = $scope.document.url.length;
-        $scope.currentPage = 1;
-
-        $scope.prevPage = function () {
-            var i = $scope.currentPage - 1;
-            if (i > 0) {
-                $scope.currentPage = i;
-                $scope.document.currentPage = i - 1;
-            }
-        };
-
-        $scope.nextPage = function () {
-            var i = $scope.currentPage + 1;
-            if (i <= $scope.totalPages) {
-                $scope.currentPage = i;
-                $scope.document.currentPage = i - 1;
-            }
-        };
-
-        $scope.update = function () {
-            var i = $scope.currentPage;
-            if (i > 0 && i <= $scope.totalPages) {
-                $scope.currentPage = i;
-                $scope.document.currentPage = i - 1;
-            }
-        };
-    });
-};

client/ui/menu.js

@@ -2,30 +2,33 @@
  * 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);
+    app.factory("menu", function ($route, $rootScope) {
+        function Menu() {
+            this.items = require("../../models/menu.json");
+            this.current = null;
+        }
+
+        Menu.prototype.activate = function (path) {
+            var f = this.items.filter(function (i) {
+                return i.url === path;
+            });
+
+            if(f.length) {
+                this.current = f[0];
             }
-            return false;
         };
 
+        var menu = new Menu();
+        $rootScope.$on('$routeChangeSuccess', function (event, current) {
+            try{
+                var path = current['$$route'].originalPath;
+                menu.activate(path);
+            }catch(e){
+
+            }
+        });
+
         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);
-        };
-    });
 };

client/ui/pdf.js

@@ -1,148 +0,0 @@
-/**
- * Created by tmshv on 24/11/14.
- */
-
-module.exports = function (app) {
-    app.directive("pdf", function () {
-        return {
-            scope: {
-                document: "="
-            },
-            templateUrl: "/views/pdf.html",
-            link: function (scope, element, attrs) {
-
-            },
-
-            controller: function ($scope) {
-                var doc = $scope.document;
-                if (doc.extra && doc.extra.style) {
-                    angular.element("head").append('<link href="' + doc.extra.style + '" rel="stylesheet">');
-                }
-
-                $scope.$watch(
-                    function () {
-                        return $scope.document.currentPage;
-                    },
-                    function (value) {
-                        value = parseInt(value);
-                        try{
-                            $scope.pageURL = $scope.document.url[value];
-                        }catch (error){
-                            $scope.pageURL = "";
-                        }
-                    }
-                );
-
-                //const PAGES = [];
-                //var currentPageIndex = 0;
-                //var doc = new Document(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)
-                //            );
-                //        });
-                //    }
-                //}
-            }
-        };
-    });
-};

client/ui/timeline.js

@@ -18,8 +18,32 @@ function personByInstagram(list, instagram){
     }
 }
 
+function postText(post){
+    try{
+        return post.data.caption.text.replace(/#[\w_]+/, "")
+    }catch(error){
+        return "";
+    }
+}
+
 module.exports = function(app) {
     app.directive("timeline", function (team) {
+        function toInstagram(post){
+            var author_id = personByInstagram(team.team, post.data.author);
+            var name = author_id ? team.short(author_id) : post.data.author;
+
+            return {
+                date: post.date,
+                image: post.data.image.standard_resolution.url,
+                url: post.data.url,
+                username: name,
+                userpic: 'https://igcdn-photos-a-a.akamaihd.net/hphotos-ak-xaf1/t51.2885-19/11357496_464997000344800_2124591831_a.jpg',
+                text: post.body,
+                //text: postText(post),
+                type: post.type
+            };
+        }
+
         return {
             templateUrl: "/views/timeline.html",
             scope: {
@@ -30,23 +54,94 @@ module.exports = function(app) {
                     return index % 2 === 1;
                 }
             },
-            controller: function($scope, api){
-                api.feed.post()
-                    .success(function (list) {
-                        $scope.feed = list.map(function (post) {
-                            var author_id = personByInstagram(team.team, post.data.user.username);
-                            var name = author_id ? team.short(author_id) : post.data.user.username;
-                            return {
-                                date: post.publishDate,
-                                image: post.data.images.standard_resolution.url,
-                                url: post.data.link,
-                                username: name,
-                                userpic: post.data.user.profile_picture,
-                                text: post.data.caption.text.replace(/#[\w_]+/, "")
+            controller: function($scope, $timeout, usSpinnerService, io, api){
+                var portion = 0;
+                var count = 10;
+                $scope.feed = [];
+
+                $scope.timelineUpdating = false;
+                usSpinnerService.stop("timelineMore");
+                //usSpinnerService.spin("timelineMore");
+
+                $scope.recordClass = function (i) {
+                    return i['type'];
                 };
+
+                $scope.showFooter = function () {
+                    var canLoadMore = true;
+                    return $scope.feed && $scope.feed.length && canLoadMore;
+                };
+
+                $scope.loadNext = function () {
+                    $scope.timelineUpdating = true;
+                    usSpinnerService.spin("timelineMore");
+
+                    api.news.feed(count, portion)
+                        .error(function(error) {
+                            console.log(error);
+                        })
+                        .success(function (list) {
+                            $scope.timelineUpdating = false;
+                            usSpinnerService.stop("timelineMore");
+
+                            var feed = list.map(function (post) {
+                                if(post.type == "instagram") return toInstagram(post);
+                                else return post;
+                            });
+
+                            portion++;
+                            $scope.feed = $scope.feed.concat(feed);
+                        });
+                };
+
+                $scope.loadNext();
+
+                io.on("post", function (params) {
+                    var posts = params instanceof Array ? params : [params];
+
+                    var feed = posts.map(function (post) {
+                        if(post.type == "instagram") return toInstagram(post);
+                        else return post;
+                    });
+
+                    $scope.$apply(function () {
+                        $scope.feed = feed.concat($scope.feed);
                     });
                 });
             }
         };
     });
+
+    app.directive("timelineRecord", function ($compile, $http, $sce, team) {
+        var templates = {
+            "post": ["/views/timeline-post.html", linkPost],
+            "instagram": ["/views/timeline-gram.html", linkGram]
+        };
+
+        function linkPost(scope, element, attrs) {
+            scope.message = $sce.trustAsHtml(scope.post.body);
+        }
+
+        function linkGram(scope, element, attrs) {
+        }
+
+        return {
+            restrict: "E",
+            scope: {
+                post:"=content"
+            },
+            link: function(scope, element, attrs){
+                var type = scope.post.type;
+                if(type in templates) {
+                    $http.get(templates[type][0])
+                        .success(function (tpl) {
+                            element.html(tpl).show();
+                            $compile(element.contents())(scope);
+                            templates[type][1](scope, element, attrs);
+                        });
+                }
+
+            }
+        };
+    });
 };

config.js

@@ -1,3 +1,5 @@
+var fs = require("fs");
+var path = require("path");
 const MENU = require("./models/menu.json");
 
 const team = require("./models/team");
@@ -5,7 +7,13 @@ const course = require("./models/course");
 const document = require("./models/document");
 const schedule = require("./models/schedule");
 
-module.exports = {
+var privateFile = process.env["PRIVATE"] || "private.json";
+var privateData = JSON.parse(fs.readFileSync(privateFile, "utf-8"));
+
+var index_file = process.env["INDEX"] || "templates/main.html";
+
+var config = {
+    defaultIndex: path.join(__dirname, index_file),
     port: process.env["PORT"] || 3000,
     pub: "./",
     data: {
@@ -19,12 +27,25 @@ module.exports = {
         uri: "mongodb://localhost:27017/hudozka"
     },
 
-	instagram:{
-		client_id: "f17901a26a5e4a5ca4544dd0eebe2a15",
-		client_secret: "ecce08509871427ab9f8f383318315fc",
-		redirect_uri: "http://72.tmshv.ru:1337/auth/instagram/callback"
+    prerender: {
+        prerender: "http://service.prerender.io/",
+        prerenderToken: "",
+        protocol: "http",
+        host: "art.shlisselburg.org"
     },
 
+    instagram: {
+        default_user: "hudozka",
+        tag_callback: "http://art.shlisselburg.org/instagram/callback/11",
+        client_id: "",
+        client_secret: "",
+        redirect_uri: "http://art.shlisselburg.org/instagram/auth/callback",
         tags: ["shlb_hudozka"]
+    }
 };
 
+module.exports = Object.keys(privateData)
+    .reduce(function (config, key) {
+        config[key] = privateData[key];
+        return config;
+    }, config);

core/db.js

@@ -2,17 +2,41 @@
  * Created by tmshv on 22/11/14.
  */
 
-var mongoose = require("mongoose");
-var Promise = require("promise");
+var mongo = require("promised-mongo");
+var ObjectId = mongo.ObjectId;
+
+var client = null;
 
 module.exports = {
-    init: function (options) {
-        return new Promise(function (resolve, reject) {
-            mongoose.connect(options.uri, function (error) {
-                if (error) return reject(error);
+    init: function (uri) {
+        //noinspection JSUnresolvedFunction
+        return new Promise(function (resolve) {
+            client = mongo(uri);
             resolve();
         });
-        });
+    },
 
+    get db() {
+        return client;
+    },
+
+    c: function(name){
+        return client.collection(name);
+    },
+
+    id: function(i) {
+        if(typeof i === "string"){
+            return ObjectId(i);
+        }
+
+        else if(i instanceof ObjectId) {
+            return i;
+        }
+
+        else if(i instanceof Object) {
+            return "_id" in i ? ObjectId(i._id) : null;
+        }
+
+        return null;
     }
 };

core/instagram.js

@@ -1,46 +0,0 @@
-/**
- * Created by tmshv on 22/11/14.
- */
-
-var config = require("../config");
-var Promise = require("promise");
-
-var auth_clients = {};
-
-module.exports = {
-    client: function(param){
-        if(param in auth_clients) {
-            return auth_clients[param];
-        }else{
-            return createClient();
-        }
-    },
-
-    authorize: function(code){
-        return new Promise(function(resolve, reject){
-            var api = createClient();
-            api.authorize_user(code, config.instagram.redirect_uri, function (err, result) {
-                if (err) return reject(err);
-                else {
-                    var token = result.access_token;
-                    var c = createClient(token);
-                    auth_clients[code] = c;
-                    resolve(c);
-                }
-            });
-        });
-    }
-};
-
-function createClient(token) {
-    var api = require('instagram-node').instagram();
-    if (token) {
-        api.use({access_token: token});
-    } else {
-        api.use({
-            client_id: config.instagram.client_id,
-            client_secret: config.instagram.client_secret
-        });
-    }
-    return api;
-}

deploy.sh

@@ -1,16 +1,33 @@
 #!/bin/sh
 
-tar cf ~/www-build.tar \
+echo "Deploying art.shburg.org"
+
+NODE_ENV=production gulp
+
+server="art.shburg.org"
+app_port=1800
+tarfile="build.tar.gz"
+tarpath=$TMPDIR$tarfile
+destpath="~/www/art.shburg.org"
+
+echo "Packing..."
+env GZIP=-9 tar -czf $tarpath \
+    --disable-copyfile \
     --exclude=node_modules \
-    --exclude=bower_components \
     --exclude=.git \
     --exclude=.idea \
+    --exclude=.DS_Store \
     --exclude=deploy.sh \
     --exclude=install.sh .
 
-ssh shburg.et "rm -rf art/*"
-scp ~/www-build.tar shburg@37.139.6.120:~
-scp install.sh shburg@37.139.6.120:~
-ssh shburg.et "./install.sh && rm ./install.sh"
-rm ~/www-build.tar
-echo "art.shburg.org deployment completed successfully"
+echo "Build file: $tarpath"
+
+ssh hoster.et "rm -rf $destpath/*"
+scp $tarpath hoster@$server:$destpath
+echo "Build file successfully uploaded on server"
+
+echo "Installing..."
+ssh hoster.et "bash -s" -- < ./install.sh $destpath $tarfile $app_port
+
+rm $tarpath
+echo "Done"

gulpfile.js

@@ -1,45 +1,75 @@
-var path = require("path");
-var gulp = require("gulp");
-var sass = require("gulp-sass");
-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 gulp = require('gulp');
+var _if = require('gulp-if');
+var postcss = require('gulp-postcss');
+var sass = require('gulp-sass');
+var imageMin = require('gulp-imagemin');
+var uglify = require('gulp-uglify');
+var minify = require('gulp-minify');
+var concat = require('gulp-concat');
+var browserify = require('gulp-browserify');
 
-gulp.task("sass", function () {
-    gulp.src("./assets/style/*.scss")
-        .pipe(sass())
-		.pipe(concat("style.css"))
-		.pipe(autoprefixer())
-        //.pipe(minifyCSS({processImport:false}))
+var is_production = process.env['NODE_ENV'] == 'production';
+
+gulp.task("concat-bower", function () {
+    var files = [
+        "public/bower_components/jquery/dist/jquery.min.js",
+        "public/bower_components/angular/angular.min.js",
+        "public/bower_components/angular-route/angular-route.min.js",
+        "public/bower_components/angular-animate/angular-animate.min.js",
+        "public/bower_components/angulartics/dist/angulartics.min.js",
+        "public/bower_components/angulartics/dist/angulartics-ga.min.js",
+        "public/bower_components/spin.js/spin.js",
+        "public/bower_components/angular-spinner/angular-spinner.min.js",
+        "public/bower_components/socket.io-client/socket.io.js"
+    ];
+    gulp.src(files)
+        .pipe(concat("libs.js"))
+        .pipe(uglify())
         .pipe(gulp.dest("public"));
 });
 
+gulp.task('styles', function () {
+    var processors = [
+        require('autoprefixer')({browsers: ['last 1 version']}),
+        require('cssnano')()
+    ];
+
+    gulp.src('./assets/style/*.scss')
+        .pipe(sass())
+        .pipe(postcss(processors))
+        .pipe(concat('style.css'))
+        .pipe(gulp.dest('./public'));
+});
+
 gulp.task("copy", function () {
     gulp.src("./assets/fonts/*")
         .pipe(gulp.dest("./public/fonts"));
 
-	gulp.src("./assets/style/*.css")
-		.pipe(gulp.dest("./public/s"));
-
     gulp.src("./assets/graphics/*")
         .pipe(gulp.dest("./public/graphics"));
+
+    gulp.src([
+            "./3rdparty/*",
+            "robots.txt"
+        ])
+        .pipe(gulp.dest("./public"));
 });
 
-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('compile', function () {
+    gulp.src([
+            'client/app.js',
+            'client/document.js',
+            'client/data.js',
+            'client/instagram.js'
+        ])
+        .pipe(browserify({
+            transform: [
+                require('browserify-ngannotate'),
+                require('babelify')
+            ]
+        }))
+        //.pipe(_if(is_production, minify()))
+        .pipe(gulp.dest('./public'));
 });
 
 gulp.task("imagemin", function () {
@@ -48,5 +78,5 @@ gulp.task("imagemin", function(){
         .pipe(gulp.dest("./public/img"));
 });
 
-gulp.task("default", ["sass", "compile"]);
-gulp.task("deploy", ["default", "copy", "imagemin"]);
+gulp.task('default', ['styles', 'compile']);
+gulp.task('deploy', ['default', 'copy', 'imagemin']);

instagram/index.js

@@ -0,0 +1,37 @@
+/**
+ * Created by tmshv on 12/03/15.
+ */
+
+var db = require("../core/db");
+var co = require("co");
+var instagram = require("./instagram");
+var config = require("../config");
+
+module.exports = function () {
+    return loadUsers()
+        .then(updateSubscription)
+};
+
+function loadUsers() {
+    return new Promise(function (resolve, reject) {
+        db.c("users").find({provider: "instagram"})
+            .toArray()
+            .then(function (users) {
+                users.forEach(function (u) {
+                    return instagram.initUser(u);
+                });
+                return users;
+            })
+            .then(resolve);
+    });
+}
+
+function updateSubscription() {
+    var tags = config.instagram["tags"];
+    return tags.map(function (tag) {
+        var cb = config.instagram["tag_callback"];
+        return co(function *() {
+            return yield instagram.api.subscribe(tag, cb);
+        })
+    });
+}

instagram/instagram.js

@@ -0,0 +1,172 @@
+/**
+ * Created by tmshv on 22/11/14.
+ */
+
+var EventEmitter = require("events").EventEmitter;
+var thunkify = require("thunkify");
+var config = require("../config");
+var db = require("../core/db");
+var instagram = require("instagram-node");
+
+function Instagram(options) {
+    this.client_id = options.client_id;
+    this.client_secret = options.client_secret;
+    this.redirect_uri = options.redirect_uri;
+    this.default_user = options.default_user;
+    this.clients = {};
+    this.users = {};
+
+    EventEmitter.call(this);
+}
+
+Instagram.prototype = Object.create(EventEmitter.prototype);
+
+Instagram.prototype.authorizationURL = function (scope, state) {
+    var params = {};
+    params.scope = scope || ["basic"];
+    if (state) {
+        params.state = state;
+    }
+
+    var client = createClient();
+    return client["get_authorization_url"](this.redirect_uri, params);
+};
+
+Instagram.prototype.addClient = function *(code, params) {
+    var token = params.access_token;
+    var item = params.user;
+    item.code = code;
+    item.access_token = token;
+    item.provider = "instagram";
+    yield db.c("users").update({provider: "instagram", id: params.user.id}, item, {upsert: true});
+
+    return this.initUser(item);
+};
+
+Instagram.prototype.initUser = function (user) {
+    var token = user.access_token;
+    this.clients[user.code] = createClient(token);
+    this.users[user.code] = user;
+    return this;
+};
+
+Instagram.prototype.getUsers = function () {
+    var users = this.users;
+    return Object.keys(users)
+        .map(function (code) {
+            return users[code];
+        });
+};
+
+Instagram.prototype.update = function (body) {
+    this.emit("update", body);
+};
+
+Instagram.prototype.client = function (code) {
+    if (code && code in this.clients) {
+        return this.clients[code];
+    } else {
+        return createClient();
+    }
+};
+
+Instagram.prototype.user = function (code) {
+    if (code && code in this.users) {
+        return this.users[code];
+    } else {
+        return null;
+    }
+};
+
+Instagram.prototype.authorize = function *(code) {
+    var api = createClient();
+    var authorize = thunkify(api["authorize_user"]);
+    var result = yield authorize(code, this.redirect_uri);
+
+    if (result) {
+        yield this.addClient(code, result);
+    }
+
+    return result;
+};
+
+Instagram.prototype.getUser = function *() {
+    if (this.default_user) {
+        var du = yield db.c("users").findOne({username: this.default_user});
+        if (du) {
+            return du;
+        }
+    }
+
+    return yield db.c("users").findOne({provider: "instagram"});
+};
+
+Instagram.prototype.getUsers = function *() {
+    return yield db.c("users").find({provider: "instagram"}).toArray();
+};
+
+Instagram.prototype.api = {
+    subscriptions: function *() {
+        var ig = createClient();
+        var subs = thunkify(ig["subscriptions"]);
+        try {
+            var s = yield subs();
+            return s[0];
+        } catch (error) {
+            return null;
+        }
+    },
+
+    subscribe: function *(tag, callbackURL) {
+        var ig = createClient();
+        var sub = thunkify(ig["add_tag_subscription"]);
+        try {
+            var s = yield sub(tag, callbackURL);
+            return s[0];
+        } catch (error) {
+            return null;
+        }
+    },
+
+    unsubscribe: function *(id) {
+        var ig = createClient();
+        var sub = thunkify(ig["del_subscription"]);
+        try {
+            var s = yield sub({id: id});
+            return s[0];
+        } catch (error) {
+            return null;
+        }
+    },
+
+    tagMediaRecent: function *(client, tag, count) {
+        var tag_media_recent = thunkify(client["tag_media_recent"]);
+
+        try{
+            var result = yield tag_media_recent(tag, {count: count});
+            return {
+                medias: result[0],
+                pagination: result[1],
+                remaining: result[2],
+                limit: result[3]
+            }
+        }catch(error){
+            return null;
+        }
+    }
+};
+
+module.exports = new Instagram(config.instagram);
+
+function createClient(token) {
+    var client = instagram.instagram({}, {});
+    if (token) {
+        client.use({access_token: token});
+    } else {
+        client.use({
+            client_id: config.instagram.client_id,
+            client_secret: config.instagram.client_secret
+        });
+    }
+    return client;
+}

instagram/io.js

@@ -0,0 +1,16 @@
+/**
+ * Created by tmshv on 14/03/15.
+ */
+
+var publisher = require("./publish");
+
+module.exports = function (app) {
+    app.io.use(function *(next) {
+        publisher.on("post", function (post) {
+            console.log("IO POST", post);
+            app.io.emit("post", post);
+        });
+
+        yield* next;
+    });
+};

instagram/publish.js

@@ -0,0 +1,97 @@
+/**
+ * Created by tmshv on 10/03/15.
+ */
+
+var co = require("co");
+var util = require("util");
+var EventEmitter = require("events").EventEmitter;
+var instagram = require("./instagram");
+var config = require("../config");
+var db = require("../core/db");
+
+function Publisher() {
+    EventEmitter.call(this);
+
+    var self = this;
+    instagram.on("update", function (data) {
+        var tag = config.instagram["tags"][0];
+
+        findInstagrams(tag)
+            .catch(function (error) {
+                console.log(error);
+            })
+            .then(function (posts) {
+                var ids = posts.map(function (gram) {
+                    return gram.data.id;
+                });
+
+                return uploadInstagrams(posts)
+                    .then(function () {
+                        return db.c("posts").find({"data.id": {$in: ids}}).toArray();
+                    });
+            })
+            .then(function (posts) {
+                self.emit("post", posts);
+            });
+    });
+}
+
+util.inherits(Publisher, EventEmitter);
+
+module.exports = new Publisher();
+
+function *fbt(client, tag) {
+    var param = yield instagram.api.tagMediaRecent(client, tag, 10);
+    return param.medias.map(toInstagram);
+}
+
+function toInstagram(gram) {
+    var post = {};
+
+    try {
+        post.body = gram.caption.text;
+    } catch (error) {
+        post.body = "";
+    }
+
+    post.type = "instagram";
+    post.tags = gram.tags;
+    post.date = new Date(parseInt(gram["created_time"]) * 1000);
+
+    post.data = {
+        id: gram.id,
+        author: gram.user["username"],
+        image: gram.images,
+        url: gram.link
+    };
+
+    return post;
+}
+
+function findInstagrams(tag){
+    return co(function *() {
+        var user = yield instagram.getUser();
+        if (user) {
+            var client = instagram.client(user.code);
+            var permitted_users = yield instagram.getUsers();
+            permitted_users = permitted_users.map(function (user) {
+                return user["username"];
+            });
+
+            var medias = yield fbt(client, tag);
+            //medias = medias.filter(function (gram) {
+            //    return permitted_users.indexOf(gram.data.author) > -1;
+            //});
+
+            return medias;
+        }
+    });
+}
+
+function uploadInstagrams(list){
+    return Promise.all(
+        list.map(function (g) {
+            return db.c("posts").update({"data.id": g.data.id}, g, {upsert: true});
+        })
+    );
+}

instagram/router.js

@@ -0,0 +1,162 @@
+/**
+ * Created by tmshv on 22/11/14.
+ */
+
+var path = require("path");
+var route = require("koa-route");
+var router = require("../routes");
+var instagram = require("../instagram/instagram");
+
+module.exports = function (app) {
+    app.use(function *(next) {
+        var code = this.cookies.get("instagram_code");
+        if (code) {
+            var client = instagram.client(code);
+            var user = instagram.user(code);
+            if (client && user) {
+                this.instagram = {
+                    client: client,
+                    user: user
+                }
+            }
+        }
+
+        yield* next;
+    });
+
+    app.use(
+        route.get("/instagram", function *() {
+            var invite = this.cookies.get("invite_code") || this.query.code;
+
+            if(!this.instagram) {
+                if(invite == undefined){
+                    this.body = "invite required";
+                    this.status = 401;
+                }else if(invite == "LOL"){
+                    this.cookies.set("invite_code", invite, {expires: expire()});
+
+                    //todo: invalidate invite
+
+                    yield router.index(
+                        path.join(__dirname, "../templates/instagram.html")
+                    );
+                }else{
+                    this.body = "invite ist correct";
+                    this.status = 401;
+                }
+            }else{
+                yield router.index(
+                    path.join(__dirname, "../templates/instagram.html")
+                );
+            }
+        })
+    );
+
+    app.use(
+        route.get("/instagram/auth", function *() {
+            var invite = this.cookies.get("invite_code");
+            if(invite) {
+                var url = instagram.authorizationURL(null, "/instagram");
+                this.redirect(url);
+            }else{
+                this.status = 401;
+                this.body = "invite required";
+            }
+        })
+    );
+
+    app.use(
+        route.get("/instagram/user", function *() {
+            var code = this.cookies.get("instagram_code");
+            var user = instagram.user(code);
+
+            if(user) {
+                this.body = user;
+            }else{
+                this.status = 404;
+            }
+        })
+    );
+
+    app.use(
+        route.get("/instagram/auth/callback", function *() {
+            var state = this.query.state || "/";
+            var code = this.query.code;
+            var client = yield instagram.authorize(code);
+
+            if (client) {
+                this.cookies.set("instagram_code", code, {expires: expire()});
+                this.redirect(state);
+            } else {
+                this.status = 401;
+                this.redirect(state);
+            }
+        })
+    );
+
+    app.use(route.get("/instagram/subscription/list", function *() {
+        var result = yield instagram.api.subscriptions();
+        if(result) {
+            this.body = result;
+        }else{
+            this.status = 500;
+        }
+    }));
+
+    app.use(route.get("/instagram/subscription/add", function *() {
+        var tag = this.query.tag;
+        var cu = this.query.url;
+
+        var result = yield instagram.api.subscribe(tag, cu);
+        if(result) {
+            this.body = result;
+        }else{
+            this.status = 500;
+        }
+    }));
+
+    app.use(route.get("/instagram/subscription/delete", function *() {
+        var id = this.query.id;
+
+        var result = yield instagram.api.unsubscribe(id);
+        if(result) {
+            this.body = result;
+        }else{
+            this.status = 500;
+        }
+    }));
+
+    app.use(route.get("/instagram/callback/:rnd", function *() {
+        if(this.query["hub.mode"] == "subscribe"){
+            this.body = this.query["hub.challenge"];
+        }else{
+            this.status = 400;
+        }
+    }));
+
+    app.use(route.post("/instagram/callback/:rnd", function *(rnd) {
+        var sign = this.header["x-hub-signature"];
+        //console.log(this.headers);
+
+        var body = this.request.body;
+
+        //var hmac = crypto.createHmac("sha1", instagram.client_secret);
+        //hmac.update(body);
+        //var shasum = hmac.digest("hex");
+
+
+        //console.log("X-Hub-Signature", sign);
+        //console.log("Hmac", shasum);
+        //console.log();
+
+        //if(shasum.digest("hex") == sign) {
+        instagram.update(body);
+        //}
+
+        this.body = "";
+    }));
+};
+
+function expire(time){
+    return time || new Date(Date.now() + 1000 * 60 * 60 * 24 * 7);
+}

install.sh

@@ -1,13 +1,19 @@
 #!/bin/sh
 
-cd ~/art
-tar xvf ../www-build.tar
-rm ../www-build.tar
-npm install --production
-node_modules/bower/bin/bower install
+dir_path="$1"
+build_file="$2"
+port="$3"
+
+cd $dir_path
+
+gunzip -c $build_file | tar xopf -
+
+#rm build.tar
+
+npm install --production --loglevel error
 
 export NODE_ENV=production
-export PORT=18010
+export PORT=$port
 
 #starting www
 if forever restart bin/www.js; then

letsencrypt.ini

@@ -0,0 +1,4 @@
+rsa-key-size = 4096
+email = roman@tmshv.ru
+domains = art.shlisselburg.org, art.shburg.org
+webroot-path = /home/hoster/www/art.shburg.org/public

main.js

@@ -1,18 +0,0 @@
-const CONTENT_PATH = "http://hudozhka.tmshv.ru/files/";
-const CONTENT_PATH = "/files/";
-
-var fs = require("fs");
-
-function gatherNotFoundCollection (dir) {
-	var list = fs.readdirSync(dir);
-	if(list){
-		list.forEach(function(i){
-			
-		});	
-	}
-	return [];
-}
-
-var config = require("./config").populate({
-	
-});

models/courses.json

@@ -11,6 +11,10 @@
 		"id": "sculpting",
 		"name": "Скульптура"
 	},
+	{
+		"id": "ceramic",
+		"name": "Керамика"
+	},
 	{
 		"id": "composition",
 		"name": "Композиция"

models/documents.json

@@ -2,85 +2,47 @@
 	{
 		"name": "statue-2013",
 		"title": "устав школы за 2013 год",
-		"path": "/document/statue-2013",
-		"preview": "http://static.shburg.org/art/graphics/statue-2013-preview.png",
-		"download": "http://static.shburg.org/art/docs/hudozhka_statue-2013.pdf",
-		"url": [
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-1.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-2.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-3.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-4.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-5.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-6.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-7.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-8.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-9.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-10.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-11.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-12.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-13.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-14.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-15.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-16.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-17.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-18.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-19.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-20.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-21.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-22.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-23.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-24.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-25.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-26.page",
-			"http://static.shburg.org/art/html/hudozhka_statue-2013-27.page"
-		],
-		"extra": {
-			"style": ["http://static.shburg.org/art/docs/preview/hudozhka_statue-2013.css"]
-		},
-		"viewer": "pdf"
+		"url": "https://static.shburg.org/art/docs/hudozhka_statue-2013.pdf",
+		"preview": "https://static.shburg.org/art/graphics/statue-2013-preview.png",
+		"files": ["https://static.shburg.org/art/docs/hudozhka_statue-2013.pdf"]
 	},
 	{
 		"name": "edu-license",
 		"title": "образовательная лицензия",
-		"path": "/document/edu-license",
-		"preview": "http://static.shburg.org/art/graphics/license_edu-preview.png",
-		"url": [
-			"http://static.shburg.org/art/docs/hudozhka_license_edu.jpg",
-			"http://static.shburg.org/art/docs/hudozhka_license_edu_back.jpg",
-			"http://static.shburg.org/art/docs/hudozhka_license_edu_attachment.jpg"
-		],
-		"viewer": "img-sheet"
+		"url": "/document/edu-license",
+		"preview": "https://static.shburg.org/art/graphics/license_edu-preview.png",
+		"files": [
+			"https://static.shburg.org/art/docs/hudozhka_license_edu.jpg",
+			"https://static.shburg.org/art/docs/hudozhka_license_edu_back.jpg",
+			"https://static.shburg.org/art/docs/hudozhka_license_edu_attachment.jpg"
+		]
 	},
 	{
 		"name": "gov-certificate",
 		"title": "свидетельство о государственной регистрации права",
-		"path": "/document/gov-certificate",
-		"preview": "http://static.shburg.org/art/graphics/certificate_gov-preview.png",
-		"url": ["http://static.shburg.org/art/docs/hudozhka_certificate_gov.jpg"],
-		"viewer": "img-sheet"
+		"url": "/document/gov-certificate",
+		"preview": "https://static.shburg.org/art/graphics/certificate_gov-preview.png",
+		"files": ["https://static.shburg.org/art/docs/hudozhka_certificate_gov.jpg"]
 	},
 	{
 		"name": "VAT",
 		"title": "ИНН",
-		"path": "/document/VAT",
-		"preview": "http://static.shburg.org/art/graphics/vatin-preview.png",
-		"url": ["http://static.shburg.org/art/docs/hudozhka_vatin.jpg"],
-		"viewer": "img-sheet"
+		"url": "/document/VAT",
+		"preview": "https://static.shburg.org/art/graphics/vatin-preview.png",
+		"files": ["https://static.shburg.org/art/docs/hudozhka_vatin.jpg"]
 	},
 	{
 		"name": "EGRYL1",
 		"title": "свидетельство о внесении в «ЕГРЮЛ»",
-		"path": "/document/EGRYL1",
-		"preview": "http://static.shburg.org/art/graphics/certificate_egryl1-preview.png",
-		"url": ["http://static.shburg.org/art/docs/hudozhka_certificate_egryl1.jpg"],
-		"viewer": "img-sheet"
+		"url": "/document/EGRYL1",
+		"preview": "https://static.shburg.org/art/graphics/certificate_egryl1-preview.png",
+		"files": ["https://static.shburg.org/art/docs/hudozhka_certificate_egryl1.jpg"]
 	},
 	{
 		"name": "EGRYL2",
 		"title": "свидетельство о внесении в «ЕГРЮЛ»",
-		"path": "/document/EGRYL2",
-		"preview": "http://static.shburg.org/art/graphics/certificate_egryl2-preview.png",
-		"url": ["http://static.shburg.org/art/docs/hudozhka_certificate_egryl2.jpg"],
-		"viewer": "img-sheet"
+		"url": "/document/EGRYL2",
+		"preview": "https://static.shburg.org/art/graphics/certificate_egryl2-preview.png",
+		"files": ["https://static.shburg.org/art/docs/hudozhka_certificate_egryl2.jpg"]
 	}
 ]

models/menu.json

@@ -1,10 +1,12 @@
-{
-	"menu": [
+[
   {
     "text": "Школа",
     "url": "/",
     "color": "blue"
   },
+  {
+    "text": "События"
+  },
   {
     "text": "Расписание",
     "url": "/schedule",
@@ -21,13 +23,12 @@
   },
   {
     "text": "Галерея",
-				"color": ""
+    "url": "/gallery",
+    "color": "red"
   },
   {
     "text": "Документы",
     "url": "/docs",
     "color": "yellow"
   }
-	],
-	"vkgroup": "https://vk.com/club10436104"
-}
+]

models/schedule-2014-early.json

@@ -1,402 +0,0 @@
-[
-	{
-		"name": "1",
-		"monday": {
-			"lesson": "composition",
-			"teacher": "as-timasheva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"tuesday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"saturday": {
-			"lesson": "sculpting",
-			"teacher": "in-vturina",
-			"time": [
-				"10:00 10:45",
-				"10:55 11:40"
-			]
-		}
-	},
-	{
-		"name": "2",
-		"tuesday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"friday": {
-			"lesson": "sculpting",
-			"teacher": "in-vturina",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"saturday": {
-			"lesson": "composition",
-			"teacher": "as-timasheva",
-			"time": [
-				"12:00 12:45",
-				"12:55 13:40"
-			]
-		}
-	},
-	{
-		"name": "3",
-		"thursday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"friday": {
-			"lesson": "sculpting",
-			"teacher": "in-vturina",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"saturday": {
-			"lesson": "composition",
-			"teacher": "as-timasheva",
-			"time": [
-				"10:00 10:45",
-				"10:55 11:40"
-			]
-		}
-	},
-	{
-		"name": "4",
-		"monday": {
-			"lesson": "composition",
-			"teacher": "vv-voronova",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"thursday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		}
-	},
-	{
-		"name": "5",
-		"monday": {
-			"lesson": "composition",
-			"teacher": "vv-voronova",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"thursday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		}
-	},
-	{
-		"name": "6",
-		"wednesday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"thursday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"friday": {
-			"lesson": "composition",
-			"teacher": "vv-voronova",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		}
-	},
-	{
-		"name": "7",
-		"wednesday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"17:00 17:45"
-			]
-		},
-		"thursday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"friday": {
-			"lesson": "drawing",
-			"teacher": "sa-latipova",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"saturday": {
-			"lesson": "cg",
-			"teacher": "rk-timashev",
-			"time": [
-				"10:00 10:45",
-				"10:55 11:40"
-			]
-		}
-	},
-	{
-		"name": "8",
-		"wednesday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"17:00 17:45"
-			]
-		},
-		"thursday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"friday": {
-			"lesson": "drawing",
-			"teacher": "sa-latipova",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"saturday": {
-			"lesson": "cg",
-			"teacher": "rk-timashev",
-			"time": [
-				"12:00 12:45",
-				"12:55 13:40"
-			]
-		}
-	},
-	{
-		"name": "9",
-		"monday": {
-			"lesson": "drawing",
-			"teacher": "sa-latipova",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"tuesday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"18:00 18:45"
-			]
-		},
-		"friday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		}
-	},
-	{
-		"name": "10",
-		"monday": {
-			"lesson": "drawing",
-			"teacher": "sa-latipova",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"tuesday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"18:00 18:45"
-			]
-		},
-		"friday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		}
-	},
-	{
-		"name": "11",
-		"monday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "drawing",
-			"teacher": "mg-timasheva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"thursday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"17:00 17:45"
-			]
-		},
-		"friday": {
-			"lesson": "composition",
-			"teacher": "od-gogoleva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		}
-	},
-	{
-		"name": "12",
-		"monday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "drawing",
-			"teacher": "mg-timasheva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"thursday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"17:00 17:45"
-			]
-		},
-		"friday": {
-			"lesson": "composition",
-			"teacher": "od-gogoleva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		}
-	},
-	{
-		"name": "13",
-		"tuesday": {
-			"lesson": "drawing",
-			"teacher": "mg-timasheva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"thursday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"18:00 18:45"
-			]
-		},
-		"friday": {
-			"lesson": "composition",
-			"teacher": "vv-voronova",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		}
-	}
-]

models/schedule-2014-late.json

@@ -1,438 +0,0 @@
-[
-	{
-		"name": "1-1",
-		"tuesday": {
-			"lesson": "composition",
-			"teacher": "vv-voronova",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"thursday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"saturday": {
-			"lesson": "sculpting",
-			"teacher": "in-vturina",
-			"time": [
-				"11:00 11:45",
-				"11:55 12:40"
-			]
-		}
-	},
-	{
-		"name": "1-2",
-		"tuesday": {
-			"lesson": "composition",
-			"teacher": "vv-voronova",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"thursday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"saturday": {
-			"lesson": "sculpting",
-			"teacher": "in-vturina",
-			"time": [
-				"13:00 13:45",
-				"13:55 14:40"
-			]
-		}
-	},
-	{
-		"name": "1-3",
-		"monday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"friday": {
-			"lesson": "composition",
-			"teacher": "vv-voronova",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"saturday": {
-			"lesson": "sculpting",
-			"teacher": "in-vturina",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		}
-	},
-	{
-		"name": "2-1",
-		"monday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"saturday": {
-			"lesson": "composition",
-			"teacher": "as-timasheva",
-			"time": [
-				"11:00 11:45",
-				"11:55 12:40"
-			]
-		}
-	},
-	{
-		"name": "2-2",
-		"monday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"saturday": {
-			"lesson": "composition",
-			"teacher": "as-timasheva",
-			"time": [
-				"13:00 13:45",
-				"13:55 14:40"
-			]
-		}
-	},
-	{
-		"name": "2-3",
-		"monday": {
-			"lesson": "painting",
-			"teacher": "od-gogoleva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"thursday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"friday": {
-			"lesson": "composition",
-			"teacher": "as-timasheva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		}
-	},
-	{
-		"name": "3-1",
-		"monday": {
-			"lesson": "drawing",
-			"teacher": "sa-latipova",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"tuesday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"17:00 17:45",
-				""
-			]
-		},
-		"thursday": {
-			"lesson": "painting",
-			"teacher": "sa-latipova",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"saturday": {
-			"lesson": "cg",
-			"teacher": "rk-timashev",
-			"time": [
-				"13:00 13:45",
-				"13:55 14:40"
-			]
-		}
-	},
-	{
-		"name": "3-2",
-		"monday": {
-			"lesson": "drawing",
-			"teacher": "sa-latipova",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"tuesday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"17:00 17:45",
-				""
-			]
-		},
-		"thursday": {
-			"lesson": "painting",
-			"teacher": "sa-latipova",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"saturday": {
-			"lesson": "cg",
-			"teacher": "rk-timashev",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		}
-	},
-	{
-		"name": "3-3",
-		"wednesday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"17:00 17:45",
-				""
-			]
-		},
-		"thursday": {
-			"lesson": "composition",
-			"teacher": "nv-andreeva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"friday": {
-			"lesson": "painting",
-			"teacher": "as-timasheva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"saturday": {
-			"lesson": "drawing",
-			"teacher": "as-timasheva",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		}
-	},
-	{
-		"name": "4-1",
-		"monday": {
-			"lesson": "composition",
-			"teacher": "vv-voronova",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"tuesday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"18:00 18:45",
-				""
-			]
-		},
-		"friday": {
-			"lesson": "drawing",
-			"teacher": "sa-latipova",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		}
-	},
-	{
-		"name": "4-2",
-		"monday": {
-			"lesson": "composition",
-			"teacher": "vv-voronova",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"tuesday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"wednesday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"18:00 18:45",
-				""
-			]
-		},
-		"friday": {
-			"lesson": "drawing",
-			"teacher": "sa-latipova",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		}
-	},
-	{
-		"name": "5-1",
-		"monday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"15:00 15:45",
-				"15:55 16:40"
-			]
-		},
-		"thursday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"17:00 17:45",
-				""
-			]
-		}
-	},
-	{
-		"name": "5-2",
-		"monday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"tuesday": {
-			"lesson": "drawing",
-			"teacher": "mg-timasheva",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"thursday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"17:00 17:45",
-				""
-			]
-		}
-	},
-	{
-		"name": "6-1",
-		"wednesday": {
-			"lesson": "painting",
-			"teacher": "va-sarzhin",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		},
-		"thursday": {
-			"lesson": "drawing",
-			"teacher": "mg-timasheva",
-			"time": [
-				"16:00 17:45",
-				""
-			]
-		},
-		"friday": {
-			"lesson": "composition",
-			"teacher": "vv-voronova",
-			"time": [
-				"17:00 17:45",
-				"17:55 18:40"
-			]
-		}
-	},
-	{
-		"thursday": {
-			"lesson": "history",
-			"teacher": "my-valkova",
-			"time": [
-				"18:00 18:45",
-				""
-			]
-		}
-	}
-]

models/schedule.js

@@ -1,21 +1,9 @@
 var pop = require("../utils/populate").pop;
 
 const WEEK = ["monday", "tuesday", "wednesday", "thursday", "friday", "saturday"];
-const SCHEDULES = {
-	"2014-early": require("./schedule-2014-early.json"),
-	"2014-late": require("./schedule-2014-late.json")
-};
 
-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);
+module.exports = {
+    populate: populateSchedule
 };
 
 function populateSchedule(s, pops) {

models/team.json

@@ -6,7 +6,7 @@
 		"edu": "Ленинградский инженерно-строительный институт",
 		"diploma": "НВ №222567",
 		"status": "",
-		"picture": "http://static.shburg.org/art/team/teacher5.jpg",
+		"picture": "https://static.shburg.org/art/team/teacher5.jpg",
 	  	"anchor": "director"
 	},
 	{
@@ -16,7 +16,7 @@
 		"edu": "Академия художеств имени И. Е. Репина",
 		"diploma": "B-I №259798",
 		"status": "Первая квалификационная категория по живописи и станковой композиции",
-		"picture": "http://static.shburg.org/art/team/teacher10.jpg"
+		"picture": "https://static.shburg.org/art/team/teacher10.jpg"
 	},
 	{
 		"id": "od-gogoleva",
@@ -25,7 +25,7 @@
 		"edu": "Ленинградский инженерно-строительный институт",
 		"diploma": "B-I №222572",
 		"status": "Высшая квалификационная категория по живописи и станковой композиции",
-		"picture": "http://static.shburg.org/art/team/teacher11.jpg"
+		"picture": "https://static.shburg.org/art/team/teacher11.jpg"
 	},
 	{
 		"id": "nv-andreeva",
@@ -34,7 +34,7 @@
 		"edu": "Санкт-Петербургский государственный университет технологии и дизайна",
 		"diploma": "ИВС 0514253",
 		"status": "Вторая квалификационная категория по прикладной композиции",
-		"picture": "http://static.shburg.org/art/team/teacher2.jpg"
+		"picture": "https://static.shburg.org/art/team/teacher2.jpg"
 	},
 	{
 		"id": "vv-voronova",
@@ -43,7 +43,7 @@
 		"edu": "Российский государственный университет имени А. И. Герцена",
 		"diploma": "ВСГ 0530340",
 		"status": "Вторая квалификационная категория по прикладной композиции",
-		"picture": "http://static.shburg.org/art/team/teacher1.jpg"
+		"picture": "https://static.shburg.org/art/team/teacher1.jpg"
 	},
 	{
 		"id": "in-vturina",
@@ -52,7 +52,7 @@
 		"edu": "Кировский государственный педагогический институт имени В. И. Ленина",
 		"diploma": "ШВ №164501",
 		"status": "Первая квалификационная категория по скульптуре",
-		"picture": "http://static.shburg.org/art/team/teacher8.jpg"
+		"picture": "https://static.shburg.org/art/team/teacher8.jpg"
 	},
 	{
 		"id": "my-valkova",
@@ -61,7 +61,7 @@
 		"edu": "Педагогический институт имени А. И. Герцена",
 		"diploma": "ПП №224197",
 		"status": "Высшая квалификационная категория по истории искусства",
-		"picture": "http://static.shburg.org/art/team/teacher.jpg"
+		"picture": "https://static.shburg.org/art/team/teacher12.jpg"
 	},
 	{
 		"id": "rk-timashev",
@@ -70,7 +70,7 @@
 		"edu": "Санкт-Петербургский государственный архитектурно-строительный университет",
 		"diploma": "ВСГ 5344910",
 		"status": "",
-		"picture": "http://static.shburg.org/art/team/teacher4.jpg"
+		"picture": "https://static.shburg.org/art/team/teacher4.jpg"
 	},
 	{
 		"id": "as-timasheva",
@@ -79,7 +79,7 @@
 		"edu": "Московский архитектурный институт",
 		"diploma": "РН 70241",
 		"status": "",
-		"picture": "http://static.shburg.org/art/team/teacher3.jpg",
+		"picture": "https://static.shburg.org/art/team/teacher3.jpg",
 	  	"contacts": {
 		  "instagram": "annm101"
 		}
@@ -91,7 +91,7 @@
 		"edu": "Незаконченный Ленинградский государственный педагогический университет имени А. С. Пушкина",
 		"diploma": "",
 		"status": "",
-		"picture": "http://static.shburg.org/art/team/teacher9.jpg"
+		"picture": "https://static.shburg.org/art/team/teacher9.jpg"
 	},
 	{
 		"id": "ey-tarasova",
@@ -100,6 +100,15 @@
 		"edu": "Санкт-Петербургский государственный архитектурно-строительный университет",
 		"diploma": "ВСВ 1321444",
 		"status": "",
-		"picture": "http://static.shburg.org/art/team/teacher.jpg"
+		"picture": "https://static.shburg.org/art/team/teacher.jpg"
+	},
+	{
+		"id": "ea-burovtseva",
+		"name": "Елена Ал Буровцева",
+		"position": "Преподаватель керамики",
+		"edu": "",
+		"diploma": "",
+		"status": "",
+		"picture": ""
 	}
 ]

nginx.conf

@@ -1,62 +1,55 @@
 server {
-	listen 80;
+	listen 443 ssl;
 	charset utf-8;
 
 	server_name art.shlisselburg.org;
 
-	location / {
-		# First attempt to serve request as file, then
-		# as directory, then fall back to displaying a 404.
-		# try_files $uri $uri/ /index.html;
-		# Uncomment to enable naxsi on this location
-		# include /etc/nginx/naxsi.rules
+    ssl_certificate /etc/letsencrypt/live/art.shlisselburg.org/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/art.shlisselburg.org/privkey.pem;
 
-		proxy_pass http://localhost:18010;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_prefer_server_ciphers on;
+    ssl_ciphers AES256+EECDH:AES256+EDH:!aNULL;
+
+	location / {
+		proxy_pass http://hudozka;
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection $connection_upgrade;
+
+		proxy_set_header Host      $host;
+		proxy_set_header X-Forwarded-For $remote_addr;
 	}
 
-	error_log /var/log/nginx/hudozhka.error.log;
-	access_log /var/log/nginx/hudozhka.access.log;
+	error_log /var/log/nginx/art.shburg.error.log;
+	access_log /var/log/nginx/art.shburg.access.log;
+}
 
-	# Only for nginx-naxsi used with nginx-naxsi-ui : process denied requests
-	#location /RequestDenied {
-	#	proxy_pass http://127.0.0.1:8080;    
-	#}
+server {
+	listen 443 ssl;
+    server_name art.shburg.org;
 
-	#error_page 404 /404.html;
+    ssl_certificate /etc/letsencrypt/live/art.shlisselburg.org/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/art.shlisselburg.org/privkey.pem;
 
-	# redirect server error pages to the static page /50x.html
-	#
-	#error_page 500 502 503 504 /50x.html;
-	#location = /50x.html {
-	#	root /usr/share/nginx/html;
-	#}
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_prefer_server_ciphers on;
+    ssl_ciphers AES256+EECDH:AES256+EDH:!aNULL;
 
-	# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-	#
-	#location ~ \.php$ {
-	#	fastcgi_split_path_info ^(.+\.php)(/.+)$;
-	#	# NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
-	#
-	#	# With php5-cgi alone:
-	#	fastcgi_pass 127.0.0.1:9000;
-	#	# With php5-fpm:
-	#	fastcgi_pass unix:/var/run/php5-fpm.sock;
-	#	fastcgi_index index.php;
-	#	include fastcgi_params;
-	#}
+	return 301 https://art.shlisselburg.org$request_uri;
 }
 
 server {
 	listen 80;	
-	server_name hudozhka.shlisselburg.org
-				hudozka.shlisselburg.org
-				artschool.shlisselburg.org
-				art-school.shlisselburg.org
-				hudozhka.shburg.org
-				hudozka.shburg.org
-				artschool.shburg.org
-				art-school.shburg.org
-				;
+	server_name art.shlisselburg.org art.shburg.org;
+	return 301 https://art.shlisselburg.org$request_uri;
+}
 
-	return 301 $scheme://art.shlisselburg.org$request_uri;
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}
+
+upstream hudozka {
+    server localhost:1800;
 }

package.json

@@ -1,9 +1,9 @@
 {
-  "name": "app",
+  "name": "Hudozka",
   "private": true,
-  "version": "2.0.0",
+  "version": "3.4.1",
   "description": "",
-  "main": "main.js",
+  "main": "bin/www.js",
   "scripts": {
     "test": "mocha"
   },
@@ -14,25 +14,37 @@
   "author": "Roman Timashev",
   "license": "ISC",
   "dependencies": {
-    "body-parser": "^1.9.3",
-    "bower": "^1.3.12",
-    "cookie-parser": "^1.3.3",
-    "express": "^4.10.1",
+    "co": "^4.4.0",
     "instagram-node": "^0.5.1",
-    "method-override": "^2.3.0",
-    "mongoose": "^3.8.19",
-    "morgan": "^1.5.0",
-    "promise": "^6.0.1"
+    "koa-bodyparser": "^1.4.1",
+    "koa-conditional-get": "^1.0.2",
+    "koa-etag": "^2.0.0",
+    "koa-helmet": "^1.0.0",
+    "koa-logger": "^1.2.2",
+    "koa-prerender": "^1.0.3",
+    "koa-route": "^2.4.0",
+    "koa-static": "^1.4.9",
+    "koa.io": "0.0.3",
+    "mz": "^1.3.0",
+    "promised-mongo": "git+https://git@github.com/tmshv/promised-mongo",
+    "sitemap": "^0.9.0",
+    "thunkify": "^2.1.2"
   },
   "devDependencies": {
+    "autoprefixer": "^6.2.3",
+    "babelify": "^7.2.0",
+    "bower": "^1.3.12",
+    "browserify-ngannotate": "^2.0.0",
+    "cssnano": "^3.4.0",
     "gulp": "^3.8.10",
-    "gulp-autoprefixer": "0.0.6",
     "gulp-browserify": "^0.5.0",
     "gulp-concat": "^2.4.1",
+    "gulp-if": "^2.0.0",
     "gulp-imagemin": "~0.1.5",
-    "gulp-minify-css": "~0.3.0",
-    "gulp-sass": "^1.2.2",
-    "gulp-uglify": "^0.2.1",
+    "gulp-minify": "0.0.5",
+    "gulp-postcss": "^6.0.1",
+    "gulp-sass": "^2.1.1",
+    "gulp-uglify": "^1.5.0",
     "mocha": "~1.17.1",
     "should": "~3.1.2"
   }

pages/docs/docs.jade

@@ -1,118 +0,0 @@
-extends ../layout
-
-block custom_head
-	link(rel="stylesheet", href="/s/docs.css")
-
-block content
-	include ../menu
-	.main
-		for group in blocks
-			.docblock
-				if(group.type == 'documents')
-					//- h2 #{group.name}
-					for i in group.items
-						.doc
-							a(href='#{i.path}')
-								img(src='#{i.preview}')
-								span #{i.title}
-
-		//- .docblock
-		//- 	h2 Лицензии, свидетельства и уставы
-		//- 	.panel
-		//- 	.docs
-		//- 		.doc
-		//- 			img(src='/docs/preview/statue-2013.png')
-		//- 			a(href='/document/statue-2013') Устав школы в 2013 году
-		//- 		.doc
-		//- 			img(src='/docs/preview/license_edu.png')
-		//- 			a(href='/document/edu-license') Образовательная лицензия
-		//- 		.doc
-		//- 			img(src='/docs/preview/certificate_gov.png')
-		//- 			a(href='/document/gov_certificate') Свидетельство о государственной регистрации права
-		//- 		.doc
-		//- 			img(src='/docs/preview/vatin.png')
-		//- 			a(href='/document/VAT') ИНН
-		//- 		.doc
-		//- 			img(src='/docs/preview/certificate_egryl1.png')
-		//- 			a(href='/document/EGRYL1') Свидетельство о внесении в «ЕГРЮЛ»
-		//- 		.doc
-		//- 			img(src='/docs/preview/certificate_egryl2.png')
-		//- 			a(href='/document/EGRYL2') Свидетельство о внесении в «ЕГРЮЛ»
-		//- .docblock
-		//- 	h2 Грамоты
-		//- 	.panel
-		//- 		ul
-		//- 			li
-		//- 				a(href='').act.select ученикам
-		//- 			li
-		//- 				a(href='').act учителям
-		//- 		ul
-		//- 			li
-		//- 				a(href='').act 2014
-		//- 			li
-		//- 				a(href='').act.select 2013
-		//- 			li
-		//- 				a(href='').act 2012
-		//- 			li
-		//- 				a(href='').act 2011
-		//- 			li
-		//- 				a(href='').act 2010
-		//- 			li
-		//- 				a(href='').act 2009
-		//- 			li
-		//- 				a(href='').act 2008
-		//- 			li
-		//- 				a(href='').act 2007
-		//- 	.docs
-		//- 		.doc
-		//- 			img(src='/docs/temp/0002_600_0.jpg')
-		//- 		.doc
-		//- 			img(src='/docs/temp/gramota1296478114.jpg')
-		//- 		.doc
-		//- 			img(src='/docs/temp/Грамота_Буркун_И.Г.jpg')
-		//- 		.doc
-		//- 			img(src='/docs/temp/Грамота_ГребенникО.С.jpg')
-		//- .docblock
-		//- 	h2 Образовательные программы
-		//- 	.panel
-		//- 	.docs
-		//- 		.doc
-		//- 			img(src='/docs/temp/03_.JPG')
-		//- 			.docinfo
-		//- 				p
-		//- 					a(href='') Живопись
-		//- 				p 500 страниц
-		//- 				p
-		//- 					a(href='') Скачать пдф (5 mb)
-		//- 		.doc
-		//- 			img(src='/docs/temp/22.jpg')
-		//- 			.docinfo
-		//- 				p
-		//- 					a(href='') Рисунок
-		//- 				p 500 страниц
-		//- 				p
-		//- 					a(href='') Скачать пдф (5 mb)
-		//- 		.doc
-		//- 			img(src='/docs/temp/dokument.gif')
-		//- 			.docinfo
-		//- 				p
-		//- 					a(href='') Скульптура
-		//- 				p 500 страниц
-		//- 				p
-		//- 					a(href='') Скачать пдф (5 mb)
-		//- 		.doc
-		//- 			img(src='/docs/temp/license_cryptomodulc.jpg')
-		//- 			.docinfo
-		//- 				p
-		//- 					a(href='') ДПИ
-		//- 				p 500 страниц
-		//- 				p
-		//- 					a(href='') Скачать пдф (5 mb)
-		//- 		.doc
-		//- 			img(src='/docs/temp/1340870449_1283936456_dog_bez_pol.jpg')
-		//- 			.docinfo
-		//- 				p
-		//- 					a(href='') История искусств
-		//- 				p 500 страниц
-		//- 				p
-		//- 					a(href='') Скачать пдф (5 mb)

pages/document/display.jade

@@ -1,15 +0,0 @@
-extends ../layout
-
-block custom_head
-	link(rel="stylesheet", href="/s/document.css")
-
-block menu
-	.menu
-		h1
-			span.bold ДХШ 
-			span.norm Шлиссельбурга, 
-			span.norm #{doc.name}
-
-block content
-	.displaybox
-		iframe#doc(src="#{doc.download}") 

pages/document/document.jade

@@ -1,57 +0,0 @@
-extends ../layout
-
-block custom_head
-	if doc.viewer == "default"
-		link(rel='stylesheet', href='/s/pdf.css')
-
-	link(rel='stylesheet', href='/s/document.css')
-
-	if doc.extra && doc.extra.style
-		for style in doc.extra.style
-			link(rel='stylesheet', href='#{style}')
-
-	if doc.viewer == "default"
-		script(src='http://code.jquery.com/jquery-2.1.0.min.js')
-		script(src='/c/document.js')
-
-	if doc.extra && doc.extra.script
-		for script in doc.extra.script
-			script(src='#{script}')
-
-block content
-	.menu.opac
-		.panel
-			h1
-				span.bold ДХШ 
-				span.norm Шлиссельбурга, 
-				span.norm #{doc.title}
-		.panel.right
-			if doc.viewer == "default" && doc.url.length > 1
-				.controls
-					p.block
-						span Страница 
-							input#currentPage(pattern='[0-9]{,3}') 
-							|  из 
-							span#totalPages
-
-					p.block
-						button#buttonPrev ←
-						button#buttonNext →
-
-					if doc.download
-						p.block
-							a.download(href='#{doc.download}')
-	if doc.viewer == "default"
-		div(id='page-container')
-			for url in doc.url
-				//- p #{url}
-				.pf(data-page-url='#{url}')
-				//- img(src='#{url}')
-			//- //- for url in doc.url
-			//- //- 	.pf
-			//- //- 	//- 
-
-	if doc.viewer == "img-sheet"
-		.doclist
-			for url in doc.url
-				img(src='#{url}')

pages/layout.jade

@@ -1,11 +0,0 @@
-doctype html
-
-html
-	head
-		link(rel="stylesheet", href="/s/main.css")
-		link(rel="stylesheet", href="/fonts/stylesheet.css")
-		block custom_head
-	body
-		block content
-
-		include yandex.metrika.jade

pages/main/main.jade

@@ -1,7 +0,0 @@
-extends ../layout
-
-block custom_head
-	meta(name="google-site-verification", content="8BxOTw-Q02DS2KAdcGcnIMwiPZ58DVB18XpOfRibCcg")
-
-block content
-	include ../menu

pages/menu.jade

@@ -1,10 +0,0 @@
-.menu
-	ul
-		each i in menu.items
-			li(class='#{i.class}')
-				if(i.url)
-					a(href='#{i.url}') #{i.text}
-				else
-					span #{i.text}
-		a.vk(href='#{menu.vkgroup}')
-			img(src='/img/icon.vk.png')

pages/schedule/schedule.jade

@@ -1,46 +0,0 @@
-extends ../layout
-
-block custom_head
-    link(rel='stylesheet', href='/s/animate.min.css')
-    link(rel='stylesheet', href='/s/schedule.css')
-    //- script(src='http://code.jquery.com/jquery-2.1.0.min.js')
-    script(src='/c/jquery-2.1.0.js')
-    script(src='/c/schedule.js')
-
-block content
-    include ../menu
-    .schedule
-        p   Расписание весеннего семестра 2014 года
-        //- ul
-        //-     li
-        //-         a(href='') 2012, осень
-        //-     li
-        //-         a(href='') 2013, весна
-        //-     li
-        //-         a(href='') 2013, осень
-        //-     li.current 2014, весна
-        table
-            thead
-                - var days = ["Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота"];
-                th.group Гр.
-                for day in days
-                    //- th.current.first
-                    //- th.weekend
-                    th
-                        p.day #{day}
-                        p.date
-            tbody
-                for group in groups
-                  tr
-                    td.group
-                        p.name #{group.name}
-                        p.time #{group.time}
-                    for day in group.days
-                        td
-                            if day
-                                p.lesson
-                                    a(href='') #{day.lesson}
-                                p.teacher
-                                    a(href='') #{day.teacher}
-                                for time in day.time
-                                    p.time #{time}

pages/team/team.jade

@@ -1,19 +0,0 @@
-extends ../layout
-
-block custom_head
-	link(rel="stylesheet", href="/s/team.css")
-
-block content
-	img.main-picture(src='http://static.shburg.org/art/team/team.jpg')
-	include ../menu
-	.main
-		ul.team-list
-			for member in team
-				li.team-member
-					img(src='#{member.picture}')
-					.info
-						h3 #{member.firstName} #{member.middleName} 
-							span #{member.lastName}
-						p #{member.position}
-						p #{member.status}
-						p #{member.edu}

pages/yandex.metrika.jade

@@ -1,13 +0,0 @@
-//- //Yandex.Metrika informer 
-//- a(href='http://metrika.yandex.ru/stat/?id=24027460&from=informer', target='_blank', rel='nofollow')
-//-   img(src='//bs.yandex.ru/informer/24027460/3_1_FFFFFFFF_EFEFEFFF_0_pageviews', style='width: 88px; height: 31px; border: 0;', alt='Яндекс.Метрика', title='Яндекс.Метрика: данные за сегодня (просмотры, визиты и уникальные посетители)', onclick='try{Ya.Metrika.informer({i:this,id:24027460,lang:\'ru\'});return false}catch(e){}')
-//- //Yandex.Metrika informer
-
-// Yandex.Metrika counter 
-
-script
-    include yandex.metrika.js
-noscript
-  div
-    img(src='//mc.yandex.ru/watch/24027460', style='position: absolute; left: -9999px;', alt='')
-// Yandex.Metrika counter 

pages/yandex.metrika.js

@@ -1 +0,0 @@
-(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");

robots.txt

@@ -0,0 +1,5 @@
+User-agent: *
+Disallow: /news 
+Allow: /
+Host: art.shlisselburg.org
+Sitemap: http://art.shlisselburg.org/sitemap.xml

routers/docs.js

@@ -1,46 +0,0 @@
-var Router = require("express").Router;
-var route = require("./route");
-var document = require("../models/document");
-
-var router = new Router();
-module.exports = router.middleware;
-
-router.get("/docs", function(req, res){
-	var url = "/docs";
-
-	res.render("docs/docs", {
-		menu: route.menu(url),
-		blocks: [
-			{
-				type: "documents",
-				name: "Лицензии, свидетельства и уставы",
-				items: document.cap(
-					document.doc(
-						["statue-2013", "edu-license", "gov-certificate", "VAT", "EGRYL1", "EGRYL2"]
-					)
-				)
-			}
-		]
-	});
-});
-
-router.get("/document/:doc/:page?", function(req, res){
-	var name = req.param("doc");
-	var doc = document.doc(name);
-	// doc = document.extra(doc, {
-	// 	"style": [
-	// 		"/s/pdf.css"
-	// 	],
-	// 	"script": [
-	// 		"http://code.jquery.com/jquery-2.1.0.min.js",
-	// 		"/c/document.js"
-	// 	]
-	// });
-
-	if(doc){
-		doc.startPage = req.param("page");
-		res.render("document/document", {doc: doc});
-	}else{
-		res.error(404);
-	}
-});

routers/instagram.js

@@ -1,44 +0,0 @@
-/**
- * Created by tmshv on 22/11/14.
- */
-
-var Router = require("express").Router;
-var instagram = require("./instagram");
-
-module.exports = function (app) {
-    var router;
-    router = new Router();
-    router.route("/auth/instagram/callback")
-        .get(function (req, res) {
-            var api = instagram.client();
-
-            var code = req.query.code;
-            instagram.authorize(code)
-                .catch(function(error){
-                    console.log(error.body);
-                    res.status(500).send('');
-                })
-                .then(function (client) {
-                    res.cookie("instagram_code", code);
-                    res.redirect("/");
-                });
-        });
-    app.use(router);
-
-    //http://your-callback.com/url/?hub.mode=subscribe&hub.challenge=15f7d1a91c1f40f8a748fd134752feb3&hub.verify_token=myVerifyToken
-    router = new Router();
-    router.route("/instagram/tag/:tag")
-        .get(function (req, res) {
-            var hub_challenge = req.query["hub.challenge"];
-            //var hub_verify_token = req.query["hub.verify_token"];
-
-            console.log("real time get", req.param("tag"), hub_challenge);
-            res.send(hub_challenge);
-        })
-        .post(function (req, res) {
-            console.log("real time tag", req.param("tag"));
-            console.log(req.body);
-            res.send("");
-        });
-    app.use(router);
-};

routers/route.js

@@ -1,45 +0,0 @@
-const config = require("../config")
-
-function getMenu(){
-	return clone(config.data.menu);
-}
-
-function clone(obj){
-    if(obj == null || typeof(obj) != 'object')
-        return obj;
-
-    var temp = obj.constructor(); // changed
-
-    for(var key in obj)
-        temp[key] = clone(obj[key]);
-    return temp;
-}
-
-exports.menu = function(url){
-	var m = getMenu();
-	m.items.forEach(function(i){
-		if(i.url != url) i.class = "";
-	});
-	return m;
-}
-
-exports.team = function(processor) {
-	var list = [];
-	config.data.team.forEach(function(m){
-		if(processor){
-			processor(m);
-		}
-		list.push(m);
-	});
-	return list;
-}
-
-exports.nameProcessor = function(delimiter){
-	if(!delimiter) delimiter = /\s+/;
-	return function(member){
-		var nnn = member.name.split(delimiter);
-		member.firstName = nnn[0];
-		member.middleName = nnn[1];
-		member.lastName = nnn[2];		
-	}
-}

routers/team.router.js

@@ -1,20 +0,0 @@
-var Router = require("express").Router;
-var route = require("./route");
-
-// var router = Object.create(Router);
-var router = new Router();
-router.get("/team", function(req, res){
-	var url = "/team";
-
-	res.render("team/team", {
-		menu: route.menu(url),
-		team: route.team(route.nameProcessor())
-	});
-});
-
-router.get("/teachers/:name", function(req, res){
-	var name = req.param("name");
-	res.error(404);
-});
-
-module.exports = router;

routes/404.js

@@ -0,0 +1,31 @@
+/**
+ * Created by tmshv on 01/03/15.
+ */
+
+var route = require("koa-route");
+var router = require("./");
+
+module.exports = function (app) {
+    app.use(function *(next) {
+        yield next;
+
+        if (404 != this.status) return;
+
+        this.status = 404;
+        yield router.accepts({
+            "text/html": router.index(),
+
+            "text/plain": function *() {
+                this.type = "text/plain";
+                this.body = "Page not found";
+            },
+
+            "application/json": function *() {
+                this.type = "application/json";
+                this.body = {
+                    message: "Not Found"
+                };
+            }
+        });
+    });
+};

routes/gallery.js

@@ -0,0 +1,83 @@
+/**
+ * Created by tmshv on 22/11/14.
+ */
+
+var co = require("co");
+var route = require("koa-route");
+var router = require("./");
+var db = require("../core/db");
+
+module.exports = function (app) {
+    app.use(route.get("/gallery", router.accepts({
+        "text/html": router.index(),
+        "text/plain": router.index(),
+        "application/json": function *() {
+            var query = {};
+            var albums = yield db.c("albums")
+                .find(query)
+                .toArray();
+
+            albums = yield albums.map(processAlbum);
+            this.body = albums;
+        }
+    })));
+
+    app.use(route.get("/gallery/:year", router.accepts({
+        "text/html": router.index(),
+        "text/plain": router.index(),
+        "application/json": function *(year) {
+            year = parseInt(year);
+            var start = new Date(year, 0, 1);
+            var end = new Date(year, 11, 31);
+            var query = {
+                date: {$gte: start, $lt: end}
+            };
+            var albums = yield db.c("albums")
+                .find(query)
+                .toArray();
+
+            albums = yield albums.map(processAlbum);
+            this.body = albums;
+        }
+    })));
+
+    app.use(route.get("/gallery/:year/:course/:album", router.accepts({
+        "text/html": router.index(),
+        "text/plain": router.index(),
+        "application/json": function *(year, course, album) {
+            year = parseInt(year);
+            course = '/' + course;
+            album = '/' + album;
+            var start = new Date(year, 0, 1);
+            var end = new Date(year, 11, 31);
+            var query = {
+                date: {$gte: start, $lt: end},
+                course_uri: course,
+                uri: album
+            };
+
+            var a = yield db.c("albums").findOne(query);
+            a = yield processAlbum(a);
+            this.body = a;
+        }
+    })));
+};
+
+function processAlbum(album) {
+    return co(function *() {
+        album.url = '/gallery/{year}{course}{album}'
+            .replace('{year}', album.date.getFullYear())
+            .replace('{course}', album.course_uri)
+            .replace('{album}', album.uri);
+
+        album.content = yield album.content.map(function (product_id) {
+            return co(function *() {
+                var product = yield db.c("products").findOne({_id: product_id});
+                if (product) return product;
+                else return null;
+            });
+        });
+
+        return album;
+    });
+}

routes/index.js

@@ -0,0 +1,40 @@
+/**
+ * Created by tmshv on 01/03/15.
+ */
+
+var path = require("path");
+var fs = require("mz/fs");
+var config = require("../config");
+
+function accepts(routes, def) {
+    return function *() {
+        var req = this.request;
+        var types = Object.keys(routes)
+            .filter(function (type) {
+                return req.accepts(type);
+            });
+
+        if (types.length) {
+            var type = types[0];
+            yield routes[type].apply(this, arguments);
+        } else if (def) {
+            yield def;
+        } else {
+            this.status = 406;
+        }
+    };
+}
+
+function index(filename) {
+    if (!filename) filename = config['defaultIndex'];
+
+    return function *() {
+        this.type = "text/html";
+        this.body = fs.createReadStream(filename);
+    }
+}
+
+module.exports = {
+    index: index,
+    accepts: accepts
+};

routes/news.js

@@ -0,0 +1,92 @@
+/**
+ * Created by tmshv on 22/11/14.
+ */
+
+var route = require("koa-route");
+var router = require("./");
+var db = require("../core/db");
+
+module.exports = function (app) {
+    app.use(route.get("/news", router.accepts({
+        "text/html": function *() {
+            this.redirect("/");
+        },
+        "text/plain": function *() {
+            this.redirect("/");
+        },
+        "application/json": function *() {
+            var count = parseInt(this.query["count"]) || 10;
+            var portion = parseInt(this.query["portion"]) || 0;
+            var skip = portion * count;
+
+            var query = {};
+            if (this.query.type) query.type = this.query.type;
+
+            var pinned = [];
+            if(portion == 0) {
+                var now = new Date();
+                pinned = yield db.c("posts").find({until: {$gte: now}}).toArray()
+                    .then(function (items) {
+                        return items.sort(sortNewsByDate);
+                    });
+            }
+            var pinned_ids = pinned.map(function (p) {
+                return p["_id"]+"";
+            });
+
+            var posts = yield db.c("posts").find(query)
+                .sort({date: -1})
+                .skip(skip)
+                .limit(count)
+                .toArray()
+                .then(function (items) {
+                    return items.filter(function (i) {
+                        var id = i["_id"]+"";
+                        return pinned_ids.indexOf(id) < 0;
+                    });
+                });
+
+            this.body = pinned.concat(posts);
+            //this.body = pinned_ids
+        }
+    })));
+
+    app.use(route.get("/news/pinned", router.accepts({
+        "text/html": function *() {
+            this.redirect("/");
+        },
+        "text/plain": function *() {
+            this.redirect("/");
+        },
+        "application/json": function *() {
+            var now = new Date();
+            var pinned = yield db.c("posts").find({until: {$gte: now}}).toArray()
+                .then(function (items) {
+                    return items.sort(sortNewsByDate);
+                });
+            this.body = pinned;
+        }
+    })));
+
+    app.use(route.get("/news/:uri", router.accepts({
+        "text/html": router.index(),
+        "text/plain": router.index(),
+        "application/json": function *(uri) {
+            var item = yield db.c("posts").findOne({uri: uri});
+            if (item) {
+                this.body = item;
+            } else {
+                this.status = 404;
+            }
+        }
+    })));
+};
+
+function sortNewsByDate(i1, i2) {
+    var t1 = new Date(i1.date).getTime();
+    var t2 = new Date(i2.date).getTime();
+
+    if (t1 < t2) return 1;
+    if (t1 > t2) return -1;
+    return 0;
+}

routes/schedule.js

@@ -0,0 +1,63 @@
+/**
+ * Created by tmshv on 22/11/14.
+ */
+
+var route = require("koa-route");
+var router = require("./");
+var db = require("../core/db");
+var schedule = require("../models/schedule");
+var populate = require("../utils/populate").populate;
+const course = require("../models/course");
+const team = require("../models/team");
+
+module.exports = function (app) {
+    app.use(
+        route.get("/schedule/:period?/:semester?", router.accepts(
+            {
+                "text/html": router.index(),
+                "text/plain": router.index(),
+
+                "application/json": function *(period, semester) {
+                    this.type = "application/json";
+
+                    var doPopulate = this.query.populate || false;
+
+                    var data = yield db.c("schedules").findOne({
+                        period: period,
+                        semester: semester
+                    });
+
+                    if(!data) {
+                        this.status = 404;
+                        return;
+                    }
+
+                    if(doPopulate) {
+                        data.schedule = schedule.populate(data.schedule, [
+                            populate(team.short, "teacher"),
+                            populate(course.name, "lesson")
+                        ]);
+                    }
+
+                    this.body = data;
+                }
+            }
+        ))
+    );
+
+    app.use(
+        route.get("/schedules", router.accepts(
+            {
+                "text/html": router.index(),
+                "text/plain": router.index(),
+
+                "application/json": function *() {
+                    this.type = "application/json";
+                    var data = yield db.c("schedules").find({}, {period:1 , semester: 1}).toArray();
+                    if(!data) this.status = 404;
+                    else this.body = data;
+                }
+            }
+        ))
+    );
+};