From 507eba38725969c10265d057a0901a90a95a3a65 Mon Sep 17 00:00:00 2001
From: KimDoHyun <kdh5998@naver.com>
Date: Thu, 5 Dec 2019 21:28:53 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EA=B8=80=20?=
=?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EA=B8=B0=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Board.vue | 0
src/views/Club.vue | 12 ++++++++----
src/views/Modify_profile.vue | 2 +-
src/views/Mypage.vue | 1 +
src/views/Post.vue | 12 ++++++++----
src/views/PublicBoard.vue | 12 ------------
src/views/SignUp.vue | 1 +
src/views/club_Free.vue | 19 +++++++++++++++++--
src/views/club_Manage.vue | 1 +
src/views/club_Page.vue | 1 +
src/views/club_Post.vue | 19 +++++++++++++++++--
src/views/club_Question.vue | 1 +
12 files changed, 56 insertions(+), 25 deletions(-)
create mode 100644 src/views/Board.vue
delete mode 100644 src/views/PublicBoard.vue
diff --git a/src/views/Board.vue b/src/views/Board.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/Club.vue b/src/views/Club.vue
index c48c9de..2636d71 100644
--- a/src/views/Club.vue
+++ b/src/views/Club.vue
@@ -1,3 +1,4 @@
+<!--동아리 구경 눌렀을 때 동아리 리스트들 나오는 화면-->
<template>
<div class="club">
<div class ="content">
@@ -24,10 +25,13 @@
<hr/>
</div>
<div class="clublist">
- <div v-for = "club in searching" class="clubImage">
- <h3>{{club.name}}({{club.category}})</h3>
- <p>{{club.detail}}</p>
- <router-link :to="{path:`/club_page/${club.id}`,params:{clubId:club.id}}">Join in!</router-link>
+ <div v-for = "club in searching" class="clubImage">
+ <router-link :to="{path:`/club_page/${club.id}`,params:{clubId:club.id}}">
+ <div>
+ <h3>{{club.name}}</h3>
+ <p>{{club.detail}}</p>
+ </div>
+ </router-link>
</div>
</div>
</div>
diff --git a/src/views/Modify_profile.vue b/src/views/Modify_profile.vue
index 33fe4ce..8efcfeb 100644
--- a/src/views/Modify_profile.vue
+++ b/src/views/Modify_profile.vue
@@ -1,7 +1,7 @@
+<!--내 정보 수정할 때-->
<template>
<div class="modify">
<div>
- <!--placeholder로 기본값 설정해야함 / form 형식?-->
이름: <input type="text" name="name" placeholder="김도현" readonly/>
<br>
이메일: <input type="email" v-model="user.email" placeholder="kdh5998@ajou.ac.kr" required>
diff --git a/src/views/Mypage.vue b/src/views/Mypage.vue
index 692b7fa..1fc6160 100644
--- a/src/views/Mypage.vue
+++ b/src/views/Mypage.vue
@@ -1,3 +1,4 @@
+<!--내 정보 볼 때-->
<template>
<div class="mypage">
<div>
diff --git a/src/views/Post.vue b/src/views/Post.vue
index 805e851..55197dd 100644
--- a/src/views/Post.vue
+++ b/src/views/Post.vue
@@ -1,3 +1,4 @@
+<!--활동 일지 글 쓸 때-->
<template>
<div class="posting">
<NavClub id="navClub">가나다</NavClub>
@@ -12,6 +13,7 @@
</div>
</template>
<script>
+import router from "../router/index"
import NavClub from '@/components/NavClub.vue'
import axios from "axios"
import {mapState} from "vuex"
@@ -31,12 +33,14 @@ export default {
},
methods: {
post(){
- axios.post(`http://jnhonlinux.ddns.net:3000/activityLog`, {
+ let id = this.$route.params.clubId;
+ axios.post(`http://jnhonlinux.ddns.net:3000/activityLog/${id}`, {
title: this.title,
- contens: this.content,
- u_id: this.userInfo.id,
- c_id: this.club[0].id
+ content: this.content,
+ writer: this.userInfo.name,
+ // c_id: this.club[0].id
})
+ router.push(`/club_post/${id}`)
}
},
async created() {
diff --git a/src/views/PublicBoard.vue b/src/views/PublicBoard.vue
deleted file mode 100644
index 5d3aa91..0000000
--- a/src/views/PublicBoard.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
- <div class="publicBoard">
- <h1>This is Public Board</h1>
- </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
diff --git a/src/views/SignUp.vue b/src/views/SignUp.vue
index 0257dde..305241b 100644
--- a/src/views/SignUp.vue
+++ b/src/views/SignUp.vue
@@ -1,3 +1,4 @@
+<!--회원가입 페이지-->
<template>
<div class="signup">
<h1>Sign Up</h1>
diff --git a/src/views/club_Free.vue b/src/views/club_Free.vue
index 56f75fd..1f21c04 100644
--- a/src/views/club_Free.vue
+++ b/src/views/club_Free.vue
@@ -1,8 +1,16 @@
+<!--동아리 내에서 활동일지 눌렀을 때-->
<template>
<div class="clubView">
<NavClub id="navClub"></NavClub>
- <router-link :to="{path:`/post/${club[0].id}`}">글쓰기</router-link>
+ <div v-for="board in freeboard" class="board">
+ <router-link :to="{ name: 'board', params: { id: board.id}}">
+ <div>
+ {{board.writer}} ㅣ {{board.title}} ㅣ {{board.date}}
+ </div>
+ </router-link>
</div>
+ <router-link :to="{path:`/post/${club[0].id}`}">글쓰기</router-link>
+
</div>
</template>
@@ -24,14 +32,21 @@ export default {
univ:'',
logo:'',
produce:''
+ }],
+ freeboard:[{
+ title:'',
+ content:'',
+ writer:''
}]
}
},
async created() {
let id = this.$route.params.clubId;
const res = await this.$http.get(`http://jnhonlinux.ddns.net:3000/club/${id}`)
- console.log(res.data.result)
this.club = res.data.result
+ const freeboard = await this.$http.get(`http://jnhonlinux.ddns.net:3000/freeboard/${id}`)
+ this.freeboard = freeboard.data.result
+
}
}
</script>
diff --git a/src/views/club_Manage.vue b/src/views/club_Manage.vue
index db672b5..f5d070f 100644
--- a/src/views/club_Manage.vue
+++ b/src/views/club_Manage.vue
@@ -1,3 +1,4 @@
+<!--동아리 내에서 동아리 회원 관리-->
<template>
<div class="manage">
<NavClub id="navClub">가나다</NavClub>
diff --git a/src/views/club_Page.vue b/src/views/club_Page.vue
index cbb5e7d..0832ea3 100644
--- a/src/views/club_Page.vue
+++ b/src/views/club_Page.vue
@@ -1,3 +1,4 @@
+<!--동아리 내에서 메인 화면-->
<template>
<div class="clubView">
<NavClub id="navClub">가나다</NavClub>
diff --git a/src/views/club_Post.vue b/src/views/club_Post.vue
index 56f75fd..900a243 100644
--- a/src/views/club_Post.vue
+++ b/src/views/club_Post.vue
@@ -1,8 +1,16 @@
+<!--동아리 내에서 활동일지 눌렀을 때-->
<template>
<div class="clubView">
<NavClub id="navClub"></NavClub>
- <router-link :to="{path:`/post/${club[0].id}`}">글쓰기</router-link>
+ <div v-for="board in activityLog" class="board">
+ <router-link :to="{ name: 'board', params: { id: board.id}}">
+ <div>
+ {{board.writer}} ㅣ {{board.title}} ㅣ {{board.date}}
+ </div>
+ </router-link>
</div>
+ <router-link :to="{path:`/post/${club[0].id}`}">글쓰기</router-link>
+
</div>
</template>
@@ -24,14 +32,21 @@ export default {
univ:'',
logo:'',
produce:''
+ }],
+ activityLog:[{
+ title:'',
+ content:'',
+ writer:''
}]
}
},
async created() {
let id = this.$route.params.clubId;
const res = await this.$http.get(`http://jnhonlinux.ddns.net:3000/club/${id}`)
- console.log(res.data.result)
this.club = res.data.result
+ const activityLog = await this.$http.get(`http://jnhonlinux.ddns.net:3000/activityLog/${id}`)
+ this.activityLog = activityLog.data.result
+
}
}
</script>
diff --git a/src/views/club_Question.vue b/src/views/club_Question.vue
index 517dada..d68a61f 100644
--- a/src/views/club_Question.vue
+++ b/src/views/club_Question.vue
@@ -1,3 +1,4 @@
+<!--동아리 내에서 자주묻는질문 눌렀을 때-->
<template>
<div class="clubView">
<NavClub id="navClub">가나다</NavClub>
--
GitLab