Skip to content

Commit 5923524

Browse files
i4004i4004
committed
Merge branch 'bugfix/#174' into develop
2 parents 55ea6bd + ce4ab4d commit 5923524

File tree

72 files changed

+29068
-14649
lines changed

Some content is hidden

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

72 files changed

+29068
-14649
lines changed

‎.vscode/launch.json

+56-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22
"version": "0.2.0",
33
"configurations": [
44
{
5-
"name": "SampleApp.Kestrel Launch",
5+
"name": "SampleApp.Angular Launch",
66
"type": "coreclr",
77
"request": "launch",
8-
"preLaunchTask": "Build Kestrel Example",
9-
"program": "${workspaceFolder}/src/SampleApps/SampleApp.Kestrel/bin/Debug/netcoreapp3.1/SampleApp.Kestrel.dll",
10-
"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Kestrel/bin/Debug/netcoreapp3.1/",
8+
"preLaunchTask": "Build Angular Example",
9+
"program": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/bin/Debug/net5.0/SampleApp.Angular.dll",
10+
"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/bin/Debug/net5.0/",
1111
"internalConsoleOptions": "openOnSessionStart",
12+
"serverReadyAction":
13+
{
14+
"action": "openExternally",
15+
"pattern": "Now listening on",
16+
"uriFormat": "http://localhost:5000"
17+
},
1218
"env":
1319
{
1420
"ASPNETCORE_ENVIRONMENT": "Development"
@@ -19,9 +25,53 @@
1925
"type": "coreclr",
2026
"request": "launch",
2127
"preLaunchTask": "Build Classic Example",
22-
"program": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/netcoreapp3.1/SampleApp.Classic.dll",
23-
"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/netcoreapp3.1/",
28+
"program": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/net5.0/SampleApp.Classic.dll",
29+
"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/net5.0/",
30+
"internalConsoleOptions": "openOnSessionStart",
31+
"serverReadyAction":
32+
{
33+
"action": "openExternally",
34+
"pattern": "Now listening on",
35+
"uriFormat": "http://localhost:5000"
36+
},
37+
"env":
38+
{
39+
"ASPNETCORE_ENVIRONMENT": "Development"
40+
}
41+
},
42+
{
43+
"name": "SampleApp.Vue Launch",
44+
"type": "coreclr",
45+
"request": "launch",
46+
"preLaunchTask": "Build Vue Example",
47+
"program": "${workspaceFolder}/src/SampleApps/SampleApp.Vue/bin/Debug/net5.0/SampleApp.Vue.dll",
48+
"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Vue/bin/Debug/net5.0/",
2449
"internalConsoleOptions": "openOnSessionStart",
50+
"serverReadyAction":
51+
{
52+
"action": "openExternally",
53+
"pattern": "Now listening on",
54+
"uriFormat": "http://localhost:5000"
55+
},
56+
"env":
57+
{
58+
"ASPNETCORE_ENVIRONMENT": "Development"
59+
}
60+
},
61+
{
62+
"name": "SampleApp.Vue.Element Launch",
63+
"type": "coreclr",
64+
"request": "launch",
65+
"preLaunchTask": "Build Vue Example",
66+
"program": "${workspaceFolder}/src/SampleApps/SampleApp.Vue.Element/bin/Debug/net5.0/SampleApp.Vue.Element.dll",
67+
"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Vue.Element/bin/Debug/net5.0/",
68+
"internalConsoleOptions": "openOnSessionStart",
69+
"serverReadyAction":
70+
{
71+
"action": "openExternally",
72+
"pattern": "Now listening on",
73+
"uriFormat": "http://localhost:5000"
74+
},
2575
"env":
2676
{
2777
"ASPNETCORE_ENVIRONMENT": "Development"

‎.vscode/tasks.json

+22-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"version": "2.0.0",
33
"tasks": [
44
{
5-
"label": "Build Kestrel Example",
5+
"label": "Build Angular Example",
66
"command": "dotnet",
77
"type": "process",
88
"args": [
99
"build",
10-
"${workspaceFolder}/src/SampleApps/SampleApp.Kestrel/SampleApp.Kestrel.csproj"
10+
"${workspaceFolder}/src/SampleApps/SampleApp.Angular/SampleApp.Angular.csproj"
1111
],
1212
"problemMatcher": "$msCompile"
1313
},
@@ -21,6 +21,26 @@
2121
],
2222
"problemMatcher": "$msCompile"
2323
},
24+
{
25+
"label": "Build Vue Example",
26+
"command": "dotnet",
27+
"type": "process",
28+
"args": [
29+
"build",
30+
"${workspaceFolder}/src/SampleApps/SampleApp.Vue/SampleApp.Vue.csproj"
31+
],
32+
"problemMatcher": "$msCompile"
33+
},
34+
{
35+
"label": "Build Vue Example",
36+
"command": "dotnet",
37+
"type": "process",
38+
"args": [
39+
"build",
40+
"${workspaceFolder}/src/SampleApps/SampleApp.Vue.Element/SampleApp.Vue.Element.csproj"
41+
],
42+
"problemMatcher": "$msCompile"
43+
},
2444
{
2545
"label": "Build",
2646
"command": "dotnet",

‎src/DockerCommads.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Docker commands to launch SampleApp.Classic inside container
2+
3+
## Build
4+
5+
```bash
6+
docker compose build simplify.web.sampleapp.classic
7+
```
8+
9+
## Launch
10+
11+
```bash
12+
docker compose up simplify.web.sampleapp.classic
13+
```

‎src/SampleApps/SampleApp.Angular/ClientApp/.angular-cli.json

-71
This file was deleted.

‎src/SampleApps/SampleApp.Angular/ClientApp/.browserslistrc

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# For the full list of supported browsers by the Angular framework, please see:
6+
# https://angular.io/guide/browser-support
7+
8+
# You can see what browsers were selected by your queries by running:
9+
# npx browserslist
10+
11+
last 1 Chrome version
12+
last 1 Firefox version
13+
last 2 Edge major versions
14+
last 2 Safari major versions
15+
last 2 iOS major versions
16+
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.

‎src/SampleApps/SampleApp.Angular/ClientApp/.editorconfig

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Editor configuration, see https://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.ts]
12+
quote_type = single
13+
14+
[*.md]
15+
max_line_length = off
16+
trim_trailing_whitespace = false

‎src/SampleApps/SampleApp.Angular/ClientApp/.gitignore

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22

33
# compiled output
44
/dist
5-
/dist-server
65
/tmp
76
/out-tsc
7+
# Only exists if Bazel was run
8+
/bazel-out
89

910
# dependencies
1011
/node_modules
1112

13+
# profiling files
14+
chrome-profiler-events*.json
15+
1216
# IDEs and editors
1317
/.idea
1418
.project
@@ -24,20 +28,18 @@
2428
!.vscode/tasks.json
2529
!.vscode/launch.json
2630
!.vscode/extensions.json
31+
.history/*
2732

2833
# misc
2934
/.sass-cache
3035
/connect.lock
3136
/coverage
3237
/libpeerconnection.log
3338
npm-debug.log
39+
yarn-error.log
3440
testem.log
3541
/typings
3642

37-
# e2e
38-
/e2e/*.js
39-
/e2e/*.map
40-
4143
# System Files
4244
.DS_Store
4345
Thumbs.db

‎src/SampleApps/SampleApp.Angular/ClientApp/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# AngularSpa
1+
# SampleAppAngular
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.7.0.
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.2.2.
44

55
## Development server
66

@@ -12,16 +12,16 @@ Run `ng generate component component-name` to generate a new component. You can
1212

1313
## Build
1414

15-
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
15+
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
1616

1717
## Running unit tests
1818

1919
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
2020

2121
## Running end-to-end tests
2222

23-
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
23+
Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
2424

2525
## Further help
2626

27-
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
27+
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

0 commit comments

Comments
 (0)