Merge pull request #93 from Suwayomi/graphql

GraphQL and custom Repos
Suwayomi · Feb 11, 2024 · 4d1bb31 · 4d1bb31
2 parents cd780f6 + 6fe6cdc
commit 4d1bb31
Show file tree

Hide file tree

Showing 79 changed files with 11,734 additions and 998 deletions.
diff --git a/.idea/scopes/Copyright_Scope.xml b/.idea/scopes/Copyright_Scope.xml
diff --git a/.run/Dev.run.xml b/.run/Dev.run.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="Tachidesk-VaadinUI.main" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="online.hatsunemiku.tachideskvaadinui.TachideskVaadinUiApplication" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/Prod.run.xml b/.run/Prod.run.xml
@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Prod" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="Tachidesk-VaadinUI.main" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="online.hatsunemiku.tachideskvaadinui.TachideskVaadinUiApplication" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/build.gradle b/build.gradle
@@ -5,17 +5,18 @@ import org.springframework.boot.gradle.tasks.run.BootRun
 
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.1.2'
+    id 'idea'
+    id 'org.springframework.boot' version '3.2.1'
     id 'io.spring.dependency-management' version '1.1.0'
     //id 'org.graalvm.buildtools.native' version '0.9.20'
-    id 'com.vaadin' version '24.1.9'
+    id 'com.vaadin' version '24.3.2'
 
     //Jpackage for building native installers
     id("org.panteleyev.jpackageplugin") version "1.5.2"
 }
 
 group = 'online.hatsunemiku'
-version = '1.0.5'
+version = '1.2.0'
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
@@ -34,23 +35,31 @@ repositories {
 }
 
 ext {
-    set('vaadinVersion', "24.1.9")
+    set('vaadinVersion', "24.3.2")
+}
+
+idea {
+    module {
+        downloadJavadoc = true
+        downloadSources = true
+    }
 }
 
 dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-graphql'
     implementation('com.vaadin:vaadin-spring-boot-starter') {
         if (vaadin.productionMode) {
             exclude group: "com.vaadin", module: "vaadin-dev-server"
         }
     }
+
     implementation 'org.jetbrains:annotations:24.0.0'
-    implementation 'org.springframework.boot:spring-boot-starter-cache'
-    implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.5'
 
     //Feign Client
-    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.0.4'
     implementation 'io.github.openfeign:feign-jackson:12.2'
     implementation 'io.github.openfeign.form:feign-form:3.8.0'
     implementation 'io.github.openfeign.form:feign-form-spring:3.8.0'
@@ -63,9 +72,11 @@ dependencies {
 
     compileOnly 'org.projectlombok:lombok'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
+    developmentOnly 'io.projectreactor:reactor-tools'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
+
     //vaadin directory plugins
     implementation 'in.virit:viritin:2.0.1'
     implementation 'org.vaadin.addons.online.hatsunemiku.diamond:FlowSwiper:1.3.1'
@@ -143,7 +154,7 @@ class InstallTask extends JPackageTask {
         appVersion = "${project.version}"
         icon = "package/icons/icon.ico"
         licenseFile = "LICENSE"
-        mainClass = "org.springframework.boot.loader.JarLauncher"
+        mainClass = "org.springframework.boot.loader.launch.JarLauncher"
         mainJar = "Tachidesk-VaadinUI-${project.version}.jar"
         vendor = "Aless2003"
         verbose = false
@@ -158,7 +169,7 @@ class WindowsInstallTask extends InstallTask {
     WindowsInstallTask() {
         super()
 
-        //winConsole = true //enable only for debugging
+        winConsole = true //enable only for debugging
         winDirChooser = true
         winHelpUrl = "https://github.com/aless2003/Tachidesk-VaadinUI"
         winMenu = true

diff --git a/frontend/css/components/dialog/tracking/tracking-dialog.css b/frontend/css/components/dialog/tracking/tracking-dialog.css
@@ -5,65 +5,95 @@
  */
 
 .manga-search-result {
-  display: flex;
-  flex-direction: column;
+    display: flex;
+    flex-direction: column;
 }
 
 .manga-search-result-upper-half {
-  display: flex;
-  flex-direction: row;
+    display: flex;
+    flex-direction: row;
 }
 
 .manga-search-result-data {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  margin-left: 1vw;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-left: 1vw;
 }
 
 .manga-search-result img {
-  max-height: 20vh !important;
-  max-width: 20vw !important;
-  min-width: 1vw;
-  min-height: 1vh;
-  width: auto;
-  height: auto;
+    max-height: 20vh !important;
+    max-width: 20vw !important;
+    min-width: 1vw;
+    min-height: 1vh;
+    width: auto;
+    height: auto;
+}
+
+.manga-search-result {
+    color: var(--miku-main-color);
 }
 
 .manga-search-result-attribute {
-  padding: 0;
-  margin: 0;
+    padding: 0;
+    margin: 0;
+    color: var(--miku-main-color);
+}
+
+.manga-search-result-attribute label {
+    color: var(--miku-main-color);
 }
 
 .manga-search-results {
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-  max-width: 50vw;
-  /*Hide scroll bar*/
-  overflow: hidden;
+    padding-top: 1rem;
+    padding-bottom: 1rem;
+    max-width: 50vw;
+    /*Hide scroll bar*/
+    overflow: hidden;
 }
 
 .manga-search-results vaadin-item[selected] {
-  background-color: var(--miku-selected-color-50);
+    background-color: var(--miku-selected-color-50);
 }
 
 .manga-search-results::part(items) {
-  overflow-y: hidden;
+    overflow-y: hidden;
 }
 
 .tracking-dialog-statistics {
-  display: grid;
-  grid-template-columns: repeat(6, 1fr);
-  grid-template-rows: repeat(2, 1fr);
-  column-gap: 1rem;
+    display: grid;
+    grid-template-columns: repeat(6, 1fr);
+    grid-template-rows: repeat(2, 1fr);
+    column-gap: 1rem;
 }
 
 .tracking-dialog-statistics > .two-span {
-  grid-row: 1 / 2;
-  grid-column: span 2;
+    grid-row: 1 / 2;
+    grid-column: span 2;
 }
 
 .tracking-dialog-statistics > .three-span {
-  grid-row: 2 / 3;
-  grid-column: span 3;
+    grid-row: 2 / 3;
+    grid-column: span 3;
+}
+
+#no-search-results-text {
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+    text-align: center;
+    color: var(--miku-main-color);
+}
+
+.tracking-manga-choice-dialog::part(footer) {
+    display: flex;
+    justify-content: space-between;
+    padding: 1rem;
+}
+
+.tracking-dialog-remove-buttons {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    padding: 1rem;
 }
diff --git a/frontend/css/root.css b/frontend/css/root.css
@@ -5,46 +5,59 @@
  */
 
 .library-grid {
-  display: grid;
-  grid-template-columns: repeat(5, 1fr);
-  grid-gap: var(--miku-grid-gap);
-  padding: 1rem;
-  max-width: 100%;
+    display: grid;
+    grid-template-columns: repeat(5, 1fr);
+    grid-gap: var(--miku-grid-gap);
+    padding: 1rem;
+    max-width: 100%;
 }
 
 @media (max-width: 720px) {
-  .library-grid {
-    grid-template-columns: repeat(4, 1fr);
-  }
+    .library-grid {
+        grid-template-columns: repeat(4, 1fr);
+    }
 }
 
 @media (max-width: 600px) {
-  .library-grid {
-    grid-template-columns: repeat(3, 1fr);
-  }
+    .library-grid {
+        grid-template-columns: repeat(3, 1fr);
+    }
 }
 
 @media (max-width: 500px) {
-  .library-grid {
-    grid-template-columns: repeat(2, 1fr);
-  }
+    .library-grid {
+        grid-template-columns: repeat(2, 1fr);
+    }
 }
 
 .delete-category-button {
-  color: var(--miku-unselected-color);
-  background-color: transparent;
-  border: transparent;
-  padding: 0;
-  margin-left: 5px;
+    color: var(--miku-unselected-color);
+    background-color: transparent;
+    border: transparent;
+    padding: 0;
+    margin-left: 5px;
 }
 
 .delete-category-button:hover {
-  border: transparent;
+    border: transparent;
 }
 
 .library-buttons {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 0.5rem;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 0.5rem;
+}
+
+.right-align {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+}
+
+.separator {
+    border-bottom: 1px solid var(--miku-main-color-50);
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+    width: 100%;
 }
diff --git a/frontend/css/views/settings-view.css b/frontend/css/views/settings-view.css
@@ -27,4 +27,51 @@
     padding: 1rem;
     width: 99% !important;
     margin-right: 10vw !important;
+}
+
+.settings-view .button-container vaadin-button {
+    margin-left: 0.125rem;
+    margin-right: 0.125rem;
+}
+
+#extension-settings-description {
+    color: var(--miku-main-color);
+    font-weight: 500;
+    padding-bottom: 1rem;
+}
+
+#dialog-buttons vaadin-button {
+    display: flex;
+    align-items: center;
+}
+
+#extension-repos-grid {
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+}
+
+.settings-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 1rem;
+}
+
+#no-server-warning {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: var(--miku-main-color);
+    font-weight: 500;
+    border: 1px solid var(--miku-main-color);
+    border-radius: 0.5rem;
+    padding: 1rem;
+    margin-top: 2rem;
+    margin-bottom: 2rem;
+}
+
+#general-settings-section {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
 }