Skip to content

Commit

Permalink
Merge branch 'develop' into 'beta'
Browse files Browse the repository at this point in the history 
Develop

See merge request Griefed/ServerPackCreator!572
  • Loading branch information
@Griefed
Griefed committed Feb 11, 2024
2 parents a1ccb9f + 62d4fc1 commit 7682d1f
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
6 changes: 3 additions & 3 deletions serverpackcreator-api/src/jvmMain/resources/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,9 +527,9 @@ A short excerpt:
**Additionally, ej-Technologies has provided an open-source license for JProfiler and install4j for ServerPackCreator, which allows me to resolve performance bottlenecks, pin down memory leaks and understand threading issues, as well as generated fancy high-end installers.
Huge shoutout and thank you!**

| [JetBrains](https://www.jetbrains.com/) | [IntelliJ IDEA](https://www.jetbrains.com/idea/) | [WebStorm](https://www.jetbrains.com/webstorm/) | [YouTrack](https://www.jetbrains.com/youtrack/) | [JProfiler](https://www.ej-technologies.com/products/jprofiler/overview.html) | [install4j](https://www.ej-technologies.com/products/install4j/overview.html) |
|-------------------------------------------------------------|---------------------------------------------------------------------------------|---------------------------------------------------------------------------|---------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------|
| [![JetBrains](img/jb_beam.png)](https://www.jetbrains.com/) | [![IntelliJ IDEA](img/IntelliJ_IDEA_icon.png)](https://www.jetbrains.com/idea/) | [![WebStorm](img/WebStorm_icon.png)](https://www.jetbrains.com/webstorm/) | [![YouTrack](img/YouTrack_icon.png)](https://www.jetbrains.com/youtrack/) | [![JProfiler](img/jprofiler.webp)](https://www.ej-technologies.com/products/jprofiler/overview.html)<br>[![JProfiler](img/jprofiler_banner.webp)](https://www.ej-technologies.com/products/jprofiler/overview.html) | [![install4j](img/install4j_icon.webp)](https://www.ej-technologies.com/products/install4j/overview.html)<br>[![install4j](img/install4j.webp)](https://www.ej-technologies.com/products/install4j/overview.html) |
| [JetBrains](https://www.jetbrains.com/) | [IntelliJ IDEA](https://www.jetbrains.com/idea/) | [WebStorm](https://www.jetbrains.com/webstorm/) | [Writerside](https://www.jetbrains.com/writerside/) | [YouTrack](https://www.jetbrains.com/youtrack/) | [JProfiler](https://www.ej-technologies.com/products/jprofiler/overview.html) | [install4j](https://www.ej-technologies.com/products/install4j/overview.html) |
|-------------------------------------------------------------|---------------------------------------------------------------------------------|---------------------------------------------------------------------------|---------------------------------------------------------------------------------|---------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [![JetBrains](img/jb_beam.png)](https://www.jetbrains.com/) | [![IntelliJ IDEA](img/IntelliJ_IDEA_icon.png)](https://www.jetbrains.com/idea/) | [![WebStorm](img/WebStorm_icon.png)](https://www.jetbrains.com/webstorm/) | [![Writerside](img/Writerside_icon.png)](https://www.jetbrains.com/writerside/) | [![YouTrack](img/YouTrack_icon.png)](https://www.jetbrains.com/youtrack/) | [![JProfiler](img/jprofiler.webp)](https://www.ej-technologies.com/products/jprofiler/overview.html)<br>[![JProfiler](img/jprofiler_banner.webp)](https://www.ej-technologies.com/products/jprofiler/overview.html) | [![install4j](img/install4j_icon.webp)](https://www.ej-technologies.com/products/install4j/overview.html)<br>[![install4j](img/install4j.webp)](https://www.ej-technologies.com/products/install4j/overview.html) |

*Starting from version 6.x, ServerPackCreator will sport fancy new installers made possible by ej-technologies' install4j.*

Expand Down
12 changes: 8 additions & 4 deletions serverpackcreator-web-frontend/src/pages/ModPackDownload.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,18 @@
<q-card-section>
<q-item>
<q-item-section>
<q-item-label overline>
Download starting in {{ counter }}
<q-item-label overline v-if="canceled">
Download aborted...
</q-item-label>
<q-item-label overline v-else>
{{ counter === 0 ? 'Downloading...' : 'Download starting in ' + counter }}
</q-item-label>
<q-item-label>
<q-linear-progress :value="counter / 100 * 20" rounded class="q-mt-md" animation-speed="200"/>
</q-item-label>
</q-item-section>
<q-item-section side>
<q-btn round color="negative" icon="cancel" @click="this.count = false"/>
<q-btn round color="negative" icon="cancel" @click="this.count = false; this.canceled = true;"/>
</q-item-section>
</q-item>
</q-card-section>
Expand Down Expand Up @@ -153,6 +156,7 @@ export default defineComponent({
source: ref(''),
status: ref(''),
versionID: ref(''),
canceled: ref(false),
count,
counter
};
Expand Down Expand Up @@ -182,7 +186,7 @@ export default defineComponent({
this.counter -= 1;
this.countDownTimer()
}, 1000)
} else if (this.counter === 0 && this.count) {
} else if (this.counter === 0 && this.count && !this.canceled) {
this.count = false;
window.open(window.location.origin + this.buildDownloadUrl(this.$route.params.id.toString()));
}
Expand Down
12 changes: 8 additions & 4 deletions serverpackcreator-web-frontend/src/pages/ServerPackDownload.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,18 @@
<q-card-section>
<q-item>
<q-item-section>
<q-item-label overline>
Download starting in {{ counter }}
<q-item-label overline v-if="canceled">
Download aborted...
</q-item-label>
<q-item-label overline v-else>
{{ counter === 0 ? 'Downloading...' : 'Download starting in ' + counter }}
</q-item-label>
<q-item-label>
<q-linear-progress :value="counter / 100 * 20" rounded class="q-mt-md" animation-speed="200"/>
</q-item-label>
</q-item-section>
<q-item-section side>
<q-btn round color="negative" icon="cancel" @click="this.count = false"/>
<q-btn round color="negative" icon="cancel" @click="this.count = false; this.canceled = true;"/>
</q-item-section>
</q-item>
</q-card-section>
Expand Down Expand Up @@ -134,6 +137,7 @@ export default defineComponent({
confirmedWorking: ref(0),
dateCreated: ref(0),
sha256: ref(''),
canceled: ref(false),
count,
counter
};
Expand Down Expand Up @@ -162,7 +166,7 @@ export default defineComponent({
this.counter -= 1;
this.countDownTimer()
}, 1000)
} else if (this.counter === 0 && this.count) {
} else if (this.counter === 0 && this.count && !this.canceled) {
this.count = false;
window.open(window.location.origin + this.buildDownloadUrl(this.$route.params.id.toString()));
}
Expand Down
2 changes: 1 addition & 1 deletion serverpackcreator-web/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies {
testRuntimeOnly("com.h2database:h2:2.2.220")
testImplementation("org.springframework.boot:spring-boot-starter-test:3.1.0")
developmentOnly("org.springframework.boot:spring-boot-devtools:3.0.4")
developmentOnly("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
//developmentOnly("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
}

tasks.clean {
Expand Down

0 comments on commit 7682d1f

Please sign in to comment.