Skip to content

Commit 18b8d30

Browse files
authored
Sprint3 before Feedback (#24)
* Create LICENSE (#19) * Added home page (#21) * resources page finished (#22) * Add angular-cli-pages automation * Added formatting to chart page, including spinner * Fixed styling resources page * Fixed styling settings component * Fixed footer styling * Update barchart.component.spec.ts * Added Run Benchmark button to the navbar * Updated angular packages. * added automated deployment to GH_PAGES using CI
1 parent 48900e0 commit 18b8d30

31 files changed

+11828
-7474
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ script:
2727
# - npm run test -- --watch=false --no-progress --browsers=ChromeHeadlessNoSandbox
2828
- npm run cibuild
2929
- sonar-scanner
30+
- ng deploy --repo=https://github.com/Narshe1412/Code-Institute-User-Centric-Algorithms --name="Narshe1412" [email protected] --base-href=/Code-Institute-User-Centric-Algorithms/

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2019 Manuel Colorado
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

angular.json

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"version": 1.2,
3+
"version": 1,
44
"newProjectRoot": "projects",
55
"projects": {
66
"Code-Institute-User-Centric-Algorithms": {
@@ -23,8 +23,14 @@
2323
"polyfills": "src/polyfills.ts",
2424
"tsConfig": "tsconfig.app.json",
2525
"aot": false,
26-
"assets": ["src/favicon.ico", "src/assets"],
27-
"styles": ["src/styles.scss", "node_modules/bootstrap/dist/css/bootstrap.min.css"],
26+
"assets": [
27+
"src/favicon.ico",
28+
"src/assets"
29+
],
30+
"styles": [
31+
"src/styles.scss",
32+
"node_modules/bootstrap/dist/css/bootstrap.min.css"
33+
],
2834
"scripts": [
2935
"node_modules/jquery/dist/jquery.min.js",
3036
"node_modules/popper.js/dist/umd/popper.min.js",
@@ -82,17 +88,30 @@
8288
"polyfills": "src/polyfills.ts",
8389
"tsConfig": "tsconfig.spec.json",
8490
"karmaConfig": "karma.conf.js",
85-
"assets": ["src/favicon.ico", "src/assets"],
86-
"styles": ["src/styles.scss"],
91+
"assets": [
92+
"src/favicon.ico",
93+
"src/assets"
94+
],
95+
"styles": [
96+
"src/styles.scss"
97+
],
8798
"scripts": [],
88-
"codeCoverageExclude": ["src/app/services/algorithm-implementations/timsort/**"]
99+
"codeCoverageExclude": [
100+
"src/app/services/algorithm-implementations/timsort/**"
101+
]
89102
}
90103
},
91104
"lint": {
92105
"builder": "@angular-devkit/build-angular:tslint",
93106
"options": {
94-
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
95-
"exclude": ["**/node_modules/**"]
107+
"tsConfig": [
108+
"tsconfig.app.json",
109+
"tsconfig.spec.json",
110+
"e2e/tsconfig.json"
111+
],
112+
"exclude": [
113+
"**/node_modules/**"
114+
]
96115
}
97116
},
98117
"e2e": {
@@ -106,9 +125,13 @@
106125
"devServerTarget": "Code-Institute-User-Centric-Algorithms:serve:production"
107126
}
108127
}
128+
},
129+
"deploy": {
130+
"builder": "angular-cli-ghpages:deploy",
131+
"options": {}
109132
}
110133
}
111134
}
112135
},
113136
"defaultProject": "Code-Institute-User-Centric-Algorithms"
114-
}
137+
}

0 commit comments

Comments
 (0)