Merge pull request '커뮤니티 정산페이지 추가' (#20) from test into main

Reviewed-on: #20

public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>보이스온 크리에이터 관리자</title>
+    <title>소다라이브</title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
   </head>

src/App.vue

@@ -7,7 +7,7 @@
       dark
     >
       <v-spacer />
-      <v-toolbar-title>보이스온 크리에이터 관리자</v-toolbar-title>
+      <v-toolbar-title>소다라이브 크리에이터</v-toolbar-title>
       <v-spacer />
     </v-app-bar>
 
@@ -38,13 +38,4 @@
     }
   }
 }
-
-.noscroll {
-  overflow-y: hidden;
-}
-
-.noscroll::-webkit-scrollbar {
-  overflow-y: hidden;
-  display: none;
-}
 </style>

src/api/audio_content_series.js

@@ -5,7 +5,7 @@ async function getGenreList() {
 }
 
 async function getSeriesList(page) {
-    return Vue.axios.get("/creator-admin/audio-content/series?page=" + (page - 1) + "&size=20");
+    return Vue.axios.get("/creator-admin/audio-content/series?page=" + (page - 1) + "&size=10");
 }
 
 async function createSeries(formData) {
@@ -55,13 +55,6 @@ async function removeContentInTheSeries(seriesId, contentId) {
     )
 }
 
-async function updateSeriesOrders(ids) {
-    return Vue.axios.put(
-        "/creator-admin/audio-content/series/orders",
-        {ids: ids}
-    )
-}
-
 export {
     getGenreList,
     getSeriesList,
@@ -69,7 +62,6 @@ export {
     modifySeries,
     getSeriesDetail,
     getSeriesContent,
-    updateSeriesOrders,
     addingContentToTheSeries,
     removeContentInTheSeries,
     searchContentNotInSeries

src/api/signature.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 
-async function getSignatureList(page, sort) {
-    return Vue.axios.get('/creator-admin/signature?page=' + (page - 1) + "&size=20" + "&sort-type=" + sort);
+async function getSignatureList(page) {
+    return Vue.axios.get('/creator-admin/signature?page=' + (page - 1) + "&size=20");
 }
 
 async function createSignature(formData) {

src/router/index.js

@@ -82,12 +82,6 @@ const router = new VueRouter({
 
 router.beforeEach((to, from, next) => {
     if (to.path !== '/login') {
-        if (to.path === '/content/series/list') {
-            document.documentElement.classList.add('noscroll'); // html에 클래스 추가
-        } else {
-            document.documentElement.classList.remove('noscroll');
-        }
-
         const isAuthenticated = store.getters['accountStore/isAuthenticated']
         if (isAuthenticated) {
             next();

src/views/Calculate/CalculateCommunityPost.vue

@@ -38,11 +38,13 @@
             color="#9970ff"
             dark
             depressed
-            @click="getCalculateCommunityPost"
+            @click="getCalculateContentDonation"
           >
             조회
           </v-btn>
         </v-col>
+
+
         <v-spacer />
       </v-row>
       <v-row>
@@ -55,20 +57,6 @@
             class="elevation-1"
             hide-default-footer
           >
-            <template slot="body.prepend">
-              <tr>
-                <td colspan="4">
-                  합계
-                </td>
-                <td>{{ sumField('totalCan').toLocaleString() }} 캔</td>
-                <td>{{ sumField('totalKrw').toLocaleString() }} 원</td>
-                <td>{{ sumField('paymentFee').toLocaleString() }} 원</td>
-                <td>{{ sumField('settlementAmount').toLocaleString() }} 원</td>
-                <td>{{ sumField('tax').toLocaleString() }} 원</td>
-                <td>{{ sumField('depositAmount').toLocaleString() }} 원</td>
-              </tr>
-            </template>
-
             <template v-slot:item.title="{ item }">
               {{ item.title }}...
             </template>
@@ -144,12 +132,6 @@ export default {
           align: 'center',
           width: "300px"
         },
-        {
-          text: '판매금액(캔)',
-          align: 'center',
-          sortable: false,
-          value: 'can',
-        },
         {
           text: '구매유저수',
           align: 'center',
@@ -223,10 +205,6 @@ export default {
       this.$dialog.notify.error(message)
     },
 
-    sumField(key) {
-      return this.items.reduce((a, b) => a + (b[key] || 0), 0)
-    },
-
     async next() {
       await this.getCalculateCommunityPost()
     },

src/views/Content/ContentList.vue

@@ -14,7 +14,7 @@
         <v-col>
           <v-btn
             block
-            color="#3bb9f1"
+            color="#9970ff"
             dark
             depressed
             @click="showWriteDialog"
@@ -227,34 +227,6 @@
               </v-col>
             </v-row>
           </v-card-text>
-          <v-card-text>
-            <v-row align="center">
-              <v-col cols="4">
-                태그
-              </v-col>
-              <v-col cols="8">
-                <v-text-field
-                  v-model="audio_content.tags"
-                  label="예 : #연애 #커버곡 #태그"
-                  required
-                />
-              </v-col>
-            </v-row>
-          </v-card-text>
-          <v-card-text>
-            <v-row align="center">
-              <v-col cols="4">
-                가격
-              </v-col>
-              <v-col cols="8">
-                <v-text-field
-                  v-model="audio_content.price"
-                  label="가격"
-                  required
-                />
-              </v-col>
-            </v-row>
-          </v-card-text>
           <v-card-text>
             <v-row>
               <v-col cols="4">
@@ -287,22 +259,6 @@
               </v-col>
             </v-row>
           </v-card-text>
-          <v-card-text>
-            <v-row>
-              <v-col cols="4">
-                포인트 사용 가능
-              </v-col>
-              <v-col
-                cols="8"
-                align="left"
-              >
-                <input
-                  v-model="audio_content.is_point_available"
-                  type="checkbox"
-                >
-              </v-col>
-            </v-row>
-          </v-card-text>
           <v-card-actions v-show="!is_loading">
             <v-spacer />
             <v-btn
@@ -484,7 +440,7 @@
                   label="가격"
                   required
                 />
-                ※ 유료 콘텐츠 가격을 입력하면 해당 콘텐츠의 미리듣기 시간을 설정할 수 있습니다.<br>미리듣기 시간은 최소 15초 이상 설정해야 합니다.
+                ※ 유료 콘텐츠 가격을 입력하면 해당 콘텐츠의 미리듣기 시간을 설정할 수 있습니다.<br>미리듣기 시간은 최소 30초 이상 설정해야 합니다.
               </v-col>
             </v-row>
           </v-card-text>
@@ -564,52 +520,18 @@
             </v-row>
           </v-card-text>
           <v-card-text v-show="audio_content.price > 0 && is_limited_edition === false">
-            <v-row align="center">
+            <v-row>
               <v-col cols="4">
-                소장 설정
+                대여만 가능
               </v-col>
-              <v-col cols="8">
-                <v-radio-group
-                  v-model="audio_content.purchase_option"
-                  row
+              <v-col
+                cols="8"
+                align="left"
+              >
+                <input
+                  v-model="audio_content.is_only_rental"
+                  type="checkbox"
                 >
-                  <v-radio
-                    value="BOTH"
-                    label="소장/대여"
-                  />
-                  <v-radio
-                    value="BUY_ONLY"
-                    label="소장만"
-                  />
-                  <v-radio
-                    value="RENT_ONLY"
-                    label="대여만"
-                  />
-                  <v-spacer />
-                </v-radio-group>
-              </v-col>
-            </v-row>
-          </v-card-text>
-          <v-card-text v-show="audio_content.price >= 50">
-            <v-row align="center">
-              <v-col cols="4">
-                콘텐츠 내용 전체 오픈 설정
-              </v-col>
-              <v-col cols="8">
-                <v-radio-group
-                  v-model="audio_content.is_full_detail_visible"
-                  row
-                >
-                  <v-radio
-                    :value="false"
-                    label="구매한 사람만"
-                  />
-                  <v-radio
-                    :value="true"
-                    label="전체"
-                  />
-                  <v-spacer />
-                </v-radio-group>
               </v-col>
             </v-row>
           </v-card-text>
@@ -645,22 +567,6 @@
               </v-col>
             </v-row>
           </v-card-text>
-          <v-card-text>
-            <v-row>
-              <v-col cols="4">
-                포인트 사용 가능
-              </v-col>
-              <v-col
-                cols="8"
-                align="left"
-              >
-                <input
-                  v-model="audio_content.is_point_available"
-                  type="checkbox"
-                >
-              </v-col>
-            </v-row>
-          </v-card-text>
           <v-card-actions v-show="!is_loading">
             <v-spacer />
             <v-btn
@@ -746,15 +652,15 @@ export default {
       audio_content: {
         price: 0,
         is_adult: false,
-        is_point_available: false,
-        is_generate_preview: false,
+        is_generate_preview: true,
         is_comment_available: true,
-        is_full_detail_visible: true,
-        purchase_option: 'BOTH',
       },
       audio_contents: [],
       themeList: [],
       selected_audio_content: {},
+      utm_source: '',
+      utm_medium: '',
+      utm_campaign: '',
     }
   },
 
@@ -793,12 +699,9 @@ export default {
       this.audio_content.id = item.audioContentId
       this.audio_content.title = item.title
       this.audio_content.detail = item.detail
-      this.audio_content.price = item.price
       this.audio_content.is_adult = item.isAdult
-      this.audio_content.is_point_available = item.isPointAvailable
       this.audio_content.is_comment_available = item.isCommentAvailable
       this.audio_content.cover_image_url = item.coverImageUrl
-      this.audio_content.tags = item.tags
       this.show_modify_dialog = true
     },
 
@@ -807,10 +710,7 @@ export default {
       this.audio_content = {
         price: 0,
         is_adult: false,
-        is_point_available: false,
         is_comment_available: true,
-        is_full_detail_visible: true,
-        purchase_option: 'BOTH',
       }
       this.reservation_time = ''
       this.reservation_time = ''
@@ -918,14 +818,12 @@ export default {
           themeId: this.audio_content.theme_id,
           isAdult: this.audio_content.is_adult,
           isGeneratePreview: this.audio_content.price > 0 ? this.audio_content.is_generate_preview : false,
-          purchaseOption: this.audio_content.purchase_option,
-          isPointAvailable: this.audio_content.is_point_available,
-          isCommentAvailable: this.audio_content.is_comment_available,
-          isFullDetailVisible: this.audio_content.is_full_detail_visible
+          isOnlyRental: this.audio_content.is_only_rental,
+          isCommentAvailable: this.audio_content.is_comment_available
         }
 
         if (this.audio_content.limited > 0) {
-          request.purchaseOption = 'BUY_ONLY'
+          request.isOnlyRental = false
         }
 
         if (this.audio_content.price > 0 && this.is_limited_edition === true) {
@@ -957,7 +855,7 @@ export default {
             !this.isValidTimeFormat(previewStartTime) ||
             !this.isValidTimeFormat(previewEndTime)
           ) {
-            this.notifyError("미리 듣기 시간 형식은 00:00:15 과 같아야 합니다")
+            this.notifyError("미리 듣기 시간 형식은 00:30:00 과 같아야 합니다")
             this.is_loading = false
             return
           }
@@ -969,8 +867,8 @@ export default {
           const totalSeconds2 = h2 * 3600 + m2 * 60 + s2;
           const timeDifference = totalSeconds2 - totalSeconds1;
 
-          if (timeDifference < 15) {
-            this.notifyError("미리 듣기의 최소 시간은 15초 입니다.")
+          if (timeDifference < 30) {
+            this.notifyError("미리 듣기의 최소 시간은 30초 입니다.")
             this.is_loading = false
             return
           }
@@ -1061,22 +959,10 @@ export default {
           request.isAdult = this.audio_content.is_adult
         }
 
-        if (this.selected_audio_content.isPointAvailable !== this.audio_content.is_point_available) {
-          request.isPointAvailable = this.audio_content.is_point_available
-        }
-
         if (this.selected_audio_content.isCommentAvailable !== this.audio_content.is_comment_available) {
           request.isCommentAvailable = this.audio_content.is_comment_available
         }
 
-        if (this.audio_content.price !== this.selected_audio_content.price) {
-          request.price = this.audio_content.price
-        }
-
-        if (this.audio_content.tags !== this.selected_audio_content.tags) {
-          request.tags = this.audio_content.tags
-        }
-
         if (this.audio_content.cover_image !== null) {
           formData.append("coverImage", this.audio_content.cover_image)
         }

src/views/Content/ContentSeriesList.vue

@@ -22,54 +22,44 @@
           </v-btn>
         </v-col>
       </v-row>
-      <div
-        ref="scroll_container"
-        class="scroll_container"
-        @scroll="onScroll"
-      >
-        <draggable
-          v-model="series_list"
-          class="row"
-          @end="onDropCallback(series_list)"
+      <v-row>
+        <v-col
+          v-for="(item, i) in series_list"
+          :key="i"
+          cols="3"
         >
-          <v-col
-            v-for="(item, i) in series_list"
-            :key="i"
-            cols="2"
-          >
-            <v-card>
-              <v-card-title>
-                <v-spacer />
-                <v-img
-                  :src="item.coverImageUrl"
-                  class="cover-image"
-                  @click="selectSeries(item)"
-                />
-                <v-spacer />
-              </v-card-title>
-              <v-card-text class="series-title-container">
-                {{ item.title }}
-              </v-card-text>
-              <v-card-actions>
-                <v-spacer />
-                <v-btn
-                  text
-                  @click="showModifyDialog(item)"
-                >
-                  수정
-                </v-btn>
-                <v-btn
-                  text
-                  @click="deleteConfirm(item)"
-                >
-                  삭제
-                </v-btn>
-                <v-spacer />
-              </v-card-actions>
-            </v-card>
-          </v-col>
-        </draggable>
-      </div>
+          <v-card>
+            <v-card-title>
+              <v-spacer />
+              <v-img
+                :src="item.coverImageUrl"
+                class="cover-image"
+                @click="selectSeries(item)"
+              />
+              <v-spacer />
+            </v-card-title>
+            <v-card-text class="series-title-container">
+              {{ item.title }}
+            </v-card-text>
+            <v-card-actions>
+              <v-spacer />
+              <v-btn
+                text
+                @click="showModifyDialog(item)"
+              >
+                수정
+              </v-btn>
+              <v-btn
+                text
+                @click="deleteConfirm(item)"
+              >
+                삭제
+              </v-btn>
+              <v-spacer />
+            </v-card-actions>
+          </v-card>
+        </v-col>
+      </v-row>
     </v-container>
 
     <v-dialog
@@ -355,11 +345,10 @@
 
 <script>
 import * as api from '@/api/audio_content_series';
-import Draggable from "vuedraggable";
 
 export default {
   name: "ContentSeriesList",
-  components: {Draggable},
+
   data() {
     return {
       is_loading: false,
@@ -389,14 +378,6 @@ export default {
   },
 
   methods: {
-    async onScroll() {
-      const scrollContainer = this.$refs.scroll_container;
-      const threshold = scrollContainer.scrollHeight - scrollContainer.clientHeight;
-      if (scrollContainer.scrollTop >= threshold - 10 && this.total_page >= this.page) {
-        await this.getSeriesList();
-      }
-    },
-
     imageAdd(payload) {
       const file = payload;
       if (file) {
@@ -504,18 +485,8 @@ export default {
       this.$router.push({name: 'ContentSeriesDetail', params: {seriesId: series.seriesId}})
     },
 
-    async onDropCallback(items) {
-      const ids = items.map((item) => {
-        return item.seriesId
-      })
-
-      const res = await api.updateSeriesOrders(ids)
-      if (res.status === 200 && res.data.success === true) {
-        this.notifySuccess(res.data.message)
-      }
-    },
-
     async getSeriesGenreList() {
+      this.is_loading = true
       try {
         const res = await api.getGenreList()
         if (res.status === 200 && res.data.success === true) {
@@ -525,24 +496,23 @@ export default {
         } else {
           this.notifyError(res.data.message || '알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.')
         }
+
+        this.is_loading = false
       } catch (e) {
         this.notifyError('알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.')
+        this.is_loading = false
       }
     },
 
     async getSeriesList() {
-      if (this.is_loading) return;
-
       this.is_loading = true
       try {
         const res = await api.getSeriesList(this.page)
         if (res.status === 200 && res.data.success === true) {
           const data = res.data.data
-          const total_page = Math.ceil(data.totalCount / 10)
 
-          if (this.page === 1) this.series_list.length = 0;
-          this.page += 1;
-          this.series_list.push(...data.items);
+          const total_page = Math.ceil(data.totalCount / 20)
+          this.series_list = data.items
 
           if (total_page <= 0)
             this.total_page = 1
@@ -695,16 +665,6 @@ export default {
 </script>
 
 <style scoped>
-.scroll_container {
-  margin-top: 30px;
-  height: 100vh;
-  overflow-y: auto;
-}
-
-.scroll_container > .row {
-  padding-bottom: 280px;
-}
-
 .image-select label {
   display: inline-block;
   padding: 10px 20px;
@@ -742,6 +702,6 @@ export default {
 }
 
 .cover-image {
-  aspect-ratio: 1/1.3;
+  aspect-ratio: 1/1.4;
 }
 </style>

src/views/Signature/SignatureManagement.vue

@@ -20,57 +20,6 @@
           </v-btn>
         </v-col>
       </v-row>
-      <v-row class="row-sort">
-        <v-col>
-          <input
-            id="sort-newest"
-            v-model="sort_type"
-            type="radio"
-            value="NEWEST"
-            class="radio-sort"
-            @change="changeSortType"
-          >
-          <label
-            for="sort-newest"
-            class="radio-label-sort"
-          >
-            최신순
-          </label>
-        </v-col>
-        <v-col>
-          <input
-            id="sort-can-high"
-            v-model="sort_type"
-            type="radio"
-            value="CAN_HIGH"
-            class="radio-sort"
-            @change="changeSortType"
-          >
-          <label
-            for="sort-can-high"
-            class="radio-label-sort"
-          >
-            높은캔순
-          </label>
-        </v-col>
-        <v-col>
-          <input
-            id="sort-can-low"
-            v-model="sort_type"
-            type="radio"
-            value="CAN_LOW"
-            class="radio-sort"
-            @change="changeSortType"
-          >
-          <label
-            for="sort-can-low"
-            class="radio-label-sort"
-          >
-            낮은캔순
-          </label>
-        </v-col>
-        <v-col cols="10" />
-      </v-row>
       <v-row>
         <v-col>
           <v-data-table
@@ -397,7 +346,6 @@ export default {
       image_url: null,
       is_active: null,
       selected_signature_can: {},
-      sort_type: 'NEWEST',
 
       headers: [
         {
@@ -501,15 +449,11 @@ export default {
       this.show_modify_dialog = true
     },
 
-    async changeSortType() {
-      await this.getSignatureList();
-    },
-
     async getSignatureList() {
-      this.is_loading = true
+      this.isLoading = true
 
       try {
-        let res = await api.getSignatureList(this.page, this.sort_type);
+        let res = await api.getSignatureList(this.page);
 
         if (res.status === 200 && res.data.success === true) {
           const data = res.data.data
@@ -525,7 +469,7 @@ export default {
       } catch (e) {
         this.notifyError("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
       } finally {
-        this.is_loading = false
+        this.isLoading = false
       }
     },
 
@@ -695,22 +639,4 @@ export default {
   display: block;
   margin: 0 auto;
 }
-
-.row-sort {
-  margin-top: 40px;
-}
-
-.radio-sort {
-  display: none;
-}
-
-.radio-label-sort {
-  font-weight: normal;
-  color: black;
-}
-
-.radio-sort:checked + .radio-label-sort {
-  font-weight: bold;
-  color: #3bb9f1;
-}
 </style>