diff --git a/matsen-tool/src/app/_components/toggle/toggle.component.html b/matsen-tool/src/app/_components/toggle/toggle.component.html index 6e84b9b..f701809 100644 --- a/matsen-tool/src/app/_components/toggle/toggle.component.html +++ b/matsen-tool/src/app/_components/toggle/toggle.component.html @@ -1,5 +1,5 @@
- diff --git a/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.html b/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.html index fda3e4d..b788d81 100644 --- a/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.html +++ b/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.html @@ -24,59 +24,58 @@
-
-
-
-

{{'basic.posts' | translate}}

- -
-
-
-
-
-

{{ post.createdAt | date:'dd.MM.YYYY' }}

-

{{ post.ownerName }}

-
-
-

{{ post.headline }}

-

-
- -
-
-
-
+ +
+
+ +
+
-

{{ comment.createdAt | date:'dd.MM.YYYY' }}

-

{{ comment.ownerName }}

+

{{ post.createdAt | date:'dd.MM.YYYY' }}

+

{{ post.ownerName }}

-

+

{{ post.headline }}

+

+
+ +
+
+
+
+
+
+

{{ comment.createdAt | date:'dd.MM.YYYY' }}

+

{{ comment.ownerName }}

+
+
+

+
+
-
-
-
- - {{ 'basic.hide-comments' | translate }} - {{ 'basic.show-comments' | translate }} - - {{'basic.comment-it' | translate}} +
+ + {{ 'basic.hide-comments' | translate }} + {{ 'basic.show-comments' | translate }} + + {{'basic.comment-it' | translate}} +
+ +
- -
-
+ diff --git a/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.ts b/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.ts index d749a78..d456358 100644 --- a/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.ts +++ b/matsen-tool/src/app/contacts/contacts-detail/contacts-detail.component.ts @@ -127,6 +127,8 @@ export class ContactsDetailComponent implements OnInit, AfterViewInit { let posting: PostJsonld = {} as PostJsonld; posting.contact = this.contact.id ?? null; posting.partner = this.contact.partner ?? null; + // TODO: REAL PRODUCT + posting.product = "/api/products/101"; modalRefPosting.componentInstance.posting = posting; modalRefPosting.componentInstance.submit.subscribe((modalStatus: ModalStatus) => { if (modalStatus === ModalStatus.Submitted) { diff --git a/matsen-tool/src/app/home/home.component.html b/matsen-tool/src/app/home/home.component.html index 55d4e42..b8d07aa 100644 --- a/matsen-tool/src/app/home/home.component.html +++ b/matsen-tool/src/app/home/home.component.html @@ -61,66 +61,65 @@
-
-
-

{{'user.my' | translate}} {{'basic.tasks' | translate}}

- -
-
-
- -
-
-

-

Zugewiesen an: {{task.assignedToName}}

- + +
+ +
+
+ -
-
- -
-
-
-

{{ taskNote.createdAt | date:'dd.MM.YYYY' }}

-

{{ taskNote.ownerName }}

-
-
-

{{ taskNote.message }}

+
+
+

+

Zugewiesen an: {{task.assignedToName}}

+
-
- + +
+
+
+

{{ taskNote.createdAt | date:'dd.MM.YYYY' }}

+

{{ taskNote.ownerName }}

+
+
+

{{ taskNote.message }}

+
+ +
+
+
-
- - {{ 'basic.hide-comments' | translate }} - {{ 'basic.show-comments' | translate }} - - {{'basic.comment-it' | translate}} +
+ + {{ 'basic.hide-comments' | translate }} + {{ 'basic.show-comments' | translate }} + + {{'basic.comment-it' | translate}} +
+ +
- - -
+
diff --git a/matsen-tool/src/app/layout/two-column/two-column.component.html b/matsen-tool/src/app/layout/two-column/two-column.component.html index 9bb4234..d4463d1 100644 --- a/matsen-tool/src/app/layout/two-column/two-column.component.html +++ b/matsen-tool/src/app/layout/two-column/two-column.component.html @@ -52,7 +52,7 @@
-
+
diff --git a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html index c677b29..94620e2 100644 --- a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html +++ b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html @@ -48,11 +48,9 @@
-
-
- -
+
+
@@ -91,10 +89,8 @@
-
-
- -
+
+
-
-
- -
+
+
diff --git a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts index 3070e54..0984671 100644 --- a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts +++ b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts @@ -295,6 +295,8 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit { const modalRefPosting = this.modalService.open(NewPostingComponent, this.modalOptions); let posting: PostJsonld = {} as PostJsonld; posting.partner = this.partner.id ?? null; + // TODO: REAL PRODUCT + posting.product = "/api/products/101"; modalRefPosting.componentInstance.posting = posting; modalRefPosting.componentInstance.submit.subscribe((modalStatus: ModalStatus) => { if (modalStatus === ModalStatus.Submitted) { diff --git a/matsen-tool/src/app/postings/new-posting/new-posting.component.ts b/matsen-tool/src/app/postings/new-posting/new-posting.component.ts index 30275a0..879fb19 100644 --- a/matsen-tool/src/app/postings/new-posting/new-posting.component.ts +++ b/matsen-tool/src/app/postings/new-posting/new-posting.component.ts @@ -2,7 +2,7 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {ModalStatus} from "@app/_helpers/modal.states"; import {FormGroup} from "@angular/forms"; import {postForm} from "@app/_forms/apiForms"; -import {PostJsonld, PostService} from "@app/core/api/v1"; +import {PartnerJsonld, PostJsonld, PostService} from "@app/core/api/v1"; import {FormGroupInitializer} from "@app/_helpers/formgroup.initializer"; import {ApiConverter} from "@app/_helpers/api.converter"; import {Subscription} from "rxjs"; diff --git a/matsen-tool/src/app/sales/sales-detail/sales-detail.component.html b/matsen-tool/src/app/sales/sales-detail/sales-detail.component.html index e0ab762..644a463 100644 --- a/matsen-tool/src/app/sales/sales-detail/sales-detail.component.html +++ b/matsen-tool/src/app/sales/sales-detail/sales-detail.component.html @@ -23,59 +23,58 @@
-
-
-
-

{{'basic.posts' | translate}}

- -
-
-
-
-
-

{{ post.createdAt | date:'dd.MM.YYYY' }}

-

{{ post.ownerName }}

-
-
-

{{ post.headline }}

-

-
- -
-
-
-
+ +
+
+ +
+
-

{{ comment.createdAt | date:'dd.MM.YYYY' }}

-

{{ comment.ownerName }}

+

{{ post.createdAt | date:'dd.MM.YYYY' }}

+

{{ post.ownerName }}

-

+

{{ post.headline }}

+

+
+ +
+
+
+
+
+
+

{{ comment.createdAt | date:'dd.MM.YYYY' }}

+

{{ comment.ownerName }}

+
+
+

+
+
-
-
-
- - {{ 'basic.hide-comments' | translate }} - {{ 'basic.show-comments' | translate }} - - {{'basic.comment-it' | translate}} +
+ + {{ 'basic.hide-comments' | translate }} + {{ 'basic.show-comments' | translate }} + + {{'basic.comment-it' | translate}} +
+ +
- -
-
\ No newline at end of file + \ No newline at end of file diff --git a/matsen-tool/src/assets/scss/_basics.scss b/matsen-tool/src/assets/scss/_basics.scss index c31fae7..abd12e0 100644 --- a/matsen-tool/src/assets/scss/_basics.scss +++ b/matsen-tool/src/assets/scss/_basics.scss @@ -1,5 +1,11 @@ -html, body { height: 100%; } -body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; } +html, body { + height: 100%; +} + +body { + margin: 0; + font-family: Roboto, "Helvetica Neue", sans-serif; +} body { background: #d2d2d2; @@ -27,6 +33,7 @@ img { } .spt-container { + min-height: 1px; margin-bottom: 3rem; } @@ -39,12 +46,15 @@ img { position: absolute; right: 0; top: -16px; + &[data-importance="low"] { background: #77bb33; } + &[data-importance="medium"] { background: #ffee55; } + &[data-importance="high"] { background: #bb1414; } @@ -58,6 +68,52 @@ img { } } +.toggle { + background: $color-matsen; + color: #fff; + padding: 3px 10px 3px 40px; + border-radius: 6px; + margin-bottom: 1rem; + position: relative; + cursor: pointer; + + * { + margin: 0 !important; + } + + &:before, + &:after { + content: ""; + position: absolute; + top: 17px; + width: 15px; + height: 2px; + background: #fff; + @include transition(); + } + + &:before { + transform: rotate(45deg); + left: 10px; + } + + &:after { + transform: rotate(-45deg); + left: 20px; + } + &.collapsed { + &:before { + transform: rotate(-45deg); + } + &:after { + transform: rotate(45deg); + } + } +} + .toggle-btn { - margin-top: -3.25rem; -} \ No newline at end of file + position: absolute; + right: 0; + top: -3.38rem; +} + diff --git a/matsen-tool/src/assets/scss/_form.scss b/matsen-tool/src/assets/scss/_form.scss index d0b697a..ce2e667 100644 --- a/matsen-tool/src/assets/scss/_form.scss +++ b/matsen-tool/src/assets/scss/_form.scss @@ -5,7 +5,7 @@ align-items: center; cursor: pointer; padding: 2px 0; - border-radius: 5px; + border-radius: 6px; @include transition(); &:hover { background: $color-matsen; diff --git a/matsen-tool/src/assets/scss/_sales.scss b/matsen-tool/src/assets/scss/_sales.scss index b1ff5cd..239dd31 100644 --- a/matsen-tool/src/assets/scss/_sales.scss +++ b/matsen-tool/src/assets/scss/_sales.scss @@ -1,15 +1,15 @@ .sales-summary-container { .sales-summary-bar { - border-radius: 5px; + border-radius: 6px; background: #bbb; margin: 0 0 0.5rem 0; div { animation: expand 2.5s ease; - border-radius: 5px; + border-radius: 6px; span { display: block; - border-radius: 5px; + border-radius: 6px; padding: 15px; white-space: nowrap; }