From ef720bbc01ab01b167241b01b90d1041c8ae05a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Sun, 26 Mar 2023 18:53:00 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB?= =?UTF-8?q?=D0=B5=D1=80,=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BE=D0=B4=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=86=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE=D0=B7=D0=B4?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F,=20=D0=B1=D0=B5=D0=B7=20=D1=81?= =?UTF-8?q?=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data.mv.db | Bin 24576 -> 24576 bytes frontend/index.html | 76 ++++++++++++------ frontend/package-lock.json | 10 +++ frontend/style.css | 3 + .../controller/CreatorController.java | 5 +- .../controller/MangaController.java | 6 +- .../controller/ReaderController.java | 14 ++-- 7 files changed, 75 insertions(+), 39 deletions(-) diff --git a/data.mv.db b/data.mv.db index cb536ab95873264e3a552383212291bca066b0c4..30e75a1bb806f9d6872b6e41819317ebfd6b0e8f 100644 GIT binary patch delta 2742 zcmdUxUuYaf9LHz(>h0!Y)1uK7O`B~Sqj;NUXXb8qc73q^35XRj!B&OPc6WBSEluz8 z=OPuVJs$)SvE~Lu5!yEZL0Q(yAvlMjOWAc#Jw?}D%D?Eg77X&V&5uyQiE$PD}5?wz!GfMSvG3e0q!HR>iVKxmE)Hau|?OX2-_x9h#Gn#Ui>fU0T zUUZPY7_=OyUvifmg!ypUfzUAYR&crFnEH}?E?9N2zS3@Y9LtD4*dR92I~Ohm4z}!o zV1o45gO$|_ZT=prciPkm2xOZx&(~@IC=1H(KptneUOJ?>9wi2Du&<3z_A5RiA+fRQ z6AxR>khSL?8B)WLScczp*=A$1H~(Dxon$vpO|vaD)&F#!R(kW%danQH$%@1$Cm*}F zDoGls^8Fu!Ml!&Aq7{l4C>?Nr`jrnPrP^}&zR$2*uTDrF`yu-6-*|dNejFhgVF2Va zBd!b-pwjbet&7K?olV?q;<4|aJ$T<|Qv84e?NrAGJG^lCDvE?m6&#SxY(&zb!1N30 zd>C4;zSde>4g5$-A7KNh>!&)WGD+P+T{}_NKzf_fwI#Pj-*61;dbSsLB;5>7Ol4Q5 z531>wLT1d4oi<6l4X-IU=p$&s+m?0XvOcC_S+tRr_0p=%k_6j9WYTSv5Kdk|l_(=9 z;T1}F$(BM}+>#~1;U^MEk%4VPF~z+YrtZ4divMjdwtg-^OEVIdY?-&y#)My@h{^9hx=PHnRG zKIp$~PSlRdq58QbU}k zZ_i!ZQ>3jbJ^J45gEk3Y1j|87;-DpI&>Av=JZR4i{UQdfnSorO9R)4hSHCH3u&uhb z3$CxHT&wJz=?DHpmkY}T)pM6^VnQ3czUcDVJUe%Ad3On#m(Amm7mKf9?(~(rclzCb z)#=kiKZ;Hlk(F8QMo!BEY4q|xPow|m6@7K*o1zp|!asxj@(=?#j;i>&O%pMmXMq@9 d!{zI6R7kHn8Y!0XOc{hz&;3MK>mFjPV;77c5MSpTNXBZKo}2R5pf%cXQ6o%;Y@&zjJ0G4;S)q zr331#CwikgpG>(~JnBxHjv}C>EjsMh)N;e>Lfu;AFW%uoWbbN(O!W6R-gKvD#xiLW z>3lYWO{}YAt9LNO0>GYRmvS!!jy(pS)!l|52*P-DHa*^hRNv7^e()XKBuf@Y*88F) zZ^g)UtA%u4YHpMvs#CB)55j_?QlEV3Z;ini0Q`O69cFulFNc?l;T4z9U_3i%r|~UQ z&>q7=NE0c1B9+18rbafcj`;*XVb7V8An<8-E^F%iqbpslz|Z4AKtFtxNLZ-=&~`rsND>eNdWiYecI*oI*2|K;!3e3h2AawZRSWqe4Y^d%3vE=;+TGd|U|K*Ji7patY=n`G zFh;6GK63ZSVmwMV;&*b(9WMf8r}KHpL!kaV%)JuY+3uQX^Z^4o5S*|ldyr5xsAzD} zIJMq0F=w7$g5-TyJ5=PdViF`QI9WDxw1Ts0&nv@H4i3!D^@RW7duyY`tr9z(^SF6@pdgRBI$$Vccd1^J4 zpi5HdinK{3+KTGx$k|6*LOW0vf5ty}DERl-*5h8uvZxt!stZ7Sv*!ENaIXVE=N)c% z^Bw~=r|6xYT7GS7>Ri}^TrEK^RUlU@yUkD}!w_tv4EeehA#bdK%F@yb;<+NGj9+9a zt+v8dZ@v2{oR)x5#hz7E;hj@VF*ze!HUx5Gs diff --git a/frontend/index.html b/frontend/index.html index 469c31c..62358bb 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -13,36 +13,60 @@
- Calculator -
-
+
+ Creator + Manga + Reader +
+ +
+

Creator

- - - - - - - - - -
- - +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+ + + + + + + + + + +
#creatorNamepassword
+
-
- Footer -
diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 3bbc5c0..a237bae 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -24,6 +24,16 @@ "node": ">=6" } }, + "node_modules/@popperjs/core": { + "version": "2.11.7", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz", + "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", diff --git a/frontend/style.css b/frontend/style.css index 716f81f..406b163 100644 --- a/frontend/style.css +++ b/frontend/style.css @@ -30,6 +30,9 @@ header { color: white; font-weight: 700; } +a { + color: white; +} footer { padding: 1em; diff --git a/src/main/java/com/LabWork/app/MangaStore/controller/CreatorController.java b/src/main/java/com/LabWork/app/MangaStore/controller/CreatorController.java index f1e4cb8..15b8aa1 100644 --- a/src/main/java/com/LabWork/app/MangaStore/controller/CreatorController.java +++ b/src/main/java/com/LabWork/app/MangaStore/controller/CreatorController.java @@ -1,7 +1,6 @@ -/* package com.LabWork.app.MangaStore.controller; -import com.LabWork.app.MangaStore.Dto.CreatorDto; +import com.LabWork.app.MangaStore.model.Dto.CreatorDto; import com.LabWork.app.MangaStore.service.CreatorService; import org.springframework.web.bind.annotation.*; @@ -45,4 +44,4 @@ public class CreatorController { public CreatorDto deleteCreator(@PathVariable Long id) { return new CreatorDto(creatorService.deleteCreator(id)); } -}*/ +} diff --git a/src/main/java/com/LabWork/app/MangaStore/controller/MangaController.java b/src/main/java/com/LabWork/app/MangaStore/controller/MangaController.java index a619e6b..fd146ae 100644 --- a/src/main/java/com/LabWork/app/MangaStore/controller/MangaController.java +++ b/src/main/java/com/LabWork/app/MangaStore/controller/MangaController.java @@ -1,8 +1,8 @@ -/* package com.LabWork.app.MangaStore.controller; -import com.LabWork.app.MangaStore.Dto.MangaDto; + import com.LabWork.app.MangaStore.model.Default.Creator; +import com.LabWork.app.MangaStore.model.Dto.MangaDto; import com.LabWork.app.MangaStore.service.MangaService; import org.springframework.web.bind.annotation.*; @@ -46,4 +46,4 @@ public class MangaController { public MangaDto deleteManga(@PathVariable Long id) { return new MangaDto(mangaService.deleteManga(id)); } -}*/ +} diff --git a/src/main/java/com/LabWork/app/MangaStore/controller/ReaderController.java b/src/main/java/com/LabWork/app/MangaStore/controller/ReaderController.java index 20fc9b6..73eb082 100644 --- a/src/main/java/com/LabWork/app/MangaStore/controller/ReaderController.java +++ b/src/main/java/com/LabWork/app/MangaStore/controller/ReaderController.java @@ -1,7 +1,7 @@ -/* package com.LabWork.app.MangaStore.controller; -import com.LabWork.app.MangaStore.Dto.ReaderDto; + +import com.LabWork.app.MangaStore.model.Dto.ReaderDto; import com.LabWork.app.MangaStore.service.ReaderService; import org.springframework.web.bind.annotation.*; @@ -41,15 +41,15 @@ public class ReaderController { return new ReaderDto(readerService.updateReader(id, readerName, password)); } - @PutMapping("/{id}") + @PostMapping("/{id}/manga/{manga_id}") public ReaderDto addManga(@PathVariable Long id, - @RequestParam("mangaId") Long mangaId) { + @PathVariable Long mangaId) { return new ReaderDto(readerService.addManga(mangaId, id)); } - @PutMapping("/{id}") + @PutMapping("/{id}/manga/{manga_id}") public ReaderDto removeManga(@PathVariable Long id, - @RequestParam("mangaId") Long mangaId) { + @PathVariable Long mangaId) { return new ReaderDto(readerService.removeManga(mangaId, id)); } @@ -57,4 +57,4 @@ public class ReaderController { public ReaderDto deleteReader(@PathVariable Long id) { return new ReaderDto(readerService.deleteReader(id)); } -}*/ +}