Skip to content

Commit

Permalink
Merge branch 'main' into HttpHeaderInterceptor
Browse files Browse the repository at this point in the history
  • Loading branch information
leomendoza123 authored Aug 18, 2023
2 parents 64bcf2b + e32d61d commit f68f4c2
Show file tree
Hide file tree
Showing 67 changed files with 9,151 additions and 5,955 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/temp-storybook.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Build and Deploy

on:
push:
branches:
- "storybook-2023"
# paths: ["src/stories/**", ".storybook/**"]
permissions:
contents: write
jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 'v16.x'
cache: 'yarn'
- name: Install and Build
run: | # Install npm packages and build the Storybook files
yarn install
yarn run build:storybook
- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4
with:
FOLDER: dist/storybook/ng-orcid # The folder that the build-storybook script generates files.
1 change: 1 addition & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const config: StorybookConfig = {
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-interactions',
'@storybook/addon-a11y',
],
framework: {
name: '@storybook/angular',
Expand Down
8 changes: 8 additions & 0 deletions .storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<link
href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Material+Icons+Outlined"
rel="stylesheet"
/>
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
## v2.38.4 - 2023-08-17

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.38.3...v2.38.4)

### Fix

- Add missing interface and fix typos in code (#2044)

## v2.38.3 - 2023-08-16

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.38.2...v2.38.3)

- [#2043](https://github.com/ORCID/orcid-angular/pull/2043):

## v2.38.2 - 2023-08-16

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.38.1...v2.38.2)

- [#2041](https://github.com/ORCID/orcid-angular/pull/2041): Storybook (2023 re-enable)

## v2.38.1 - 2023-08-16

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.38.0...v2.38.1)

## v2.38.0 - 2023-08-15

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.36.14...v2.38.0)
Expand Down
12 changes: 10 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,8 @@
"src/styles.scss"
],
"scripts": [],
"assets": ["src/favicon.ico", "src/assets", "src/manifest.json"]
"assets": ["src/favicon.ico", "src/assets", "src/manifest.json"],
"sourceMap": true
}
},
"storybook": {
Expand All @@ -459,7 +460,14 @@
"compodoc": true,
"compodocArgs": ["-e", "json", "-d", "."],
"port": 6006
}
},
"styles": [
"src/assets/scss/noto-sans.scss",
"src/assets/scss/material.scss",
"src/assets/scss/orcid.scss",
"src/styles.scss",
"src/assets/scss/grid.scss"
]
},
"build-storybook": {
"builder": "@storybook/angular:build-storybook",
Expand Down
8,524 changes: 6,146 additions & 2,378 deletions documentation.json

Large diffs are not rendered by default.

17 changes: 0 additions & 17 deletions e2e/.storybook/main.ts

This file was deleted.

18 changes: 0 additions & 18 deletions e2e/.storybook/preview.ts

This file was deleted.

11 changes: 0 additions & 11 deletions e2e/.storybook/tsconfig.json

This file was deleted.

4 changes: 0 additions & 4 deletions e2e/.storybook/typings.d.ts

This file was deleted.

28 changes: 0 additions & 28 deletions e2e/protractor.conf.js

This file was deleted.

14 changes: 0 additions & 14 deletions e2e/src/app.e2e-spec.ts

This file was deleted.

11 changes: 0 additions & 11 deletions e2e/src/app.po.ts

This file was deleted.

8 changes: 0 additions & 8 deletions e2e/src/stories/.eslintrc.json

This file was deleted.

51 changes: 0 additions & 51 deletions e2e/src/stories/Button.stories.ts

This file was deleted.

37 changes: 0 additions & 37 deletions e2e/src/stories/Header.stories.ts

This file was deleted.

Loading

0 comments on commit f68f4c2

Please sign in to comment.