Skip to content

Commit 383c07b

Browse files
authored
Merge pull request #40 from SwimResults/develop
`v1.0.6` PWA
2 parents 2f35d1c + ff30e80 commit 383c07b

36 files changed

Lines changed: 11493 additions & 7937 deletions

.github/workflows/node.js.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ on:
1111
workflow_dispatch:
1212

1313
env:
14-
NODE_VERSION: 18.x
15-
CLI_VERSION: 14.2.1
16-
14+
NODE_VERSION: 20.x
15+
CLI_VERSION: 17.0.3
16+
1717
# Use docker.io for Docker Hub if empty
1818
REGISTRY: ghcr.io
1919
# github.repository as <account>/<repo>
@@ -22,7 +22,7 @@ env:
2222
jobs:
2323
install:
2424
runs-on: ubuntu-latest
25-
25+
2626
steps:
2727
- uses: actions/checkout@v3
2828
- name: Use Node.js ${{ env.NODE_VERSION }}
@@ -34,11 +34,11 @@ jobs:
3434

3535
test:
3636
runs-on: ubuntu-latest
37-
37+
3838
strategy:
3939
matrix:
4040
Test: [Test,Lint]
41-
41+
4242
needs: install
4343

4444
steps:
@@ -56,10 +56,10 @@ jobs:
5656

5757
build:
5858
runs-on: ubuntu-latest
59-
59+
6060
needs: test
6161
if: github.event_name != 'pull_request'
62-
62+
6363
steps:
6464
- uses: actions/checkout@v3
6565
- name: Use Node.js ${{ env.NODE_VERSION }}
@@ -83,19 +83,19 @@ jobs:
8383
if: github.event_name != 'pull_request'
8484
steps:
8585
- uses: actions/checkout@v3
86-
86+
8787
# Install the cosign tool except on PR
8888
# https://github.com/sigstore/cosign-installer
8989
- name: Install cosign
9090
if: github.event_name != 'pull_request'
9191
uses: sigstore/[email protected]
9292
with:
9393
cosign-release: 'v2.1.1'
94-
94+
9595
# Workaround: https://github.com/docker/build-push-action/issues/461
9696
- name: Setup Docker buildx
9797
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
98-
98+
9999
# Login against a Docker registry except on PR
100100
# https://github.com/docker/login-action
101101
- name: Log into registry ${{ env.REGISTRY }}
@@ -113,8 +113,8 @@ jobs:
113113
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
114114
with:
115115
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
116-
117-
116+
117+
118118
- name: Use cached build output
119119
uses: actions/cache@v2
120120
env:

angular.json

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,19 @@
2525
],
2626
"tsConfig": "tsconfig.app.json",
2727
"assets": [
28-
"src/favicon.ico",
29-
"src/assets"
30-
],
28+
"src/favicon.ico",
29+
"src/assets",
30+
"src/manifest.webmanifest"
31+
],
3132
"styles": [
3233
"@angular/material/prebuilt-themes/indigo-pink.css",
3334
"src/styles.scss",
3435
"src/material.scss",
3536
"src/colors.scss"
3637
],
37-
"scripts": []
38+
"scripts": [],
39+
"serviceWorker": true,
40+
"ngswConfigPath": "ngsw-config.json"
3841
},
3942
"configurations": {
4043
"production": {
@@ -93,22 +96,22 @@
9396
"serve": {
9497
"builder": "@angular-devkit/build-angular:dev-server",
9598
"configurations": {
96-
"production": {
97-
"browserTarget": "swimresults:build:production"
99+
"production": {
100+
"buildTarget": "swimresults:build:production"
98101
},
99-
"test": {
100-
"browserTarget": "swimresults:build:test"
102+
"test": {
103+
"buildTarget": "swimresults:build:test"
101104
},
102-
"development": {
103-
"browserTarget": "swimresults:build:development"
105+
"development": {
106+
"buildTarget": "swimresults:build:development"
104107
}
105108
},
106109
"defaultConfiguration": "development"
107110
},
108111
"extract-i18n": {
109112
"builder": "@angular-devkit/build-angular:extract-i18n",
110-
"options": {
111-
"browserTarget": "swimresults:build"
113+
"options": {
114+
"buildTarget": "swimresults:build"
112115
}
113116
},
114117
"test": {
@@ -120,9 +123,10 @@
120123
],
121124
"tsConfig": "tsconfig.spec.json",
122125
"assets": [
123-
"src/favicon.ico",
124-
"src/assets"
125-
],
126+
"src/favicon.ico",
127+
"src/assets",
128+
"src/manifest.webmanifest"
129+
],
126130
"styles": [
127131
"@angular/material/prebuilt-themes/indigo-pink.css",
128132
"src/styles.scss",

favicon.ico

14.7 KB
Binary file not shown.

ngsw-config.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"$schema": "./node_modules/@angular/service-worker/config/schema.json",
3+
"index": "/index.html",
4+
"assetGroups": [
5+
{
6+
"name": "app",
7+
"installMode": "prefetch",
8+
"resources": {
9+
"files": [
10+
"/favicon.ico",
11+
"/index.html",
12+
"/manifest.webmanifest",
13+
"/*.css",
14+
"/*.js"
15+
]
16+
}
17+
},
18+
{
19+
"name": "assets",
20+
"installMode": "lazy",
21+
"updateMode": "prefetch",
22+
"resources": {
23+
"files": [
24+
"/assets/**",
25+
"!/assets/release.txt",
26+
"/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)"
27+
]
28+
}
29+
}
30+
]
31+
}

0 commit comments

Comments
 (0)