Skip to content

Commit

Permalink
Merge pull request mvnpm#5579 from phillip-kruger/socket-keep-alive
Browse files Browse the repository at this point in the history
Keep ws alive
  • Loading branch information
phillip-kruger authored Mar 26, 2024
2 parents a9c5afc + e815e9b commit cb235fe
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 17 deletions.
14 changes: 6 additions & 8 deletions .locker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.mvnpm</groupId>
<version>3.0.29-SNAPSHOT</version>
<version>3.0.30-SNAPSHOT</version>
<artifactId>mvnpm-locker</artifactId>
<packaging>pom</packaging>

<!-- Locked dependencies (Update with 'mvn io.mvnpm:locker-maven-plugin:LATEST:lock -Dunlocked') -->

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -34,7 +32,7 @@
<dependency>
<groupId>org.mvnpm.at.mvnpm</groupId>
<artifactId>vaadin-webcomponents</artifactId>
<version>24.3.7</version>
<version>24.3.10</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -70,13 +68,13 @@
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>component-base</artifactId>
<version>24.3.7</version>
<version>24.3.10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>icon</artifactId>
<version>24.3.7</version>
<version>24.3.10</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -94,13 +92,13 @@
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>vaadin-lumo-styles</artifactId>
<version>24.3.7</version>
<version>24.3.10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>vaadin-themable-mixin</artifactId>
<version>24.3.7</version>
<version>24.3.10</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.mvnpm</groupId>
<artifactId>mvnpm</artifactId>
<version>3.0.29-SNAPSHOT</version>
<version>3.0.30-SNAPSHOT</version>
<name>mvnpm</name>
<description>Maven on NPM</description>
<url>https://mvnpm.org/</url>
Expand Down Expand Up @@ -52,8 +52,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.8.2</quarkus.platform.version>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>3.9.0</quarkus.platform.version>
<skipITs>true</skipITs>
<surefire-plugin.version>3.2.5</surefire-plugin.version>
<formatter.plugin.version>2.23.0</formatter.plugin.version>
Expand All @@ -64,7 +64,7 @@
<!-- UI Libs -->
<quarkus-web-bundler.version>1.3.1</quarkus-web-bundler.version>
<importmap.version>1.0.10</importmap.version>
<vaadin.version>24.3.7</vaadin.version>
<vaadin.version>24.3.10</vaadin.version>
<vaadin-router.version>1.7.5</vaadin-router.version>
<codeblock.version>1.0.6</codeblock.version>
<compare-versions.version>6.1.0</compare-versions.version>
Expand All @@ -90,11 +90,11 @@
<!-- To serve the maven files -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive</artifactId>
<artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>
<artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<!-- To create the pom.xml -->
<dependency>
Expand Down Expand Up @@ -128,7 +128,7 @@
<!-- To fetch the info from npm -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-jackson</artifactId>
<artifactId>quarkus-rest-client-jackson</artifactId>
</dependency>
<!-- To schedule an update check -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
copyright.year=2023
copyright.year=2024
quarkus.banner.path=asciiart.txt

quarkus.web-bundler.dependencies.node-modules=node_modules
Expand Down
Binary file added src/main/resources/web/app/blutter.woff
Binary file not shown.
10 changes: 10 additions & 0 deletions src/main/resources/web/app/mvnpm-nav.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ export class MvnpmNav extends LitElement {
const centralSyncStateChangeEvent = new CustomEvent('centralSyncStateChange', {detail: centralSyncItem});
document.dispatchEvent(centralSyncStateChangeEvent);
}
MvnpmNav.syncWebSocket.onclose = function (event) {
setTimeout(function () {
MvnpmNav.connectSync();
}, 100);
};
}

static connectLog() {
Expand All @@ -90,5 +95,10 @@ export class MvnpmNav extends LitElement {
const eventLogEntryEvent = new CustomEvent('eventLogEntryEvent', {detail: eventLogEntry});
document.dispatchEvent(eventLogEntryEvent);
}
MvnpmNav.logWebSocket.onclose = function (event) {
setTimeout(function () {
MvnpmNav.connectLog();
}, 100);
};
}
}
14 changes: 14 additions & 0 deletions src/main/resources/web/app/mvnpm.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
@font-face {
font-family: 'blutter';
font-style: normal;
font-weight: normal;
src: local('blutter'), url('blutter.woff') format('woff');
}

html, body {
margin: 0;
width:100vw;
Expand Down Expand Up @@ -64,6 +71,13 @@ header img{
height: 50px;
padding: 15px;
}

.banner {
display: flex;
align-items: center;
gap: 10px;
}

main {
width:100vw;
height: 100%;
Expand Down
5 changes: 4 additions & 1 deletion src/main/resources/web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@

<body>
<header>
<img src="/static/banner.png" alt="mvnpm"/>
<div class="banner" onclick="location.href='/';">
<img src="/static/logo.png" alt="mvnpm"/>
<h1 style="font-family:'blutter';font-weight:normal;font-size:48px">mvnpm</h1>
</div>
<mvnpm-nav></mvnpm-nav>
</header>

Expand Down
Binary file added src/main/resources/web/static/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit cb235fe

Please sign in to comment.