Skip to content

Commit c47a6fb

Browse files
Dan WahlinDan Wahlin
Dan Wahlin
authored and
Dan Wahlin
committed
Removing files
1 parent 748ffb7 commit c47a6fb

File tree

96 files changed

+1318
-1744
lines changed

Some content is hidden

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

96 files changed

+1318
-1744
lines changed

modules/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Run the following commands to get the code in place for each module:
2+
3+
1. `npm install`
4+
1. `node setup.js`
5+
6+
Once the code is ready you can open each individual module folder in your editor to work with that particular sample.

modules/module1/begin/readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
See the "src" folder at the root level for the final source code.

modules/setup.js

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ var fse = require('fs-extra'),
44
request = require('request'),
55
url = require('url'),
66
path = require('path'),
7-
fs = require('fs'),
8-
AdmZip = require('adm-zip');
7+
fs = require('fs');
98

109
function copyIntoDirectories(srcDir, startDir, copyToSubFolderName, dirsToIgnore, overlayFolder) {
1110
//Iterate through directories
@@ -15,21 +14,23 @@ function copyIntoDirectories(srcDir, startDir, copyToSubFolderName, dirsToIgnore
1514

1615
if (stat.isDirectory()) {
1716
if (dirsToIgnore.indexOf(dir) === -1) { //Make sure the ignoreDirs aren't involved in the copy operations
18-
var targetDir = directory + '/' + copyToSubFolderName, //Target directory src should be copied to
19-
overlayFolder = (overlayFolder) ? overlayFolder : 'Files';
20-
filesOverlaySrc = directory + '/' + overlayFolder, //If no srcDir is provided then we're overlaying lab files into the targetDir
21-
finalSrc = (srcDir) ? srcDir : filesOverlaySrc;
17+
// var targetDir = directory + '/' + copyToSubFolderName, //Target directory src should be copied to
18+
// overlayFolder = (overlayFolder) ? overlayFolder : 'files';
19+
// filesOverlaySrc = directory + '/' + overlayFolder, //If no srcDir is provided then we're overlaying lab files into the targetDir
20+
// finalSrc = (srcDir) ? srcDir : filesOverlaySrc;
2221

23-
fse.copySync(finalSrc, targetDir);
24-
console.log('Copied ' + finalSrc + ' to ' + targetDir);
22+
// fse.copySync(finalSrc, targetDir);
23+
// console.log('Copied ' + finalSrc + ' to ' + targetDir);
24+
25+
copyIntoDirectory(srcDir, directory, copyToSubFolderName, overlayFolder);
2526
}
2627
}
2728
});
2829
}
2930

3031
function copyIntoDirectory(srcDir, startDir, copyToSubFolderName, overlayFolder) {
3132
var targetDir = startDir + '/' + copyToSubFolderName, //Target directory src should be copied to
32-
overlayFolder = (overlayFolder) ? overlayFolder : 'Files',
33+
overlayFolder = (overlayFolder) ? overlayFolder : 'files',
3334
filesOverlaySrc = startDir + '/' + overlayFolder, //If no srcDir is provided then we're overlaying lab files into the targetDir
3435
finalSrc = (srcDir) ? srcDir : filesOverlaySrc;
3536

@@ -64,16 +65,20 @@ function downloadAndExtractProjects(callback) {
6465
});
6566
}
6667

68+
var beginFolder = 'begin',
69+
endFolder = 'end',
70+
beginFiles = 'files/beginFiles',
71+
endFiles = 'files/endFiles',
72+
dirsToIgnore = [ 'node_modules', 'module1', 'module8'];
6773

6874

69-
var beginFolder = 'begin',
70-
endFolder = 'end',
71-
beginFiles = 'files/beginFiles',
72-
endFiles = 'files/endFiles';
73-
75+
//Copy src folder into begin folder of each module
76+
console.log(`Copying ../src into modules`);
77+
copyIntoDirectories('../src', '.', beginFolder, dirsToIgnore, beginFiles);
7478

75-
//Copy src folder into begin folder of each module
76-
copyIntoDirectories('./src', './', beginFolder, null, beginFiles);
79+
//Overlay files over begin folder
80+
console.log(`Overlaying code`);
81+
copyIntoDirectories(null, '.', beginFolder, dirsToIgnore, beginFiles);
7782

7883

7984

src/public/app/app.component.js

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

src/public/app/app.component.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/public/app/app.module.js

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

src/public/app/app.module.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/public/app/app.routing.js

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

src/public/app/app.routing.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/public/app/core/core.module.js

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

src/public/app/core/core.module.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/public/app/core/data-filter.service.js

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

src/public/app/core/data-filter.service.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)