Skip to content

Commit f2842a8

Browse files
edcarrolledcarroll
committed
Further angular cli restructuring
1 parent 40c56df commit f2842a8

File tree

8 files changed

+70
-69
lines changed

8 files changed

+70
-69
lines changed

‎angular-cli.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
"tsconfig": "tsconfig.json",
1515
"prefix": "app",
1616
"mobile": false,
17-
"styles": [],
17+
"styles": [
18+
"css/style.css",
19+
"css/code.css"
20+
],
1821
"scripts": [],
1922
"environments": {
2023
"source": "environments/environment.ts",

‎demo/app/app.routing.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ const appRoutes: Routes = [
7777

7878
export const appRoutingProviders: any[] = [];
7979

80-
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);
80+
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes, { useHash: true });

‎demo/assets/css/code.css‎ renamed to ‎demo/css/code.css‎

File renamed without changes.

‎demo/assets/css/style.css‎ renamed to ‎demo/css/style.css‎

File renamed without changes.

‎demo/assets/favicon.ico‎ renamed to ‎demo/favicon.ico‎

File renamed without changes.

‎demo/index.html‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<title>ng2-semantic-ui - Semantic UI Angular 2 Integrations</title>
55

6-
<base href="/ng2-semantic-ui/">
6+
<base href="/">
77

8-
<link rel="icon" sizes="16x16" type="image/x-icon" href="/assets/favicon.ico">
8+
<link rel="icon" sizes="16x16" type="image/x-icon" href="/favicon.ico">
99

1010
<meta charset="utf-8">
1111
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -18,9 +18,6 @@
1818
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.5.1/components/prism-bash.min.js"></script>
1919
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.5.1/components/prism-markup.min.js"></script>
2020
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.5.1/components/prism-typescript.min.js"></script>
21-
22-
<link rel="stylesheet" href="/assets/css/code.css">
23-
<link rel="stylesheet" href="/assets/css/style.css">
2421
</head>
2522
<body>
2623
<demo-root>

‎demo/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"../node_modules/@types"
1515
],
1616
"types": [
17-
"jasmine",
17+
"requirejs",
1818
"prismjs"
1919
]
2020
}

‎package.json‎

Lines changed: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,64 @@
11
{
2-
"name": "ng2-semantic-ui",
3-
"version": "0.3.0",
4-
"description": "Angular 2 Semantic UI Components",
5-
"repository": {
6-
"type": "git",
7-
"url": "https://github.com/edcarroll/ng2-semantic-ui/tree/master"
8-
},
9-
"bugs": {
10-
"url": "https://github.com/edcarroll/ng2-semantic-ui/tree/master/issues"
11-
},
12-
"author": "Edward Carroll",
13-
"keywords": [
14-
"angular",
15-
"angular2",
16-
"semantic-ui",
17-
"semantic",
18-
"ui",
19-
"2"
20-
],
21-
"license": "MIT",
22-
"angular-cli": {},
23-
"scripts": {
24-
"start": "ng serve",
25-
"lint": "tslint \"demo/**/*.ts\"",
26-
"compile": "tsc",
27-
"compile:w": "tsc -w",
28-
"prepublish": "tsc"
29-
},
30-
"dependencies": {
31-
"@angular/common": "2.0.0-rc.5",
32-
"@angular/compiler": "2.0.0-rc.5",
33-
"@angular/core": "2.0.0-rc.5",
34-
"@angular/forms": "0.3.0",
35-
"@angular/http": "2.0.0-rc.5",
36-
"@angular/platform-browser": "2.0.0-rc.5",
37-
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
38-
"@angular/router": "3.0.0-rc.1",
39-
"core-js": "^2.4.0",
40-
"reflect-metadata": "0.1.3",
41-
"rxjs": "5.0.0-beta.6",
42-
"ts-helpers": "^1.1.1",
43-
"zone.js": "0.6.12"
44-
},
45-
"devDependencies": {
46-
"@types/jasmine": "^2.2.30",
47-
"@types/prismjs": "^1.4.17",
48-
"@types/protractor": "^1.5.16",
49-
"angular-cli": "1.0.0-beta.11-webpack.8",
50-
"codelyzer": "0.0.26",
51-
"jasmine-core": "2.4.1",
52-
"jasmine-spec-reporter": "2.5.0",
53-
"karma": "0.13.22",
54-
"karma-chrome-launcher": "0.2.3",
55-
"karma-jasmine": "0.3.8",
56-
"karma-remap-istanbul": "^0.2.1",
57-
"prismjs": "^1.5.1",
58-
"protractor": "3.3.0",
59-
"ts-node": "1.2.1",
60-
"tslint": "3.13.0",
61-
"typescript": "2.0.0"
62-
}
2+
"name": "ng2-semantic-ui",
3+
"version": "0.3.0",
4+
"description": "Angular 2 Semantic UI Components",
5+
"repository": {
6+
"type": "git",
7+
"url": "https://github.com/edcarroll/ng2-semantic-ui/tree/master"
8+
},
9+
"bugs": {
10+
"url": "https://github.com/edcarroll/ng2-semantic-ui/tree/master/issues"
11+
},
12+
"author": "Edward Carroll",
13+
"keywords": [
14+
"angular",
15+
"angular2",
16+
"semantic-ui",
17+
"semantic",
18+
"ui",
19+
"2"
20+
],
21+
"license": "MIT",
22+
"angular-cli": {},
23+
"scripts": {
24+
"start": "ng serve",
25+
"lint": "tslint \"demo/**/*.ts\"",
26+
"compile": "tsc",
27+
"compile:w": "tsc -w",
28+
"prepublish": "tsc"
29+
},
30+
"dependencies": {
31+
"@angular/common": "2.0.0-rc.5",
32+
"@angular/compiler": "2.0.0-rc.5",
33+
"@angular/core": "2.0.0-rc.5",
34+
"@angular/forms": "0.3.0",
35+
"@angular/http": "2.0.0-rc.5",
36+
"@angular/platform-browser": "2.0.0-rc.5",
37+
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
38+
"@angular/router": "3.0.0-rc.1",
39+
"core-js": "^2.4.0",
40+
"reflect-metadata": "0.1.3",
41+
"rxjs": "5.0.0-beta.6",
42+
"ts-helpers": "^1.1.1",
43+
"zone.js": "0.6.12"
44+
},
45+
"devDependencies": {
46+
"@types/jasmine": "^2.2.30",
47+
"@types/prismjs": "^1.4.17",
48+
"@types/protractor": "^1.5.16",
49+
"@types/requirejs": "^2.1.26",
50+
"angular-cli": "1.0.0-beta.11-webpack.8",
51+
"codelyzer": "0.0.26",
52+
"jasmine-core": "2.4.1",
53+
"jasmine-spec-reporter": "2.5.0",
54+
"karma": "0.13.22",
55+
"karma-chrome-launcher": "0.2.3",
56+
"karma-jasmine": "0.3.8",
57+
"karma-remap-istanbul": "^0.2.1",
58+
"prismjs": "^1.5.1",
59+
"protractor": "3.3.0",
60+
"ts-node": "1.2.1",
61+
"tslint": "3.13.0",
62+
"typescript": "2.0.0"
63+
}
6364
}

0 commit comments

Comments
 (0)