From f12e9dfad5ee324a225fa525d6338bf7dd8de459 Mon Sep 17 00:00:00 2001
From: DyCTaTOR <125912249+DyCTaTOR@users.noreply.github.com>
Date: Sat, 18 May 2024 01:35:26 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20=D1=81?=
 =?UTF-8?q?=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20news?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |   1 +
 data.mv.db                                    | Bin 258048 -> 307200 bytes
 .../demo/core/configuration/Constants.java    |   2 +
 .../example/demo/news/api/NewsController.java |  32 ++++++--
 src/main/resources/public/css/style.css       |  72 +++++++++++-------
 src/main/resources/public/images/logo.png     | Bin 0 -> 13145 bytes
 src/main/resources/templates/default.html     |   2 +
 src/main/resources/templates/new-edit.html    |   0
 src/main/resources/templates/news.html        |  20 ++++-
 9 files changed, 89 insertions(+), 40 deletions(-)
 create mode 100644 src/main/resources/public/images/logo.png
 create mode 100644 src/main/resources/templates/new-edit.html

diff --git a/build.gradle b/build.gradle
index ba00bce..e2763db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,7 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-devtools'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     runtimeOnly 'org.webjars.npm:bootstrap:5.3.3'
 	implementation 'com.h2database:h2:2.2.224'
diff --git a/data.mv.db b/data.mv.db
index 6b1eaada43df09f06b899d7e123e41ce33dbba1a..9b9f9f5dc5ca3942849c19e8058ebb15b6271293 100644
GIT binary patch
delta 18382
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

delta 7192
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
QBTzTlfXX);s2fWB4?Ef#VgLXD

diff --git a/src/main/java/com/example/demo/core/configuration/Constants.java b/src/main/java/com/example/demo/core/configuration/Constants.java
index af14112..e8c5eda 100644
--- a/src/main/java/com/example/demo/core/configuration/Constants.java
+++ b/src/main/java/com/example/demo/core/configuration/Constants.java
@@ -6,6 +6,8 @@ public class Constants {
     public static final String API_URL = "/api/1.0";
 
     public static final String DEFAULT_PAGE_SIZE = "5";
+    
+    public static final String REDIRECT_VIEW = "redirect:";
 
     private Constants() {
     }
diff --git a/src/main/java/com/example/demo/news/api/NewsController.java b/src/main/java/com/example/demo/news/api/NewsController.java
index 4e30a98..e6bb797 100644
--- a/src/main/java/com/example/demo/news/api/NewsController.java
+++ b/src/main/java/com/example/demo/news/api/NewsController.java
@@ -1,20 +1,18 @@
 package com.example.demo.news.api;
 
-import java.util.List;
-
 import org.modelmapper.ModelMapper;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.example.demo.core.configuration.Constants;
 import com.example.demo.department.service.DepartmentService;
-import com.example.demo.news.service.NewsService;
 import com.example.demo.news.model.NewsEntity;
+import com.example.demo.news.service.NewsService;
 
 import jakarta.validation.Valid;
 
@@ -23,8 +21,8 @@ import jakarta.validation.Valid;
 public class NewsController {
     public static final String URL = "/news";
     private static final String NEWS_VIEW = "news";
-    private static final String NEWS_VIEW_EDIT_VIEW = "new-edit";
-    private static final String NEWS_VIEW_ATTRIBUTE = "news";
+    private static final String NEWS_EDIT_VIEW = "new-edit";
+    private static final String NEWS_ATTRIBUTE = "news";
     private final NewsService newsService;
     private final ModelMapper modelMapper;
     private final DepartmentService departmentService;
@@ -53,7 +51,7 @@ public class NewsController {
 
     @GetMapping
     public String getAll(Model model) {
-        model.addAttribute(NEWS_VIEW_ATTRIBUTE,
+        model.addAttribute(NEWS_ATTRIBUTE,
                 newsService.getAll().stream().map(this::toDto).toList());
         return NEWS_VIEW;
     }
@@ -68,6 +66,24 @@ public class NewsController {
         return toDto(newsService.create(toEntity(dto)));
     }
 
+    @PostMapping("/delete/{id}")
+    public String delete(
+            @PathVariable(name = "id") Long id) {
+        newsService.delete(id);
+        return Constants.REDIRECT_VIEW + URL;
+    }
+
+    @GetMapping("/edit/{id}")
+    public String update(
+            @PathVariable(name = "id") Long id,
+            Model model) {
+        if (id <= 0) {
+            throw new IllegalArgumentException();
+        }
+        model.addAttribute(NEWS_ATTRIBUTE, toDto(newsService.get(id)));
+        return NEWS_EDIT_VIEW;
+    }
+
     // @PutMapping("/{id}")
     // public NewsDto update(@PathVariable(name = "id") Long id, @RequestBody
     // NewsDto dto) {
diff --git a/src/main/resources/public/css/style.css b/src/main/resources/public/css/style.css
index a304cfa..ba7619b 100644
--- a/src/main/resources/public/css/style.css
+++ b/src/main/resources/public/css/style.css
@@ -65,36 +65,41 @@ td form {
 .cart-item {
     height: auto;
 }
-.headStyle{
+
+.headStyle {
     color: #FFFFFF
 }
-.headStyleNavBar{
+
+.headStyleNavBar {
     background-color: #454545;
 }
-.headStyleNavBar2{
+
+.headStyleNavBar2 {
     background-color: #575757
 }
-.stsp{
+
+.stsp {
     font-size: 30px;
     color: #333333;
     text-align: center;
     margin-top: 70;
 }
 
-.mainSt{
+.mainSt {
     color: #060647;
     font-size: 50px;
 }
 
-.rectPage2{
+.rectPage2 {
     color: #FFFFFF;
     width: 1470px;
     height: 900px;
-    border : 2px solid #000000;
+    border: 2px solid #000000;
     background-color: #FFFFFF;
     opacity: 0.8;
 }
-.rectPage4{
+
+.rectPage4 {
     margin-left: auto;
     margin-right: auto;
     color: #FFFFFF;
@@ -104,55 +109,66 @@ td form {
     background-color: #7c7474;
     opacity: 0.8;
 }
-.rectPage5{
+
+.rectPage5 {
     margin-left: auto;
     margin-right: auto;
-    margin-top : auto;
-    margin-bottom : auto;
+    margin-top: auto;
+    margin-bottom: auto;
     width: 600px;
     height: 500px;
     border: 2px solid #000000;
     background-color: #FFFFFF;
     opacity: 0.7;
 }
-.rectNews{
-    width:310px;
-    height:200px;
-    border : 2px solid #2582A3;
+
+.rectNews {
+    width: 310px;
+    height: 200px;
+    border: 2px solid #2582A3;
     border-radius: 8%;
     margin-left: 180;
     margin-top: 9px;
-    margin-bottom:25px;
+    margin-bottom: 25px;
 }
-.stylePage2{
-    float : center;
+
+.stylePage2 {
+    float: center;
     margin-right: 7;
     color: #063638;
     font-size: 18px
 }
-.styleParagraph{
+
+.styleParagraph {
     border-top: 2px solid #000000;
 }
-.styleBlack{
-    color : #000000;
+
+.styleBlack {
+    color: #000000;
 }
-.stylePage2LargeSymbol{
-    float : left;
+
+.stylePage2LargeSymbol {
+    float: left;
     margin-right: 7;
     color: #118D94;
     font-size: 50px;
     line-height: 52px
 }
-.rectNewsTextBox{
-    width : 310px;
-    min-height : 50px;
+
+.rectNewsTextBox {
+    width: 310px;
+    min-height: 50px;
     border: 2px solid #000000;
     background-color: #FFFFFF;
     opacity: 0.7;
     border-radius: 10% / 40%;
-    margin-top : 5px;
+    margin-top: 5px;
 }
-.rectNewsText{
+
+.rectNewsText {
     color: #000000;
     font-size: 15px;
+    display: flex;
+    align-items: center;
+    padding: 3px;
 }
\ No newline at end of file
diff --git a/src/main/resources/public/images/logo.png b/src/main/resources/public/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e089579fa8d7d0eb76bf661f0f366e794adee14a
GIT binary patch
literal 13145
zcmV-fGp5XmP)<h;3K|Lk000e1NJLTq003<O002Y?1^@s6i(9*>00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsHGVV!4K~#7F?Ys%J
zp4E9Cy2o$$=i$ufXdZwgz<@9y1F;yK#2AxXut<~GiPM|lUgz4mb{wa@X_gPGxwo}r
z$F1GotkCP0)z!GGD0Q8Y6g#o75kdkn2<b>V^F03Z@Qr)uyZ<AEm~4Tt(;9Cr>FE5!
z_kZ7h_xrxju)iOpzt3^cnKWu#=A%Pcp#7Sm?Cb{_C1r8-rYFz{R_G_=bq7U%U*nEe
zFG|&ZgC*){^9|Rnw6J@-V)`peqxU3AtIuA2OI%t`rwN*w`AP6zHU55rcF$@rN;W==
zNc4XxL~m`z13ML_zm~QuW0*)kREhU%-gR=%P+z0(noVl?_;HPXGR}`5eb7vXIqgp)
z*7`WYIDxS0(wbeD<CU|!3WvW|bf?CfQSUA7sCbXfg6I13)oOmv9tnZ_NyeQUKiZ((
z(I}$K`oBSz_v;Wa%RGb;QUyMLc2nw!Cpm89u?`AZzOd8?2ZtL`_r5qvOr)GzweQ+t
z@sq%9j2~Ul?)EmLWa<A#R`5~yjlA^nIWo20$G*43bTgp{p_tIvqCq=ruZ%as{@r!a
ze}mSU#f(#4+x3Av<C#N;-tmF^(FE-tD2aUSw-F0|2_c=_c#xwsS*Z8u$Ey@KD56wS
z%9kmnvzm}~hU2D78*31_y^W~%DvP8}^oph0&|SAl2;4im$NlhwcGp@T;<X16^ZpUk
z!mKHXSYw?dlht1QttvxJMVZy)+?wT<bKJJ==c(mRNQBxJYlaD0DS0A)dCA*)Z;1HO
zTyD8h+`U`AlflUkH)#LcbPn<O_YwCWIN!q{U@5ZH?7@Fmp{hxUWmhf78RIs4o?GrQ
z#Q3=7wbv<2w<Hu%hc;A#l}k<0ePuluytUoPp3d|H<$*oh-?8B2hZnSeFwujU_@{`3
z|0e_tZ#>AMhmBXe(D!N#)l7!fZO1vwZTo4?o#TE2k3C(Rs?Ge-7sEY&{q;yVxkyP)
zEYghAY-OPy_gxG0;CkV?<GqewoxA&1f!={V?uQe!dq?{b$NvQ2{KudgS{n~S55u#K
zKJ-|b>K3M!RcE$6$=t+~#G+5jSWX^q&sWhy55?%g2hqf_V{*r?TVihUNHGcr@sVS#
zuLdG_MKkQZDMIeV)%Mu>{QKUg&^xThz5PMEccvdP{W*l>uf7C2utw0srfOa2i8}N!
zK{&5lwll#U`xqzen3ZJX^{lL|f9Xr{g@>AX{*dgy`L38)I>ZubPFvW*^;$FTyP*;H
z+{Sh5?{=km(05sffWKoh?(GfQ&rNJXRQ@jfeE<Sxn}?t>sw|$YccaHmNtBdZB`AsG
zmg^p&j&(!}I(8%z)z(Kw;@3Om!c+fUrr-BK=rmS+jj6WnW}M+m^PVW|EP1<c4{Ch2
z&kf4m*X?-6^tiV#X!lI@B1?P*QSp!9H+$njD2Zsc(Sx6;a@0@+P@?5JXSi)W&nSD=
zl*FgSd<}i+OXB+-di~Hrb>+URM2reCtOCM_uT#9VS`9bd=*i+`ii)$nsh~cysXIoa
zqd)eg^6d%Qf%yWW(eENGO%HpShvB(KKl!T?(QQnihe3auhCX(fIM#6$tFfoWQn}N^
zE@E_g++DZCx^0IVNF76M?OL@;Akvq&Meklh!e=k*7w!4q{7s1t9{jNm+@%NY1G9O=
z{C|ZAl*DtOqr=1Kcnx@1g{X*7+gh_6cNC!gQ`}8_Pqf8kst;9Wen5u3dH|^w=`FW}
zg{<!jY(<=UGR2oyYT=f5x8tt&DQrEv+dI=-?CB9d&KZZ%r3_ONx%w?c<KKcF){&+<
zJq%6Oy6}^AuB(c0y9$sVco;v%sP(*5?Bua{rg5<u_Il^M^AlgOdg4k}TMXO*+3)*_
z?UVI8evv_$>~>FlzB_a3%#kmDIe>FQXzy``wnq#hmPIjl5M>!C0v1x-hEi@L0sjZZ
z8U=+20F*?$9m4A(6!gIRn+@dld8iG4wxS3<1g|!*>hF2H^`PA~-G@@*vq;CLBqlZ<
zv``k0SGv*P)hTKzO09;Ka85%HJIXnK+Tv>ZP!g5U$jF<@u-6;I2S%)XuiGU^tDi{S
zABp7VvHBe!R)|cyxb>G!Q7FbbIiQfpAR=<`mLjYu2jZCNR0M6vzH;Fwhvy)uG=}FS
z!XkuUL!=n=Pgw<-G(cLJpLL{ZohVjeG@ePK=uDo>&rTh@v+<)2<Xa1xf%P>03_|fg
zemP(a<?uwM2Op|o-PC{*8_>Td>_p-ThS4*Dw#LJis6KjdBtmb~Fo6@vE4Mde=RSq-
zzP3v3Xp8Rckn|zUBZVr>P3}V`(GJ1a=5pVlBfK;d`hwr}xd*h?AaMgSmGD<9j3@+^
z_>iruh^VowRXW8~__U&}?^XWft_J!ck2fDQ)5DVSzePCydAOL3k_bF3OQ&i*=-U+x
zJ&ZvQW5B~K%X-?ft;4X|r;h9!uA}?!m*`T)-e)-4oXaCF_7EcXVZm>gid>I~&Td=@
z%qbS;q$He^!bHbJ>ww@eW;kqd;`yLwwiyad0N`~>n@}PxUydY(jto}>M}Z?!I1JT+
z%%p^NomeGYg)Bz_4%P@e@MZ#wg=)naQsxkNm6G@wm$si*(s@cE>#Utwt27#4t^+u_
zv}?a$yt$y=yD)@^|7qw2zxh(YI?@zATkXQ%ty10AjPk1OIwz^apJS9h0}K1ikt}Ll
zQc3*iw1e8gwQ#m~!{=TN6MF+>O?Rh*VkHSy0mnfd<gT`bE7H&lisQ(pe$6JW2E#t|
zPpEd#l88Y`kcyBmFv})pos`<R7L!pBH24P|&=64wJk&^SaurhuG{Z_cB+^M9s9X{P
z$b_;{po(ds66r`gg;-f>r8tyd+M-yD5+qL{%%4f{#<6rfIl6H0eji=pxcH!%EdqAy
zvyfpQffe1o@gPGPJXh<+e^+C=4%P~5fXXorS@r}#{1=jz7&}zIcv%0M@riL8t%(mn
z0^J7lxED_MdYB9j@|dtmu<o+@m`&<Ui+I|>rO-laHdgHv%s22v$OnQW3=Pd3N_EPj
z?i5P|31ZAw2!(>Wry!@)xvKa|a<0$Kk4ZfZFN1)ZvSI=Xk0}#-WKxz|A{Gf6sP04{
z)5%DutUzVEJeePo%1*&sYLL}u;CLrp9(=1ObM{+P58Yo!Z*g2)(0&0>q7WcWiC@|1
zVV$ecSu$Pi#(!I*D3C_{<&Je0VEs`b&QH+<n<-B`2R-cIo9kiwA*;HhBGTe+nBn_i
zlCOu)vmimjBx{__*b8F`R&Ch07Fwi|P*S8IHIgP!a7tX8a-~i8!Vx9N2X8Kbz(I-B
z0VXKYgaNS75gZo+3aO`&fcMBw5b-%c0fkIch&hBwfvgQL<4Qq)B!olmamXI{EM!5{
zAfuE8pUZHkXPS6I31T=>0AymF!=B9M0@<CZM*}-TneBnk3gH#A4)eavu=ul7df|oT
zfoB7#L>H~*{NSK<>=pTW$gp2K59>Sj%0jajKekR)n}U{Dv0e8p<NO%s_Ax2R*<;;N
z{mqrc5rXdhr2)j$9dO~l0`qqhLAcF{e>P>6=8DeD>AW?!u0-4`wd#YSn1zXSI@bVc
z0Miu{MA|T6ZA3t%)ToUqZUSiV;1wS9Cy!F)YY89);2*^*gpkBCf|RtGae>ZHnnDqg
zF(QU^N)sau!O{U_IA>I83tsF%@Bn$rgwoQ1ziD`X0?sD^J<!!!xbT@!OHJ345u6K1
zaE@$>O<k2}^Uk*D>WyWxOA1Rmmj5-Z)#F%^=h}PzbnRk-_x*!rc$ghSNtB;{`N2*P
zs}%9!2G?~#C~tBX>=g%KJ++UuEirK-g(?>xFjxrpy|^0@ekV-qeHh8>Y#O|1GyhD{
zo*yq-V`~_NDWz4flG?0P+cX%HAp{ILSp6O*xCK9<1hJ|Rjt`UTS*#5(T^LI|j5&@t
z0VPGYMPxbBZwAt)o81P$6U-seS}FK=aUQlinMGfC2}o7f)$kfugjiV&+fYdv^uhoF
z$f4~K9#bt?5(=+PaDxaPCm7Mt-((IJOA4w$7J{45SOL}094e|L6h{DPbS>K210G?Y
z7x!$5WHJq@eHcpU-|R@t{rQ>ycxM^CrJxymg|gp)3;*?(Vf{I23jftQ);=<@-m;9n
zVjpIhKh4u@?0e;z+C}%UyPruQH~C4V*@qxlo6=6@Z<DNgwCK#urN|mwtmqaJ^&%;g
z3PTApg$r|kxp~!<;H~XRTFoO{dyYR$W8LJos!p!%A6)YWe^*P_=}9mCc7ErhN6{&S
z_MlVp;3JQi^4D1<<{$c@$*%!1ABIAz0J>kWh8WJ<)vv`kT5HAGe`?UlE1pL$&4ipO
zI7{Cw`CIQNSfmTd<*)4=eEi!ov=dE@GxKYEKM{z;9Z=Fw?k*ns2B6#`(7=?ID!q|~
z&|ol@vC67iJk-^WdUw_1!QHS3PCIt_-}BzqqqTo^TkZ9xjlJ$<njR+QKZAh%GW^yF
zn1NhrJXJ5^C+b889r2f2#$K_WrVudVsBzQ70NQ^4fIR@PeMJ<IoxKAf`G?`;d(v*{
zSeCDUp(}B=WFfCxC@~mol>;aNtC&Dr(PcQ%7P#6K8>142Gz#PH8{(+zrsbyk%PonM
zqe5Bh^*H-JLC~#9d;RewpDp(^QKp$+@(xx_uwO}lp`=}<v3xhwuMpEPK=|AO22sRy
z*0)0e1uUGs!gMJ_0}eGSi4B^Byab{RsUEpWcj;g?&OyDk-&c+bwRFAb_@F&sIWha8
zu8`9kq~bgByz(d5wZ?g*ml1S+$k{A3-7J*Y4D{_J$91cl)>pdhGm|Z`<!IU8a(y!z
z{G3`yekk*c&p(ujz3(nOvM;#s{9hY11M6h~B~kq2^E|9$uNXh<P#p|RMY&x8X=>7x
zL}J^=V(d&DPqk_guyZ95aKQdUuVk^^`{8n*E1<gbbI8UYg!-0GS=A%kQ>VV=Cg$rZ
zr2RsvT|i$`7-}v|Pyj%n3`nnHQ>zB6v=$Lw23*kSRf{L;0rUo$`iIqa-!JsLqw^wC
zI8^Sh5~9MawRqgJR)$v^y_-UL^-517+gkg1C>miFC3&^oMl<UW9AXMh)>%G0<UV^G
z%9Eu#h!ATi&FeTNf<oLoLbYV|py!%JZ}`KE1oh3SXZ}1v+BGQ6EsHjCZgKtFqvbn)
zR%`iFVOaP;n3(?-wuASIICo{jYMkv&OiaaKMF2i30|i=RG7vUPqyr>#MBp6Ea2JHb
zl+tw0nyA9xKWmBpOv&FhT=$3mMTw-JbAIuK|Il^dk>d+{z{NPVu3s56)5B={Q*c55
zJ37D3jiI!jZFJ$obq>-LX1vu2m~B0WnEgC->gnVDSRH-op_hBu2WPh;zT>@!M7Dtm
z8xKyxTFvZ+vi_?EVNnu&D-^sv)7bew*4$ixtWH7ogG4eo3<pZnP$Cw@D%qCGZ42py
zHjPF%UH;9#%0h4IPo8;fvi|O05RzS83v%zabi73<vd86(sUjcu=d0IzJjO{XwB3SK
z35`IaIV1|@FLbfYLzPfc4MmRYhRxMto?vD^8o&u4OT>zhQ#5bQG=SULeqh$&9>}kl
zalP8baD@^8C~(}ZNxHP2X6s{(xc5pgO5TY=JO&H?Zm1$GXDyz9veMsdZ@zpz+Tnl)
zSQUy#fMgkzR9KV1%4sueVJ~Gs4W$qdDYz+{z$*iXuh$#Vz=w!bm#xt&{+hpNx1`>F
zLC}6-u?xlC?{ysK^F53L51X$Ipua3>4S>tC8r-sGsN){RggmEXF@97mRbJi05|I}W
zH<%(;I{_JGBqTzNl%#bC`t0ZZIC+1hQui?JzCW8f{f$_-nR2-MhEON_I2Mb&$+55b
zk(;T9TR$QZ$=Ia*oxHpHO`EoxJvEf@rA`zwlQZky(2EVxe`UiT+>cZYpMr6URhFo(
z_O(U&dcjgIN6|V=cH1Tb2(hz?khqvju0Ga?x~&KhJCvw`5_mHR8Z7`VWe6HbU^s%m
zz{a_jhCcx2=+qC0vJ_$vv=n9n%m^xJxU`}@@suaiTL2Z_SZNne`>}h2Mg3BiO*gd?
zTPbVDfX!AzmDvMU(tSV^qXdZ$CRzDA?YQufvV`-8f?Z6^{ig)4l*`_>5Be&*ixSb;
zoPOpnB(~ZZQ&3`TFH%mU6SVZ*i(Snq_-BZT|D(e-Oi6@nNRjzw4}PqyR17rCszSiV
zz!Q7UV)hZl+3b_4HlW0ZUV{?7eUGdTBUCP|2FW;WCv62}KuGLC#3Ux&VVtSQF}?y&
zX(q{6%b?j#7L)VO#mbEs5q_Fir!{1BJ)AfOa-YLl(1wN%r4lt-$S&9z3oIiqZ_hp6
z65W?q!oFJ|Gi}cNTDN_2L8}NvVMQz)R|nh^-{?!8JW&e=hsGLr{5E8CKA}rD0z*i2
zfC*?&z>y_mWSJ4`EPO@@09XS)!b5~b6w(e+X9&HtHwm~8l<x-Rbedsn6iR9<msk!O
z;lQ4X+_Z0@b=8Lzwo@rKGis4#(6W`AVCyqkxBP5RYUXbmqUTSU_LC`8s}o05p@MwT
z4>AvHCftNoZBXf>yfd>9E2j_ZIPa462#NrxD7eHBp8^YPu@kh|ZGb#PjWqSri6M}L
z!Xi3a14#%LoKt~-jYC;HYU~vu^wcqbyn(*>(Cfqc;bGh}+9q|j%v|5IHL`8LlWYi9
zH!b+FGZ4nK2Q)wjY63udt{PD>tt86=#_(Jw{Wx?`y;<x5K_ii|>MfhrR;VVc4#Qev
zQKFhxbME4?X54pWCEj$KVMHmixNM^pCK1qTQ-d)mBRbd>Mk1pmG&EB>w9HHCzYBG^
zlnDfZIz_>y<@40RCnR;}5}x)Y#WHk3QG`Mr<Mid{=0#%4Tf`zOlvrbkv6GaC9+x=C
zhRffrH+zQLxOWg3Mk~+8ngF4ah?5d#WC>P9snqQ2^Ze{io06>UG}dg{&emJq#b%t(
zQyg+TSzm+p)AXZUCV=W=kvex>6m%FQq&0vu8)U-7x$-FcU`iWMV|}4%uR+BzNHI0E
zC+D#8tnIQX03S~?8(=*mQ{T%O;{4DX^03T**|q&?>bwWDD8W?Z5Xe*sw2CvS3=wUM
z+&=)@WG5&BVT7KK!#GXq@z!?>WEVLJtA2FmJHTBM)p#eM7i8DN%0$-BpK$DObRf4d
zXSYNcCWW7}<YdNLe5xV3uLJEbS0E>9N(%royb4(&4em3arzF_i>Lqz!gMtxtL+DLy
z?EHaXfNG=b5al&0>B^y=M%a1j$cTAT_kQHj4av!@1EaJc)&k64ZrJs5(Q%r3-RDJj
z>6sO8*JLb`1;~!JgBC%ZfeuP2D8`p1%fXKQfp%|#@^&{UDiR?6@g!Rvt3}(cZOg)y
zMxBXd_In^|uT;XV@Vex7i^h#uy?6vZ*^flJCz6@%0Nede&<Hl14^?~Yv7@WO?z;qH
zDI=^k(C!qIGP|8WGY%!;3@qlE<!$K-`s63SFLAcqHld`E1H_ks69l0Gij_i6GwgeB
z6x-c^&PKED((|CD19wR>#&MWo>rVjy0l7+8pjxFk(?Omsd<T#fTsO><w$etbqRNR_
zp2TZz;PZNZ!4rAN1t1@!+D?(_5J)YE#iR=HlILW4pyDJXMj1h!24x%;(_it0EETR#
z0lii=$<%992}WL~3wXn;F%ytz+w#!A9FhAz^@nSfW`0FTQ2U{l<;m$PfM4k44ges$
zt{AG?cB{+MtvNWaKZUYaVAO*tN#;^^bKF7xEVMM2(^x>&NkJ)n5#idXF)3=nrpw!^
zcT>`;KI1s`7vZ>UBh$dd0H{p6>}RW7%#AI_`>qIa)-{1E$*VWZM&UjEiSeT;R0^^u
zPyRrerL^<g<LK0>iM{ze2)6@?M1u2x$67|Yug{dP`?MdYE(3ACm9}SJC|GmLgsW9p
z5FSisMkxg_xFh^kOmQMqLTOW=F9NC~?pzER6Gq8sZsw=&ZAFFO2ghLmkSH3kj~q87
zs}*lfuld*BEwP&ev|F>O*MeGE!(hn5!Uw(v!89PF!)7{m3i^RVcEreYuO~0Z(oJ+S
z@u|rJf1+8i50*%GhA+-#`Sh~shlJ8)=zTN0oz-LW+3`Os)_4(s%`UCNt=eoa#M*;%
zDZ}hjVA%ztAp2ppdvQ+I{Qh0#VCX}k&J7k5Gyi>4`uVRz>sSIkXak6#j_7S9HcMx%
zsbvAHdR6S(0{jbBeT-_+;LTcFi+y@@ai~Zp;2p;3dqcN&zd6{RJx<+oGcdzx0W(Iu
z7#e<!U7mmZ>np9Tx0n5GA818a-P+)TFQ)CaXY%giI053)nH6Quh&U!mpw9tq&<3qR
zg;OpjwxvX!+rY0QWdSIVb2)2fG0he#AV674nbw#OZSBvc*isopWtbQu7>dd+Ymb7f
zZHzLRV6_q^i2#tPZ%`LDo(*7b^x7qfZ7xeL^G>*=;SjwccLC1P!uQPiV%M#$352U0
z`=vqm$&=8$K^L>?;Cd_qS6?dyku2DD5=ysOfbf&Tyh5jw(oz<O_MtlFPpDFf6>s;R
zw%>O}Tjj2S@>m~mPCee`jGlzDumu2e3aZd*r_S>|54;y>$u-^1+2e%j$fb=o)gcaL
zS4zSuL;t0bOza9(GEZc6y#My$+UigLw0xtTy)z&GIL=H@Gbbu=phir`pqVBZ6b>*C
zmF#lZy2$aFbz_}0LAt31TW_dFLqkv*g-e^$#F8rztvVshgP9Cq1-IeCnuL*x#d%$n
z+mV&=mr}fSrq?+=QLx6_3MPs&R(5Uw`J`R`Zqc5a%+aw3AU+glUW0x*k#lB8vwWrv
zEuCkamDL;@Ur3VG8e}y*#%7=u%!)O?zCL>BykU9ZzyTWNEmX9|s~JA!!>Pbk;8lyU
zNmxXyyY9M8GU1(0v(lOV)bmSR)si4sOHhnv2%{$x*qvPN4Vvl5!ct-Ar+`MGp~9MP
zQ6fu1B`cNYrtVdL*L#-QSN?20+<ZH{ESa@ek8VjFIg(*BfCMpQC9E|@e5gT<mw6f}
zvXs&a$f9Mz)N&V_u2Mg0F9bhzjljf$wcs|RuKO3r)rD(Q>z}yUb5{=^IN-gmBYWV0
z5~HIr^OgWv^+*dl#1|0_1=wD&z$k&W!Xw_r&H!v5f1wf$Z(j>`-ZJN1f5Vb@#eBwI
z`<uMI@MjrX9k<gZ3s5<*U>n(-1U4L1_T}Q7@+h2Y1=QC;P!k}&tOnOLV=+DHpi&q~
zX)CM%RIv!e<W-viWY$3o08yr6#SmjPOJjQ)Tct_C5CnNFcJp(uScnJr?9uz`Q2_e%
zsw83&Y&DM(T?XgX^I2Pp{$04Ywi1gdY=%(Zp{^UkSOxWC9CCMNP5HH%;o*4e=qOyW
z*{vIeN?3ED%sBJ@?i<$HgTEH3#Cu?27Bx_#?!@e$7v0lOq}VE~3GgiyO8`ssfP&Vb
z)RY9)tDS<Lxc}MT6PkZ?Pw_AQHRn+c9`t};WN{Q+QS!FjvJl>SO^hwO<6eMxT5uO1
z&ZnpTT~~MO<oj`@HS$Jw!U)(cOG|WkV4(9k*?NXTOGy(y&V@|%0lw=MI_d(OgsIr#
z)9rWP4rKXVkw}7?Ph-#_|AKSxuapL36~~iJ@%d`!xO?{Cy}pyAk=R9IxkGBvixmYv
zqo-hXF9TYHK!bFk<N&N_K&L&c<#1cYrGZ6Avj@pIZT3!55(8=vu!xgEtg~~K_Ryjq
z4738Bd3hn~i1nuC6DfCoh~Qd3Ba!RJ*>WIyrmI1B2}em$NG%i-$;F|pGusQ8$81L^
zIh2n}8crWs7zRD|eu+N%9mk2Xy^w>K0rh-02r>ttCSQS}5&#gafU|vSQ}X$5X6^YJ
zz>y(v)>F{ip)cqLoa8d#s|BnQ^C9upUlFt`yZ`#j77N#)i7qOkz^se6qu7Vlux<ZJ
zbOV5sWWofFXzV3<{ZY`>zPM|!GWsY4?qW?mQ*Ng6du);g!PFx~D3}9aMfNEmy?_oA
zp~x53{L8Ke5_%cLb_lq>hKpLD7(W$D`ecSTr_;3d0^c=L>MgHz0nI9CA(OzLBCy5Q
zVlCQCb34GaK!gBAoyOCpn{V)={5)kbV4kL9dYIJq)wb1KuyD`}L{fvl6$z9cjHR<4
z3$_kS4}&EQ)kj?JkoqcArkLQ+F`jA^=YhPt9`vSFz&>VE3AacqSInIO3NT*|Ra8NV
zR7tM(;<0$oE-%c#3uLPu;AGq+5x*8dO$JD^a<D(=u=<IjJ9jG2C)N>gNr3d(bA~KX
zTf72Z<s!iEIcVvt=~Aus*p8I{8o`)oz;ChkW6W2W#e8D`77`0dAjot%-g|j$Hnu>A
zYR8%Pm%MF_Y<cAi`_<aQp#ul}i`l$#u=ARO{@w@vIA;B!XO}|{kYx*icAt#pkWH)B
zVDjk6LY!YLg*$gO#lY@BWj4hcZ-W5c)spsVJ03bqU)XxMcj)0iYC@UHS{dY58)|hc
z3TBp;<ko1w>rF>(m*&WPJqyUhRmCg+>$m&oGYQoT)1drlZ2qUZ2lJE1q}y0Uo{wV6
z<=XnK*JK=Pc}w5p(*|U~{KYft`>I`uY0pAqC1tr5VM2%AjzlZ&=_>MLXUsK4!1|+j
zPcDeN`YJjZRJ^Wh>TA6Nah$kTGv6pb+aU@$pqv&qA|o%KacFZQYcEYeus|D)ZOE+4
zV1W{2m;wi@n7#?EY6_6iQtZX+<pI<>l1)V>IbIVqsMVTMaCveuAjIy5*HAG?qq>MD
zV&n<A67L<3P{M^Cm#D{GAD*n;l-ZH9AG~q6d-mufkF+mx$CW<*(8pp!cMd%GV6Yt6
zwE$VGmLHadqJv;4580@U25ET|R{m@=9_p*hO<UWd51asNJMgx_f;%<uQe2=k=~<;l
z<H&#bT=<e-HUmU;26RsI%iym((E}W*Jag()+&{DjrL-k#P80?}`G6;b7~~7^1+^fK
ztm0PPQ9g@Wep0z<;d*PdFMm3y`Nd7U(`c;;Vqge#myoClz3?)h4R+gfwC<(`l~bSh
zXI5|f`3Uj*Ad8Z4Z8l;)@32IoeU5{5&_x$=eE!80pDTg2lZMOBN`cIN8-Qy7wlG=c
zgv?9E=b_Xu1C#(eXQ}zYfowQ(j_8|fI>*z9zL2f}nt~^lI5hGb;nkn{gGCo`3wN;Y
zA!CwwVYCqL-z%UZfFH$cLEn8-wRZ)5(ZnC#SUEM}j*NJRF4nb%oIeN)75*3R{KQwh
zY%y$DCA|hEVjWPzW+-AqoceuT__XT6r&eKg=WFrqtqyNZcR7>u?TB6nbZDa77Z|}h
zeCeXlejruX!xaG?4+cp#Mcd__eYYk>7+C9mTDd$16l?JyP7uim3nfu*Xl}~E9?1Sw
z;FJx0iMH856ob!QZ4LC564NOG7KKzf_yH7B7T3adKFc!wLF|b*f%7r9T4RyO0xXwF
zVD(L~a@HKutO2N+$g&wIb4^3)bAX#JlN;_w1U(qgD=k48U#1k#f-f|$1X?c=tMS+u
zf7|TbQb%4jZFG3#5v#P;_Yq)5+q#nzM`1C+f`at4b=mBlUp@So*m~%Q*=6g2Dj{9E
z7K5Um4MicdK?ei^$!S+85;=#*XGl2RTD<G7_|4wvS2^~mT<-1;H|6aX%yykvtOB(h
zvfXURp#nHHr>IFXY_96i5(LRWeB=RDZUBj`E!Ecj&W#rj{4vib&_KE{-<5Rcb07x|
znw^ONAZ(C{(okxX?Wo|^gRbi>+glOP2SS}q#Zlh%b*?AYPQj!`=ob<}kW9oVi(7tn
zyAh;J%?VK|DM619Nh0Nkxh>jYsK{~r$Vxf9UWGn<3jiFoHTmSX`|abC1vXZ4pfw>K
zb}5MqPy(sRDr&wAfU!Bas!`6YQDB3k+~t#P&6aoFw7vcppL!rdZ@`7w)QKBzj!F0d
z4r?bA$()1R%OIMP+)_wh%7()uBkh}!y8wa$n7rwzTTi5!4#Va6-B*SvnE>U)ZN<fV
z7n_&iO)2r^{c9^{F1E+LV!-QRRr!EcqJ2aA8p`*}b~?EzWY~k1253(<X`y<d3Oc4y
zo6R}|<`J{P%eOcUEK6qzm0}^Nuwv@OqStkUa@H*cBC@2-<0w#FK5dy^*eJn5Z?;+u
zL75vkDrGa`Sr(~Qv<<++;3AicVvLVl+Or(DToMkHP1O|1$g8ckoIJP^QIao}7;t9W
z2Ju*n|2*3s{wGw`yO3&OWt23~o`AS}z;v3F^EIFt0QTq#Wn>j(*(Gf88ig`=czPj%
zIZ!9Qk8oiIRl}eDgr?Dc$X1%7)mevER=|R*vQ%Py^2u*)_+*eZHx1-v-Q5*HvUyNE
z2>=E~WRz&jz5)<)W)M^))0aoWWyN&$<UleVE`H`W#9O-U2m)YkCj9k#e#)EZNi>tO
zt^|s$TNe0Th?Jn5z=hK#M#&6u*>dDGYy9aulGpyyFN>LxUsdnlURB<%767WOW5;T{
z&8oE|UX_joI1vo7r0a;a%D{Eq=`pZks<D&CBHtzAX3b7<P6ji$yvP~YuhbI|KtQh+
zwA=2!TyAk4L<*QLUjnUz_Ui!aj9n|YRD)WeISO3IS<z*0`)x|IREjTvmq%*U;!~9J
zF~+Skgj+8H5<X4s<hYFVLZUrZy5rw|q4}SF=4S-pfr~=m(9@z+XH#Ye;)*W#x0gU8
zR9zX<@6PXNKZp97Adbe0TE`e}dcF8;MB0H|jBmZlph}Ge$Q6CRe5$+`ck}6g_x@9-
zPCsh)b|Cat?$Ffdny;zr{((mxsnw4iTWz_$Nv4Qx9_Bz=ywLXQFC<kZ*>`8^)N}B0
zsAUN8-u`}FKE*O5NwdHWL6DI;23TMLx0S63EZG|(i?;-kW>;gZQO!dMEAQ39e#=g$
zZ~-kKiGa{&K}2p_jYzSq@DeEpl^dz<jBW=|ROv!_xq9V$(qeMnu>jvj+6P0sT(o8%
zD@EJyDWJJ(+Nqu-mh&QX!zGTvlf-rd73)Fw@aFj7Mv(NOhaX07W`OM-0IXzSu}fGf
zwIm3a-Jrsxs_V<Vqln{I2&($XAATyh=2H(YaR%@N=m3bBmS{Wns<?i4CvZqu&8Tpn
z*@?(k+h4u<GoKkdkxKb*W;5pNje{Gg)B~OutOL1jE-m5hciyR<`DT9xrHgx`IQgz>
za{J__Uph?V(+M<lnw$HQwgC9p3XXJbw%H?%T&Q&t$Tp-=WcMzYuHOOeOGFh=n8518
zk~yAE4k2M*UMHJF;9;?>CZvuu108m7sd^2!aj+z7;Gh9Df^64elqoK)?cc|-w`z8o
zgFc-DWH=9QcT^WUvT5|(3QXgomE`k&CEq#><@-|Sf`N!yYRN2s84$mfmjqoW1J;)V
zb}dB@K6pOU&JXBu&yVQFjpeU``wa>aN}=xLq=niDt%w^h2V2JiBP-X8yMBJ9HB2t&
zrGLKPTV6e+b^FyjqTa&Los2(tu=C6DhaN(?k3I*Ihtrqh_2<%wxdg?~p<~cxbwaiM
z3|KwN1KUPnSWXlSR24<Yf^_iXG%(L<M<=#i(5RK!kIbTWm=V-zxe4Bmbw`o_SrbCt
z^1GH{g6xD{qaAr2o&vvtSbi{8^}DuZ(@P*g!|X}b)GQiz<HpfSu<bn=yYzUTE>Z@X
z3(y>aen7vvm_gMQpZQ}T%i9#<Ttlv9=<*`5$&@5yc6ste?{)8}JoKPmJoaeR|FiFH
zSplt^o1jy4B?7V3@@01p%8F%fGXf-aO*1NPj;+kp?q?pa?Yiwo`F4M|RnPE;U1Iw~
z88QC1{X=6lo2`~JYH~&L1+Yi5plJ9@gV~c439GWk`N~ojFE3_>7MB{8O`8XYo_fkn
zlvcS|SQ35Z#XM~<Hob1vTby3V<>qHtqOx3w78m{gl@-yVb=L{~UhC`((yL3ZJ-U=k
z>Xl^j)Iu2d_Lxjd*)NQ_iQ2M5YOSQbUN3n&ZkC9o3hw-AN$eo=v$wX^4;{MXyJt*E
z-?HK0Vhl=bK16BI&Lp$2N1zmazxV3nBO`vxc2*EdjbbbDY{8v5*2A73gN7V*d?(QM
z>T&M}%8l(0G?&ubU9HWAp-a2_^i`v+v%TPeH!_2ZVDg7H6`V@P!IqZ=gFfW0U5{|&
zF)AaPaJsPDtw|I06U9ML!dV~_41i;SZqWsj24T>)T6MtigkwO^F|drDEZYJpXK{+9
z<XsioZ6y*Qb|<f(8P_#imKdg$=?FVn-JRz)Ns$Ny-Xv?xgRA~@GaS6ekMlc(^73X=
z5_%g3MhDKSjr$MGG)uYFdEz_8^zt`2Nj;WD^9zrD^{e3zI>ybP{d_8l!_7EQ?*gcO
z(|UW`d)MP@c7ayuzNA%VSoz>k@#McD&cx{xv$KJLw&<;tihHNFAYu$hWWl^6i=tl8
z10|<k1MG2bZf}9~lE$|b$k_q@LLHQ&ddDxsNSKS2nt`ol-RiQ&a}+E)XingoATaa5
zoDl?gS`0d^YC`Q)=Jf#E!44p{5Y{$E!*z~D%e-E}d(BN6z||ahQ4g?>HLO9x1_%TH
z&)BrKW7!)%P)y7|x-EbF>p&LIBvNwz&?Vjp%h1N{k)5G5c$KneFe_I2xDymAs<4hW
z6pQaSx%%+uKij(bcfK$u1b`WkGP=>E1-4GK7~XQVz|87MUZUq0as7(i74E`s-Pkw0
z{w5@^m&bv60g1-{1L61}lF+^2tOS@WNW$8P@@nH+Uh10$M0M`IFlFTRp0gkW?%(+R
z!pA$W!yB7NE_fVu-cC`+r`2lXxmQdJ-FW=m)&$(S_s!VLiAJz(U$t2}TgWVw<2kQ{
zHW2k&?rj*|e__v}D23Om+fv{8Z%#sg({i2ThZFwFMWP)%{PB@wmY^Xa(e=>(uPwJX
z-@IY#*caM5|Gtn|`u~f4XHUH!<2SZ-UOmjW**U@g$9ZFW-d_2mjJ?_d<dDUkFG|y9
zcQCM6VgQwd=@RD7O!z;z<p>aixtGvb&Y)14z57_1TL&5Z%K(8GR1tUX6HuL91qPb{
z?^K2r0|WttMzkcFnq7sgb5DWU-~*pwcAJ=c)HHZ=ozLnBzVJBwLX>$zgGe0rDJ?TD
z_2v?`|D?~@(fmC(uO7PXwzr&Z?EEU~421%nPRG*fbx=@5VU*rmTUtMUaXd?p_8{-(
zId>6d;R+)#$`W(1^q!<E;SGB_r4o8vE$sb=v9R+@1z&vBnLP;$;s@J0_pI$i)c+jk
zt?dP8>GRw2PcDO3)~8I-GDdx8pN;u}%-#~A&Ghrm-c2*Hsx!srr`dgH!qs^IZ^(bD
z)6t=ZlTOx~^ue92gdM(PT++_1z@0LPIwf&qy8%QSj-qhqcHeXFGk3MA&e0)?=DpJF
z-l+pe16;?Ug7Q?7X=mXZFPa?#mlCuKae=8LjDc^J#Zu(K_e@#I%MHoCxVvCr@((}q
zh<DX@CYKz?MIBqmolimku)rO-Okl?bJ2uf4*`HbQE~~nv@}>Q2Q*%(`y*CWpy|wK~
zH9p0-e`Ud5{ui6GM@k|_yWv!GFguosh`9zMdBe=APQW_%w4=`5x%%8roDGl4Y`xt0
z7?@nMZJ2a!*M;6?Oze#*z$O*ROULU38>vo0njPz%JK@ZK37APrpFdtF?48{<#H<L}
zSpi`3!9l@?!*zJfIO}cEdBZrml<^vC#%vFSvrNL`$ca#-H4e;uJ{NzVF!ZU*4;*ML
zZM)uRv9bAp?&MTVJS0})cY&>wbUHmQ>iWoZ^QP?f9{PJXmTQZf4;*M8e6?2jftBq9
zHU2rVo4X)jU)q-WZbJ#W6BfJM*&@JM6S5>Up~4s3#d&_vb6XXW*@*Khj%c>Ck_(=@
zVC|a6O}a3%#prd8XPzUkevWTEM=$s+a~x?lC23ng(s~flRa?uZyz<IRBiFBe$Pi7I
zzzPDUQ9{_*LT_@Mle}6TTZf{~KE2-LX+^yto{!#p9T0Hdv326U`=(3R`UA<yFU}1Y
zr$<Kiyxik%FAXBg`+dqAm*?#AzuumGVkM60E+aaD=vskFv`RTz)G`h@Prhy69Psv!
z00|$$m~>+m`@zDNLVMz4AG=ia`0ByU?qUa!GxQ+f6*A)JtqpzR4?g1os+^Bv(pkq{
ziP<<-PrK{!RXanRN|=qk^|0q&=<l*`Y5Ji@o$^U|SrgqezXM?X?{n7L*6qyy!RGuk
z>oQW?K!o6wurjRp8K^poVXA)(Egg^Tfr0<2zf#FcLA4p)tq&TZ;**~|Z)U#LaY4{<
z=T{4r%vU;?+r1s|&0Gg(-fGa!+d4Ov3-d<u!XydcWIWA$@0_iZan06+M$~rz6x@Wv
z{r|W3z|ne12O|LJcNLPe|8jfgXfuk@R(P`up|60tHw~vc8)a4X_{hinOPzrK6$jh+
zrUC?ox1rMN40zx#_%4kDrIQ^vMWwhj1p~^R=~r`ox6W&;6>}+51-uX`&!S7wjeEel
z*BP=<YsXt|pQ{hIBk&)I)Wd0O=?}N2k5&VTwgX+Zso5e&*|aUgIq)URKLgC{_&YFQ
zW<c|*HWKQzN~sqV(@jB`?Gxr!31elBc~f`9a`al^_)UyXkAr@-cL^<!Wa1e3QSDwj
z9+H*<cPsA6)6ufWcc_K%_Md}gQXa}4|Kq;o7$~-Che4p6(TcXnY%KLu2^A|7BcF^8
zy+Z?L2HmoE*9Vj8G<e`bL9m*Z?W{7(o??uiMCSG;hb+%M@wb=!Ei=YQUH;&HS*+8T
z**pN|gKSblHZDV#Hvex{EiRT*ynMFDJ-Y-wHE-_51f#P8iuyc>&|IP@O3!}bcYcsU
z^J70)$|^0z8k`u6V#fI@V|)fPe%1nqRZ2R~9RJb-_R@e-`J&eK8$bC~X?mQ6Z6KYb
z4%N8;&+2YH6G&pTLER0MwFMUavgu)1i-n*Ym7W|Kd3p2BJ9sckopIu-RS<9LfTbr9
z<<r2{7KnpOHOFrseS_~7e#-;6>rt(n!@u$1Y>H6Nve_Jv+pJc?>~l{LDKiK|o?~5y
z#WM{gXL`Pdsxx2tNx)tj3`B~jsE8>*>5AlPIf3H}D$leIedXaF-XsC490gZp-+@m_
zx}&G21mmDEu(&N#)V0!}lN;dCZb!j-2^T6e4}bC<UlK1I%wqTjkl|&>lvjxh?PJAC
zjK1{nkK$Xm^^t>LHl^2mFBC?nPT_q+`>HC%I1Sr0Zu>Iq!U2E|lj%PR*aZU*kBnIE
z(vm(tFmTCx7v7HZ=>*V>&wWn64cilbEXV%<OG}x0kaX<P00000NkvXXu0mjfk^i)p

literal 0
HcmV?d00001

diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html
index fd39a8a..8f217c2 100644
--- a/src/main/resources/templates/default.html
+++ b/src/main/resources/templates/default.html
@@ -4,10 +4,12 @@
 
 <head>
     <meta charset="UTF-8" />
+    <link rel="icon" href="/images/logo.png" type="image/x-icon">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <script type="text/javascript" src="/webjars/bootstrap/5.3.3/dist/js/bootstrap.bundle.min.js"></script>
     <link rel="stylesheet" href="/webjars/bootstrap/5.3.3/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="/webjars/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" />
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="/css/style.css" />
 </head>
 
diff --git a/src/main/resources/templates/new-edit.html b/src/main/resources/templates/new-edit.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/resources/templates/news.html b/src/main/resources/templates/news.html
index 57d4926..eaa9e35 100644
--- a/src/main/resources/templates/news.html
+++ b/src/main/resources/templates/news.html
@@ -4,15 +4,16 @@
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="stylesheet" href="/css/style.css" />
     <title>Новости</title>
 </head>
 
 <body>
-    <main layout:fragment="content">
-        <h2>Типы заказов</h2>
+    <main class="text-center" layout:fragment="content">
+        <span class="mainSt">
+            <b>Новости</b>
+        </span>
         <div>
-            <a href="/news/edit/" class="btn btn-primary">Добавить тип заказа</a>
+            <a href="/news/edit/" class="btn btn-primary">Добавить новость</a>
         </div>
         <div class="row">
             <div class="col mt-4" th:each="newItem : ${news}">
@@ -21,6 +22,17 @@
                     <div class="rectNewsTextBox">
                         <span class="rectNewsText">
                             <b scope="row" th:text="${newItem.description}"></b>
+                            <form th:action="@{/news/edit/{id}(id=${newItem.id})}" method="get">
+                                <button type="submit" class="btn btn-link button-link">
+                                    <i class="fa fa-edit"></i>
+                                </button>
+                            </form>
+                            <form th:action="@{/news/delete/{id}(id=${newItem.id})}" method="post">
+                                <button type="submit" class="btn btn-link button-link"
+                                    onclick="return confirm('Вы уверены?')">
+                                    <i class="fa fa-trash"></i>
+                                </button>
+                            </form>
                         </span>
                     </div>
                 </div>