Skip to content

Commit 9733b04

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # angular.json # package.json # pnpm-lock.yaml # tsconfig.json
2 parents 3d63943 + d13bb11 commit 9733b04

File tree

4 files changed

+50
-33
lines changed

4 files changed

+50
-33
lines changed

.github/workflows/ci.yml

+23-14
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,34 @@ jobs:
1111
- name: Checkout
1212
uses: actions/checkout@v2
1313
- name: Set up Node 16
14-
uses: actions/setup-node@v1
14+
uses: actions/setup-node@v3
1515
with:
1616
node-version: '16'
17-
- name: Install PNPM
18-
run: npm install -g pnpm
19-
- name: Cache PNPM Store
20-
uses: actions/cache@v2
17+
- uses: pnpm/[email protected]
18+
name: Install pnpm
19+
id: pnpm-install
2120
with:
22-
path: |
23-
~/.pnpm-store
24-
/.pnpm-store
25-
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
26-
restore-keys: ${{ runner.os }}-pnpm
21+
version: 7
22+
run_install: false
23+
- name: Get pnpm store directory
24+
id: pnpm-cache
25+
run: |
26+
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
27+
- uses: actions/cache@v3
28+
name: Setup pnpm cache
29+
with:
30+
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
31+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
32+
restore-keys: |
33+
${{ runner.os }}-pnpm-store-
2734
- name: Install
2835
run: pnpm install
2936
- name: Build
3037
run: pnpm build
31-
- name: Deploy
38+
- name: Deploy to Pages
3239
if: github.ref == 'refs/heads/master'
33-
env:
34-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
35-
run: pnpm run -- ng deploy --no-build --cname=app.clashsoft.de --name=Clashsoft --email=${{ secrets.EMAIL }}
40+
uses: peaceiris/actions-gh-pages@v3
41+
with:
42+
github_token: ${{ secrets.GITHUB_TOKEN }}
43+
publish_dir: dist/clashsoft-apps/
44+
cname: app.clashsoft.de
+18-16
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
<div class="card-header">
2-
<ng-content select="[header]"></ng-content>
3-
</div>
4-
<div class="card-body">
5-
<h5 class="card-title">
6-
{{title}}
7-
<span class="badge bg-secondary" *ngIf="wip">WIP</span>
8-
</h5>
9-
<p class="card-text">
10-
<ng-content select="[description]"></ng-content>
11-
</p>
12-
</div>
13-
<div class="card-footer">
14-
<a [routerLink]="id" role="button" class="btn btn-{{color}} btn-lg">
15-
Open
16-
</a>
1+
<div class="card h-100 shadow">
2+
<div class="card-header">
3+
<ng-content select="[header]"></ng-content>
4+
</div>
5+
<div class="card-body">
6+
<h5 class="card-title">
7+
{{title}}
8+
<span class="badge bg-secondary" *ngIf="wip">WIP</span>
9+
</h5>
10+
<p class="card-text">
11+
<ng-content select="[description]"></ng-content>
12+
</p>
13+
</div>
14+
<div class="card-footer">
15+
<a [routerLink]="id" role="button" class="btn btn-{{color}} btn-lg">
16+
Open
17+
</a>
18+
</div>
1719
</div>
+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.card {
2+
transition: all .5s;
3+
}
4+
5+
.card:hover {
6+
z-index: 1;
7+
transform: scale(1.05);
8+
}

src/app/app-card/app-card.component.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, HostBinding, Input} from '@angular/core';
1+
import {Component, Input} from '@angular/core';
22

33
@Component({
44
selector: 'app-app-card',
@@ -10,6 +10,4 @@ export class AppCardComponent {
1010
@Input() title!: string;
1111
@Input() wip?: boolean;
1212
@Input() color!: string;
13-
14-
@HostBinding('class') hostClass = 'card h-100';
1513
}

0 commit comments

Comments
 (0)