🔀 [fix] : conflict resolved

Author: seorang42

.github/workflows/CD.yml

@@ -31,16 +31,26 @@ jobs:
       - name: Build with npm
         run: npm run build-only
 
-      - name: Create nginx.conf
-        run: touch ./nginx.conf
-      - run: echo "${{ secrets.NGINX_CONF }}" > ./nginx.conf
+      - name: send file via ssh
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.FRONT_HOST }}
+          username: ${{ secrets.FRONT_HOST_USERNAME }}
+          key: ${{ secrets.FRONT_HOST_KEY }}
+          port: ${{ secrets.FRONT_HOST_PORT }}
+          source: "dist/*"
+          target: /home/${{ secrets.FRONT_HOST_USERNAME }}/
+#
+#      - name: Create nginx.conf
+#        run: touch ./nginx.conf
+#      - run: echo "${{ secrets.NGINX_CONF }}" > ./nginx.conf
 
       ## docker build & push to production
-      - name: Docker build & push
-        run: |
-          docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -t ${{ secrets.DOCKER_FRONT_REPO }} .
-          docker push ${{ secrets.DOCKER_FRONT_REPO }}
+#      - name: Docker build & push
+#        run: |
+#          docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+#          docker build -t ${{ secrets.DOCKER_FRONT_REPO }} .
+#          docker push ${{ secrets.DOCKER_FRONT_REPO }}
 
       ## deploy
       - name: Deploy
@@ -52,6 +62,9 @@ jobs:
           key: ${{ secrets.FRONT_HOST_KEY }}
           port: ${{ secrets.FRONT_HOST_PORT }}
           script: |
-            docker rm -f taskflow-front
-            docker image rm ${{ secrets.DOCKER_FRONT_REPO }} -f
-            docker run --name taskflow-front -d -p 80:80 --restart on-failure ${{ secrets.DOCKER_FRONT_REPO }}
+            sudo rm -rf /var/www/html/*
+            sudo cp -r dist/* /var/www/html/
+            sudo systemctl restart nginx
+#            docker rm -f taskflow-front
+#            docker image rm ${{ secrets.DOCKER_FRONT_REPO }} -f
+#            docker run --name taskflow-front -d -p 80:80 --restart on-failure ${{ secrets.DOCKER_FRONT_REPO }}

Dockerfile

@@ -1,5 +1,5 @@
 FROM nginx
-COPY nginx.conf /etc/nginx/sites-available/default
+COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY dist/. /usr/share/nginx/html/
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

src/App.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import TopBar from './components/TopBar.vue'
+import TopBar from './components/top-bar/TopBar.vue'
 import TheView from './layout/TheView.vue'
 </script>
 

src/api/admin.ts

@@ -0,0 +1,25 @@
+import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
+import { axiosInstance } from '@/utils/axios'
+
+export const deleteLabelAdmin = async (id: number) => {
+  const response = await axiosInstance.delete(`/api/management/labels/${id}`)
+  return response.data
+}
+
+export const postAddLabelAdmin = async (newLabel: NewLabelTypes) => {
+  const response = await axiosInstance.post('/api/management/labels', newLabel)
+  return response.data
+}
+
+export const patchLabelAdmin = async (editLabel: LabelDataTypes) => {
+  const response = await axiosInstance.patch(`/api/management/labels/${editLabel.labelId}`, {
+    labelName: editLabel.labelName,
+    labelColor: editLabel.labelColor
+  })
+  return response.data
+}
+
+export const deleteCategoryAdmin = async (id: number) => {
+  const response = await axiosInstance.delete(`/api/managements/categories/${id}`)
+  return response.data
+}

src/api/test.ts

@@ -4,3 +4,13 @@ export const postTaskRequest = async (formdata: FormData) => {
   const response = await formDataAxiosInstance.post('/api/tasks', formdata)
   return response.data
 }
+
+export const getTaskDetailUser = async (id: number) => {
+  const response = await formDataAxiosInstance.get(`/api/tasks/${id}/requests/details`)
+  return response.data
+}
+
+export const getTaskDetailManager = async (id: number) => {
+  const response = await formDataAxiosInstance.get(`/api/tasks/${id}/details`)
+  return response.data
+}

src/api/user.ts

@@ -1,7 +1,11 @@
 <template>
   <Line
+    v-if="labels.length !== 0"
     :data="teamData"
     :options="options" />
+  <NoContent
+    v-else
+    content="데이터가 없습니다" />
 </template>
 
 <script setup lang="ts">
@@ -17,6 +21,7 @@ import {
   LinearScale,
   Colors
 } from 'chart.js'
+import NoContent from './lists/NoContent.vue'
 
 ChartJS.register(
   Title,
@@ -41,14 +46,22 @@ const teamData = {
     {
       label: dataLabel,
       data: series,
-      fill: true,
-      tension: 0.4
+      fill: true
     }
   ]
 }
 
 const options = {
   responsive: true,
-  maintainAspectRatio: false
+  maintainAspectRatio: false,
+  scales: {
+    y: {
+      beginAtZero: true,
+      ticks: {
+        stepSize: 1
+      },
+      suggestedMax: Math.max(...series) + 1
+    }
+  }
 }
 </script>

src/components/LineChart.vue

@@ -92,6 +92,7 @@ watch(textValue, newValue => {
 })
 
 const closeModal = () => {
+  textValue.value = ''
   emit('close')
 }
 

src/components/ModalView.vue

@@ -1,7 +1,11 @@
 <template>
   <Pie
+    v-if="labels.length !== 0"
     :data="teamData"
     :options="options" />
+  <NoContent
+    v-else
+    content="데이터가 없습니다" />
 </template>
 
 <script setup lang="ts">
@@ -16,6 +20,7 @@ import {
   type ChartEvent,
   type ActiveElement
 } from 'chart.js'
+import NoContent from './lists/NoContent.vue'
 ChartJS.register(Title, Tooltip, Legend, ArcElement, Colors)
 
 const { labels, series } = defineProps<{ labels: string[]; series: number[] }>()

src/components/PieChart.vue

@@ -28,5 +28,3 @@ const bgColor = computed(() => {
   return isActive ? `bg-${statusAsColor(status)}-1` : `bg-${statusAsColor(status)}-2`
 })
 </script>
-
-<style scoped></style>