Skip to content

Enhanced UI for better user experience #33

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
Masterroy1210 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enhanced UI for better user experience #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
"node": "0.10.x",
"npm": "1.2.x"
}
}
}
11 changes: 7 additions & 4 deletions www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
<link rel="stylesheet" href="styles/main.css">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="icon" href="favicon.ico" type="image/x-icon">

</head>
<body>
<div class="wrapper">
<div class="banner">
<h1>HiChat :)</h1>
<h1 id="LOGO"><img src="https://img.icons8.com/color/48/000000/weixing.png"/> HiChat:)</h1>
<span id="status"></span>
</div>
<div id="historyMsg">
Expand All @@ -24,21 +25,23 @@ <h1>HiChat :)</h1>
<input id="colorStyle" type="color" placeHolder='#000' title="font color" />
<input id="emoji" type="button" value="emoji" title="emoji" />
<label for="sendImage" class="imageLable">
<input type="button" value="image" />
<input type="button" value="image" id="image" />
<input id="sendImage" type="file" value="image"/>
</label>
<input id="clearBtn" type="button" value="clear" title="clear screen" />
</div>
<textarea id="messageInput" placeHolder="enter to send"></textarea>
<textarea id="messageInput" placeholder="ENTER MSG HERE"></textarea>
<input id="sendBtn" type="button" value="SEND">
<div id="emojiWrapper">
</div>
</div>
</div>
<div id="loginWrapper">
<a href="https://icons8.com/icon/61333/salute"></a>
<img src="https://img.icons8.com/color/48/000000/user.png"/ id="welcome">
<p id="info">connecting to server...</p>
<div id="nickWrapper">
<input type="text" placeHolder="nickname" id="nicknameInput" />
<input type="text" id="nicknameInput" />
<input type="button" value="OK" id="loginBtn" />
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions www/scripts/hichat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ HiChat.prototype = {
if (e.keyCode == 13 && msg.trim().length != 0) {
messageInput.value = '';
that.socket.emit('postMsg', msg, color);
that._displayNewMsg('me', msg, color);
that._displayNewMsg('me', msg, 'White');
};
}, false);
document.getElementById('clearBtn').addEventListener('click', function() {
Expand Down Expand Up @@ -144,7 +144,7 @@ HiChat.prototype = {
date = new Date().toTimeString().substr(0, 8),
//determine whether the msg contains emoji
msg = this._showEmoji(msg);
msgToDisplay.style.color = color || '#000';
msgToDisplay.style.color = color || '#FFDC00';
msgToDisplay.innerHTML = user + '<span class="timespan">(' + date + '): </span>' + msg;
container.appendChild(msgToDisplay);
container.scrollTop = container.scrollHeight;
Expand Down
120 changes: 110 additions & 10 deletions www/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,81 @@ html, body {
background-color: #ddd;
}
#loginWrapper {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
background-color: rgba(5, 5, 5, .6);
position: absolute;
top: 15%;
right:25%;
bottom: 10%;
left: 33%;
width: 450px;
height:200px;
border:3px solid;
border-style:solid;
border-color:#AAAAAA ;
background-color: rgba(12, 10, 10, 0.377);
text-align: center;
color: #fff;
display: block;
padding-top: 200px;
padding-top: 150px;
justify-content: center;
}
#loginWrapper:hover{
background-color:rgba(20, 20, 20, 0.603) ;
}

#welcome{

height:80px;
width: 80px;



}

#nicknameInput{

width: 350x;
height:25px;
font-size:medium;

background: black;
padding:4px;
color:#fff;
border-color:lightblue;
font-family:monospace;
text-transform: uppercase;
}
#loginBtn{
height:35px;
width: 45px;
font-size:medium;
background: black;
padding:4px;
color:#fff;
border-color:lightblue;
font-family:monospace;
margin-left:3%;

}
#nickWrapper {
display: none;
margin:4%;

}
#info{
font-weight:900;
font-family: monospace;
text-transform: uppercase;
text-decoration-style: double;

}
#info:hover{
scale: 10%;
}
#LOGO{
font-family: monospace;
text-transform: uppercase;
text-shadow: #fff;

}
.banner {
height: 80px;
Expand All @@ -37,25 +99,30 @@ html, body {
height: 100px;
margin: 5px 0px;
position: relative;

}
#historyMsg {
height: 400px;
background-color: #fff;
background-color:rgba(10, 9, 9, 0.952);
overflow: auto;
padding: 2px;
color: white;
font-family: monospace;
}
#historyMsg img {
max-width: 99%;
}
.timespan {
color: #ddd;
color:yellow;
}
.items {
height: 30px;
color:red ;
}
#colorStyle {
width: 50px;
border: none;

padding: 0;
}
/*custom the file input*/
Expand All @@ -69,6 +136,11 @@ html, body {
left: 0;
opacity: 0;
overflow: hidden;
color:#fff;
border-color:lightblue;
font-family:monospace;
font-size:medium;
background: black;
}
/*end custom file input*/

Expand All @@ -78,18 +150,45 @@ html, body {
height: 90px;
max-height: 90px;
float:left;
background: black;
color:#fff;
border-color:lightblue;
font-family:monospace;
font-size:x-large;

}
#emoji{
background-color: black;
color:white;
}
#image{
background-color: black;;
color:white;
}
#clearBtn{
background-color:black;
color: white;
}
#status{
font-family: monospace;;
color:white;
margin-top:3%;
}
#sendBtn {
width: 50px;
height: 96px;
float: right;
border:1px solid white;
background-color:black ;
color:white;
}
#emojiWrapper {
display: none;
width: 500px;
bottom: 105px;
position: absolute;
background-color: #aaa;
background-color:black;
color:white;
box-shadow: 0 0 10px #555;
}
#emojiWrapper img {
Expand All @@ -103,6 +202,7 @@ html, body {
}
.emoji{
display: inline;

}
footer {
text-align: center;
Expand Down