Skip to content

Lab6 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aadereiko wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Lab6 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c190b33
added files
aadereiko Feb 19, 2018
803187c
There are in folders pictures with comments
aadereiko Feb 19, 2018
5019812
new mockup
aadereiko Feb 26, 2018
79df154
my main page
aadereiko Feb 26, 2018
dbfda48
changed index and styles
aadereiko Mar 3, 2018
1d315b3
new Adapted css
aadereiko Mar 4, 2018
56c54ef
changed footer
aadereiko Mar 4, 2018
2e6020d
changed footer2
aadereiko Mar 4, 2018
157c0b4
added js file
aadereiko Mar 5, 2018
59a21d7
changed footer and js-code
aadereiko Mar 18, 2018
c94ade0
changed data on date
aadereiko Mar 18, 2018
5d86c8b
changed comments
aadereiko Mar 19, 2018
0ca2dbd
5 lab: DOM
aadereiko Apr 4, 2018
e363d28
changes DOM and JS
aadereiko Apr 9, 2018
e345c93
changed comments
aadereiko Apr 13, 2018
60b9adb
lab 6
aadereiko May 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added UI/fonts/11451.otf
View file
Open in desktop
Binary file not shown.
Binary file added UI/fonts/huxley/a_huxleycaps-italic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added UI/fonts/st/Stolzl-Thin.eot
View file
Open in desktop
Binary file not shown.
4,406 changes: 4,406 additions & 0 deletions UI/fonts/st/Stolzl-Thin.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/fonts/st/Stolzl-Thin.ttf
View file
Open in desktop
Binary file not shown.
Binary file added UI/fonts/st/Stolzl-Thin.woff
View file
Open in desktop
Binary file not shown.
Binary file added UI/fonts/st/Stolzl-Thin.woff2
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions UI/fonts/st/font.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@font-face {
font-family: 'Stolzl-Thin';
src: url('Stolzl-Thin.eot');
src: url('Stolzl-Thin.woff2') format('woff2'),
url('Stolzl-Thin.woff') format('woff'),
url('Stolzl-Thin.ttf') format('truetype'),
url('Stolzl-Thin.svg#Stolzl-Thin') format('svg'),
url('Stolzl-Thin.eot?#iefix') format('embedded-opentype');
font-weight: normal;
font-style: normal;
}

96 changes: 96 additions & 0 deletions UI/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="UTF-8">
<title>Aperture</title>
<link rel="stylesheet" href="styles.css">
</head>
<body>
<div id="error">
<p>ERROR</p>
<p id="textError"></p>
</div>
<div class="editFormPost" id="editFormPostId">
<div id ="editPhotoDrop">
<p> Выберите новую картинку.</p>
<div id="galleryEdit"></div>
</div>
<label class="descriptionAdding">Описание: <input type="text" class="inputAddingDescr" id="iptDscrEdit"></label>
<label class="descriptionAdding">Хэштеги: <input type="text" class="inputAddingHashtags" id="iptHashtagsEdit"></label>
<select class="addingHashtags" name="Популярные хэштеги" title="Популярные хэштеги" size="1" id ="selectEdit">
<option disabled> Выберите популярный хэштег</option>
<option value =""></option>
<option>Закат</option>
<option>Рассвет</option>
<option>Солнце</option>
<option>Луна</option>
</select>
<p class="descriptionAdding" id ="userEdit">Пользователь: </p>
<p class="descriptionAdding" id ="dataEdit">Дата: </p>
<img src="./pictures/menu/add.png" id="editFormAdd" class="menu-picture-margin" alt="Добавить пост">
</div>

<div class="formAddingPost" id="formAddPost">
<div id ="addPhotoDrop">
<p> Переместите сюда файл.</p>
<!--<input type="file" id="loaderFileStand" multiple accept="image/*" onchange="handleFiles(this.files)">-->
<div id="gallery"></div>
</div>
<label class="descriptionAdding">Описание: <input type="text" class="inputAddingDescr" id="iptDscr"></label>
<label class="descriptionAdding">Хэштеги: <input type="text" class="inputAddingHashtags" id="iptHashtags"></label>
<select class="addingHashtags" name="Популярные хэштеги" title="Популярные хэштеги" size="1" id ="selectAdd">
<option disabled> Выберите популярный хэштег</option>
<option value =""></option>
<option>Закат</option>
<option>Рассвет</option>
<option>Солнце</option>
<option>Луна</option>
</select>
<p class="descriptionAdding" id ="userAdding">Пользователь: </p>
<p class="descriptionAdding" id ="dataAdding">Дата: </p>
<img src="./pictures/menu/add.png" id="addingFormAdd" class="menu-picture-margin" alt="Добавить пост">
</div>
<div class="grayBackground" id="grayBckd"></div>
<div class="formAuthorization" id="formAuth">
<img src="./pictures/authorization/logoWithAuth.png" alt="Лого" class="authLogo">
<div class="authInputes">
<p class="pAuth">Авторизация</p>
<div class="inpDivAuth"><input class="inputAuth" type="text" value="Логин" id="logAuth"></div>
<div class="inpDivAuth"><input class="inputAuth" type="text" value="Пароль" id="passAuth"></div>
<button class="enterBtn" id="loginBtn">Вход</button>
</div>
</div>
<div>
<header>
<img src="./pictures/logo/apertureText.png" alt="Aperture" class="logoImg">
</header>
<!--block of filters-->
<div class="filters">
<div class="filter-blocks"><label>Логин: <input class="filter-input" type="text" name="firstname" id="login">
</label></div>
<div class="filter-blocks"><label>Хэштеги: <input class="filter-input" type="text" name="firstname" id="hash">
</label></div>
<div class="filter-blocks"><label>Дата: <input class="filter-input" type="text" name="firstname" id="date">
</label></div>
<select class="filter-blocks" name="Популярные хэштеги" title="Популярные хэштеги" size="1" id = "selectFilter">
<option disabled> Выберите популярный хэштег</option>
<option value =""></option>
<option>Закат</option>
<option>Рассвет</option>
<option>Солнце</option>
<option>Луна</option>
</select>
<div class="filters-picture" id="filtersPicture"></div>
</div>
<div class="posts">
</div>
<div class="downloadMore" id="downMore"><img src="./pictures/downloadYet.png" class="downloadMore" alt="Загрузить еще"></div>
<div class="menu" id="menu">
<footer>
Aperture, Адерейко, 6 гр, 2к, 19.02, aadereiko@gmail.com
</footer>
<script src="scrypt.js"></script>
</div>
</div>
</body>
</html>
25 changes: 25 additions & 0 deletions UI/information.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[
{
"id":"1",
"description":"красота!",
"createdAt":"2016-02-29T11:02:21.000Z",
"author":"Djadka.by","authorPhoto":
"./pictures/menu/mainPhoto.png",
"photoLink":
"http://i.artfile.ru/1920x1080_663213_%5Bwww.ArtFile.ru%5D.jpg",
"hashtags":["природа","пейзаж","1","2","3434123413241323123213123123"],
"likes":["aadereiko","taxi","djadka.by"],
"deleted":false},
{
"id":"2",
"description":"В горах",
"createdAt":"2016-03-26T12:03:41.000Z",
"author":"aadereiko",
"authorPhoto":"./pictures/post/post1/avaOther.png",
"photoLink":"https://s1.1zoom.ru/big0/81/Russia_Mountains_Lake_469922.jpg",
"hashtags":["природа","пейзаж","горы"],
"likes":["aadereiko","arina"],
"deleted":false},
{
"id":"3",
"description":"Вода","createdAt":"2018-05-02T20:52:44.840Z","author":"aadereiko","authorPhoto":"./pictures/post/post1/avaOther.png","photoLink":"https://i.ytimg.com/vi/9NKyArdusj8/maxresdefault.jpg","hashtags":["вода","горы"],"likes":["djadka.by"],"deleted":false},{"id":"4","description":"Дерево","createdAt":"2018-05-02T20:52:44.840Z","author":"aadereiko","authorPhoto":"./pictures/post/post1/avaOther.png","photoLink":"http://www.fonstola.ru/download.php?file=201506/1920x1200/fonstola.ru-187130.jpg","hashtags":["дерево","пейзаж"],"likes":["aadereiko","taxi","djadka.by","pipi"],"deleted":false},{"id":"5","description":"Водопад","createdAt":"2018-05-02T20:52:44.840Z","author":"Djadka.by","authorPhoto":"./pictures/menu/mainPhoto.png","photoLink":"https://s1.1zoom.ru/big3/137/371625-svetik.jpg","hashtags":["водопад","пейзаж"],"likes":["aadereiko","taxi","djadka.by","taxi","remember"],"deleted":false},{"id":"6","description":"На лугу","createdAt":"2018-05-02T20:52:44.840Z","author":"Djadka.by","authorPhoto":"./pictures/menu/mainPhoto.png","photoLink":"http://desktopwallpapers.org.ua/pic/201211/2560x1600/desktopwallpapers.org.ua-21746.jpg","hashtags":["луг","лужок"],"likes":["aadereiko"],"deleted":false},{"id":"7","description":"Цветы","createdAt":"2018-05-02T20:52:44.840Z","author":"Djadka.by","authorPhoto":"./pictures/menu/mainPhoto.png","photoLink":"https://s1.1zoom.ru/big0/328/252677-svetik.jpg","hashtags":["цветы"],"likes":["mashinka","autos"],"deleted":false},{"id":"8","description":"Одуванчики","createdAt":"2018-05-02T20:52:44.840Z","author":"Djadka.by","authorPhoto":"./pictures/menu/mainPhoto.png","photoLink":"https://storge.pic2.me/c/1360x800/981/584872400b299.jpg","hashtags":["Одуваны","Машина"],"likes":["bojenka"],"deleted":false},{"id":"9","description":"F430","createdAt":"2018-05-02T20:52:44.840Z","author":"aadereiko","authorPhoto":"./pictures/post/post1/avaOther.png","photoLink":"https://mosautoshina.ru/i/auto/ferrari_f430_2008.jpg","hashtags":["Ferrari","F430"],"likes":["tachki","chai","ss"],"deleted":false},{"id":"10","description":"Ламборгини","createdAt":"2018-05-02T20:52:44.840Z","author":"cars","authorPhoto":"http://skachat-kartinki.ru/img/picture/Oct/04/417e63b46e74be245aca2a969133b567/4.jpg","photoLink":"https://w-dog.ru/wallpapers/1/4/497672376362454/lamborghini-aventador-lp700-4-avto-superkar-doroga-zelnyj-green-nebo.jpg","hashtags":["Машины"],"likes":["cars","taxi"],"deleted":false},{"id":"11","description":"59","createdAt":"2018-05-02T20:52:44.840Z","author":"cars","authorPhoto":"http://skachat-kartinki.ru/img/picture/Oct/04/417e63b46e74be245aca2a969133b567/4.jpg","photoLink":"http://skachat-kartinki.ru/img/picture/Oct/04/417e63b46e74be245aca2a969133b567/4.jpg","hashtags":["59"],"likes":["aadereiko","taxi","djadka.by","egor"],"deleted":false},{"id":"12","description":"Lamborghini","createdAt":"2018-05-02T20:52:44.840Z","author":"Djadka.by","authorPhoto":"./pictures/menu/mainPhoto.png","photoLink":"https://autowall.ru/wallpapers/original/29402.jpg","hashtags":["Одуваны","Детки","Lamborghini"],"likes":["pacani","djadka.by"],"deleted":false},{"id":"13","description":"Тренажер","createdAt":"2018-05-02T20:52:44.840Z","author":"aadereiko","authorPhoto":"./pictures/post/post1/avaOther.png","photoLink":"http://lolopepe.kg/wp-content/uploads/2017/08/body_src_1021.jpg","hashtags":["качаться","лето","Одуваны","Детки"],"likes":[],"deleted":false},{"id":"14","description":"Кач","createdAt":"2018-05-02T20:52:44.840Z","author":"trener","authorPhoto":"https://onsport.by/upload/resize_cache/iblock/23a/540_350_187651f930238ae42a94b52b10d934176/23a8370963af42ff33de0d9ef78f6c60.jpg","photoLink":"https://onsport.by/upload/resize_cache/iblock/23a/540_350_187651f930238ae42a94b52b10d934176/23a8370963af42ff33de0d9ef78f6c60.jpg","hashtags":["тренажер"],"likes":["kekochka","life","sport"],"deleted":false},{"id":"15","description":"Зал","createdAt":"2018-05-02T20:52:44.840Z","author":"trener","authorPhoto":"https://onsport.by/upload/resize_cache/iblock/23a/540_350_187651f930238ae42a94b52b10d934176/23a8370963af42ff33de0d9ef78f6c60.jpg","photoLink":"https://onsport.by/upload/resize_cache/iblock/fcf/540_350_187651f930238ae42a94b52b10d934176/fcf7286441ab8fd5ed140c65282a35ec.png","hashtags":["ВЗале","Сидим"],"likes":["brother","syster"],"deleted":false},{"id":"16","description":"crupo7","createdAt":"2018-05-02T20:52:44.840Z","author":"films","authorPhoto":"https://im0-tub-by.yandex.net/i?id=3979f00131c7422720695dcb01d2dce2&n=13","photoLink":"https://static.kinoafisha.info/k/movie_posters/1920x1080/upload/movie_posters/7/8/9/8143987/804fe6d00e2cfb98841de815d5a3fce0.jpg","hashtags":["Antonio"],"likes":["aadereiko"],"deleted":false},{"id":"17","description":"Найди меня","createdAt":"2018-05-02T20:52:44.840Z","author":"films","authorPhoto":"https://im0-tub-by.yandex.net/i?id=3979f00131c7422720695dcb01d2dce2&n=13","photoLink":"https://www.kinocitymall.ru/images/posters/fdad9ac238d6034e.jpg","hashtags":["Бумажные города"],"likes":["lubov","zhizhn"],"deleted":false},{"id":"18","description":"Без компромиссов","createdAt":"2018-05-02T20:52:44.840Z","author":"films","authorPhoto":"https://im0-tub-by.yandex.net/i?id=3979f00131c7422720695dcb01d2dce2&n=13","photoLink":"http://glass-kino.ucoz.ru/_nw/15/46383748.jpg","hashtags":["стэтхем"],"likes":[],"deleted":false},{"id":"19","description":"Смертельная гонка","createdAt":"2018-05-02T20:52:44.840Z","author":"cars","authorPhoto":"http://skachat-kartinki.ru/img/picture/Oct/04/417e63b46e74be245aca2a969133b567/4.jpg","photoLink":"https://paris-life.info/wp-content/uploads/2016/11/eifeel-tower-paris-1068x712.jpg","hashtags":["гонка"],"likes":["shmonka","dashka"],"deleted":false},{"id":"20","description":"Лучшее во мне","createdAt":"2018-05-02T20:52:44.840Z","author":"films","authorPhoto":"https://im0-tub-by.yandex.net/i?id=3979f00131c7422720695dcb01d2dce2&n=13","photoLink":"https://disput.azstatic.com/uploads/monthly_2017_06/596362.jpg.80fcd483cdbed4a9572f79ce745fd097.jpg","hashtags":["InMe"],"likes":["arts","draws","films"],"deleted":false}]"
Binary file added UI/pictures/authorization/enter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/authorization/logoWithAuth.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/downloadYet.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/filters/filter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/filters/filterAnim.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/logo/apertureText.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/menu/add.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/menu/exit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/menu/home.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/menu/mainPhoto.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/post/NotPressed.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/post/delete.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/post/edit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/post/like.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/post/post1/avaOther.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/post/post1/gory-cvety-rassvet-solnce.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/post/post2/Russia_Mountains_Lake_469922.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/post/post3/index.php
View file
Open in desktop
Binary file not shown.
Binary file added UI/pictures/post/post4/oboik.ru_34817.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/pictures/post/post5/niceimage.ru-41516.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading