diff --git a/Dockerfile b/Dockerfile index e22c248..08abaee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:edge MAINTAINER gltron RUN apk --update add openjdk8-jre -COPY cloud32.jar /home/cloud32.jar -CMD ["java","-jar","/home/cloud32.jar"] +COPY voozik.jar /home/voozik.jar +CMD ["java","-jar","/home/voozik.jar"] EXPOSE 8181 \ No newline at end of file diff --git a/buildDocker.sh b/buildDocker.sh index 142e14f..1035a52 100644 --- a/buildDocker.sh +++ b/buildDocker.sh @@ -1 +1 @@ -docker build . -t thomsb/c32java \ No newline at end of file +docker build . -t gltron/voozik \ No newline at end of file diff --git a/buildJar.sh b/buildJar.sh index 85786eb..b591ad9 100644 --- a/buildJar.sh +++ b/buildJar.sh @@ -3,6 +3,6 @@ npm run build cp -r dist/* ../server/src/main/resources/public cd ../server 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 src/main/resources/public/* \ No newline at end of file diff --git a/client/public/favicon.ico b/client/public/favicon.ico index df36fcf..fe3e5d9 100644 Binary files a/client/public/favicon.ico and b/client/public/favicon.ico differ diff --git a/client/public/img/icons/android-chrome-144x144.png b/client/public/img/icons/android-chrome-144x144.png new file mode 100644 index 0000000..98126f3 Binary files /dev/null and b/client/public/img/icons/android-chrome-144x144.png differ diff --git a/client/public/img/icons/android-chrome-192x192.png b/client/public/img/icons/android-chrome-192x192.png index b02aa64..e455a64 100644 Binary files a/client/public/img/icons/android-chrome-192x192.png and b/client/public/img/icons/android-chrome-192x192.png differ diff --git a/client/public/img/icons/android-chrome-256x256.png b/client/public/img/icons/android-chrome-256x256.png new file mode 100644 index 0000000..86f31cd Binary files /dev/null and b/client/public/img/icons/android-chrome-256x256.png differ diff --git a/client/public/img/icons/android-chrome-36x36.png b/client/public/img/icons/android-chrome-36x36.png new file mode 100644 index 0000000..9a56193 Binary files /dev/null and b/client/public/img/icons/android-chrome-36x36.png differ diff --git a/client/public/img/icons/android-chrome-48x48.png b/client/public/img/icons/android-chrome-48x48.png new file mode 100644 index 0000000..f16c663 Binary files /dev/null and b/client/public/img/icons/android-chrome-48x48.png differ diff --git a/client/public/img/icons/android-chrome-512x512.png b/client/public/img/icons/android-chrome-512x512.png index 06088b0..5215a3e 100644 Binary files a/client/public/img/icons/android-chrome-512x512.png and b/client/public/img/icons/android-chrome-512x512.png differ diff --git a/client/public/img/icons/android-chrome-72x72.png b/client/public/img/icons/android-chrome-72x72.png new file mode 100644 index 0000000..ed3bf0b Binary files /dev/null and b/client/public/img/icons/android-chrome-72x72.png differ diff --git a/client/public/img/icons/android-chrome-96x96.png b/client/public/img/icons/android-chrome-96x96.png new file mode 100644 index 0000000..2674ede Binary files /dev/null and b/client/public/img/icons/android-chrome-96x96.png differ diff --git a/client/public/img/icons/android-chrome-maskable-192x192.png b/client/public/img/icons/android-chrome-maskable-192x192.png index 791e9c8..fd0f5c9 100644 Binary files a/client/public/img/icons/android-chrome-maskable-192x192.png and b/client/public/img/icons/android-chrome-maskable-192x192.png differ diff --git a/client/public/img/icons/android-chrome-maskable-512x512.png b/client/public/img/icons/android-chrome-maskable-512x512.png index 5f2098e..f7f1d89 100644 Binary files a/client/public/img/icons/android-chrome-maskable-512x512.png and b/client/public/img/icons/android-chrome-maskable-512x512.png differ diff --git a/client/public/img/icons/apple-touch-icon.png b/client/public/img/icons/apple-touch-icon.png index 03c0c5d..48691f1 100644 Binary files a/client/public/img/icons/apple-touch-icon.png and b/client/public/img/icons/apple-touch-icon.png differ diff --git a/client/public/img/icons/favicon-16x16.png b/client/public/img/icons/favicon-16x16.png index 42af009..7cd7b60 100644 Binary files a/client/public/img/icons/favicon-16x16.png and b/client/public/img/icons/favicon-16x16.png differ diff --git a/client/public/img/icons/favicon-32x32.png b/client/public/img/icons/favicon-32x32.png index 46ca04d..0085d49 100644 Binary files a/client/public/img/icons/favicon-32x32.png and b/client/public/img/icons/favicon-32x32.png differ diff --git a/client/public/img/icons/mstile-150x150.png b/client/public/img/icons/mstile-150x150.png index 3b37a43..2044f8d 100644 Binary files a/client/public/img/icons/mstile-150x150.png and b/client/public/img/icons/mstile-150x150.png differ diff --git a/client/public/img/icons/safari-pinned-tab.svg b/client/public/img/icons/safari-pinned-tab.svg index e44c0d5..314461b 100644 --- a/client/public/img/icons/safari-pinned-tab.svg +++ b/client/public/img/icons/safari-pinned-tab.svg @@ -1,3 +1,21 @@ - - + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + diff --git a/client/src/assets/logo.png b/client/src/assets/logo.png index f3d2503..fe9c65a 100644 Binary files a/client/src/assets/logo.png and b/client/src/assets/logo.png differ diff --git a/client/src/assets/logo_small.png b/client/src/assets/logo_small.png new file mode 100644 index 0000000..590eced Binary files /dev/null and b/client/src/assets/logo_small.png differ diff --git a/client/src/registerServiceWorker.js b/client/src/registerServiceWorker.js index 76cede0..b79acf1 100644 --- a/client/src/registerServiceWorker.js +++ b/client/src/registerServiceWorker.js @@ -21,6 +21,7 @@ if (process.env.NODE_ENV === 'production') { }, updated () { console.log('New content is available; please refresh.') + window.location.reload(true) }, offline () { console.log('No internet connection found. App is running in offline mode.') diff --git a/client/vue.config.js b/client/vue.config.js new file mode 100644 index 0000000..cde0c2e --- /dev/null +++ b/client/vue.config.js @@ -0,0 +1,12 @@ +module.exports = { + pwa: { + name: 'Oozik', + themeColor: '#26a8a2', + msTileColor: '#26a8a2', + appleMobileWebAppCapable: 'yes', + appleMobileWebAppStatusBarStyle: 'black', + workboxOptions: { + skipWaiting: true + } + } +} diff --git a/docker-compose.yml b/docker-compose.yml index c7a76bb..afe599f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,8 @@ version: '3' services: cloud32: - image: gltron/c32java - container_name: cloud32 + image: gltron/voozik + container_name: voozik ports: - - 8004:8181 - volumes: - - /data/c32_data/:/data + - 8005:8181 restart: unless-stopped \ No newline at end of file diff --git a/server/pom.xml b/server/pom.xml index 33f18a6..aa78430 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -9,10 +9,10 @@ gltronic - oozik + voozik 0.0.1-SNAPSHOT - oozik - oozik signaling server + voozik + voozik signaling server 11 diff --git a/server/src/main/java/gltronic/oozik/OozikApplication.java b/server/src/main/java/gltronic/voozik/VoozikApplication.java similarity index 69% rename from server/src/main/java/gltronic/oozik/OozikApplication.java rename to server/src/main/java/gltronic/voozik/VoozikApplication.java index 6339a02..1ac5103 100644 --- a/server/src/main/java/gltronic/oozik/OozikApplication.java +++ b/server/src/main/java/gltronic/voozik/VoozikApplication.java @@ -1,4 +1,4 @@ -package gltronic.oozik; +package gltronic.voozik; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -6,12 +6,12 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.PropertySource; @SpringBootApplication -@ComponentScan(basePackages = "gltronic.oozik") +@ComponentScan(basePackages = "gltronic.voozik") @PropertySource("classpath:application.properties") -public class OozikApplication { +public class VoozikApplication { public static void main(String[] args) { - SpringApplication.run(OozikApplication.class, args); + SpringApplication.run(VoozikApplication.class, args); } } diff --git a/server/src/main/java/gltronic/oozik/business/IRoomManager.java b/server/src/main/java/gltronic/voozik/business/IRoomManager.java similarity index 96% rename from server/src/main/java/gltronic/oozik/business/IRoomManager.java rename to server/src/main/java/gltronic/voozik/business/IRoomManager.java index 9555b75..11769e9 100644 --- a/server/src/main/java/gltronic/oozik/business/IRoomManager.java +++ b/server/src/main/java/gltronic/voozik/business/IRoomManager.java @@ -1,4 +1,4 @@ -package gltronic.oozik.business; +package gltronic.voozik.business; import java.io.IOException; diff --git a/server/src/main/java/gltronic/oozik/business/RoomManager.java b/server/src/main/java/gltronic/voozik/business/RoomManager.java similarity index 98% rename from server/src/main/java/gltronic/oozik/business/RoomManager.java rename to server/src/main/java/gltronic/voozik/business/RoomManager.java index 4ed0a44..fdd849b 100644 --- a/server/src/main/java/gltronic/oozik/business/RoomManager.java +++ b/server/src/main/java/gltronic/voozik/business/RoomManager.java @@ -1,4 +1,4 @@ -package gltronic.oozik.business; +package gltronic.voozik.business; import java.io.IOException; import java.util.Random; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; -import gltronic.oozik.model.BiMap; +import gltronic.voozik.model.BiMap; @Service public class RoomManager implements IRoomManager{ diff --git a/server/src/main/java/gltronic/oozik/model/BiMap.java b/server/src/main/java/gltronic/voozik/model/BiMap.java similarity index 96% rename from server/src/main/java/gltronic/oozik/model/BiMap.java rename to server/src/main/java/gltronic/voozik/model/BiMap.java index f45206b..a44403b 100644 --- a/server/src/main/java/gltronic/oozik/model/BiMap.java +++ b/server/src/main/java/gltronic/voozik/model/BiMap.java @@ -1,4 +1,4 @@ -package gltronic.oozik.model; +package gltronic.voozik.model; import java.util.HashMap; diff --git a/server/src/main/java/gltronic/oozik/web/SocketHandler.java b/server/src/main/java/gltronic/voozik/web/SocketHandler.java similarity index 96% rename from server/src/main/java/gltronic/oozik/web/SocketHandler.java rename to server/src/main/java/gltronic/voozik/web/SocketHandler.java index 7fc5c6b..3e886f5 100644 --- a/server/src/main/java/gltronic/oozik/web/SocketHandler.java +++ b/server/src/main/java/gltronic/voozik/web/SocketHandler.java @@ -1,4 +1,4 @@ -package gltronic.oozik.web; +package gltronic.voozik.web; import java.io.IOException; 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.handler.TextWebSocketHandler; -import gltronic.oozik.business.IRoomManager; +import gltronic.voozik.business.IRoomManager; @Component public class SocketHandler extends TextWebSocketHandler { diff --git a/server/src/main/java/gltronic/oozik/web/WebSocketConfiguration.java b/server/src/main/java/gltronic/voozik/web/WebSocketConfiguration.java similarity index 95% rename from server/src/main/java/gltronic/oozik/web/WebSocketConfiguration.java rename to server/src/main/java/gltronic/voozik/web/WebSocketConfiguration.java index ed40ea6..ea1bd62 100644 --- a/server/src/main/java/gltronic/oozik/web/WebSocketConfiguration.java +++ b/server/src/main/java/gltronic/voozik/web/WebSocketConfiguration.java @@ -1,4 +1,4 @@ -package gltronic.oozik.web; +package gltronic.voozik.web; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/server/src/test/java/gltronic/oozik/DemoApplicationTests.java b/server/src/test/java/gltronic/voozik/DemoApplicationTests.java similarity index 87% rename from server/src/test/java/gltronic/oozik/DemoApplicationTests.java rename to server/src/test/java/gltronic/voozik/DemoApplicationTests.java index f24373c..959f824 100644 --- a/server/src/test/java/gltronic/oozik/DemoApplicationTests.java +++ b/server/src/test/java/gltronic/voozik/DemoApplicationTests.java @@ -1,4 +1,4 @@ -package gltronic.oozik; +package gltronic.voozik; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;