Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f006207112 | ||
|
|
d46d39a131 | ||
|
|
8a934cbf5c | ||
|
|
c6f242693a |
No files matched your search
@@ -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;
|
|
||||||
// }
|
|
||||||
@@ -29,9 +29,9 @@ module.exports = function (app) {
|
|||||||
|
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
fotorama.load([
|
fotorama.load([
|
||||||
{img: 'http://static.shburg.org/art/img/cat1.jpg'},
|
{img: 'https://static.shburg.org/art/img/cat1.jpg'},
|
||||||
{img: 'http://static.shburg.org/art/img/cat2.jpg'},
|
{img: 'https://static.shburg.org/art/img/cat2.jpg'},
|
||||||
{img: 'http://static.shburg.org/art/img/cat3.jpg'}
|
{img: 'https://static.shburg.org/art/img/cat3.jpg'}
|
||||||
]);
|
]);
|
||||||
}, 100);
|
}, 100);
|
||||||
});
|
});
|
||||||
|
|||||||
+63
-59
@@ -1,78 +1,82 @@
|
|||||||
var path = require("path");
|
var gulp = require('gulp');
|
||||||
var gulp = require("gulp");
|
var _if = require('gulp-if');
|
||||||
var _if = require("gulp-if");
|
var postcss = require('gulp-postcss');
|
||||||
var sass = require("gulp-sass");
|
var sass = require('gulp-sass');
|
||||||
var babel = require("babelify");
|
var imageMin = require('gulp-imagemin');
|
||||||
var minify_css = require("gulp-minify-css");
|
var uglify = require('gulp-uglify');
|
||||||
var autoprefixer = require("gulp-autoprefixer");
|
var minify = require('gulp-minify');
|
||||||
var imageMin = require("gulp-imagemin");
|
var concat = require('gulp-concat');
|
||||||
var uglify = require("gulp-uglify");
|
var browserify = require('gulp-browserify');
|
||||||
var concat = require("gulp-concat");
|
|
||||||
var browserify = require("gulp-browserify");
|
|
||||||
var annotate = require("browserify-ngannotate");
|
|
||||||
|
|
||||||
var is_production = process.env['NODE_ENV'] == 'production';
|
var is_production = process.env['NODE_ENV'] == 'production';
|
||||||
|
|
||||||
gulp.task("concat-bower", function () {
|
gulp.task("concat-bower", function () {
|
||||||
var files = [
|
var files = [
|
||||||
"public/bower_components/jquery/dist/jquery.min.js",
|
"public/bower_components/jquery/dist/jquery.min.js",
|
||||||
"public/bower_components/angular/angular.min.js",
|
"public/bower_components/angular/angular.min.js",
|
||||||
"public/bower_components/angular-route/angular-route.min.js",
|
"public/bower_components/angular-route/angular-route.min.js",
|
||||||
"public/bower_components/angular-animate/angular-animate.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.min.js",
|
||||||
"public/bower_components/angulartics/dist/angulartics-ga.min.js",
|
"public/bower_components/angulartics/dist/angulartics-ga.min.js",
|
||||||
"public/bower_components/spin.js/spin.js",
|
"public/bower_components/spin.js/spin.js",
|
||||||
"public/bower_components/angular-spinner/angular-spinner.min.js",
|
"public/bower_components/angular-spinner/angular-spinner.min.js",
|
||||||
"public/bower_components/socket.io-client/socket.io.js"
|
"public/bower_components/socket.io-client/socket.io.js"
|
||||||
];
|
];
|
||||||
gulp.src(files)
|
gulp.src(files)
|
||||||
.pipe(concat("libs.js"))
|
.pipe(concat("libs.js"))
|
||||||
.pipe(uglify())
|
.pipe(uglify())
|
||||||
.pipe(gulp.dest("public"));
|
.pipe(gulp.dest("public"));
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task("sass", function () {
|
gulp.task('styles', function () {
|
||||||
gulp.src("./assets/style/*.scss")
|
var processors = [
|
||||||
|
require('autoprefixer')({browsers: ['last 1 version']}),
|
||||||
|
require('cssnano')()
|
||||||
|
];
|
||||||
|
|
||||||
|
gulp.src('./assets/style/*.scss')
|
||||||
.pipe(sass())
|
.pipe(sass())
|
||||||
.pipe(concat("style.css"))
|
.pipe(postcss(processors))
|
||||||
.pipe(autoprefixer())
|
.pipe(concat('style.css'))
|
||||||
.pipe(minify_css({processImport:false}))
|
.pipe(gulp.dest('./public'));
|
||||||
.pipe(gulp.dest("public"));
|
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task("copy", function(){
|
gulp.task("copy", function () {
|
||||||
gulp.src("./assets/fonts/*")
|
gulp.src("./assets/fonts/*")
|
||||||
.pipe(gulp.dest("./public/fonts"));
|
.pipe(gulp.dest("./public/fonts"));
|
||||||
|
|
||||||
gulp.src("./assets/graphics/*")
|
gulp.src("./assets/graphics/*")
|
||||||
.pipe(gulp.dest("./public/graphics"));
|
.pipe(gulp.dest("./public/graphics"));
|
||||||
|
|
||||||
gulp.src([
|
gulp.src([
|
||||||
"./3rdparty/*",
|
"./3rdparty/*",
|
||||||
"robots.txt"
|
"robots.txt"
|
||||||
])
|
])
|
||||||
.pipe(gulp.dest("./public"));
|
.pipe(gulp.dest("./public"));
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task("compile", function(){
|
gulp.task('compile', function () {
|
||||||
gulp.src([
|
gulp.src([
|
||||||
"client/app.js",
|
'client/app.js',
|
||||||
"client/document.js",
|
'client/document.js',
|
||||||
"client/data.js",
|
'client/data.js',
|
||||||
"client/instagram.js"
|
'client/instagram.js'
|
||||||
])
|
])
|
||||||
.pipe(browserify({
|
.pipe(browserify({
|
||||||
transform: [annotate, babel]
|
transform: [
|
||||||
}))
|
require('browserify-ngannotate'),
|
||||||
.pipe(_if(is_production, uglify()))
|
require('babelify')
|
||||||
.pipe(gulp.dest("public"));
|
]
|
||||||
|
}))
|
||||||
|
//.pipe(_if(is_production, minify()))
|
||||||
|
.pipe(gulp.dest('./public'));
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task("imagemin", function(){
|
gulp.task("imagemin", function () {
|
||||||
gulp.src("./assets/img/**/*")
|
gulp.src("./assets/img/**/*")
|
||||||
.pipe(imageMin())
|
.pipe(imageMin())
|
||||||
.pipe(gulp.dest("./public/img"));
|
.pipe(gulp.dest("./public/img"));
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task("default", ["sass", "compile"]);
|
gulp.task('default', ['styles', 'compile']);
|
||||||
gulp.task("deploy", ["default", "copy", "imagemin"]);
|
gulp.task('deploy', ['default', 'copy', 'imagemin']);
|
||||||
@@ -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
|
||||||
+15
-15
@@ -2,47 +2,47 @@
|
|||||||
{
|
{
|
||||||
"name": "statue-2013",
|
"name": "statue-2013",
|
||||||
"title": "устав школы за 2013 год",
|
"title": "устав школы за 2013 год",
|
||||||
"url": "http://static.shburg.org/art/docs/hudozhka_statue-2013.pdf",
|
"url": "https://static.shburg.org/art/docs/hudozhka_statue-2013.pdf",
|
||||||
"preview": "http://static.shburg.org/art/graphics/statue-2013-preview.png",
|
"preview": "https://static.shburg.org/art/graphics/statue-2013-preview.png",
|
||||||
"files": ["http://static.shburg.org/art/docs/hudozhka_statue-2013.pdf"]
|
"files": ["https://static.shburg.org/art/docs/hudozhka_statue-2013.pdf"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "edu-license",
|
"name": "edu-license",
|
||||||
"title": "образовательная лицензия",
|
"title": "образовательная лицензия",
|
||||||
"url": "/document/edu-license",
|
"url": "/document/edu-license",
|
||||||
"preview": "http://static.shburg.org/art/graphics/license_edu-preview.png",
|
"preview": "https://static.shburg.org/art/graphics/license_edu-preview.png",
|
||||||
"files": [
|
"files": [
|
||||||
"http://static.shburg.org/art/docs/hudozhka_license_edu.jpg",
|
"https://static.shburg.org/art/docs/hudozhka_license_edu.jpg",
|
||||||
"http://static.shburg.org/art/docs/hudozhka_license_edu_back.jpg",
|
"https://static.shburg.org/art/docs/hudozhka_license_edu_back.jpg",
|
||||||
"http://static.shburg.org/art/docs/hudozhka_license_edu_attachment.jpg"
|
"https://static.shburg.org/art/docs/hudozhka_license_edu_attachment.jpg"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "gov-certificate",
|
"name": "gov-certificate",
|
||||||
"title": "свидетельство о государственной регистрации права",
|
"title": "свидетельство о государственной регистрации права",
|
||||||
"url": "/document/gov-certificate",
|
"url": "/document/gov-certificate",
|
||||||
"preview": "http://static.shburg.org/art/graphics/certificate_gov-preview.png",
|
"preview": "https://static.shburg.org/art/graphics/certificate_gov-preview.png",
|
||||||
"files": ["http://static.shburg.org/art/docs/hudozhka_certificate_gov.jpg"]
|
"files": ["https://static.shburg.org/art/docs/hudozhka_certificate_gov.jpg"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "VAT",
|
"name": "VAT",
|
||||||
"title": "ИНН",
|
"title": "ИНН",
|
||||||
"url": "/document/VAT",
|
"url": "/document/VAT",
|
||||||
"preview": "http://static.shburg.org/art/graphics/vatin-preview.png",
|
"preview": "https://static.shburg.org/art/graphics/vatin-preview.png",
|
||||||
"files": ["http://static.shburg.org/art/docs/hudozhka_vatin.jpg"]
|
"files": ["https://static.shburg.org/art/docs/hudozhka_vatin.jpg"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "EGRYL1",
|
"name": "EGRYL1",
|
||||||
"title": "свидетельство о внесении в «ЕГРЮЛ»",
|
"title": "свидетельство о внесении в «ЕГРЮЛ»",
|
||||||
"url": "/document/EGRYL1",
|
"url": "/document/EGRYL1",
|
||||||
"preview": "http://static.shburg.org/art/graphics/certificate_egryl1-preview.png",
|
"preview": "https://static.shburg.org/art/graphics/certificate_egryl1-preview.png",
|
||||||
"files": ["http://static.shburg.org/art/docs/hudozhka_certificate_egryl1.jpg"]
|
"files": ["https://static.shburg.org/art/docs/hudozhka_certificate_egryl1.jpg"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "EGRYL2",
|
"name": "EGRYL2",
|
||||||
"title": "свидетельство о внесении в «ЕГРЮЛ»",
|
"title": "свидетельство о внесении в «ЕГРЮЛ»",
|
||||||
"url": "/document/EGRYL2",
|
"url": "/document/EGRYL2",
|
||||||
"preview": "http://static.shburg.org/art/graphics/certificate_egryl2-preview.png",
|
"preview": "https://static.shburg.org/art/graphics/certificate_egryl2-preview.png",
|
||||||
"files": ["http://static.shburg.org/art/docs/hudozhka_certificate_egryl2.jpg"]
|
"files": ["https://static.shburg.org/art/docs/hudozhka_certificate_egryl2.jpg"]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
+11
-11
@@ -6,7 +6,7 @@
|
|||||||
"edu": "Ленинградский инженерно-строительный институт",
|
"edu": "Ленинградский инженерно-строительный институт",
|
||||||
"diploma": "НВ №222567",
|
"diploma": "НВ №222567",
|
||||||
"status": "",
|
"status": "",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher5.jpg",
|
"picture": "https://static.shburg.org/art/team/teacher5.jpg",
|
||||||
"anchor": "director"
|
"anchor": "director"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
"edu": "Академия художеств имени И. Е. Репина",
|
"edu": "Академия художеств имени И. Е. Репина",
|
||||||
"diploma": "B-I №259798",
|
"diploma": "B-I №259798",
|
||||||
"status": "Первая квалификационная категория по живописи и станковой композиции",
|
"status": "Первая квалификационная категория по живописи и станковой композиции",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher10.jpg"
|
"picture": "https://static.shburg.org/art/team/teacher10.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "od-gogoleva",
|
"id": "od-gogoleva",
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
"edu": "Ленинградский инженерно-строительный институт",
|
"edu": "Ленинградский инженерно-строительный институт",
|
||||||
"diploma": "B-I №222572",
|
"diploma": "B-I №222572",
|
||||||
"status": "Высшая квалификационная категория по живописи и станковой композиции",
|
"status": "Высшая квалификационная категория по живописи и станковой композиции",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher11.jpg"
|
"picture": "https://static.shburg.org/art/team/teacher11.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "nv-andreeva",
|
"id": "nv-andreeva",
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
"edu": "Санкт-Петербургский государственный университет технологии и дизайна",
|
"edu": "Санкт-Петербургский государственный университет технологии и дизайна",
|
||||||
"diploma": "ИВС 0514253",
|
"diploma": "ИВС 0514253",
|
||||||
"status": "Вторая квалификационная категория по прикладной композиции",
|
"status": "Вторая квалификационная категория по прикладной композиции",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher2.jpg"
|
"picture": "https://static.shburg.org/art/team/teacher2.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "vv-voronova",
|
"id": "vv-voronova",
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
"edu": "Российский государственный университет имени А. И. Герцена",
|
"edu": "Российский государственный университет имени А. И. Герцена",
|
||||||
"diploma": "ВСГ 0530340",
|
"diploma": "ВСГ 0530340",
|
||||||
"status": "Вторая квалификационная категория по прикладной композиции",
|
"status": "Вторая квалификационная категория по прикладной композиции",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher1.jpg"
|
"picture": "https://static.shburg.org/art/team/teacher1.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "in-vturina",
|
"id": "in-vturina",
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
"edu": "Кировский государственный педагогический институт имени В. И. Ленина",
|
"edu": "Кировский государственный педагогический институт имени В. И. Ленина",
|
||||||
"diploma": "ШВ №164501",
|
"diploma": "ШВ №164501",
|
||||||
"status": "Первая квалификационная категория по скульптуре",
|
"status": "Первая квалификационная категория по скульптуре",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher8.jpg"
|
"picture": "https://static.shburg.org/art/team/teacher8.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "my-valkova",
|
"id": "my-valkova",
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
"edu": "Педагогический институт имени А. И. Герцена",
|
"edu": "Педагогический институт имени А. И. Герцена",
|
||||||
"diploma": "ПП №224197",
|
"diploma": "ПП №224197",
|
||||||
"status": "Высшая квалификационная категория по истории искусства",
|
"status": "Высшая квалификационная категория по истории искусства",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher12.jpg"
|
"picture": "https://static.shburg.org/art/team/teacher12.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "rk-timashev",
|
"id": "rk-timashev",
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
"edu": "Санкт-Петербургский государственный архитектурно-строительный университет",
|
"edu": "Санкт-Петербургский государственный архитектурно-строительный университет",
|
||||||
"diploma": "ВСГ 5344910",
|
"diploma": "ВСГ 5344910",
|
||||||
"status": "",
|
"status": "",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher4.jpg"
|
"picture": "https://static.shburg.org/art/team/teacher4.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "as-timasheva",
|
"id": "as-timasheva",
|
||||||
@@ -79,7 +79,7 @@
|
|||||||
"edu": "Московский архитектурный институт",
|
"edu": "Московский архитектурный институт",
|
||||||
"diploma": "РН 70241",
|
"diploma": "РН 70241",
|
||||||
"status": "",
|
"status": "",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher3.jpg",
|
"picture": "https://static.shburg.org/art/team/teacher3.jpg",
|
||||||
"contacts": {
|
"contacts": {
|
||||||
"instagram": "annm101"
|
"instagram": "annm101"
|
||||||
}
|
}
|
||||||
@@ -91,7 +91,7 @@
|
|||||||
"edu": "Незаконченный Ленинградский государственный педагогический университет имени А. С. Пушкина",
|
"edu": "Незаконченный Ленинградский государственный педагогический университет имени А. С. Пушкина",
|
||||||
"diploma": "",
|
"diploma": "",
|
||||||
"status": "",
|
"status": "",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher9.jpg"
|
"picture": "https://static.shburg.org/art/team/teacher9.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "ey-tarasova",
|
"id": "ey-tarasova",
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
"edu": "Санкт-Петербургский государственный архитектурно-строительный университет",
|
"edu": "Санкт-Петербургский государственный архитектурно-строительный университет",
|
||||||
"diploma": "ВСВ 1321444",
|
"diploma": "ВСВ 1321444",
|
||||||
"status": "",
|
"status": "",
|
||||||
"picture": "http://static.shburg.org/art/team/teacher.jpg"
|
"picture": "https://static.shburg.org/art/team/teacher.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "ea-burovtseva",
|
"id": "ea-burovtseva",
|
||||||
|
|||||||
+25
-4
@@ -1,9 +1,16 @@
|
|||||||
server {
|
server {
|
||||||
listen 80;
|
listen 443 ssl;
|
||||||
charset utf-8;
|
charset utf-8;
|
||||||
|
|
||||||
server_name art.shlisselburg.org;
|
server_name art.shlisselburg.org;
|
||||||
|
|
||||||
|
ssl_certificate /etc/letsencrypt/live/art.shlisselburg.org/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/art.shlisselburg.org/privkey.pem;
|
||||||
|
|
||||||
|
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
ssl_ciphers AES256+EECDH:AES256+EDH:!aNULL;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://hudozka;
|
proxy_pass http://hudozka;
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
@@ -18,10 +25,24 @@ server {
|
|||||||
access_log /var/log/nginx/art.shburg.access.log;
|
access_log /var/log/nginx/art.shburg.access.log;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
server_name art.shburg.org;
|
||||||
|
|
||||||
|
ssl_certificate /etc/letsencrypt/live/art.shlisselburg.org/fullchain.pem;
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/art.shlisselburg.org/privkey.pem;
|
||||||
|
|
||||||
|
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
ssl_ciphers AES256+EECDH:AES256+EDH:!aNULL;
|
||||||
|
|
||||||
|
return 301 https://art.shlisselburg.org$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
server_name art.shburg.org;
|
server_name art.shlisselburg.org art.shburg.org;
|
||||||
return 301 $scheme://art.shlisselburg.org$request_uri;
|
return 301 https://art.shlisselburg.org$request_uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
map $http_upgrade $connection_upgrade {
|
map $http_upgrade $connection_upgrade {
|
||||||
|
|||||||
+11
-10
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "Hudozka",
|
"name": "Hudozka",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "3.4.0",
|
"version": "3.4.1",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "bin/www.js",
|
"main": "bin/www.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -19,12 +19,11 @@
|
|||||||
"koa-bodyparser": "^1.4.1",
|
"koa-bodyparser": "^1.4.1",
|
||||||
"koa-conditional-get": "^1.0.2",
|
"koa-conditional-get": "^1.0.2",
|
||||||
"koa-etag": "^2.0.0",
|
"koa-etag": "^2.0.0",
|
||||||
"koa-helmet": "0.0.3",
|
"koa-helmet": "^1.0.0",
|
||||||
"koa-logger": "^1.2.2",
|
"koa-logger": "^1.2.2",
|
||||||
"koa-prerender": "^1.0.3",
|
"koa-prerender": "^1.0.3",
|
||||||
"koa-route": "^2.4.0",
|
"koa-route": "^2.4.0",
|
||||||
"koa-static": "^1.4.9",
|
"koa-static": "^1.4.9",
|
||||||
"koa-useragent": "0.1.1",
|
|
||||||
"koa.io": "0.0.3",
|
"koa.io": "0.0.3",
|
||||||
"mz": "^1.3.0",
|
"mz": "^1.3.0",
|
||||||
"promised-mongo": "git+https://git@github.com/tmshv/promised-mongo",
|
"promised-mongo": "git+https://git@github.com/tmshv/promised-mongo",
|
||||||
@@ -32,18 +31,20 @@
|
|||||||
"thunkify": "^2.1.2"
|
"thunkify": "^2.1.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babelify": "^6.1.3",
|
"autoprefixer": "^6.2.3",
|
||||||
|
"babelify": "^7.2.0",
|
||||||
"bower": "^1.3.12",
|
"bower": "^1.3.12",
|
||||||
"browserify-ngannotate": "^0.7.1",
|
"browserify-ngannotate": "^2.0.0",
|
||||||
|
"cssnano": "^3.4.0",
|
||||||
"gulp": "^3.8.10",
|
"gulp": "^3.8.10",
|
||||||
"gulp-autoprefixer": "0.0.6",
|
|
||||||
"gulp-browserify": "^0.5.0",
|
"gulp-browserify": "^0.5.0",
|
||||||
"gulp-concat": "^2.4.1",
|
"gulp-concat": "^2.4.1",
|
||||||
"gulp-if": "^1.2.5",
|
"gulp-if": "^2.0.0",
|
||||||
"gulp-imagemin": "~0.1.5",
|
"gulp-imagemin": "~0.1.5",
|
||||||
"gulp-minify-css": "~0.3.0",
|
"gulp-minify": "0.0.5",
|
||||||
"gulp-sass": "^1.2.2",
|
"gulp-postcss": "^6.0.1",
|
||||||
"gulp-uglify": "^1.1.0",
|
"gulp-sass": "^2.1.1",
|
||||||
|
"gulp-uglify": "^1.5.0",
|
||||||
"mocha": "~1.17.1",
|
"mocha": "~1.17.1",
|
||||||
"should": "~3.1.2"
|
"should": "~3.1.2"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ app.use(prerender(config.prerender));
|
|||||||
app.use(serve(path.join(__dirname, "public")));
|
app.use(serve(path.join(__dirname, "public")));
|
||||||
app.use(serve(path.join(__dirname, "templates")));
|
app.use(serve(path.join(__dirname, "templates")));
|
||||||
|
|
||||||
app.use(helmet.defaults());
|
app.use(helmet());
|
||||||
|
|
||||||
app.use(function *(next) {
|
app.use(function *(next) {
|
||||||
var q = this.query;
|
var q = this.query;
|
||||||
|
|||||||
+2
-2
@@ -15,8 +15,8 @@
|
|||||||
|
|
||||||
<script src="/libs.js"></script>
|
<script src="/libs.js"></script>
|
||||||
|
|
||||||
<link href="http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.css" rel="stylesheet">
|
<link href="//cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.css" rel="stylesheet">
|
||||||
<script src="http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.js"></script>
|
<script src="//cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.js"></script>
|
||||||
|
|
||||||
<link rel="stylesheet" href="//cdn.jsdelivr.net/jquery.slick/1.5.7/slick.css"/>
|
<link rel="stylesheet" href="//cdn.jsdelivr.net/jquery.slick/1.5.7/slick.css"/>
|
||||||
<script src="//cdn.jsdelivr.net/jquery.slick/1.5.7/slick.min.js"></script>
|
<script src="//cdn.jsdelivr.net/jquery.slick/1.5.7/slick.min.js"></script>
|
||||||
|
|||||||
Reference in new issue
Block a user