Merge pull request #74 from ucfopen/dev/2.1.0

Dev/2.1.0
ucfopen · Aug 23, 2019 · b5f53fa · b5f53fa
2 parents 205bade + b92746a
commit b5f53fa
Show file tree

Hide file tree

Showing 17 changed files with 186 additions and 91 deletions.
diff --git a/__test__/mockapi/widget_instances_get.json b/__test__/mockapi/widget_instances_get.json
@@ -25,7 +25,6 @@
             "dir": "70-mental-rotation-body-parts/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Popup",
             "height": "600",
             "id": "70",
             "is_answer_encrypted": "1",
@@ -85,7 +84,6 @@
             "dir": "16-labeling/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "601",
             "id": "16",
             "is_answer_encrypted": "1",
@@ -149,7 +147,6 @@
             "dir": "16-labeling/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "601",
             "id": "16",
             "is_answer_encrypted": "1",
@@ -213,7 +210,6 @@
             "dir": "16-labeling/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "601",
             "id": "16",
             "is_answer_encrypted": "1",
@@ -277,7 +273,6 @@
             "dir": "13-last-chance-cadet/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "13",
             "is_answer_encrypted": "1",
@@ -340,7 +335,6 @@
             "dir": "8-enigma/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "548",
             "id": "8",
             "is_answer_encrypted": "1",
@@ -403,7 +397,6 @@
             "dir": "10-crossword/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "592",
             "id": "10",
             "is_answer_encrypted": "1",
@@ -466,7 +459,6 @@
             "dir": "8-enigma/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "548",
             "id": "8",
             "is_answer_encrypted": "1",
@@ -529,7 +521,6 @@
             "dir": "8-enigma/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "548",
             "id": "8",
             "is_answer_encrypted": "1",
@@ -592,7 +583,6 @@
             "dir": "8-enigma/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "548",
             "id": "8",
             "is_answer_encrypted": "1",
@@ -655,7 +645,6 @@
             "dir": "80-this-or-that/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "0",
             "id": "80",
             "is_answer_encrypted": "1",
@@ -719,7 +708,6 @@
             "dir": "16-labeling/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "601",
             "id": "16",
             "is_answer_encrypted": "1",
@@ -783,7 +771,6 @@
             "dir": "98-equation-sandbox/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "650",
             "id": "98",
             "is_answer_encrypted": "1",
@@ -846,7 +833,6 @@
             "dir": "12-hangman/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "620",
             "id": "12",
             "is_answer_encrypted": "1",
@@ -909,7 +895,6 @@
             "dir": "8-enigma/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "548",
             "id": "8",
             "is_answer_encrypted": "1",
@@ -972,7 +957,6 @@
             "dir": "64-what-do-you-believe/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Popup",
             "height": "600",
             "id": "64",
             "is_answer_encrypted": "1",
@@ -1032,7 +1016,6 @@
             "dir": "10-crossword/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "592",
             "id": "10",
             "is_answer_encrypted": "1",
@@ -1095,7 +1078,6 @@
             "dir": "9-flash-cards/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "516",
             "id": "9",
             "is_answer_encrypted": "1",
@@ -1158,7 +1140,6 @@
             "dir": "9-flash-cards/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "516",
             "id": "9",
             "is_answer_encrypted": "1",
@@ -1221,7 +1202,6 @@
             "dir": "9-flash-cards/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "516",
             "id": "9",
             "is_answer_encrypted": "1",
@@ -1284,7 +1264,6 @@
             "dir": "9-flash-cards/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "516",
             "id": "9",
             "is_answer_encrypted": "1",
@@ -1347,7 +1326,6 @@
             "dir": "10-crossword/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "592",
             "id": "10",
             "is_answer_encrypted": "1",
@@ -1410,7 +1388,6 @@
             "dir": "16-labeling/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "601",
             "id": "16",
             "is_answer_encrypted": "1",
@@ -1474,7 +1451,6 @@
             "dir": "9-flash-cards/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "516",
             "id": "9",
             "is_answer_encrypted": "1",
@@ -1537,7 +1513,6 @@
             "dir": "9-flash-cards/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "516",
             "id": "9",
             "is_answer_encrypted": "1",
@@ -1600,7 +1575,6 @@
             "dir": "9-flash-cards/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "516",
             "id": "9",
             "is_answer_encrypted": "1",
@@ -1663,7 +1637,6 @@
             "dir": "10-crossword/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "592",
             "id": "10",
             "is_answer_encrypted": "1",
@@ -1726,7 +1699,6 @@
             "dir": "10-crossword/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "592",
             "id": "10",
             "is_answer_encrypted": "1",
@@ -1789,7 +1761,6 @@
             "dir": "10-crossword/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "592",
             "id": "10",
             "is_answer_encrypted": "1",
@@ -1852,7 +1823,6 @@
             "dir": "10-crossword/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "592",
             "id": "10",
             "is_answer_encrypted": "1",
@@ -1915,7 +1885,6 @@
             "dir": "18-adventure/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "18",
             "is_answer_encrypted": "1",
@@ -1982,7 +1951,6 @@
             "dir": "16-labeling/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "601",
             "id": "16",
             "is_answer_encrypted": "1",
@@ -2046,7 +2014,6 @@
             "dir": "10-crossword/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "592",
             "id": "10",
             "is_answer_encrypted": "1",
@@ -2109,7 +2076,6 @@
             "dir": "17-sequencer/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "548",
             "id": "17",
             "is_answer_encrypted": "1",
@@ -2172,7 +2138,6 @@
             "dir": "18-adventure/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "18",
             "is_answer_encrypted": "1",
@@ -2239,7 +2204,6 @@
             "dir": "13-last-chance-cadet/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "13",
             "is_answer_encrypted": "1",
@@ -2302,7 +2266,6 @@
             "dir": "18-adventure/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "18",
             "is_answer_encrypted": "1",
@@ -2369,7 +2332,6 @@
             "dir": "18-adventure/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "18",
             "is_answer_encrypted": "1",
@@ -2436,7 +2398,6 @@
             "dir": "18-adventure/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "18",
             "is_answer_encrypted": "1",
@@ -2503,7 +2464,6 @@
             "dir": "9-flash-cards/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "516",
             "id": "9",
             "is_answer_encrypted": "1",
@@ -2566,7 +2526,6 @@
             "dir": "18-adventure/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "18",
             "is_answer_encrypted": "1",
@@ -2633,7 +2592,6 @@
             "dir": "18-adventure/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "18",
             "is_answer_encrypted": "1",
@@ -2700,7 +2658,6 @@
             "dir": "18-adventure/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "18",
             "is_answer_encrypted": "1",
@@ -2767,7 +2724,6 @@
             "dir": "10-crossword/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "592",
             "id": "10",
             "is_answer_encrypted": "1",
@@ -2830,7 +2786,6 @@
             "dir": "18-adventure/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "18",
             "is_answer_encrypted": "1",
@@ -2897,7 +2852,6 @@
             "dir": "18-adventure/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "593",
             "id": "18",
             "is_answer_encrypted": "1",
@@ -2964,7 +2918,6 @@
             "dir": "8-enigma/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "548",
             "id": "8",
             "is_answer_encrypted": "1",
@@ -3027,7 +2980,6 @@
             "dir": "16-labeling/",
             "flash_version": "10",
             "api_version": "2",
-            "group": "Materia",
             "height": "601",
             "id": "16",
             "is_answer_encrypted": "1",
@@ -3091,7 +3043,6 @@
             "dir": "8-enigma/",
             "flash_version": "0",
             "api_version": "2",
-            "group": "Materia",
             "height": "548",
             "id": "8",
             "is_answer_encrypted": "1",

diff --git a/__test__/mockapi/widgets_get.json b/__test__/mockapi/widgets_get.json
@@ -6,7 +6,6 @@
         "dir": "10-crossword/",
         "flash_version": "10",
         "api_version": "2",
-        "group": "Materia",
         "height": "592",
         "id": "10",
         "is_answer_encrypted": "1",