diff --git a/sisvietnamvn/build.gradle b/sisvietnamvn/build.gradle index e34dc4cd..98a2e6a8 100644 --- a/sisvietnamvn/build.gradle +++ b/sisvietnamvn/build.gradle @@ -39,20 +39,21 @@ idea { } } -eclipse { - sourceSets { - main { - java { - srcDirs += ["build/generated/sources/annotationProcessor/java/main"] - } - } - } -} +// eclipse { +// sourceSets { +// main { +// java { +// srcDirs += ["build/generated/sources/annotationProcessor/java/main"] +// } +// } +// } +// } dependencies { implementation libs.jhipster.framework implementation libs.mapstruct implementation libs.springdoc.openapi.starter.webmvc.api + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.3" implementation "org.springframework.boot:spring-boot-h2console" implementation "org.springframework.boot:spring-boot-jackson2" implementation "org.springframework.boot:spring-boot-starter" @@ -66,6 +67,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server" implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "org.springframework.boot:spring-boot-starter-validation" implementation "org.springframework.boot:spring-boot-starter-web" @@ -103,3 +105,10 @@ dependencies { annotationProcessor "org.hibernate.orm:hibernate-processor" // jhipster-needle-gradle-dependency - JHipster will add additional dependencies here } + +tasks.register('printSourceSets') { + doLast { + println "classesDirs = ${sourceSets.main.output.classesDirs.files}" + println "runtimeClasspath = ${sourceSets.main.runtimeClasspath.files}" + } +} diff --git a/sisvietnamvn/src/main/java/com/sisvietnamvn/web/config/SecurityConfiguration.java b/sisvietnamvn/src/main/java/com/sisvietnamvn/web/config/SecurityConfiguration.java index 3bc9c541..1c25ffb0 100644 --- a/sisvietnamvn/src/main/java/com/sisvietnamvn/web/config/SecurityConfiguration.java +++ b/sisvietnamvn/src/main/java/com/sisvietnamvn/web/config/SecurityConfiguration.java @@ -44,6 +44,8 @@ public class SecurityConfiguration { .authorizeHttpRequests(authz -> // prettier-ignore authz + .requestMatchers(HttpMethod.GET, "/", "/about", "/flex-finish", "/manage/**", "/css/**", "/images/**", "/js/**", "/UMass*/**", "/Undergraduate*/**", "/favicons/**", "/flex-finish/**").permitAll() + .requestMatchers(HttpMethod.GET, "/swagger-ui/**", "/v3/api-docs/**").permitAll() .requestMatchers(HttpMethod.POST, "/api/authenticate").permitAll() .requestMatchers(HttpMethod.GET, "/api/authenticate").permitAll() .requestMatchers("/api/register").permitAll() @@ -52,7 +54,6 @@ public class SecurityConfiguration { .requestMatchers("/api/account/reset-password/finish").permitAll() .requestMatchers("/api/admin/**").hasAuthority(AuthoritiesConstants.ADMIN) .requestMatchers("/api/**").authenticated() - .requestMatchers("/v3/api-docs/**").hasAuthority(AuthoritiesConstants.ADMIN) .requestMatchers("/management/health").permitAll() .requestMatchers("/management/health/**").permitAll() .requestMatchers("/management/info").permitAll() diff --git a/sisvietnamvn/src/main/java/com/sisvietnamvn/web/controller/ManageController.java b/sisvietnamvn/src/main/java/com/sisvietnamvn/web/controller/ManageController.java new file mode 100644 index 00000000..a1217490 --- /dev/null +++ b/sisvietnamvn/src/main/java/com/sisvietnamvn/web/controller/ManageController.java @@ -0,0 +1,16 @@ +package com.sisvietnamvn.web.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/manage") +public class ManageController { + + @GetMapping({"", "/"}) + public String index() { + return "manage/index"; + } + +} diff --git a/sisvietnamvn/src/main/resources/config/application-dev.yml b/sisvietnamvn/src/main/resources/config/application-dev.yml index 78830d00..5150c2bc 100644 --- a/sisvietnamvn/src/main/resources/config/application-dev.yml +++ b/sisvietnamvn/src/main/resources/config/application-dev.yml @@ -26,7 +26,7 @@ spring: enabled: true additional-exclude: static/**,.h2.server.properties livereload: - enabled: false # we use Webpack dev server + BrowserSync for livereload + enabled: true # enabled for backend-only app (run ./gradlew classes -t) jackson2: serialization: indent-output: true diff --git a/sisvietnamvn/src/main/resources/logback-spring.xml b/sisvietnamvn/src/main/resources/logback-spring.xml index e71ce4d8..ffd70547 100644 --- a/sisvietnamvn/src/main/resources/logback-spring.xml +++ b/sisvietnamvn/src/main/resources/logback-spring.xml @@ -3,8 +3,8 @@ - - + + + + + + + + + + + + +
+ + + + + + +
+ + +
+ + + + + + +
+ +
+ + +
+ + + +
+
+ +
+
+ + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + diff --git a/sisvietnamvn/src/main/resources/templates/manage/index.html b/sisvietnamvn/src/main/resources/templates/manage/index.html new file mode 100644 index 00000000..80f2b52c --- /dev/null +++ b/sisvietnamvn/src/main/resources/templates/manage/index.html @@ -0,0 +1,155 @@ + + + + + Dashboard + + + + +
+ +
+

Dashboard

+ Generate Report +
+ + +
+ + +
+
+
+
+
+
+ Earnings (Monthly)
+
$40,000
+
+
+ +
+
+
+
+
+ + +
+
+
+
+
+
+ Earnings (Annual)
+
$215,000
+
+
+ +
+
+
+
+
+ + +
+
+
+
+
+
Tasks +
+
+
+
50%
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+ + +
+
+
+
+
+
+ Pending Requests
+
18
+
+
+ +
+
+
+
+
+
+ + +
+ + +
+ + +
+
+
Projects
+
+
+

Server Migration 20%

+
+
+
+

Sales Tracking 40%

+
+
+
+

Customer Database 60%

+
+
+
+

Payout Details 80%

+
+
+
+

Account Setup Complete!

+
+
+
+
+
+ +
+
+
+ + +