Skip to content

Commit

Permalink
Merge pull request #106 from Suwayomi/new-tracking
Browse files Browse the repository at this point in the history
New tracking System via Suwayomi
  • Loading branch information
aless2003 authored Apr 8, 2024
2 parents e9c2f02 + c23b186 commit 052bfe9
Show file tree
Hide file tree
Showing 35 changed files with 2,333 additions and 280 deletions.
1 change: 1 addition & 0 deletions .run/Dev.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<option name="ACTIVE_PROFILES" value="dev" />
<option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<module name="Tachidesk-VaadinUI.main" />
<option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE" />
<option name="SPRING_BOOT_MAIN_CLASS" value="online.hatsunemiku.tachideskvaadinui.TachideskVaadinUiApplication" />
<method v="2">
<option name="Make" enabled="true" />
Expand Down
13 changes: 12 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ plugins {
}

group = 'online.hatsunemiku'
version = '1.5.0'
version = '1.6.0'
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

Expand Down Expand Up @@ -65,6 +65,16 @@ dependencies {
implementation 'io.github.openfeign.form:feign-form-spring:3.8.0'
implementation 'io.github.openfeign:feign-okhttp:12.4'

//MAL API
implementation 'dev.katsute:mal4j:3.4.2'

//GraphQL
implementation "com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter"

//Apache Commons codec -> used for URL encoding
implementation 'commons-codec:commons-codec:1.16.1'


implementation 'pl.unforgiven:superfields:0.18.3'
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
implementation 'commons-validator:commons-validator:1.7'
Expand All @@ -85,6 +95,7 @@ dependencies {
dependencyManagement {
imports {
mavenBom "com.vaadin:vaadin-bom:${vaadinVersion}"
mavenBom "com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:latest.release"
}
}

Expand Down
7 changes: 7 additions & 0 deletions frontend/css/components/dialog/tracking/tracking-dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,11 @@
justify-content: space-between;
align-items: center;
padding: 1rem;
}

#tracking-dialog-tracker-buttons {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
32 changes: 0 additions & 32 deletions frontend/css/views/anilist.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,3 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/

.anilist-title-section {
display: flex;
justify-content: center;
width: 100%;
background-color: var(--miku-unselected-color);
color: var(--miku-main-color);
font-size: 1.5rem;
font-weight: 600;
margin-bottom: 0.6rem;
padding: 0.2rem;
border-radius: 0.5rem;
}

.anilist-content {
width: 100%;
padding: 0.6rem;
border: 2px solid var(--miku-main-color);
border-radius: 0.5rem;
}

.anilist-content-grid {
display: grid;
grid-template-columns: repeat(5, minmax(200px, 1fr));
grid-gap: 1rem;
}

.anilist-view .button-container {
display: flex;
justify-content: center;
width: 100%;
height: 100%;
}
33 changes: 33 additions & 0 deletions frontend/css/views/imports/importCommons.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
.import-title-section {
display: flex;
justify-content: center;
width: 100%;
background-color: var(--miku-unselected-color);
color: var(--miku-main-color);
font-size: 1.5rem;
font-weight: 600;
margin-bottom: 0.6rem;
padding: 0.2rem;
border-radius: 0.5rem;
}

.import-content {
width: 100%;
padding: 0.6rem;
border: 2px solid var(--miku-main-color);
border-radius: 0.5rem;
}

.import-content-grid {
display: grid;
grid-template-columns: repeat(5, minmax(200px, 1fr));
grid-gap: 1rem;
}

.import-button-container {
display: flex;
/*grow horizontally*/
width: 100%;
justify-content: center;
margin-top: 1rem;
}
1 change: 1 addition & 0 deletions frontend/css/views/search-view.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@
justify-content: center;
align-items: center;
margin-top: 1rem;
gap: .5rem;
}
Loading

0 comments on commit 052bfe9

Please sign in to comment.