diff --git a/src/assets/adding.png b/src/assets/adding.png new file mode 100644 index 0000000000000000000000000000000000000000..68053c44eaaeceef6a08224e1a3d0bd1402cf8fe Binary files /dev/null and b/src/assets/adding.png differ diff --git a/src/components/MyModal.vue b/src/components/MyModal.vue index e43111551650c83cf7fefe056e6aa95045674353..93a9583b05287d9258dff9b65074f9acce5bf11a 100644 --- a/src/components/MyModal.vue +++ b/src/components/MyModal.vue @@ -22,9 +22,9 @@ :until-country=true @select-country="getCountryInfo"/> <div v-if="checkCountry"> - <button class="modal-default-button" v-on:click="clickMakePlan()">Make Plan!</button> + <button class="modal-default-button" v-on:click="clickMakePlan()"><img id="illu" src="../assets/makePlan.png">!</button> </div> - <button class="modal-default-button" @click="$emit('close')">Close + <button class="modal-default-button" @click="$emit('close')"><img id="illu" src="../assets/close.png"> </button> <br> </div> @@ -110,6 +110,10 @@ export default { .closeModalBtn { color: #62acde; } + #illu { + width: 80px; + height: 35px; + } .modal-mask { position: fixed; @@ -149,11 +153,12 @@ export default { } .modal-default-button { - color: #fff; float: right; - background-color: #64b99f; - font-size: 20px; - border-radius: 8px; + background-color:#ffffff; + width: 80px; + height: 35px; + border : none; + margin: 0px 5px; } /* diff --git a/src/views/AttractionList.vue b/src/views/AttractionList.vue index aba26637951905df6189338f274333589c227cf0..1693d26c3912aa0a4604b5c14196867492113aa0 100644 --- a/src/views/AttractionList.vue +++ b/src/views/AttractionList.vue @@ -62,7 +62,7 @@ export default { font-size: 26px; } #attractionlist { - margin: 15% auto auto auto; + margin: 10% auto auto auto; } hr{ border: none; @@ -74,6 +74,7 @@ export default { .illu{ width: 80px; height: 35px; + margin: 4px 0px; } .img{ diff --git a/src/views/LogIn.vue b/src/views/LogIn.vue index 17a4345d64dab0845e80b60e1eb7f4ccdc931df6..3d70ee162c2d2ac161da801e869cfd15a8ad6398 100644 --- a/src/views/LogIn.vue +++ b/src/views/LogIn.vue @@ -1,10 +1,11 @@ <template> <div id="LogIn"> - <p>LogIn Page</p> + <h2 class="text-info">LogIn Page</h2> + <br> <input required v-model='user_id' placeholder="ID"><br><br> <input required v-model='user_password' placeholder="PASSWORD"><br><br> - <button v-on:click="login()" id="bu1"> - <img id="illu1" src="../assets/login.png"> + <button class="btn" v-on:click="login()"> + <img id="illu1" src="../assets/login.png"> </button> <br> <router-link to='/'> @@ -45,13 +46,17 @@ export default { } </script> <style> +h2{ + font-weight: 2px +} #illu, #illu1, #bu1 { width: 80px; height: 35px; } - #bu1 { - background-color: #ffffff + .btn { + background-color: none; + border : none; } #LogIn { diff --git a/src/views/MainPage.vue b/src/views/MainPage.vue index 4b3146ba17234884a9efa7593f7d1d97a66c11af..e7163712f78840316389099003070a558fb6bf3c 100644 --- a/src/views/MainPage.vue +++ b/src/views/MainPage.vue @@ -4,7 +4,7 @@ -o-background-size: cover;"> <li class="triplan-li"> <router-link to="/attractionlist" id="menu1"> - <img id="illu1" src="../assets/menu1.png"> + <img id="illu11" src="../assets/menu1.png"> </router-link> <img id="illu2" src="../assets/menu2.png" @click="showModal = true"> <modal v-if="showModal" @close="showModal = false"> @@ -62,7 +62,7 @@ export default { background-color: none; } - #illu1, #illu2, #illu3 { + #illu11, #illu2, #illu3 { width: 200px; height: 200px; cursor: pointer; diff --git a/src/views/MakePlan.vue b/src/views/MakePlan.vue index 0feb24c62e9cb1f2457444070bebcd98082d18a0..4e81aa53c7331d8b4cdc8c9fa9ebee6e5e80b4b8 100644 --- a/src/views/MakePlan.vue +++ b/src/views/MakePlan.vue @@ -1,5 +1,6 @@ <template> <div class="makePlan"> + <br><br><br> <h1>Make Plan</h1> <div id="div0"> <div v-for="item in Days" v-bind:key='item.idx'> @@ -9,16 +10,17 @@ {{item.st}} </button> </div> + <br><br> <button id="addBtn" v-on:click="newAdd">+</button> - <br> + </div> - <br> + <div> <div id="div1"> <div class="tourList"> <p class="w1">관광지</p> </div> <br> - <button v-on:click="cl1">고르기</button> + <button v-on:click="cl1" class="btn"><img id="illu1" src="../assets/choose.png"></button> <div v-if="showM" @close="showM=false"> <select @change="selectCity($event)" name="city"> <!-- <option disabled value="">Select City</option>--> @@ -26,7 +28,7 @@ <option v-for="city in cities" v-bind:key="city.id">{{city.city_name}}</option> </select> </div> - <br><br> + <br> <div v-for="idx in places" v-bind:key='idx.place_id'> <button class="btn btn-outline-secondary" v-on:click="makeTour(idx)">{{idx.place_name}}</button> <br> @@ -42,8 +44,9 @@ <div id="div_tour"> {{pl.place_name}} </div> </div> - <button class="btn" v-on:click="addTour">저장</button> - <button class="btn" v-on:click="sendResult">최종 저장</button> + <button class="btn" v-on:click="addTour"><img id="illu1" src="../assets/submit.png"></button> + <button class="btn" v-on:click="sendResult"><img id = "illu2" src="../assets/totalSubmit.png"></button> + </div> </div> </div> </template> @@ -55,6 +58,7 @@ import API from '../components/API' var number = 1 var dayNum = 0 var cc = '' +var clicked='' export default { name: 'makePlan', data () { @@ -67,7 +71,8 @@ export default { places: [], Days: [], checking: [], - placeNames: [] + placeNames: [], + dayplanNames: [] } }, methods: { @@ -141,30 +146,31 @@ export default { }) }, makeTour (idx) { - this.tours.push({ - place_id: idx.place_id - }) + this.tours.push(idx.place_id) this.placeNames.push({ place_name: idx.place_name }) }, addTour () { const data = { - place_id: this.tours, - day: dayNum, city_id: cc, + place_id: this.tours + } + const data2 = { + day: dayNum, place_name: this.placeNames } - this.dayplan[data.day - 1] = data + this.dayplan[data2.day - 1] = data + this.dayplanNames[data2.day - 1] = data2 + this.tours = [] this.checking[dayNum] = 1 this.placeNames = [] }, showTour (idx) { - this.tours = [] + this.placeNames = [] dayNum = idx if (this.checking[dayNum] === 1) { - const result = this.dayplan[idx - 1].place_name - console.log(result) + const result = this.dayplanNames[idx - 1].place_name this.placeNames = result } }, @@ -187,14 +193,20 @@ export default { } </script> <style> - +#illu1, #illu2{ + width: 80px; + height: 35px; +} #btnDay{ float:left; - margin: 2px 5px; + margin:0px 5px; background-color: #ffffff; border: 2px dashed #FF6D6A; - + bottom : 0%; } + #btnDay:hover{ + background-color: #FF6D6A + } #div0 { text-align: right; @@ -224,7 +236,7 @@ export default { } .btn { - position: relative; + bottom: 0; /*background-color: #FF6D6A;*/ } @@ -239,9 +251,11 @@ export default { border: solid 3px #3d3b3b; border-radius: 7px; color: #ffffff; + bottom: 0%; } #div_tour { height: auto; + margin: 2px 0px } </style> diff --git a/src/views/MyPage.vue b/src/views/MyPage.vue index 6aca1ccf398f509d89f7af6a14335dce499db768..fab69dc3b43e6932f13ad151aefe77c514c49131 100644 --- a/src/views/MyPage.vue +++ b/src/views/MyPage.vue @@ -95,6 +95,9 @@ export default { *{ color:#000000; } + .btn{ + padding: 1px 1px; + } #mypage { margin: 15% auto auto auto } diff --git a/src/views/SharePlan.vue b/src/views/SharePlan.vue index 1eb2f8d32587633350d9c241f70fa181b1680bc5..d931e06b03f212be849c794ece1f518dd5b31103 100644 --- a/src/views/SharePlan.vue +++ b/src/views/SharePlan.vue @@ -92,18 +92,21 @@ export default { <style> + .btn { + background: #ffffff + } h1 { size: 70px; margin: 50px; } - #illu { + #illu, .btn{ width: 80px; height: 35px; } .example { - margin: 15% auto auto auto + margin: 10% auto auto auto } .example input { diff --git a/src/views/SignUp.vue b/src/views/SignUp.vue index fa194736862ea08894564249eab3e684fdeeec51..41a134246e30657790081d68e9cd33c18d2cb48f 100644 --- a/src/views/SignUp.vue +++ b/src/views/SignUp.vue @@ -1,6 +1,6 @@ <template> <div id="LogIn"> - <p>Sign Up</p> + <h2 class="text-info">Sign Up</h2> <input type="email" required v-model="user_email" placeholder="EMAIL"><br><br> <input required v-model='user_id' placeholder="ID"> <button v-on:click="overlap()">중복확인</button> @@ -12,11 +12,11 @@ <input type="radio" v-model="user_gender" name="user_gender" value="0">Female<br><br> <input required v-model='user_phone' placeholder="PHONE"><br><br> <button v-on:click="register()" id="bu1"> - 가입 + <img id="illu" src="../assets/adding.png"> </button> <br> <router-link to='/'> - <img id="illu" src="../assets/gotoHome.png"> + <img id="illu" src="../assets/gotoHome.png"> </router-link> </div> </template> @@ -108,13 +108,17 @@ export default { } </script> <style> - #illu, #illu1, #bu1 { + #illu, #illu1 { width: 80px; height: 35px; } #bu1 { - background-color: #ffffff + background-color: #ffffff; + border : none; + width: 80px; + height: 35px; + margin: 3px 0px; } #LogIn {