Merge pull request #443 from Jlu18/course-settings

Modify lesson so each lesson will load the settings from backend

Author: kdvalin

src/actions/courseActions.js

@@ -63,6 +63,7 @@ export function fetchCourse(courseId) {
                         }
 
                         dispatch(loadLesson(json.lessons[0] || ""));
+                        dispatch(sceneActions.loadSettings(json.lessons[0].settings || {}));
                         dispatch(render(json.lessons[0].code || ""));
                         dispatch(updateSavedText(json.lessons[0].code || ""));
                         dispatch(sceneActions.setNameDesc(
@@ -96,6 +97,8 @@ export function loadCourse(course) {
 export function fetchLesson(json) {
     return (dispatch) => {
         dispatch(loadLesson(json));
+        dispatch(sceneActions.resetSettings());
+        dispatch(sceneActions.loadSettings(json.settings || {}));
         dispatch(render(json.code || ""));
         dispatch(updateSavedText(json.code || ""));
         dispatch(sceneActions.nameScene(json.name));

src/actions/sceneActions.js

@@ -72,8 +72,12 @@ export function loadSettings(payload) {
     return { type: types.LOAD_SETTINGS, payload };
 }
 
-export function changeSetting(payload) {
-    return { type: types.LOAD_SETTINGS, payload };
+export function changeSettings(payload) {
+    return { type: types.CHANGE_SETTINGS, payload };
+}
+
+export function resetSettings() {
+    return { type: types.RESET_SETTINGS };
 }
 
 export function addCollectionID(payload) {
@@ -105,7 +109,8 @@ export default {
     toggleFly,
     toggleFloor,
     loadSettings,
-    changeSetting,
+    changeSettings,
+    resetSettings,
     addCollectionID,
     setDesc,
     setNameDesc,

src/constants/ActionTypes.js

@@ -36,7 +36,8 @@ export const CHANGE_VIEW = "CHANGE_VIEW";
 export const TOGGLE_FLY = "TOGGLE_FLY";
 export const TOGGLE_FLOOR = "TOGGLE_FLOOR";
 export const LOAD_SETTINGS = "LOAD_SETTINGS";
-export const CHANGE_SETTING = "CHANGE_SETTING";
+export const CHANGE_SETTINGS = "CHANGE_SETTINGS";
+export const RESET_SETTINGS = "RESET_SETTINGS";
 export const ADD_CLASSROOM = "ADD_CLASSROOM";
 export const REMOVE_CLASSROOM = "REMOVE_CLASSROOM";
 export const SET_DESC = "SET_DESC";

src/reducers/scene.js

@@ -135,7 +135,7 @@ export default function scene(state = initial_state, action) {
                 name: action.payload.name,
                 desc: action.payload.desc
             };
-        case types.CHANGE_SETTING:
+        case types.CHANGE_SETTINGS:
             const { param, val } = action.payload;
             return {
                 ...state,
@@ -144,6 +144,11 @@ export default function scene(state = initial_state, action) {
                     [param]: val
                 }
             };
+        case types.RESET_SETTINGS:
+            return {
+                ...state,
+                settings: DEF_SETTINGS
+            };
         case types.TOGGLE_DEFAULT_LIGHT:
             return {
                 ...state,