Skip to content

Commit 7942cfa

Browse files
ShMcKShMcK
committed
rename project -> tutorialInfo
1 parent 36db2bc commit 7942cfa

File tree

16 files changed

+99
-101
lines changed

16 files changed

+99
-101
lines changed

‎lib/actions/actionTypes.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
2-
exports.SET_PROJECT = 'SET_PROJECT';
32
exports.VERIFY_SETUP = 'VERIFY_SETUP';
43
exports.SET_GLOBALS = 'SET_GLOBALS';
4+
exports.SET_TUTORIAL_INFO = 'SET_TUTORIAL_INFO';
55
exports.LOAD_TUTORIALS = 'LOAD_TUTORIALS';
66
exports.UPDATE_TUTORIAL = 'UPDATE_TUTORIAL';
77
exports.SET_ROUTE = 'SET_ROUTE';
@@ -20,6 +20,5 @@ exports.RUN_TESTS = 'RUN_TESTS';
2020
exports.TEST_COMPLETE = 'TEST_COMPLETE';
2121
exports.TEST_RESULT = 'TEST_RESULT';
2222
exports.TOGGLE_LOG = 'CHECK_LOG';
23-
exports.LOG_MESSAGE = 'LOG_MESSAGE';
2423
exports.TOGGLE_ALERT = 'TOGGLE_ALERT';
2524
exports.REPLAY_ALERT = 'SHOW_ALERT';

‎lib/actions/actions.js

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,30 @@
11
"use strict";
22
var actionTypes_1 = require('./actionTypes');
3+
var tutorials_1 = require('./tutorials');
34
var store_1 = require('../store/store');
45
var tutorial_package_1 = require('../services/tutorial-package');
5-
function setProject() {
6-
return { type: actionTypes_1.SET_PROJECT };
7-
}
8-
exports.setProject = setProject;
6+
var page_actions_1 = require('./page-actions');
7+
exports.setPage = page_actions_1.setPage;
8+
exports.nextPage = page_actions_1.nextPage;
9+
var progress_actions_1 = require('./progress-actions');
10+
exports.pageComplete = progress_actions_1.pageComplete;
11+
exports.chapterComplete = progress_actions_1.chapterComplete;
12+
exports.projectComplete = progress_actions_1.projectComplete;
13+
var task_actions_1 = require('./task-actions');
14+
exports.showHint = task_actions_1.showHint;
15+
exports.runTests = task_actions_1.runTests;
16+
exports.testComplete = task_actions_1.testComplete;
17+
exports.testResult = task_actions_1.testResult;
18+
exports.setHintPosition = task_actions_1.setHintPosition;
19+
var tutorials_2 = require('./tutorials');
20+
exports.loadTutorials = tutorials_2.loadTutorials;
21+
exports.updateTutorial = tutorials_2.updateTutorial;
22+
exports.setTutorialInfo = tutorials_2.setTutorialInfo;
23+
var alert_1 = require('./alert');
24+
exports.toggleAlert = alert_1.toggleAlert;
25+
exports.replayAlert = alert_1.replayAlert;
26+
var routes_1 = require('./routes');
27+
exports.setRoute = routes_1.setRoute;
928
function setGlobals(packageJson) {
1029
return { type: actionTypes_1.SET_GLOBALS, payload: { packageJson: packageJson } };
1130
}
@@ -24,7 +43,7 @@ function setPosition(position) {
2443
exports.setPosition = setPosition;
2544
function loadTutorial(tutorial) {
2645
tutorial_package_1.default.set(tutorial.name);
27-
store_1.store.dispatch(setProject());
46+
store_1.store.dispatch(tutorials_1.setTutorialInfo());
2847
store_1.store.dispatch(setPosition({ chapter: 0, page: 0 }));
2948
store_1.store.dispatch(setProgress());
3049
}
@@ -34,24 +53,3 @@ function toggleLog() {
3453
return { type: actionTypes_1.TOGGLE_LOG, payload: { open: open } };
3554
}
3655
exports.toggleLog = toggleLog;
37-
var page_actions_1 = require('./page-actions');
38-
exports.setPage = page_actions_1.setPage;
39-
exports.nextPage = page_actions_1.nextPage;
40-
var progress_actions_1 = require('./progress-actions');
41-
exports.pageComplete = progress_actions_1.pageComplete;
42-
exports.chapterComplete = progress_actions_1.chapterComplete;
43-
exports.projectComplete = progress_actions_1.projectComplete;
44-
var task_actions_1 = require('./task-actions');
45-
exports.showHint = task_actions_1.showHint;
46-
exports.runTests = task_actions_1.runTests;
47-
exports.testComplete = task_actions_1.testComplete;
48-
exports.testResult = task_actions_1.testResult;
49-
exports.setHintPosition = task_actions_1.setHintPosition;
50-
var tutorials_1 = require('./tutorials');
51-
exports.loadTutorials = tutorials_1.loadTutorials;
52-
exports.updateTutorial = tutorials_1.updateTutorial;
53-
var alert_1 = require('./alert');
54-
exports.toggleAlert = alert_1.toggleAlert;
55-
exports.replayAlert = alert_1.replayAlert;
56-
var routes_1 = require('./routes');
57-
exports.setRoute = routes_1.setRoute;

‎lib/actions/tutorials.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
"use strict";
22
var actionTypes_1 = require('./actionTypes');
3+
function setTutorialInfo() {
4+
return { type: actionTypes_1.SET_TUTORIAL_INFO };
5+
}
6+
exports.setTutorialInfo = setTutorialInfo;
37
function loadTutorials() {
48
return { type: actionTypes_1.LOAD_TUTORIALS };
59
}

‎lib/reducers/reducer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var redux_1 = require('redux');
3-
var project_1 = require('./project/project');
3+
var tutorial_info_1 = require('./tutorial-info/tutorial-info');
44
var route_1 = require('./route/route');
55
var progress_1 = require('./progress/progress');
66
var position_1 = require('./position/position');
@@ -18,7 +18,7 @@ var checks_1 = require('./checks/checks');
1818
var globals_1 = require('./globals/globals');
1919
Object.defineProperty(exports, "__esModule", { value: true });
2020
exports.default = redux_1.combineReducers({
21-
globals: globals_1.default, project: project_1.default, route: route_1.default, progress: progress_1.default, position: position_1.default,
21+
globals: globals_1.default, tutorialInfo: tutorial_info_1.default, route: route_1.default, progress: progress_1.default, position: position_1.default,
2222
page: page_1.default, tasks: tasks_1.default, taskPosition: task_position_1.default, hintPosition: hint_position_1.default,
2323
taskTests: task_tests_1.default, alert: alert_1.default, runTests: run_tests_1.default, editorActions: editor_actions_1.default,
2424
tutorials: tutorials_1.default, log: log_1.default, checks: checks_1.default

‎lib/reducers/tutorial-info/tutorial-info.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
"use strict";
2+
var actionTypes_1 = require('../../actions/actionTypes');
3+
var tutorial_package_1 = require('../../services/tutorial-package');
4+
var defaultInfo = {
5+
title: '',
6+
description: ''
7+
};
8+
function projectReducer(info, action) {
9+
if (info === void 0) { info = defaultInfo; }
10+
switch (action.type) {
11+
case actionTypes_1.SET_TUTORIAL_INFO:
12+
return tutorial_package_1.default.getTutorialInfo();
13+
default:
14+
return info;
15+
}
16+
}
17+
Object.defineProperty(exports, "__esModule", { value: true });
18+
exports.default = projectReducer;

‎lib/services/tutorial-package.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ var TutorialPackageService = (function () {
8282
return { chapter: chapter, page: page, completed: true };
8383
}
8484
};
85-
TutorialPackageService.prototype.getProject = function () {
85+
TutorialPackageService.prototype.getTutorialInfo = function () {
8686
return this.data.project;
8787
};
8888
TutorialPackageService.prototype.getProgress = function () {

‎src/actions/actionTypes.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
// Project
2-
export const SET_PROJECT = 'SET_PROJECT';
1+
// Setup
32
export const VERIFY_SETUP = 'VERIFY_SETUP';
43
export const SET_GLOBALS = 'SET_GLOBALS';
4+
5+
// Tutorials
6+
export const SET_TUTORIAL_INFO = 'SET_TUTORIAL_INFO';
57
export const LOAD_TUTORIALS = 'LOAD_TUTORIALS';
68
export const UPDATE_TUTORIAL = 'UPDATE_TUTORIAL';
79

@@ -34,7 +36,6 @@ export const TEST_RESULT = 'TEST_RESULT';
3436

3537
// Log
3638
export const TOGGLE_LOG = 'CHECK_LOG';
37-
export const LOG_MESSAGE = 'LOG_MESSAGE';
3839

3940
// Alert
4041
export const TOGGLE_ALERT = 'TOGGLE_ALERT';

‎src/actions/actions.ts

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
import {
2-
SET_PROJECT, SET_GLOBALS, VERIFY_SETUP,
3-
SET_PROGRESS, SET_POSITION, TOGGLE_LOG
2+
SET_GLOBALS, VERIFY_SETUP, SET_PROGRESS, SET_POSITION, TOGGLE_LOG
43
} from './actionTypes';
4+
import {setTutorialInfo} from './tutorials';
55
import {store} from '../store/store';
66
import TutorialPackage from '../services/tutorial-package';
77

8-
/* Project */
9-
export function setProject(): CR.Action {
10-
return { type: SET_PROJECT };
11-
}
8+
export {setPage, nextPage} from './page-actions';
9+
export {
10+
pageComplete, chapterComplete, projectComplete
11+
} from './progress-actions';
12+
export {
13+
showHint, runTests, testComplete, testResult, setHintPosition
14+
} from './task-actions';
15+
export {
16+
loadTutorials, updateTutorial, setTutorialInfo
17+
} from './tutorials';
18+
export {toggleAlert, replayAlert} from './alert';
19+
export {setRoute} from './routes';
1220

1321
export function setGlobals(packageJson: PackageJson): CR.Action {
1422
return { type: SET_GLOBALS, payload: { packageJson } };
@@ -22,14 +30,13 @@ export function setProgress(): CR.Action {
2230
return { type: SET_PROGRESS };
2331
}
2432

25-
/* Position */
2633
export function setPosition(position: CR.Position): CR.Action {
2734
return { type: SET_POSITION, payload: { position } };
2835
}
2936

3037
export function loadTutorial(tutorial: CR.Tutorial): void {
3138
TutorialPackage.set(tutorial.name);
32-
store.dispatch(setProject());
39+
store.dispatch(setTutorialInfo());
3340
store.dispatch(setPosition({chapter: 0, page: 0}));
3441
store.dispatch(setProgress());
3542
}
@@ -38,21 +45,3 @@ export function toggleLog(): CR.Action {
3845
let open = !store.getState().log.open;
3946
return { type: TOGGLE_LOG, payload: { open } };
4047
}
41-
42-
43-
/* Page */
44-
export {setPage, nextPage} from './page-actions';
45-
46-
/* Progress */
47-
export {pageComplete, chapterComplete, projectComplete} from './progress-actions';
48-
49-
/* Tasks */
50-
export {showHint, runTests, testComplete, testResult, setHintPosition} from './task-actions';
51-
52-
/* Tutorials */
53-
export {loadTutorials, updateTutorial} from './tutorials';
54-
55-
/* Alert */
56-
export {toggleAlert, replayAlert} from './alert';
57-
58-
export {setRoute} from './routes';

‎src/actions/tutorials.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import {LOAD_TUTORIALS, UPDATE_TUTORIAL} from './actionTypes';
1+
import {
2+
LOAD_TUTORIALS, UPDATE_TUTORIAL, SET_TUTORIAL_INFO
3+
} from './actionTypes';
4+
5+
export function setTutorialInfo(): CR.Action {
6+
return { type: SET_TUTORIAL_INFO };
7+
}
28

39
export function loadTutorials(): CR.Action {
410
return { type: LOAD_TUTORIALS };

‎src/reducers/project/project.spec.ts

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

‎src/reducers/project/project.ts

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

‎src/reducers/reducer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {combineReducers} from 'redux';
22

3-
import project from './project/project';
3+
import tutorialInfo from './tutorial-info/tutorial-info';
44
import route from './route/route';
55
import progress from './progress/progress';
66
import position from './position/position';
@@ -18,7 +18,7 @@ import checks from './checks/checks';
1818
import globals from './globals/globals';
1919

2020
export default combineReducers({
21-
globals, project, route, progress, position,
21+
globals, tutorialInfo, route, progress, position,
2222
page, tasks, taskPosition, hintPosition,
2323
taskTests, alert, runTests, editorActions,
2424
tutorials, log, checks

‎src/reducers/tutorial-info/tutorial-info.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import {SET_TUTORIAL_INFO} from '../../actions/actionTypes';
2+
import TutorialPackage from '../../services/tutorial-package';
3+
4+
const defaultInfo: CR.TutorialInfo = {
5+
title: '',
6+
description: ''
7+
};
8+
9+
export default function projectReducer(info = defaultInfo,
10+
action: CR.Action): CR.TutorialInfo {
11+
switch (action.type) {
12+
case SET_TUTORIAL_INFO:
13+
return TutorialPackage.getTutorialInfo();
14+
default:
15+
return info;
16+
}
17+
}

‎src/services/tutorial-package.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class TutorialPackageService {
8383
return {chapter, page, completed: true};
8484
}
8585
}
86-
getProject(): CR.Project {
86+
getTutorialInfo(): CR.TutorialInfo {
8787
return this.data.project;
8888
}
8989
getProgress(): CR.Progress {

‎src/typings/cr/cr.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ declare namespace CR {
2727

2828
interface State {
2929
route: string;
30-
project: Project;
30+
tutorialInfo: TutorialInfo;
3131
position: Position;
3232
page: Page;
3333
progress: Progress;
@@ -44,7 +44,7 @@ declare namespace CR {
4444
globals: Coderoad;
4545
}
4646

47-
interface Project {
47+
interface TutorialInfo {
4848
title: string;
4949
description: string;
5050
}

‎tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
"src/reducers/page/page.ts",
8080
"src/reducers/position/position.ts",
8181
"src/reducers/progress/progress.ts",
82-
"src/reducers/project/project.ts",
8382
"src/reducers/reducer.ts",
8483
"src/reducers/route/route.ts",
8584
"src/reducers/run-tests/parse-loaders.ts",
@@ -89,6 +88,7 @@
8988
"src/reducers/task-position/task-position.ts",
9089
"src/reducers/task-tests/task-tests.ts",
9190
"src/reducers/tasks/tasks.ts",
91+
"src/reducers/tutorial-info/tutorial-info.ts",
9292
"src/reducers/tutorials/check-tutorials.ts",
9393
"src/reducers/tutorials/tutorials.ts",
9494
"src/reducers/tutorials/update-tutorial.ts",

0 commit comments

Comments
 (0)