0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-01-07 00:50:23 -05:00

fix: merge main

This commit is contained in:
martabal 2024-05-28 00:42:52 +02:00
parent fec3a04123
commit e36b7240c7
No known key found for this signature in database
GPG key ID: C00196E3148A52BD
5 changed files with 7 additions and 0 deletions

BIN
mobile/openapi/README.md generated

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -279,6 +279,7 @@
<div class="flex gap-2"> <div class="flex gap-2">
{#if peopleWithFaces.length > Object.keys(selectedFaceToRemove).length} {#if peopleWithFaces.length > Object.keys(selectedFaceToRemove).length}
<button <button
type="button"
class="justify-self-end rounded-lg p-2 hover:bg-immich-dark-primary hover:dark:bg-immich-dark-primary/50" class="justify-self-end rounded-lg p-2 hover:bg-immich-dark-primary hover:dark:bg-immich-dark-primary/50"
on:click={handleRemoveAllFaces} on:click={handleRemoveAllFaces}
title="Remove all faces" title="Remove all faces"
@ -290,6 +291,7 @@
{/if} {/if}
{#if (unassignedFaces.length > 0 && unassignedFaces.length > Object.keys(selectedPersonToAdd).length) || Object.keys(selectedFaceToRemove).length > 0} {#if (unassignedFaces.length > 0 && unassignedFaces.length > Object.keys(selectedPersonToAdd).length) || Object.keys(selectedFaceToRemove).length > 0}
<button <button
type="button"
class="justify-self-end rounded-lg p-2 hover:bg-immich-dark-primary hover:dark:bg-immich-dark-primary/50" class="justify-self-end rounded-lg p-2 hover:bg-immich-dark-primary hover:dark:bg-immich-dark-primary/50"
on:click={handleOpenAvailableFaces} on:click={handleOpenAvailableFaces}
title="Faces available" title="Faces available"
@ -300,6 +302,7 @@
</button> </button>
{/if} {/if}
<button <button
type="button"
class="justify-self-end rounded-lg p-2 hover:bg-immich-dark-primary hover:dark:bg-immich-dark-primary/50" class="justify-self-end rounded-lg p-2 hover:bg-immich-dark-primary hover:dark:bg-immich-dark-primary/50"
on:click={() => handleEditFaces()} on:click={() => handleEditFaces()}
> >

View file

@ -75,6 +75,7 @@
<div class="flex place-items-center justify-between gap-2"> <div class="flex place-items-center justify-between gap-2">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<button <button
type="button"
class="flex place-content-center rounded-full p-3 transition-colors hover:bg-gray-200 dark:text-immich-dark-fg dark:hover:bg-gray-900" class="flex place-content-center rounded-full p-3 transition-colors hover:bg-gray-200 dark:text-immich-dark-fg dark:hover:bg-gray-900"
on:click={onClose} on:click={onClose}
> >
@ -93,6 +94,7 @@
{#if !selectedPersonToAdd[face.id]} {#if !selectedPersonToAdd[face.id]}
<div class="relative z-[20001] h-[115px] w-[95px]"> <div class="relative z-[20001] h-[115px] w-[95px]">
<button <button
type="button"
tabindex={index} tabindex={index}
class="absolute left-0 top-0 h-[90px] w-[90px] cursor-default" class="absolute left-0 top-0 h-[90px] w-[90px] cursor-default"
on:focus={() => ($boundingBoxesArray = [face])} on:focus={() => ($boundingBoxesArray = [face])}
@ -141,6 +143,7 @@
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<p>Faces to be removed</p> <p>Faces to be removed</p>
<button <button
type="button"
class="justify-self-end rounded-lg p-2 hover:bg-immich-dark-primary hover:dark:bg-immich-dark-primary/50" class="justify-self-end rounded-lg p-2 hover:bg-immich-dark-primary hover:dark:bg-immich-dark-primary/50"
on:click={handleRemoveAllFaces} on:click={handleRemoveAllFaces}
title="Reset" title="Reset"
@ -154,6 +157,7 @@
{#each Object.entries(selectedFaceToRemove) as [id, face], index} {#each Object.entries(selectedFaceToRemove) as [id, face], index}
<div class="relative z-[20001] h-[115px] w-[95px]"> <div class="relative z-[20001] h-[115px] w-[95px]">
<button <button
type="button"
tabindex={index} tabindex={index}
class="absolute left-0 top-0 h-[90px] w-[90px] cursor-default" class="absolute left-0 top-0 h-[90px] w-[90px] cursor-default"
on:focus={() => (face ? ($boundingBoxesArray = [face]) : '')} on:focus={() => (face ? ($boundingBoxesArray = [face]) : '')}