Skip to content

Commit

Permalink
Merge pull request #351 from TAMULib/sprint17-staging
Browse files Browse the repository at this point in the history
Sprint17 staging
  • Loading branch information
jeremythuff authored Apr 23, 2021
2 parents 8428362 + f0c0e4c commit 7cae335
Show file tree
Hide file tree
Showing 20 changed files with 237 additions and 77 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [1.10.0] - 04-23-21
### Resolves
- Weaver Modal button should be toggle-able. (#329 )
- WVRWYSIWYG is not appearing in the usage documentation. (#330 )
- WVR Theme Variants should be expanded to include all needed variant names. (#334)
- Weaver Component's Modal Component should utilize the wvr-button-component intead of the wvre-button. ( #341)
- Weaver component should provide additional theme variants. ( #342)
- Weaver drop down menu should have a delay on hover prior to displaying the dropdown menu. ( #344)

## [1.9.0] - 03-31-21
### Resolves

Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
[![Build Status](https://github.com/TAMULib/weaver-components/workflows/Build/badge.svg)](https://github.com/TAMULib/weaver-components/actions?query=workflow%3ABuild)
[![Coverage Status](https://coveralls.io/repos/github/TAMULib/weaver-components/badge.svg?branch=master)](https://coveralls.io/github/TAMULib/weaver-components?branch=master) [![Compodoc Coverage](https://tamulib.github.io/weaver-components/docs/development/images/coverage-badge-documentation.svg)](https://tamulib.github.io/weaver-components/docs/development/coverage.html)

# Lighthouse Badges

[![Performance](https://tamulib.github.io/weaver-components/reports/audit/assets/performance.svg)](https://tamulib.github.io/weaver-components/reports/audit/#performance)
[![Accessibility](https://tamulib.github.io/weaver-components/reports/audit/assets/accessibility.svg)](https://tamulib.github.io/weaver-components/reports/audit/#accessibility)
[![Best Practices](https://tamulib.github.io/weaver-components/reports/audit/assets/best-practices.svg)](https://tamulib.github.io/weaver-components/reports/audit/#best-practices)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "git",
"url": "git+https://github.com/TAMULib/weaver-components.git"
},
"version": "1.9.0",
"version": "1.10.0",
"private": false,
"license": "MIT",
"config": {
Expand Down
2 changes: 1 addition & 1 deletion projects/wvr-elements/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wvr/elements",
"version": "1.9.0",
"version": "1.10.0",
"description": "Collection of angular components for Weaver's Custom Web Component UI",
"author": "Texas A&M University Libraries",
"private": false,
Expand Down
2 changes: 1 addition & 1 deletion projects/wvr-elements/src/lib/core/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,4 @@ export const selectWysiwygState = createFeatureSelector<RootState, fromWysiwyg.S

// TODO - states not to be undefined during testing.
export const selectWysiwygById = (id: string) =>
createSelector(selectWysiwygState, (wysiwygState: fromWysiwyg.State) => wysiwygState ? wysiwygState.entities[id]: undefined);
createSelector(selectWysiwygState, (wysiwygState: fromWysiwyg.State) => wysiwygState ? wysiwygState.entities[id] : undefined);
21 changes: 12 additions & 9 deletions projects/wvr-elements/src/lib/core/theme/theme.reducers.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ describe(' Theme Reducers', () => {
const state = {
"themes":{
"appleTheme":{
"primary":{"baseColor":"red"}, "secondary":{"baseColor":"maroon"}, "success":{"baseColor":"apple"},
"danger":{"baseColor":"grey"},"warning":{"baseColor":"pumpkin"}, "info":{"baseColor":"apple"},
"light":{"baseColor":"tomato"}, "dark":{"baseColor":"yellow"}, "accent":{"baseColor":"tomato"}
"primary":{"baseColor":"yellow"}, "primaryAccent":{"baseColor":"yellow"}, "primaryNeutral":{"baseColor":"yellow"},
"secondary":{"baseColor":"yellow"}, "secondaryAccent":{"baseColor":"yellow"}, "secondaryNeutral":{"baseColor":"yellow"},
"success":{"baseColor":"yellow"}, "danger":{"baseColor":"yellow"},"warning":{"baseColor":"yellow"}, "info":{"baseColor":"yellow"},
"light":{"baseColor":"yellow"}, "dark":{"baseColor":"yellow"}
},
"ballTheme":{
"primary":{"baseColor":"blue"}, "secondary":{"baseColor":"blue"}, "success":{"baseColor":"blue"},
"danger":{"baseColor":"blue"},"warning":{"baseColor":"blue"}, "info":{"baseColor":"blue"},
"light":{"baseColor":"blue"}, "dark":{"baseColor":"blue"}, "accent":{"baseColor":"blue"}
"primary":{"baseColor":"yellow"}, "primaryAccent":{"baseColor":"yellow"}, "primaryNeutral":{"baseColor":"yellow"},
"secondary":{"baseColor":"yellow"}, "secondaryAccent":{"baseColor":"yellow"}, "secondaryNeutral":{"baseColor":"yellow"},
"success":{"baseColor":"yellow"}, "danger":{"baseColor":"yellow"},"warning":{"baseColor":"yellow"}, "info":{"baseColor":"yellow"},
"light":{"baseColor":"yellow"}, "dark":{"baseColor":"yellow"}
}
},
"currentTheme":"ballTheme"
Expand All @@ -29,9 +31,10 @@ describe(' Theme Reducers', () => {

const name = 'appleTheme';
const theme: ThemeVariants = {
"primary":{"baseColor":"yellow"}, "secondary":{"baseColor":"yellow"}, "success":{"baseColor":"yellow"},
"danger":{"baseColor":"yellow"},"warning":{"baseColor":"yellow"}, "info":{"baseColor":"yellow"},
"light":{"baseColor":"yellow"}, "dark":{"baseColor":"yellow"}, "accent":{"baseColor":"yellow"}
"primary":{"baseColor":"yellow"}, "primaryAccent":{"baseColor":"yellow"}, "primaryNeutral":{"baseColor":"yellow"},
"secondary":{"baseColor":"yellow"}, "secondaryAccent":{"baseColor":"yellow"}, "secondaryNeutral":{"baseColor":"yellow"},
"success":{"baseColor":"yellow"}, "danger":{"baseColor":"yellow"},"warning":{"baseColor":"yellow"}, "info":{"baseColor":"yellow"},
"light":{"baseColor":"yellow"}, "dark":{"baseColor":"yellow"}
};

it('should add theme', () => {
Expand Down
4 changes: 3 additions & 1 deletion projects/wvr-elements/src/lib/core/wvr-core.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, Injector, NgModule, Optional, SkipSelf } from '
import { createCustomElement } from '@angular/elements';
import { EffectsModule } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { InlineSVGModule } from 'ng-inline-svg';
import { WvrAlertComponent } from '../wvr-alert/wvr-alert.component';
import { WvrButtonComponent } from '../wvr-button/wvr-button.component';
Expand Down Expand Up @@ -91,7 +92,8 @@ const MODULES = [
clientOnly: true,
bypassHttpClientInterceptorChain: true
}),
StoreModule.forRoot(ROOT_REDUCER, { metaReducers })
StoreModule.forRoot(ROOT_REDUCER, { metaReducers }),
StoreDevtoolsModule.instrument()
];

const PROVIDERS = [
Expand Down
Loading

0 comments on commit 7cae335

Please sign in to comment.