restore currency logic and ad display

README.md

@@ -1,7 +1,9 @@
-# Online Boutique: Cloud-Native Microservices Demo Application
+![src/frontend/static/icons/Hipster_HeroLogoCyan.svg](src/frontend/static/icons/Hipster_HeroLogoCyan.svg)
 
-This project contains a 10-tier microservices application. The application is a
-web-based e-commerce app called **“Online Boutique”** where users can browse items,
+
+**Online Boutique** is a cloud-native microservices demo application.
+Online Boutique consists of a 10-tier microservices application. The application is a
+web-based e-commerce app where users can browse items,
 add them to the cart, and purchase them.
 
 **Google uses this application to demonstrate use of technologies like

src/frontend/static/styles/styles.css

@@ -91,6 +91,43 @@ header .h-control input {
   align-items: center;
 }
 
+header .h-form form {
+  font-size: 12px;
+  border: solid 1px #f2f2f2;
+  padding: 0 0px 0 0px;
+  width: 250px;
+  height: 24px;
+  flex-shrink: 0;
+  background-color: #f2f2f2;
+  display: flex;
+  align-items: center;
+}
+
+header .h-form select {
+  background: transparent;
+  border-radius: 0;
+  border: solid 1px #f2f2f2;
+  width: 100px;
+  height: 20px;
+  flex-shrink: 0;
+  padding: 0 7px;
+  display: flex;
+  align-items: center;
+}
+
+header .h-form option {
+  background: transparent;
+  border-radius: 0;
+  border: solid 1px #f2f2f2;
+  width: 100px;
+  height: 20px;
+  flex-shrink: 0;
+  padding: 0 7px;
+  display: flex;
+  align-items: center;
+}
+
+
 header .h-control input:focus {
   outline: 0;
   border: 0;
@@ -119,7 +156,7 @@ header .icon.search-icon {
 header .h-control select {
   background: transparent;
   border-radius: 0;
-  border: 1px solid #acacac;
+  border: none;
   width: 100px;
   height: 20px;
   flex-shrink: 0;

src/frontend/templates/header.html

@@ -36,13 +36,17 @@
                         <span>Help</span>
                     </div>
                     <div class="h-control">
+                        {{ if $.currencies }}
                         <img src="/static/icons/Hipster_CurrencyIcon.svg" alt="icon" class="icon" />
-                        <select value="US Dollars">
-                            <option>US Dollars</option>
-                            <option>Euros</option>
-                            <option>CRC</option>
-                        </select>
-                        <img src="/static/icons/Hipster_DownArrow.svg" alt="icon" class="icon arrow" />
+                        <form method="POST" action="/setCurrency" id="currency_form">
+                            <select value="US Dollars"
+                            onchange="document.getElementById('currency_form').submit();" style="width:auto;">
+                            {{range $.currencies}}
+                                <option value="{{.}}" {{if eq . $.user_currency}}selected="selected"{{end}}>{{.}}</option>
+                            {{end}}
+                            </select>
+                        </form>
+                        {{ end }}
                     </div>
                 </div>
             </div>

src/frontend/templates/product.html

@@ -45,9 +45,8 @@
       {{ template "recommendations" $.recommendations }}
     {{ end }}
 
-    <div class="row ad-row ad-row-2">
-      <img src="/static/icons/Hipster_Advert2.svg" alt="icon" class="" />
-    </div>
+   {{ with $.ad }}{{ template "text_ad" . }}{{ end}}
+
   </div>
 </main>
 {{ template "footer" . }}