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
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ import { AxiosError } from "axios";
import { useMutation } from "@tanstack/react-query";

import axiosInstance from "api/axiosInstance";
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import { BrandReview } from "../types/brandReview";
import { getCookie } from "hooks/auth/useOwnerCookie";

export interface CreateBrandReviewInput {
user_id: number;
Expand All @@ -15,7 +14,7 @@ export const createBrandReview = async (
requestBody: CreateBrandReviewInput
): Promise<BrandReview> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const result = await axiosInstance.post(
`${serverUrl}/customers/brandReviews`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import { AxiosError } from "axios";
import { useMutation } from "@tanstack/react-query";

import axiosInstance from "api/axiosInstance";
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { getCookie } from "hooks/auth/useOwnerCookie";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";

export const deleteBrandReview = async (review_id: number): Promise<void> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const response = await axiosInstance.delete(
`${serverUrl}/brandReviews/${review_id}`,
Expand Down
5 changes: 2 additions & 3 deletions frontend/apps/admin/src/api/brand/hooks/useGetBrandReviews.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { useQuery } from "@tanstack/react-query";
import { BrandReview } from "../types/brandReview";
import { BRAND_REVIEWS } from "constants/queryKeys";
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import axios from "axios";
import { getCookie } from "hooks/auth/useOwnerCookie";

export interface GetBrandReviewsOutput {
reviews: Array<BrandReview>;
Expand All @@ -21,7 +20,7 @@ export const getBrandReviews = async (
params: GetBrandReviewsParams
): Promise<GetBrandReviewsOutput> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const response = await axios.get(`${serverUrl}/brandReviews`, {
headers: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { useQuery } from "@tanstack/react-query";
import { GET_QUESTION_CATEGORIES } from "constants/queryKeys";
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import axiosInstance from "api/axiosInstance";
import { getCookie } from "hooks/auth/useOwnerCookie";

export interface GetQuestionCardCategoriesOutput {
id: number;
Expand All @@ -15,7 +14,7 @@ export const getQuestionCardCategories = async (
brandId: number
): Promise<Array<GetQuestionCardCategoriesOutput>> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const response = await axiosInstance.get(
`${serverUrl}/customers/questionCardCategories`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import { AxiosError } from "axios";
import { useQuery } from "@tanstack/react-query";
import { GET_QUESTION_CATEGORIES } from "constants/queryKeys";

import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import { QuestionCardDeck } from "interfaces/questionCardCategory";
import axiosInstance from "api/axiosInstance";
import { getCookie } from "hooks/auth/useOwnerCookie";

export interface QuestionCategoriesOutput {
id: number;
Expand All @@ -22,7 +21,7 @@ export const getQuestionCategories = async (
brand_id: string
): Promise<QuestionCategoriesOutput> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const response = await axiosInstance.get(
`${serverUrl}/brands/${brand_id}/questionCardCategories/questionCards`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ import { AxiosError } from "axios";
import { useMutation } from "@tanstack/react-query";

import axiosInstance from "api/axiosInstance";
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import { BrandReview } from "../types/brandReview";
import { getCookie } from "hooks/auth/useOwnerCookie";

export interface Params {
review_id: number;
Expand All @@ -18,7 +17,7 @@ export const updateBrandReview = async (
param: Params
): Promise<BrandReview> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const response = await axiosInstance.put<BrandReview>(
`${serverUrl}/brandReviews/${param.review_id}`,
Expand Down
5 changes: 2 additions & 3 deletions frontend/apps/admin/src/api/channel/hooks/useGetChannels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import { useQuery } from "@tanstack/react-query";
import { AxiosError } from "axios";

import axiosInstance from "api/axiosInstance";
import { ACCEESS_TOKEN, OWNER, serverUrl, USER_EMAIL } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import { GET_CHANNELS } from "constants/queryKeys";
import { Channel, ChannelState } from "interfaces/channels/index";
import { getCookie } from "hooks/auth/useOwnerCookie";

export interface Output {
channels: Array<Channel>;
Expand All @@ -23,7 +22,7 @@ export interface Params {

export const getChannels = async (params: Params): Promise<Output> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const response = await axiosInstance.get(`${serverUrl}/channels`, {
headers: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { useMutation } from "@tanstack/react-query";
import { AxiosError } from "axios";
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";

import axiosInstance from "api/axiosInstance";
import { getCookie } from "hooks/auth/useOwnerCookie";

export const fetchDeleteGalleryImage = async (
image_id: number
): Promise<void> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const result = await axiosInstance.delete(
`${serverUrl}/landingAdmin/deleteImage/gallery`,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import axiosInstance from "api/axiosInstance";
import { AxiosError } from "axios";
import { useMutation } from "@tanstack/react-query";
import { getCookie } from "hooks/auth/useOwnerCookie";

export const fetchDeleteMainImage = async (): Promise<void> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const result = await axiosInstance.delete(
`${serverUrl}/landingAdmin/deleteImage/main`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ import { useQuery } from "@tanstack/react-query";
import { AxiosError } from "axios";

import axiosInstance from "api/axiosInstance";
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import { GET_GALLERY_IMAGES } from "constants/queryKeys";
import { getCookie } from "hooks/auth/useOwnerCookie";

export const fetchGetGalleryImages = async (): Promise<
Array<{ id: number; url: string }>
> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const response = await axiosInstance.get(
`${serverUrl}/landingAdmin/galleryImages`,
Expand Down
5 changes: 2 additions & 3 deletions frontend/apps/admin/src/api/landing/hooks/useGetMainImage.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import { AxiosError } from "axios";
import { useQuery } from "@tanstack/react-query";

import axiosInstance from "api/axiosInstance";
import { GET_MAIN_IMAGE } from "constants/queryKeys";
import { getCookie } from "hooks/auth/useOwnerCookie";

export const fetchGetMainImage = async (): Promise<{
id: number;
url: string;
}> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const response = await axiosInstance.get(
`${serverUrl}/landingAdmin/mainImage`,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { AxiosError } from "axios";
import { useMutation } from "@tanstack/react-query";
import axiosInstance from "api/axiosInstance";
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { getCookie } from "hooks/auth/useOwnerCookie";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";

interface Output {
id: number;
Expand All @@ -11,7 +10,7 @@ interface Output {

export const fetchUploadGalleryImage = async (file: File): Promise<Output> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const formData = new FormData();
formData.append("file", file);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { AxiosError } from "axios";
import { useMutation } from "@tanstack/react-query";
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import axiosInstance from "api/axiosInstance";
import { getCookie } from "hooks/auth/useOwnerCookie";

export interface Output {
id: number;
Expand All @@ -11,7 +10,7 @@ export interface Output {

export const fetchUploadMainImage = async (file: File): Promise<Output> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const formData = new FormData();
formData.append("file", file);
Expand Down
5 changes: 2 additions & 3 deletions frontend/apps/admin/src/api/survey/hook/useCreateSurvey.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";

import axiosInstance from "../../axiosInstance";
import { Question } from "interfaces/brand/survey";
import { useMutation } from "@tanstack/react-query";
import { AxiosError } from "axios";
import { getCookie } from "hooks/auth/useOwnerCookie";

export interface SurveyType {
brand_id: string;
Expand All @@ -17,7 +16,7 @@ export const fetchCreateSurvey = async (
requestBody: SurveyType
): Promise<Array<SurveyType>> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const result = await axiosInstance.post(`${serverUrl}/surveys`, requestBody, {
headers: {
Expand Down
5 changes: 2 additions & 3 deletions frontend/apps/admin/src/api/survey/hook/useGetSurvey.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import { AxiosError } from "axios";
import { useQuery } from "@tanstack/react-query";

import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";
import axiosInstance from "api/axiosInstance";
import { GET_SURVEYS } from "constants/queryKeys";
import { Survey } from "interfaces/brand/survey";
import { getCookie } from "hooks/auth/useOwnerCookie";

export const fetchGetSurvey = async (
brand_id: string
): Promise<Array<Survey>> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const response = await axiosInstance.get(`${serverUrl}/surveys`, {
headers: {
Expand Down
5 changes: 2 additions & 3 deletions frontend/apps/admin/src/api/survey/hook/useUpdateSurvey.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { AxiosError } from "axios";
import { useMutation } from "@tanstack/react-query";
import { ACCEESS_TOKEN, OWNER, serverUrl } from "configs";
import { ACCEESS_TOKEN, serverUrl, USER_NAME } from "configs";

import axiosInstance from "../../axiosInstance";
import { Question } from "interfaces/brand/survey";
import { getCookie } from "hooks/auth/useOwnerCookie";

export interface SurveyType {
brand_id: string;
Expand All @@ -18,7 +17,7 @@ export const fetchUpdateSurvey = async (
survey_id: string
): Promise<SurveyType> => {
const token = localStorage.getItem(ACCEESS_TOKEN);
const owner = getCookie(OWNER);
const owner = localStorage.getItem(USER_NAME);

const result = await axiosInstance.put(
`${serverUrl}/surveys/${survey_id}`,
Expand Down
21 changes: 2 additions & 19 deletions frontend/apps/admin/src/components/brand/BrandTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { Table, TableContainer } from "../common/Table";
import Button from "../common/Button";
import OptimizedImage from "components/common/image/OptimizedImage";
import { GetBrandOutput } from "hooks/brand/useGetBrands";
import useOwnerCookie from "hooks/auth/useOwnerCookie";
import { USER_NAME } from "configs";

const brandStateLabels: Record<BrandState, string> = {
[BrandState.ONGOING]: "진행중",
Expand All @@ -25,7 +25,7 @@ const brandStateLabels: Record<BrandState, string> = {
const BrandTable = () => {
const [searchParams] = useSearchParams();
const page = Number(searchParams.get("page")) || 1;
const owner = useOwnerCookie();
const owner = localStorage.getItem(USER_NAME);
const isTester = owner === "tester";

const queryClient = useQueryClient();
Expand Down Expand Up @@ -183,23 +183,6 @@ const BrandTable = () => {
);
};

const StyledImg = styled.img`
width: 40px;
height: 40px;
object-fit: cover;
`;

const Placeholder = styled.div`
width: 40px;
height: 40px;
display: flex;
justify-content: center;
align-items: center;
background-color: #e5e7eb;
color: #9ca3af;
font-size: 24px;
`;

const StyledSelect = styled.select<{ state: BrandState }>`
padding: 8px 12px;
border: 1px solid #ccc;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import { useBrandFormContext } from "hooks/brand/context/useBrandFormContext";
import ProductImage from "components/common/image/ProductImage";
import AddImageInput from "components/common/image/addImageInput";
import useSystemModal from "hooks/common/components/useSystemModal";
import useOwnerCookie from "hooks/auth/useOwnerCookie";
import { USER_NAME } from "configs";

const DetailImageUpload = () => {
const { brandId, setBrand, brand } = useBrandFormContext();

const owner = useOwnerCookie();
const owner = localStorage.getItem(USER_NAME);
const isTester = owner === "tester";
const { showAnyMessageModal } = useSystemModal();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import { useBrandFormContext } from "hooks/brand/context/useBrandFormContext";
import AddImageInput from "components/common/image/addImageInput";
import ProductImage from "components/common/image/ProductImage";
import useSystemModal from "hooks/common/components/useSystemModal";
import useOwnerCookie from "hooks/auth/useOwnerCookie";
import { USER_NAME } from "configs";

const ThumbnailUpload: React.FC = () => {
const { brandId, setBrand, brand } = useBrandFormContext();
const { showAnyMessageModal } = useSystemModal();
const owner = useOwnerCookie();
const owner = localStorage.getItem(USER_NAME);
const isTester = owner === "tester";

const [preview, setPreview] = useState<string>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import { QuestionCard } from "interfaces/questionCardCategory";

import AddImageInput from "components/common/image/addImageInput";
import ProductImage from "components/common/image/ProductImage";
import { OWNER } from "configs";
import useOwnerCookie from "hooks/auth/useOwnerCookie";
import { USER_NAME } from "configs";

interface BackImageItemProps {
cardIndex: number;
Expand All @@ -31,7 +30,7 @@ const BackImageItem: React.FC<BackImageItemProps> = ({
const queryClient = useQueryClient();
const { showErrorModal, showAnyMessageModal } = useSystemModal();

const owner = useOwnerCookie();
const owner = localStorage.getItem(USER_NAME);
const isTester = owner === "tester";

const { mutate: deleteQuestionCard } = useDeleteQuestionCard();
Expand Down
Loading
Loading