Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/211125/add todolist create obok22 #21

Open
wants to merge 4 commits into
base: fix/211125-fix-add-profile-matchinginfo-riri
Choose a base branch
from
Open

Feature/211125/add todolist create obok22 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69d8938
house lobby
obok22 Nov 24, 2021
a26f825
todolist
obok22 Nov 25, 2021
16699e1
Merge branch 'fix/211125-fix-add-profile-matchinginfo-riri' into feat…
obok22 Nov 25, 2021
1460a69
fix: 투두리스트 추가 수정
RIANAEH Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 55 additions & 37 deletions src/components/common/Modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,29 @@
</div>
<div class="modal-card">
<table>
<thead>
<th>새로운 규칙 등록하기</th>
</thead>
<tbody>
<tr>
<th id="tableH">대분류</th>
</tr>
<tr>
<td>
<input v-model="message1">
</td>
</tr>
<tr>
<th>소분류</th>
<!-- <tr>
<th id="subtitle">번호</th>
</tr>
<tr>
<td>
<input v-model="message2">
</td>
</tr>
<td><input id="text" v-model="num"></td>
</tr> -->
<tr>
<th>내용</th>
<th id="subtitle">내용</th>
</tr>
<tr>
<td>
<textarea id="input_textarea" v-model="message3" rows="5"></textarea>
<textarea id="input_textarea" v-model="value" rows="10"></textarea>
</td>
</tr>
</tbody>
<footer class="footer_btn">
<div class="button-group">
<green-button class="new-button cancelB" @click="$emit('close-modal')">취소</green-button>
<green-button class="new-button registerB" @click="$emit('close-modal')">등록하기</green-button>
<green-button class="new-button registerB" @click="$emit('close-modal'); register">등록하기</green-button>
</div>
</footer>
</table>
Expand All @@ -43,31 +36,44 @@

<script>
import GreenButton from '../../components/green-button.vue'
// import axios from 'axios'

export default {
name: 'RuleModal',
components: {
GreenButton
},
// methods: {
// addRule() {
// if(this.message !== "") {
// var value = this.message && this.message.trim();
// this.$emit('addRule', value)
// this.clearInput();
// }
// },
// clearInput() {
// this.message = '';
// }
// },
data() {
return {
message1: '',
message2: '',
message3: '',
value: "",
// newRule: {
// houseid: "",
// userid: "",
// rule: "",
// upperNum: "",
// lowerNum: "",
// }
}
},
methods: {
register() {
this.$emit("value", this.value);

},
clearInput() {
this.value = '';
}
}


// if (this.message !== "") {
// var value = this.message && this.message.trim();
// console.log(this.message);
// this.$emit('register', value)
// this.clearInput();
// }


}
</script>

Expand All @@ -85,6 +91,7 @@ import GreenButton from '../../components/green-button.vue'
margin-left: 20px;
margin-right: 20px;
width: 70px;
cursor: pointer;
}
.registerB {
float: right;
Expand All @@ -94,9 +101,10 @@ table {
}
th {
background-color: #EABF3A;
font-family: a고딕14;
font-size: 15px;
font-family: a고딕16;
font-size: 20px;
border-bottom: 1.5px solid black;
text-align: center;
}
#tableH {
border-top: 1.5px solid black;
Expand All @@ -116,8 +124,17 @@ textarea {
background-color: #EABF3A;
border-bottom: 1px solid black;
}
#subtitle {
font-family: a고딕15;
font-size: 16px;
text-align: left;
}
#text {
font-family: a고딕14;
}
#input_textarea {
width: 285px;
font-family: a고딕14;
}
.content {
background: #EABF3A;
Expand All @@ -137,10 +154,11 @@ textarea {
}
.modal-card {
position: relative;
max-width: 310px;
min-height: 335px;
max-width: 300px;
/* min-height: 340px; */
min-height: 325px;
margin: auto;
margin-top: 60%;
margin-top: 70%;
padding-top: 30px;
background-color: white;
z-index: 10;
Expand Down
12 changes: 10 additions & 2 deletions src/components/common/Modal_2.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
</div>
<div class="modal-card">
<div class="mem_report">
<p id="report_content">soyoung 님이 작성한 평가는 삭제되지 않습니다.</p>
<p id="report_content">{{ username }} 님이 작성한 평가는 삭제되지 않습니다.</p>
<p id="report_content">신중하게 작성하셨나요?</p>
<p id="report_content">Yes 버튼을 누르면 평가를 완료합니다.</p>
</div>
<footer class="footer_btn">
<red-button class="white-button yesB" @click="$emit('close-modal')">Yes</red-button>
<red-button class="white-button yesB" @click="reportPage">Yes</red-button>
<red-button class="white-button cancelB" @click="$emit('close-modal')">Cancel</red-button>
</footer>
</div>
Expand All @@ -24,6 +24,14 @@
components: {
RedButton
},
props: {
username: String,
},
methods: {
reportPage() {
this.$router.push({ path: '/auth/house/report'})
}
}
// methods: {
// cancelBtn() {
// this.modal = false;
Expand Down
16 changes: 14 additions & 2 deletions src/components/layout/house-header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,22 @@
</template>

<script>
// import axios from 'axios'

export default {
name: 'househeader',
props: {
housename: String,
data() {
return {
housename: '',
}
},
created() {
// axios.get('http://10.14.4.42:8080/house/1')
// .then((res)=> {
// console.log('status code:', res.status);
// console.log('data:', res.data);
// this.housename = res.data.data.name;
// })
}
}
</script>
Expand Down
12 changes: 9 additions & 3 deletions src/components/lobby-explain.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
<p id="explanation" style="display: inline">{{housename}}</p>
<p style="display: inline"> House입니다.</p>
</div>
<p class="date">{{date}}</p>
<p class="date">{{ content }}</p>
<!--집 이미지-->
<img id="house_pic" src="../assets/house_pic.png" alt="house picture">
<p id="locate">{{ location }}</p>
</div>
</div>
</template>
Expand All @@ -26,12 +27,17 @@ export default {
props: {
Username: String,
housename: String,
date: String
}
content: String,
location: String
},
}
</script>

<style scoped>
#locate {
font-size: 12px;
margin-top: 0;
}
.explain_house {
padding-bottom: 3%;
text-align: left;
Expand Down
1 change: 1 addition & 0 deletions src/components/report_list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
</tbody>
</table>
</div>

</div>
</template>

Expand Down
53 changes: 26 additions & 27 deletions src/components/single-matelist.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,27 @@ export default {
params: { uid: this.uid }
});
},
ChatPage() {
//get으로 방 있는 지 확인 후에, 방 없으면 방만들기, 방 있으면 채팅방으로 이동
axios.get('http://192.168.0.118:5050/chattingRoom/exist', {
params: { senderUid: 3, receiverUid: 1}
})
.then((res) => {
console.log("data:", res.data);
if(res.data == true) { //방이 이미 존재하면
this.$router.push({ path: '/auth/chatting'})
}
else {
axios.post('http://192.168.0.118:5050/chat', { //방만들기
senderUid: "3",
receiverUid: "1"
})
.then((res) => {
console.log("data", res.data);
})
}
})
},
},
async ChatPage() {
const res = await axios.get(this.mainserve+ '/user/chattingRoom/exist', // 채팅방 유무 조회 요청
{
params: this.makeChattingRoom,
headers: { 'X-AUTH-TOKEN': localStorage.getItem('token')}
});

if(res.data.isExisted) this.$router.push({
name: "Chatting",
params: {otherid: this.uid, cid: res.data.cid}});
else {
const res = await axios.post(this.mainserve+ '/user/chattingRoom/make', // 채팅방 생성 요청
this.makeChattingRoom,
{ headers: { 'X-AUTH-TOKEN': localStorage.getItem('token')} });
this.$router.push({
name: "Chatting",
params: {otherid: this.uid, cid: res.data.chattingRoom.id}
});
}
},
},
};
</script>

Expand All @@ -63,16 +62,16 @@ export default {
min-width: 250px;
max-width: 400px;
height: 100%;
background: pink;
background: #E88827;
border-radius: 10px 10px 0 10px;
border: solid 2px rgb(235, 21, 57);
box-shadow: 5px 9px 0px rgb(235, 21, 57);
border: solid 2px #A05E17;
box-shadow: 5px 9px 0px #A05E17;
z-index: 100;
margin: 10px auto 25px;
}

.balloon-shadow:after {
border-top: 15px solid pink;
border-top: 15px solid #E88827;
border-left: 30px solid transparent;
border-right: 0px solid transparent;
border-bottom: 0px solid transparent;
Expand All @@ -85,7 +84,7 @@ export default {
}

.balloon-shadow:before {
border-top: 20px solid rgb(235, 21, 57);
border-top: 20px solid #A05E17;
border-left: 45px solid transparent;
border-right: 0px solid transparent;
border-bottom: 0px solid transparent;
Expand Down
Loading