Skip to content

saving, filter, loading #1

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
vizhukova wants to merge 3 commits into
base: master
Choose a base branch
from
Open

saving, filter, loading #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f5cd1c
saving, filter, loading
Oct 1, 2015
717b566
some changes
Nov 28, 2015
53c08f2
some changes
Nov 28, 2015
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
1 change: 1 addition & 0 deletions .idea/.name
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions .idea/Angular.iml
View file
Open in desktop

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

14 changes: 14 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

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

217 changes: 217 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

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

Binary file added basket.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.
6 changes: 5 additions & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,9 @@
"dependencies": {
"angular": "~1.4.6",
"bootstrap": "~3.3.5"
}
},
"homepage": "https://github.com/IntersogLABs/Angular",
"authors": [
"vizhukova <veronikazhukova@gmail.com>"
]
}
48 changes: 45 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,56 @@
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap-theme.min.css"/>
</head>
<body ng-app="FirstApplication">
<div id="load" style="text-align: center">Loading...</div>

<div style="display: inline-block; width: 80%">
<div class="row" ng-controller="ProductsListController" id="list" style="text-align: center">
<input type="text" ng-model="searchVoucher" style="margin: 20px 113px;; width: 480px;" placeholder="Search..." list="search"/>
<datalist id="search">
<option>food</option>
<option>drink</option>
<option>pizza</option>
<option>other</option>
</datalist>
<div id="basket" style="display: inline-block"><img src="basket.jpg" style="width: 60px" ng-click="showOrder()"/></div>

<div>
<div class="row" ng-controller="ProductsListController">
<div ng-repeat="product in products">
<div role="dialog">
<div class="modal-dialog" style="display: none">

<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close close-modal" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Your order</h4>
</div>
<<<<<<< HEAD
<div ng-hide="activeTab==0" class="content">
<div class="comments">
<div class="comment" ng-repeat="comment in product.comments">
<div class="author">{{comment.author}}</div>
<div class="message">{{comment.message}}</div>
</div>
<div class="post-comment">
<textarea ng-model="newComment"></textarea>
<div class=" btn" ng-click="postComment()">Post</div>
</div>
=======
<div class="modal-body">
<div ng-repeat="product in orders">
<order data="product"></order>
>>>>>>> origin/master
</div>
</div>
<div class="modal-footer"></div>
</div>

</div>

<div ng-repeat="product in products | filterCat:searchVoucher">
<product data="product"></product>
</div>
</div>
</div>
</div>

</body>
Expand Down
Loading