Skip to content
This repository has been archived by the owner on Dec 9, 2022. It is now read-only.

Commit

Permalink
Merge pull request #211 from livepoll/develop
Browse files Browse the repository at this point in the history
Continuous release
  • Loading branch information
marcauberer authored Apr 8, 2021
2 parents d275e48 + 2143163 commit 7420e9d
Show file tree
Hide file tree
Showing 160 changed files with 6,053 additions and 2,706 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ name: Angular CI

on:
push:
branches: [ main, develop ]
paths-ignore: [ 'README.md', 'SECURITY.md', '.git**' ]
pull_request:
branches: [ main, develop ]
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ Thumbs.db

# Themes are generated at build time
/src/assets/themes/

# Logfiles
debug.log
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Live-Poll
Copyright (c) 2020-2021 Live-Poll

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Live-Poll
![Maven Build](https://github.com/livepoll/live-poll/workflows/Angular%20CI/badge.svg)
![NPM Build](https://github.com/livepoll/live-poll/workflows/Angular%20CI/badge.svg)
![Docker Build](https://img.shields.io/github/workflow/status/livepoll/live-poll/Angular%20Deploy?label=Docker%20build)
[![Quality Gate Status](https://sonarqube.live-poll.de/api/project_badges/measure?project=live-poll&metric=alert_status)](https://sonarqube.live-poll.de/dashboard?id=live-poll)
[![codecov](https://codecov.io/gh/livepoll/live-poll/branch/master/graph/badge.svg)](https://codecov.io/gh/livepoll/live-poll)
Expand All @@ -17,4 +17,4 @@ The development version is live here: [dev.live-poll.de](https://dev.live-poll.d
## Security policy
If you want to report a security vulnerability, please read our security policy in the [SECURITY.md](https://github.com/StudentsAgainstCovid19/corona-aid/blob/master/SECURITY.md) file.

© Live-Poll 2020
© Live-Poll 2020-2021
16 changes: 12 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
"glob": "**/*",
"input": "./node_modules/@ant-design/icons-angular/src/inline-svg/",
"output": "/assets/"
}
},
"src/manifest.json",
"src/ngsw-worker.js"
],
"styles": [
"src/styles.sass",
Expand Down Expand Up @@ -68,7 +70,9 @@
"maximumWarning": "6kb",
"maximumError": "10kb"
}
]
],
"serviceWorker": true,
"ngswConfigPath": "ngsw-config.json"
},
"staging": {
"fileReplacements": [
Expand Down Expand Up @@ -132,13 +136,17 @@
"karmaConfig": "karma.conf.js",
"assets": [
"src/favicon.ico",
"src/assets"
"src/assets",
"src/manifest.json"
],
"styles": [
"src/styles.sass",
"src/animations.sass"
],
"scripts": []
"scripts": [
"src/service-worker.js",
"node_modules/cookieconsent/build/cookieconsent.min.js"
]
}
},
"lint": {
Expand Down
2 changes: 1 addition & 1 deletion e2e/protractor.conf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Live-Poll 2020. All rights reserved
* Copyright © Live-Poll 2020-2021. All rights reserved
*/

// @ts-check
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Live-Poll 2020. All rights reserved
* Copyright © Live-Poll 2020-2021. All rights reserved
*/

import {AppPage} from './app.po';
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/app.po.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Live-Poll 2020. All rights reserved
* Copyright © Live-Poll 2020-2021. All rights reserved
*/

import {browser, by, element} from 'protractor';
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © Live-Poll 2020. All rights reserved
* Copyright © Live-Poll 2020-2021. All rights reserved
*/

// Karma configuration file, see link for more information
Expand Down
30 changes: 30 additions & 0 deletions ngsw-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"$schema": "./node_modules/@angular/service-worker/config/schema.json",
"index": "/index.html",
"assetGroups": [
{
"name": "app",
"installMode": "prefetch",
"resources": {
"files": [
"/favicon.ico",
"/index.html",
"/manifest.json",
"/*.css",
"/*.js"
]
}
},
{
"name": "assets",
"installMode": "lazy",
"updateMode": "prefetch",
"resources": {
"files": [
"/assets/**",
"/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)"
]
}
}
]
}
Loading

0 comments on commit 7420e9d

Please sign in to comment.