Skip to content

Add branch aleksandr #43

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
aleksandrhristi wants to merge 8 commits into
base: development
Choose a base branch
from
Open

Add branch aleksandr #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4419107
- add less file for aleksandrForm
aleksandrhristi Oct 7, 2017
4cdd16e
- add sheet aleksandrForm
aleksandrhristi Oct 7, 2017
1c2f7ff
- alina page change save
aleksandrhristi Oct 7, 2017
d9d270f
- save change
aleksandrhristi Oct 7, 2017
5793cbf
- delete ","
aleksandrhristi Oct 7, 2017
13c3fc4
- added pages Pasha, Alina, AleksandrForm
aleksandrhristi Oct 7, 2017
952e62f
- add layout: fedoseev, alina, aleksandrForm
aleksandrhristi Oct 7, 2017
7e3952d
add files aleksandrhristi
course-js Oct 7, 2017
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
39 changes: 0 additions & 39 deletions source/app/app.js
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions source/app/filters/humanize.filter.js
View file
Open in desktop

This file was deleted.

123 changes: 123 additions & 0 deletions source/app/states/aleksandr/aleksandrForm.controller.js
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 44 additions & 0 deletions source/app/states/aleksandr/aleksandrForm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@

<div class="container-fluid">
<h3>Введите ваши данные и нажмите сохранить</h3>
<div id="aleksFormFirst" class="container">

<div ng-controller="aleksandrFormController">
<input class="col-xs-6" ng-model="vm.nameAleksandrForm" placeholder="Введите ваш логин" />
<p class="col-xs-6"> Ваш логин: {{vm.nameAleksandrForm}} </p>
<input type="password" class="col-xs-6" ng-model="vm.upassword" placeholder="Введите вашу фамилию"/>
<p class="col-xs-6"> Ваш пароль: {{vm.upassword}} </p>
<input class="col-xs-6" ng-model="vm.emailUserAleksandrForm" placeholder="Введите ваш email"/>
<p class="col-xs-6"> Ваш email: {{vm.emailUserAleksandrForm}} </p>
<input class="col-xs-6" ng-model="vm.telefoneAleksandrForm" placeholder="Введите ваш телефон"/>
<p class="col-xs-6"> Ваш телефон: {{vm.telefoneAleksandrForm}} </p>

<input type="button" class="btn btn-primary" ng-click="vm.setInfoUserAleksandrForm($scope)" value="Сохранить">
</div>


</div >

<h3>Карточка посетителя, сюда сохраняются ваши введенные данные</h3>


<div id="aleksFormLast" class="container">

<h4 class="col-xs-6 inputInfo"></h4>
<h4 class="col-xs-6 ">Ваш логин</h4>

<br>
<h4 class="col-xs-6 inputInfo"></h4>
<h4 class="col-xs-6 ">Ваш пароль</h4>

<br>

<h4 class="col-xs-6 inputInfo"></h4>
<h4 class="col-xs-6">Ваш email</h4>
<br>

<h4 class="col-xs-6 inputInfo"></h4>
<h4 class="col-xs-6 ">Ваш телефон</h4>

</div>
</div>
26 changes: 26 additions & 0 deletions source/app/states/aleksandr/aleksandrForm.module .js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

'use strict';

angular

.module('layout.aleksandrForm', [
])

.config( function ( $stateProvider ) {

$stateProvider.state('layout.aleksandrForm', {
url: '/aleksandrForm',
templateUrl: 'app/states/aleksandr/aleksandrForm.html',
controller: 'aleksandrFormController',

resolve: {
// resolve это убъект уникальных для этой страници зависимостей
// имена полей обьектов могут быть затянуты в контроллер твоей страници как зависимость
// обычно используеться для выполнения важных для страници запросов
// без которых страницу будет невозможно нарисовать
fromRoot: function ( user ) {
return {user: user, prepered: true};
}
}
});
});
4 changes: 2 additions & 2 deletions source/app/states/alina/alina.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="homePage" class="container">
<div class="container">

<div class="jumbotron text-center">
<h1>'Allo, 'Allo!</h1>
<h1>'Hello my friends!</h1>
<p class="lead">
<img src="https://upload.wikimedia.org/wikipedia/en/thumb/e/e3/Yeoman.svg/256px-Yeoman.svg.png" alt="I'm Yeoman"><br>
angular-dft alwaes a pleasure scaffolding your application.
Expand Down
3 changes: 3 additions & 0 deletions source/app/states/dima/dima.controller.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions source/app/states/dima/dima.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container">

<div id="dimaPage" class="container">
<div class="jumbotron text-center">
<h1>'Привет, 'Привет!</h1>
<p>{{ vm.some }}</p>
<p class="lead">
<img src="https://upload.wikimedia.org/wikipedia/en/thumb/e/e3/Yeoman.svg/256px-Yeoman.svg.png" alt="I'm Yeoman"><br>
angular-dft alwaes a pleasure scaffolding your application.
Expand Down
185 changes: 184 additions & 1 deletion source/app/states/fedoseev/fedoseev.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,187 @@
<div id="fedoseev" class="container">
<div id="fed" >
<div class="bodyContainer">
<header>
<div class="container">
<div class="row">
<img src="../../../assets/images/TimeLine/Logo.png" alt="">
<div class="col-lg-6 socials">
<p>Time Line the WordPress theme</p>
<a href=""><img src="../../../assets/images/TimeLine/like.png" alt=""></a>
<a href="" class="soc"></a>
<a href="" class="soc"></a>
<a href="" class="soc"></a>
<a href="" class="soc"></a>
<a href="" class="soc"></a>
</div>
</div>
</div>
<nav class="navbar ">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li ><a href="">Home </a></li>
<li><a href="">About</a></li>
<li><a href="">Services</a></li>
<li class="dropdown">
<a href="" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Portfolio <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="">Action</a></li>
<li><a href="">Another action</a></li>
<li><a href="">Something else here</a></li>
<li role="separator" class="divider"></li>
<li><a href="">Separated link</a></li>
<li role="separator" class="divider"></li>
<li><a href="">One more separated link</a></li>
</ul>
</li>
<li><a href="">Blog</a></li>

</ul>
<form class="navbar-form navbar-right" role="search">
<input type="text" class="search" placeholder="Search..."><i class="fa fa-search" aria-hidden="true"></i>
</form>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
<div class="bl"></div>
</nav>
<div class="datePick">
<div class="year">2012</div>
<div class="year active">2011
<div><a href="">Jan</a></div>
<div><a href="">Feb</a></div>
<div><a href="">Mar</a></div>
<div class="active"><a href="">Apr</a></div>
<div><a href="">May</a></div>
<div><a href="">Jun</a></div>
<div><a href="">Jul</a></div>
<div><a href="">Aug</a></div>
<div><a href="">Sep</a></div>
<div><a href="">Oct</a></div>
<div><a href="">Nov</a></div>
<div><a href="">Dec</a></div>
</div>
<div class="year">2010</div>
<div class="year">2009</div>
<div class="year">2008</div>
<div class="year">2007</div>
<div class="year">2006</div>
</div>
</header>
<div class="wrapper">
<div class="container">
<div class="row">
<div class="col-sm-6 col-xs-6 col-md-3">
<div class="thumbn">
<p><span>25</span>.04.2011</p>
<div class="thumb-unit">
<div class="thumb-overlay">
<h1>Omnis voluptas. assumenda est omnis doloresd repelledus.</h1>
</div>
</div>
<div class="caption">
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugiat aperiam adipisci, saepe ea, porro ad eveniet nihil ipsum reiciendis labore magni, nesciunt voluptatibus sint voluptatum aspernatur magnam provident veritati aliquid magnam provident veritatis.</p>
<p><a href="#" class="detailsBtn " >Details</a> <a href="#" class="comments">19</a></p>
</div>
</div>
</div>
<div class="col-sm-6 col-xs-6 col-md-3">
<div class="thumbn">
<p><span>21</span>.04.2011</p>
<div class="thumb-unit">
<div class="thumb-overlay">
<h1>Omnis voluptas. assumenda est omnis doloresd repelledus.</h1>
</div>
</div>
<div class="caption">
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugiat aperiam adipisci, saepe ea, porro ad eveniet nihil ipsum reiciendis labore magni, nesciunt voluptatibus sint voluptatum aspernatur magnam provident veritati aliquid magnam provident veritatis.adsa sadwq qwe asdasd as</p>
<p><a href="#" class="detailsBtn " >Details</a> <a href="#" class="comments">19</a></p>
</div>
</div>
</div>
<div class="col-sm-6 col-xs-6 col-md-3">
<div class="thumbn">
<p><span>18</span>.04.2011</p>
<div class="thumb-unit">
<div class="thumb-overlay">
<h1>Omnis voluptas. assumenda est omnis doloresd repelledus.</h1>
</div>
</div>
<div class="caption">
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugiat aperiam adipisci, saepe ea, porro ad eveniet nihil ipsum reiciendis labore magni, nesciunt voluptatibus sint voluptatum aspernatur magnam provident veritati aliquid magnam provident veritatis.</p>
<p><a href="#" class="detailsBtn " >Details</a> <a href="#" class="comments">19</a></p>
</div>
</div>
</div>
<div class="col-sm-6 col-xs-6 col-md-3">
<div class="thumbn">
<p><span>16</span>.04.2011</p>
<div class="thumb-unit">
<div class="thumb-overlay">
<h1>Omnis voluptas. assumenda est omnis doloresd repelledus.</h1>
</div>
</div>
<div class="caption">
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugiat aperiam adipisci, saepe ea, porro ad eveniet nihil ipsum reiciendis labore magni, nesciunt voluptatibus sint voluptatum aspernatur magnam provident veritati aliquid magnam provident veritatis.</p>
<p><a href="#" class="detailsBtn " >Details</a> <a href="#" class="comments">19</a></p>
</div>
</div>
</div>
</div>
</div>


<div class="purchase">
<div class="container">
<a href=" " class="floatRight"></a>
<h2>Time Line is the new way to present your blog entries and organize an archives. Portfolio included.</h2>
</div>
</div>
</div>

<footer >
<div class="container">
<div class="row">
<article class="col-sm-12 col-md-4">
<h1>About</h1>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nemo iusto fugiat excepturi, maiores sunt quibusdam ipsa, doloremque quisquam nulla, ratione magnam odio voluptatum non pariatur reiciendis! Quibusdam laborum, nesciunt pariatur reiciendis! sdam labonesciunt omnis?</p>
<p class="marked"><span>«</span>Consectetur adipisicing elit. Quam iusto, libero dolore similique et, commodi laudantium sequi illo harum eveniet ex vel nostrum ipsa quae repellendus eius quas nemo Lorem ipsum dolor sit amet, c minus.</p>
</article>
<article class="recent col-sm-6 col-md-4">
<h1>Recent works</h1>
<a href=""><img src="../../../assets/images/TimeLine/Latest_1.png" alt=""></a>
<a href=""><img src="../../../assets/images/TimeLine/Latest_2.png" alt=""></a>
<a href=""><img src="../../../assets/images/TimeLine/Latest_3.png" alt=""></a>
<a href=""><img src="../../../assets/images/TimeLine/Latest_4.png" alt=""></a>
</article>
<article class="col-sm-6 col-md-4">
<h1>Get in touch</h1>
<form action="" id='contactUs'>
<input type="text" id="Name" placeholder="Name"><p>* required</p>
<input type="text" id="Email" placeholder="Email"><p>* required</p>
<textarea name="comment" placeholder="Message" id="comment" cols="30" rows="4"></textarea>
<input type="submit" value="Submit">
</form>
</article>
</div>
</div>
</footer>
<div class="copyrights">
<div class="container">
<p>2012 © Company Name</p>
<p class="floatRight">WordPress Theme by PandaThemes</p>
</div>
</div>

</div>

</div>
26 changes: 0 additions & 26 deletions source/app/states/home/home.module.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion source/app/states/layout.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ angular
toastr.error('Sorry but this state not specified by scaffolding.', state);
}
};

});
Loading