latest

2017-03-07 10:56:12 -05:00
parent e640ed061c
commit a69c5327a8
3 changed files with 41 additions and 56 deletions
--- a/bookstore-api/.idea/workspace.xml
+++ b/bookstore-api/.idea/workspace.xml
@@ -19,7 +19,7 @@
      <file leaf-file-name="BookResource.java" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/BookResource.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
+            <state relative-caret-position="315">
              <caret line="52" column="27" lean-forward="true" selection-start-line="52" selection-start-column="27" selection-end-line="52" selection-end-column="27" />
              <folding />
            </state>
@@ -121,10 +121,10 @@
    </option>
  </component>
  <component name="ProjectFrameBounds">
-    <option name="x" value="50" />
-    <option name="y" value="23" />
-    <option name="width" value="1351" />
-    <option name="height" value="797" />
+    <option name="x" value="71" />
+    <option name="y" value="38" />
+    <option name="width" value="1663" />
+    <option name="height" value="961" />
  </component>
  <component name="ProjectView">
    <navigator currentView="ProjectPane" proportions="" version="1">
@@ -849,7 +849,7 @@
    <option name="totallyTimeSpent" value="71535000" />
  </component>
  <component name="ToolWindowManager">
-    <frame x="50" y="23" width="1351" height="797" extended-state="0" />
+    <frame x="71" y="38" width="1663" height="961" extended-state="0" />
    <editor active="true" />
    <layout>
      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -873,7 +873,7 @@
      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32907802" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3002292" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24244294" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
@@ -1257,7 +1257,7 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/BookResource.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
+        <state relative-caret-position="315">
          <caret line="52" column="27" lean-forward="true" selection-start-line="52" selection-start-column="27" selection-end-line="52" selection-end-column="27" />
          <folding />
        </state>
--- a/store-front/src/app/components/nav-bar/nav-bar.component.html
+++ b/store-front/src/app/components/nav-bar/nav-bar.component.html
@@ -3,20 +3,13 @@
    <div class="container">
        <div class="navbar-header">
            <!-- The mobile navbar-toggle button can be safely removed since you do not need it in a non-responsive implementation -->
-            <a class="navbar-brand" th:href="@{/}">LE'S BOOKSTORE</a>
+            <a class="navbar-brand pointer" >LE'S BOOKSTORE</a>
        </div>
        <!-- Note that the .navbar-collapse and .collapse classes have been removed from the #navbar -->
        <div id="navbar">
            <ul class="nav navbar-nav navbar-left">
-                <li class="dropdown">
-                    <a th:href="@{/bookshelf}" class="dropdown-toggle" data-hover="dropdown" role="button"> <span style="font-size: large">BOOKS</span></a>
-                    <ul class="dropdown-menu">
-                        <li><a th:href="@{/bookshelf}">Browse the bookshelf</a></li>
-                        <li><a th:href="@{/hours}">Store hours &#38; Directions</a></li>
-                        <li><a th:href="@{/faq}">FAQ</a></li>
-                    </ul>
-                </li>
-                <form class="navbar-form" th:action="@{/searchBook}" method="post">
+                <li ><a md-button>BOOK</a></li>
+                <form class="navbar-form" method="post">
                    <div class="form-group">
                        <input type="text" name="keyword" class="form-control" placeholder="Book title" />
                    </div>
@@ -25,16 +18,9 @@
            </ul>
            <ul class="nav navbar-nav navbar-right">
                <li>
-                    <md-select placeholder="Favorite food">
-                        <md-option>
-                            test1
-                        </md-option>
-                        <md-option>
-                            test2
-                        </md-option>
-                    </md-select>
+                    
                </li>
-                <li sec:authorize="isAuthenticated()"><a th:href="@{/logout}">LOGOUT</a></li>
+                <li ><a md-button >LOGOUT</a></li>
            </ul>
        </div>
        <!--/.nav-collapse -->
--- a/store-front/src/styles.css
+++ b/store-front/src/styles.css
@@ -6,6 +6,32 @@
@import '../node_modules/@swimlane/ngx-datatable/release/themes/material.css';
@import '../node_modules/@swimlane/ngx-datatable/release/assets/icons.css';*/

+hr {
+    border: none;
+    height: 1px;
+    /* Set the hr color */
+    color: #333; /* old IE */
+    background-color: #333; /* Modern Browsers */
+}
+
+body {
+    font-family: Tahoma, Serif;
+    margin:0;
+    padding-top: 0;
+}
+
+md-input-container {
+    width: 100%;
+}
+
+md-select {
+    width: 100%;
+}
+
+md-slide-toggle {
+    width:100%;
+}
+
 .container {
  width: 90%;
 }
@@ -37,35 +63,8 @@
 	border: 1px solid black;
 }

-hr {
-    border: none;
-    height: 1px;
-    /* Set the hr color */
-    color: #333; /* old IE */
-    background-color: #333; /* Modern Browsers */
-}
-
-body {
-    font-family: Tahoma, Serif;
-    margin:0;
-    padding-top: 0;
-}
-
-md-input-container {
-    width: 100%;
-}
-
-md-select {
-    width: 100%;
-}
-
-md-slide-toggle {
-    width:100%;
-}
-
-.container {
-	width:90%;
-	margin:auto;
+.pointer {
+  cursor: pointer;
 }

 .full-width {