Skip to content
This repository was archived by the owner on Sep 23, 2025. It is now read-only.

Commit 74796f9

Browse files
Paul GrayPaul Gray
authored andcommitted
Setting up build for deployment to DE
1 parent fc73f9a commit 74796f9

File tree

10 files changed

+48
-101
lines changed

10 files changed

+48
-101
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
node_modules/
22

33
dist/
4+
5+
*.zip

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = function (grunt) {
2929
dist: {
3030
files: [{
3131
expand: true,
32-
cwd: 'src/',
32+
cwd: 'app/',
3333
src: 'index.html',
3434
dest: 'dist/'
3535
}],

app/car.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
{
22
"identifier": "com.learningobjects.etui",
3-
"name": "Administration",
3+
"name": "Extended Transcript",
44
"version": "1.0.0",
55
"components": [{
6-
"identifier": "loi.cp.ExtendedTranscriptDomain",
6+
"identifier": "loi.cp.ExtendedTranscriptUI",
77
"name": "Extended Transcript UI",
8-
"description": "Extended Transcript ui",
9-
"implementation": "loi.cp.domain.GenericDomain"
8+
"description": "View standardized transcripts.",
9+
"implementation": "loi.cp.generic.GenericServlet",
10+
"annotations": {
11+
"com.learningobjects.cpxp.component.web.ServletBinding": {
12+
"path": "/extended-transcript"
13+
}
14+
}
1015
}],
1116
"dependencies": [ "com.learningobjects.component" ]
1217
}

app/components/transcript/transcriptModule.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ export default angular.module(moduleName, []);
44

55
import transcript from './transcript';
66
import unit from './unit/unit';
7-
import unitBar from './unit/unitBar';
87
import competency from './competency/competency';
98

10-
angular.module(moduleName).directive('transcript', transcript);
9+
angular.module(moduleName).directive('transcript', transcript);
1110
angular.module(moduleName).directive('unit', unit);
12-
angular.module(moduleName).directive('unitBar', unitBar);
1311
angular.module(moduleName).directive('competency', competency);

index.html renamed to app/index.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
<header></header>
2525
<transcript></transcript>
2626
</div>
27-
<!--<script type="text/javascript" src="/dist/assets/main.js"></script>-->
28-
<!--<script type="text/javascript" src="$$url/assets/bundle.js"></script>-->
29-
<script type="text/javascript" src="/bundle.js"></script>
27+
<script type="text/javascript" src="/assets/main.js"></script>
3028
</body>
3129
</html>

app/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import 'angular-ui-router';
44
//import 'bootstrap';
55
import 'font-awesome/css/font-awesome.css';
66

7-
import 'copy!./car.json';
8-
97
//Styles
108
import 'bootstrap/dist/css/bootstrap.css';
119
import './styles/main.less';

package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
{
2-
"name": "campuspack",
2+
"name": "extended-transcript",
33
"version": "1.0.0",
4-
"description": "Social Collaboration",
5-
"main": "Gruntfile.js",
4+
"description": "Extended Transcript user interface",
5+
"src": "app",
6+
"test": "test",
7+
"dist": "dist",
8+
"mainInput": "main",
9+
"mainOutput": "main",
610
"devDependencies": {
711
"babel-core": "^5.6.7",
812
"babel-loader": "^5.2.1",

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var webpack = require('webpack'),
66
// PATHS
77
var PATHS = {
88
app: __dirname + '/app',
9-
target: __dirname + '/dist' //this might be able to be changed... have to check maven.
9+
target: __dirname + '/dist'
1010
};
1111

1212
module.exports = {

webpack.config.js.new

Lines changed: 0 additions & 68 deletions
This file was deleted.

webpack.dist.config.js

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,23 @@
88

99
var webpack = require('webpack');
1010

11+
// PATHS
12+
var PATHS = {
13+
app: __dirname + '/app',
14+
target: __dirname + '/dist' //this might be able to be changed... have to check maven.
15+
};
16+
1117
module.exports = {
1218

1319
output: {
14-
path: 'dist/assets/',
15-
filename: 'main.js'
20+
path: PATHS.target + '/assets',
21+
filename: 'main.js',
22+
publicPath: '/assets/'
1623
},
1724

1825
debug: false,
1926
devtool: false,
20-
entry: './src/scripts/components/main.js',
27+
entry: './app/index.js',
2128

2229
stats: {
2330
colors: true,
@@ -43,24 +50,27 @@ module.exports = {
4350
}],
4451

4552
loaders: [{
46-
test: /\.js$/,
47-
loader: 'jsx-loader?harmony'
53+
test: /\.jsx?$/,
54+
loader: 'babel',
55+
include: PATHS.app
4856
}, {
49-
test: /\.css$/,
50-
loader: 'style-loader!css-loader'
57+
test: /\.sass$/,
58+
loader: 'style!copy' //the server will compile this for us!
5159
}, {
52-
test: /\.less/,
53-
loader: 'style-loader!css-loader!less-loader'
60+
test: /\.less$/,
61+
loader: 'style!css!less'
5462
}, {
55-
test: /\.(png|jpg)$/,
56-
loader: 'url-loader?limit=8192'
63+
test: /\.css$/,
64+
loader: 'style!css'
5765
}, {
58-
test: /\.(eot.*|woff.*|ttf.*|svg.*)$/,
59-
loader: "file-loader"
66+
test: /\.(png|jpg)$/,
67+
loader: 'url?limit=8192'
6068
}, {
61-
test: /\.jsx?$/,
62-
exclude: /node_modules/,
63-
loader: "babel-loader"
69+
test: /(\.(eot.*|woff.*|ttf.*|svg.*)$|.(gif)$)/,
70+
loader: "file"
71+
}, {
72+
test: /\.html$/,
73+
loader: "ngtemplate?relativeTo=" + __dirname + "!html"
6474
}]
6575
}
6676
};

0 commit comments

Comments
 (0)