Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Phillip Kruger <[email protected]>
  • Loading branch information
@phillip-kruger
phillip-kruger committed Feb 15, 2024
1 parent f94b341 commit 561beb9
Show file tree
Hide file tree
Showing 5 changed files with 164 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .locker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
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.20-SNAPSHOT</version>
<version>3.0.21-SNAPSHOT</version>
<artifactId>mvnpm-locker</artifactId>
<packaging>pom</packaging>

Expand Down
150 changes: 150 additions & 0 deletions composites/codeblock.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.mvnpm.at.mvnpm</groupId>
<artifactId>codeblock</artifactId>
<version>latest</version>
<name>Code block</name>
<description>a Code block web component build with Code Mirror 6</description>
<url>https://github.com/quarkusio/webcomponents</url>

<organization>
<name>Red Hat</name>
<url>https://github.com/quarkusio/webcomponents</url>
</organization>

<scm>
<connection>https://github.com/quarkusio/webcomponents.git</connection>
<developerConnection>https://github.com/quarkusio/webcomponents.git</developerConnection>
<url>https://github.com/quarkusio/webcomponents</url>
</scm>
<issueManagement>
<url>https://github.com/quarkusio/webcomponents/issues</url>
</issueManagement>

<dependencies>

<dependency>
<groupId>org.mvnpm.at.quarkus-webcomponents</groupId>
<artifactId>codeblock</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>state</artifactId>
<version>6.4.0</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>view</artifactId>
<version>6.24.0</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>commands</artifactId>
<version>6.3.3</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lint</artifactId>
<version>6.5.0</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>autocomplete</artifactId>
<version>6.12.0</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-java</artifactId>
<version>6.0.1</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-javascript</artifactId>
<version>6.2.1</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-json</artifactId>
<version>6.0.1</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-yaml</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-sql</artifactId>
<version>6.5.5</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>lang-xml</artifactId>
<version>6.0.2</version>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>style-mod</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>w3c-keyname</artifactId>
<version>2.2.8</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.codemirror</groupId>
<artifactId>language</artifactId>
<version>6.10.1</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>common</artifactId>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>highlight</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>lr</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>crelt</artifactId>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>java</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>javascript</artifactId>
<version>1.4.13</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>json</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>yaml</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>xml</artifactId>
<version>1.0.4</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion pom.xml
View file
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.20-SNAPSHOT</version>
<version>3.0.21-SNAPSHOT</version>
<name>mvnpm</name>
<description>Maven on NPM</description>
<url>https://mvnpm.org/</url>
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/web/app/mvnpm-home.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,6 @@ export class MvnpmHome extends LitElement {
_findVersionsAndShowLatest(e){
const name = this._coordinates.name.trim();
if ((e.which == 13 || e.which == 0)){
window.history.pushState({/* State */},"", "/package/" + name);
this._showGA(name);
}
}
Expand Down Expand Up @@ -569,6 +568,8 @@ export class MvnpmHome extends LitElement {
this._coordinates.groupId = metadata.getElementsByTagName("groupId")[0].childNodes[0].nodeValue.substring(9);
this._coordinates.artifactId = metadata.getElementsByTagName("artifactId")[0].childNodes[0].nodeValue;

window.history.pushState({/* State */},"", "/package/" + this._coordinates.groupId + ":" + this._coordinates.artifactId);

var latestTags = metadata.getElementsByTagName("latest");
var versionTags = metadata.getElementsByTagName("version");

Expand Down
33 changes: 10 additions & 23 deletions src/main/resources/web/app/mvnpm-progress.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,37 +159,24 @@ export class MvnpmProgress extends LitElement {
}

private _renderMavenCentral() {
return html`<div class="maven-central">
${this._renderUploaded()}
${this._renderClosed()}
${this._renderReleasing()}
${this._renderReleased()}
</div>
`;
}

private _renderUploaded() {

let merged = [];
if (this._uploadedQueue && this._uploadedQueue.length > 0) {
return html`<vaadin-message-list class="maven-central-message-box" .items="${this._uploadedQueue}"></vaadin-message-list>`;
merged = merged.concat(this._uploadedQueue);
}
}

private _renderClosed() {
if (this._closedQueue && this._closedQueue.length > 0) {
return html`<vaadin-message-list class="maven-central-message-box" .items="${this._closedQueue}"></vaadin-message-list>`;
merged = merged.concat(this._closedQueue);
}
}

private _renderReleasing() {
if (this._releasingQueue && this._releasingQueue.length > 0) {
return html`<vaadin-message-list class="maven-central-message-box" .items="${this._releasingQueue}"></vaadin-message-list>`;
merged = merged.concat(this._releasingQueue);
}
}

private _renderReleased() {
if (this._releasedQueue && this._releasedQueue.length > 0) {
return html`<vaadin-message-list class="maven-central-message-box" .items="${this._releasedQueue}"></vaadin-message-list>`;
merged = merged.concat(this._releasedQueue);
}

return html`<div class="maven-central">
<vaadin-message-list class="maven-central-message-box" .items="${merged}"></vaadin-message-list>
</div>`;
}

private _addToQueue(queue: any[] | null, item: any, stagemessage: string, step: number) {
Expand Down

0 comments on commit 561beb9

Please sign in to comment.