Skip to content
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
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
}
</div>

<div class="project__team-tooltip">
<div class="project__tooltip">
<div class="tooltip">
<app-tooltip color="grey" iconSize="40" (show)="isHintTeamVisible.set(true)"></app-tooltip>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@use "styles/typography";

.project {
position: relative;
max-width: 1280px;

&__inner {
width: 100%;
Expand Down Expand Up @@ -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;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}

/**
* Отправляет приглашение пользователю для участия в проекте
Expand Down
17 changes: 17 additions & 0 deletions projects/social_platform/src/assets/icons/svg/empty-mail.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!-- @format -->

<div class="card">
<div class="card__inner">
<i appIcon icon="cross" appSquare="16" class="card__cross"></i>

<div class="card__info">
<i appIcon icon="empty-mail" appSquare="46"></i>
<p class="text-body-12 card__text">новых уведомлений пока нет</p>
</div>

<app-button routerLink="/office/program/all" customTypographyClass="text-body-12" size="big"
>начать действовать</app-button
>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -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;
}
}
Original file line number Diff line number Diff line change
@@ -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 {}
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,36 @@
</div>
<div class="invite__info">
<div class="text-body-12 invite__text">
<!-- для приглашений в проект -->
<a [routerLink]="['/office/profile', invite.sender.id]"
>{{ invite.sender.firstName }} {{ invite.sender.lastName }}</a
><br />приглашает вас в проект <br />
<a [routerLink]="['/office/projects', invite.project.id]"
>"{{ invite.project.name | truncate: 20 }}"</a
>

<!-- для программ -->
<!-- <p>В программе</p>
<br />
<a [routerLink]="['/office/program', invite.project.id]"
>"{{ invite.project.name | truncate: 20 }}"</a
> -->

<!-- для поста текст -->
<!-- <p>выложили новый пост</p> -->

<!-- для материалов текст -->
<!-- <p>опубликован новый материал</p> -->
</div>
<div class="text-body-12 invite__time">

<!-- <div class="text-body-12 invite__time">
{{ invite.datetimeCreated | dayjs: "fromX" }} назад в
{{ invite.datetimeCreated | dayjs: "format":"HH:HH" }}
</div>
</div> -->
</div>
</div>
<div class="invite__actions">
<!-- для приглашений в проект -->
<app-button
customTypographyClass="text-body-12"
size="medium"
Expand All @@ -32,6 +48,14 @@
<app-button customTypographyClass="text-body-12" size="medium" (click)="accept.emit(invite.id)"
>принять</app-button
>

<!-- для программ -->
<!-- <app-button
customTypographyClass="text-body-12"
size="big"
[routerLink]="['/office/program', invite.project.id]"
>перейти в программу</app-button
> -->
</div>
</div>
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
(reject)="rejectInvite.emit($event)"
></app-invite-manage-card>
</li>
} @empty {
<app-empty-manage-card></app-empty-manage-card>
}
</ul>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
&__notifications {
position: absolute;
top: 100%;
right: -10%;
right: 0%;
z-index: 20;
margin-top: 10px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
* Компонент панели управления профилем
Expand Down Expand Up @@ -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",
Expand Down
Loading