Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { provideDaffDesignHeroExamplesContent } from '@daffodil/design-examples/
import { provideDaffDesignImageExamplesContent } from '@daffodil/design-examples/image';
import { provideDaffDesignInputExamplesContent } from '@daffodil/design-examples/input';
import { provideDaffDesignListExamplesContent } from '@daffodil/design-examples/list';
import { provideDaffDesignLoadingIconExamplesContent } from '@daffodil/design-examples/loading-icon';
import { provideDaffDesignMediaGalleryExamplesContent } from '@daffodil/design-examples/media-gallery';
import { provideDaffDesignMenuExamplesContent } from '@daffodil/design-examples/menu';
import { provideDaffDesignModalExamplesContent } from '@daffodil/design-examples/modal';
Expand Down Expand Up @@ -58,7 +57,6 @@ export const provideDaffioDesignExamplesContent = () => makeEnvironmentProviders
provideDaffDesignImageExamplesContent(),
provideDaffDesignInputExamplesContent(),
provideDaffDesignListExamplesContent(),
provideDaffDesignLoadingIconExamplesContent(),
provideDaffDesignMediaGalleryExamplesContent(),
provideDaffDesignMenuExamplesContent(),
provideDaffDesignModalExamplesContent(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
</div>
}
@if ((loading$ | async)) {
<daff-loading-icon></daff-loading-icon>
<daff-spinner></daff-spinner>
}
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ describe('AddToCartNotificationComponent', () => {
expect(buttonSetElement).not.toBeNull();
});

it('should not render <daff-loading-icon>', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-loading-icon'));
it('should not render <daff-spinner>', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-spinner'));
expect(loadingIcon).toBeNull();
});
});
Expand Down Expand Up @@ -235,8 +235,8 @@ describe('AddToCartNotificationComponent', () => {
expect(buttonSetElement).toBeNull();
});

it('should render <daff-loading-icon>', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-loading-icon'));
it('should render <daff-spinner>', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-spinner'));

expect(loadingIcon).not.toBeNull();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
DAFF_BASIC_BUTTON_COMPONENTS,
DAFF_ICON_BUTTON_COMPONENTS,
} from '@daffodil/design/button';
import { DaffLoadingIconComponent } from '@daffodil/design/loading-icon';
import { DaffSpinnerComponent } from '@daffodil/design/spinner';
import { DaffProduct } from '@daffodil/product';
import {
DaffProductStateRootSlice,
Expand All @@ -42,7 +42,7 @@ import { ProductAddedComponent } from '../product-added/product-added.component'
ViewCartDirective,
ProceedToCheckoutDirective,
ProductAddedComponent,
DaffLoadingIconComponent,
DaffSpinnerComponent,
DAFF_BASIC_BUTTON_COMPONENTS,
DAFF_ICON_BUTTON_COMPONENTS,
FaIconComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
@if ((loading)) {
<div class="demo-cart-summary-wrapper__loading-icon">
<daff-loading-icon></daff-loading-icon>
<daff-spinner></daff-spinner>
</div>
}
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {

import { DaffCart } from '@daffodil/cart';
import { DaffCartFactory } from '@daffodil/cart/testing';
import { DAFF_LOADING_ICON_COMPONENTS } from '@daffodil/design/loading-icon';
import { DAFF_SPINNER_COMPONENTS } from '@daffodil/design/spinner';

import { CartSummaryWrapperComponent } from './cart-summary-wrapper.component';
import { CartSummaryComponent } from '../cart-summary/cart-summary.component';
Expand Down Expand Up @@ -76,7 +76,7 @@ describe('CartSummaryWrapper', () => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule,
DAFF_LOADING_ICON_COMPONENTS,
DAFF_SPINNER_COMPONENTS,
WrapperComponent,
CartSummaryWrapperComponent,
MockCartTotalsComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from '@angular/core';

import { DaffCart } from '@daffodil/cart';
import { DAFF_LOADING_ICON_COMPONENTS } from '@daffodil/design/loading-icon';
import { DAFF_SPINNER_COMPONENTS } from '@daffodil/design/spinner';

import { HelpBoxComponent } from '../../../misc/help-box/help-box.component';
import { CartSummaryComponent } from '../cart-summary/cart-summary.component';
Expand All @@ -19,7 +19,7 @@ import { CartTotalsComponent } from '../cart-totals/cart-totals.component';
imports: [
CartSummaryComponent,
CartTotalsComponent,
DAFF_LOADING_ICON_COMPONENTS,
DAFF_SPINNER_COMPONENTS,
HelpBoxComponent,
],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<demo-cart [cart]="cart$ | async" class="demo-cart-view__cart"></demo-cart>
}
@if (loading$ | async) {
<daff-loading-icon></daff-loading-icon>
<daff-spinner></daff-spinner>
}
</daff-container>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
} from '@daffodil/cart/state/testing';
import { DaffCartFactory } from '@daffodil/cart/testing';
import { DAFF_CONTAINER_COMPONENTS } from '@daffodil/design/container';
import { DAFF_LOADING_ICON_COMPONENTS } from '@daffodil/design/loading-icon';
import { DAFF_SPINNER_COMPONENTS } from '@daffodil/design/spinner';

import { DemoCartViewComponent } from './cart-view.component';

Expand All @@ -40,7 +40,7 @@ describe('DemoCartViewComponent', () => {
TestBed.configureTestingModule({
imports: [
DAFF_CONTAINER_COMPONENTS,
DAFF_LOADING_ICON_COMPONENTS,
DAFF_SPINNER_COMPONENTS,
DaffCartStateTestingModule,
DemoCartViewComponent,
MockCartWrapperComponent,
Expand Down Expand Up @@ -91,14 +91,14 @@ describe('DemoCartViewComponent', () => {
fixture.detectChanges();

cartWrapper = fixture.debugElement.query(By.css('demo-cart'));
loadingIcon = fixture.debugElement.query(By.css('daff-loading-icon'));
loadingIcon = fixture.debugElement.query(By.css('daff-spinner'));
});

it('should not render demo-cart', () => {
expect(cartWrapper).toBeNull();
});

it('should render daff-loading-icon', () => {
it('should render daff-spinner', () => {
expect(loadingIcon).not.toBeNull();
});
});
Expand All @@ -113,14 +113,14 @@ describe('DemoCartViewComponent', () => {
fixture.detectChanges();

cartWrapper = fixture.debugElement.query(By.css('demo-cart'));
loadingIcon = fixture.debugElement.query(By.css('daff-loading-icon'));
loadingIcon = fixture.debugElement.query(By.css('daff-spinner'));
});

it('should render demo-cart', () => {
expect(cartWrapper).not.toBeNull();
});

it('should not render daff-loading-icon', () => {
it('should not render daff-spinner', () => {
expect(loadingIcon).toBeNull();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
import { DaffCart } from '@daffodil/cart';
import { DaffCartFacade } from '@daffodil/cart/state';
import { DAFF_CONTAINER_COMPONENTS } from '@daffodil/design/container';
import { DAFF_LOADING_ICON_COMPONENTS } from '@daffodil/design/loading-icon';
import { DAFF_SPINNER_COMPONENTS } from '@daffodil/design/spinner';

import { CartComponent } from '../../components/cart/cart.component';

Expand All @@ -17,7 +17,7 @@ import { CartComponent } from '../../components/cart/cart.component';
styleUrls: ['./cart-view.component.scss'],
imports: [
AsyncPipe,
DAFF_LOADING_ICON_COMPONENTS,
DAFF_SPINNER_COMPONENTS,
DAFF_CONTAINER_COMPONENTS,
CartComponent,
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ <h1>{{(category$ | async).name}}</h1>
<demo-product-grid [products]="products$ | async"></demo-product-grid>
}
@if (loading$ | async) {
<daff-loading-icon></daff-loading-icon>
<daff-spinner></daff-spinner>
}
<daff-container>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '@daffodil/category/state/testing';
import { DaffCategoryFactory } from '@daffodil/category/testing';
import { DaffContainerComponent } from '@daffodil/design/container';
import { DaffLoadingIconComponent } from '@daffodil/design/loading-icon';
import { DaffSpinnerComponent } from '@daffodil/design/spinner';
import { DaffProduct } from '@daffodil/product';
import {
DaffProductFactory,
Expand All @@ -39,7 +39,7 @@ describe('CategoryViewComponent', () => {
imports: [
CategoryViewComponent,
DaffContainerComponent,
DaffLoadingIconComponent,
DaffSpinnerComponent,
ProductGridComponent,
DaffCategoryStateTestingModule,
DaffProductTestingModule,
Expand Down Expand Up @@ -91,8 +91,8 @@ describe('CategoryViewComponent', () => {
expect(productGrid).not.toBeNull();
});

it('should not render daff-loading-icon', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-loading-icon'));
it('should not render daff-spinner', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-spinner'));

expect(loadingIcon).toBeNull();
});
Expand All @@ -110,8 +110,8 @@ describe('CategoryViewComponent', () => {
expect(productGrid).toBeNull();
});

it('should render daff-loading-icon', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-loading-icon'));
it('should render daff-spinner', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-spinner'));
expect(loadingIcon).not.toBeNull();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
import { DaffCategory } from '@daffodil/category';
import { DaffCategoryFacade } from '@daffodil/category/state';
import { DaffContainerComponent } from '@daffodil/design/container';
import { DaffLoadingIconComponent } from '@daffodil/design/loading-icon';
import { DaffSpinnerComponent } from '@daffodil/design/spinner';
import { DaffProduct } from '@daffodil/product';

import { ProductGridComponent } from '../../../product/components/product-grid/product-grid.component';
Expand All @@ -19,7 +19,7 @@ import { ProductGridComponent } from '../../../product/components/product-grid/p
imports: [
AsyncPipe,
DaffContainerComponent,
DaffLoadingIconComponent,
DaffSpinnerComponent,
ProductGridComponent,
],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<daff-container size="md">
@if (vm.loading) {
@if (vm.loading) {
<daff-loading-icon class="demo-checkout__loading-icon"></daff-loading-icon>
<daff-spinner class="demo-checkout__loading-icon"></daff-spinner>
}
} @else {
@if (vm.loading === false) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
import { DaffCartFacade } from '@daffodil/cart/state';
import { DAFF_ACCORDION_COMPONENTS } from '@daffodil/design/accordion';
import { DAFF_CONTAINER_COMPONENTS } from '@daffodil/design/container';
import { DAFF_LOADING_ICON_COMPONENTS } from '@daffodil/design/loading-icon';
import { DAFF_SPINNER_COMPONENTS } from '@daffodil/design/spinner';
import { DaffPersonalAddress } from '@daffodil/geography';

import { CartSummaryWrapperComponent } from '../../../cart/components/cart-summary-wrapper/cart-summary-wrapper.component';
Expand Down Expand Up @@ -49,7 +49,7 @@ import {
imports: [
LetDirective,
DAFF_CONTAINER_COMPONENTS,
DAFF_LOADING_ICON_COMPONENTS,
DAFF_SPINNER_COMPONENTS,
DAFF_ACCORDION_COMPONENTS,
DemoCheckoutShippingAddressFormComponent,
DemoCheckoutShippingAddressSummaryComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<div class="demo-sidebar__error"> {{ error }}</div>
}
@if (treeLoading$ | async) {
<daff-loading-icon></daff-loading-icon>
<daff-spinner></daff-spinner>
}
</daff-sidebar>
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ describe('SidebarContainer', () => {
expect(sidebarListComponent).toBeTruthy();
});

it('should not render the daff-loading-icon', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-loading-icon'));
it('should not render the daff-spinner', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-spinner'));

expect(loadingIcon).toBeFalsy();
});
Expand All @@ -124,8 +124,8 @@ describe('SidebarContainer', () => {
expect(sidebarListComponent).toBeFalsy();
});

it('should render the daff-loading-icon', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-loading-icon'));
it('should render the daff-spinner', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-spinner'));

expect(loadingIcon).toBeTruthy();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import { Store } from '@ngrx/store';
import { Observable } from 'rxjs';

import { DaffStateError } from '@daffodil/core/state';
import { DAFF_LOADING_ICON_COMPONENTS } from '@daffodil/design/loading-icon';
import {
DaffSidebarSide,
DaffSidebarMode,
DaffSidebarComponent,
DAFF_SIDEBAR_COMPONENTS,
} from '@daffodil/design/sidebar';
import { DAFF_SPINNER_COMPONENTS } from '@daffodil/design/spinner';
import { DaffNavigationTree } from '@daffodil/navigation';
import {
DaffNavigationFacade,
Expand All @@ -40,7 +40,7 @@ import * as fromDemoSidebar from '../../reducers/index';
AsyncPipe,
FaIconComponent,
DAFF_SIDEBAR_COMPONENTS,
DAFF_LOADING_ICON_COMPONENTS,
DAFF_SPINNER_COMPONENTS,
SidebarListComponent,
],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

@if ((loading$ | async)) {
<div class="demo-best-sellers__loading-icon">
<daff-loading-icon></daff-loading-icon>
<daff-spinner></daff-spinner>
</div>
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Observable,
} from 'rxjs';

import { DaffLoadingIconComponent } from '@daffodil/design/loading-icon';
import { DaffSpinnerComponent } from '@daffodil/design/spinner';
import { DaffProduct } from '@daffodil/product';
import {
DaffProductGridFacade,
Expand All @@ -25,7 +25,7 @@ import { ProductGridComponent } from '../../components/product-grid/product-grid
styleUrls: ['./best-sellers.component.scss'],
imports: [
AsyncPipe,
DaffLoadingIconComponent,
DaffSpinnerComponent,
ProductGridComponent,
DaffProductStateModule,
DaffRelatedProductStateModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<demo-product-grid [products]="products$ | async"></demo-product-grid>
}
@if (loading$ | async) {
<daff-loading-icon></daff-loading-icon>
<daff-spinner></daff-spinner>
}
<daff-container>
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ describe('ProductGridViewComponent', () => {
expect(productGrid).not.toBeNull();
});

it('should not render daff-loading-icon', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-loading-icon'));
it('should not render daff-spinner', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-spinner'));

expect(loadingIcon).toBeNull();
});
Expand All @@ -98,8 +98,8 @@ describe('ProductGridViewComponent', () => {
expect(productGrid).toBeNull();
});

it('should render daff-loading-icon', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-loading-icon'));
it('should render daff-spinner', () => {
const loadingIcon = fixture.debugElement.query(By.css('daff-spinner'));
expect(loadingIcon).not.toBeNull();
});
});
Expand Down
Loading
Loading