diff --git a/src/main/java/me/imsonmia/epqapi/config/SqlConfig.java b/src/main/java/me/imsonmia/epqapi/config/SqlConfig.java new file mode 100644 index 0000000..764fb85 --- /dev/null +++ b/src/main/java/me/imsonmia/epqapi/config/SqlConfig.java @@ -0,0 +1,4 @@ +package me.imsonmia.epqapi.config; + +public interface SqlConfig { +} diff --git a/src/main/java/me/imsonmia/epqapi/config/WebSocketConfig.java b/src/main/java/me/imsonmia/epqapi/config/WebSocketConfig.java index 64f5dd9..d464af9 100644 --- a/src/main/java/me/imsonmia/epqapi/config/WebSocketConfig.java +++ b/src/main/java/me/imsonmia/epqapi/config/WebSocketConfig.java @@ -17,5 +17,6 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { @Override public void registerStompEndpoints(StompEndpointRegistry registry) { registry.addEndpoint("/ws").setAllowedOrigins("*"); + } } diff --git a/src/main/java/me/imsonmia/epqapi/model/Message.java b/src/main/java/me/imsonmia/epqapi/model/Message.java index f152f0b..47148b4 100644 --- a/src/main/java/me/imsonmia/epqapi/model/Message.java +++ b/src/main/java/me/imsonmia/epqapi/model/Message.java @@ -13,6 +13,7 @@ public class Message { @GeneratedValue(strategy = GenerationType.AUTO) @Id Long id; + MessageType type; String fromUserId; String toUserId; String content; @@ -20,6 +21,9 @@ public class Message { public Long getId() { return id; } + public MessageType getType() { + return type; + } public String getFromUserId() { return fromUserId; } @@ -44,15 +48,20 @@ public class Message { public void setTimeMillis(Long timeMillis) { this.timeMillis = timeMillis; } + public void setType(MessageType type) { + this.type = type; + } public Message() { } public Message(Long id, + MessageType type, String fromUserId, String toUserId, String content, Long timeMillis) { this.id = id; + this.type = type; this.fromUserId = fromUserId; this.toUserId = toUserId; this.content = content; diff --git a/src/main/java/me/imsonmia/epqapi/model/MessageType.java b/src/main/java/me/imsonmia/epqapi/model/MessageType.java new file mode 100644 index 0000000..bc8cfe0 --- /dev/null +++ b/src/main/java/me/imsonmia/epqapi/model/MessageType.java @@ -0,0 +1,8 @@ +package me.imsonmia.epqapi.model; + +public enum MessageType { + MESSAGE, + SYSTEM, + HELLO, + DATA, +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0ead42d..cff589b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ -spring.datasource.url=jdbc:mariadb://127.0.0.1:3306/test +spring.datasource.url=jdbc:mariadb://127.0.0.1:3306/test?useUnicode=true&characterEncoding=UTF-8 spring.datasource.username=dbuser spring.datasource.password=dbpasswd spring.datasource.driver-class-name=org.mariadb.jdbc.Driver -spring.jpa.show-sql: false -spring.jpa.hibernate.ddl-auto=create-drop \ No newline at end of file +spring.jpa.show-sql: true +spring.jpa.hibernate.ddl-auto=create-drop diff --git a/src/main/resources/static/asset-manifest.json b/src/main/resources/static/asset-manifest.json index 50dc02e..bc62b34 100644 --- a/src/main/resources/static/asset-manifest.json +++ b/src/main/resources/static/asset-manifest.json @@ -1,13 +1,13 @@ { "files": { - "main.css": "/static/css/main.e6c13ad2.css", - "main.js": "/static/js/main.a029d655.js", + "main.css": "/static/css/main.7bfab64e.css", + "main.js": "/static/js/main.837b405a.js", "index.html": "/index.html", - "main.e6c13ad2.css.map": "/static/css/main.e6c13ad2.css.map", - "main.a029d655.js.map": "/static/js/main.a029d655.js.map" + "main.7bfab64e.css.map": "/static/css/main.7bfab64e.css.map", + "main.837b405a.js.map": "/static/js/main.837b405a.js.map" }, "entrypoints": [ - "static/css/main.e6c13ad2.css", - "static/js/main.a029d655.js" + "static/css/main.7bfab64e.css", + "static/js/main.837b405a.js" ] } \ No newline at end of file diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index 765a116..98fd3ae 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -1 +1 @@ -IRC application instance
\ No newline at end of file +IRC application instance
\ No newline at end of file diff --git a/src/main/resources/static/static/css/main.7bfab64e.css b/src/main/resources/static/static/css/main.7bfab64e.css new file mode 100644 index 0000000..3db283a --- /dev/null +++ b/src/main/resources/static/static/css/main.7bfab64e.css @@ -0,0 +1,2 @@ +body{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;margin:0}code{font-family:source-code-pro,Menlo,Monaco,Consolas,Courier New,monospace}.chat-inner-wrapper{display:flex;flex-direction:column-reverse;height:500px;overflow-wrap:normal;overflow-y:auto}.entry-box{margin-top:5px}.chat{min-height:80vh;position:relative}body{background-color:#000;color:#0f3}.App{margin:3%;min-height:100vh} +/*# sourceMappingURL=main.7bfab64e.css.map*/ \ No newline at end of file diff --git a/src/main/resources/static/static/css/main.7bfab64e.css.map b/src/main/resources/static/static/css/main.7bfab64e.css.map new file mode 100644 index 0000000..899b3ee --- /dev/null +++ b/src/main/resources/static/static/css/main.7bfab64e.css.map @@ -0,0 +1 @@ +{"version":3,"file":"static/css/main.7bfab64e.css","mappings":"AAAA,KAKE,kCAAmC,CACnC,iCAAkC,CAJlC,mIAEY,CAHZ,QAMF,CAEA,KACE,uEAEF,CCZA,oBAII,YAAa,CACb,6BAA8B,CAJ9B,YAAa,CAEb,oBAAqB,CADrB,eAKJ,CACA,WACI,cACJ,CACA,MACI,eAAgB,CAChB,iBACJ,CCdA,KACE,qBAAuB,CACvB,UACF,CACA,KACE,SAAU,CACV,gBACF","sources":["index.css","Chat/Chat.css","App.css"],"sourcesContent":["body {\n margin: 0;\n font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',\n 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',\n sans-serif;\n -webkit-font-smoothing: antialiased;\n -moz-osx-font-smoothing: grayscale;\n}\n\ncode {\n font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',\n monospace;\n}\n",".chat-inner-wrapper {\n height: 500px;\n overflow-y: auto;\n overflow-wrap: normal;\n display: flex;\n flex-direction: column-reverse;\n\n}\n.entry-box {\n margin-top: 5px;\n}\n.chat {\n min-height: 80vh;\n position: relative;\n}","body {\n background-color: black;\n color: #00FF33;\n}\n.App {\n margin: 3%;\n min-height: 100vh;\n}"],"names":[],"sourceRoot":""} \ No newline at end of file diff --git a/src/main/resources/static/static/css/main.e6c13ad2.css b/src/main/resources/static/static/css/main.e6c13ad2.css deleted file mode 100644 index 50410fa..0000000 --- a/src/main/resources/static/static/css/main.e6c13ad2.css +++ /dev/null @@ -1,2 +0,0 @@ -body{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;margin:0}code{font-family:source-code-pro,Menlo,Monaco,Consolas,Courier New,monospace} -/*# sourceMappingURL=main.e6c13ad2.css.map*/ \ No newline at end of file diff --git a/src/main/resources/static/static/css/main.e6c13ad2.css.map b/src/main/resources/static/static/css/main.e6c13ad2.css.map deleted file mode 100644 index 5c4dfb9..0000000 --- a/src/main/resources/static/static/css/main.e6c13ad2.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"static/css/main.e6c13ad2.css","mappings":"AAAA,KAKE,kCAAmC,CACnC,iCAAkC,CAJlC,mIAEY,CAHZ,QAMF,CAEA,KACE,uEAEF","sources":["index.css"],"sourcesContent":["body {\n margin: 0;\n font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',\n 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',\n sans-serif;\n -webkit-font-smoothing: antialiased;\n -moz-osx-font-smoothing: grayscale;\n}\n\ncode {\n font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',\n monospace;\n}\n"],"names":[],"sourceRoot":""} \ No newline at end of file diff --git a/src/main/resources/static/static/js/main.a029d655.js b/src/main/resources/static/static/js/main.837b405a.js similarity index 85% rename from src/main/resources/static/static/js/main.a029d655.js rename to src/main/resources/static/static/js/main.837b405a.js index 81632e6..f5aeabb 100644 --- a/src/main/resources/static/static/js/main.a029d655.js +++ b/src/main/resources/static/static/js/main.837b405a.js @@ -1,3 +1,3 @@ -/*! For license information please see main.a029d655.js.LICENSE.txt */ -(()=>{"use strict";var e={71:(e,t,n)=>{var r=n(791);function a(e){for(var t="https://reactjs.org/docs/error-decoder.html?invariant="+e,n=1;n