pakin/Taobin-Recipe-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add deepCompare for merge, WIP merge

Browse source
This commit is contained in:
pakintada@gmail.com 2024-02-23 16:50:21 +07:00
parent ed7810cded
commit cf5b11b267
6 changed files with 234 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/src/app/core/layout/layout.component.html
View file

@ -41,11 +41,26 @@
</div>
<!-- File Change Status -->
<button *ngIf="showDetectChanges">
<button onclick="patch_merge_modal.showModal()" *ngIf="showDetectChanges">
<h1 class="text-center font-extrabold text-2xl text-red-500 animate-pulse">Detect Changes! Click</h1>
</button>
<dialog id="patch_merge_modal" class="modal">
<div class="modal-box max-w-screen-2xl">
<app-merge
[commit]="changesCommit"
></app-merge>
<div class="modal-action sticky bottom-0 right-0">
<form method="dialog">
<button class="btn btn-warning">Close</button>
</form>
</div>
</div>
</dialog>
<div class="flex items-center">
<div class="flex items-center ml-3">
@ -168,4 +183,3 @@
</div>
</div>
<!--Modal-->

5
client/src/app/core/layout/layout.component.ts
View file

@ -60,6 +60,7 @@ export class LayoutComponent implements OnInit, OnDestroy {
redisStatus:string = "Offline";
showDetectChanges: boolean = false;
changesCommit: any = undefined;
constructor(
private _userService: UserService,
@ -94,9 +95,11 @@ export class LayoutComponent implements OnInit, OnDestroy {
next: async (data: any) => {
if(data != undefined && typeof data === 'object'){
// check if attr exists
if(data.files != null){
if(data.files != null && data.files != undefined){
this.showDetectChanges = true;
await AsyncStorage.setItem("detectChanges", "true");
this.changesCommit = data.files;
console.log("get commits", this.changesCommit);
} else {
this.showDetectChanges = false;
await AsyncStorage.setItem("detectChanges", "false");