diff --git a/src/main/java/br/edu/utfpr/servicebook/controller/IndexController.java b/src/main/java/br/edu/utfpr/servicebook/controller/IndexController.java index 5cf4f427..823adbd0 100644 --- a/src/main/java/br/edu/utfpr/servicebook/controller/IndexController.java +++ b/src/main/java/br/edu/utfpr/servicebook/controller/IndexController.java @@ -49,7 +49,6 @@ public ModelAndView showIndexPage() { List cities = cityService.findAll(); mv.addObject("cities", cities); - return mv; } diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 39abd15b..fb1887e0 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -30,7 +30,7 @@ VALUES ('Acre', 'AC'), INSERT INTO cities (image, name, state_id) -VALUES ('https://i.imgur.com/qMKc4rf.png', 'Guarapuava', '16'); +VALUES ('https://i.imgur.com/qMKc4rf.png', 'Guarapuava', '16'), ('https://www.viajeparana.com/sites/viaje-parana/arquivos_restritos/files/imagem/2019-04/igreja_nossa_senhora_da_gloria_ca.jpg', 'Pitanga', '16'); diff --git a/src/main/webapp/WEB-INF/tags/banner.tag b/src/main/webapp/WEB-INF/tags/banner.tag index 4fd803f1..22bae9dd 100644 --- a/src/main/webapp/WEB-INF/tags/banner.tag +++ b/src/main/webapp/WEB-INF/tags/banner.tag @@ -13,7 +13,10 @@ diff --git a/src/main/webapp/WEB-INF/tags/template.tag b/src/main/webapp/WEB-INF/tags/template.tag index 596f5f45..fb420c2f 100644 --- a/src/main/webapp/WEB-INF/tags/template.tag +++ b/src/main/webapp/WEB-INF/tags/template.tag @@ -20,6 +20,7 @@ + @@ -82,6 +83,7 @@ + \ No newline at end of file diff --git a/src/main/webapp/assets/resources/scripts/banner-hidden.js b/src/main/webapp/assets/resources/scripts/banner-hidden.js new file mode 100644 index 00000000..616da666 --- /dev/null +++ b/src/main/webapp/assets/resources/scripts/banner-hidden.js @@ -0,0 +1,19 @@ + +$(document).ready(function(){ + $("#select-city option[value='" + localStorage.getItem('selectCityOption') + "']").attr("selected", "selected") + $("#select-city-name").text($("#select-city option[value ='" + localStorage.getItem("selectCityOption") +"']").text().trim()); + $("#toggle-city-id").click(function(e){ + e.preventDefault(); + $("#city-panel").slideToggle(350); + }); + + $("#select-city").change(function () { + let selectCityOption = $('#select-city').val(); + let selectCity = $("#select-city option[value ='" + this.value +"']").text().trim(); + console.log(selectCityOption) + localStorage.setItem("selectCityOption", selectCityOption); + $("#select-city option[value='" + localStorage.getItem('selectCityOption') + "']").attr("selected", "selected") + $("#select-city-name").text(selectCity); + + }); +}); \ No newline at end of file diff --git a/src/main/webapp/assets/resources/styles/style-banner-hidden.css b/src/main/webapp/assets/resources/styles/style-banner-hidden.css new file mode 100644 index 00000000..cf922aaa --- /dev/null +++ b/src/main/webapp/assets/resources/styles/style-banner-hidden.css @@ -0,0 +1,29 @@ +.city-name { + width: 100%; + padding: 10px; + background-color: #f5f5f5; + color: #0d47a1; +} + +.cityNameContent { + display: flex; + justify-content: start; +} +.expanded { + transform: rotate(180deg); +} + +#painel { + padding: 0; +} + +#toggle-city-id { + cursor: pointer; + margin-left: 1.2em; +} + +@media screen and (max-width: 600px) { + .cityNameContent { + justify-content: space-between; + } +} \ No newline at end of file