diff --git a/data.mv.db b/data.mv.db index cb536ab..30e75a1 100644 Binary files a/data.mv.db and b/data.mv.db differ 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)); } -}*/ +}