From 40da888e7e1e7eb8ffe0fce5c91134d324d7caad Mon Sep 17 00:00:00 2001 From: BeitxuelaWEB Date: Mon, 9 May 2022 10:16:56 +0200 Subject: [PATCH 1/9] highlights --- .../demo/controllers/ViewController.java | 4 +++- .../example/demo/domain/entities/Event.java | 11 ++++++++++- .../demo/domain/service/EventServiceImpl.java | 5 +++++ .../demo/domain/service/IEventService.java | 4 ++++ .../demo/repositories/EventRepository.java | 4 ++++ .../src/main/resources/application.properties | 2 +- .../templates/components/eventForm.html | 9 ++++++++- .../templates/components/eventList.html | 2 +- .../target/classes/application.properties | 2 +- .../demo/controllers/ViewController.class | Bin 1435 -> 1462 bytes .../example/demo/domain/entities/Event.class | Bin 2821 -> 3053 bytes .../domain/service/EventServiceImpl.class | Bin 1678 -> 1802 bytes .../demo/domain/service/IEventService.class | Bin 486 -> 519 bytes .../demo/repositories/EventRepository.class | Bin 436 -> 559 bytes .../templates/components/eventForm.html | 9 ++++++++- .../classes/templates/components/footer.html | 8 ++++---- .../classes/templates/components/navBar.html | 2 +- .../templates/components/slideShow.html | 1 + 18 files changed, 51 insertions(+), 12 deletions(-) diff --git a/backend/demo/src/main/java/com/example/demo/controllers/ViewController.java b/backend/demo/src/main/java/com/example/demo/controllers/ViewController.java index befea86..8b7ec77 100644 --- a/backend/demo/src/main/java/com/example/demo/controllers/ViewController.java +++ b/backend/demo/src/main/java/com/example/demo/controllers/ViewController.java @@ -16,13 +16,15 @@ public class ViewController { private IEventService eventService; @GetMapping({"/","/home", "/index"}) public String eventSlider(Model model){ - List eventSlider = eventService.eventList(); + List eventSlider = eventService.listHighlights(); List eventList = eventService.eventList(); model.addAttribute("titulo", "Events List No order"); model.addAttribute("slider", eventSlider); model.addAttribute("titulo", "List No order"); model.addAttribute("list", eventList); + return "index"; } } + diff --git a/backend/demo/src/main/java/com/example/demo/domain/entities/Event.java b/backend/demo/src/main/java/com/example/demo/domain/entities/Event.java index 439143d..f85fd1f 100644 --- a/backend/demo/src/main/java/com/example/demo/domain/entities/Event.java +++ b/backend/demo/src/main/java/com/example/demo/domain/entities/Event.java @@ -17,6 +17,7 @@ public class Event implements Serializable { private String image; private Integer max_people =25; private String Date; + private boolean featured; public Integer getMaxPeople() { return max_people; @@ -67,6 +68,13 @@ public void setDate(String date) { Date = date; } + public boolean isFeatured() { + return featured; + } + public void setFeatured(boolean featured) { + this.featured = featured; + } + @java.lang.Override public java.lang.String toString() { @@ -77,7 +85,8 @@ public java.lang.String toString() { ", image='" + image + '\'' + ", maxPeople=" + max_people + ", Date=" + Date + - '}'; + ", featured="+ + '}'; } diff --git a/backend/demo/src/main/java/com/example/demo/domain/service/EventServiceImpl.java b/backend/demo/src/main/java/com/example/demo/domain/service/EventServiceImpl.java index e2ee6c2..84bc8a9 100644 --- a/backend/demo/src/main/java/com/example/demo/domain/service/EventServiceImpl.java +++ b/backend/demo/src/main/java/com/example/demo/domain/service/EventServiceImpl.java @@ -15,6 +15,11 @@ public List eventList() { return (List) eventRepository.findAll(); } + public List listHighlights(){ + return (List) eventRepository.findByFeaturedIsTrue(); + } + + @Override public void save(Event event) { eventRepository.save(event); diff --git a/backend/demo/src/main/java/com/example/demo/domain/service/IEventService.java b/backend/demo/src/main/java/com/example/demo/domain/service/IEventService.java index ffe7c6e..2558f60 100644 --- a/backend/demo/src/main/java/com/example/demo/domain/service/IEventService.java +++ b/backend/demo/src/main/java/com/example/demo/domain/service/IEventService.java @@ -6,7 +6,11 @@ public interface IEventService { public List eventList(); + public List listHighlights(); public void save(Event event); public Event findById(Long id); public Event delete(Long id); + + //List listaUsers(); + } diff --git a/backend/demo/src/main/java/com/example/demo/repositories/EventRepository.java b/backend/demo/src/main/java/com/example/demo/repositories/EventRepository.java index a335129..70c8517 100644 --- a/backend/demo/src/main/java/com/example/demo/repositories/EventRepository.java +++ b/backend/demo/src/main/java/com/example/demo/repositories/EventRepository.java @@ -8,6 +8,10 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface EventRepository extends CrudRepository { + public List findByFeaturedIsTrue(); + } diff --git a/backend/demo/src/main/resources/application.properties b/backend/demo/src/main/resources/application.properties index bc00326..af2858f 100644 --- a/backend/demo/src/main/resources/application.properties +++ b/backend/demo/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.jpa.hibernate.ddl-auto=update -spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3307/tech_meets_data +spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/tech_meets_data spring.datasource.username=root spring.datasource.password= spring.datasource.driver-class-name =com.mysql.cj.jdbc.Driver diff --git a/backend/demo/src/main/resources/templates/components/eventForm.html b/backend/demo/src/main/resources/templates/components/eventForm.html index 113c491..fffece0 100644 --- a/backend/demo/src/main/resources/templates/components/eventForm.html +++ b/backend/demo/src/main/resources/templates/components/eventForm.html @@ -35,5 +35,12 @@

- +
+ + + +
+ + + \ No newline at end of file diff --git a/backend/demo/src/main/resources/templates/components/eventList.html b/backend/demo/src/main/resources/templates/components/eventList.html index 025162b..b6204e2 100644 --- a/backend/demo/src/main/resources/templates/components/eventList.html +++ b/backend/demo/src/main/resources/templates/components/eventList.html @@ -21,7 +21,7 @@

- +

diff --git a/backend/demo/target/classes/application.properties b/backend/demo/target/classes/application.properties index bc00326..af2858f 100644 --- a/backend/demo/target/classes/application.properties +++ b/backend/demo/target/classes/application.properties @@ -1,5 +1,5 @@ spring.jpa.hibernate.ddl-auto=update -spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3307/tech_meets_data +spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/tech_meets_data spring.datasource.username=root spring.datasource.password= spring.datasource.driver-class-name =com.mysql.cj.jdbc.Driver diff --git a/backend/demo/target/classes/com/example/demo/controllers/ViewController.class b/backend/demo/target/classes/com/example/demo/controllers/ViewController.class index f8faede3c4999fcfe146f613465abeb097217b4a..4b9fdb961a2b651a8fe34970a23a281079b059b7 100644 GIT binary patch delta 517 zcmY*W$xgyh6g`hYkOGTRa6+iF6c7gx6^FPmabaAUXyU4g6>BP(wz~Bj3`-Y&fr-XM zqYFR4A2IPGjHgr<=H=btoqO)|?xYtf_WASv0bm1Lx3TY=q-8qpuGu`ZcwI+8o-OR1 z>(_ea$~CRZ9?^z`B$PPPkOlgUYoq0Q&ru8r^tq;cWwoOi5>R$L$Wc8|-EXUH`^2y% zj367qXdF4@1+s0sS#d6Hv(-Gc^$Vl(AQBxz9BE_By$U@+9oAkUp1N?6(hCL$DN)A#0F*IDPmnT?AhgbXD0`C< z*e}W%dGHOxK^zukwbZjR@_5gjEc=!`{m2YKcolMpP^J)r!jncG8MZfoDh9F1HF%XZ zgebTFDtp!f7TG}zb#}3YfKFB(fVT>TIqJMC#|S!D Tb+G23LBcw*0ROtTu1(+^d~eX8d>-O zeu^JqJZ;6ryZ794&K=%c{3#y$`k8$K=;Gor_T7k%rlUKzXF9HcUas_R2h%}w;+j^| z=QSBP(vLuO5RM# zx03?>s-Du9Kd>U>x~i|&<|w6a&S9}0B7OUr6J(UVq*{E)1=9^EYA)c}_AP-4SFA*Pn9^^)9%Ey->syJ0}b z@oV@Yd|_u~bo#;%;D>Vj-@8j#mQ6=rZ0^%J=l*h@?%)5s{fmee=parVbR|j=jXJ4| zQQ|c};(C>v6@6>}wJ14^y5N< zQM|^FU)F^MIYt9*3=e8FM8k|aj57X>PbhDh6?OG{8l~tOqfS_tmXbc9U8iAqV%Igg zA;qqigS#JCPOcsEs=sP0=)?*ek)EW;~u(E!v*G0oNY)6`W(tI2wj&y9Hw(GKb2xq3Dub;rZbzK!OiHw3))^}rI%Y0 zLw*yUfHcwzBP-|mjt%Hs*pS!cWahi}ylGVGA%duWsi0<&vKr!sz1AuNw2(cN6lBi# zBI!NF?^rGf3VqjVHcDd6kXaX3)qhu}B%^B~*|aL##0f%`3OQ79$63ULkI~D7Y$b4X z;*n)JGVAJY5bVA#dJ(5@=-ViLC#&=&qsjBuWtd0Sq0n7Gw{X{Z$*~&9*kAm<^aNd_ z>)b3?g*}sx*eT(^ig39T`kHp7pYYpOEc26BWE%<+d&CC?O~BT=G?z z3!;QqVeH+a2$JhBnm}*uAVzZ(#fYws`CW9;eyntiA7K5VppWPtHqg?s)ggPf8quTG zh$lvk=+J6JW5$?(D&9N%-p6VldJJQ4<_}_-MCwn9o>I>nCI2yg>cjM7qP=6CA(4U-O%2INIVBR=KMmU32IFEN%NEidZMNbL}UQ9Qoa zm62gr&@%!RJmpDTvIzA~hK0oXf*#^mTJ~cN1hH<0VlB}l+#!`0J*=+G>?sWdy>c6V zob)kuwV1lRkawhh8f3Z$ru%J}WX`sjZYZW)DAQPw=|L#dm*GrfL8dI2=G!pI`e`wZE2bx*OcOz- zhoMaQaHfeM(+ZeY+c0hTnKl&DCT)e})8wx>^q1axDAP7Qy_8R*r!*O4dIF|=8z$LL zT7H^ROgk+3_7nVFVpsi95Vl*`CPxl9od1Qi6ta;q1LqKJ15>5j0lD;A{0#9wfh zCjJJAvN6$>D>nWR<6khoXF5!W$#gMuzBlLlzW2#@&iR}Fn6pm*eg6qy9&eAWO<|=O zUru5WL-J6379(G~wTdRC{vowx;W3`Xu&s8V$^qk-{!Cy^{xMcFhXTp+{(kj+Y42UF zR;|VGQdUeye=T6kiebx7X1aeECNyM`gMdSu4yq#8QR*vIjA2~W{YI?|YAl;kdu!W6D?6`011%4a;zRqYwhH?)6Ypg}cI?Lg;dvEdhA#|>tw z;w7%isLfH;Culzg>RyKiLMP(ra=YXjnO+yx;3nY&W?63t3dJ>tTl|N)GGQ(|l4~9d z^w?3=Do|jiQ#?V2R8-Bm^mASV0VvalGQDwoP+1ph5w{hTJc{RrnzI>2{QD!3@ecg zc9>x%l413Xp?>}(?C?p<5^AmmRBsTf*M(Y(gz5`JE&5P(-Yx&$uAfnzhw2MMl~}Xf z0;(K@D!Wj3eW-Qs+1Pvy8Gd<39wa(;F9Bh~vQG%u9-xkU?5E+r``9lqdO*Fw%TcLe X6Avlk6p#4r;5n7W=mlQk4GRAOO|fB= diff --git a/backend/demo/target/classes/com/example/demo/domain/service/EventServiceImpl.class b/backend/demo/target/classes/com/example/demo/domain/service/EventServiceImpl.class index f6bf6b3fbaa03bf6f7908e0c6576dce574a39279..9c6188b2c7679f8f25fb5062e70e2f355542a6ff 100644 GIT binary patch delta 644 zcmZXROG^S_6o%h#bQH!>!BRBMOQx1)XEO&V28A<~^J{=dDZn_V-vFihr`KZBa%V87>Pc zYnCC)znGt&2tT}TId;3+t!}U0y1Z)B)9XIoTQV%Z1O@>P$fU~@$ws=OtEg5v{%!T8 z^7=PG!YZ8=KOmxjA}PZf{KU!ekQg3Jyl#`%se9MSFJOauN?H%qMXD5@lzxJJ1TVvb z>Y9+IOeEsW|w4HBrdu>P+UZX<>4y$K=2g{E3nj>%0TQuTYC$e`32TCk{A;$ zjI}>Te}IX2XV|bN#_HTV_uOwzW^TrAW9Iw!%PW9A9QMr$6J1s|W-TN!C+=A_n!-W^ zu7xzF#Rqd)M#Oo^Shlc&tT^IX=7|m;Bjj`ZPGa~LAe}7a8z#v1bO=wwuw+Bm(Hk>5t7)EII53H zCBV)ff$?3=9mm3?dV`w)6AlWEPirWTt220C7q2#Qm33SXmeuSQ*$D7#Y}s u>X;ZffP79gJ{JQwP@V@U&&tTa%fJ9s!pFdm5E1|j38D!B<%PgT3IhNRMi2=A delta 116 zcmZo?dB!Yo>ff$?3=9mm48rUTOpFY=lN}i)CTh%_c|!B`K*i#JPZs#AzlVPgb+ViNB~U;C@%;$LI?mE6bl*v diff --git a/backend/demo/target/classes/com/example/demo/repositories/EventRepository.class b/backend/demo/target/classes/com/example/demo/repositories/EventRepository.class index 60613078593b95f3ef009b21fceeecd556df7db3..164210db9c6b9ed86245ce89ccc9e723118d5040 100644 GIT binary patch delta 150 zcmdnOyq<;Y)W2Q(7#J9A83ZPBHG7GqW#*+gRl21nmXsEyrg#>I6qTkjG6-pC`eY@R zCF+-!WajAmWEPiLGcs@nXQt - +
+ + + +
+ + + \ No newline at end of file diff --git a/backend/demo/target/classes/templates/components/footer.html b/backend/demo/target/classes/templates/components/footer.html index 4b4b5da..6e8ae75 100644 --- a/backend/demo/target/classes/templates/components/footer.html +++ b/backend/demo/target/classes/templates/components/footer.html @@ -98,15 +98,15 @@
- Contact + Contact Us
-

Madrid, NY 28820, Spain

+

Madrid, Coslada 28823, Spain

techevents@info.com

-

+ 01 234 567 88

-

+ 01 234 567 89

+

+ 34 91 678 72 08 07

+

+ 34 93 742 22 04 03

diff --git a/backend/demo/target/classes/templates/components/navBar.html b/backend/demo/target/classes/templates/components/navBar.html index 3ae4c5f..9ce07af 100644 --- a/backend/demo/target/classes/templates/components/navBar.html +++ b/backend/demo/target/classes/templates/components/navBar.html @@ -16,7 +16,7 @@ Lista de Eventos
  • - Formulario Nuevo evento + Crear evento
  • hola Admin diff --git a/backend/demo/target/classes/templates/components/slideShow.html b/backend/demo/target/classes/templates/components/slideShow.html index b27d13f..d6c61c2 100644 --- a/backend/demo/target/classes/templates/components/slideShow.html +++ b/backend/demo/target/classes/templates/components/slideShow.html @@ -19,6 +19,7 @@

    TOP EVENTS

    + From aca226192292406523dce154772afcb7aff53f22 Mon Sep 17 00:00:00 2001 From: BeitxuelaWEB Date: Mon, 9 May 2022 10:57:56 +0200 Subject: [PATCH 2/9] favicon --- .../src/main/resources/static/images/favicon.ico | Bin 0 -> 4286 bytes .../templates/components/eventListIndex.html | 2 ++ .../resources/templates/template/template.html | 10 +++++----- .../classes/templates/components/slideShow.html | 1 - .../classes/templates/template/template.html | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 backend/demo/src/main/resources/static/images/favicon.ico diff --git a/backend/demo/src/main/resources/static/images/favicon.ico b/backend/demo/src/main/resources/static/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..531f0653516e16eaf4ef20f1ccbe24d55141afaa GIT binary patch literal 4286 zcmcgwX>*fR6pr58(V;8Ax zZ4m?n$|5Kz>KA8ZbkrHg@q-`zg)sa~Mp z-Mdx%SGAI&QteQwRQqVqS1LUX{yy1{{zN)9GIZ(;=#6&REuH9*hB4uq#$5d@=IiG$ z?fw8hXAljxJ`|Z6pw7wOkj{!s0V_aPupV9^_ZU7m zD*isI8pN3E464j6$SN#Os!OBS;-txq4(A9~>PDlsOgpDwD6LAmE;bJu%AL)y1aeQA*VUobt1%FR-An5=d3o!uiQ*-wW3Jg6 zsSkHe!@`EkWJ7jYby9t9S&?IVo83WZwOL7J*TY@?uGHL&yR{?2hFQvmCO2n|-uxOD zKC1}`nL+Yft5dI$S*>?7pN)=g+CNGzymBB;w^n-sQ&eB<_mZ8k3zFB^W-#MqvyP(E zH7+pjQ7p1!YJvAzWM5ZV+v9AD(~%&@n|ZG-D#JCaVne4q8pRo+cr*To@-(;xH=}d2 zvL1($gInex)Wv1UDk{Zo>JyAF*?Quz)#~HWW*tL%SrrZ&Z8#vc(X$bUYb2vH%SY@eM#|Dp*mmK2Y`O9)wqAHD=I!UcLwdOpnFhkYL-=G%THgXPb8_(d=r!z|d5n~+ zzhUder+6*&09zJ+#H+OCfU^TT#%|)B(*d+Qh6ErD zA|5)bJ03e{AAxhiavDu0c8%Y}u8CVXR4Yf<@;hB-I!;i04pE-=OYL~^>%XyW?um%s z9dPld_~x1s%sJW zH!b69@Dt%U4F#Akl-7(qeI|l|E)4ZHqqp6I_R~%@y3Fu6Yf+G$ym!XpcZB0V6%+r} zHu&;Pm@Kr%jj;kNVOe0Wtw1)NO=Clym>TUPTr~_-V{MI6Tux$j{u}?i1xGQ$k&O>L)Yd{nsT01fO6|!}TcJ zdK0b*kl!VFI)UFH*P^l{SKzmL9U|sIe-~yZhcG+k$HZ`ts0DvtOF~_`Dk~lumHlU= z{=@MYl$D;m;G70?pV(aSGvl-WUUwauJXUb5IVW6eoM)a-73accs(@EEqq@8R16_@4 z^suf*Nx}Yt?WSeO~b#}{XC z``UQ~`dg8!Rr*A%FS?Qn+z7|Ioj6+LolbKcBCerh)-!Tu1aKU<~KcQ|(R(dh#p@XlTSy8A{f_lki=k zFPtZ~;gWq4WtJ9jjcf!nB4Z$a<&WXgmk2wjJU-_U+0`?1Pq%9r55hcw?KngI*<@)$ zR_UpvcBqNh7EwRzk%PDwt|eYOE>A&UT#J5`mXmF|2Y;!R5Lh}e>BK2P_+ddC2mZ$^B1 u?wR&CbGJHkn>as4gX19+mpW;3L6hVhOJqZ`{|o$I-~R({$kNmR literal 0 HcmV?d00001 diff --git a/backend/demo/src/main/resources/templates/components/eventListIndex.html b/backend/demo/src/main/resources/templates/components/eventListIndex.html index 1775b9b..f2d3b10 100644 --- a/backend/demo/src/main/resources/templates/components/eventListIndex.html +++ b/backend/demo/src/main/resources/templates/components/eventListIndex.html @@ -11,6 +11,8 @@

    +
    + diff --git a/backend/demo/src/main/resources/templates/template/template.html b/backend/demo/src/main/resources/templates/template/template.html index 20e3e08..0948a50 100644 --- a/backend/demo/src/main/resources/templates/template/template.html +++ b/backend/demo/src/main/resources/templates/template/template.html @@ -5,9 +5,9 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> - Template + Tech Events - +
    -