Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.7.8 Force Update Release #2636

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ jobs:
body=${body//$'>'/'%3E'}
echo $body
echo "BODY=$body" >> $GITHUB_OUTPUT


- name: Check Out Repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -439,7 +439,7 @@ jobs:
context: .
platforms: linux/amd64,linux/arm/v7,linux/arm64
push: true
tags: kizaing/kavita:canary, kizaing/kavita:canary-${{ steps.parse-version.outputs.VERSION }}, ghcr.io/kareadita/kavita:canary, ghcr.io/kareadita/kavita:canary-${{ steps.parse-version.outputs.VERSION }}
tags: kizaing/kavita:canary, kizaing/kavita:canary-${{ steps.parse-version.outputs.VERSION }}, ghcr.io/kareadita/kavita:canary, ghcr.io/kareadita/kavita:canary-${{ steps.parse-version.outputs.VERSION }}, kizaing/kavita:latest, kizaing/kavita:${{ steps.parse-version.outputs.VERSION }}, ghcr.io/kareadita/kavita:latest, ghcr.io/kareadita/kavita:${{ steps.parse-version.outputs.VERSION }}, kizaing/kavita:nightly, kizaing/kavita:nightly-${{ steps.parse-version.outputs.VERSION }}, ghcr.io/kareadita/kavita:nightly, ghcr.io/kareadita/kavita:nightly-${{ steps.parse-version.outputs.VERSION }}

- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
34 changes: 25 additions & 9 deletions UI/Web/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import {Component, DestroyRef, HostListener, inject, Inject, OnInit} from '@angular/core';
import { NavigationStart, Router, RouterOutlet } from '@angular/router';
import {map, pluck, shareReplay, take} from 'rxjs/operators';
import {map, pluck, shareReplay, take, tap} from 'rxjs/operators';
import { AccountService } from './_services/account.service';
import { LibraryService } from './_services/library.service';
import { NavService } from './_services/nav.service';
import { filter } from 'rxjs/operators';
import { NgbModal, NgbRatingConfig } from '@ng-bootstrap/ng-bootstrap';
import { DOCUMENT, NgClass, NgIf, AsyncPipe } from '@angular/common';
import { Observable } from 'rxjs';
import {interval, Observable} from 'rxjs';
import {ThemeService} from "./_services/theme.service";
import { SideNavComponent } from './sidenav/_components/side-nav/side-nav.component';
import {NavHeaderComponent} from "./nav/_components/nav-header/nav-header.component";
import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
import {translate, TranslocoService} from "@ngneat/transloco";
import {ImportCblModalComponent} from "./reading-list/_modals/import-cbl-modal/import-cbl-modal.component";
import {UpdateModalComponent} from "./update-modal/update-modal.component";

@Component({
selector: 'app-root',
Expand All @@ -38,13 +40,13 @@ export class AppComponent implements OnInit {
ratingConfig.resettable = true;

// Close any open modals when a route change occurs
router.events
.pipe(filter(event => event instanceof NavigationStart), takeUntilDestroyed(this.destroyRef))
.subscribe((event) => {
if (this.ngbModal.hasOpenModals()) {
this.ngbModal.dismissAll();
}
});
// router.events
// .pipe(filter(event => event instanceof NavigationStart), takeUntilDestroyed(this.destroyRef))
// .subscribe((event) => {
// if (this.ngbModal.hasOpenModals()) {
// this.ngbModal.dismissAll();
// }
// });

this.transitionState$ = this.accountService.currentUser$.pipe(map((user) => {
if (!user) return false;
Expand All @@ -62,6 +64,20 @@ export class AppComponent implements OnInit {

ngOnInit(): void {
this.setDocHeight();

// Pop an update notice that nags user to update to the new repo
this.ngbModal.open(UpdateModalComponent, {size: 'xl'})
interval(30 * 60 * 1000) // 30 minutes in milliseconds
.pipe(
tap(() => {
if (!this.ngbModal.hasOpenModals()) {
this.ngbModal.open(UpdateModalComponent, {size: 'xl'})
}
})
)
.subscribe();


this.setCurrentUser();
}

Expand Down
20 changes: 20 additions & 0 deletions UI/Web/src/app/update-modal/update-modal.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<div class="modal-header">
<h4 class="modal-title" id="modal-basic-title">You are massively out of date!</h4>
<button type="button" class="btn-close" aria-label="Close" (click)="close()"></button>
</div>
<div class="modal-body scrollable-modal">
<p><strong>Kavita has moved docker repositories!</strong></p>
<p>You are no longer receiving updates. Kavita has over 4K active installs on v0.7.8. You need to migrate to the new docker repo to continue receiving updates.</p>
<p>Please switch your docker container to use <code>jvmilazz0/kavita:latest</code> to continue using Kavita and receiving important security and feature updates.</p>


<p>You can also setup <a href="https://crazymax.dev/diun/" target="_blank" rel="noopener noreferrer">Diun</a> to get notifications, Watchtower for automatic updates, or subscribe to releases on Github or join the discord to get pings when releases come out.</p>

<p>Dockerhub: <a href="https://hub.docker.com/r/jvmilazz0/kavita" target="_blank" rel="noopener noreferrer">https://hub.docker.com/r/jvmilazz0/kavita</a></p>

<p class="mt-2">Note: This message will continue to popup until you update or explicitly rollback to v0.7.8 tag (there is no reason to stay on old releases)</p>

</div>
<div class="modal-footer" style="justify-content: normal">
<button type="submit" class="btn btn-primary" (click)="close()">Okay</button>
</div>
Empty file.
20 changes: 20 additions & 0 deletions UI/Web/src/app/update-modal/update-modal.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { Component } from '@angular/core';
import { CommonModule } from '@angular/common';
import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap";

@Component({
selector: 'app-update-modal',
standalone: true,
imports: [CommonModule],
templateUrl: './update-modal.component.html',
styleUrls: ['./update-modal.component.scss']
})
export class UpdateModalComponent {

constructor(private ngbActiveModal: NgbActiveModal) {
console.log('hello')
}
close() {
this.ngbActiveModal.close();
}
}
Loading