This commit is contained in:
Thomas
2020-08-01 19:56:20 +02:00
parent 1990ff0f04
commit 0e803cb17e
32 changed files with 55 additions and 26 deletions

View File

@@ -1,6 +1,6 @@
FROM alpine:edge FROM alpine:edge
MAINTAINER gltron MAINTAINER gltron
RUN apk --update add openjdk8-jre RUN apk --update add openjdk8-jre
COPY cloud32.jar /home/cloud32.jar COPY voozik.jar /home/voozik.jar
CMD ["java","-jar","/home/cloud32.jar"] CMD ["java","-jar","/home/voozik.jar"]
EXPOSE 8181 EXPOSE 8181

View File

@@ -1 +1 @@
docker build . -t thomsb/c32java docker build . -t gltron/voozik

View File

@@ -3,6 +3,6 @@ npm run build
cp -r dist/* ../server/src/main/resources/public cp -r dist/* ../server/src/main/resources/public
cd ../server cd ../server
mvn package mvn package
cp target/cloud32-0.0.1-SNAPSHOT.jar ../cloud32.jar cp target/voozik-0.0.1-SNAPSHOT.jar ../voozik.jar
rm -rf ../client/dist rm -rf ../client/dist
rm -rf src/main/resources/public/* rm -rf src/main/resources/public/*

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 799 B

After

Width:  |  Height:  |  Size: 748 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@@ -1,3 +1,21 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> <?xml version="1.0" standalone="no"?>
<path d="M8.00251 14.9297L0 1.07422H6.14651L8.00251 4.27503L9.84583 1.07422H16L8.00251 14.9297Z" fill="black"/> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="332.000000pt" height="332.000000pt" viewBox="0 0 332.000000 332.000000"
preserveAspectRatio="xMidYMid meet">
<metadata>
Created by potrace 1.11, written by Peter Selinger 2001-2013
</metadata>
<g transform="translate(0.000000,332.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M1477 3309 c-380 -44 -716 -207 -988 -478 -229 -230 -375 -492 -447
-806 -189 -821 288 -1670 1087 -1935 505 -168 1019 -98 1462 198 399 267 662
705 719 1197 69 603 -220 1216 -735 1559 -314 209 -725 309 -1098 265z m-3
-1261 c49 -277 95 -543 104 -591 8 -48 19 -84 23 -80 6 6 322 700 356 781 4 9
-29 12 -146 12 -83 0 -151 3 -151 8 0 4 25 87 57 185 l57 177 504 0 c399 0
503 -3 500 -12 -3 -7 -141 -372 -308 -810 l-304 -798 -208 0 -208 0 0 -27 c0
-27 35 -320 45 -375 l5 -28 -360 0 -360 0 -5 22 c-12 53 -395 2014 -395 2025
0 10 77 13 353 13 l353 0 88 -502z"/>
</g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -21,6 +21,7 @@ if (process.env.NODE_ENV === 'production') {
}, },
updated () { updated () {
console.log('New content is available; please refresh.') console.log('New content is available; please refresh.')
window.location.reload(true)
}, },
offline () { offline () {
console.log('No internet connection found. App is running in offline mode.') console.log('No internet connection found. App is running in offline mode.')

12
client/vue.config.js Normal file
View File

@@ -0,0 +1,12 @@
module.exports = {
pwa: {
name: 'Oozik',
themeColor: '#26a8a2',
msTileColor: '#26a8a2',
appleMobileWebAppCapable: 'yes',
appleMobileWebAppStatusBarStyle: 'black',
workboxOptions: {
skipWaiting: true
}
}
}

View File

@@ -1,10 +1,8 @@
version: '3' version: '3'
services: services:
cloud32: cloud32:
image: gltron/c32java image: gltron/voozik
container_name: cloud32 container_name: voozik
ports: ports:
- 8004:8181 - 8005:8181
volumes:
- /data/c32_data/:/data
restart: unless-stopped restart: unless-stopped

View File

@@ -9,10 +9,10 @@
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>gltronic</groupId> <groupId>gltronic</groupId>
<artifactId>oozik</artifactId> <artifactId>voozik</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>oozik</name> <name>voozik</name>
<description>oozik signaling server</description> <description>voozik signaling server</description>
<properties> <properties>
<java.version>11</java.version> <java.version>11</java.version>

View File

@@ -1,4 +1,4 @@
package gltronic.oozik; package gltronic.voozik;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -6,12 +6,12 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.PropertySource;
@SpringBootApplication @SpringBootApplication
@ComponentScan(basePackages = "gltronic.oozik") @ComponentScan(basePackages = "gltronic.voozik")
@PropertySource("classpath:application.properties") @PropertySource("classpath:application.properties")
public class OozikApplication { public class VoozikApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(OozikApplication.class, args); SpringApplication.run(VoozikApplication.class, args);
} }
} }

View File

@@ -1,4 +1,4 @@
package gltronic.oozik.business; package gltronic.voozik.business;
import java.io.IOException; import java.io.IOException;

View File

@@ -1,4 +1,4 @@
package gltronic.oozik.business; package gltronic.voozik.business;
import java.io.IOException; import java.io.IOException;
import java.util.Random; import java.util.Random;
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.WebSocketSession;
import gltronic.oozik.model.BiMap; import gltronic.voozik.model.BiMap;
@Service @Service
public class RoomManager implements IRoomManager{ public class RoomManager implements IRoomManager{

View File

@@ -1,4 +1,4 @@
package gltronic.oozik.model; package gltronic.voozik.model;
import java.util.HashMap; import java.util.HashMap;

View File

@@ -1,4 +1,4 @@
package gltronic.oozik.web; package gltronic.voozik.web;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
@@ -12,7 +12,7 @@ import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.handler.TextWebSocketHandler; import org.springframework.web.socket.handler.TextWebSocketHandler;
import gltronic.oozik.business.IRoomManager; import gltronic.voozik.business.IRoomManager;
@Component @Component
public class SocketHandler extends TextWebSocketHandler { public class SocketHandler extends TextWebSocketHandler {

View File

@@ -1,4 +1,4 @@
package gltronic.oozik.web; package gltronic.voozik.web;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

View File

@@ -1,4 +1,4 @@
package gltronic.oozik; package gltronic.voozik;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;