From 944b2369734f1bf5b3817080ea4d49323bb54bed Mon Sep 17 00:00:00 2001 From: pablo correia Date: Wed, 31 May 2023 23:18:09 -0300 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20adicionado=20bot=C3=A3o=20onde=20ir?= =?UTF-8?q?a=20esconder=20a=20tela=20com=20o=20nome=20da=20cidade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/view/visitor/index.jsp | 62 ++++++++++++++++--- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/view/visitor/index.jsp b/src/main/webapp/WEB-INF/view/visitor/index.jsp index 5c87e226..339a7e5b 100644 --- a/src/main/webapp/WEB-INF/view/visitor/index.jsp +++ b/src/main/webapp/WEB-INF/view/visitor/index.jsp @@ -5,17 +5,61 @@
- - - - -
-
-
- + <%-- --%> +
+
+
+
+ keyboard_arrow_up + ${cities[0].name} +
+
+ +
+
-
+
+ + + + From c36406699930b50078e407bab171acc263597ade Mon Sep 17 00:00:00 2001 From: pablo correia Date: Thu, 1 Jun 2023 19:59:31 -0300 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20feito=20a=20separa=C3=A7=C3=A3o=20d?= =?UTF-8?q?os=20estilos=20css=20e=20tambem=20do=20javascript=20em=20arquiv?= =?UTF-8?q?os=20separados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/tags/template.tag | 2 + .../webapp/WEB-INF/view/visitor/index.jsp | 43 +------------------ .../assets/resources/scripts/banner-hidden.js | 12 ++++++ .../resources/styles/style-banner-hidden.css | 20 +++++++++ 4 files changed, 35 insertions(+), 42 deletions(-) create mode 100644 src/main/webapp/assets/resources/scripts/banner-hidden.js create mode 100644 src/main/webapp/assets/resources/styles/style-banner-hidden.css 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..5bd8c3fb --- /dev/null +++ b/src/main/webapp/assets/resources/scripts/banner-hidden.js @@ -0,0 +1,12 @@ +function toggleCityPanel() { + var cityPanel = document.getElementById('city-panel'); + // var cityName = document.querySelector('.city-name'); + var setaPraCima = document.getElementById('iconeSeta'); + if (cityPanel.style.display === 'none') { + cityPanel.style.display = 'block'; + setaPraCima.classList.add('expanded'); + } else { + cityPanel.style.display = 'none'; + setaPraCima.classList.remove('expanded'); + } +} \ 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..e48b8ce1 --- /dev/null +++ b/src/main/webapp/assets/resources/styles/style-banner-hidden.css @@ -0,0 +1,20 @@ +.city-name { + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + padding: 10px; + background-color: #f5f5f5; +} + +.expanded { + transform: rotate(180deg); +} + +#city-panel { + display: none; +} + +#painel { + padding: 0; +} \ No newline at end of file From 615490bac33cda01a742890cbb0258e558148b42 Mon Sep 17 00:00:00 2001 From: pablo correia Date: Fri, 2 Jun 2023 18:03:04 -0300 Subject: [PATCH 3/7] ajustes --- src/main/webapp/WEB-INF/view/visitor/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/view/visitor/index.jsp b/src/main/webapp/WEB-INF/view/visitor/index.jsp index a818e4eb..5c82e54e 100644 --- a/src/main/webapp/WEB-INF/view/visitor/index.jsp +++ b/src/main/webapp/WEB-INF/view/visitor/index.jsp @@ -10,7 +10,7 @@
keyboard_arrow_up - ${cities[0].name} + ${cities[0].name} - PR
From 7325967232e56aeb3f73c5cf187554d7ccf3fb85 Mon Sep 17 00:00:00 2001 From: pablo correia Date: Fri, 2 Jun 2023 18:59:07 -0300 Subject: [PATCH 4/7] ajuste no nome da cidade --- src/main/webapp/WEB-INF/view/visitor/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/view/visitor/index.jsp b/src/main/webapp/WEB-INF/view/visitor/index.jsp index 5c82e54e..80638efa 100644 --- a/src/main/webapp/WEB-INF/view/visitor/index.jsp +++ b/src/main/webapp/WEB-INF/view/visitor/index.jsp @@ -10,7 +10,7 @@
keyboard_arrow_up - ${cities[0].name} - PR + ${cities[0].name} - ${cities[0].state.uf}
From 04cec5fa4cb9e54ccc755d310399f1e55bfe90bf Mon Sep 17 00:00:00 2001 From: pablo correia Date: Mon, 12 Jun 2023 22:47:14 -0300 Subject: [PATCH 5/7] ajustes no PR conforme o que foi pedido no review --- .../controller/CityController.java | 3 ++- .../controller/IndexController.java | 1 - src/main/resources/data.sql | 1 + src/main/webapp/WEB-INF/tags/banner.tag | 2 +- .../webapp/WEB-INF/view/visitor/index.jsp | 12 ++++++--- .../assets/resources/scripts/banner-hidden.js | 24 +++++++++--------- .../resources/styles/style-banner-hidden.css | 25 +++++++++++++------ 7 files changed, 41 insertions(+), 27 deletions(-) diff --git a/src/main/java/br/edu/utfpr/servicebook/controller/CityController.java b/src/main/java/br/edu/utfpr/servicebook/controller/CityController.java index e186c4ea..ef6efa61 100644 --- a/src/main/java/br/edu/utfpr/servicebook/controller/CityController.java +++ b/src/main/java/br/edu/utfpr/servicebook/controller/CityController.java @@ -89,7 +89,8 @@ public ModelAndView showForm(HttpServletRequest request, PageRequest pageRequest = PageRequest.of(page-1, size, Sort.Direction.valueOf(direction), order); Page cityPage = cityService.findAll(pageRequest); - + System.out.println(cityPage); + System.out.println("cityPage"); mv.addObject("states", listStateDTO()); mv.addObject("cities", listCityDTO(cityPage)); 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..8e7da397 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -31,6 +31,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', 'Pitanga', '16'); diff --git a/src/main/webapp/WEB-INF/tags/banner.tag b/src/main/webapp/WEB-INF/tags/banner.tag index 4fd803f1..9a5ad883 100644 --- a/src/main/webapp/WEB-INF/tags/banner.tag +++ b/src/main/webapp/WEB-INF/tags/banner.tag @@ -13,7 +13,7 @@
diff --git a/src/main/webapp/WEB-INF/view/visitor/index.jsp b/src/main/webapp/WEB-INF/view/visitor/index.jsp index 80638efa..7fee321d 100644 --- a/src/main/webapp/WEB-INF/view/visitor/index.jsp +++ b/src/main/webapp/WEB-INF/view/visitor/index.jsp @@ -8,9 +8,11 @@
-
- keyboard_arrow_up - ${cities[0].name} - ${cities[0].state.uf} +
+
+ ${cities[0].name} - ${cities[0].state.uf} + Alterar a cidade +
@@ -21,4 +23,6 @@ - \ No newline at end of file + + + \ 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 index 5bd8c3fb..5492fb9e 100644 --- a/src/main/webapp/assets/resources/scripts/banner-hidden.js +++ b/src/main/webapp/assets/resources/scripts/banner-hidden.js @@ -1,12 +1,12 @@ -function toggleCityPanel() { - var cityPanel = document.getElementById('city-panel'); - // var cityName = document.querySelector('.city-name'); - var setaPraCima = document.getElementById('iconeSeta'); - if (cityPanel.style.display === 'none') { - cityPanel.style.display = 'block'; - setaPraCima.classList.add('expanded'); - } else { - cityPanel.style.display = 'none'; - setaPraCima.classList.remove('expanded'); - } -} \ No newline at end of file +$(document).ready(function(){ + $("#togleCityId").click(function(){ + $("#city-panel").slideToggle(350); + }); +}); + + +$(document).ready(function(){ + $("select").change(function () { + $("#selectCityName").text($("#select-city option[value ='" + this.value +"']").text().trim()) + }); +}); diff --git a/src/main/webapp/assets/resources/styles/style-banner-hidden.css b/src/main/webapp/assets/resources/styles/style-banner-hidden.css index e48b8ce1..08543b33 100644 --- a/src/main/webapp/assets/resources/styles/style-banner-hidden.css +++ b/src/main/webapp/assets/resources/styles/style-banner-hidden.css @@ -1,20 +1,29 @@ .city-name { - cursor: pointer; - display: flex; - align-items: center; - justify-content: center; + width: 100%; padding: 10px; background-color: #f5f5f5; + color: #0d47a1; } +.cityNameContent { + display: flex; + justify-content: start; +} .expanded { transform: rotate(180deg); } -#city-panel { - display: none; -} - #painel { padding: 0; +} + +#togleCityId { + cursor: pointer; + margin-left: 1.2em; +} + +@media screen and (max-width: 600px) { + .cityNameContent { + justify-content: space-between; + } } \ No newline at end of file From 4527f3c9c76ac85f8445a51cec33a92509203cb4 Mon Sep 17 00:00:00 2001 From: Roni Fabio Banaszewski Date: Wed, 14 Jun 2023 18:15:17 -0300 Subject: [PATCH 6/7] refactor: ajustes em termos de nomenclaturas --- .../servicebook/controller/CityController.java | 3 +-- src/main/resources/data.sql | 3 +-- src/main/webapp/WEB-INF/view/visitor/index.jsp | 4 ++-- .../assets/resources/scripts/banner-hidden.js | 13 ++++++------- .../assets/resources/styles/style-banner-hidden.css | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/main/java/br/edu/utfpr/servicebook/controller/CityController.java b/src/main/java/br/edu/utfpr/servicebook/controller/CityController.java index ef6efa61..e186c4ea 100644 --- a/src/main/java/br/edu/utfpr/servicebook/controller/CityController.java +++ b/src/main/java/br/edu/utfpr/servicebook/controller/CityController.java @@ -89,8 +89,7 @@ public ModelAndView showForm(HttpServletRequest request, PageRequest pageRequest = PageRequest.of(page-1, size, Sort.Direction.valueOf(direction), order); Page cityPage = cityService.findAll(pageRequest); - System.out.println(cityPage); - System.out.println("cityPage"); + mv.addObject("states", listStateDTO()); mv.addObject("cities", listCityDTO(cityPage)); diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 8e7da397..95a2c766 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -30,8 +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', 'Pitanga', '16'); +VALUES ('https://i.imgur.com/qMKc4rf.png', 'Guarapuava', '16'), ('https://i.imgur.com/qMKc4rf.png', 'Pitanga', '16'); diff --git a/src/main/webapp/WEB-INF/view/visitor/index.jsp b/src/main/webapp/WEB-INF/view/visitor/index.jsp index 7fee321d..f5241c2a 100644 --- a/src/main/webapp/WEB-INF/view/visitor/index.jsp +++ b/src/main/webapp/WEB-INF/view/visitor/index.jsp @@ -10,8 +10,8 @@
- ${cities[0].name} - ${cities[0].state.uf} - Alterar a cidade + ${cities[0].name} - ${cities[0].state.uf} + ALTERAR A CIDADE
diff --git a/src/main/webapp/assets/resources/scripts/banner-hidden.js b/src/main/webapp/assets/resources/scripts/banner-hidden.js index 5492fb9e..0104c2b5 100644 --- a/src/main/webapp/assets/resources/scripts/banner-hidden.js +++ b/src/main/webapp/assets/resources/scripts/banner-hidden.js @@ -1,12 +1,11 @@ $(document).ready(function(){ - $("#togleCityId").click(function(){ + + $("#toggle-city-id").click(function(e){ + e.preventDefault(); $("#city-panel").slideToggle(350); }); -}); - -$(document).ready(function(){ - $("select").change(function () { - $("#selectCityName").text($("#select-city option[value ='" + this.value +"']").text().trim()) + $("#select-city").change(function () { + $("#select-city-name").text($("#select-city option[value ='" + this.value +"']").text().trim()) }); -}); +}); \ 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 index 08543b33..cf922aaa 100644 --- a/src/main/webapp/assets/resources/styles/style-banner-hidden.css +++ b/src/main/webapp/assets/resources/styles/style-banner-hidden.css @@ -17,7 +17,7 @@ padding: 0; } -#togleCityId { +#toggle-city-id { cursor: pointer; margin-left: 1.2em; } From 57c2f387474e450c4cc7914e78e7dd0204c7f8da Mon Sep 17 00:00:00 2001 From: pablo correia Date: Mon, 19 Jun 2023 20:01:39 -0300 Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20ajustado=20para=20salvar=20no?= =?UTF-8?q?=20local=20storage=20a=20escolha=20da=20cidade=20e=20tamb=C3=A9?= =?UTF-8?q?m=20feito=20alguns=20ajustes=20na=20fun=C3=A7=C3=A3o=20de=20sel?= =?UTF-8?q?ect=20city?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/data.sql | 2 +- src/main/webapp/WEB-INF/tags/banner.tag | 3 +++ src/main/webapp/WEB-INF/view/visitor/index.jsp | 2 +- .../webapp/assets/resources/scripts/banner-hidden.js | 12 ++++++++++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 95a2c766..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'), ('https://i.imgur.com/qMKc4rf.png', 'Pitanga', '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 9a5ad883..22bae9dd 100644 --- a/src/main/webapp/WEB-INF/tags/banner.tag +++ b/src/main/webapp/WEB-INF/tags/banner.tag @@ -13,6 +13,9 @@ diff --git a/src/main/webapp/WEB-INF/view/visitor/index.jsp b/src/main/webapp/WEB-INF/view/visitor/index.jsp index f5241c2a..1d8eac35 100644 --- a/src/main/webapp/WEB-INF/view/visitor/index.jsp +++ b/src/main/webapp/WEB-INF/view/visitor/index.jsp @@ -10,7 +10,7 @@
- ${cities[0].name} - ${cities[0].state.uf} + ALTERAR A CIDADE
diff --git a/src/main/webapp/assets/resources/scripts/banner-hidden.js b/src/main/webapp/assets/resources/scripts/banner-hidden.js index 0104c2b5..616da666 100644 --- a/src/main/webapp/assets/resources/scripts/banner-hidden.js +++ b/src/main/webapp/assets/resources/scripts/banner-hidden.js @@ -1,11 +1,19 @@ -$(document).ready(function(){ +$(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 () { - $("#select-city-name").text($("#select-city option[value ='" + this.value +"']").text().trim()) + 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