Skip to content

채팅 기능 #14

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

Open
ZZANZU wants to merge 7 commits into
base: master
Choose a base branch
from
Open

채팅 기능 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb410e2
Add chat room screen
ZZANZU Dec 3, 2018
b423b7d
Merge branch '181124' of https://github.com/ZzanzuCodeFactory/Intervi…
ZZANZU Dec 3, 2018
f724219
Add chat room function
ZZANZU Dec 3, 2018
4d70926
Add additional functions
ZZANZU Dec 3, 2018
692939b
Fixed errors on opening chat room window.
ZZANZU Dec 5, 2018
07c0f9f
Merge pull request #1 from ZzanzuCodeFactory/181124
ZZANZU Dec 5, 2018
a11877f
Merge branch 'master' into master
ZZANZU Dec 6, 2018
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
7 changes: 7 additions & 0 deletions static/css/business-casual.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,13 @@ img {
width: 300px;
}

label {
margin-bottom: 10px;
}

select {
margin-bottom: 10px;
}

#pageselect {
list-style: none;
Expand Down
11 changes: 9 additions & 2 deletions static/js/matching.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ var locationJsonArr = [
];

// 매칭 사용자 등록
var register_container = document.getElementById('register_container');
var inputUserName = document.getElementById('user_name_set')
var selectCompanySet = document.getElementById('sel_company_set');
var selectLocationSet = document.getElementById('sel_location_set');
Expand All @@ -53,7 +54,8 @@ var inputUserInfo = document.getElementById('user_info_set')
var selectCompany = document.getElementById('sel_company');
var selectMajor = document.getElementById('sel_major');
var selectLocation = document.getElementById('sel_location');
var user_card = document.getElementById('user_card')
var user_card = document.getElementById('user_card');


// TODO : JSON 파싱해서 select의 option으로 넣어주기
for(var i = 0; i < companyJsonArr.length; i++) {
Expand Down Expand Up @@ -98,6 +100,7 @@ function setMemeber() {
data: myJSON,
success: function (data) {
//박스 사라짐
register_container.style.display = 'none';
alert("사용자 등록을 완료했습니다. 이제 원하는 스터디원을 검색해보세요!")
console.log("사용자 등록 성공");
},
Expand Down Expand Up @@ -150,7 +153,7 @@ function matchingSearch() {
// 요청(PUT) 결과를 카드뷰로 그리기
var myHTML = '';
for(i = 0; i < userJsonArr.length; i++) {
myHTML += '<div class="card">' +
myHTML += '<div class="card" onclick=startChat()>' +
'<img src= "https://www.w3schools.com/howto/img_avatar.png">' +
'<div class="container2">' +
'<h4><b>' + userJsonArr[i]['username'] + '</b></h4>' +
Expand All @@ -160,4 +163,8 @@ function matchingSearch() {
'</div>';
}
user_card.innerHTML = myHTML;
}

function startChat() {
window.open("http://13.209.186.36:3000/", '_blank', 'resizable=yes, width=450, height=600');
}
117 changes: 59 additions & 58 deletions static/templates/matching.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
</head>

<body>


<a div class="brand" href="{{ url_for("index") }}">InterviewNet</a>
<div class="address-bar">소프트웨어 팀프로젝트 1팀</div>

Expand Down Expand Up @@ -79,75 +77,79 @@
<!-- /.container -->
</nav>


<!--매칭 사용자 등록-->
<div class="container">
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<p class="text-center">다른 사용자에게 나를 알리세요!</p>
<hr>
<!--매칭 사용자 등록-->
<div class="container" id="register_container">
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<p class="text-center">다른 사용자에게 나를 알리세요!</p>
<hr>
</div>
<br>
<label>이름(로그인 기능 구현 전까지는 직접 입력)</label>
<br>
<input class="input-group-lg" type="text" id="user_name_set">
<br>
<br>
<label>희망 지역</label>
<select class="form-control col-lg-3" id="sel_location_set"><option>직종 선택</option></select>
<br>
<br>
<label>지원 기업</label>
<select class="form-control col-lg-3" id="sel_company_set"><option>기업 선택</option></select>
<br>
<label>직종</label>
<select class="form-control col-lg-3" id="sel_major_set"><option>직종 선택</option></select>
<br>
<label>한마디</label>
<br>
<input class="input-group-lg" type="text" id="user_info_set">
<br>
<br>
<button type="button" class="btn-group-lg btn-lg center-block" onclick="setMemeber()">사용자 등록</button>
</div>
<br>
<label>이름(로그인 기능 구현 전까지는 직접 입력)</label>
<br>
<input class="input-group-lg" type="text" id="user_name_set">
<br>
<br>
<label>희망 지역</label>
<select class="form-control col-lg-3" id="sel_location_set"><option>직종 선택</option></select>
<br>
<br>
<label>지원 기업</label>
<select class="form-control col-lg-3" id="sel_company_set"><option>기업 선택</option></select>
<br>
<label>직종</label>
<select class="form-control col-lg-3" id="sel_major_set"><option>직종 선택</option></select>
<br>
<label>한마디</label>
<br>
<input class="input-group-lg" type="text" id="user_info_set">
<br>
<br>
<button type="button" class="btn-group-lg btn-lg center-block" onclick="setMemeber()">사용자 등록</button>
</div>
</div>
</div>

<!--매칭 사용자 찾기-->
<div class="container">
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<p class="text-center">원하는 지역과 직종을 선택하고, 동일 직종 사용자를 찾아보세요!</p>
<hr>
<!--매칭 사용자 찾기-->
<div class="container">
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<p class="text-center">원하는 지역과 직종을 선택하고, 동일 직종 사용자를 찾아보세요!</p>
<hr>
</div>
<br>
<!--<button type="button-right" class="btn-group-lg btn-lg col-lg-3">등록</button>-->
<label>지원 기업</label>
<select class="form-control col-lg-3" id="sel_company"><option>기업 선택</option></select>
<br>
<label>직종</label>
<select class="form-control col-lg-3" id="sel_major"><option>직종 선택</option></select>
<br>
<label>스터디 희망 지역</label>
<select class="form-control col-lg-3" id="sel_location"><option>지역 선택</option></select>
<br>
<br>
<br>
<br>
<button type="button" class="btn-group-lg btn-lg center-block" onclick="matchingSearch()">매칭 찾기</button>
<div class="clearfix"></div>
</div>
<br>
<!--<button type="button-right" class="btn-group-lg btn-lg col-lg-3">등록</button>-->
<label>지원 기업</label>
<select class="form-control col-lg-3" id="sel_company"><option>기업 선택</option></select>
<br>
<label>직종</label>
<select class="form-control col-lg-3" id="sel_major"><option>직종 선택</option></select>
<br>
<label>스터디 희망 지역</label>
<select class="form-control col-lg-3" id="sel_location"><option>지역 선택</option></select>
<br>
<button type="button" class="btn-group-lg btn-lg center-block" onclick="matchingSearch()">매칭 찾기</button>
<div class="clearfix"></div>
</div>
</div>

<!--사용자 카드뷰-->
<div class="container">
<div class="row">
<div class="card_box" id="user_card">
<div class="clearfix"></div>
</div>
</div>
</div>
<!-- /.container -->
</div>
<!-- /.container -->

<footer>
<div class="container">
Expand All @@ -163,7 +165,6 @@
<!-- jQuery -->
<script src="{{ url_for('static', filename = 'js/jquery.js') }}"></script>


<!-- Bootstrap Core JavaScript -->
<link href="{{ url_for('static', filename = 'css/bootstrap.css') }}" rel="stylesheet">
<script src="{{ url_for('static', filename = 'js/matching.js') }}"></script>
Expand Down
6 changes: 1 addition & 5 deletions static/templates/mypage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,8 @@
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">마이페이지
<strong>구현하기</strong>
</h2>

<h2 class="intro-text text-center">마이페이지</h2>
<hr>
<p>마이페이지를~~~구현하하면 됩니다!!!</p>
<form role="form">
<div class="row">
<div class="form-group col-lg-4">
Expand Down