Merge branch 'master' of https://github.com/dicksor/SitNBeer

dicksor · Apr 21, 2020 · f77527c · f77527c
2 parents d765b43 + 19f48df
commit f77527c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/SitNBeer/src/main/java/ch/hearc/sitnbeer/security/WebSecurityConfig.java b/SitNBeer/src/main/java/ch/hearc/sitnbeer/security/WebSecurityConfig.java
@@ -54,7 +54,7 @@ public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests().antMatchers("/js/*.js", "/css/*.css", "/favicon.ico").permitAll()
-                .antMatchers("/registration", "/home", "/bars", "/beers", "/" ).permitAll()
+                .antMatchers("/registration", "/home", "/bars", "/bar/query", "/beers", "/beer/query", "/" ).permitAll()
                 .antMatchers("/bar/update/*", "/beer/update/*", "/beer/edit/*", "/beer/add*", "/orders/*", "/orders/history/*", "/order/update/*", "/order/delete/*").hasAuthority("ENTERPRISE")
                 .antMatchers("/orders/client/*", "/bar/add").hasAuthority("USER")
                 .antMatchers("/profile", "/user/delete").authenticated()

diff --git a/SitNBeer/src/main/resources/static/css/main.css b/SitNBeer/src/main/resources/static/css/main.css
@@ -58,4 +58,8 @@ main {
     position: relative;
     top: -100px;
     float: right;
+}
+
+.card-content > p{
+    margin-bottom: 10px !important;
 }
diff --git a/SitNBeer/src/main/resources/templates/fragments/card.html b/SitNBeer/src/main/resources/templates/fragments/card.html
@@ -7,9 +7,7 @@
             </div>
             <div class="card-content">
                 <p>[[${bar.getAddress()}]]</p>
-                <br>
                 <p>Available tables : [[${bar.getAvailableTable()}]]</p>
-                <br>
                 <p>Owner : [[${bar.getUser().getUsername()}]]</p>
             </div>
             <div class="card-action">

diff --git a/SitNBeer/target/classes/static/css/main.css b/SitNBeer/target/classes/static/css/main.css
@@ -58,4 +58,8 @@ main {
     position: relative;
     top: -100px;
     float: right;
+}
+
+.card-content > p{
+    margin-bottom: 10px !important;
 }
diff --git a/SitNBeer/target/classes/templates/fragments/card.html b/SitNBeer/target/classes/templates/fragments/card.html
@@ -7,9 +7,7 @@
             </div>
             <div class="card-content">
                 <p>[[${bar.getAddress()}]]</p>
-                <br>
                 <p>Available tables : [[${bar.getAvailableTable()}]]</p>
-                <br>
                 <p>Owner : [[${bar.getUser().getUsername()}]]</p>
             </div>
             <div class="card-action">