Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* added form dialog for entering grocery cost * need to work on getting grocery cost data * made grocery cost dialog popup correct hxw and all other dialog cards unaffected * added oauth btns to signup page * oauth switched to live and properly displays name
- Loading branch information
1 parent
bc1e873
commit 9dcc517
Showing
5 changed files
with
56 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,23 @@ | ||
<md-dialog aria-label="Cost"> | ||
<form ng-cloak id="cost"> | ||
<md-toolbar> | ||
<div class="md-toolbar-tools"> | ||
<h2>Groceries Cost</h2> | ||
<span flex></span> | ||
<md-button class="md-icon-button" ng-click="cancel()"> | ||
<i class="material-icons" aria-label="Close dialog">close</i> | ||
</md-button> | ||
</div> | ||
</md-toolbar> | ||
<md-dialog-content> | ||
<!-- COST --> | ||
<md-input-container> | ||
<label>Groceries Total</label> | ||
<input placeholder="$" ng-model="price"> | ||
</md-input-container> | ||
</md-dialog-content> | ||
<md-dialog-actions layout="row" layout-align="end"> | ||
<md-button ng-click="submitPrice(+price)" type="submit"> | ||
Save | ||
<md-content flex> | ||
<navbar class="nav" header="Grocery List"></navbar> | ||
<div id="groceries" layout="row"> | ||
<p ng-if="!showList"><a ui-sref="meals">Add some meals</a> to your grocery list to see your personalized shopping list here!</p> | ||
<section class="grocery-list" ng-if="showList"> | ||
<md-button class="md-icon-button" ng-click="makePDF(sections)"> | ||
<md-tooltip md-direction="right">Download this list as a PDF</md-tooltip> | ||
<ng-md-icon icon="file_download"></ng-md-icon> | ||
</md-button> | ||
<md-button ng-click="cancel()"> | ||
Cancel | ||
<md-button class="md-icon-button" ng-click="showCostForm()"> | ||
<md-tooltip md-direction="right">Input grocery Cost</md-tooltip> | ||
<ng-md-icon icon="attach_money"></ng-md-icon> | ||
</md-button> | ||
</md-dialog-actions> | ||
</form> | ||
</md-dialog> | ||
<div ng-repeat="section in headers | orderBy : section"> | ||
<h3> {{ section }} </h3> | ||
<md-list-item ng-repeat="item in sections[section] | orderBy: 'name'"> | ||
<p><strong>{{item.name}}</strong> || {{round(item.amount)}} {{item.unitLong}} </p> | ||
<md-checkbox class="md-secondary" ng-model="item.wanted"></md-checkbox> | ||
</md-list-item> | ||
</div> | ||
</section> | ||
</div> | ||
</md-content> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,4 +23,8 @@ | |
|
||
#signup-form { | ||
@include form-body; | ||
a { | ||
border-bottom: none; | ||
padding: 5px; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters