Merge pull request '에이전트 기능' (#97) from test into main

Reviewed-on: #97

src/api/member.js

@@ -1,7 +1,7 @@
 import Vue from 'vue';
 
 async function login(email, password) {
-    return Vue.axios.post('/admin/member/login', {
+    return Vue.axios.post('/member/login', {
         email,
         password,
         isAdmin: true,

src/api/original_series_settlement.js

@@ -1,37 +0,0 @@
-import Vue from 'vue';
-
-// 소지 유저 조회
-async function getOwners() {
-  return Vue.axios.get('/admin/calculate/original-series/owners');
-}
-
-// 정산 내역 조회 (page는 1부터 시작하는 UI 기준, 서버에는 0부터 전달)
-async function getSettlementDetails({ startDate, endDate, creatorId, page = 1, size = 10 }) {
-  const params = new URLSearchParams();
-  // 서버 파라미터 스펙 변경: start_date, end_date, creator_id
-  if (startDate) params.append('start_date', startDate);
-  if (endDate) params.append('end_date', endDate);
-  if (creatorId != null) params.append("creator_id", creatorId);
-  params.append('page', Math.max(0, (page || 1) - 1));
-  params.append('size', size || 10);
-
-  return Vue.axios.get(`/admin/calculate/original-series/settlement-details?${params.toString()}`);
-}
-
-// 엑셀 다운로드 (xlsx 바이너리)
-async function downloadSettlementExcel({ startDate, endDate }) {
-  const params = new URLSearchParams();
-  // 서버 파라미터 스펙 변경: start_date, end_date
-  if (startDate) params.append('start_date', startDate);
-  if (endDate) params.append('end_date', endDate);
-
-  return Vue.axios.get(`/admin/calculate/original-series/settlement-details/excel?${params.toString()}` , {
-    responseType: 'blob'
-  });
-}
-
-export {
-  getOwners,
-  getSettlementDetails,
-  downloadSettlementExcel,
-};

src/components/SideMenu.vue

@@ -94,16 +94,9 @@ export default {
       this.isLoading = true
       try {
         let res = await api.getMenus();
-        if (res.status === 200 && res.data.success === true) {
+        if (res.status === 200 && res.data.success === true && res.data.data.length > 0) {
-          // 기본 메뉴 설정 (API 결과가 비어있을 수 있음)
+          this.items = res.data.data
-          this.items = Array.isArray(res.data.data) ? res.data.data : []
 
-          // 현재 사용자 역할 확인
-          const role = (this.$store && this.$store.state && this.$store.state.accountStore && this.$store.state.accountStore.role)
-            || localStorage.role
-
-          // ADMIN 권한 전용 추가 메뉴들
-          if (role === 'ADMIN') {
           // '시리즈 관리' 메뉴에 '배너 등록' 하위 메뉴 추가
           try {
             const seriesMenu = this.items.find(m => m && m.title === '시리즈 관리')
@@ -180,9 +173,9 @@ export default {
             // ignore
           }
 
-            // 정산현황 메뉴에 '채널 후원 정산' 및 '오리지널 시리즈 정산' 추가
+          // 정산 관리 메뉴에 '채널 후원 정산' 추가
           try {
-              const calculateMenu = this.items.find(m => m && m.title === '정산현황')
+            const calculateMenu = this.items.find(m => m && m.title === '정산 관리')
             if (calculateMenu) {
               if (!Array.isArray(calculateMenu.items)) {
                 calculateMenu.items = calculateMenu.items ? [].concat(calculateMenu.items) : []
@@ -195,35 +188,10 @@ export default {
                   items: null
                 })
               }
-
-                const existsOriginal = calculateMenu.items.some(ci => ci && ci.route === '/calculate/original-series')
-                if (!existsOriginal) {
-                  calculateMenu.items.push({
-                    title: '오리지널 시리즈 정산',
-                    route: '/calculate/original-series',
-                    items: null
-                  })
-                }
             }
           } catch (e) {
             // ignore
           }
-          }
-
-          // 조회한 메뉴가 비어 있고, 콘텐츠 매니저라면 기본 메뉴 추가
-          if (this.items.length === 0 && role === 'CONTENT_MANAGER') {
-            this.items.push({
-              title: '콘텐츠 리스트',
-              route: '/content/list',
-              items: null
-            })
-          }
-
-          // 그래도 비어있다면 이전 동작과 동일하게 처리
-          if (this.items.length === 0) {
-            this.notifyError("알 수 없는 오류가 발생했습니다. 다시 로그인 해주세요!")
-            this.logout();
-          }
         } else {
           this.notifyError("알 수 없는 오류가 발생했습니다. 다시 로그인 해주세요!")
           this.logout();

src/router/index.js

@@ -51,11 +51,6 @@ const routes = [
                 component: () => import(/* webpackChunkName: "counselor" */ '../views/Creator/CreatorSettlementRatio.vue')
             },
             // Agent Management
-            {
-                path: '/calculate/original-series',
-                name: 'OriginalSeriesSettlement',
-                component: () => import(/* webpackChunkName: "calculate" */ '../views/Calculate/OriginalSeriesSettlement.vue')
-            },
             {
                 path: '/agent/list',
                 name: 'AgentList',

src/store/accountStore.js

@@ -12,13 +12,17 @@ enhanceAccessToken();
 const accountStore = {
     namespaced: true,
     state: {
+        userId: '',
+        nickname: '',
         accessToken: '',
-        role: '',
+        profileImage: '',
     },
     getters: {
         isAuthenticated(state) {
+            state.userId = state.userId || localStorage.userId
+            state.nickname = state.nickname || localStorage.nickname
+            state.profileImage = state.profileImage || localStorage.profileImage
             state.accessToken = state.accessToken || localStorage.accessToken
-            state.role = state.role || localStorage.role
 
             return state.accessToken !== undefined &&
                 state.accessToken !== null &&
@@ -27,19 +31,27 @@ const accountStore = {
         }
     },
     mutations: {
-        LOGIN(state, {token, role}) {
+        LOGIN(state, {userId, nickname, token, profileImage}) {
+            state.userId = userId
+            localStorage.userId = userId
+
+            state.nickname = nickname
+            localStorage.nickname = nickname
+
+            state.profileImage = profileImage
+            localStorage.profileImage = profileImage
+
             state.accessToken = token
             localStorage.accessToken = token
 
-            state.role = role
-            localStorage.role = role
-
             Vue.axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
         },
 
         LOGOUT(state) {
+            state.userId = ''
+            state.nickname = ''
+            state.profileImage = ''
             state.accessToken = ''
-            state.role = ''
 
             localStorage.clear()
             if (location.pathname === '/') {

src/views/Calculate/OriginalSeriesSettlement.vue

@@ -1,340 +0,0 @@
-<template>
-  <div>
-    <v-toolbar dark>
-      <v-btn
-        icon
-        @click="$router.back()"
-      >
-        <v-icon>mdi-arrow-left</v-icon>
-      </v-btn>
-      <v-toolbar-title>오리지널 시리즈 정산</v-toolbar-title>
-      <v-spacer />
-      <v-btn
-        color="primary"
-        :loading="excelLoading"
-        @click="onDownloadExcel"
-      >
-        엑셀 다운로드
-      </v-btn>
-    </v-toolbar>
-
-    <v-container>
-      <!-- 필터 영역 -->
-      <v-row
-        class="mt-2 mb-2"
-        align="center"
-        justify="end"
-      >
-        <v-col
-          cols="12"
-          md="3"
-        >
-          <v-autocomplete
-            v-model="selectedCreatorId"
-            :items="ownerOptions"
-            :loading="ownersLoading"
-            item-text="nickname"
-            item-value="creatorId"
-            label="멤버 선택"
-            dense
-            clearable
-            hide-details
-          />
-        </v-col>
-
-        <v-col
-          cols="12"
-          md="3"
-        >
-          <v-menu
-            v-model="menuStart"
-            :close-on-content-click="false"
-            transition="scale-transition"
-            offset-y
-            min-width="auto"
-          >
-            <template v-slot:activator="{ on, attrs }">
-              <v-text-field
-                v-bind="attrs"
-                label="시작일"
-                readonly
-                dense
-                :value="startDateStr"
-                v-on="on"
-              />
-            </template>
-            <v-date-picker
-              v-model="startDateStr"
-              scrollable
-              @input="menuStart = false"
-            />
-          </v-menu>
-        </v-col>
-
-        <v-col
-          cols="12"
-          md="3"
-        >
-          <v-menu
-            v-model="menuEnd"
-            :close-on-content-click="false"
-            transition="scale-transition"
-            offset-y
-            min-width="auto"
-          >
-            <template v-slot:activator="{ on, attrs }">
-              <v-text-field
-                v-bind="attrs"
-                label="종료일"
-                readonly
-                dense
-                :value="endDateStr"
-                v-on="on"
-              />
-            </template>
-            <v-date-picker
-              v-model="endDateStr"
-              scrollable
-              @input="menuEnd = false"
-            />
-          </v-menu>
-        </v-col>
-
-        <v-col
-          cols="12"
-          md="2"
-        >
-          <v-btn
-            color="primary"
-            :loading="isLoading"
-            @click="onSearch"
-          >
-            조회
-          </v-btn>
-        </v-col>
-      </v-row>
-
-      <!-- 테이블 영역 -->
-      <v-data-table
-        :headers="headers"
-        :items="items"
-        :loading="isLoading"
-        :items-per-page="pageSize"
-        class="elevation-1"
-        disable-pagination
-        hide-default-footer
-      >
-        <template v-slot:no-data>
-          <div class="text-center grey--text pa-6">
-            데이터가 없습니다.
-          </div>
-        </template>
-        <template v-slot:item.price="{ item }">
-          <span>{{ numberFormat(item.price) }}</span>
-        </template>
-        <template v-slot:item.totalCan="{ item }">
-          <span>{{ numberFormat(item.totalCan) }}</span>
-        </template>
-        <template v-slot:item.totalPoint="{ item }">
-          <span>{{ numberFormat(item.totalPoint) }}</span>
-        </template>
-      </v-data-table>
-
-      <v-row
-        class="mt-4"
-        justify="center"
-      >
-        <v-pagination
-          v-model="page"
-          :length="totalPages"
-          :total-visible="7"
-          @input="fetchList"
-        />
-      </v-row>
-    </v-container>
-  </div>
-</template>
-
-<script>
-import {
-  getOwners,
-  getSettlementDetails,
-  downloadSettlementExcel,
-} from "@/api/original_series_settlement";
-
-export default {
-  name: "OriginalSeriesSettlement",
-  data() {
-    return {
-      // 필터 상태
-      ownersLoading: false,
-      ownerOptions: [],
-      selectedCreatorId: null,
-      startDateStr: "",
-      endDateStr: "",
-      menuStart: false,
-      menuEnd: false,
-
-      // 목록 상태
-      isLoading: false,
-      items: [],
-      totalCount: 0,
-      page: 1,
-      pageSize: 20,
-
-      excelLoading: false,
-
-      headers: [
-        { text: "시리즈 제목", value: "seriesTitle", align: "center" },
-        { text: "콘텐츠 제목", value: "contentTitle", align: "center" },
-        { text: "가격", value: "price", align: "center" },
-        { text: "구분", value: "orderType", align: "center" },
-        { text: "판매 수", value: "salesCount", align: "center" },
-        { text: "합계(캔)", value: "totalCan", align: "center" },
-        { text: "합계(포인트)", value: "totalPoint", align: "center" },
-      ],
-    };
-  },
-  computed: {
-    totalPages() {
-      return Math.max(1, Math.ceil(this.totalCount / this.pageSize));
-    },
-  },
-  created() {
-    this.initDefaultDates();
-    this.loadOwners();
-  },
-  methods: {
-    numberFormat(v) {
-      if (v === null || v === undefined) return "-";
-      try {
-        return Number(v).toLocaleString();
-      } catch (e) {
-        return String(v);
-      }
-    },
-
-    notifyError(message) {
-      this.$dialog.notify.error(message);
-    },
-    notifySuccess(message) {
-      this.$dialog.notify.success(message);
-    },
-
-    // 이번 달 1일 ~ 오늘
-    initDefaultDates() {
-      const now = new Date();
-      const y = now.getFullYear();
-      const m = now.getMonth();
-      const first = new Date(y, m, 1);
-      const pad = (n) => (n < 10 ? "0" + n : "" + n);
-      this.startDateStr = `${first.getFullYear()}-${pad(
-        first.getMonth() + 1
-      )}-${pad(first.getDate())}`;
-      this.endDateStr = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(
-        now.getDate()
-      )}`;
-    },
-
-    async loadOwners() {
-      this.ownersLoading = true;
-      try {
-        const res = await getOwners();
-        if (res.status === 200 && res.data && res.data.success) {
-          const list = Array.isArray(res.data.data) ? res.data.data : [];
-          this.ownerOptions = list;
-          // 가장 조회된 값 순서로 온다고 가정, 첫 번째를 기본 선택
-          if (list.length > 0) {
-            this.selectedCreatorId = list[0].creatorId;
-          }
-          // 초기 조회 (이번 달 범위, 기본 멤버)
-          this.page = 1;
-          await this.fetchList();
-        } else {
-          this.notifyError(
-            res.data && res.data.message
-              ? res.data.message
-              : "소지 유저 조회 실패"
-          );
-        }
-      } catch (e) {
-        this.notifyError("소지 유저 조회 중 오류가 발생했습니다.");
-      } finally {
-        this.ownersLoading = false;
-      }
-    },
-
-    async onSearch() {
-      this.page = 1;
-      await this.fetchList();
-    },
-
-    async fetchList() {
-      if (!this.selectedCreatorId) {
-        this.items = [];
-        this.totalCount = 0;
-        return;
-      }
-      this.isLoading = true;
-      try {
-        const res = await getSettlementDetails({
-          startDate: this.startDateStr,
-          endDate: this.endDateStr,
-          creatorId: this.selectedCreatorId,
-          page: this.page,
-          size: this.pageSize,
-        });
-        if (res.status === 200 && res.data) {
-          if (res.data.success) {
-            const data = res.data.data || { totalCount: 0, items: [] };
-            this.totalCount = data.totalCount || 0;
-            this.items = Array.isArray(data.items) ? data.items : [];
-          } else {
-            this.notifyError(res.data.message || "정산 내역 조회 실패");
-          }
-        } else {
-          this.notifyError("정산 내역 조회 실패");
-        }
-      } catch (e) {
-        this.notifyError("정산 내역 조회 중 오류가 발생했습니다.");
-      } finally {
-        this.isLoading = false;
-      }
-    },
-
-    async onDownloadExcel() {
-      this.excelLoading = true;
-      try {
-        const res = await downloadSettlementExcel({
-          startDate: this.startDateStr,
-          endDate: this.endDateStr,
-        });
-        const blob = new Blob([res.data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        const url = window.URL.createObjectURL(blob);
-        const link = document.createElement("a");
-        link.href = url;
-        link.setAttribute("download", "오리지널_시리즈_정산.xlsx");
-        document.body.appendChild(link);
-        link.click();
-        link.parentNode.removeChild(link);
-        window.URL.revokeObjectURL(url);
-        this.notifySuccess("엑셀 다운로드가 시작되었습니다.");
-      } catch (e) {
-        this.notifyError("엑셀 다운로드 중 오류가 발생했습니다.");
-      } finally {
-        this.excelLoading = false;
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-/* 테이블 헤더/바디 모두 가운데 정렬 */
-.v-data-table table thead th,
-.v-data-table table tbody td {
-  text-align: center !important;
-}
-</style>

src/views/Can/CanManagement.vue

@@ -135,8 +135,7 @@ export default {
       currency: 'KRW',
       currencies: [
         { text: 'KRW (한국 원)', value: 'KRW' },
-        { text: 'USD (미국 달러)', value: 'USD' },
+        { text: 'USD (미국 달러)', value: 'USD' }
-        { text: 'JPY (일본 엔)', value: 'JPY' }
       ],
       headers: [
         {

src/views/Content/ContentList.vue

@@ -36,7 +36,7 @@
           >
             <v-btn
               slot="append"
-              color="#3bb9f1"
+              color="#9970ff"
               dark
               @click="search"
             >
@@ -96,10 +96,7 @@
                   <th class="text-center">
                     오픈 예정일
                   </th>
-                  <th
+                  <th class="text-center">
-                    v-if="isAdmin"
-                    class="text-center"
-                  >
                     관리
                   </th>
                 </tr>
@@ -217,7 +214,7 @@
                   </td>
                   <td>{{ item.date }}</td>
                   <td>{{ item.releaseDate }}</td>
-                  <td v-if="isAdmin">
+                  <td>
                     <v-row>
                       <v-col>
                         <v-btn
@@ -530,14 +527,6 @@ export default {
     };
   },
 
-  computed: {
-    isAdmin() {
-      const role = (this.$store && this.$store.state && this.$store.state.accountStore && this.$store.state.accountStore.role)
-        || (typeof localStorage !== 'undefined' ? localStorage.role : '');
-      return role === 'ADMIN';
-    },
-  },
-
   async created() {
     this.audio_content = {
       id: null,
@@ -550,10 +539,7 @@ export default {
       is_settlement_ratio_deleted: false,
       settlement_ratio: "",
     };
-    // ADMIN 권한일 때만 테마 리스트 조회
-    if (this.isAdmin) {
     await this.getAudioContentThemeList();
-    }
     await this.getAudioContent();
   },
 

src/views/Member/MemberList.vue

@@ -19,7 +19,7 @@
           >
             <v-btn
               slot="append"
-              color="#3bb9f1"
+              color="#9970ff"
               dark
               @click="search"
             >
@@ -171,7 +171,7 @@
           <v-card-text>
             <v-row align="center">
               <v-col cols="4">
-                권한
+                사용 여부
               </v-col>
               <v-col cols="8">
                 <v-radio-group
@@ -191,10 +191,6 @@
                     value="USER"
                     label="일반회원"
                   />
-                  <v-radio
-                    value="CONTENT_MANAGER"
-                    label="콘텐츠 관리자"
-                  />
                   <v-spacer />
                 </v-radio-group>
               </v-col>
@@ -455,8 +451,6 @@ export default {
         this.user_type = 'CREATOR'
       } else if (member.userType === '에이전트') {
         this.user_type = 'AGENT'
-      } else if (member.userType === '콘텐츠 관리자') {
-        this.user_type = 'CONTENT_MANAGER'
       }
 
       this.email = member.email
@@ -525,8 +519,7 @@ export default {
       if (
         (this.user_type === 'CREATOR' && this.member.userType === '크리에이터') ||
         (this.user_type === 'USER' && this.member.userType === '일반회원') ||
-        (this.user_type === 'AGENT' && this.member.userType === '에이전트') ||
+        (this.user_type === 'AGENT' && this.member.userType === '에이전트')
-        (this.user_type === 'CONTENT_MANAGER' && this.member.userType === '콘텐츠 관리자')
       ) {
         this.notifyError("변경사항이 없습니다.")
       } else {