Skip to content

Commit

Permalink
Merge pull request #14 from nhnacademy-be4-My-Books/feature/layout-se…
Browse files Browse the repository at this point in the history
…tting

Feature/layout setting
  • Loading branch information
minsu11 authored Feb 23, 2024
2 parents e3217cc + 3f315e1 commit 58bfd3f
Show file tree
Hide file tree
Showing 21 changed files with 319 additions and 5,937 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: Docker Image CI

on:
push:
branches: [ "main", "dev", "feature/front-setting" ]
branches: [ "main", "dev" ]
pull_request:
branches: [ "main", "dev", "feature/front-setting" ]
branches: [ "main", "dev" ]

jobs:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package store.mybooks.front.admin.controller;
package store.mybooks.front.admin.main.controller;

import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
Expand All @@ -25,7 +25,7 @@ public class AdminController {
*/
@GetMapping
public String doAdmin() {

return "admin";

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@

public interface BookOrderAdaptor {
List<Response> test();

}
435 changes: 0 additions & 435 deletions src/main/resources/Template Main/admin/404.html

This file was deleted.

429 changes: 0 additions & 429 deletions src/main/resources/Template Main/admin/blank.html

This file was deleted.

604 changes: 0 additions & 604 deletions src/main/resources/Template Main/admin/buttons.html

This file was deleted.

601 changes: 0 additions & 601 deletions src/main/resources/Template Main/admin/cards.html

This file was deleted.

497 changes: 0 additions & 497 deletions src/main/resources/Template Main/admin/charts.html

This file was deleted.

87 changes: 0 additions & 87 deletions src/main/resources/Template Main/admin/forgot-password.html

This file was deleted.

106 changes: 0 additions & 106 deletions src/main/resources/Template Main/admin/login.html

This file was deleted.

102 changes: 0 additions & 102 deletions src/main/resources/Template Main/admin/register.html

This file was deleted.

Loading

0 comments on commit 58bfd3f

Please sign in to comment.