diff --git a/src/components/NavClub.vue b/src/components/NavClub.vue
new file mode 100644
index 0000000000000000000000000000000000000000..72caf54bca551e1395b94f632a69f5d28304c20e
--- /dev/null
+++ b/src/components/NavClub.vue
@@ -0,0 +1,24 @@
+<template>
+ <div class="navClub">
+ <div id="clubMenu">
+ <router-link to='/clubHomePage'>프롤로그 </router-link> |
+ <router-link to='/'>공지사항 </router-link> |
+ <router-link to='/'>활동일지 </router-link> |
+ <router-link to='/'>자유게시판 </router-link> |
+ <router-link to='/'>캘린더 </router-link> |
+ <router-link to='/'>자주묻는질문 </router-link> |
+ <router-link to='/'>가입신청</router-link> |
+ </div>
+ </div>
+</template>
+
+<script>
+
+</script>
+
+<style>
+.navClub {
+ background-color: cadetblue;
+ text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/clubForm.vue b/src/components/clubForm.vue
index ec6e4eccef12c86c79c9f7bb5a8445120b805cfa..447cc18853cf01b1c6217a4a6ffc56e215635cb7 100644
--- a/src/components/clubForm.vue
+++ b/src/components/clubForm.vue
@@ -2,7 +2,6 @@
<div class="clubForm">
{{name}} <br>
{{address}} <br>
-
</div>
</template>
diff --git a/src/components/clubHomePage.vue b/src/components/clubHomePage.vue
new file mode 100644
index 0000000000000000000000000000000000000000..cb3bcf74149a4d7811a6555d28ac7666b3597723
--- /dev/null
+++ b/src/components/clubHomePage.vue
@@ -0,0 +1,31 @@
+<template>
+ <div class="clubHone">
+ 클럽 페이지 메인입니다.
+ </div>
+</template>
+
+<script>
+export default {
+ async created() {
+ let id = req.params.id;
+ const res = await this.$http.get(`http://jnhonlinux.ddns.net:3000/club/${id}`)
+ if(res.data.success == true) {
+ this.data = res.data.result[0]
+ }
+ },
+ data() {
+ return {
+ name: '',
+ address: ''
+ }
+ }
+}
+</script>
+
+<style>
+.clubForm {
+ width: 300px;
+ height: 200px;
+ border: 2px solid black;
+}
+</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index d54b08eebda9df29c039e180bf918e6c4d04ff82..46bbb363edc7fe5388b055348ad3bc2b82f68809 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,6 +4,7 @@ import Home from '../views/Home.vue'
import Login from '../views/Login.vue'
import SignUp from '../views/SignUp.vue'
import Club from '../views/Club.vue'
+import ClubPage from '../views/ClubPage.vue'
Vue.use(VueRouter)
@@ -44,6 +45,10 @@ const routes = [
path: '/club',
name: 'club',
component: Club
+ },{
+ path: '/clubpage',
+ name: 'clubpage',
+ component: ClubPage
}
]
diff --git a/src/views/Club.vue b/src/views/Club.vue
index 1d2e3d287871ba53a78db82f17f56e90f35f9451..1649e1db13ffd2f656bcd75389e75f385f929e81 100644
--- a/src/views/Club.vue
+++ b/src/views/Club.vue
@@ -4,8 +4,13 @@
<input type="text" id="searchClub" placeholder="Search"> <br>
<hr>
<div class="clubList">
- <div class="club" v-for="club in data" :key="club">
- {{club.name}}
+ <div class="club" v-for="club in data" :key="club" v-on:click="testClick" >
+
+ {{club.name}}<br/>
+ 회장: {{club.manager}}<br/>
+ {{club.picture}}><br/>
+ {{club.detail}}<br/>
+
</div>
</div>
</div>
@@ -30,6 +35,11 @@ export default {
name: '',
}
+ },
+ methods:{
+ testClick(){
+ return this.$router.push('/clubpage');
+ }
}
}
</script>
diff --git a/src/views/ClubPage.vue b/src/views/ClubPage.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ffa255228a59283bfa23c3ddbe0043c37ce99c27
--- /dev/null
+++ b/src/views/ClubPage.vue
@@ -0,0 +1,27 @@
+<template>
+ <div class="clubView">
+ <NavClub id="navClub">가나다</NavClub>
+ <h1>클럽 페이지 입니다.</h1>
+ <div id="clubMain">
+ <router-view/>
+ </div>
+ </div>
+</template>
+
+<script>
+import NavClub from '@/components/NavClub.vue'
+import clubHomePage from '@/components/clubHomePage.vue'
+
+export default {
+ name: 'clubpage',
+ components: {
+ 'NavClub': NavClub
+ },
+ async created() {
+ const res = await this.$http.get('http://jnhonlinux.ddns.net:3000/club')
+ if(res.data.success == true) {
+ this.data = res.data.result
+ }
+ },
+}
+</script>
diff --git a/src/views/JoinedClub.vue b/src/views/JoinedClub.vue
new file mode 100644
index 0000000000000000000000000000000000000000..52fc53a8ae170dc90d70456d2e56ba69a75237a1
--- /dev/null
+++ b/src/views/JoinedClub.vue
@@ -0,0 +1,16 @@
+<template>
+ <div class="joinedClub">
+ <NavOfClub></NavOfClub>
+ <h1>This is joinedClub Page</h1>
+ </div>
+</template>
+
+<script>
+import NavOfClub from '@/components/NavOfClub.vue'
+export default {
+ name: 'joinedClub',
+ components: {
+ NavOfClub
+ }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/PublicBoard.vue b/src/views/PublicBoard.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5d3aa91134e7802b65edb51c8e43fe4cd0e50685
--- /dev/null
+++ b/src/views/PublicBoard.vue
@@ -0,0 +1,12 @@
+<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 b5d52ba6a69914ae73cb3c35665358b766f9e3e4..0257dde15016d132c2a03dc42b5cc655eb665d57 100644
--- a/src/views/SignUp.vue
+++ b/src/views/SignUp.vue
@@ -7,6 +7,9 @@
<div class="signUpInput">
<input type="text" v-model="password" placeholder="Password">
</div>
+ <div class="signUpInput">
+ <input type="text" v-model="name" placeholder="Name">
+ </div>
<div class="signUpInput">
<input type="text" v-model="email" placeholder="Email">
</div>
@@ -42,29 +45,46 @@ export default {
textLimit: 30,
uid: '',
password: '',
+ name: '',
email: '',
phone: '',
univ: '',
department: '',
sid: '',
- ifsuper: '',
+ ifsuper: 0,
}
},
methods: {
async btnSignUp(){
- const res = await this.$http.post('http://jnhonlinux.ddns.net:3000/signup', {
- 'uid': this.uid,
- 'password': this.password,
- 'email': this.email,
- 'phone': this.phone,
- 'univ': this.univ,
- 'department': this.department,
- 'sid': this.sid,
- 'ifsuper': this.ifsuper
- });
- if(res.data.success == true) {
- alert('Go to Login');
- this.$router.push('/login');
+ if(this.uid == '' || this.password == ''){
+ alert('input Your Id & Pwd');
+ }else if(!this.sid_valid){
+ alert('plz input Number in StudentId');
+ } else {
+ const res = await this.$http.post('http://jnhonlinux.ddns.net:3000/signup', {
+ 'uid': this.uid,
+ 'password': this.password,
+ 'name': this.name,
+ 'email': this.email,
+ 'phone': this.phone,
+ 'univ': this.univ,
+ 'department': this.department,
+ 'sid': this.sid,
+ 'ifsuper': this.ifsuper
+ });
+ if(res.data.success == true) {
+ alert('Go to Login');
+ this.$router.push('/login');
+ }
+ }
+ }
+ },
+ computed: {
+ sid_valid: function() {
+ if(!isNaN(this.sid)){
+ return true
+ } else {
+ return false
}
}
}