Skip to content

Commit d2f7914

Browse files
cal-smithcal-smith
committed
rework towards minimal carbon implementation
1 parent f139930 commit d2f7914

File tree

144 files changed

+2242
-13241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+2242
-13241
lines changed

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @callums @Zvonimir-Fras
1+
* @cal-smith @Zvonimir-Fras

‎demo/demo-app/app.component.ts‎

Lines changed: 40 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, OnInit, ViewEncapsulation } from "@angular/core";
22
import { TranslateService } from "@ngx-translate/core";
33
import { Router, NavigationEnd, NavigationStart } from "@angular/router";
4-
import { HcModeChecker, IconService } from "./../../src";
4+
import { IconService } from "./../../src";
55
import "rxjs/add/operator/filter";
66

77
const en = require("./../../src/i18n/en.json");
@@ -10,32 +10,20 @@ const en = require("./../../src/i18n/en.json");
1010
selector: "app-root",
1111
template: `
1212
<header class="p-demo-header text--center">
13-
<h1>Neutrino</h1>
14-
<h2>A componentized <em>Angular</em> implementation of the Watson Customer Engagement design guide.</h2>
15-
<a class="btn--icon-white" href="https://github.ibm.com/peretz/neutrino">
16-
<n-icon icon="build" color="white" size="sm"></n-icon>
13+
<h1>Carbon Components Angular</h1>
14+
<h2>An <em>Angular</em> implementation of the Carbon Design System</h2>
15+
<a class="btn--icon-white" href="https://github.com/ibm/carbon-components-angular">
16+
<ibm-icon icon="build" color="white" size="sm"></ibm-icon>
1717
Project
1818
</a>
1919
<a class="btn--icon-white" href="https://github.ibm.com/peretz/neutrino/wiki/Style-guide">
20-
<n-icon icon="form_opt_in" color="white" size="sm"></n-icon>
20+
<ibm-icon icon="form_opt_in" color="white" size="sm"></ibm-icon>
2121
Code style guide
2222
</a>
23-
<a class="btn--icon-white" href="https://pages.github.ibm.com/peretz/neutrino/documentation/">
24-
<n-icon icon="document" color="white" size="sm"></n-icon>
23+
<a class="btn--icon-white" href="https://pages.github.com/carbon/carbon-components-angular/documentation/">
24+
<ibm-icon icon="document" color="white" size="sm"></ibm-icon>
2525
Documentation
2626
</a>
27-
<a class="btn--icon-white" href="http://billboard1.fyre.ibm.com/">
28-
<n-icon icon="preview" color="white" size="sm"></n-icon>
29-
Billboard
30-
</a>
31-
<a class="btn--icon-white" href="https://peretz.slack.com/messages/C6DS43Y5N">
32-
<n-icon icon="collaborate" color="white" size="sm"></n-icon>
33-
Send feedback
34-
</a>
35-
<a class="btn--icon-white" href="https://peretz.slack.com/messages/C6DS43Y5N">
36-
<n-icon icon="query" color="white" size="sm"></n-icon>
37-
Ask a question
38-
</a>
3927
</header>
4028
<main class="p-container">
4129
<aside class="p-demo-sidebar" role="complementary">
@@ -61,46 +49,47 @@ const en = require("./../../src/i18n/en.json");
6149
</svg>
6250
</button>
6351
</label>
64-
<n-list-group [items]="filteredItems" [listTpl]="item" (selected)="onSelect($event)">
52+
<ibm-list-group [items]="filteredItems" [listTpl]="item" (selected)="onSelect($event)">
6553
<ng-template #item let-item="item">
6654
<a routerLink="{{item.link}}">{{item.content}}</a>
6755
</ng-template>
68-
</n-list-group>
56+
</ibm-list-group>
6957
</nav>
7058
</aside>
7159
<div class="p-demo-container">
7260
<div class="main-banner-placeholder"></div>
7361
<router-outlet></router-outlet>
7462
</div>
7563
</main>
76-
<n-modal-placeholder></n-modal-placeholder>
77-
<n-dialog-placeholder></n-dialog-placeholder>
78-
<n-sprite sprite="alerts_status"></n-sprite>
79-
<n-sprite sprite="animations"></n-sprite>
80-
<n-sprite sprite="arrows_chevrons"></n-sprite>
81-
<n-sprite sprite="brands"></n-sprite>
82-
<n-sprite sprite="calculator"></n-sprite>
83-
<n-sprite sprite="core_set"></n-sprite>
84-
<n-sprite sprite="cursors"></n-sprite>
85-
<n-sprite sprite="disabled"></n-sprite>
86-
<n-sprite sprite="ecommerce"></n-sprite>
87-
<n-sprite sprite="emoticons"></n-sprite>
88-
<n-sprite sprite="formatting"></n-sprite>
89-
<n-sprite sprite="gestures"></n-sprite>
90-
<n-sprite sprite="ibm_logo"></n-sprite>
91-
<n-sprite sprite="market_segments_activities"></n-sprite>
92-
<n-sprite sprite="market_segments_browser_os_mobile"></n-sprite>
93-
<n-sprite sprite="market_segments_demographics"></n-sprite>
94-
<n-sprite sprite="market_segments_occasions_seasons"></n-sprite>
95-
<n-sprite sprite="market_segments_occupations"></n-sprite>
96-
<n-sprite sprite="market_segments_segments"></n-sprite>
97-
<n-sprite sprite="market_segments_store_users"></n-sprite>
98-
<n-sprite sprite="mobile_controls"></n-sprite>
99-
<n-sprite sprite="playback_controls"></n-sprite>
100-
<n-sprite sprite="tables"></n-sprite>
101-
<n-sprite sprite="top_nav_bar"></n-sprite>
102-
<n-sprite sprite="watson_shell"></n-sprite>
103-
<n-sprite sprite="window_controls"></n-sprite>
64+
<ibm-modal-placeholder></ibm-modal-placeholder>
65+
<ibm-dialog-placeholder></ibm-dialog-placeholder>
66+
<!-- <ibm-placeholder></ibm-placeholder> -->
67+
<ibm-sprite sprite="alerts_status"></ibm-sprite>
68+
<ibm-sprite sprite="animations"></ibm-sprite>
69+
<ibm-sprite sprite="arrows_chevrons"></ibm-sprite>
70+
<ibm-sprite sprite="brands"></ibm-sprite>
71+
<ibm-sprite sprite="calculator"></ibm-sprite>
72+
<ibm-sprite sprite="core_set"></ibm-sprite>
73+
<ibm-sprite sprite="cursors"></ibm-sprite>
74+
<ibm-sprite sprite="disabled"></ibm-sprite>
75+
<ibm-sprite sprite="ecommerce"></ibm-sprite>
76+
<ibm-sprite sprite="emoticons"></ibm-sprite>
77+
<ibm-sprite sprite="formatting"></ibm-sprite>
78+
<ibm-sprite sprite="gestures"></ibm-sprite>
79+
<ibm-sprite sprite="ibm_logo"></ibm-sprite>
80+
<ibm-sprite sprite="market_segments_activities"></ibm-sprite>
81+
<ibm-sprite sprite="market_segments_browser_os_mobile"></ibm-sprite>
82+
<ibm-sprite sprite="market_segments_demographics"></ibm-sprite>
83+
<ibm-sprite sprite="market_segments_occasions_seasons"></ibm-sprite>
84+
<ibm-sprite sprite="market_segments_occupations"></ibm-sprite>
85+
<ibm-sprite sprite="market_segments_segments"></ibm-sprite>
86+
<ibm-sprite sprite="market_segments_store_users"></ibm-sprite>
87+
<ibm-sprite sprite="mobile_controls"></ibm-sprite>
88+
<ibm-sprite sprite="playback_controls"></ibm-sprite>
89+
<ibm-sprite sprite="tables"></ibm-sprite>
90+
<ibm-sprite sprite="top_nav_bar"></ibm-sprite>
91+
<ibm-sprite sprite="watson_shell"></ibm-sprite>
92+
<ibm-sprite sprite="window_controls"></ibm-sprite>
10493
`,
10594
styleUrls: ["./demo.scss"],
10695
encapsulation: ViewEncapsulation.None
@@ -142,11 +131,6 @@ export class AppComponent implements OnInit {
142131
link: "/table",
143132
selected: false
144133
},
145-
{
146-
content: "Tree view",
147-
link: "/tree-view",
148-
selected: false
149-
},
150134
{
151135
content: "Drop-down",
152136
link: "/dropdown",
@@ -162,11 +146,6 @@ export class AppComponent implements OnInit {
162146
link: "/top-nav",
163147
selected: false
164148
},
165-
{
166-
content: "Side-nav",
167-
link: "/side-nav",
168-
selected: false
169-
},
170149
{
171150
content: "Modal",
172151
link: "/modal",
@@ -186,16 +165,6 @@ export class AppComponent implements OnInit {
186165
content: "Combo box",
187166
link: "/combobox",
188167
selected: false
189-
},
190-
{
191-
content: "Chart",
192-
link: "/chart",
193-
selected: false
194-
},
195-
{
196-
content: "Condition builder",
197-
link: "/condition-builder",
198-
selected: false
199168
}
200169
].sort((a, b) => {
201170
if (a.content > b.content) {
@@ -207,7 +176,7 @@ export class AppComponent implements OnInit {
207176
});
208177
public filteredItems = this.navItems;
209178
private previousItem = null;
210-
constructor (private router: Router, private translate: TranslateService, private iconService: IconService) {
179+
constructor (private router: Router, private translate: TranslateService) {
211180
this.translate.setDefaultLang("en");
212181
this.translate.use("en");
213182
this.translate.setTranslation("en", en);
@@ -232,8 +201,6 @@ export class AppComponent implements OnInit {
232201
}
233202
this.previousItem = item;
234203
});
235-
236-
HcModeChecker();
237204
}
238205

239206
search(ev) {

‎demo/demo-app/app.module.ts‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,43 +25,33 @@ import { ListGroupDemo } from "./list-group-demo/list-group-demo.component";
2525
import { ModalDemo } from "./modal-demo/modal-demo.component";
2626
import { PopoverDemo } from "./popover-demo/popover-demo.component";
2727
import { SampleModalComponent } from "./modal-demo/sample-modal.component";
28-
import { SideNavDemo } from "./side-nav-demo/side-nav-demo.component";
2928
import { TableDemo } from "./table-demo/table-demo.component";
3029
import { TableDemoService } from "./table-demo/table-demo.service";
3130
import { TabsDemo } from "./tabs-demo/tabs-demo.component";
3231
import { TooltipDemo } from "./tooltip-demo/tooltip-demo.component";
3332
import { TopNavDemo } from "./top-nav-demo/top-nav-demo.component";
34-
import { TreeViewDemo } from "./tree-view-demo/tree-view-demo.component";
3533
import { XLModalComponent } from "./modal-demo/extra-large.component";
3634
import { ComboboxDemo } from "./combobox-demo/combobox-demo.component";
37-
import { ChartDemo } from "./chart-demo/chart-demo.component";
3835
import { ButtonMenuDemo } from "./button-menu-demo/button-menu-demo.component";
39-
import { ConditionBuilderDemo } from "./condition-builder-demo/condition-builder-demo.component";
40-
import { ConditionBuilderDemoService } from "./condition-builder-demo/condition-builder-demo.service";
4136
import { CalendarDemo } from "./calendar-demo/calendar-demo.component";
4237

43-
import { AppDoc } from "./doc.component";
4438

4539
// component imports
4640
import {
4741
BannerModule,
4842
BannerService,
4943
ButtonMenuModule,
50-
ChartsModule,
5144
ComboBoxModule,
52-
ConditionBuilderModule,
5345
DialogModule,
5446
DropdownModule,
5547
IconModule,
5648
IconService,
5749
ListGroupModule,
5850
ModalModule,
5951
NFormsModule,
60-
SideNavModule,
6152
TableModule,
6253
TabsModule,
6354
TopNavModule,
64-
TreeViewModule,
6555
PillInputModule,
6656
CalendarModule
6757
} from "./../../src";
@@ -71,7 +61,6 @@ import {
7161
declarations: [
7262
AppComponent,
7363
HomeComponent,
74-
AppDoc,
7564
ButtonMenuDemo,
7665
TableDemo,
7766
FormsDemo,
@@ -81,9 +70,7 @@ import {
8170
ListGroupDemo,
8271
DropdownDemo,
8372
TopNavDemo,
84-
TreeViewDemo,
8573
DropdownDemo,
86-
SideNavDemo,
8774
ModalDemo,
8875
SampleModalComponent,
8976
ErrorModalComponent,
@@ -94,8 +81,6 @@ import {
9481
BannerDemo,
9582
BannerCustom,
9683
ComboboxDemo,
97-
ChartDemo,
98-
ConditionBuilderDemo,
9984
CalendarDemo
10085
],
10186
entryComponents: [
@@ -111,9 +96,7 @@ import {
11196
BrowserAnimationsModule,
11297
BrowserModule,
11398
ButtonMenuModule,
114-
ChartsModule,
11599
ComboBoxModule,
116-
ConditionBuilderModule,
117100
DialogModule,
118101
DropdownModule,
119102
FormsModule,
@@ -124,11 +107,9 @@ import {
124107
NFormsModule,
125108
PillInputModule,
126109
ReactiveFormsModule,
127-
SideNavModule,
128110
TableModule,
129111
TabsModule,
130112
TopNavModule,
131-
TreeViewModule,
132113
CalendarModule,
133114
RouterModule.forRoot([
134115
{
@@ -163,10 +144,6 @@ import {
163144
path: "list-group",
164145
component: ListGroupDemo
165146
},
166-
{
167-
path: "tree-view",
168-
component: TreeViewDemo
169-
},
170147
{
171148
path: "dropdown",
172149
component: DropdownDemo
@@ -175,10 +152,6 @@ import {
175152
path: "top-nav",
176153
component: TopNavDemo
177154
},
178-
{
179-
path: "side-nav",
180-
component: SideNavDemo
181-
},
182155
{
183156
path: "modal",
184157
component: ModalDemo
@@ -198,14 +171,6 @@ import {
198171
{
199172
path: "combobox",
200173
component: ComboboxDemo
201-
},
202-
{
203-
path: "chart",
204-
component: ChartDemo
205-
},
206-
{
207-
path: "condition-builder",
208-
component: ConditionBuilderDemo
209174
}
210175
], {
211176
useHash: true
@@ -215,7 +180,6 @@ import {
215180
providers: [
216181
IconService,
217182
BannerService,
218-
ConditionBuilderDemoService,
219183
TableDemoService
220184
],
221185
bootstrap: [AppComponent]

‎demo/demo-app/banner-demo/banner-demo-component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import { Banner } from "./../../../src";
1515
1616
<h2 class="p-demo-section">Static</h2>
1717
<div class="banners-container">
18-
<n-banner [bannerObj]="infoBanner" (close)="onClose($event)"></n-banner>
19-
<n-banner [bannerObj]="errorBanner" (close)="onCloseError($event)"></n-banner>
20-
<n-banner [bannerObj]="warningBanner" (close)="onCloseWarning($event)"></n-banner>
21-
<n-banner [bannerObj]="successBanner" (close)="onCloseSuccess($event)"></n-banner>
18+
<ibm-banner [bannerObj]="infoBanner" (close)="onClose($event)"></ibm-banner>
19+
<ibm-banner [bannerObj]="errorBanner" (close)="onCloseError($event)"></ibm-banner>
20+
<ibm-banner [bannerObj]="warningBanner" (close)="onCloseWarning($event)"></ibm-banner>
21+
<ibm-banner [bannerObj]="successBanner" (close)="onCloseSuccess($event)"></ibm-banner>
2222
</div>
2323
2424
<h2 class="p-demo-section">Default</h2>

0 commit comments

Comments
 (0)