Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(playground): add without-styles folder for bootstrap like use-cases #1271

Merged
merged 1 commit into from
Mar 3, 2019
Merged

feat(playground): add without-styles folder for bootstrap like use-cases #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions schematics/playground-module/add-to-modules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
applyReplaceChange,
findRoutingModule,
findFeatureModule,
getPlaygroundRootDir,
getPlaygroundDirs,
findRoutesArray,
addMissingChildRoutes,
isInPlaygroundRoot,
Expand All @@ -42,7 +42,7 @@ import {
} from '../utils';

export function addToModules(tree: Tree, context: SchematicContext): Tree {
processDirs(tree, context, [getPlaygroundRootDir(tree)]);
processDirs(tree, context, getPlaygroundDirs(tree));
return tree;
}

Expand Down
2 changes: 1 addition & 1 deletion schematics/utils/playground.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function getPlaygroundRootDir(tree: Tree): DirEntry {
* Returns DirEntries of root playground directories excluding ignored.
* @param tree
*/
function getPlaygroundDirs(tree: Tree): DirEntry[] {
export function getPlaygroundDirs(tree: Tree): DirEntry[] {
const pgDir = getPlaygroundRootDir(tree);

return pgDir.subdirs
Expand Down
22 changes: 11 additions & 11 deletions src/app/playground-components.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,17 +1309,6 @@ export const PLAYGROUND_COMPONENTS: ComponentLink[] = [
},
],
},
{
path: 'bootstrap',
children: [
{
path: 'bootstrap-test.component',
link: '/bootstrap/bootstrap-test.component',
component: 'BootstrapTestComponent',
name: 'Bootstrap Test',
},
],
},
{
path: 'context-menu',
children: [
Expand Down Expand Up @@ -1630,4 +1619,15 @@ export const PLAYGROUND_COMPONENTS: ComponentLink[] = [
},
],
},
{
path: 'bootstrap',
children: [
{
path: 'bootstrap-test.component',
link: '/bootstrap/bootstrap-test.component',
component: 'BootstrapTestComponent',
name: 'Bootstrap Test',
},
],
},
];
4 changes: 4 additions & 0 deletions src/playground/playground-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ export const routes: Routes = [
path: '',
loadChildren: './without-layout/without-layout.module#WithoutLayoutModule',
},
{
path: '',
loadChildren: './without-styles/without-styles.module#WithoutStylesModule',
},
];

@NgModule({
Expand Down
146 changes: 0 additions & 146 deletions src/playground/without-layout/bootstrap/bootstrap-test.component.ts
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/playground/without-layout/without-layout-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ const routes: Route[] = [
path: '',
component: PlaygroundBaseComponent,
children: [
{
path: 'bootstrap',
loadChildren: './bootstrap/bootstrap.module#BootstrapModule',
},
{
path: 'context-menu',
loadChildren: './context-menu/context-menu.module#ContextMenuModule',
Expand Down
0 ...out/bootstrap/bootstrap-routing.module.ts → ...les/bootstrap/bootstrap-routing.module.ts
View file
Open in desktop
File renamed without changes.
Loading