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

feat(merge_component): ✨ Add third souce for diff

Browse source 
Add third source (only from recipe, WIP commit) and attach debugger for checking functions
This commit is contained in:
pakintada@gmail.com 2024-03-05 11:12:03 +07:00
parent 860dc05cde
commit 1b96e298ee
8 changed files with 439 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,10 +24,7 @@
></path>
</svg>
</button>
<a
routerLink="/departments"
class="flex ml-14 max-sm:hidden"
>
<a routerLink="/departments" class="flex ml-14 max-sm:hidden">
<img
src="assets/logo.svg"
class="h-10 md:h-20 px-4"
@ -35,32 +32,36 @@
/>
</a>
<!-- Redis Status -->
<div class="p-2 rounded-lg border border-double border-black" [ngStyle]="redisStatus == 'Online'?{'background-color':'greenyellow'}:{'background-color':'tomato'}">
<p class="text-center font-bold">{{redisStatus}}</p>
<div
class="p-2 rounded-lg border border-double border-black"
[ngStyle]="
redisStatus == 'Online'
? { 'background-color': 'greenyellow' }
: { 'background-color': 'tomato' }
"
>
<p class="text-center font-bold">{{ redisStatus }}</p>
</div>
</div>
<!-- File Change Status -->
<div *ngIf="isCommitLoaded | async">
<button onclick="patch_merge_modal.showModal()" >
<h1 class="text-center font-extrabold text-2xl text-red-500 animate-pulse">Detect Changes! Click</h1>
<button onclick="patch_merge_modal.showModal()">
<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 class="modal-action">
<form method="dialog">
<button class="text-3xl">&#x2715;</button>
</form>
</div>
<div class="modal-box max-w-screen-2xl">
<app-merge [commit]="changesCommit"></app-merge>
</div>
</dialog>
</div>
@ -184,4 +185,3 @@
</div>
</div>
</div>