Skip to content

Commit 3c2142e

Browse files
committed
chore: update to Angular 14
- chore: flatten project structure
1 parent a2eab28 commit 3c2142e

File tree

102 files changed

+3764
-2411
lines changed

Some content is hidden

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

102 files changed

+3764
-2411
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: .github/workflows/daily-project-check.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [14.x]
15+
node-version: [16.x]
1616
os: [ubuntu-latest, windows-latest, macOS-latest]
1717

1818
steps:
@@ -36,10 +36,10 @@ jobs:
3636

3737
steps:
3838
- uses: actions/checkout@v1
39-
- name: Use Node.js 14
39+
- name: Use Node.js 16
4040
uses: actions/setup-node@v1
4141
with:
42-
node-version: 14
42+
node-version: 16
4343
- name: e2e chrome test
4444
run: |
4545
choco install googlechrome

Diff for: .github/workflows/project-check.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ on:
44
push:
55
branches:
66
- master
7+
- v2
78
pull_request:
89
branches:
910
- master
10-
11+
- v2
1112
jobs:
1213
build:
1314

1415
runs-on: ubuntu-latest
1516

1617
strategy:
1718
matrix:
18-
node-version: [14.x]
19+
node-version: [16.x]
1920
os: [ubuntu-latest, windows-latest, macOS-latest]
2021

2122
steps:
@@ -39,10 +40,10 @@ jobs:
3940

4041
steps:
4142
- uses: actions/checkout@v1
42-
- name: Use Node.js 14
43+
- name: Use Node.js 16
4344
uses: actions/setup-node@v1
4445
with:
45-
node-version: 14
46+
node-version: 16
4647
- name: e2e chrome test
4748
run: |
4849
choco install googlechrome

Diff for: .gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
/dist
55
/tmp
66
/out-tsc
7-
# Only exists if Bazel was run
87
/bazel-out
98

109
# Node
1110
/node_modules
1211
npm-debug.log
1312
yarn-error.log
14-
package-lock.json
15-
yarn.lock
1613

1714
# profiling files
1815
chrome-profiler-events*.json

Diff for: CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
### [@coreui/angular](https://coreui.io/) changelog
22

3+
##### `v2.14.0`
4+
5+
- update to `Angular 14`
6+
37
##### `v2.13.0`
48

59
- update to `Angular 13.3`
@@ -953,7 +957,7 @@ usage: set toggler breakpoint
953957
##### `v2.2.1`
954958
- fix: remove `-fixed` class on layout components destroy
955959
- chore: commit `package-lock.json`
956-
- chore: add [README](./projects/coreui/angular/README.md)
960+
- chore: add [README](projects/coreui-angular/README.md)
957961
- update: `core-js` to `2.6.0`
958962
- update: `@angular-devkit/build-angular` to `0.11.1`
959963
- update: `@angular-devkit/build-ng-packagr` to `0.11.1`

Diff for: README.md

+81-32
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# [@coreui/angular](https://coreui.io/angular)
22

3-
![angular](https://img.shields.io/badge/angular-^13.3.0-lightgrey.svg?style=flat-square&logo=angular)
3+
![angular](https://img.shields.io/badge/angular-^14.0.0-lightgrey.svg?style=flat-square&logo=angular)
44
[![npm package][npm-coreui-angular-badge-v2]][npm-coreui-angular]
55
[![npm package][npm-coreui-angular-badge-latest]][npm-coreui-angular]
66
[![NPM downloads][npm-coreui-angular-download]][npm-coreui-angular]
@@ -21,55 +21,54 @@
2121
[npm-coreui-badge-v2]: https://img.shields.io/npm/v/@coreui/coreui/v2-lts?style=flat-square
2222
[npm-coreui-download]: https://img.shields.io/npm/dm/@coreui/coreui.svg?style=flat-square
2323

24-
# CoreUI for Angular 13 - Free WebApp UI Kit built on top of Bootstrap 4 [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?text=CoreUI%20-%20Free%20Bootstrap%204%20Admin%20Template%20&url=https://coreui.io&hashtags=,admin,template,dashboard,panel,free,angular,react,vue)
25-
26-
Please help us on [Product Hunt](https://www.producthunt.com/posts/coreui-open-source-bootstrap-4-admin-template-with-angular-2-react-js-vue-js-support) and [Designer News](https://www.designernews.co/stories/81127). Thanks in advance!
27-
28-
Curious why I decided to create CoreUI? Please read this article: [Jack of all trades, master of none. Why Bootstrap Admin Templates suck.](https://medium.com/@lukaszholeczek/jack-of-all-trades-master-of-none-5ea53ef8a1f#.7eqx1bcd8)
24+
> [@coreui/angular](https://coreui.io/angular) v2 library project
25+
> for use with [CoreUI](https://coreui.io/angular/) v2 Bootstrap Admin Template
2926
3027
CoreUI is an Open Source UI Kit built on top of Bootstrap 4. CoreUI is the fastest way to build modern dashboard for any platforms, browser or device. A complete Dashboard and WebApp UI Kit that allows you to quickly build eye-catching, high-quality, high-performance responsive applications using your framework of choice.
3128

3229
## Table of Contents
3330

34-
* [Templates](#templates)
35-
* [Admin Templates built on top of CoreUI Pro](#admin-templates-built-on-top-of-coreui-pro)
31+
* [Template](#template)
3632
* [Prerequisites](#prerequisites)
3733
* [Installation](#coreui-installation)
3834
* [Usage](#usage)
3935
* [What's included](#whats-included)
4036
* [Documentation](#documentation)
41-
* [Contributing](#contributing)
37+
* [Changelog](#changelog)
38+
* [Frameworks](#frameworks)
39+
* [Templates](#templates)
4240
* [Versioning](#versioning)
41+
* [Contributing](#contributing)
4342
* [Creators](#creators)
4443
* [Community](#community)
45-
* [License](#license)
4644
* [Support CoreUI Development](#support-coreui-development)
45+
* [Copyright and license](#copyright-and-license)
4746

48-
## Templates
47+
## Template
4948

5049
* [CoreUI Free Angular Admin Template](https://github.com/coreui/coreui-free-angular-admin-template)
51-
* 💪 [CoreUI Pro Angular Admin Template](https://coreui.io/pro/angular/)
50+
* 💪 [CoreUI Pro Angular Admin Template](https://coreui.io/angular/)
5251

5352

5453
#### Prerequisites
5554
Before you begin, make sure your development environment includes `Node.js®` and an `npm` package manager.
5655

5756
###### Node.js
58-
Angular 13 requires `Node.js` version 14.15 or later.
57+
Angular 14 requires `Node.js` version 14.15 or later.
5958

6059
- To check your version, run `node -v` in a terminal/console window.
6160
- To get `Node.js`, go to [nodejs.org](https://nodejs.org/).
6261

6362
###### Angular CLI
6463
Install the Angular CLI globally using a terminal/console window.
6564
```bash
66-
npm install -g @angular/cli
65+
npm install -g @angular/cli@14
6766
```
6867

69-
##### Update to Angular 13
68+
##### Update to Angular 14
7069
see: [https://update.angular.io](https://update.angular.io)
7170

72-
## CoreUI Installation
71+
## Installation
7372

7473
Several options are available:
7574

@@ -115,19 +114,34 @@ coreui/
115114

116115
## Documentation
117116

118-
The documentation for the CoreUI Free Bootstrap Admin Template is hosted at our website [CoreUI](https://coreui.io/angular/)
117+
The documentation for the CoreUI & CoreUI PRO is hosted at our website [CoreUI for Angular](https://coreui.io/angular/docs/)
119118

120-
## Contributing
119+
### Changelog
121120

122-
Please read through our [contributing guidelines](https://github.com/coreui/coreui-angular/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
121+
See the GitHub [release history](https://github.com/coreui/coreui-angular/releases).
123122

124-
Editor preferences are available in the [editor config](https://github.com/coreui/coreui-angular/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
123+
## Frameworks
125124

126-
## Versioning
125+
CoreUI supports most popular frameworks.
127126

128-
For transparency into our release cycle and in striving to maintain backward compatibility,CoreUI Free Admin Template is maintained under [the Semantic Versioning guidelines](http://semver.org/).
127+
- [CoreUI for Bootstap(Vanilla JS)](https://github.com/coreui/coreui)
128+
- [CoreUI for React](https://github.com/coreui/coreui-react)
129+
- [CoreUI for Vue](https://github.com/coreui/coreui-vue)
130+
131+
## Templates
129132

130-
See [the Releases section of our project](https://github.com/coreui/coreui-angular/releases) for changelogs for each release version.
133+
Fully featured, out-of-the-box, templates for your application based on CoreUI.
134+
135+
- [Angular Admin Template](https://coreui.io/angular)
136+
- [Bootstrap Admin Template](https://coreui.io/)
137+
- [React Admin Template](https://coreui.io/react)
138+
- [Vue Admin Template](https://coreui.io/vue)
139+
140+
## Contributing
141+
142+
Please read through our [contributing guidelines](https://github.com/coreui/coreui-angular/blob/main/.github/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
143+
144+
Editor preferences are available in the [editor config](https://github.com/coreui/coreui-angular/blob/main/.editorconfig) for easy use in common text editors. Read more and download plugins at <https://editorconfig.org/>.
131145

132146
## Creators
133147

@@ -140,20 +154,55 @@ See [the Releases section of our project](https://github.com/coreui/coreui-angul
140154

141155
* <https://github.com/xidedix>
142156

143-
## Community
157+
**The CoreUI Team**
144158

145-
Get updates on CoreUI's development and chat with the project maintainers and community members.
159+
- <https://github.com/orgs/coreui/people>
146160

147-
- Follow [@core_ui on Twitter](https://twitter.com/core_ui).
148-
- Read and subscribe to [CoreUI Blog](https://coreui.io/blog/).
161+
## Community
149162

150-
## Copyright and license
163+
Stay up to date on the development of CoreUI and reach out to the community with these helpful resources.
151164

152-
copyright 2017-2022 creativeLabs Łukasz Holeczek. Code released under [the MIT license](https://github.com/coreui/coreui-angular/blob/master/LICENSE).
153-
There is only one limitation - you can’t re-distribute the CoreUI as stock. You can’t do this if you modify the CoreUI. In the past we faced some problems with persons who tried to sell CoreUI based templates.
165+
- Read and subscribe to [The Official CoreUI Blog](https://blog.coreui.io/).
166+
- You can also follow [@core_ui on Twitter](https://twitter.com/core_ui).
154167

155168
## Support CoreUI Development
156169

157-
CoreUI is an MIT licensed open source project and completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by donating on [PayPal](https://www.paypal.me/holeczek), buying [CoreUI Pro Version](https://coreui.io/pro) or buying one of our [premium admin templates](https://genesisui.com/?support=1).
170+
CoreUI is an MIT-licensed open source project and is completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by buying the [CoreUI PRO](https://coreui.io/pricing/) or by becoming a sponsor via [Open Collective](https://opencollective.com/coreui/).
171+
172+
<!--- StartOpenCollectiveBackers -->
173+
174+
### Platinum Sponsors
175+
176+
Support this project by [becoming a Platinum Sponsor](https://opencollective.com/coreui/contribute/platinum-sponsor-40959/). A large company logo will be added here with a link to your website.
177+
178+
<a href="https://opencollective.com/coreui/contribute/platinum-sponsor-40959/checkout"><img src="https://opencollective.com/coreui/tiers/platinum-sponsor/0/avatar.svg?avatarHeight=100"></a>
179+
180+
### Gold Sponsors
181+
182+
Support this project by [becoming a Gold Sponsor](https://opencollective.com/coreui/contribute/gold-sponsor-40960/). A big company logo will be added here with a link to your website.
183+
184+
<a href="https://opencollective.com/coreui/contribute/gold-sponsor-40960/checkout"><img src="https://opencollective.com/coreui/tiers/gold-sponsor/0/avatar.svg?avatarHeight=100"></a>
185+
186+
### Silver Sponsors
187+
188+
Support this project by [becoming a Silver Sponsor](https://opencollective.com/coreui/contribute/silver-sponsor-40967/). A medium company logo will be added here with a link to your website.
189+
190+
<a href="https://opencollective.com/coreui/contribute/silver-sponsor-40967/checkout"><img src="https://opencollective.com/coreui/tiers/gold-sponsor/0/avatar.svg?avatarHeight=100"></a>
191+
192+
### Bronze Sponsors
193+
194+
Support this project by [becoming a Bronze Sponsor](https://opencollective.com/coreui/contribute/bronze-sponsor-40966/). The company avatar will show up here with a link to your OpenCollective Profile.
195+
196+
<a href="https://opencollective.com/coreui/contribute/bronze-sponsor-40966/checkout"><img src="https://opencollective.com/coreui/tiers/bronze-sponsor/0/avatar.svg?avatarHeight=100"></a>
197+
198+
### Backers
199+
200+
Thanks to all the backers and sponsors! Support this project by [becoming a backer](https://opencollective.com/coreui/contribute/backer-40965/).
201+
202+
<a href="https://opencollective.com/coreui/contribute/backer-40965/checkout" target="_blank" rel="noopener"><img src="https://opencollective.com/coreui/backers.svg?width=890"></a>
203+
204+
<!--- EndOpenCollectiveBackers -->
205+
206+
## Copyright and license
158207

159-
As of now I am exploring the possibility of working on CoreUI full-time - if you are a business that is building core products using CoreUI, I am also open to conversations regarding custom sponsorship / consulting arrangements. Get in touch on [Twitter](https://twitter.com/lukaszholeczek).
208+
Copyright 2022 creativeLabs Łukasz Holeczek. Code released under the [MIT License](https://github.com/coreui/coreui-angular/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

Diff for: angular.json

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"cli": {
4-
"analytics": false
5-
},
63
"version": 1,
74
"newProjectRoot": "projects",
85
"projects": {
@@ -123,37 +120,39 @@
123120
}
124121
}
125122
},
126-
"@coreui/angular": {
123+
"coreui-angular": {
127124
"projectType": "library",
128-
"root": "projects/coreui/angular",
129-
"sourceRoot": "projects/coreui/angular/src",
125+
"root": "projects/coreui-angular",
126+
"sourceRoot": "projects/coreui-angular/src",
130127
"prefix": "lib",
131128
"architect": {
132129
"build": {
133130
"builder": "@angular-devkit/build-angular:ng-packagr",
134131
"options": {
135-
"project": "projects/coreui/angular/ng-package.json"
132+
"project": "projects/coreui-angular/ng-package.json"
136133
},
137134
"configurations": {
138135
"production": {
139-
"tsConfig": "projects/coreui/angular/tsconfig.lib.prod.json"
136+
"tsConfig": "projects/coreui-angular/tsconfig.lib.prod.json"
140137
},
141138
"development": {
142-
"tsConfig": "projects/coreui/angular/tsconfig.lib.json"
139+
"tsConfig": "projects/coreui-angular/tsconfig.lib.json"
143140
}
144141
},
145142
"defaultConfiguration": "production"
146143
},
147144
"test": {
148145
"builder": "@angular-devkit/build-angular:karma",
149146
"options": {
150-
"main": "projects/coreui/angular/src/test.ts",
151-
"tsConfig": "projects/coreui/angular/tsconfig.spec.json",
152-
"karmaConfig": "projects/coreui/angular/karma.conf.js"
147+
"main": "projects/coreui-angular/src/test.ts",
148+
"tsConfig": "projects/coreui-angular/tsconfig.spec.json",
149+
"karmaConfig": "projects/coreui-angular/karma.conf.js"
153150
}
154151
}
155152
}
156153
}
157154
},
158-
"defaultProject": "coreui"
155+
"cli": {
156+
"analytics": false
157+
}
159158
}

0 commit comments

Comments
 (0)