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

refactor(album): melhora marcação de pessoas em fotos #122

Merged
merged 1 commit into from
Dec 30, 2024
Merged
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
6 changes: 6 additions & 0 deletions apps/devmx/public/icons/share.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/devmx/public/portal-devpr-mx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
89 changes: 89 additions & 0 deletions apps/devmx/public/templates/user-tag.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<html
dir="ltr"
lang="pt-br"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:o="urn:schemas-microsoft-com:office:office"
>
<head>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin="" />
<link
href="https://fonts.googleapis.com/css2?family=Source+Sans+3:ital,wght@0,200..900;1,200..900&amp;display=swap"
rel="stylesheet"
/>

<style type="text/css">
body {
font-family: 'Source Sans 3';
font-style: normal;
font-weight: 500;
font-size: 16px;
line-height: 18px;
color: #000000;
}

a:link,
a:active,
a:visited,
a:hover {
text-decoration-line: underline;
color: #1A84FF;
}

blockquote {
margin: 2em 0;
}

footer {
font-family: 'Source Sans 3';
font-style: normal;
line-height: 18px;
font-size: 16px;

order: 0;
flex-grow: 0;
gap: 3px;
}

footer strong {
font-weight: 700;
}

footer p {
margin: 0;
}
</style>
</head>
<body>
<div>
<h3>Faala {{name}}, belê?</h3>

<p style="font-size: 120%">
Alguém marcou você no album de fotos "<a href="{{url}}">{{title}}</a>"
da comunidade.
</p>

<blockquote>
<strong>
🛟 Você pode remover sua tag da foto se preferir, algumas orientações
para isso:
</strong>
<ol>
<li>Clique no botão ☰ no lado direito acima da foto</li>
<li>Cliique em Remover minha tag</li>
<li>Salvar alterações</li>
</ol>
</blockquote>
</div>

<hr />

<footer>
<p>
<strong>Não responda este e-mail</strong>, pois foi enviado de forma
automatizada.
</p>
<p>Operações <a href="https://devparana.mx">devparana.mx</a>.</p>
</footer>
</body>
</html>
4 changes: 4 additions & 0 deletions apps/devmx/src/scss/_overrides.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.cdk-overlay-backdrop {
background-color: rgba(0,0,0,.9);
}

::ng-deep body .align-button.mat-mdc-button .mdc-button__label {
display: inline-flex;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion apps/devmx/src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// @use '@angular/cdk/overlay-prebuilt.css';
@use '@angular/cdk/overlay-prebuilt.css';
@use '@angular/material' as mat;
@use './scss/theming/app-shell' as app-shell;
@use './scss/theme' as theme;
Expand Down
91 changes: 79 additions & 12 deletions apps/server/src/assets/templates/user-tag.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/server/src/envs/env.dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { join } from 'node:path';

export const env = {
production: false,
origin: 'http://localhost:4200',
db: {
name: process.env.DB_NAME,
host: process.env.DB_HOST,
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/envs/env.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ if (!process.env.MONGO_URI) {

export const env = {
production: true,
origin: 'https://devparana.mx',
db: {
name: process.env.DB_NAME,
host: process.env.DB_HOST,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { UseCase, Course, EditableCourse } from '@devmx/shared-api-interfaces';
import { CoursesService } from '../services';

export class UpdateCourseUseCase implements UseCase<EditableCourse, Course> {
export class UpdateCourseUseCase implements UseCase<EditableCourse, Course | null> {
constructor(private coursesService: CoursesService) {}

async execute(data: EditableCourse) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
} from '@devmx/shared-api-interfaces';

export class UpdateInstitutionUseCase
implements UseCase<EditableInstitution, Institution>
implements UseCase<EditableInstitution, Institution | null>
{
constructor(private institutionsService: InstitutionsService) {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
EditableSubject,
} from '@devmx/shared-api-interfaces';

export class UpdateSubjectUseCase implements UseCase<EditableSubject, Subject> {
export class UpdateSubjectUseCase implements UseCase<EditableSubject, Subject | null> {
constructor(private subjectsService: SubjectsService) {}

async execute(data: EditableSubject) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,81 @@
<form [formGroup]="form" (submit)="onSubmit()">
<mat-tab-group>
<mat-tab label="Conta">
<ng-template matTabContent>
<form [formGroup]="form" (submit)="onSubmit()">
<section>
<devmx-account-user />

<devmx-account-contact />

<devmx-account-profile />

<fieldset>
<legend>Informações públicas</legend>

<devmx-account-visibility />
</fieldset>

<footer>
<button mat-flat-button [disabled]="state()">
{{state() ? state() : 'Salvar'}}
</button>
</footer>
</section>

<aside>
<div class="user-avatar">
<devmx-avatar [src]="photo()" />
<devmx-select-file
class="select-file"
(selectChange)="changePhoto($event)"
/>
</div>

<a
mat-stroked-button
[routerLink]="['/', 'sobre', form.controls.name.value]"
>
Acessar página pública
</a>

<devmx-account-social />
</aside>
</form>
</ng-template>
</mat-tab>

<mat-tab label="Biografia">
<ng-template matTabContent>
<form [formGroup]="form" (submit)="onSubmit()">
<section formGroupName="profile">
<devmx-markdown-toolbar>
<devmx-markdown-editor
label="Bio"
#editor="markdownEditor"
formControlName="minibio"
[maxRows]="64"
/>
<devmx-markdown-view
[content]="form.profile.controls.minibio?.value ?? ''"
/>
</devmx-markdown-toolbar>
</section>
</form>
</ng-template>
</mat-tab>

<mat-tab label="Habilidades">
<ng-template matTabContent>
<form [formGroup]="form" (submit)="onSubmit()">
<section>
<devmx-account-skills />
</section>
</form>
</ng-template>
</mat-tab>
</mat-tab-group>

<!-- <form [formGroup]="form" (submit)="onSubmit()">
<section>
<devmx-account-user />

Expand Down Expand Up @@ -53,4 +130,4 @@

<devmx-account-social />
</aside>
</form>
</form> -->
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
padding: 1em;
display: flex;
flex-direction: column;
max-width: 980px;
// max-width: 980px;

form {
gap: 64px;
display: flex;
flex-direction: row;

padding-top: 2em;
@media (max-width: 768px) {
flex-direction: column-reverse;
}
Expand All @@ -36,7 +36,7 @@
gap: 1em;
display: flex;
flex-direction: column;
max-width: 580px;
// max-width: 580px;
}

fieldset {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { UserPhoto, provideUserPhoto } from '../../dialogs';
import { MatButtonModule } from '@angular/material/button';
import { AvatarComponent } from '@devmx/shared-ui-global';
import { UpdatePhoto } from '@devmx/account-data-access';
import { MatTabsModule } from '@angular/material/tabs';
import { UserComponent } from './user/user.component';
import { ReactiveFormsModule } from '@angular/forms';
import { RouterLink } from '@angular/router';
Expand All @@ -27,6 +28,7 @@ import {
ChangeDetectionStrategy,
} from '@angular/core';


@Component({
selector: 'devmx-account',
templateUrl: './account.container.html',
Expand All @@ -46,6 +48,7 @@ import {
VisibilityComponent,
SelectFileComponent,
MatButtonModule,
MatTabsModule,
AvatarComponent,
RouterLink,
],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { UserRef } from '@devmx/shared-api-interfaces';
import { Pipe, PipeTransform } from '@angular/core';

@Pipe({
name: 'searchUserExcept',
})
export class SearchUserExceptPipe implements PipeTransform {
transform<U extends UserRef>(value: U[], except: U[] = []) {
if (except.length === 0) return value;

return value.filter((user) => except.some((u) => u.id !== user.id));
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<mat-form-field>
<mat-label>{{ label() }}</mat-label>

<input matInput [formControl]="control" [matAutocomplete]="auto" />

<mat-hint>{{ hint() }}</mat-hint>

<mat-autocomplete
#auto="matAutocomplete"
[displayWith]="displayFn"
(optionSelected)="onOptionSelected($event.option.value)"
>
@if (userFacade.response$ | async; as response) {
<!-- -->
@for (option of response.data; track option.id) {
@for (option of response.data | searchUserExcept: except(); track $index) {
<mat-option [value]="option">{{ option.displayName }}</mat-option>
}
<!-- -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { FormControl, ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { SearchUserExceptPipe } from './search-user-except.pipe';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { User, UserRef } from '@devmx/shared-api-interfaces';
import { MatInputModule } from '@angular/material/input';
import { UserFacade } from '@devmx/account-data-access';
import { User } from '@devmx/shared-api-interfaces';
import { AsyncPipe } from '@angular/common';
import { debounceTime, filter, startWith } from 'rxjs';
import { AsyncPipe } from '@angular/common';
import {
input,
inject,
Expand All @@ -23,6 +24,7 @@ import {
imports: [
ReactiveFormsModule,
MatAutocompleteModule,
SearchUserExceptPipe,
MatFormFieldModule,
MatInputModule,
AsyncPipe,
Expand All @@ -39,6 +41,8 @@ export class SearchUserComponent {

control = new FormControl<string | User>('');

except = input<UserRef[]>([]);

constructor() {
this.control.valueChanges
.pipe(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import {
UploadPhotoUseCase,
} from '@devmx/album-domain/client';


export class PhotoFacade extends EntityFacade<Photo> {
constructor(
private createPhotoUseCase: CreatePhotoUseCase,
Expand Down Expand Up @@ -65,7 +64,7 @@ export class PhotoFacade extends EntityFacade<Photo> {
}

updateTags(data: UpdatePhotoTags) {
this.onUpdate(this.updatePhotoTagsUseCase.execute(data));
return this.updatePhotoTagsUseCase.execute(data);
}

delete(id: string) {
Expand Down
3 changes: 2 additions & 1 deletion packages/album/data-access/src/lib/resolvers/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './album-resolver-wrapped';
export * from './album-resolver-wrapped';
export * from './photo-resolver-wrapped';
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Params } from '@devmx/shared-api-interfaces';
import { PhotoFacade } from '../application';
import { distinctUntilChanged, filter } from 'rxjs';

export const photoResolverWrapped = (facade: PhotoFacade, params: Params) => {
facade.loadOne(params['id']);
return facade.selected$.pipe(
distinctUntilChanged(),
filter((photo) => !!photo)
);
};
Loading
Loading