diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index f0d6f0e22..0e1c44005 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -33,7 +33,7 @@ jobs: NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_ACCESS_TOKEN }} NETLIFY_PREVIEW_APP: true # or perhaps like this GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NETLIFY_PR_ID: ${{ github.pr_id }}-social + NETLIFY_PR_ID: ${{ github.event.pull_request.number }}-social - name: Publish preview skills uses: netlify/actions/cli@master id: publish_preview_skills @@ -44,7 +44,7 @@ jobs: NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_ACCESS_TOKEN }} NETLIFY_PREVIEW_APP: true # or perhaps like this GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NETLIFY_PR_ID: ${{ github.pr_id }}-skills + NETLIFY_PR_ID: ${{ github.event.pull_request.number }}-skills - uses: mshick/add-pr-comment@v2 with: message: | diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.html b/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.html index a05acd5ff..5bb81d584 100644 --- a/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.html +++ b/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.html @@ -148,7 +148,7 @@ } -
+
diff --git a/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.scss b/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.scss index e088ef91f..54a86df08 100644 --- a/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.scss +++ b/projects/social_platform/src/app/office/projects/edit/shared/project-team-step/project-team-step.component.scss @@ -4,7 +4,7 @@ @use "styles/typography"; .project { - position: relative; + max-width: 1280px; &__inner { width: 100%; @@ -73,15 +73,14 @@ transform: translateY(-50%); } - &__team { - position: relative; - - &-tooltip { - position: absolute; - right: 0; - bottom: 0; - transform: translateY(calc(var(--app-height) * 0.47)); - } + &__tooltip { + position: fixed; + right: + calc( + (100vw - 1080px) / 2 + ); + bottom: 24px; + z-index: 30; } } diff --git a/projects/social_platform/src/app/office/services/invite.service.ts b/projects/social_platform/src/app/office/services/invite.service.ts index 787186781..b8fe6193d 100644 --- a/projects/social_platform/src/app/office/services/invite.service.ts +++ b/projects/social_platform/src/app/office/services/invite.service.ts @@ -24,7 +24,7 @@ import { AuthService } from "@auth/services"; export class InviteService { private readonly INVITES_URL = "/invites"; - constructor(private readonly apiService: ApiService, private readonly authService: AuthService) {} + constructor(private readonly apiService: ApiService) {} /** * Отправляет приглашение пользователю для участия в проекте diff --git a/projects/social_platform/src/assets/icons/svg/empty-mail.svg b/projects/social_platform/src/assets/icons/svg/empty-mail.svg new file mode 100644 index 000000000..09aacae68 --- /dev/null +++ b/projects/social_platform/src/assets/icons/svg/empty-mail.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg index 06ed945ee..57e81601c 100644 --- a/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg +++ b/projects/social_platform/src/assets/icons/symbol/svg/sprite.css.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.html b/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.html new file mode 100644 index 000000000..b2338a62f --- /dev/null +++ b/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.html @@ -0,0 +1,16 @@ + + +
+
+ + +
+ +

новых уведомлений пока нет

+
+ + начать действовать +
+
diff --git a/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.scss b/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.scss new file mode 100644 index 000000000..8568223aa --- /dev/null +++ b/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.scss @@ -0,0 +1,37 @@ +.card { + position: relative; + width: 100%; + max-width: 286px; + padding: 24px; + background-color: var(--light-white); + border: 0.5px solid var(--medium-grey-for-outline); + border-radius: var(--rounded-xl); + + &__inner { + display: flex; + flex-direction: column; + gap: 10px; + } + + &__info { + display: flex; + gap: 15px; + align-items: center; + } + + &__text { + width: 60%; + color: var(--dark-grey); + } + + &__cross { + position: absolute; + top: 10px; + right: 10px; + } + + i { + color: var(--dark-grey); + cursor: pointer; + } +} diff --git a/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.ts b/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.ts new file mode 100644 index 000000000..2e28f5c9b --- /dev/null +++ b/projects/ui/src/lib/components/layout/empty-manage-card/empty-manage-card.component.ts @@ -0,0 +1,15 @@ +/** @format */ + +import { CommonModule } from "@angular/common"; +import { Component } from "@angular/core"; +import { ButtonComponent, IconComponent } from "@ui/components"; +import { RouterLink } from "@angular/router"; + +@Component({ + selector: "app-empty-manage-card", + templateUrl: "./empty-manage-card.component.html", + styleUrl: "./empty-manage-card.component.scss", + imports: [CommonModule, ButtonComponent, IconComponent, RouterLink], + standalone: true, +}) +export class EmptyManageCardComponent {} diff --git a/projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.html b/projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.html index ec54b368e..5b455b07a 100644 --- a/projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.html +++ b/projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.html @@ -8,20 +8,36 @@
+ {{ invite.sender.firstName }} {{ invite.sender.lastName }}
приглашает вас в проект
"{{ invite.project.name | truncate: 20 }}" + + + + + + + + +
-
+ +
+ принять + + +
} diff --git a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.html b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.html index 2cd95cf31..79fcab679 100644 --- a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.html +++ b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.html @@ -24,6 +24,8 @@ (reject)="rejectInvite.emit($event)" > + } @empty { + }
diff --git a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.scss b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.scss index 5c0883d3c..7bb882fe9 100644 --- a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.scss +++ b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.scss @@ -27,7 +27,7 @@ &__notifications { position: absolute; top: 100%; - right: -10%; + right: 0%; z-index: 20; margin-top: 10px; } diff --git a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.ts b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.ts index 86cdcd27c..59f09f357 100644 --- a/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.ts +++ b/projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.ts @@ -7,6 +7,7 @@ import { ClickOutsideModule } from "ng-click-outside"; import type { Invite } from "@office/models/invite.model"; import { RouterLink } from "@angular/router"; import type { User } from "../../../models/user.model"; +import { EmptyManageCardComponent } from "../empty-manage-card/empty-manage-card.component"; /** * Компонент панели управления профилем @@ -38,6 +39,7 @@ import type { User } from "../../../models/user.model"; ClickOutsideModule, IconComponent, RouterLink, + EmptyManageCardComponent, ], templateUrl: "./profile-control-panel.component.html", styleUrl: "./profile-control-panel.component.scss",