Skip to content

Commit 91ebe6b

Browse files
hirokiterashimahirokiterashima
committed
Merged student vle hybrid app as sub-route of site angular app. Merged teacher hybrid app as sub-route of site angular app. Created preview app for showing unit to unauthenticated users. Changed URL from hashbang (#!) to html5mode.
1 parent 54510dd commit 91ebe6b

82 files changed

Lines changed: 1078 additions & 1327 deletions

File tree

Some content is hidden

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

‎angular.json‎

Lines changed: 1 addition & 329 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": 1,
44
"newProjectRoot": "projects",
55
"projects": {
6-
"site": {
6+
"wise": {
77
"root": "src/main/webapp/site",
88
"sourceRoot": "src/main/webapp/site/src",
99
"projectType": "application",
@@ -183,334 +183,6 @@
183183
}
184184
}
185185
}
186-
},
187-
"vle": {
188-
"root": "src/main/webapp/wise5/vle",
189-
"sourceRoot": "src/main/webapp/wise5/vle/src",
190-
"projectType": "application",
191-
"architect": {
192-
"build": {
193-
"builder": "@angular-devkit/build-angular:browser",
194-
"options": {
195-
"outputPath": "src/main/webapp/wise5/vle/dist",
196-
"index": "src/main/webapp/wise5/vle/src/index.html",
197-
"main": "src/main/webapp/wise5/vle/src/main.ts",
198-
"tsConfig": "src/main/webapp/wise5/vle/src/tsconfig.app.json",
199-
"polyfills": "src/main/webapp/wise5/vle/src/polyfills.ts",
200-
"extractCss": true,
201-
"assets": [],
202-
"styles": [],
203-
"scripts": []
204-
},
205-
"configurations": {
206-
"production": {
207-
"optimization": true,
208-
"outputHashing": "all",
209-
"sourceMap": true,
210-
"statsJson": true,
211-
"extractCss": true,
212-
"namedChunks": false,
213-
"aot": true,
214-
"extractLicenses": true,
215-
"vendorChunk": false,
216-
"buildOptimizer": true,
217-
"fileReplacements": [
218-
{
219-
"replace": "src/main/webapp/wise5/vle/src/environments/environment.ts",
220-
"with": "src/main/webapp/wise5/vle/src/environments/environment.prod.ts"
221-
}
222-
],
223-
"outputPath": "src/main/webapp/wise5/vle/dist/",
224-
"baseHref": "/"
225-
}
226-
}
227-
},
228-
"serve": {
229-
"builder": "@angular-devkit/build-angular:dev-server",
230-
"options": {
231-
"browserTarget": "vle:build"
232-
},
233-
"configurations": {
234-
"production": {
235-
"browserTarget": "vle:build:production"
236-
}
237-
}
238-
},
239-
"extract-i18n": {
240-
"builder": "@angular-devkit/build-angular:extract-i18n",
241-
"options": {
242-
"browserTarget": "vle:build"
243-
}
244-
},
245-
"test": {
246-
"builder": "@angular-devkit/build-angular:karma",
247-
"options": {
248-
"main": "src/main/webapp/wise5/vle/src/test.ts",
249-
"karmaConfig": "./karma.conf.js",
250-
"polyfills": "src/main/webapp/wise5/vle/src/polyfills.ts",
251-
"tsConfig": "src/main/webapp/wise5/vle/src/tsconfig.spec.json",
252-
"scripts": [],
253-
"styles": ["src/main/webapp/wise5/vle/src/style/styles.scss"],
254-
"assets": [
255-
"src/main/webapp/wise5/vle/src/assets",
256-
"src/main/webapp/wise5/vle/src/favicon.ico"
257-
]
258-
}
259-
},
260-
"lint": {
261-
"builder": "@angular-devkit/build-angular:tslint",
262-
"options": {
263-
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
264-
"exclude": ["**/node_modules/**"]
265-
}
266-
}
267-
}
268-
},
269-
"at": {
270-
"root": "src/main/webapp/wise5/authoringTool",
271-
"sourceRoot": "src/main/webapp/wise5/authoringTool/src",
272-
"projectType": "application",
273-
"architect": {
274-
"build": {
275-
"builder": "@angular-devkit/build-angular:browser",
276-
"options": {
277-
"outputPath": "src/main/webapp/wise5/authoringTool/dist",
278-
"index": "src/main/webapp/wise5/authoringTool/src/index.html",
279-
"main": "src/main/webapp/wise5/authoringTool/src/main.ts",
280-
"tsConfig": "src/main/webapp/wise5/authoringTool/src/tsconfig.app.json",
281-
"polyfills": "src/main/webapp/wise5/authoringTool/src/polyfills.ts",
282-
"extractCss": true,
283-
"assets": [],
284-
"styles": [],
285-
"scripts": []
286-
},
287-
"configurations": {
288-
"production": {
289-
"optimization": true,
290-
"outputHashing": "all",
291-
"sourceMap": true,
292-
"statsJson": true,
293-
"extractCss": true,
294-
"namedChunks": false,
295-
"aot": true,
296-
"extractLicenses": true,
297-
"vendorChunk": false,
298-
"buildOptimizer": true,
299-
"fileReplacements": [
300-
{
301-
"replace": "src/main/webapp/wise5/authoringTool/src/environments/environment.ts",
302-
"with": "src/main/webapp/wise5/authoringTool/src/environments/environment.prod.ts"
303-
}
304-
],
305-
"outputPath": "src/main/webapp/wise5/authoringTool/dist/",
306-
"baseHref": "/"
307-
}
308-
}
309-
},
310-
"serve": {
311-
"builder": "@angular-devkit/build-angular:dev-server",
312-
"options": {
313-
"browserTarget": "at:build"
314-
},
315-
"configurations": {
316-
"production": {
317-
"browserTarget": "at:build:production"
318-
}
319-
}
320-
},
321-
"extract-i18n": {
322-
"builder": "@angular-devkit/build-angular:extract-i18n",
323-
"options": {
324-
"browserTarget": "at:build"
325-
}
326-
},
327-
"test": {
328-
"builder": "@angular-devkit/build-angular:karma",
329-
"options": {
330-
"main": "src/main/webapp/wise5/authoringTool/src/test.ts",
331-
"karmaConfig": "./karma.conf.js",
332-
"polyfills": "src/main/webapp/wise5/authoringTool/src/polyfills.ts",
333-
"tsConfig": "src/main/webapp/wise5/authoringTool/src/tsconfig.spec.json",
334-
"scripts": [],
335-
"styles": ["src/main/webapp/wise5/authoringTool/src/style/styles.scss"],
336-
"assets": [
337-
"src/main/webapp/wise5/authoringTool/src/assets",
338-
"src/main/webapp/wise5/authoringTool/src/favicon.ico"
339-
]
340-
}
341-
},
342-
"lint": {
343-
"builder": "@angular-devkit/build-angular:tslint",
344-
"options": {
345-
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
346-
"exclude": ["**/node_modules/**"]
347-
}
348-
}
349-
}
350-
},
351-
"cm": {
352-
"root": "src/main/webapp/wise5/classroomMonitor",
353-
"sourceRoot": "src/main/webapp/wise5/classroomMonitor/src",
354-
"projectType": "application",
355-
"architect": {
356-
"build": {
357-
"builder": "@angular-devkit/build-angular:browser",
358-
"options": {
359-
"outputPath": "src/main/webapp/wise5/classroomMonitor/dist",
360-
"index": "src/main/webapp/wise5/classroomMonitor/src/index.html",
361-
"main": "src/main/webapp/wise5/classroomMonitor/src/main.ts",
362-
"tsConfig": "src/main/webapp/wise5/classroomMonitor/src/tsconfig.app.json",
363-
"polyfills": "src/main/webapp/wise5/classroomMonitor/src/polyfills.ts",
364-
"extractCss": true,
365-
"assets": [],
366-
"styles": [],
367-
"scripts": []
368-
},
369-
"configurations": {
370-
"production": {
371-
"optimization": true,
372-
"outputHashing": "all",
373-
"sourceMap": true,
374-
"statsJson": true,
375-
"extractCss": true,
376-
"namedChunks": false,
377-
"aot": true,
378-
"extractLicenses": true,
379-
"vendorChunk": false,
380-
"buildOptimizer": true,
381-
"fileReplacements": [
382-
{
383-
"replace": "src/main/webapp/wise5/classroomMonitor/src/environments/environment.ts",
384-
"with": "src/main/webapp/wise5/classroomMonitor/src/environments/environment.prod.ts"
385-
}
386-
],
387-
"outputPath": "src/main/webapp/wise5/classroomMonitor/dist/",
388-
"baseHref": "/"
389-
}
390-
}
391-
},
392-
"serve": {
393-
"builder": "@angular-devkit/build-angular:dev-server",
394-
"options": {
395-
"browserTarget": "cm:build"
396-
},
397-
"configurations": {
398-
"production": {
399-
"browserTarget": "cm:build:production"
400-
}
401-
}
402-
},
403-
"extract-i18n": {
404-
"builder": "@angular-devkit/build-angular:extract-i18n",
405-
"options": {
406-
"browserTarget": "cm:build"
407-
}
408-
},
409-
"test": {
410-
"builder": "@angular-devkit/build-angular:karma",
411-
"options": {
412-
"main": "src/main/webapp/wise5/classroomMonitor/src/test.ts",
413-
"karmaConfig": "./karma.conf.js",
414-
"polyfills": "src/main/webapp/wise5/classroomMonitor/src/polyfills.ts",
415-
"tsConfig": "src/main/webapp/wise5/classroomMonitor/src/tsconfig.spec.json",
416-
"scripts": [],
417-
"styles": ["src/main/webapp/wise5/classroomMonitor/src/style/styles.scss"],
418-
"assets": [
419-
"src/main/webapp/wise5/classroomMonitor/src/assets",
420-
"src/main/webapp/wise5/classroomMonitor/src/favicon.ico"
421-
]
422-
}
423-
},
424-
"lint": {
425-
"builder": "@angular-devkit/build-angular:tslint",
426-
"options": {
427-
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
428-
"exclude": ["**/node_modules/**"]
429-
}
430-
}
431-
}
432-
},
433-
"teacher": {
434-
"root": "src/main/webapp/wise5/teacher",
435-
"sourceRoot": "src/main/webapp/wise5/teacher/src",
436-
"projectType": "application",
437-
"architect": {
438-
"build": {
439-
"builder": "@angular-devkit/build-angular:browser",
440-
"options": {
441-
"outputPath": "src/main/webapp/wise5/teacher/dist",
442-
"index": "src/main/webapp/wise5/teacher/src/index.html",
443-
"main": "src/main/webapp/wise5/teacher/src/main.ts",
444-
"tsConfig": "src/main/webapp/wise5/teacher/src/tsconfig.app.json",
445-
"polyfills": "src/main/webapp/wise5/teacher/src/polyfills.ts",
446-
"extractCss": true,
447-
"assets": [],
448-
"styles": [],
449-
"scripts": []
450-
},
451-
"configurations": {
452-
"production": {
453-
"optimization": true,
454-
"outputHashing": "all",
455-
"sourceMap": true,
456-
"statsJson": true,
457-
"extractCss": true,
458-
"namedChunks": false,
459-
"aot": true,
460-
"extractLicenses": true,
461-
"vendorChunk": false,
462-
"buildOptimizer": true,
463-
"fileReplacements": [
464-
{
465-
"replace": "src/main/webapp/wise5/teacher/src/environments/environment.ts",
466-
"with": "src/main/webapp/wise5/teacher/src/environments/environment.prod.ts"
467-
}
468-
],
469-
"outputPath": "src/main/webapp/wise5/teacher/dist/",
470-
"baseHref": "/"
471-
}
472-
}
473-
},
474-
"serve": {
475-
"builder": "@angular-devkit/build-angular:dev-server",
476-
"options": {
477-
"browserTarget": "teacher:build"
478-
},
479-
"configurations": {
480-
"production": {
481-
"browserTarget": "teacher:build:production"
482-
}
483-
}
484-
},
485-
"extract-i18n": {
486-
"builder": "@angular-devkit/build-angular:extract-i18n",
487-
"options": {
488-
"browserTarget": "teacher:build"
489-
}
490-
},
491-
"test": {
492-
"builder": "@angular-devkit/build-angular:karma",
493-
"options": {
494-
"main": "src/main/webapp/wise5/teacher/src/test.ts",
495-
"karmaConfig": "./karma.conf.js",
496-
"polyfills": "src/main/webapp/wise5/teacher/src/polyfills.ts",
497-
"tsConfig": "src/main/webapp/wise5/teacher/src/tsconfig.spec.json",
498-
"scripts": [],
499-
"styles": ["src/main/webapp/wise5/teacher/src/style/styles.scss"],
500-
"assets": [
501-
"src/main/webapp/wise5/teacher/src/assets",
502-
"src/main/webapp/wise5/teacher/src/favicon.ico"
503-
]
504-
}
505-
},
506-
"lint": {
507-
"builder": "@angular-devkit/build-angular:tslint",
508-
"options": {
509-
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
510-
"exclude": ["**/node_modules/**"]
511-
}
512-
}
513-
}
514186
}
515187
},
516188
"defaultProject": "site",

‎package.json‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,26 +128,16 @@
128128
"webpack-node-externals": "^1.7.2"
129129
},
130130
"scripts": {
131-
"build-dev-all": "node node_modules/concurrently/bin/concurrently.js \"npm run build-dev-site\" \"npm run build-dev-teacher\" \"npm run build-dev-vle\"",
132-
"build-dev-at": "node node_modules/concurrently/bin/concurrently.js \"node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build at --watch\" \"node scripts/afterBuild.js at true\"",
133-
"build-dev-cm": "node node_modules/concurrently/bin/concurrently.js \"node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build cm --watch\" \"node scripts/afterBuild.js cm true\"",
134-
"build-dev-site": "node node_modules/concurrently/bin/concurrently.js \"ng build site --watch\" \"ng test --source-map=false --karma-config src/main/webapp/site/karma.conf.js --browsers ChromeHeadlessNoSandbox\" \"node scripts/afterBuild.js site true\"",
135-
"build-dev-teacher": "node node_modules/concurrently/bin/concurrently.js \"node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build teacher --watch\" \"node scripts/afterBuild.js teacher true\"",
136-
"build-dev-vle": "node node_modules/concurrently/bin/concurrently.js \"node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build vle --watch\" \"node scripts/afterBuild.js vle true\"",
137-
"build-prod-all": "npm run build-prod-at && npm run build-prod-cm && npm run build-prod-vle && npm run build-prod-site",
138-
"build-prod-all-hans": "npm run build-prod-at && npm run build-prod-cm && npm run build-prod-vle && npm run build-prod-site-hans",
139-
"build-prod-at": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build at --configuration=production && node scripts/afterBuild.js at",
140-
"build-prod-cm": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build cm --configuration=production && node scripts/afterBuild.js cm",
141-
"build-prod-vle": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build vle --configuration=production && node scripts/afterBuild.js vle",
142-
"build-prod-site": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build site --configuration=production && node scripts/afterBuild.js site",
143-
"build-prod-site-hans": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build site --configuration=production-zh-Hans && node scripts/afterBuild.js site",
131+
"build-dev": "node node_modules/concurrently/bin/concurrently.js \"ng build wise --watch\" \"ng test --source-map=false --karma-config src/main/webapp/site/karma.conf.js --browsers ChromeHeadlessNoSandbox\" \"node scripts/afterBuild.js true\"",
132+
"build-prod": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build wise --configuration=production && node scripts/afterBuild.js",
133+
"build-prod-hans": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build wise --configuration=production-zh-Hans && node scripts/afterBuild.js",
144134
"bundle-report": "node ./node_modules/webpack-bundle-analyzer/lib/bin/analyzer.js src/main/webapp/site/dist/stats.json",
145135
"watch-all-wise5": "node node_modules/concurrently/bin/concurrently.js \"node ./node_modules/gulp/bin/gulp.js\" \"npm run test-wise5-watch\"",
146136
"watch-sass": "npm rebuild node-sass && node ./node_modules/gulp/bin/gulp.js",
147137
"update-i18n": "node ./node_modules/gulp/bin/gulp.js update-i18n",
148138
"compile-sass": "node ./node_modules/gulp/bin/gulp.js compile-sass",
149139
"test": "node ./node_modules/karma/bin/karma start src/main/webapp/wise5/karma.conf.js --single-run --browsers ChromeHeadlessNoSandbox",
150-
"test-site": "ng test site --karma-config src/main/webapp/site/karma.conf.js --browsers ChromeHeadlessNoSandbox --watch=false",
140+
"test-site": "ng test wise --karma-config src/main/webapp/site/karma.conf.js --browsers ChromeHeadlessNoSandbox --watch=false",
151141
"test-watch": "node ./node_modules/karma/bin/karma start src/main/webapp/wise5/karma.conf.js --color --browsers ChromeHeadlessNoSandbox",
152142
"test-e2e-comment": "test-e2e assumes wise is already running.",
153143
"test-e2e": "node ./node_modules/protractor/bin/protractor src/main/webapp/wise5/test-e2e/conf.js",

0 commit comments

Comments
 (0)