Florian Eisenmenger 2 лет назад
Родитель
Сommit
078a3c3476
8 измененных файлов: 32 добавлений и 45 удалений
  1. +7
    -21
      matsen-tool/src/app/home/home.component.html
  2. +1
    -1
      matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
  3. +0
    -3
      matsen-tool/src/app/partners/partners-detail/partners-detail.component.scss
  4. +4
    -2
      matsen-tool/src/app/partners/partners.component.html
  5. +0
    -11
      matsen-tool/src/app/partners/partners.component.scss
  6. +0
    -7
      matsen-tool/src/app/products/products.component.scss
  7. +19
    -0
      matsen-tool/src/assets/scss/_table.scss
  8. +1
    -0
      matsen-tool/src/styles.scss

+ 7
- 21
matsen-tool/src/app/home/home.component.html Просмотреть файл

@@ -1,7 +1,7 @@
<div class="home-container pb-5"> <div class="home-container pb-5">
<div class="pt-4"> <div class="pt-4">
<div class="container"> <div class="container">
<h1>{{'user.hello' | translate}} {{ user?.firstName }}!</h1>
<h1>{{ 'user.hello' | translate }} {{ user?.firstName }}!</h1>
<p *ngIf="userIsAdmin"><a routerLink="/users">Manage Users</a></p> <p *ngIf="userIsAdmin"><a routerLink="/users">Manage Users</a></p>
</div> </div>
</div> </div>
@@ -11,21 +11,21 @@
<div class="col d-flex"> <div class="col d-flex">
<a class="card" routerLink="/customer" routerLinkActive="active"> <a class="card" routerLink="/customer" routerLinkActive="active">
<div class="card-body position-relative bi bi-emoji-heart-eyes"> <div class="card-body position-relative bi bi-emoji-heart-eyes">
<h3 class="position-absolute m-0">{{'basic.customer' | translate}}</h3>
<h3 class="position-absolute m-0">{{ 'basic.customer' | translate }}</h3>
</div> </div>
</a> </a>
</div> </div>
<div class="col d-flex"> <div class="col d-flex">
<a class="card" routerLink="/supplier" routerLinkActive="active"> <a class="card" routerLink="/supplier" routerLinkActive="active">
<div class="card-body position-relative bi bi-emoji-kiss"> <div class="card-body position-relative bi bi-emoji-kiss">
<h3 class="position-absolute m-0">{{'basic.supplier' | translate}}</h3>
<h3 class="position-absolute m-0">{{ 'basic.supplier' | translate }}</h3>
</div> </div>
</a> </a>
</div> </div>
<div class="col d-flex"> <div class="col d-flex">
<a class="card" routerLink="/service" routerLinkActive="active"> <a class="card" routerLink="/service" routerLinkActive="active">
<div class="card-body position-relative bi bi-emoji-smile"> <div class="card-body position-relative bi bi-emoji-smile">
<h3 class="position-absolute m-0">{{'basic.service' | translate}}</h3>
<h3 class="position-absolute m-0">{{ 'basic.service' | translate }}</h3>
</div> </div>
</a> </a>
</div> </div>
@@ -37,21 +37,21 @@
<div class="col d-flex"> <div class="col d-flex">
<a class="card" routerLink="/products" routerLinkActive="active"> <a class="card" routerLink="/products" routerLinkActive="active">
<div class="card-body position-relative bi bi-droplet-fill"> <div class="card-body position-relative bi bi-droplet-fill">
<h3 class="position-absolute m-0">{{'basic.products' | translate}}</h3>
<h3 class="position-absolute m-0">{{ 'basic.products' | translate }}</h3>
</div> </div>
</a> </a>
</div> </div>
<div class="col d-flex"> <div class="col d-flex">
<a class="card" routerLink="/tasks" routerLinkActive="active"> <a class="card" routerLink="/tasks" routerLinkActive="active">
<div class="card-body position-relative bi bi-list-check"> <div class="card-body position-relative bi bi-list-check">
<h3 class="position-absolute m-0">{{'basic.tasks' | translate}}</h3>
<h3 class="position-absolute m-0">{{ 'basic.tasks' | translate }}</h3>
</div> </div>
</a> </a>
</div> </div>
<div class="col d-flex"> <div class="col d-flex">
<a class="card" routerLink="/documents" routerLinkActive="active"> <a class="card" routerLink="/documents" routerLinkActive="active">
<div class="card-body position-relative bi bi-journals"> <div class="card-body position-relative bi bi-journals">
<h3 class="position-absolute m-0">{{'basic.documents' | translate}}</h3>
<h3 class="position-absolute m-0">{{ 'basic.documents' | translate }}</h3>
</div> </div>
</a> </a>
</div> </div>
@@ -99,19 +99,5 @@
</div> </div>
</div> </div>
</div> </div>

</div> </div>

</div> </div>
<ul>
<li *ngFor="let user of users">
<h2>{{ user.id }} - {{ user.lastName }}</h2>
<p>{{ user.email }}</p>
</li>
</ul>
<ul>
<li *ngFor="let post of posts">
<h2>{{ post.id }} - {{ post.owner }}</h2>
<p>{{ post.message }}</p>
</li>
</ul>

+ 1
- 1
matsen-tool/src/app/partners/partners-detail/partners-detail.component.html Просмотреть файл

@@ -27,7 +27,7 @@
</div> </div>
<div class="col-4"> <div class="col-4">
<img *ngIf="partner.logoUrl !== null && partner.logoUrl !== undefined" src="{{partner.logoUrl}}" width="247" <img *ngIf="partner.logoUrl !== null && partner.logoUrl !== undefined" src="{{partner.logoUrl}}" width="247"
height="94" alt="{{partner.name}}" title="{{partner.name}}"/>
height="94" alt="{{partner.name}}" title="{{partner.name}}" />
</div> </div>
<span class="position-absolute bi bi-pencil p-2" data-type="user-tool" data-action="edit" <span class="position-absolute bi bi-pencil p-2" data-type="user-tool" data-action="edit"
(click)="openModalEditPartner()"></span> (click)="openModalEditPartner()"></span>


+ 0
- 3
matsen-tool/src/app/partners/partners-detail/partners-detail.component.scss Просмотреть файл

@@ -1,3 +0,0 @@
.contacts {

}

+ 4
- 2
matsen-tool/src/app/partners/partners.component.html Просмотреть файл

@@ -28,7 +28,8 @@
</ng-container> </ng-container>


<ng-container matColumnDef="name"> <ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="{{ 'overview.sort' | translate }}: {{ partnerNameOne }}">
<th mat-header-cell *matHeaderCellDef mat-sort-header
sortActionDescription="{{ 'overview.sort' | translate }}: {{ partnerNameOne }}">
{{ partnerNameOne }} {{ partnerNameOne }}
</th> </th>
<td mat-cell *matCellDef="let element"><span role="button" <td mat-cell *matCellDef="let element"><span role="button"
@@ -48,7 +49,8 @@
</ng-container> </ng-container>


<ng-container matColumnDef="website"> <ng-container matColumnDef="website">
<th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="{{ 'overview.sort' | translate }}: {{ 'overview.website' | translate }}">
<th mat-header-cell *matHeaderCellDef mat-sort-header
sortActionDescription="{{ 'overview.sort' | translate }}: {{ 'overview.website' | translate }}">
{{ 'overview.website' | translate }} {{ 'overview.website' | translate }}
</th> </th>
<td mat-cell *matCellDef="let element"><a href="{{ element.website }}" <td mat-cell *matCellDef="let element"><a href="{{ element.website }}"


+ 0
- 11
matsen-tool/src/app/partners/partners.component.scss Просмотреть файл

@@ -1,11 +0,0 @@
table {
width: 100%;
img {
width: 40px;
height: auto;
}
}

th.mat-sort-header-sorted {
color: black;
}

+ 0
- 7
matsen-tool/src/app/products/products.component.scss Просмотреть файл

@@ -1,7 +0,0 @@
table {
width: 100%;
img {
width: 40px;
height: auto;
}
}

+ 19
- 0
matsen-tool/src/assets/scss/_table.scss Просмотреть файл

@@ -0,0 +1,19 @@
table {
width: 100%;
img {
width: 40px;
height: auto;
}
}

th.mat-sort-header-sorted {
color: black;
}

.mat-mdc-table {
.mdc-data-table__cell,
.mdc-data-table__header-cell {
padding-top: 8px;
padding-bottom: 8px;
}
}

+ 1
- 0
matsen-tool/src/styles.scss Просмотреть файл

@@ -4,5 +4,6 @@
@import "assets/scss/basics"; @import "assets/scss/basics";
@import "assets/scss/modal"; @import "assets/scss/modal";
@import "assets/scss/form"; @import "assets/scss/form";
@import "assets/scss/table";
@import "assets/scss/button"; @import "assets/scss/button";
@import "assets/scss/accordion"; @import "assets/scss/accordion";

Загрузка…
Отмена
Сохранить