Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
fbdfd94
chore: regenerated package-lock.json
mfranzke Dec 14, 2022
5d229f1
chore: updated angular dependencies
mfranzke Dec 14, 2022
8d7d31a
chore: updated angular dependencies
mfranzke Dec 14, 2022
5c537d2
chore: corrected the path
mfranzke Dec 14, 2022
e99b4f8
chore: updated angular dependencies
mfranzke Dec 14, 2022
d0a475d
chore: updated and moved angular dependencies
mfranzke Dec 14, 2022
ada7ff1
chore: added angular specific gitignore aspects
mfranzke Dec 15, 2022
5498417
Update howto-angular.md
mfranzke Dec 15, 2022
56eaa66
refactor: moved to typed form controls
mfranzke Dec 15, 2022
31af5d8
Merge branch '691-update-angular-13-to-14' of https://github.com/db-u…
mfranzke Dec 15, 2022
8f06f30
chore: regenerated package-lock.json files
mfranzke Dec 15, 2022
1e404f5
chore: it's unclear what this plugin is all about
mfranzke Dec 15, 2022
a5cd74b
refactor: we need to downgrade typescript for Angular 14
mfranzke Dec 15, 2022
24256f2
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Dec 29, 2022
742b8f3
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Dec 29, 2022
b66ed5c
chore: regenerate package-lock.json
mfranzke Dec 29, 2022
c1b4741
chore: regenerated lock files
mfranzke Dec 29, 2022
e7eb50d
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Jan 13, 2023
7284cb9
refactor: regenerated lock file
mfranzke Jan 13, 2023
900d10e
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Jan 18, 2023
7ff9a64
chore: regenerated lock files
mfranzke Jan 18, 2023
cee16ad
chore: regenerated lock files
mfranzke Jan 18, 2023
26947b0
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Jan 18, 2023
32ec53a
chore: regenerated lock file
mfranzke Jan 18, 2023
dfbe8a1
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Jan 18, 2023
295e0a1
chore: regenerated lock file
mfranzke Jan 18, 2023
f5b0ce7
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Jan 25, 2023
6941b08
chore: regenerated lock files
mfranzke Jan 25, 2023
b47d3db
chore: regenerated lock files and added postcss
mfranzke Jan 25, 2023
edd43f5
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Jan 26, 2023
a058141
refactor: regenerated lock files
mfranzke Jan 26, 2023
d71c3f2
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Jan 30, 2023
5568811
chore: regenerated lock files
mfranzke Jan 30, 2023
c3e6eac
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Jan 30, 2023
d19aeea
chore: regenerated lock files
mfranzke Jan 30, 2023
648ef02
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Jan 30, 2023
133904b
chore: regenerated lock files
mfranzke Jan 30, 2023
3b2aa1c
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Aug 16, 2023
dd36efe
refactor: updated lock files
mfranzke Aug 16, 2023
f8548b6
refactor: extracted lint ignore rules
mfranzke Aug 16, 2023
bb7f76f
refactor: removed deprecated option
mfranzke Aug 16, 2023
961a645
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Aug 16, 2023
6d3b197
refactor: moved this folder according to its contents
mfranzke Aug 16, 2023
e91e792
refactor: updated versions again
mfranzke Aug 16, 2023
da0667d
refactor: needed to revert typescript to version < 4.9.0
mfranzke Aug 16, 2023
af8c1d3
refactor: needed to adapt those after console messages
mfranzke Aug 16, 2023
6725980
Merge branch '691-update-angular-13-to-14' of https://github.com/db-u…
mfranzke Aug 16, 2023
474b34b
refactor: updated that list
mfranzke Aug 16, 2023
0460af7
refactor: corrected that artifact name
mfranzke Aug 16, 2023
b62e495
docs: further details
mfranzke Aug 16, 2023
a947892
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Aug 17, 2023
8610b35
refactor: that zone.js version is still required by @angular/core@14.3.0
mfranzke Aug 17, 2023
794eb52
refactor: updated jest and jest-preset-angular
mfranzke Aug 17, 2023
941d25f
refactor: regenerated lock files
mfranzke Aug 17, 2023
eb383d9
refactor: reverted that update which has been previously done by acci…
mfranzke Aug 17, 2023
61d433d
chore: another try
mfranzke Aug 17, 2023
28ae0e1
Discard changes to showcase/vue-showcase/package-lock.json
mfranzke Aug 17, 2023
eff6cd9
refactor: further places which we needed to update
mfranzke Aug 17, 2023
ea6a011
refactor: another try
mfranzke Aug 17, 2023
40ab6b8
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Aug 17, 2023
f0183aa
chore: another try
mfranzke Aug 17, 2023
7006890
chore: another try
mfranzke Aug 17, 2023
c3b9c9a
fix: value
mfranzke Aug 17, 2023
b0468d3
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Aug 18, 2023
c5ccacc
refactor: regenerated lock files
mfranzke Aug 18, 2023
3f705a1
chore: another try
mfranzke Aug 18, 2023
260dfaf
chore: another try
mfranzke Aug 18, 2023
41552a0
Merge branch 'main' into 691-update-angular-13-to-14
mfranzke Aug 18, 2023
f0c7b61
refactor: regenerated lock files
mfranzke Aug 18, 2023
0e1347d
refactor: renamed folder
mfranzke Aug 18, 2023
4e19157
feat: added Angular 15
mfranzke Aug 19, 2023
2010ec3
refactor: doing ng update
mfranzke Aug 19, 2023
2b544ea
Merge branch 'main' into feat-provide-angular-15-showcase
mfranzke Sep 4, 2023
12178ac
refactor: regenerated lock files
mfranzke Sep 4, 2023
6ffc435
refactor: corrected that merge aspect
mfranzke Sep 4, 2023
64b0ef1
Discard changes to packages/db-ui-elements-angular/package.json
mfranzke Sep 4, 2023
af9f764
Merge branch 'main' into feat-provide-angular-15-showcase
mfranzke Sep 8, 2023
533ec46
refactor: updated lock files
mfranzke Sep 8, 2023
57e7a20
Merge branch 'main' into feat-provide-angular-15-showcase
mfranzke Sep 13, 2023
ab97c2b
refactor: regenerated lock files
mfranzke Sep 13, 2023
9780bfd
Merge branch 'main' into feat-provide-angular-15-showcase
mfranzke Nov 25, 2023
d368cef
refactor: regenerated package lock file
mfranzke Nov 25, 2023
8bc1614
refactor: regenerated package lock file
mfranzke Nov 25, 2023
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
25 changes: 25 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,31 @@ updates:
- '@commitlint*'
- '@babel*'

- package-ecosystem: 'npm'
directory: '/showcase/angular-lts-showcase'
open-pull-requests-limit: 10
schedule:
interval: 'daily'
time: '04:00'
timezone: 'Europe/Berlin'
ignore:
- dependency-name: 'ng-packagr'
update-types: ['version-update:semver-major']
# Especially as we're using multiple major versions of Angular, we want to update the major version by ourselves
- dependency-name: '@angular/cli'
update-types: ['version-update:semver-major']
- dependency-name: '@angular/core'
update-types: ['version-update:semver-major']
- dependency-name: '@angular/compiler'
update-types: ['version-update:semver-major']
- dependency-name: '@angular/common'
update-types: ['version-update:semver-major']
- dependency-name: '@angular/forms'
update-types: ['version-update:semver-major']
- dependency-name: '@angular/platform-browser-dynamic'
update-types: ['version-update:semver-major']
pull-request-branch-name:
separator: '-'
- package-ecosystem: 'npm'
directory: '/showcase/angular-lts-minus-1-showcase'
open-pull-requests-limit: 10
Expand Down
4 changes: 4 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ react:
vue:
- packages/db-ui-elements-vue/**

# Add 'angular-lts-showcase' label to any file changes for angular-lts-showcase
angular-lts-showcase:
- showcase/angular-lts-showcase/**

# Add 'angular-lts-minus-1-showcase' label to any file changes for angular-lts-minus-1-showcase
angular-lts-minus-1-showcase:
- showcase/angular-lts-minus-1-showcase/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/01-build-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- name: 👩‍🍳 Bake everything (StoryBook, Playground & Showcases)
run: |
node scripts/build angular-lts-minus-1,react,vue,playground,reactwind withShowcase
node scripts/build angular-lts-minus-1,angular-lts,react,vue,playground,reactwind withShowcase
npm run build:storybook

- name: ⬆ Upload build
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/01-build-showcases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ jobs:
strategy:
fail-fast: false
matrix:
showcases: [angular-lts-minus-1, playground, react, reactwind, vue]
showcases:
[angular-lts-minus-1, angular-lts, playground, react, reactwind, vue]
steps:
- name: ⬇ Checkout repo
uses: actions/checkout@v4
Expand All @@ -22,6 +23,9 @@ jobs:
- name: ↔ Get download params for showcase
run: |
if echo ${{ matrix.showcases }} | grep -c "angular-lts-minus-1"
then
echo "framework=angular" >> $GITHUB_OUTPUT
elif echo ${{ matrix.showcases }} | grep -c "angular-lts"
then
echo "framework=angular" >> $GITHUB_OUTPUT
elif echo ${{ matrix.showcases }} | grep -c "playground"
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/01-build-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,18 @@ jobs:
name: stencil-default-angular
path: packages/db-ui-elements-stencil

- name: ⬇ Download Showcase Angular LTS v.14 dist folder
- name: ⬇ Download Showcase Angular LTS -1 dist folder
uses: ./.github/actions/download-tar-artifact
with:
name: showcase-angular-lts-minus-1
path: showcase/angular-lts-minus-1-showcase/dist

- name: ⬇ Download Showcase Angular LTS dist folder
uses: ./.github/actions/download-tar-artifact
with:
name: showcase-angular-lts
path: showcase/angular-lts-showcase/dist

- name: ⬇ Download Showcase playground dist folder
uses: ./.github/actions/download-tar-artifact
with:
Expand Down Expand Up @@ -62,6 +68,7 @@ jobs:
VERSION: ${{ inputs.tag }}
run: |
mv showcase/angular-lts-minus-1-showcase/dist/angular-lts-minus-1-showcase packages/db-ui-elements-stencil/www/angular-lts-minus-1-showcase
mv showcase/angular-lts-showcase/dist/angular-lts-showcase packages/db-ui-elements-stencil/www/angular-lts-showcase
mv showcase/playground-showcase/dist/playground-showcase packages/db-ui-elements-stencil/www/playground-showcase
mv showcase/react-showcase/dist/react-showcase packages/db-ui-elements-stencil/www/react-showcase
mv showcase/reactwind-showcase/dist/reactwind-showcase packages/db-ui-elements-stencil/www/reactwind-showcase
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"streetsidesoftware.code-spell-checker",
"html-validate.vscode-html-validate",
"deque-systems.vscode-axe-linter",
"esbenp.prettier-vscode"
"esbenp.prettier-vscode"
]
}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ If you miss a component than [contribute](CONTRIBUTING.md), please.
## Framework showcases

* [DB UI Elements with React (CRA)](showcase/react-showcase/README.md)
* [DB UI Elements with Angular 15](showcase/angular-lts-showcase/README.md)
* [DB UI Elements with Angular 14](showcase/angular-lts-minus-1-showcase/README.md)
* [DB UI Elements with Vue](showcase/vue-showcase/README.md)

Expand Down
6 changes: 4 additions & 2 deletions doc/howto-angular.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ There are 3 ways to use Events in Angular:

### Example

[Angular Showcase GitHub](https://github.com/db-ui/elements/tree/main/showcase/angular-lts-minus-1-showcase)
[Angular v.15 Showcase GitHub](https://github.com/db-ui/elements/tree/main/showcase/angular-lts-showcase)
[Angular v.15 Showcase App](https://db-ui.github.io/elements/angular-lts-showcase/)

[Angular Showcase App](https://db-ui.github.io/elements/angular-lts-minus-1-showcase/)
[Angular v.14 Showcase GitHub](https://github.com/db-ui/elements/tree/main/showcase/angular-lts-minus-1-showcase)
[Angular v.14 Showcase App](https://db-ui.github.io/elements/angular-lts-minus-1-showcase/)
45 changes: 22 additions & 23 deletions e2e/cypress/e2e/99-1-showcases/showcases-tables.cy.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
context('showcase', () => {
const showcases = require('../../fixtures/showcases.json');
const showcases = ['angular-lts-minus-1', 'angular-lts'];

//showcases.forEach((showcase) => {
const showcase = 'angular-lts-minus-1';
it(`${showcase}: Test Tables`, () => {
cy.showcaseGoto(showcase, 'Tables');
showcases.forEach((showcase) => {
it(`${showcase}: Test Tables`, () => {
cy.showcaseGoto(showcase, 'Tables');

// 1. DbPagination
cy.get('db-pagination > nav > ol > li').eq(6).contains('…');
cy.get('db-pagination > nav > ol > li > button')
.eq(2)
.invoke('attr', 'aria-current')
.should('eq', 'page');
Array.from(Array(7)).forEach(() => {
cy.get('db-pagination > nav > ol > li > button').last().click();
});
cy.get('db-pagination > nav > ol > li > button')
.eq(7)
.invoke('attr', 'aria-current')
.should('eq', 'page');
// 1. DbPagination
cy.get('db-pagination > nav > ol > li').eq(6).contains('…');
cy.get('db-pagination > nav > ol > li > button')
.eq(2)
.invoke('attr', 'aria-current')
.should('eq', 'page');
Array.from(Array(7)).forEach(() => {
cy.get('db-pagination > nav > ol > li > button').last().click();
});
cy.get('db-pagination > nav > ol > li > button')
.eq(7)
.invoke('attr', 'aria-current')
.should('eq', 'page');

// 2. Table
// 2. Table

cy.get('table').eq(0).find('td').should('have.length', 6);
cy.get('table').eq(1).find('td').should('have.length', 6);
cy.get('table').eq(0).find('td').should('have.length', 6);
cy.get('table').eq(1).find('td').should('have.length', 6);

//
//
});
});
//});
});
2 changes: 1 addition & 1 deletion e2e/cypress/fixtures/showcases.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["angular-lts-minus-1", "react", "vue"]
["angular-lts-minus-1", "angular-lts", "react", "vue"]
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@db-ui/elements-monorepo",
"version": "0.0.0",
"scripts": {
"prepare": "cd showcase/react-showcase && npm i && cd ../angular-lts-minus-1-showcase && npm i && cd ../vue-showcase && npm i && cd ../playground-showcase && npm i && cd ../../ && husky install",
"prepare": "cd showcase/react-showcase && npm i && cd ../angular-lts-minus-1-showcase && npm i && cd ../angular-lts-showcase && npm i && cd ../vue-showcase && npm i && cd ../playground-showcase && npm i && cd ../../ && husky install",
"start": "concurrently \"npm run build.watch.enterprise --workspace=@db-ui/elements\" \"npm run start:storybook\"",
"start:storybook": "start-storybook -c .storybook -p 6006 --ci",
"watch:showcase:react": "concurrently \"npm run build.watch.local --workspace=@db-ui/elements\" \"npm run watch --workspace=@db-ui/react-elements\"",
Expand All @@ -15,7 +15,7 @@
"cypress": "npx cypress run --project ./e2e --env type=actual",
"cypress:watch": "npx cypress open --project ./e2e --env type=actual",
"cypress:ci": "start-server-and-test start:storybook http://localhost:6006 cypress",
"cypress:full": "node scripts/build angular-lts-minus-1,playground,react,reactwind,vue withShowcase && concurrently \"npm run cypress:watch\" \"npm run start:storybook\"",
"cypress:full": "node scripts/build angular-lts-minus-1,angular-lts,playground,react,reactwind,vue withShowcase && concurrently \"npm run cypress:watch\" \"npm run start:storybook\"",
"cypress:snapshot:base": "npx cypress run --project ./e2e --env type=base --config screenshotsFolder=e2e/cypress/snapshots/base",
"postcypress:snapshot:base": "rimraf --glob e2e/cypress/snapshots/base/**/*-base-*.png && node ./scripts/cypress/snapshot-helper.js",
"lint:markdownlint": "markdownlint -c .markdown-lint.yml '**/*.md'",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import './showcase.css';

export default {
title: '00-Intro/Showcases',
parameters: {
layout: 'fullscreen'
}
};

export const Angular_NG_build = () => {
return `<div class="iframe-container">
<iframe src="angular-lts-showcase/index.html" height="100vh" width="100%" />
</div>`;
};
16 changes: 15 additions & 1 deletion scripts/review-page-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ const getFrom = (framework) => {
if (framework === 'vue') {
return /\/vue-showcase/g;
}
if (framework === 'angular') {
if (framework === 'angular-lts-minus-1') {
return /\/angular-lts-minus-1-showcase/g;
}
if (framework === 'angular-lts') {
return /\/angular-lts-showcase/g;
}
if (framework === 'angular') {
return /\/angular-showcase/g;
}
if (framework === 'reactwind') {
return /\/reactwind-showcase/g;
}
Expand Down Expand Up @@ -44,6 +50,14 @@ const run = async () => {
from: /url\(/g,
to: 'url(/angular-lts-minus-1-showcase/'
});
await replace({
files: [
'./public/angular-lts-showcase/index.html',
'./public/angular-lts-showcase/styles.css'
],
from: /url\(/g,
to: 'url(/angular-lts-showcase/'
});
}
await replace({
files: [
Expand Down
Loading