-
+
Search
diff --git a/projects/lib-workspace/src/app/content/home/home.component.css b/projects/lib-workspace/src/app/content/home/home.component.css
index ef4c218..be7e5e3 100644
--- a/projects/lib-workspace/src/app/content/home/home.component.css
+++ b/projects/lib-workspace/src/app/content/home/home.component.css
@@ -5,9 +5,8 @@
justify-content: center;
}
-.docs-components .mat-card {
- height: 300px;
- width: 250px;
+.docs-components mat-card {
+ width: 380px;
margin: 8px;
cursor: pointer;
}
diff --git a/projects/lib-workspace/src/app/content/home/home.component.html b/projects/lib-workspace/src/app/content/home/home.component.html
index 5580b71..b54d0b2 100644
--- a/projects/lib-workspace/src/app/content/home/home.component.html
+++ b/projects/lib-workspace/src/app/content/home/home.component.html
@@ -1,23 +1,35 @@
+
+ Nav Frame
+
+
- Nav Frame
+
+
+ Calendar Panels
+
+
- Calendar Panels
+
+
+ Calendar Table
+
+
- Calendar Table
+
diff --git a/projects/ng-mat-components/src/fs-nav-frame/components/fs-nav-frame-item.ts b/projects/ng-mat-components/src/fs-nav-frame/components/fs-nav-frame-item.ts
deleted file mode 100644
index 4e4b9aa..0000000
--- a/projects/ng-mat-components/src/fs-nav-frame/components/fs-nav-frame-item.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { ChangeDetectionStrategy, Component, Input, OnInit, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core';
-import { FsNavFrameService, MenuState } from '../services/fs-nav-frame.service';
-
-@Component({
- selector: 'fs-nav-frame-item, a[fs-nav-frame-item], button[fs-nav-frame-item]',
- exportAs: 'fsNavFrameItem',
- template: `
-
-
-
- `,
- styles: [
- `
- .fs-nav-frame-item {
- height: 4rem;
- display: block;
- }
- `,
- ],
- encapsulation: ViewEncapsulation.None,
- changeDetection: ChangeDetectionStrategy.OnPush,
- host: {
- class: 'fs-nav-frame-item',
- },
- standalone: true,
- imports: [CommonModule],
-})
-export class FsNavFrameItem implements OnInit {
- @Input() routerLink: string | undefined;
- @ViewChild(TemplateRef) template: TemplateRef | undefined;
-
- closed: boolean = true;
- isActivePath: string = '';
-
- constructor(public frameService: FsNavFrameService) {
- this.frameService.menuStateEvent.subscribe(state => {
- if (state == MenuState.OPENED) {
- this.closed = false;
- } else {
- this.closed = true;
- }
- });
- }
-
- ngOnInit() {}
-}
diff --git a/projects/ng-mat-components/src/fs-nav-frame/components/fs-nav-frame-sidebar-item/fs-nav-frame-sidebar-item.component.scss b/projects/ng-mat-components/src/fs-nav-frame/components/fs-nav-frame-sidebar-item/fs-nav-frame-sidebar-item.component.scss
index 5bb47fd..00f4243 100644
--- a/projects/ng-mat-components/src/fs-nav-frame/components/fs-nav-frame-sidebar-item/fs-nav-frame-sidebar-item.component.scss
+++ b/projects/ng-mat-components/src/fs-nav-frame/components/fs-nav-frame-sidebar-item/fs-nav-frame-sidebar-item.component.scss
@@ -18,7 +18,7 @@ fs-nav-frame-sidebar-item button {
}
.icon {
- margin-left: 13px;
+ margin-left: 12px;
}
.title {
diff --git a/projects/ng-mat-components/src/fs-nav-frame/directives/fs-nav-frame-sidebar.directive.ts b/projects/ng-mat-components/src/fs-nav-frame/directives/fs-nav-frame-sidebar.directive.ts
deleted file mode 100644
index a94e4e6..0000000
--- a/projects/ng-mat-components/src/fs-nav-frame/directives/fs-nav-frame-sidebar.directive.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Directive } from '@angular/core';
-
-@Directive({
- selector: 'fs-nav-frame-sidebar, [fsNavFrameSidebar]',
- host: { class: 'fs-nav-frame-sidebar' },
-})
-export class FsNavFrameSidebarDirective {
- constructor() {}
-}
diff --git a/projects/ng-mat-components/src/fs-nav-frame/directives/fs-sidebar-item-icon.directive.ts b/projects/ng-mat-components/src/fs-nav-frame/directives/fs-sidebar-item-icon.directive.ts
deleted file mode 100644
index 787e86b..0000000
--- a/projects/ng-mat-components/src/fs-nav-frame/directives/fs-sidebar-item-icon.directive.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Directive } from '@angular/core';
-
-@Directive({
- selector: 'fs-sidebar-item-icon, [fsSidebarItemIcon]',
- host: { class: 'fs-sidebar-item-icon' },
-})
-export class FsSidebarItemIconDirective {
- constructor() {}
-}
diff --git a/projects/ng-mat-components/src/fs-nav-frame/directives/fs-sidebar-item-title.directive.ts b/projects/ng-mat-components/src/fs-nav-frame/directives/fs-sidebar-item-title.directive.ts
deleted file mode 100644
index d26cfd5..0000000
--- a/projects/ng-mat-components/src/fs-nav-frame/directives/fs-sidebar-item-title.directive.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Directive } from '@angular/core';
-
-@Directive({
- selector: 'fs-sidebar-item-title, [fsSidebarItemTitle]',
- host: { class: 'fs-sidebar-item-title' },
-})
-export class FsSidebarItemTitleDirective {
- constructor() {}
-}
diff --git a/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.component.html b/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.component.html
index e891adb..bb91278 100644
--- a/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.component.html
+++ b/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.component.html
@@ -2,7 +2,10 @@
- Bootstrap your Nav with this nice template and start right away with valuable content.
- The missing piece to the angular material components.
- The perfect complement to the calendar panels when it comes to several independent entries.
diff --git a/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.component.scss b/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.component.scss
index 371ff70..ffce2f6 100644
--- a/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.component.scss
+++ b/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.component.scss
@@ -26,10 +26,6 @@
flex-shrink: 0;
object-fit: cover;
}
-
- .material-icons {
- // font-size: 32px;
- }
}
.app-info-wrapper {
@@ -47,11 +43,10 @@
.app-version {
padding: 0 1rem;
- font-size: .9rem;
+ font-size: 0.9rem;
}
}
-
.app-info-wrapper.opened {
display: flex;
}
@@ -103,14 +98,14 @@ ul {
margin: 0;
padding: 0;
- >li {
+ > li {
position: relative;
display: inline-grid;
grid-template-columns: 1fr 3rem;
align-items: center;
width: 100%;
- >button:nth-child(1) {
+ > button:nth-child(1) {
width: 100%;
height: $sidebar-width-closed;
display: inline-flex;
@@ -123,10 +118,6 @@ ul {
text-overflow: ellipsis;
}
- .material-icons {
- padding-left: 4px;
- }
-
.link-name {
margin-left: 1rem;
white-space: nowrap;
@@ -172,4 +163,4 @@ ul {
right: 0;
bottom: 0;
z-index: 1;
-}
\ No newline at end of file
+}
diff --git a/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.module.ts b/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.module.ts
index 601528b..9a17357 100644
--- a/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.module.ts
+++ b/projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.module.ts
@@ -5,15 +5,10 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterModule } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
-import { MatListModule } from '@angular/material/list';
-import { FsNavFrameItem } from './components/fs-nav-frame-item';
import { FsNavFrameSidebar } from './components/fs-nav-frame-sidebar';
import { FsNavFrameSidebarItemComponent } from './components/fs-nav-frame-sidebar-item/fs-nav-frame-sidebar-item.component';
import { FsNavFrameContentDirective } from './directives/fs-nav-frame-content.directive';
-import { FsSidebarItemIconDirective } from './directives/fs-sidebar-item-icon.directive';
-import { FsSidebarItemTitleDirective } from './directives/fs-sidebar-item-title.directive';
import { FsNavFrameComponent } from './fs-nav-frame.component';
import { FsNavUserProfileActionsDirective } from './fs-nav-user-profile/directives/fs-nav-user-profile-actions.directive';
import { FsNavUserProfileNameDirective } from './fs-nav-user-profile/directives/fs-nav-user-profile-name.directive';
@@ -26,17 +21,7 @@ import { FsNavFrameToolbarComponent } from './nav-frame-toolbar/fs-nav-frame-too
import { FsNavFrameService } from './services/fs-nav-frame.service';
@NgModule({
- imports: [
- CommonModule,
- BrowserModule,
- BrowserAnimationsModule,
- RouterModule,
- FsNavFrameSidebar,
- FsNavFrameItem,
- MatIconModule,
- MatButtonModule,
- MatListModule,
- ],
+ imports: [CommonModule, BrowserModule, BrowserAnimationsModule, RouterModule, FsNavFrameSidebar, MatButtonModule],
exports: [
FsNavFrameComponent,
FsNavFrameToolbarComponent,
@@ -45,13 +30,8 @@ import { FsNavFrameService } from './services/fs-nav-frame.service';
FsNavFrameToolbarEndDirective,
FsNavFrameContentDirective,
-
- FsNavFrameItem,
FsNavFrameSidebar,
-
FsNavFrameSidebarItemComponent,
- FsSidebarItemTitleDirective,
- FsSidebarItemIconDirective,
FsNavUserProfileComponent,
FsNavUserProfileNameDirective,
@@ -66,10 +46,7 @@ import { FsNavFrameService } from './services/fs-nav-frame.service';
FsNavFrameToolbarEndDirective,
FsNavFrameContentDirective,
-
FsNavFrameSidebarItemComponent,
- FsSidebarItemTitleDirective,
- FsSidebarItemIconDirective,
FsNavUserProfileComponent,
FsNavUserProfileNameDirective,
diff --git a/projects/ng-mat-components/src/fs-nav-frame/fs-nav-user-profile/fs-nav-user-profile.component.html b/projects/ng-mat-components/src/fs-nav-frame/fs-nav-user-profile/fs-nav-user-profile.component.html
index 13b47c6..d7828c3 100644
--- a/projects/ng-mat-components/src/fs-nav-frame/fs-nav-user-profile/fs-nav-user-profile.component.html
+++ b/projects/ng-mat-components/src/fs-nav-frame/fs-nav-user-profile/fs-nav-user-profile.component.html
@@ -1,6 +1,14 @@
diff --git a/projects/ng-mat-components/src/fs-nav-frame/fs-nav-user-profile/fs-nav-user-profile.component.scss b/projects/ng-mat-components/src/fs-nav-frame/fs-nav-user-profile/fs-nav-user-profile.component.scss
index d4a4b1e..528a9bc 100644
--- a/projects/ng-mat-components/src/fs-nav-frame/fs-nav-user-profile/fs-nav-user-profile.component.scss
+++ b/projects/ng-mat-components/src/fs-nav-frame/fs-nav-user-profile/fs-nav-user-profile.component.scss
@@ -13,10 +13,19 @@ fs-nav-user-profile {
align-items: center;
button {
- width: 3rem;
- height: 3rem;
+ width: 3rem !important;
+ height: 3rem !important;
font-size: 3rem;
+ .mdc-button__label {
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ }
+
.pic {
height: 3rem;
width: 3rem;
@@ -70,4 +79,4 @@ fs-nav-user-profile {
.profile-content-wrapper.opened {
display: flex;
-}
\ No newline at end of file
+}
diff --git a/projects/ng-mat-components/src/fs-nav-frame/public-api.ts b/projects/ng-mat-components/src/fs-nav-frame/public-api.ts
index 15f0db5..c602187 100644
--- a/projects/ng-mat-components/src/fs-nav-frame/public-api.ts
+++ b/projects/ng-mat-components/src/fs-nav-frame/public-api.ts
@@ -1,9 +1,11 @@
+import { FsNavFrameSidebarItemComponent } from './components/fs-nav-frame-sidebar-item/fs-nav-frame-sidebar-item.component';
/*
* Public API Surface of ng-mat-components
*/
export { FsNavFrameContentDirective } from './directives/fs-nav-frame-content.directive';
-export { FsNavFrameSidebarDirective } from './directives/fs-nav-frame-sidebar.directive';
+export { FsNavFrameSidebar } from './components/fs-nav-frame-sidebar';
+export { FsNavFrameSidebarItemComponent } from './components/fs-nav-frame-sidebar-item/fs-nav-frame-sidebar-item.component';
export { FsNavFrameComponent } from './fs-nav-frame.component';
export { FsNavFrameModule } from './fs-nav-frame.module';
export * from './fs-nav-frame.modules';
@@ -15,5 +17,3 @@ export { FsNavFrameToolbarCenterDirective } from './nav-frame-toolbar/directives
export { FsNavFrameToolbarEndDirective } from './nav-frame-toolbar/directives/fs-nav-frame-toolbar-end.directive';
export { FsNavFrameToolbarStartDirective } from './nav-frame-toolbar/directives/fs-nav-frame-toolbar-start.directive';
export { FsNavFrameToolbarComponent } from './nav-frame-toolbar/fs-nav-frame-toolbar.component';
-
-
diff --git a/projects/ng-mat-components/styles/fs-nav-frame/_theming.scss b/projects/ng-mat-components/styles/fs-nav-frame/_theming.scss
index 71395d5..f7ec581 100644
--- a/projects/ng-mat-components/styles/fs-nav-frame/_theming.scss
+++ b/projects/ng-mat-components/styles/fs-nav-frame/_theming.scss
@@ -22,10 +22,14 @@
border-top: 1px solid map-get($foreground, 'divider');
}
- .sidebar .profile {
+ .sidebar .fs-nav-user-profile {
border-top: 1px solid map-get($foreground, 'divider');
}
+ .sidebar .profile-pic-button-wrapper svg {
+ fill: map-get($foreground, 'text');
+ }
+
$nav-link-border: 5px;
.fs-nav-frame-sidebar-item:has(button.active-link)::after {
@@ -67,4 +71,4 @@
border-radius: 50%;
}
-}
\ No newline at end of file
+}
From de457af1cc9277a2655966bcacc81872bec8c712 Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Sun, 17 Dec 2023 12:02:15 +0100
Subject: [PATCH 4/5] fix node version
---
.github/workflows/pull-request.yml | 4 ++--
.github/workflows/release.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index a2082e4..c0bd1d9 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -19,8 +19,8 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
- node-version: '16.x'
- registry-url: 'https://npm.pkg.github.com'
+ node-version-file: .nvmrc
+ registry-url: 'https://registry.npmjs.org'
scope: '@fullstack-devops'
- name: install packages
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6261efb..8fea0f1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,9 +24,9 @@ jobs:
uses: actions/checkout@v3
- name: Setup node for npmjs
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
- node-version: '16.x'
+ node-version-file: .nvmrc
registry-url: 'https://registry.npmjs.org'
scope: '@fullstack-devops'
From a40f906e3b2ff2106203661bc8f317f0200e04f8 Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Sun, 17 Dec 2023 12:02:15 +0100
Subject: [PATCH 5/5] fix node version
---
.nvmrc | 1 +
1 file changed, 1 insertion(+)
create mode 100644 .nvmrc
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 0000000..3f430af
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+v18