Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .bruno/v1/s3/Node upload complete.bru
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ post {

body:json {
{
"id": "051fa42f90e5426187b960eabfab1966",
"fileListId": "af5c6c168f80417696e4e4778679bfa6",
"fileKey": "node_file/video/051fa42f90e5426187b960eabfab1966.mp4"
"id": "98dc35d0a51d41ce8b33d942dd23d0c4",
"fileListId": "ae089fbee8ff4a218e8821b01fe6eb19",
"fileKey": "node_file/video/98dc35d0a51d41ce8b33d942dd23d0c4.mp4"
}

// μ΄λ―Έμ§€λ…Έλ“œ "5ee66300df3f4f48bb2725b4cca1c9eb"
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
id 'io.spring.dependency-management' version '1.1.7'
}

group = 'com.handong-app'
group = 'app.handong'
version = '0.0.1-SNAPSHOT'

java {
Expand Down
2 changes: 1 addition & 1 deletion src/main/front/src/pages/ClubPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function ClubPage() {
}
onContinue={() => {
navigate(
`/club/${club}/course/${mostRecentNodeGroup.courseId}/nodegroup/${mostRecentNodeGroup.nodeGroupId}`
`/club/${club}/course/${mostRecentNodeGroup.courseSlug}/nodegroup/${mostRecentNodeGroup.nodeGroupId}`
);
}}
theme={"dark"}
Expand Down
1 change: 1 addition & 0 deletions src/main/front/src/pages/NodeGroupPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ function NodeGroupPage() {
alignItems="center"
justifyContent="center"
height="100%"
width="100%"
borderRadius={2}
color="white"
sx={{
Expand Down
12 changes: 6 additions & 6 deletions src/main/front/src/pages/ProfileRegistrationPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ const ProfileRegistrationPage: React.FC = () => {
queryFn: () => fetchBe("/v1/user/profile", { onUnauthorized: () => {} }),
});

useEffect(() => {
if (jwtToken) {
alert("이미 둜그인된 μ‚¬μš©μžμž…λ‹ˆλ‹€.");
navigate("/profile"); // λ˜λŠ” "/"둜 λ³€κ²½ κ°€λŠ₯
}
}, [jwtToken, navigate]);
// useEffect(() => {
// if (jwtToken) {
// alert("이미 둜그인된 μ‚¬μš©μžμž…λ‹ˆλ‹€.");
// navigate("/profile"); // λ˜λŠ” "/"둜 λ³€κ²½ κ°€λŠ₯
// }
// }, [jwtToken, navigate]);

useEffect(() => {
if (user?.name) setName(user.name);
Expand Down
2 changes: 1 addition & 1 deletion src/main/front/src/pages/ProgramPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function ProgramPage() {
onContinue={() => {
// κ°•μ˜ 이동
navigate(
`/club/${club}/course/${mostRecentNodeGroup.courseId}/nodegroup/${mostRecentNodeGroup.nodeGroupId}`
`/club/${club}/course/${mostRecentNodeGroup.courseSlug}/nodegroup/${mostRecentNodeGroup.nodeGroupId}`
);
}}
background="rgba(255, 255, 255, 0.05)"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.handongapp.cms;
package app.handong.cms;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

@EnableJpaAuditing
@SpringBootApplication
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.handongapp.cms.auth.controller;

import com.handongapp.cms.auth.service.AuthService;
import com.handongapp.cms.security.LoginProperties;
import com.handongapp.cms.security.PrincipalDetails;
import com.handongapp.cms.security.TokenBlacklistManager;
import com.handongapp.cms.auth.dto.GoogleOAuthResponse;
import com.handongapp.cms.auth.service.GoogleOAuthService;
import com.handongapp.cms.service.UserService;
package app.handong.cms.auth.controller;

import app.handong.cms.auth.service.AuthService;
import app.handong.cms.security.LoginProperties;
import app.handong.cms.security.PrincipalDetails;
import app.handong.cms.security.TokenBlacklistManager;
import app.handong.cms.auth.dto.GoogleOAuthResponse;
import app.handong.cms.auth.service.GoogleOAuthService;
import app.handong.cms.service.UserService;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.handongapp.cms.auth.dto;
package app.handong.cms.auth.dto;

import com.handongapp.cms.domain.TbUser;
import app.handong.cms.domain.TbUser;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.auth.dto;
package app.handong.cms.auth.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.auth.dto;
package app.handong.cms.auth.dto;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.auth.service;
package app.handong.cms.auth.service;

import io.jsonwebtoken.Claims;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.handongapp.cms.auth.service;
package app.handong.cms.auth.service;

import com.handongapp.cms.auth.dto.GoogleOAuthResponse;
import com.handongapp.cms.auth.dto.GoogleTokenResponse;
import com.handongapp.cms.auth.dto.GoogleUserInfoResponse;
import app.handong.cms.auth.dto.GoogleOAuthResponse;
import app.handong.cms.auth.dto.GoogleTokenResponse;
import app.handong.cms.auth.dto.GoogleUserInfoResponse;

public interface GoogleOAuthService {
GoogleOAuthResponse authenticate(String authorizationCode);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.handongapp.cms.auth.service.impl;
package app.handong.cms.auth.service.impl;

import com.github.benmanes.caffeine.cache.Cache;
import com.handongapp.cms.auth.service.AuthService;
import com.handongapp.cms.security.LoginProperties;
import com.handongapp.cms.security.TokenBlacklistManager;
import app.handong.cms.auth.service.AuthService;
import app.handong.cms.security.LoginProperties;
import app.handong.cms.security.TokenBlacklistManager;
import io.jsonwebtoken.*;
import io.jsonwebtoken.security.Keys;
import jakarta.annotation.PostConstruct;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.handongapp.cms.auth.service.impl;

import com.handongapp.cms.domain.TbUser;
import com.handongapp.cms.repository.UserRepository;
import com.handongapp.cms.auth.service.AuthService;
import com.handongapp.cms.security.LoginProperties;
import com.handongapp.cms.auth.dto.GoogleOAuthResponse;
import com.handongapp.cms.auth.dto.GoogleTokenResponse;
import com.handongapp.cms.auth.dto.GoogleUserInfoResponse;
import com.handongapp.cms.auth.service.GoogleOAuthService;
import com.handongapp.cms.service.UserService;
package app.handong.cms.auth.service.impl;

import app.handong.cms.domain.TbUser;
import app.handong.cms.repository.UserRepository;
import app.handong.cms.auth.service.AuthService;
import app.handong.cms.security.LoginProperties;
import app.handong.cms.auth.dto.GoogleOAuthResponse;
import app.handong.cms.auth.dto.GoogleTokenResponse;
import app.handong.cms.auth.dto.GoogleUserInfoResponse;
import app.handong.cms.auth.service.GoogleOAuthService;
import app.handong.cms.service.UserService;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.web.reactive.function.BodyInserters;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.handongapp.cms.config;
package app.handong.cms.config;

import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.handongapp.cms.security.LoginProperties;
import app.handong.cms.security.LoginProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.concurrent.TimeUnit;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.config;
package app.handong.cms.config;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.config;
package app.handong.cms.config;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.config;
package app.handong.cms.config;

import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
Expand All @@ -11,13 +11,13 @@
import javax.sql.DataSource;

@Configuration
@MapperScan(basePackages={"com.handongapp.cms.mapper"}, sqlSessionFactoryRef="sqlSessionFactory")
@MapperScan(basePackages={"app.handong.cms.mapper"}, sqlSessionFactoryRef="sqlSessionFactory")
public class MybatisConfig {
@Bean(name="sqlSessionFactory")
public SqlSessionFactory sqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws Exception {
SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean();
sqlSessionFactoryBean.setDataSource(dataSource);
sqlSessionFactoryBean.setTypeAliasesPackage("com.handongapp.cms.dto.v1, com.handongapp.cms.domain");
sqlSessionFactoryBean.setTypeAliasesPackage("app.handong.cms.dto.v1, app.handong.cms.domain");
sqlSessionFactoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:/mapper/*.xml"));
return sqlSessionFactoryBean.getObject();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.config;
package app.handong.cms.config;

import com.querydsl.jpa.impl.JPAQueryFactory;
import jakarta.persistence.EntityManager;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.config;
package app.handong.cms.config;

import org.springframework.amqp.core.Queue;
import org.springframework.amqp.core.AmqpTemplate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.config;
package app.handong.cms.config;

import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.config;
package app.handong.cms.config;

import lombok.Getter;
import org.springframework.context.annotation.Bean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.handongapp.cms.config;
package app.handong.cms.config;

import com.handongapp.cms.auth.service.impl.AuthServiceImpl;
import com.handongapp.cms.security.*;
import app.handong.cms.auth.service.impl.AuthServiceImpl;
import app.handong.cms.security.*;
import org.springframework.boot.autoconfigure.security.servlet.PathRequest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.handongapp.cms.controller;
package app.handong.cms.controller;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.handongapp.cms.controller;
package app.handong.cms.controller;

import com.handongapp.cms.dto.ProgressDto;
import com.handongapp.cms.exception.auth.NoAuthenticatedException;
import com.handongapp.cms.security.PrincipalDetails;
import com.handongapp.cms.service.ProgressService;
import app.handong.cms.dto.ProgressDto;
import app.handong.cms.exception.auth.NoAuthenticatedException;
import app.handong.cms.security.PrincipalDetails;
import app.handong.cms.service.ProgressService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
package com.handongapp.cms.controller.v1;
package app.handong.cms.controller.v1;

import com.handongapp.cms.dto.v1.ClubDto;
import com.handongapp.cms.service.ClubService;
import app.handong.cms.dto.v1.ClubDto;
import app.handong.cms.service.ClubService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;

import java.util.Collections;
import java.util.List; // Added
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.handongapp.cms.controller.v1;
package app.handong.cms.controller.v1;

import com.handongapp.cms.dto.v1.CommentDto;
import com.handongapp.cms.dto.v1.CommentResponseDto;
import com.handongapp.cms.exception.auth.NoAuthenticatedException;
import com.handongapp.cms.security.PrincipalDetails;
import com.handongapp.cms.service.CommentService;
import app.handong.cms.dto.v1.CommentDto;
import app.handong.cms.dto.v1.CommentResponseDto;
import app.handong.cms.exception.auth.NoAuthenticatedException;
import app.handong.cms.security.PrincipalDetails;
import app.handong.cms.service.CommentService;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.handongapp.cms.controller.v1;
package app.handong.cms.controller.v1;

import com.handongapp.cms.dto.v1.CourseDto;
import com.handongapp.cms.security.PrincipalDetails;
import com.handongapp.cms.service.CourseService;
import com.handongapp.cms.service.ClubService;
import com.handongapp.cms.service.CommentOfCategoryService;
import com.handongapp.cms.dto.v1.CommentOfCategoryDto;
import app.handong.cms.dto.v1.CourseDto;
import app.handong.cms.security.PrincipalDetails;
import app.handong.cms.service.CourseService;
import app.handong.cms.service.ClubService;
import app.handong.cms.service.CommentOfCategoryService;
import app.handong.cms.dto.v1.CommentOfCategoryDto;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.handongapp.cms.controller.v1;
package app.handong.cms.controller.v1;

import com.handongapp.cms.dto.v1.NodeDto;
import com.handongapp.cms.service.NodeService;
//import com.handongapp.cms.service.validator.CourseHierarchyValidator;
import app.handong.cms.dto.v1.NodeDto;
import app.handong.cms.service.NodeService;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.handongapp.cms.controller.v1;
package app.handong.cms.controller.v1;

import com.handongapp.cms.dto.v1.NodeGroupDto;
import com.handongapp.cms.service.NodeGroupService;
import app.handong.cms.dto.v1.NodeGroupDto;
import app.handong.cms.service.NodeGroupService;

import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.handongapp.cms.controller.v1;
package app.handong.cms.controller.v1;

import com.handongapp.cms.service.ProgramService;
import app.handong.cms.service.ProgramService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import com.handongapp.cms.dto.v1.ProgramDto;
import app.handong.cms.dto.v1.ProgramDto;
import jakarta.validation.Valid;
import org.springframework.web.bind.annotation.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.handongapp.cms.controller.v1;
package app.handong.cms.controller.v1;

import com.handongapp.cms.dto.v1.S3Dto;
import com.handongapp.cms.exception.auth.NoAuthorizationException;
import com.handongapp.cms.security.PrincipalDetails;
import com.handongapp.cms.service.PresignedUrlService;
import com.handongapp.cms.service.UploadNotifyService;
import app.handong.cms.dto.v1.S3Dto;
import app.handong.cms.exception.auth.NoAuthorizationException;
import app.handong.cms.security.PrincipalDetails;
import app.handong.cms.service.PresignedUrlService;
import app.handong.cms.service.UploadNotifyService;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
Expand Down
Loading