Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add components-angular as output-target from components package #2071

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
862aa5e
chore: switch to loader as main entry for components package
oliverschuerch Oct 12, 2023
e40d2a4
chore(components): refactor stencil.config
oliverschuerch Oct 12, 2023
5a23711
feat(components): set customElementsExportBehavior to 'single-export-…
oliverschuerch Oct 12, 2023
d5fb32c
feat(components): disable sourceMaps
oliverschuerch Oct 12, 2023
a4a78e5
chore(documentation): update components docs page
oliverschuerch Oct 12, 2023
2ac0523
chore: rename components-angular to angular-components
oliverschuerch Oct 12, 2023
1793169
chore: rename angular-components to intranet-header-workspace
oliverschuerch Oct 13, 2023
ad6ebeb
feat: add components-angular package
oliverschuerch Oct 13, 2023
6ab9819
feat(components): add components-angular outputTarget
oliverschuerch Oct 13, 2023
6f039d9
chore(components-angular): add eslintrc
oliverschuerch Oct 13, 2023
2342381
chore(components-angular): add test-app
oliverschuerch Oct 13, 2023
da6b490
fix(components-angular): add custom-element definition in components.…
oliverschuerch Oct 13, 2023
e3a06e0
chore(components-angular): refine package.json files
oliverschuerch Oct 13, 2023
6d5ef13
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Oct 13, 2023
4ce05a2
chore(components-angular): rename package to intranet-header-workspace
oliverschuerch Oct 13, 2023
ab6ee42
Merge branch 'chore/rename-components-angular' into feat/1381-compone…
oliverschuerch Oct 13, 2023
bca9b49
chore: add changeset
oliverschuerch Oct 13, 2023
eda9806
chore: update pnpm-lock
oliverschuerch Oct 17, 2023
bae73e4
Merge branch 'main' into chore/rename-components-angular
oliverschuerch Oct 17, 2023
8c68a92
Merge branch 'main' into chore/rename-components-angular
oliverschuerch Oct 17, 2023
a2227b5
Merge branch 'chore/rename-components-angular' into feat/1381-compone…
oliverschuerch Oct 17, 2023
66146f2
fix(components-angular): fix sonar cloud reported issue
oliverschuerch Oct 18, 2023
72f0ace
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Oct 18, 2023
e513208
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Oct 25, 2023
13aa75a
chore(components-angular): remove test-app
oliverschuerch Oct 26, 2023
366f090
chore(components-angular): add missing workspace files
oliverschuerch Oct 26, 2023
f303b86
chore(components-angular): add consumer-app
oliverschuerch Oct 26, 2023
c172e1b
chore(components-angular): update pnpm-lock
oliverschuerch Oct 26, 2023
20dcae4
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Oct 31, 2023
47502eb
chore(components-angular): rename ComponentsModule to PostComponentsM…
oliverschuerch Nov 1, 2023
51186f3
feat(documentation): add docs page for compoments-angular package
oliverschuerch Nov 1, 2023
6d61453
chore(documentation): update components getting-started docs
oliverschuerch Nov 1, 2023
b13c4d3
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Nov 1, 2023
18968f3
fix(components): fix package.json to point to the correct types file
oliverschuerch Nov 1, 2023
4fed317
chore: add changeset
oliverschuerch Nov 1, 2023
7bb3bf9
chore: updated changesets
oliverschuerch Nov 1, 2023
71f832e
fix(components-angular): issue reported by sonarcloud
oliverschuerch Nov 1, 2023
ea5e5ab
chore(components-angular): add eslint config
oliverschuerch Nov 1, 2023
20931b2
fix(components-angular): issue reported by sonar-cloud
oliverschuerch Nov 1, 2023
f63022d
chore: update lockfile
oliverschuerch Nov 1, 2023
c6d79e7
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Nov 1, 2023
f170e68
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Nov 1, 2023
42f2d35
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Nov 1, 2023
22c2129
Update .changeset/selfish-jars-accept.md
oliverschuerch Nov 2, 2023
3a626c7
Update packages/documentation/src/stories/getting-started/components/…
oliverschuerch Nov 2, 2023
7cd60bc
Update packages/components-angular/projects/components/README.md
oliverschuerch Nov 2, 2023
cc59f43
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Nov 3, 2023
c7e3991
chore: remove changeset
oliverschuerch Nov 3, 2023
f533e39
chore: update changeset
oliverschuerch Nov 3, 2023
f206699
chore: update changeset
oliverschuerch Nov 3, 2023
59ba7b2
chore: update license file copyright data
oliverschuerch Nov 3, 2023
18e324e
chore(components-angular): namespace components-angular-workspace pac…
oliverschuerch Nov 3, 2023
78b7825
chore(components-angular): changed puslishConfig to let the packge be…
oliverschuerch Nov 3, 2023
e00657c
fix: update dependency chain for a clean bulid to work
gfellerph Nov 6, 2023
0d8b6a5
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Nov 8, 2023
bc35ae0
chore(components-angular): update contributing guidelines
oliverschuerch Nov 8, 2023
62cff96
Update .changeset/pretty-ligers-bathe.md
oliverschuerch Nov 9, 2023
3b6b9fb
Update packages/components-angular/projects/components/package.json
oliverschuerch Nov 9, 2023
c5aecff
Update .changeset/pretty-ligers-bathe.md
oliverschuerch Nov 9, 2023
5d4519c
chore(documentation): update components getting-started pages structu…
oliverschuerch Nov 9, 2023
cc5dfec
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Nov 9, 2023
1194fef
Update pnpm-lock.yaml
gfellerph Nov 16, 2023
3f0fa05
Merge branch 'main' into feat/1381-components-release-web-components-…
gfellerph Nov 16, 2023
6a0b89a
Update workspace references
gfellerph Nov 16, 2023
3859252
Merge branch 'main' into feat/1381-components-release-web-components-…
gfellerph Nov 16, 2023
2877021
chore: release beta manually
gfellerph Nov 22, 2023
1e51020
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Dec 12, 2023
568d69d
chore: release beta manually
oliverschuerch Dec 13, 2023
062ee5b
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Dec 15, 2023
189e95f
test(components): Add test for all components who should be exported …
oliverschuerch Dec 21, 2023
44ce8e5
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Jan 9, 2024
d304d68
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Jan 10, 2024
36c5818
fix(components): fix accordion tests
oliverschuerch Jan 10, 2024
7a0811f
fix(components): fix collapsible tests
oliverschuerch Jan 10, 2024
aa3aa0f
Merge branch '2461-fix-broken-accordion-e2e-tests' into feat/1381-com…
oliverschuerch Jan 10, 2024
95e5e4e
fix(components): update popover polyfill
oliverschuerch Jan 11, 2024
d8bb7b0
chore(components): remove jest dependencies, as stenciljs runs with e…
oliverschuerch Jan 11, 2024
cabc73b
chore(components): exclude output and cypress paths from unit testing
oliverschuerch Jan 11, 2024
d706f63
refactor(components): update component export test
oliverschuerch Jan 11, 2024
6d37b20
feat(components): add post-accordion-item to components exports
oliverschuerch Jan 11, 2024
660684e
chore(components-angular): update angular dependencies to make the pa…
oliverschuerch Jan 12, 2024
a0e57e4
chore: test preview deployment with next.design-system.post.ch url
oliverschuerch Jan 16, 2024
4867775
chore(components-angular): update angular dependencies
oliverschuerch Jan 12, 2024
14c1073
Merge branch 'feat/1381-components-release-web-components-as-angular-…
oliverschuerch Jan 16, 2024
e588e45
chore: prepare for manual beta release
oliverschuerch Jan 16, 2024
0a27333
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Jan 17, 2024
f4e7510
chore(components-angular): update installation guide
oliverschuerch Jan 17, 2024
db4be1e
chore(components-angular): prepare for manual beta release
oliverschuerch Jan 17, 2024
87a891f
chore(components-angular): fix installation guide
oliverschuerch Jan 17, 2024
dd83c81
chore(components-angular): prepare for manual beta release
oliverschuerch Jan 17, 2024
d55de0a
chore(documentation): remove unused imports from angular.docs.mdx
oliverschuerch Jan 17, 2024
19f542b
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Jan 18, 2024
0769421
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Jan 24, 2024
e2a999c
feat(components-angular): add cypress e2e testing to the consumer app
oliverschuerch Jan 26, 2024
db3d6bd
test(components-angular): add general e2e tests in consumer-app
oliverschuerch Jan 26, 2024
19549d0
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Jan 26, 2024
d79f4c4
fix(components-angular): issue reported by sonar
oliverschuerch Jan 26, 2024
f0d42cc
chore(components-angular): update e2e test scripts
oliverschuerch Jan 26, 2024
40c847f
Update .github/workflows/deploy-documentation.yaml
oliverschuerch Jan 30, 2024
241abe7
Update packages/components-angular/projects/components/README.md
oliverschuerch Jan 30, 2024
c667b5e
Update packages/components-angular/projects/components/README.md
oliverschuerch Jan 30, 2024
02ae7f8
chore(components-angular): remove cypress fixtures example file
oliverschuerch Jan 30, 2024
69836e7
Merge branch 'feat/1381-components-release-web-components-as-angular-…
oliverschuerch Jan 30, 2024
9ee28ad
chore(components-angular): update documentation headings
oliverschuerch Jan 30, 2024
f1bfce4
feat(documentation): update and add package icons
oliverschuerch Jan 31, 2024
9e9420c
chore(documentation): update components-angular package docs page
oliverschuerch Jan 31, 2024
16b8c99
chore(components-angular): remove beta flag out of package version
oliverschuerch Jan 31, 2024
ba5d991
refactor(documentation): update version util
oliverschuerch Jan 31, 2024
326f27a
chore(documentation): update styles of package tiles
oliverschuerch Jan 31, 2024
717540f
Merge branch 'main' into feat/1381-components-release-web-components-…
oliverschuerch Jan 31, 2024
1be7aed
chore(documentation): update the way how packages and technologies ar…
oliverschuerch Jan 31, 2024
2f76a54
chore(documentation): switch from optional- to peerDependencies
oliverschuerch Jan 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .changeset/pretty-ligers-bathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@swisspost/design-system-components-angular': major
---

We are introducing the new package `@swisspost/design-system-components-angular` 🥳, which provides a corresponding Angular component for all our web-components.
For those working on an Angular app this means:

- Instead of the package `@swisspost/design-system-components`, which provides native web components, the new package can be used.
- The manual creation of Angular wrapper components for our previous web components in every project is no longer necessary.
- Full support of the standard Angular schema. The use of the `CUSTOM_ELEMENTS_SCHEMA` schema is history.
- Component properties, events, etc. can be applied to the components in the usual Angular way.
5 changes: 5 additions & 0 deletions .changeset/stupid-keys-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@swisspost/design-system-documentation': minor
---

Added a getting-started docs page for the new `@swisspost/components-angular` package.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
id: ${{ steps.build.outputs.id }}
netlify_auth_token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
netlify_site_id: ${{ secrets.NEXT_NETLIFY_SITE_ID }}
netlify_site_url: swisspost-design-system-next.netlify.app
netlify_site_url: next.design-system.post.ch
folder: ${{ steps.build.outputs.folder }}
comment_token: ${{ secrets.SWISSPOSTDEVS_ACCESS_TOKEN }}
comment_author: swisspost-bot
Expand Down
16 changes: 16 additions & 0 deletions packages/components-angular/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.ts]
quote_type = single

[*.md]
max_line_length = off
trim_trailing_whitespace = false
40 changes: 40 additions & 0 deletions packages/components-angular/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"root": true,
"ignorePatterns": ["projects/**/*"],
"overrides": [
{
"files": ["*.ts"],
"parserOptions": {
"project": ["tsconfig.json"],
"createDefaultProgram": true
imagoiq marked this conversation as resolved.
Show resolved Hide resolved
},
"extends": [
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "app",
"style": "camelCase"
}
],
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "app",
"style": "kebab-case"
}
]
}
},
{
"files": ["*.html"],
"extends": ["plugin:@angular-eslint/template/recommended"],
"rules": {}
}
]
}
43 changes: 43 additions & 0 deletions packages/components-angular/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# Compiled output
/dist
/tmp
/out-tsc
/bazel-out

# Node
/node_modules
npm-debug.log
yarn-error.log

# IDEs and editors
.vscode/
.idea/
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# Miscellaneous
/.angular/cache
.sass-cache/
/connect.lock
/coverage
/libpeerconnection.log
testem.log
/typings

# System files
.DS_Store
Thumbs.db
201 changes: 201 additions & 0 deletions packages/components-angular/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2023 Swiss Post, Ltd.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
15 changes: 15 additions & 0 deletions packages/components-angular/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Swiss Post Design-System Components-Angular-Workspace

This project was generated with [Angular CLI](https://github.com/angular/angular-cli).

## Development server

Run `npm run start` for a dev server. Navigate to `http://localhost:9210/`. The application will automatically reload if you change any of the source files.

## Build

Run `npm run build` to build the project. The build artifacts will be stored in the `dist/` directory.

## Further help

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.
Loading
Loading