Skip to content

Commit dd6b82e

Browse files
committed
README updates, render no orders on gomocha-ba, smaller nav icons
1 parent 6a87142 commit dd6b82e

File tree

6 files changed

+670
-646
lines changed

6 files changed

+670
-646
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ GoMocha is a full-stack, monolithic geolocation food and drink ordering system.
66
GoMocha Consumer allows a customer to select a coffee shop within a given radius of their current location, customize their order, and place their order. GoMocha Consumer will calculate how long it will take the customer to arrive at the coffee shop using the customer's location, the selected coffee shop location, and their selected method of transportation. This sends an order to GoMocha-BA, which displays a list of incoming orders. Each order has a timer component that tells the coffee shop approximately when the customer is going to arrive given the information collected mentioned above. If a customer selects a desired pickup time, the timer will adjust and calculate the difference in the current time and the customer's selected pickup time. Orders can then be marked as complete on GoMocha-BA once the coffee shop has handed them off to their customer.
77

88
To see GoMocha live in action, open a browser tab for <a href="http://gomocha.herokuapp.com/">GoMocha Consumer</a> and a tab for <a href="https://gomocha.herokuapp.com/admin">GoMocha-BA</a>. All you have to do is place an order on GoMocha Consumer, and then watch GoMocha-BA receive the order.
9+
<br />
10+
Front end source code for GoMocha Consumer can be found in the `/customer` directory, and `/business-admin` for GoMocha-BA. Back end source code can be found in `/routers`.
911
<br /><br />
1012
GoMocha Consumer
1113
<img src="public/img/select-shop-custom-order.png" style="width: 400px" />

business-admin/components/BusinessAdminView/Nav/Nav.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ var Nav = React.createClass({
66
return (
77
<div className="nav-container">
88
<div className="nav-icons">
9-
<i className="fa fa-tachometer fa-3x" aria-hidden="true"></i>
10-
<i className="fa fa-history fa-3x" aria-hidden="true"></i>
9+
<i className="fa fa-tachometer fa-2x" aria-hidden="true"></i>
10+
<i className="fa fa-history fa-2x" aria-hidden="true"></i>
1111
</div>
1212
</div>
1313
)

business-admin/components/BusinessAdminView/Nav/nav.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.nav-container {
22
width: 100%;
3-
height: 4em;
3+
height: 3em;
44
background: #40B284;
55
text-align: center;
66
padding-top: 1em;

business-admin/components/BusinessAdminView/OrdersContainer/OrdersContainer.jsx

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,19 @@ var OrdersContainer = React.createClass({
3939
completeOrder={this.props.completeOrder} />
4040
}, this);
4141

42-
return (
43-
<div className="ba-orders-container">
44-
{orders}
45-
</div>
46-
)
42+
if (orders.length > 0) {
43+
return (
44+
<div className="ba-orders-container">
45+
{orders}
46+
</div>
47+
)
48+
}
49+
else if (orders.length === 0) {
50+
return (
51+
<div className="no-orders">No current orders!</div>
52+
)
53+
}
54+
4755
}
4856

4957

business-admin/components/BusinessAdminView/OrdersContainer/orders-container.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,9 @@
22
width: 100%;
33
margin: 0 auto;
44
}
5+
6+
.no-orders {
7+
font-size: 2.5em;
8+
text-align: center;
9+
font-weight: normal;
10+
}

0 commit comments

Comments
 (0)