Skip to content

Commit a3f559f

Browse files
committed
...
1 parent 1b71bd4 commit a3f559f

File tree

9 files changed

+49
-68
lines changed

9 files changed

+49
-68
lines changed

.github/workflows/release.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ jobs:
2222
steps:
2323
- name: Checkout code
2424
uses: actions/checkout@v3
25-
- name: Setup awesome-ci
26-
uses: fullstack-devops/awesome-ci-action@main
27-
- name: Setup node
25+
26+
- name: Setup node for GitHub
2827
uses: actions/setup-node@v3
2928
with:
3029
node-version: "16.x"
@@ -36,18 +35,29 @@ jobs:
3635
- name: build applikation
3736
run: yarn run build
3837

39-
# - name: set publish config
40-
# shell: bash
41-
# run: npm config set //registry.npmjs.org/:_authToken ${{ secrets.GITHUB_TOKEN }}
42-
43-
- name: npm publish
38+
- name: npm publish to GitHub
4439
working-directory: dist/ng-mat-components
4540
run: |
4641
npm version ${{ needs.create_release.outputs.version }}
4742
npm publish
4843
env:
4944
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5045

46+
- name: Setup node for npmjs
47+
uses: actions/setup-node@v3
48+
with:
49+
node-version: "16.x"
50+
registry-url: "https://registry.npmjs.org"
51+
scope: "@fullstack-devops"
52+
53+
54+
- name: npm publish to npmjs
55+
working-directory: dist/ng-mat-components
56+
run: |
57+
npm publish
58+
env:
59+
NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
60+
5161
- name: Publish release
5262
run: awesome-ci release publish -releaseid "${{ needs.create_release.outputs.releaseid }}"
5363
env:

.vscode/settings.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,11 @@
1313
},
1414
"javascript.updateImportsOnFileMove.enabled": "always",
1515
"typescript.updateImportsOnFileMove.enabled": "always",
16-
"[typescript]": {
17-
"editor.defaultFormatter": "esbenp.prettier-vscode",
18-
"editor.codeActionsOnSave": {
19-
"source.organizeImports": true
20-
}
21-
},
2216
"angular.enable-strict-mode-prompt": false,
2317
"files.associations": {
2418
".env*": "shell"
2519
},
26-
"[html]": {
27-
"editor.defaultFormatter": "esbenp.prettier-vscode"
28-
}
20+
"[yaml]": {
21+
"editor.defaultFormatter": "redhat.vscode-yaml"
22+
},
2923
}

projects/lib-workspace/src/app/app.component.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
<fs-ui-frame
2-
[frameConfig]="frameConfig"
3-
[navUser]="navUser"
4-
[appRoutes]="appRoutes"
5-
(event)="onEvent($event)"
6-
>
1+
<fs-ui-frame [frameConfig]="frameConfig" [navUser]="navUser" [appRoutes]="appRoutes" (event)="onEvent($event)">
72
<fs-ui-frame-toolbar>
83
<fs-ui-frame-toolbar-title>Current App Title</fs-ui-frame-toolbar-title>
94

projects/lib-workspace/src/assets/docs/calendar/api-panles.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
## installation
1+
# API reference for Calendar Panels
22

33
```javascript
44
import { FsCalendarModule } from "@fullstack-devops/ng-mat-components";
55
```
66

7-
## html
7+
## HTML
88

99
```html
1010
<div style="height: 80%">
@@ -21,7 +21,7 @@ import { FsCalendarModule } from "@fullstack-devops/ng-mat-components";
2121
</div>
2222
```
2323

24-
## ts
24+
## TS
2525

2626
```typescript
2727
// ...

projects/lib-workspace/src/assets/docs/calendar/api-table.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import { FsCalendarModule } from "@fullstack-devops/ng-mat-components";
55
```
66

7-
## Html
7+
## HTML
88

99
```html
1010
<section class="mat-elevation-z4">
@@ -14,7 +14,7 @@ import { FsCalendarModule } from "@fullstack-devops/ng-mat-components";
1414
</section>
1515
```
1616

17-
## Ts
17+
## TS
1818

1919
```typescript
2020
// ...

projects/ng-mat-components/_theming.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
@mixin theme($theme) {
66
// Extract whichever individual palettes you need from the theme.
77
$primary: map-get($theme, primary);
8+
$primaryContrast: map-get($primary, contrast);
89
$accent: map-get($theme, accent);
910
// Gets the standard material maps of fore/background
1011
$background: map-get($theme, "background");
@@ -134,10 +135,10 @@
134135
.fs-calendar-table .box-base {
135136
background-color: mat-color($foreground, "divider");
136137
}
137-
.date-today {
138-
background-color: mat-color($primary, "default");
138+
.fs-calendar-table .date-today {
139+
background-color: mat-color($primary, "main") !important;
139140
border-radius: 4px;
140-
color: mat-color($primary, "secondary-text");
141+
color: mat-color($primaryContrast, "main") !important;
141142
}
142143
}
143144

projects/ng-mat-components/src/lib/fs-calendar/_theming.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
$foreground: map-get($theme, "foreground");
1212

1313
// Use mat-color to extract individual colors from a palette as necessary.
14-
.svg-icon svg {
14+
/* .svg-icon svg {
1515
fill: mat-color($foreground, "text");
1616
}
1717
1818
.date-today {
1919
background-color: mat-color($primary, "lighter");
2020
border-radius: 4px;
21-
}
21+
} */
2222
}

projects/ng-mat-components/src/lib/fs-calendar/calendar-table/fs-calendar-table.component.html

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,24 @@
11
<table *ngIf="!isLoading">
22
<thead role="rowgroup">
33
<tr>
4-
<th><ng-content select="fs-calendar-table-name"></ng-content></th>
54
<th>
6-
<button
7-
mat-icon-button
8-
class="fs-calendar-switches"
9-
(click)="onMonthBackward()"
10-
>
11-
<svg
12-
xmlns="http://www.w3.org/2000/svg"
13-
viewBox="0 0 24 24"
14-
width="24px"
15-
height="24px"
16-
>
5+
<ng-content select="fs-calendar-table-name"></ng-content>
6+
</th>
7+
<th>
8+
<button mat-icon-button class="fs-calendar-switches" (click)="onMonthBackward()">
9+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24px" height="24px">
1710
<path d="M0 0h24v24H0V0z" fill="none" />
18-
<path
19-
d="M15.41 16.59L10.83 12l4.58-4.59L14 6l-6 6 6 6 1.41-1.41z"
20-
/>
11+
<path d="M15.41 16.59L10.83 12l4.58-4.59L14 6l-6 6 6 6 1.41-1.41z" />
2112
</svg>
2213
</button>
2314
</th>
24-
<th
25-
*ngFor="let day of currentMonth.days"
26-
[class.date-today]="isToday(day.date)"
27-
>
15+
<th *ngFor="let day of currentMonth.days" [class.date-today]="isToday(day.date)">
2816
{{ day._meta?.dayNumber }} <br />
2917
{{ day.date | date: "EEEEEE" }}
3018
</th>
3119
<th>
32-
<button
33-
mat-icon-button
34-
class="fs-calendar-switches"
35-
(click)="onMonthForward()"
36-
>
37-
<svg
38-
xmlns="http://www.w3.org/2000/svg"
39-
viewBox="0 0 24 24"
40-
width="24px"
41-
height="24px"
42-
>
20+
<button mat-icon-button class="fs-calendar-switches" (click)="onMonthForward()">
21+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24px" height="24px">
4322
<path d="M0 0h24v24H0V0z" fill="none" />
4423
<path d="M8.59 16.59L13.17 12 8.59 7.41 10 6l6 6-6 6-1.41-1.41z" />
4524
</svg>
@@ -53,11 +32,8 @@
5332
<td colspan="2">{{ entry.name }}</td>
5433
<td *ngFor="let day of entry.data" [class.tooltip]="day.toolTip">
5534
<span class="tooltiptext" *ngIf="day.toolTip">{{ day.toolTip }}</span>
56-
<div
57-
class="box box-base"
58-
[style.backgroundColor]="day.colors?.backgroundColor"
59-
[style.color]="day.colors?.color"
60-
>
35+
<div class="box box-base" [style.backgroundColor]="day.colors?.backgroundColor"
36+
[style.color]="day.colors?.color">
6137
{{ day.char }}
6238
</div>
6339
</td>

projects/ng-mat-components/src/lib/fs-calendar/calendar-table/fs-calendar-table.component.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ export class FsCalendarTableComponent implements OnInit {
6060
}
6161

6262
genMonthData() {
63+
this.currentMonth = this.calendarService.generateMonth(
64+
this._yearNumber,
65+
this._monthNumber,
66+
[]
67+
);
6368
this._dataSource.forEach((item: CalendarTableEntry, index: number) => {
6469
this.tableData.splice(index, 1, {
6570
name: item.name,

0 commit comments

Comments
 (0)