Skip to content

Commit 206ed69

Browse files
authored
Merge pull request #4 from Bernardo-MG/develop
Develop
2 parents 49bcf08 + 51f5e41 commit 206ed69

File tree

107 files changed

+7601
-17096
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+7601
-17096
lines changed

.browserslistrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ last 2 Edge major versions
1414
last 2 Safari major versions
1515
last 2 iOS major versions
1616
Firefox ESR
17-
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

.eslintrc.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@
88
"files": [
99
"*.ts"
1010
],
11-
"parserOptions": {
12-
"project": [
13-
"tsconfig.json"
14-
],
15-
"createDefaultProgram": true
16-
},
1711
"extends": [
12+
"eslint:recommended",
13+
"plugin:@typescript-eslint/recommended",
1814
"plugin:@angular-eslint/recommended",
1915
"plugin:@angular-eslint/template/process-inline-templates"
2016
],
@@ -23,15 +19,15 @@
2319
"error",
2420
{
2521
"type": "attribute",
26-
"prefix": ["app", "navigation", "login", "logout", "data"],
22+
"prefix": ["app", "authentication", "business", "icon", "layout", "login", "logout", "navigation", "view"],
2723
"style": "camelCase"
2824
}
2925
],
3026
"@angular-eslint/component-selector": [
3127
"error",
3228
{
3329
"type": "element",
34-
"prefix": ["app", "navigation", "login", "logout", "data"],
30+
"prefix": ["app", "authentication", "business", "icon", "layout", "login", "logout", "navigation", "view"],
3531
"style": "kebab-case"
3632
}
3733
]

.github/workflows/testing.yml

Lines changed: 6 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -3,71 +3,11 @@ name: Testing and validation
33
on: [push, pull_request]
44

55
jobs:
6-
7-
linting:
8-
name: Linting
9-
runs-on: ubuntu-latest
10-
strategy:
11-
matrix:
12-
node: [ 16.x ]
13-
14-
steps:
15-
- name: Check-out
16-
uses: actions/checkout@v2
17-
- name: Set up Node.js ${{ matrix.node }}
18-
uses: actions/setup-node@v2
19-
with:
20-
node-version: ${{ matrix.node }}
21-
cache: 'npm'
22-
- name: Install dependencies
23-
run: npm ci
24-
- name: Install Angular CLI
25-
run: npm install -g @angular/cli
26-
- name: Run linter
27-
run: npm run lint
28-
29-
test:
30-
name: Tests
31-
needs: linting
32-
runs-on: ubuntu-latest
33-
strategy:
34-
matrix:
35-
node: [ 16.x ]
36-
37-
steps:
38-
- name: Check-out
39-
uses: actions/checkout@v2
40-
- name: Set up Node.js ${{ matrix.node }}
41-
uses: actions/setup-node@v2
42-
with:
43-
node-version: ${{ matrix.node }}
44-
cache: 'npm'
45-
- name: Install dependencies
46-
run: npm ci
47-
- name: Install Angular CLI
48-
run: npm install -g @angular/cli
49-
- name: Run tests
50-
run: npm test -- --configuration=ci
51-
52-
test_build:
53-
name: Test build
54-
needs: test
55-
runs-on: ubuntu-latest
6+
tests:
7+
name: Tests with node ${{ matrix.node }}
568
strategy:
579
matrix:
58-
node: [ 16.x ]
59-
60-
steps:
61-
- name: Check-out
62-
uses: actions/checkout@v2
63-
- name: Set up Node.js ${{ matrix.node }}
64-
uses: actions/setup-node@v2
65-
with:
66-
node-version: ${{ matrix.node }}
67-
cache: 'npm'
68-
- name: Install dependencies
69-
run: npm ci
70-
- name: Install Angular CLI
71-
run: npm install -g @angular/cli
72-
- name: Build
73-
run: npm run build
10+
node: [ 18 ]
11+
uses: Bernardo-MG/github-workflow-angular/.github/workflows/testing.yml@v1
12+
with:
13+
node: ${{ matrix.node }}

README.md

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Angular HTTP Basic Authentication Example
22

3-
Example for setting up HTTP Basic authentication with Angular. It is prepared to be used with [Spring WS Basic Security Example](https://github.com/bernardo-mg/spring-ws-basic-security-example);
3+
Example using HTTP Basic authentication with Angular.
4+
5+
Run the [Spring WS Basic Security Example](https://github.com/bernardo-mg/spring-ws-basic-security-example) for the backend.
46

57
## Features
68

@@ -9,14 +11,14 @@ Example for setting up HTTP Basic authentication with Angular. It is prepared to
911

1012
## Usage
1113

12-
### Building the project
13-
14-
This builds the development version:
14+
The project can be deployed locally for testing:
1515

1616
```
17-
npm run build
17+
npm start
1818
```
1919

20+
It will be available on `http://localhost:4200/`. Changes will be reloaded automatically.
21+
2022
### Running tests
2123

2224
To run the unit tests:
@@ -25,16 +27,6 @@ To run the unit tests:
2527
npm test
2628
```
2729

28-
## Deploying locally
29-
30-
The project can be deployed locally for testing:
31-
32-
```
33-
npm start
34-
```
35-
36-
It will be available on `http://localhost:4200/`. Changes will be reloaded automatically.
37-
3830
## Collaborate
3931

4032
Any kind of help with the project will be well received, and there are two main ways to give such help:
@@ -54,6 +46,6 @@ If you wish to fork or modify the code, visit the [GitHub project page][scm], wh
5446

5547
The project has been released under the [MIT License][license].
5648

57-
[issues]: https://github.com/Bernardo-MG/dnd5-api-angular-client/issues
49+
[issues]: https://github.com/Bernardo-MG/angular-http-basic-auth-example/issues
5850
[license]: http://www.opensource.org/licenses/mit-license.php
59-
[scm]: https://github.com/Bernardo-MG/dnd5-api-angular-client
51+
[scm]: https://github.com/Bernardo-MG/angular-http-basic-auth-example

angular.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@
2323
"outputPath": "dist/angular-http-basic-auth-example",
2424
"index": "src/index.html",
2525
"main": "src/main.ts",
26-
"polyfills": "src/polyfills.ts",
26+
"polyfills": [
27+
"zone.js"
28+
],
2729
"tsConfig": "tsconfig.app.json",
2830
"inlineStyleLanguage": "sass",
2931
"assets": [
3032
"src/favicon.ico",
3133
"src/assets"
3234
],
3335
"styles": [
34-
"src/styles.sass",
35-
"./node_modules/bootstrap/dist/css/bootstrap.min.css"
36+
"./node_modules/bootswatch/dist/materia/bootstrap.min.css"
3637
],
3738
"scripts": [
3839
"./node_modules/@popperjs/core/dist/umd/popper.min.js",
@@ -96,22 +97,20 @@
9697
"ci": {
9798
"watch": false,
9899
"progress": false,
99-
"browsers": "ChromeHeadlessCI"
100+
"browsers": "ChromeHeadless"
100101
}
101102
},
102103
"options": {
103-
"main": "src/test.ts",
104-
"polyfills": "src/polyfills.ts",
104+
"polyfills": [
105+
"zone.js",
106+
"zone.js/testing"
107+
],
105108
"tsConfig": "tsconfig.spec.json",
106-
"karmaConfig": "karma.conf.js",
107109
"inlineStyleLanguage": "sass",
108110
"assets": [
109111
"src/favicon.ico",
110112
"src/assets"
111113
],
112-
"styles": [
113-
"src/styles.sass"
114-
],
115114
"scripts": []
116115
}
117116
},
@@ -130,6 +129,7 @@
130129
"cli": {
131130
"schematicCollections": [
132131
"@angular-eslint/schematics"
133-
]
132+
],
133+
"analytics": false
134134
}
135-
}
135+
}

karma.conf.js

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)