Skip to content
Open
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
20 changes: 10 additions & 10 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
"sourceMap": true,
"fileReplacements": [
{
"replace": "apps/demo/src/app/drivers/driver.module.ts",
"with": "apps/demo/src/app/drivers/in-memory.module.ts"
"replace": "apps/demo/src/app/drivers/driver.providers.ts",
"with": "apps/demo/src/app/drivers/in-memory.providers.ts"
}
]
},
Expand All @@ -86,8 +86,8 @@
"with": "apps/demo/src/environments/environment.prod.ts"
},
{
"replace": "apps/demo/src/app/drivers/driver.module.ts",
"with": "apps/demo/src/app/drivers/in-memory.module.ts"
"replace": "apps/demo/src/app/drivers/driver.providers.ts",
"with": "apps/demo/src/app/drivers/in-memory.providers.ts"
}
]
},
Expand All @@ -98,8 +98,8 @@
"with": "apps/demo/src/environments/environment.magento.ts"
},
{
"replace": "apps/demo/src/app/drivers/driver.module.ts",
"with": "apps/demo/src/app/drivers/magento.module.ts"
"replace": "apps/demo/src/app/drivers/driver.providers.ts",
"with": "apps/demo/src/app/drivers/magento.providers.ts"
}
]
},
Expand All @@ -110,8 +110,8 @@
"with": "apps/demo/src/environments/environment.venia.ts"
},
{
"replace": "apps/demo/src/app/drivers/driver.module.ts",
"with": "apps/demo/src/app/drivers/magento.module.ts"
"replace": "apps/demo/src/app/drivers/driver.providers.ts",
"with": "apps/demo/src/app/drivers/magento.providers.ts"
}
]
},
Expand All @@ -122,8 +122,8 @@
"with": "apps/demo/src/environments/environment.shopify.ts"
},
{
"replace": "apps/demo/src/app/drivers/driver.module.ts",
"with": "apps/demo/src/app/drivers/shopify.module.ts"
"replace": "apps/demo/src/app/drivers/driver.providers.ts",
"with": "apps/demo/src/app/drivers/shopify.providers.ts"
}
]
}
Expand Down
9 changes: 3 additions & 6 deletions apps/demo/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';
import {
importProvidersFrom,
NgModule,
} from '@angular/core';
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { EffectsModule } from '@ngrx/effects';
Expand All @@ -25,7 +22,7 @@ import { AppComponent } from './app.component';
import { DemoCartRootModule } from './cart/cart-root.module';
import { DemoCheckoutStepActionTypes } from './checkout/actions/checkout-step.actions';
import { TemplateModule } from './core/template/template/template.module';
import { DemoDriverModule } from './drivers/driver.module';
import { provideDemoDrivers } from './drivers/driver.providers';
import { NotFoundModule } from './misc/not-found/not-found.module';
import { ProductModule } from './product/product.module';
import { DemoRoutingComponentModule } from './routing/routing-component.module';
Expand Down Expand Up @@ -80,7 +77,7 @@ import { environment } from '../environments/environment';
// importing modules. therefore, the in memory web API
// will not be able override the HTTP client backend
// when imported as a module
importProvidersFrom(DemoDriverModule),
provideDemoDrivers(),
//
],
bootstrap: [AppComponent],
Expand Down
4 changes: 0 additions & 4 deletions apps/demo/src/app/drivers/driver.module.ts

This file was deleted.

1 change: 1 addition & 0 deletions apps/demo/src/app/drivers/driver.providers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const provideDemoDrivers = () => [];
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
NgModule,
inject,
importProvidersFrom,
makeEnvironmentProviders,
} from '@angular/core';

import { DaffAuthInMemoryDriverModule } from '@daffodil/auth/driver/in-memory';
Expand All @@ -24,21 +25,21 @@ import { DaffConfigurableProductInMemoryDriverModule } from '@daffodil/product-c

import { DEMO_EXTERNAL_ROUTER_DRIVER_IN_MEMORY_CONFIG } from './in-memory/external-router.config.token';

@NgModule({
imports: [
DaffInMemoryDriverModule.forRoot(),
DaffAuthorizeNetInMemoryDriverModule.forRoot(),
DaffAuthInMemoryDriverModule.forRoot(),
DaffProductInMemoryDriverModule.forRoot(),
DaffCompositeProductInMemoryDriverModule.forRoot(),
DaffConfigurableProductInMemoryDriverModule.forRoot(),
DaffCartInMemoryDriverModule.forRoot(),
DaffNavigationInMemoryDriverModule.forRoot(),
DaffNewsletterInMemoryDriverModule.forRoot(),
DaffGeographyInMemoryDriverModule.forRoot(),
DaffCategoryInMemoryDriverModule.forRoot(),
],
providers: [
export const provideDemoDrivers = () => [
makeEnvironmentProviders([
importProvidersFrom(
DaffInMemoryDriverModule.forRoot(),
DaffAuthorizeNetInMemoryDriverModule.forRoot(),
DaffAuthInMemoryDriverModule.forRoot(),
DaffProductInMemoryDriverModule.forRoot(),
DaffCompositeProductInMemoryDriverModule.forRoot(),
DaffConfigurableProductInMemoryDriverModule.forRoot(),
DaffCartInMemoryDriverModule.forRoot(),
DaffNavigationInMemoryDriverModule.forRoot(),
DaffNewsletterInMemoryDriverModule.forRoot(),
DaffGeographyInMemoryDriverModule.forRoot(),
DaffCategoryInMemoryDriverModule.forRoot(),
),
provideDaffExternalRouterInMemoryDriver(DEMO_EXTERNAL_ROUTER_DRIVER_IN_MEMORY_CONFIG),
{
provide: DAFF_NAVIGATION_IN_MEMORY_SEED_DATA_PROVIDER,
Expand All @@ -47,6 +48,5 @@ import { DEMO_EXTERNAL_ROUTER_DRIVER_IN_MEMORY_CONFIG } from './in-memory/extern
return () => categoryBackend.categories[0];
},
},
],
})
export class DemoDriverModule { }
]),
];
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { NgModule } from '@angular/core';
import {
importProvidersFrom,
makeEnvironmentProviders,
} from '@angular/core';
import { provideApollo } from 'apollo-angular';

import { DaffAuthMagentoDriverModule } from '@daffodil/auth/driver/magento';
Expand All @@ -15,23 +18,21 @@ import { demoMagentoApolloOptions } from './magento/apollo-options.factory';
import { environment } from '../../environments/environment';
import { MagentoEnvironmentDriverConfiguration } from '../../environments/environment.interface';

@NgModule({
imports: [
//Magento
DaffAuthMagentoDriverModule.forRoot(),
DaffProductMagentoDriverModule.forRoot({
baseMediaUrl: 'https://magento2.test/media/',
}),
DaffCartMagentoDriverModule.forRoot(),
DaffNavigationMagentoDriverModule.forRoot(),
DaffNewsletterInMemoryDriverModule.forRoot(),
DaffGeographyMagentoDriverModule.forRoot(),
DaffCategoryMagentoDriverModule.forRoot(),
DaffMagentoAuthorizeNetDriverModule.forRoot((<MagentoEnvironmentDriverConfiguration>environment.driver).anetConfig),
],
providers: [
export const provideDemoDrivers = () => [
makeEnvironmentProviders([
importProvidersFrom(
DaffAuthMagentoDriverModule.forRoot(),
DaffProductMagentoDriverModule.forRoot({
baseMediaUrl: 'https://magento2.test/media/',
}),
DaffCartMagentoDriverModule.forRoot(),
DaffNavigationMagentoDriverModule.forRoot(),
DaffNewsletterInMemoryDriverModule.forRoot(),
DaffGeographyMagentoDriverModule.forRoot(),
DaffCategoryMagentoDriverModule.forRoot(),
DaffMagentoAuthorizeNetDriverModule.forRoot((<MagentoEnvironmentDriverConfiguration>environment.driver).anetConfig),
),
provideApollo(demoMagentoApolloOptions),
provideDaffExternalRouterMagentoDriver(),
],
})
export class DemoDriverModule {}
]),
];
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { NgModule } from '@angular/core';
import {
importProvidersFrom,
makeEnvironmentProviders,
} from '@angular/core';

import { DaffAuthorizeNetInMemoryDriverModule } from '@daffodil/authorizenet/driver/in-memory';
import { DaffCartInMemoryDriverModule } from '@daffodil/cart/driver/in-memory';
Expand All @@ -19,19 +22,18 @@ import { ShopifyEnviromentDriverConfiguration } from '../../environments/environ
const domain = (<ShopifyEnviromentDriverConfiguration>environment.driver).domain;
const accessToken = (<ShopifyEnviromentDriverConfiguration>environment.driver).publicAccessToken;

@NgModule({
imports: [
DaffInMemoryDriverModule.forRoot(),
DaffProductShopifyDriverModule.forRoot(),
DaffCartInMemoryDriverModule.forRoot(),
DaffNewsletterInMemoryDriverModule.forRoot(),
DaffCategoryInMemoryDriverModule.forRoot(),
DaffNavigationInMemoryDriverModule.forRoot(),
DaffAuthorizeNetInMemoryDriverModule.forRoot(),
],
providers: [
export const provideDemoDrivers = () => [
makeEnvironmentProviders([
importProvidersFrom(
DaffInMemoryDriverModule.forRoot(),
DaffProductShopifyDriverModule.forRoot(),
DaffCartInMemoryDriverModule.forRoot(),
DaffNewsletterInMemoryDriverModule.forRoot(),
DaffCategoryInMemoryDriverModule.forRoot(),
DaffNavigationInMemoryDriverModule.forRoot(),
DaffAuthorizeNetInMemoryDriverModule.forRoot(),
),
provideDaffProductExtraFactoryTypes(DaffDefaultProductFactory),
provideShopifyApolloDriver(domain, accessToken),
],
})
export class DemoDriverModule {}
]),
];