Hoan thanh chuc nang Page

.vscode/launch.json

@@ -7,6 +7,7 @@
       "request": "launch",
       "mainClass": "com.sisvietnamvn.web.SisvietnamvnApp",
       "projectName": "sisvietnamvn",
+      "cwd": "${workspaceFolder}/sisvietnamvn_main",
       "vmArgs": "-Dspring.profiles.active=dev"
     },
     {

sisvietnamvn_main/.gitignore

@@ -151,3 +151,9 @@ Desktop.ini
 ######################
 coverage/
 .nyc_output/
+
+######################
+# Database
+######################
+src/main/docker/oracle-data/
+

sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/config/SecurityConfiguration.java

@@ -46,7 +46,8 @@ public class SecurityConfiguration {
                 authz
                         .requestMatchers(HttpMethod.GET, "/", "/about", "/flex-finish", "/tin-tuc", "/tin-tuc/**", "/lien-he",
                                 "/manage/**", "/css/**", "/images/**", "/js/**", "/UMass*/**", "/Undergraduate*/**",
-                                "/favicon.ico", "/favicons/**", "/flex-finish/**", "/contact-us/**", "/uploads/**", "/api/manage/snippets/**", "/page/**")
+                                "/favicon.ico", "/favicons/**", "/flex-finish/**", "/contact-us/**", "/uploads/**", "/api/manage/snippets/**", "/page/**",
+                                "/about-us", "/specialty", "/doctor", "/service", "/health-library", "/news-and-events", "/patient-support", "/medical-expert", "/umcers", "/bidding", "/contact-us")
                         .permitAll()
                         .requestMatchers(HttpMethod.POST, "/manage/**", "/api/manage/media/upload").permitAll()
                         .requestMatchers(HttpMethod.GET, "/swagger-ui/**", "/v3/api-docs/**").permitAll()

sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/HomeController.java

@@ -6,8 +6,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 @Controller
 public class HomeController {
 
+
     @GetMapping("/")
-    public String home() {
+    public String index() {
         return "index";
     }
 
@@ -20,17 +21,17 @@ public class HomeController {
     // Trang Giới thiệu Bệnh viện
     @GetMapping("/about")
     public String about() {
-        return "about";
+        return "redirect:/about-us";
     }
 
     // Trang Tin tức
     @GetMapping("/tin-tuc")
     public String tintuc() {
-        return "tin-tuc";
+        return "redirect:/news-and-events";
     }
 
     @GetMapping("/lien-he")
     public String lienhe() {
-        return "lien-he";
+        return "redirect:/contact-us";
     }
 }

sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/PageController.java

@@ -43,15 +43,48 @@ public class PageController {
     @GetMapping("/page/{slug}")
     public String getPage(@PathVariable("slug") String slug, Model model) {
         LOG.debug("REST request to get public Page : {}", slug);
-        
+        return renderPage(pageService.findBySlug(slug), model);
-        Optional<Page> pageOpt = pageService.findBySlug(slug);
+    }
-        
+
+
+    @GetMapping("/about-us")
+    public String getAboutUs(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.ABOUT_US), model); }
+
+    @GetMapping("/specialty")
+    public String getSpecialty(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.SPECIALTY), model); }
+
+    @GetMapping("/doctor")
+    public String getDoctor(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.DOCTOR), model); }
+
+    @GetMapping("/service")
+    public String getService(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.SERVICE), model); }
+
+    @GetMapping("/health-library")
+    public String getHealthLibrary(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.HEALTH_LIBRARY), model); }
+
+    @GetMapping("/news-and-events")
+    public String getNewsAndEvents(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.NEWS_AND_EVENTS), model); }
+
+    @GetMapping("/patient-support")
+    public String getPatientSupport(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.PATIENT_SUPPORT), model); }
+
+    @GetMapping("/medical-expert")
+    public String getMedicalExpert(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.MEDICAL_EXPERT), model); }
+
+    @GetMapping("/umcers")
+    public String getUmcers(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.UMCERS), model); }
+
+    @GetMapping("/bidding")
+    public String getBidding(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.BIDDING), model); }
+
+    @GetMapping("/contact-us")
+    public String getContactUs(Model model) { return renderPage(pageService.findByPageType(com.sisvietnamvn.web.domain.PageType.CONTACT_US), model); }
+
+    private String renderPage(Optional<Page> pageOpt, Model model) {
         if (pageOpt.isEmpty()) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Page not found");
         }
-        
         Page page = pageOpt.get();
-        
         // Security Check: If Draft, only Admins can view
         if ("DRAFT".equals(page.getStatus()) && !SecurityUtils.hasCurrentUserThisAuthority(AuthoritiesConstants.ADMIN)) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Page not found");
@@ -61,19 +94,17 @@ public class PageController {
         List<Map<String, Object>> blocks = Collections.emptyList();
         if (page.getContent() != null && !page.getContent().trim().isEmpty()) {
             try {
-                // Editor.js JSON has a "blocks" array at the root level
                 Map<String, Object> editorData = objectMapper.readValue(page.getContent(), new TypeReference<>() {});
                 if (editorData.containsKey("blocks")) {
                     blocks = (List<Map<String, Object>>) editorData.get("blocks");
                 }
             } catch (JsonProcessingException e) {
-                LOG.error("Failed to parse Editor.js JSON for page slug: {}", slug, e);
+                LOG.error("Failed to parse Editor.js JSON for page ID: {}", page.getId(), e);
             }
         }
 
         model.addAttribute("page", page);
         model.addAttribute("blocks", blocks);
-
         return "page";
     }
 }

sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/manage/ManagePageController.java

@@ -61,6 +61,7 @@ public class ManagePageController {
         page.setDisplayOrder(0);
         model.addAttribute("page", page);
         model.addAttribute("statuses", PageStatus.values());
+        model.addAttribute("pageTypes", com.sisvietnamvn.web.domain.PageType.values());
         model.addAttribute("isNew", true);
         return "manage/pages/form";
     }
@@ -76,6 +77,7 @@ public class ManagePageController {
         LOG.debug("Request to create Page : {}", page);
         if (bindingResult.hasErrors()) {
             model.addAttribute("statuses", PageStatus.values());
+            model.addAttribute("pageTypes", com.sisvietnamvn.web.domain.PageType.values());
             model.addAttribute("isNew", true);
             return "manage/pages/form";
         }
@@ -97,6 +99,7 @@ public class ManagePageController {
         }
         model.addAttribute("page", pageOptional.get());
         model.addAttribute("statuses", PageStatus.values());
+        model.addAttribute("pageTypes", com.sisvietnamvn.web.domain.PageType.values());
         model.addAttribute("isNew", false);
         return "manage/pages/form";
     }
@@ -113,6 +116,7 @@ public class ManagePageController {
         LOG.debug("Request to update Page : {}", id);
         if (bindingResult.hasErrors()) {
             model.addAttribute("statuses", PageStatus.values());
+            model.addAttribute("pageTypes", com.sisvietnamvn.web.domain.PageType.values());
             model.addAttribute("isNew", false);
             return "manage/pages/form";
         }

sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/domain/Page.java

@@ -45,6 +45,11 @@ public class Page extends AbstractAuditingEntity<Long> {
     @Column(name = "status", length = 20, nullable = false)
     private PageStatus status = PageStatus.DRAFT;
 
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    @Column(name = "page_type", length = 50, nullable = false)
+    private PageType pageType = PageType.CUSTOM;
+
     @Column(name = "display_order")
     private Integer displayOrder = 0;
 
@@ -99,6 +104,14 @@ public class Page extends AbstractAuditingEntity<Long> {
         this.status = status;
     }
 
+    public PageType getPageType() {
+        return pageType;
+    }
+
+    public void setPageType(PageType pageType) {
+        this.pageType = pageType;
+    }
+
     public Integer getDisplayOrder() {
         return displayOrder;
     }
@@ -129,6 +142,7 @@ public class Page extends AbstractAuditingEntity<Long> {
             "id=" + getId() +
             ", title='" + getTitle() + "'" +
             ", slug='" + getSlug() + "'" +
+            ", pageType='" + getPageType() + "'" +
             ", status='" + getStatus() + "'" +
             ", displayOrder=" + getDisplayOrder() +
             "}";

sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/domain/PageType.java

@@ -0,0 +1,21 @@
+package com.sisvietnamvn.web.domain;
+
+/**
+ * The PageType enumeration.
+ * Specifies the template or system location that a CMS page belongs to.
+ */
+public enum PageType {
+    HOME,
+    ABOUT_US,
+    SPECIALTY,
+    DOCTOR,
+    SERVICE,
+    HEALTH_LIBRARY,
+    NEWS_AND_EVENTS,
+    PATIENT_SUPPORT,
+    MEDICAL_EXPERT,
+    UMCERS,
+    BIDDING,
+    CONTACT_US,
+    CUSTOM
+}

sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/repository/PageRepository.java

@@ -23,6 +23,11 @@ public interface PageRepository extends JpaRepository<Page, Long> {
      */
     Optional<Page> findBySlug(String slug);
 
+    /**
+     * Find a page by its predefined CMS Page Type.
+     */
+    Optional<Page> findByPageType(com.sisvietnamvn.web.domain.PageType pageType);
+
     /**
      * Find all pages with a given publication status.
      */

sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/service/PageService.java

@@ -61,6 +61,15 @@ public class PageService {
         return pageRepository.findBySlug(slug);
     }
 
+    /**
+     * Get a single page by its predefined CMS Page Type.
+     */
+    @Transactional(readOnly = true)
+    public Optional<Page> findByPageType(com.sisvietnamvn.web.domain.PageType pageType) {
+        LOG.debug("Request to get Page by type : {}", pageType);
+        return pageRepository.findByPageType(pageType);
+    }
+
     /**
      * Find all pages with a specific status.
      */

sisvietnamvn_main/src/main/resources/config/liquibase/changelog/20260625120000_add_page_type.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+
+    <changeSet id="20260625120000-1" author="antigravity">
+        <addColumn tableName="sis_page">
+            <column name="page_type" type="varchar(50)" defaultValue="CUSTOM">
+                <constraints nullable="false" />
+            </column>
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>

sisvietnamvn_main/src/main/resources/config/liquibase/master.xml

@@ -20,6 +20,7 @@
 
     <include file="config/liquibase/changelog/00000000000000_initial_schema.xml" relativeToChangelogFile="false"/>
     <include file="config/liquibase/changelog/20260625100000_add_page_entity.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20260625120000_add_page_type.xml" relativeToChangelogFile="false"/>
     <!-- jhipster-needle-liquibase-add-changelog - JHipster will add liquibase changelogs here -->
     <!-- jhipster-needle-liquibase-add-constraints-changelog - JHipster will add liquibase constraints changelogs here -->
     <!-- jhipster-needle-liquibase-add-incremental-changelog - JHipster will add incremental liquibase changelogs here -->

sisvietnamvn_main/src/main/resources/templates/fragments/layout.html

@@ -21,13 +21,9 @@
 </head>
 
 <body>
-    <header th:replace="~{fragments/header :: #l--main-header}"></header>
-
     <div layout:fragment="content">
-        <!-- Nội dung của các trang con sẽ được chèn vào đây -->
+        <!-- All elements will be defined in the editor page -->
     </div>
-
-    <footer th:replace="~{fragments/footer :: footer}"></footer>
 </body>
 
 </html>

sisvietnamvn_main/src/main/resources/templates/manage/pages/form.html

@@ -117,8 +117,19 @@
                     </div>
 
                     <div class="row">
+                        <!-- Page Type -->
+                        <div class="col-md-4">
+                            <div class="form-group">
+                                <label for="pageType" class="font-weight-bold">Page Type <span
+                                        class="text-danger">*</span></label>
+                                <select class="form-control" id="pageType" th:field="*{pageType}">
+                                    <option th:each="pt : ${pageTypes}" th:value="${pt}" th:text="${pt}"></option>
+                                </select>
+                            </div>
+                        </div>
+
                         <!-- Status -->
-                        <div class="col-md-6">
+                        <div class="col-md-4">
                             <div class="form-group">
                                 <label for="pageStatus" class="font-weight-bold">Status <span
                                         class="text-danger">*</span></label>
@@ -129,7 +140,7 @@
                         </div>
 
                         <!-- Display Order -->
-                        <div class="col-md-6">
+                        <div class="col-md-4">
                             <div class="form-group">
                                 <label for="pageDisplayOrder" class="font-weight-bold">Display Order</label>
                                 <input type="number" class="form-control" id="pageDisplayOrder"

sisvietnamvn_main/src/main/resources/templates/page.html

@@ -8,102 +8,79 @@
 </head>
 
 <body>
-    <!-- 
+    <!-- Render Editor.js Blocks -->
-       Because the user wants absolute freedom to design the page using snippets,
-       we will render the blocks directly into the content fragment with NO constraining containers. 
-       If they want a container, they can use a standard snippet.
-    -->
     <div layout:fragment="content">
-        
-        <!-- Render Editor.js Blocks -->
         <th:block th:each="block : ${blocks}">
-            
+        
-            <!-- 1. HTML Snippet Block (Custom) -->
+        <!-- 1. HTML Snippet Block (Custom) -->
-            <th:block th:if="${block.type == 'snippet'}">
+        <th:block th:if="${block.type == 'snippet'}">
-                <div th:insert="~{'snippets/' + ${block.data.id}}"></div>
+            <div th:insert="~{'snippets/' + ${block.data.id}}" th:remove="tag"></div>
+        </th:block>
+        
+        <!-- 2. Header Block -->
+        <th:block th:if="${block.type == 'header'}">
+            <th:block th:switch="${block.data.level}">
+                <h1 th:case="1" th:utext="${block.data.text}"></h1>
+                <h2 th:case="2" th:utext="${block.data.text}"></h2>
+                <h3 th:case="3" th:utext="${block.data.text}"></h3>
+                <h4 th:case="4" th:utext="${block.data.text}"></h4>
+                <h5 th:case="5" th:utext="${block.data.text}"></h5>
+                <h6 th:case="6" th:utext="${block.data.text}"></h6>
+                <h2 th:case="*" th:utext="${block.data.text}"></h2>
             </th:block>
-            
-            <!-- 2. Header Block -->
-            <th:block th:if="${block.type == 'header'}">
-                <!-- Editor.js header block has level (1-6) and text -->
-                <div class="container my-3">
-                    <th:block th:switch="${block.data.level}">
-                        <h1 th:case="1" th:utext="${block.data.text}"></h1>
-                        <h2 th:case="2" th:utext="${block.data.text}"></h2>
-                        <h3 th:case="3" th:utext="${block.data.text}"></h3>
-                        <h4 th:case="4" th:utext="${block.data.text}"></h4>
-                        <h5 th:case="5" th:utext="${block.data.text}"></h5>
-                        <h6 th:case="6" th:utext="${block.data.text}"></h6>
-                        <h2 th:case="*" th:utext="${block.data.text}"></h2>
-                    </th:block>
-                </div>
-            </th:block>
-
-            <!-- 3. Paragraph Block -->
-            <th:block th:if="${block.type == 'paragraph'}">
-                <div class="container">
-                    <p th:utext="${block.data.text}"></p>
-                </div>
-            </th:block>
-
-            <!-- 4. List Block -->
-            <th:block th:if="${block.type == 'list'}">
-                <div class="container">
-                    <ul th:if="${block.data.style == 'unordered'}">
-                        <li th:each="item : ${block.data.items}" th:utext="${item}"></li>
-                    </ul>
-                    <ol th:if="${block.data.style == 'ordered'}">
-                        <li th:each="item : ${block.data.items}" th:utext="${item}"></li>
-                    </ol>
-                </div>
-            </th:block>
-
-            <!-- 5. Image Block -->
-            <th:block th:if="${block.type == 'image'}">
-                <div class="container text-center my-4">
-                    <img th:src="${block.data.file.url}" class="img-fluid" th:alt="${block.data.caption}" />
-                    <p class="text-muted small mt-1" th:if="${block.data.caption}" th:utext="${block.data.caption}"></p>
-                </div>
-            </th:block>
-
-            <!-- 6. Quote Block -->
-            <th:block th:if="${block.type == 'quote'}">
-                <div class="container my-4">
-                    <blockquote class="blockquote">
-                        <p class="mb-0" th:utext="${block.data.text}"></p>
-                        <footer class="blockquote-footer" th:if="${block.data.caption}" th:utext="${block.data.caption}"></footer>
-                    </blockquote>
-                </div>
-            </th:block>
-            
-            <!-- 7. Delimiter Block -->
-            <th:block th:if="${block.type == 'delimiter'}">
-                <div class="container text-center my-4">
-                    <span style="font-size: 24px; letter-spacing: 10px; color: #ccc;">***</span>
-                </div>
-            </th:block>
-            
-            <!-- 8. Table Block -->
-            <th:block th:if="${block.type == 'table'}">
-                <div class="container my-4">
-                    <table class="table table-bordered">
-                        <tbody>
-                            <tr th:each="row, rowStat : ${block.data.content}">
-                                <!-- If withHeadings is true, make first row <th> -->
-                                <th:block th:if="${block.data.withHeadings == true and rowStat.index == 0}">
-                                    <th th:each="cell : ${row}" th:utext="${cell}"></th>
-                                </th:block>
-                                <th:block th:unless="${block.data.withHeadings == true and rowStat.index == 0}">
-                                    <td th:each="cell : ${row}" th:utext="${cell}"></td>
-                                </th:block>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </th:block>
-
         </th:block>
 
+        <!-- 3. Paragraph Block -->
+        <th:block th:if="${block.type == 'paragraph'}">
+            <p th:utext="${block.data.text}"></p>
+        </th:block>
+
+        <!-- 4. List Block -->
+        <th:block th:if="${block.type == 'list'}">
+            <ul th:if="${block.data.style == 'unordered'}">
+                <li th:each="item : ${block.data.items}" th:utext="${item}"></li>
+            </ul>
+            <ol th:if="${block.data.style == 'ordered'}">
+                <li th:each="item : ${block.data.items}" th:utext="${item}"></li>
+            </ol>
+        </th:block>
+
+        <!-- 5. Image Block -->
+        <th:block th:if="${block.type == 'image'}">
+            <img th:src="${block.data.file.url}" th:alt="${block.data.caption}" />
+            <p th:if="${block.data.caption}" th:utext="${block.data.caption}"></p>
+        </th:block>
+
+        <!-- 6. Quote Block -->
+        <th:block th:if="${block.type == 'quote'}">
+            <blockquote>
+                <p th:utext="${block.data.text}"></p>
+                <footer th:if="${block.data.caption}" th:utext="${block.data.caption}"></footer>
+            </blockquote>
+        </th:block>
+        
+        <!-- 7. Delimiter Block -->
+        <th:block th:if="${block.type == 'delimiter'}">
+            <hr />
+        </th:block>
+        
+        <!-- 8. Table Block -->
+        <th:block th:if="${block.type == 'table'}">
+            <table>
+                <tbody>
+                    <tr th:each="row, rowStat : ${block.data.content}">
+                        <th:block th:if="${block.data.withHeadings == true and rowStat.index == 0}">
+                            <th th:each="cell : ${row}" th:utext="${cell}"></th>
+                        </th:block>
+                        <th:block th:unless="${block.data.withHeadings == true and rowStat.index == 0}">
+                            <td th:each="cell : ${row}" th:utext="${cell}"></td>
+                        </th:block>
+                    </tr>
+                </tbody>
+            </table>
+        </th:block>
+
+    </th:block>
     </div>
 </body>