Skip to content

Commit

Permalink
название коммита
Browse files Browse the repository at this point in the history
lexaweb committed Mar 30, 2020
1 parent 5332298 commit 9673771
Showing 55 changed files with 2,014 additions and 141 deletions.
Binary file added .DS_Store
Binary file not shown.
Binary file added ._.DS_Store
Binary file not shown.
Binary file added ._Readme.md
Binary file not shown.
Binary file added ._gulpfile.js
Binary file not shown.
Binary file added ._webpack.config.js
Binary file not shown.
Binary file added ._yarn.lock
Binary file not shown.
3 changes: 3 additions & 0 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -191,3 +191,6 @@

- png-спрайты можно будет использовать прописав класс `icon-{file-name}`
- svg-спрайты можно будет использовать прописав класс `svg-{file-name}`

sudo npm install gulp-cli --global
npm rebuild node-sass
Binary file added app/.DS_Store
Binary file not shown.
Binary file added app/._.DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions app/scss/base/fonts.css

Large diffs are not rendered by default.

127 changes: 95 additions & 32 deletions app/scss/base/svgSprite.scss
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
display: inline-block;
background-image: url("../images/sprite.svg");
background-repeat: no-repeat;
background-size: 82.27848101265823em 326.7em;
background-size: 82.27848101265823em 340.1em;
}

.no-svg .svg-icon:before {
@@ -17,8 +17,17 @@



.svg-icon.svg-Group_2:before {
.svg-icon.svg-Group-107:before {
background-position: 0em 0em;
width: 3.3em;
height: 1.8em;
}




.svg-icon.svg-Group_2:before {
background-position: 0em -1.8em;
width: 7.9em;
height: 7.8em;
}
@@ -27,7 +36,7 @@


.svg-icon.svg-Rectangle-336:before {
background-position: 0em -7.8em;
background-position: 0em -9.6em;
width: 82.27848101265823em;
height: 100em;
}
@@ -36,7 +45,7 @@


.svg-icon.svg-car:before {
background-position: 0em -107.8em;
background-position: 0em -109.6em;
width: 13.6em;
height: 7.2em;
}
@@ -45,7 +54,7 @@


.svg-icon.svg-certificate:before {
background-position: 0em -115em;
background-position: 0em -116.8em;
width: 7.7em;
height: 9.1em;
}
@@ -54,7 +63,7 @@


.svg-icon.svg-eggs-1:before {
background-position: 0em -124.1em;
background-position: 0em -125.9em;
width: 7.7em;
height: 9.1em;
}
@@ -63,7 +72,7 @@


.svg-icon.svg-eggs-2:before {
background-position: 0em -133.2em;
background-position: 0em -135em;
width: 12.1em;
height: 11em;
}
@@ -72,7 +81,7 @@


.svg-icon.svg-eggs-3:before {
background-position: 0em -144.2em;
background-position: 0em -146em;
width: 7.8em;
height: 9.8em;
}
@@ -81,7 +90,7 @@


.svg-icon.svg-eggs-4:before {
background-position: 0em -154em;
background-position: 0em -155.8em;
width: 10.3em;
height: 7em;
}
@@ -90,7 +99,7 @@


.svg-icon.svg-eggs-5:before {
background-position: 0em -161em;
background-position: 0em -162.8em;
width: 13.6em;
height: 7.2em;
}
@@ -99,7 +108,7 @@


.svg-icon.svg-eggs-6:before {
background-position: 0em -168.2em;
background-position: 0em -170em;
width: 40.3em;
height: 24.2em;
}
@@ -108,7 +117,7 @@


.svg-icon.svg-logo_1:before {
background-position: 0em -192.4em;
background-position: 0em -194.2em;
width: 15.1em;
height: 9.6em;
}
@@ -117,7 +126,7 @@


.svg-icon.svg-logotype:before {
background-position: 0em -202em;
background-position: 0em -203.8em;
width: 15.1em;
height: 9.6em;
}
@@ -126,7 +135,7 @@


.svg-icon.svg-navigation:before {
background-position: 0em -211.6em;
background-position: 0em -213.4em;
width: 7.9em;
height: 7.8em;
}
@@ -135,7 +144,7 @@


.svg-icon.svg-pack:before {
background-position: 0em -219.4em;
background-position: 0em -221.2em;
width: 40.3em;
height: 24.2em;
}
@@ -144,7 +153,7 @@


.svg-icon.svg-presentation:before {
background-position: 0em -243.6em;
background-position: 0em -245.4em;
width: 7.8em;
height: 9.8em;
}
@@ -153,16 +162,79 @@


.svg-icon.svg-prevslogo:before {
background-position: 0em -253.4em;
background-position: 0em -255.2em;
width: 24.2em;
height: 24.3em;
}




.svg-icon.svg-quality-mark:before {
background-position: 0em -279.5em;
width: 24.2em;
height: 24.3em;
}




.svg-icon.svg-social-facebook:before {
background-position: 0em -303.8em;
width: 1.1em;
height: 2.3em;
}




.svg-icon.svg-social-instagram:before {
background-position: 0em -306.1em;
width: 1.8em;
height: 1.8em;
}




.svg-icon.svg-social-ok:before {
background-position: 0em -307.9em;
width: 1.4em;
height: 2.4em;
}




.svg-icon.svg-social-twitter:before {
background-position: 0em -310.3em;
width: 2em;
height: 1.8em;
}




.svg-icon.svg-social-vk:before {
background-position: 0em -312.1em;
width: 2.6em;
height: 1.6em;
}




.svg-icon.svg-social-wikipedia:before {
background-position: 0em -313.7em;
width: 2.8em;
height: 1.7em;
}




.svg-icon.svg-statistics:before {
background-position: 0em -277.7em;
background-position: 0em -315.4em;
width: 10.3em;
height: 7em;
}
@@ -171,7 +243,7 @@


.svg-icon.svg-str-down:before {
background-position: 0em -284.7em;
background-position: 0em -322.4em;
width: 4.3em;
height: 4.3em;
}
@@ -180,7 +252,7 @@


.svg-icon.svg-str-right-white:before {
background-position: 0em -289em;
background-position: 0em -326.7em;
width: 2.6em;
height: 0.8em;
}
@@ -189,7 +261,7 @@


.svg-icon.svg-str-up:before {
background-position: 0em -289.8em;
background-position: 0em -327.5em;
width: 1.5em;
height: 0.8em;
}
@@ -198,7 +270,7 @@


.svg-icon.svg-str-up-blue:before {
background-position: 0em -290.6em;
background-position: 0em -328.3em;
width: 1.5em;
height: 0.8em;
}
@@ -207,21 +279,12 @@


.svg-icon.svg-vote:before {
background-position: 0em -291.4em;
background-position: 0em -329.1em;
width: 12.1em;
height: 11em;
}




.svg-icon.svg-Слой-2:before {
background-position: 0em -302.4em;
width: 24.2em;
height: 24.3em;
}





798 changes: 787 additions & 11 deletions app/scss/style.scss

Large diffs are not rendered by default.

Binary file added app/static/.DS_Store
Binary file not shown.
Binary file added app/static/._.DS_Store
Binary file not shown.
Binary file added app/static/fonts/._CeraPro-500.eot
Binary file not shown.
Binary file added app/static/fonts/._CeraPro-500.ttf
Binary file not shown.
Binary file added app/static/fonts/._CeraPro-500.woff
Binary file not shown.
Binary file added app/static/fonts/._CeraPro-500.woff2
Binary file not shown.
Binary file added app/static/fonts/CeraPro-500.eot
Binary file not shown.
Binary file added app/static/fonts/CeraPro-500.ttf
Binary file not shown.
Binary file added app/static/fonts/CeraPro-500.woff
Binary file not shown.
Binary file added app/static/fonts/CeraPro-500.woff2
Binary file not shown.
Binary file added app/static/images/.DS_Store
Binary file not shown.
Binary file added app/static/images/._.DS_Store
Binary file not shown.
4 changes: 4 additions & 0 deletions app/static/images/Group-107-focus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/static/images/Group-107.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/static/images/Group-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/Vector-136.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/static/images/about-us.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/checkbox-active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/checkbox-hover.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/static/images/logo.png
Binary file not shown.
4 changes: 4 additions & 0 deletions app/static/images/product.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/static/images/question.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/social-facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/static/images/social-instagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/social-ok.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/social-twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/social-vk.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/social-wikipedia.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/static/images/svgSprite/Group-107.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
3 changes: 3 additions & 0 deletions app/static/images/svgSprite/social-facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/static/images/svgSprite/social-instagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/svgSprite/social-ok.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/svgSprite/social-twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/svgSprite/social-vk.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/static/images/svgSprite/social-wikipedia.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
143 changes: 122 additions & 21 deletions app/templates/pages/index.pug
Original file line number Diff line number Diff line change
@@ -55,25 +55,126 @@ block content
.text
h1 Имеем эксклюзивное право на производство Адыгейского сыра и производим по технологии НМПТ
.quality-mark
+icon('Слой-2', 'svg')
+icon('quality-mark', 'svg')
.eggs
.eggs-block
+icon('eggs-1', 'svg')
.eggs-block
+icon('eggs-2', 'svg')
.eggs-block
+icon('eggs-3', 'svg')
.eggs-block-1
p Производственные процессы регламентированы системой менеджмента качества ИСО 9001:2008
.eggs-block-2
p Для всех партнеров проводим трейд-маркетинговую поддержку
.eggs-block-3
p Регулярно проводим презентации продуктов и новинок
.eggs-block
+icon('eggs-4', 'svg')
.eggs-block
+icon('eggs-5', 'svg')
.eggs-block-4
p Помогаем со стратегией развития направления сбыта и маркетинговым позиционированием
.eggs-block-5
p Самостоятельно осуществляем доставку продукции до распределительных центров
.square
.eggs-row
.eggs-block
+icon('eggs-1', 'svg')
p Производственные процессы регламентированы системой менеджмента качества ИСО 9001:2008
.eggs-block
+icon('eggs-2', 'svg')
p Для всех партнеров проводим трейд-маркетинговую поддержку
.eggs-block
+icon('eggs-3', 'svg')
p Регулярно проводим презентации продуктов и новинок
.eggs-block
+icon('eggs-4', 'svg')
p Помогаем со стратегией развития направления сбыта и маркетинговым позиционированием
.eggs-block
+icon('eggs-5', 'svg')
p Самостоятельно осуществляем доставку продукции до распределительных центров
.eggs-block
+icon('eggs-6', 'svg')
.request
.container
h1 Задайте вопрос или оставьте заявку на сотрудничество
.form
form.application(action="", method="post")
.item
.name
input(type="text" name="name" placeholder="Ваше имя")
.phone
input(type="text" name="phone" placeholder="Ваш телефон")
.email
input(type="text" name="email" placeholder="Ваша почта для ответа")
.item
.question
textarea(name=question, cols="30", rows="10" placeholder="Ваш вопрос")
.otpravka
.item
.item-checkbox
input(type="checkbox", name="price-list", id="check1")
label(for="check1")
label.text(for="") Хочу получить прайс-лист
.item-checkbox
input(type="checkbox", name="consent", id="check2")
label(for="check2")
label.text(for="") Согласие на обработку персональных данных в соответствии с
a(href="#") политикой конфиденциальности
.item-submit
input(type="submit", value="Отправить +")
.about-us
.about-us-item
.item
h1 О нас
.item
a(href="#")
+icon('Group-107', 'svg')
.subscription
.item
h1 Подпишитесь на нас
.item
form.form-subscription(action="", method="post")
.box-email
input.email(type="email", name="email" placeholder="Введите почту")
.sending
input(type="submit", value="")
marquee НЕ СПАМИМ! ТОЛЬКО ПОЛЕЗНЫЙ КОНТЕНТ ∙ НЕ СПАМИМ! ТОЛЬКО ПОЛЕЗНЫЙ КОНТЕНТ ∙ НЕ СПАМИМ! ТОЛЬКО ПОЛЕЗНЫЙ КОНТЕНТ ∙ НЕ СПАМИМ! ТОЛЬКО ПОЛЕЗНЫЙ КОНТЕНТ
.request
.container
footer
.footer-menu
.item-product
.menu-link
a(href="#") Продукция
p Сыры, масла, сыворотка
.menu-about-us
a(href="#") О нас
p Кто мы и как работаем
.item
a(href="#") Политика конфиденциальности
a(href="#") Положение о персональных данных
a(href="#") СОУТ
.item-menu
.menu-link-right
a(href="#") Где купить
a(href="#") Новости и акции
a(href="#") Партнерам
a(href="#") Контакты
.information
.address
span Адрес
p 385600, Россия, Республика Адыгея, Гиагинский район, станица Гиагинская, ул. Ленина, 142
.office-hours
span Часы работы
p Понедельник ­–­­ Пятница 8:00 ­–­­ 17:00
.weekend
span Выходные дни
p Суббота, Воскресенье
.number
span Служба поддержки потребителей
a.tel(href="tel:+") 8 800 250-93-93
a.question(href="#") Задать вопрос
.social
p Мы в социальных сетях
.social-icon
a(href="#")
+icon('social-instagram', 'svg')
a(href="#")
+icon('social-vk', 'svg')
a(href="#")
+icon('social-twitter', 'svg')
a(href="#")
+icon('social-facebook', 'svg')
a(href="#")
+icon('social-ok', 'svg')
a(href="#")
+icon('social-wikipedia', 'svg')
.copyright
.item-title
p © ОАО Молочный завод «Гиагинский» 2020 г.
.item-link
p Сделано в
a(href="#") CloudMill

4 changes: 4 additions & 0 deletions desktop.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[ViewState]
Mode=
Vid=
FolderType=Generic
35 changes: 15 additions & 20 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -11,9 +11,12 @@ let gulp = require("gulp"),
svgSprite = require("gulp-svg-sprites"),
filter = require("filter"),
webpack = require("webpack-stream"),
webpackConfig = require("./webpack.config.js"),
gutil = require("gulp-util"),
getData = require("jade-get-data")("app/data"),
concat = require("gulp-concat"),
font2css = require("gulp-font2css").default,
errorHandler = require("gulp-error-handle"),
clean = require("gulp-clean");

//конфигурации
@@ -75,22 +78,6 @@ let _ = {
start: "index.js"
}
};
let WPConf = {
output: {
filename: "scripts.min.js"
},
module: {
rules: [
{
test: /\.m?js$/,
exclude: /(node_modules|bower_components)/,
use: {
loader: "babel-loader"
}
}
]
}
};

///Работа со стилями
gulp.task("scss", function() {
@@ -111,13 +98,21 @@ gulp.task("scss", function() {
});

/////Работа со скриптами
gulp.task("js", function() {
return gulp
const logError = function(err) {
//gutil.log(err);
this.emit('end');
};
gulp.task("js", function(callback) {
gulp
.src(_.js.dir + _.js.start)
.pipe(webpack(WPConf))
.pipe(webpack(webpackConfig))
.pipe(errorHandler(logError))
.pipe(gulp.dest(_.dist.js));

callback()
});


/////Работа с картинками
gulp.task("images", function() {
return gulp
@@ -231,7 +226,7 @@ gulp.task("clear-build", function() {
gulp.task("pre-scss", gulp.parallel("pngSprite", "svgSprite", "font2css"));
gulp.task("styles", gulp.series("pre-scss", "scss"));
gulp.task("after-clean", gulp.parallel("styles", "js", "pug", "images"));
gulp.task("after-build", gulp.parallel("browser-sync", "watch"));
gulp.task("after-build", gulp.parallel("browser-sync", "watch"));

gulp.task("build", gulp.series("clear-build", "after-clean"));
gulp.task("dev", gulp.series("build", "after-build"));
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gulpBuildWebDevery",
"version": "0.4.0",
"version": "0.7.0",
"main": "index.js",
"author": "Dmitry Antonov",
"description": "https://github.com/webdevery/gulp-package.git",
@@ -9,7 +9,9 @@
"@babel/core": "^7.8.7",
"@babel/preset-env": "^7.8.7",
"autoprefixer": "^9.7.4",
"babel-core": "^6.26.3",
"babel-loader": "^8.0.6",
"babel-preset-latest": "^6.24.1",
"bemto.pug": "^2.1.0",
"browser-sync": "^2.26.7",
"core-js": "^3.6.4",
@@ -18,20 +20,22 @@
"gulp-clean": "^0.4.0",
"gulp-concat": "^2.6.1",
"gulp-cssnano": "^2.1.3",
"gulp-error-handle": "^1.0.1",
"gulp-font2css": "^0.1.2",
"gulp-imagemin": "^7.1.0",
"gulp-postcss": "^8.0.0",
"gulp-pug": "^4.0.1",
"gulp-rename": "^2.0.0",
"gulp-sass": "^4.0.2",
"gulp-svg-sprites": "^4.1.2",
"gulp-util": "^3.0.8",
"gulp.spritesmith": "^6.11.0",
"jade-get-data": "^1.0.1",
"merge-stream": "^2.0.0",
"normalize.css": "^8.0.1",
"postcss-discard-comments": "^4.0.2",
"postcss-import": "^12.0.1",
"webpack": "^4.42.0",
"webpack-cli": "^3.3.11",
"webpack-stream": "^5.2.1"
},
"dependencies": {
19 changes: 19 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// webpack.config.js


module.exports = {
output: {
filename: "scripts.min.js"
},
module: {
rules: [
{
test: /\.m?js$/,
exclude: /(node_modules|bower_components)/,
use: {
loader: "babel-loader"
}
}
]
}
};
940 changes: 885 additions & 55 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 9673771

Please sign in to comment.