norbipeti/ChatServer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed sending messages and CSS improvements

Browse source
This commit is contained in:
Norbi Peti 2016-08-01 10:17:21 +02:00
parent 8062fbee9e
commit d64b615020
7 changed files with 126 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/resources/log4j2.xml
View file

@ -10,7 +10,7 @@
</File> </File>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Root level="debug"> <Root level="info">
<AppenderRef ref="Console" /> <AppenderRef ref="Console" />
<AppenderRef ref="MyFile" /> <AppenderRef ref="MyFile" />
</Root> </Root>

13
pages/css/style.css
View file

@ -35,6 +35,7 @@ body {
#usercontent { #usercontent {
margin: auto; margin: auto;
width: 75%; width: 75%;
height: 100%;
} }
#msginput { #msginput {
@ -42,3 +43,15 @@ body {
height: 30px; height: 30px;
max-width: 100%; max-width: 100%;
} }
#channelmessages {
width: 100%;
height: -moz-calc(100% - 50px);
height: -webkit-calc(100% - 50px);
height: calc(100% - 50px);
}
html, body {
height: 100%;
margin: 0;
}

2
src/io/github/norbipeti/chat/server/IOHelper.java
View file

@ -81,7 +81,7 @@ public class IOHelper {
if (exchange.getRequestBody().available() == 0) if (exchange.getRequestBody().available() == 0)
return null; return null;
try { try {
String content = IOUtils.toString(exchange.getRequestBody(), StandardCharsets.ISO_8859_1); String content = IOUtils.toString(exchange.getRequestBody(), StandardCharsets.ISO_8859_1).trim();
JSONObject obj = new JSONObject(content); JSONObject obj = new JSONObject(content);
return obj; return obj;
} catch (Exception e) { } catch (Exception e) {

15
src/io/github/norbipeti/chat/server/Main.java
View file

@ -29,13 +29,14 @@ public class Main {
try { // rt.jar Javadoc: try { // rt.jar Javadoc:
// https://docs.oracle.com/javase/8/docs/jre/api/net/httpserver/spec/ // https://docs.oracle.com/javase/8/docs/jre/api/net/httpserver/spec/
// https://docs.oracle.com/javase/8/docs/api/ // https://docs.oracle.com/javase/8/docs/api/
LogManager.getLogger().log(Level.DEBUG, "Loading database..."); LogManager.getLogger().log(Level.INFO, "Loading database...");
try (DataProvider provider = new DataProvider()) { try (DataProvider provider = new DataProvider()) {
User user = new User(); User user = new User();
user.setName("asd"); user.setName("asd");
user.setEmail("test@test.com"); user.setEmail("test@test.com");
User user2 = new User(); User user2 = new User();
user2.setName("Teszt"); //TODO: http://www.journaldev.com/3524/spring-hibernate-integration-example-tutorial user2.setName("Teszt"); // TODO:
// http://www.journaldev.com/3524/spring-hibernate-integration-example-tutorial
user2.setEmail("test2@test.com"); user2.setEmail("test2@test.com");
user2.getContacts().add(user); user2.getContacts().add(user);
provider.save(user); provider.save(user);
@ -69,14 +70,14 @@ public class Main {
provider.save(user2); provider.save(user2);
User loggedinuser = new User(); User loggedinuser = new User();
loggedinuser.setName("NorbiPeti"); loggedinuser.setName("NorbiPeti");
loggedinuser.setSessionid("2ed6e2cd-33ad-416e-92c2-7365510b8b31"); loggedinuser.setSessionid("8b148304-5dd6-48dd-a1a3-c8e47bcfc44b");
loggedinuser.setEmail("sznp@asd.com"); loggedinuser.setEmail("sznp@asd.com");
convo.getUsers().add(loggedinuser); convo.getUsers().add(loggedinuser);
loggedinuser.getConversations().add(convo); loggedinuser.getConversations().add(convo);
provider.save(loggedinuser); provider.save(loggedinuser);
provider.save(convo); provider.save(convo);
} }
LogManager.getLogger().log(Level.DEBUG, "Starting webserver..."); LogManager.getLogger().log(Level.INFO, "Starting webserver...");
HttpServer server = HttpServer.create(new InetSocketAddress(InetAddress.getLocalHost(), 8080), 10); HttpServer server = HttpServer.create(new InetSocketAddress(InetAddress.getLocalHost(), 8080), 10);
Reflections rf = new Reflections( Reflections rf = new Reflections(
new ConfigurationBuilder().setUrls(ClasspathHelper.forClassLoader(Page.class.getClassLoader())) new ConfigurationBuilder().setUrls(ClasspathHelper.forClassLoader(Page.class.getClassLoader()))
@ -96,14 +97,14 @@ public class Main {
} }
} }
server.start(); server.start();
LogManager.getLogger().log(Level.DEBUG, "Ready... Press Enter to stop."); LogManager.getLogger().log(Level.INFO, "Ready... Press Enter to stop.");
System.in.read(); System.in.read();
LogManager.getLogger().log(Level.DEBUG, "Stopping..."); LogManager.getLogger().log(Level.INFO, "Stopping...");
server.stop(1); server.stop(1);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
LogManager.getLogger().log(Level.DEBUG, "Stopped"); LogManager.getLogger().log(Level.INFO, "Stopped");
} }
private static void addPage(HttpServer server, Page page) { private static void addPage(HttpServer server, Page page) {

7
src/io/github/norbipeti/chat/server/page/IndexPage.java
View file

@ -36,9 +36,10 @@ public class IndexPage extends Page {
userbox.html(userbox.html().replace("<username />", user.getName())); userbox.html(userbox.html().replace("<username />", user.getName()));
Element channelmessages = doc.getElementById("channelmessages"); Element channelmessages = doc.getElementById("channelmessages");
try (DataProvider provider = new DataProvider()) { try (DataProvider provider = new DataProvider()) {
LogManager.getLogger().log(Level.DEBUG, "Conversations: " + provider.getConversations().size()); LogManager.getLogger().log(Level.INFO, "Conversations: " + provider.getConversations().size());
Conversation convo = provider.getConversations().get(0); LogManager.getLogger().log(Level.INFO, "User conversations: " + user.getConversations().size());
LogManager.getLogger().log(Level.DEBUG, "Messages: " + convo.getMesssages().size()); Conversation convo = user.getConversations().iterator().next();
LogManager.getLogger().log(Level.INFO, "Messages: " + convo.getMesssages().size());
for (Message message : convo.getMesssages()) { for (Message message : convo.getMesssages()) {
Element msgelement = channelmessages.appendElement("div"); Element msgelement = channelmessages.appendElement("div");
Element header = msgelement.appendElement("p"); Element header = msgelement.appendElement("p");

1
src/io/github/norbipeti/chat/server/page/MessageAjaxPage.java
View file

@ -60,6 +60,7 @@ public class MessageAjaxPage extends Page {
msg.setSender(user); msg.setSender(user);
msg.setMessage(message); msg.setMessage(message);
msg.setTime(new Date()); msg.setTime(new Date());
msg.setConversation(conv);
provider.save(msg); provider.save(msg);
conv.getMesssages().add(msg); conv.getMesssages().add(msg);
provider.save(conv); provider.save(conv);

2
src/io/github/norbipeti/chat/server/page/Page.java
View file

@ -42,7 +42,7 @@ public abstract class Page implements HttpHandler {
str.print("</pre>"); str.print("</pre>");
IOHelper.SendResponse(500, baos.toString(StandardCharsets.ISO_8859_1), exchange); IOHelper.SendResponse(500, baos.toString(StandardCharsets.ISO_8859_1), exchange);
} catch (Exception e1) { } catch (Exception e1) {
e1.printStackTrace(); e1.printStackTrace(); //TODO: Message listener JS
} }
} }
} }