Skip to content

Mission editing master #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 133 commits into from
Apr 15, 2019
Merged

Mission editing master #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
df99398
update js-slang imports, and use null for empty list
openorclose Jan 8, 2019
3ac7925
pass tests
openorclose Jan 8, 2019
083e100
pass tests
openorclose Jan 8, 2019
e42bccf
format all external libraries with prettier
openorclose Feb 4, 2019
0588d8f
Merge branch 'master' into update-js-slang
openorclose Feb 4, 2019
1b33af9
Update README.md
openorclose Feb 7, 2019
c370da6
missionOverviews
gerhean Feb 10, 2019
481f7b6
minorOverviewChanges
gerhean Feb 10, 2019
c5a7a79
minorOverviewChanges1
gerhean Feb 10, 2019
2578241
AddedAssignmentSupport
gerhean Feb 10, 2019
7f08350
minorOverviewChanges2
gerhean Feb 10, 2019
166fd75
placed xmlpharser in alt file
gerhean Feb 13, 2019
399cfdb
update js-slang to version 0.2.0
openorclose Feb 13, 2019
349b0d8
Merge remote-tracking branch 'origin/master' into update-js-slang2
openorclose Feb 13, 2019
29e1c09
update acorn, fix order of imports
openorclose Feb 13, 2019
3858146
update readme
openorclose Feb 13, 2019
01923f2
Merge remote-tracking branch 'origin/master' into update-js-slang2
openorclose Feb 13, 2019
0f2f2d2
created editing folder
gerhean Feb 14, 2019
7208138
added interface
gerhean Feb 14, 2019
0a26bfd
Merge pull request #3 from source-academy/update-js-slang
gerhean Feb 14, 2019
f96402f
Merge pull request #5 from gerhean/missionEditing
gerhean Feb 14, 2019
94e639c
library parsing
gerhean Feb 15, 2019
dfaf29a
Local storage
gerhean Feb 15, 2019
a76447d
packages fixed
gerhean Feb 15, 2019
f40f547
export library
gerhean Feb 18, 2019
3c1457e
Added Template Reset Feature
geshuming Feb 18, 2019
71ed095
Added UI to edit assessmentsOverview
ZiHawkEye Feb 18, 2019
8178ced
Merge pull request #1 from gerhean/missionEditing-slang
ZiHawkEye Feb 19, 2019
ce1a17c
Merge pull request #6 from ZiHawkEye/missionEditing-slang
gerhean Feb 19, 2019
358fbc4
Moved edititngOverviewCard logic
gerhean Feb 20, 2019
efc4e76
export added
gerhean Feb 20, 2019
ce524a4
minor debugging
gerhean Feb 20, 2019
8ee9050
fixed xmlParser
gerhean Feb 21, 2019
2952d87
added autofocus
gerhean Feb 22, 2019
fd0d635
sync stuff
gerhean Feb 22, 2019
d21a2ae
Added EditAssessment component
ZiHawkEye Feb 25, 2019
e211567
Bug fixes
ZiHawkEye Feb 26, 2019
a5b8a71
More bug fixes
ZiHawkEye Feb 27, 2019
78166e6
move importfilecomponents
gerhean Feb 27, 2019
67b9b14
localretrive functions added
gerhean Feb 27, 2019
2b3b358
Added EditingAssessmentForm to edit missions
ZiHawkEye Mar 3, 2019
2c81546
Merge
ZiHawkEye Mar 3, 2019
df78b60
Bug fixes and added MakeMission button
ZiHawkEye Mar 4, 2019
57ba44f
Use alpha version of js-slang, with verbose messages and native enabled
openorclose Mar 4, 2019
7f63bb5
Update js-slang to alpha-3
openorclose Mar 5, 2019
eb37fee
Bug fixes
ZiHawkEye Mar 5, 2019
99a2986
Added toggle editing mode
ZiHawkEye Mar 5, 2019
6ec7841
Edited style
ZiHawkEye Mar 5, 2019
ce8ea6b
Bug fixes
ZiHawkEye Mar 6, 2019
90d3e55
overhaulStuff
gerhean Mar 6, 2019
84253ae
Merge branch 'missionEditing-slang' of https://github.com/ZiHawkEye/c…
gerhean Mar 6, 2019
717567e
click to edit added
gerhean Mar 6, 2019
fe2551a
mcq question tabs added
gerhean Mar 7, 2019
34a22e0
added incubator
gerhean Mar 7, 2019
6518142
code refactoring
gerhean Mar 7, 2019
222355e
cleanup unused code
gerhean Mar 7, 2019
0c12834
minor clean
gerhean Mar 7, 2019
e52ca30
Merge pull request #8 from gerhean/mission-edit-assess-edit
gerhean Mar 7, 2019
a1cc3e5
code refactoring
gerhean Mar 7, 2019
2f5120a
Added manageQuestion tab
ZiHawkEye Mar 7, 2019
4514844
enzyme update
gerhean Mar 7, 2019
31eff4b
Merge pull request #9 from ZiHawkEye/mission-edit-assess-edit
gerhean Mar 7, 2019
6881d67
add example xml
gerhean Mar 7, 2019
281d1b9
library selection added
gerhean Mar 7, 2019
52de4ee
code clean
gerhean Mar 13, 2019
92964af
removed editing from assessment
gerhean Mar 13, 2019
a46fa86
Update NavigationBar.tsx.snap
gerhean Mar 13, 2019
7287c1a
Prettify
gerhean Mar 13, 2019
4c9536e
Update index.tsx
gerhean Mar 13, 2019
adc84be
Merge branch 'pr/478' into mission-editing
gerhean Mar 14, 2019
2067109
yarn format
gerhean Mar 14, 2019
37c06b5
Merge pull request #10 from source-academy/mission-editing
gerhean Mar 14, 2019
13a605f
bug fixes
gerhean Mar 15, 2019
050d702
yarn format
gerhean Mar 15, 2019
ffec588
Mission editing slang (#479)
gerhean Mar 15, 2019
1958a73
moved editing side content tabs
gerhean Mar 15, 2019
30b0bca
Update EditingWorkspace.tsx
gerhean Mar 15, 2019
e3aef03
seperated question template tab
gerhean Mar 16, 2019
982fdaf
update question template tab
gerhean Mar 16, 2019
8b4a928
tab clean up
gerhean Mar 16, 2019
d797b17
added ManageQuestionTab
gerhean Mar 16, 2019
59230d2
complete split up of editingContentsTab
gerhean Mar 16, 2019
0cf0279
yarn format
gerhean Mar 16, 2019
0bc4bf1
Update QuestionTemplateTab.tsx
gerhean Mar 16, 2019
f66c77c
signal unsavedChanges
gerhean Mar 16, 2019
460abbc
GlobalDeployment Added
gerhean Mar 17, 2019
9fa770c
yarn format
gerhean Mar 17, 2019
4476a65
Merge branch 'pr/481' into mission-editing
gerhean Mar 17, 2019
8d729a0
Update GlobalDeploymentTab.tsx
gerhean Mar 20, 2019
55c54d0
nicer buttons
gerhean Mar 20, 2019
74e3f10
Mission editing slang (#483)
gerhean Mar 20, 2019
2c2ba57
made local deployment
gerhean Mar 21, 2019
672e7c3
yarn format
gerhean Mar 21, 2019
59b1a44
Merge branch 'pr/486' into mission-editing
gerhean Mar 21, 2019
1a81453
minor bug fix
gerhean Mar 21, 2019
270c323
Mission editing update (#486)
gerhean Mar 21, 2019
0d1e420
Auto update overview maxGrade/Xp
gerhean Mar 22, 2019
94be1b0
Merge branch 'mission-editing' into missionEditing-slang
gerhean Mar 22, 2019
2fdd2d8
xp bug fix
gerhean Mar 23, 2019
00877c2
Update NavigationBar.tsx.snap
gerhean Mar 23, 2019
b92a11d
Merge branch 'missionEditing-slang' of https://github.com/gerhean/cad…
gerhean Mar 23, 2019
010d55d
Update EditingWorkspace.tsx
gerhean Mar 23, 2019
84baf52
Merge branch 'pr/11' into missionEditing-slang
gerhean Mar 23, 2019
8940b15
Reset button added
gerhean Mar 23, 2019
cdfdfe0
fixed bugs
gerhean Mar 24, 2019
ec1a2e0
yarn format
gerhean Mar 24, 2019
1076f40
Mission editing slang (#489)
gerhean Mar 24, 2019
5035673
placeholder for overview card
gerhean Mar 24, 2019
1ae07bd
Mission editing slang (#496)
gerhean Mar 24, 2019
5aae7b0
better placeholders
gerhean Mar 24, 2019
de8956c
Merge branch 'missionEditing-slang' into mission-editing
gerhean Mar 24, 2019
8563820
Merge pull request #12 from source-academy/mission-editing (#498)
gerhean Mar 24, 2019
e024b33
fix import for firefox (#499)
gerhean Mar 24, 2019
4f5c495
Mission editing slang (#500)
gerhean Mar 24, 2019
d22710a
an update (#501)
gerhean Mar 24, 2019
c5c99e2
Mission editing slang (#502)
gerhean Mar 25, 2019
319ad02
Mission editing slang (#503)
gerhean Mar 25, 2019
ff0d227
Mission editing slang (#505)
gerhean Mar 27, 2019
9cfa385
Mission editing slang (#512)
gerhean Apr 2, 2019
fb637cd
Mission editing slang (#517)
gerhean Apr 9, 2019
075bdb4
Merge branch 'mission-editing' into mission-editing-master
gerhean Apr 10, 2019
646f3e8
Update context.ts
openorclose Apr 12, 2019
f584ee8
super refactoring
gerhean Apr 14, 2019
296ac48
screenshot update
gerhean Apr 14, 2019
1b3f769
Merge branch 'mission-editing-master' of https://github.com/source-ac…
gerhean Apr 14, 2019
fb3ee4c
more refactor
gerhean Apr 14, 2019
ff25b2b
Merge master into mission-editing
gerhean Apr 14, 2019
242d0d3
Update README.md
gerhean Apr 14, 2019
95d0283
remove Carriage Return
gerhean Apr 14, 2019
d0e4200
Update test.sh
gerhean Apr 14, 2019
f1f54b7
Merge branch 'master' into mission-editing-master
gerhean Apr 14, 2019
5264359
Merge branch 'master' into mission-editing-master
gerhean Apr 15, 2019
d90207d
fix merge compatibility
gerhean Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ Note that this copies your files over, any future changes will not be reflected.

You may try [this](https://medium.com/@alexishevia/the-magic-behind-npm-link-d94dcb3a81af) for a smoother experience.

## For Editing And Creating New Local XML Missions

1. Use the branch 'mission-editing' in cadet-frontend
2. Run in browser with npm start
2. Go to Incubator tab.

## Application Structure

1. `actions` contains action creators, one file per reducer, combined in index.
Expand All @@ -70,4 +64,4 @@ You may try [this](https://medium.com/@alexishevia/the-magic-behind-npm-link-d94

## TypeScript Coding Conventions

We reference [this guide](https://github.com/piotrwitek/react-redux-typescript-guide).
We reference [this guide](https://github.com/piotrwitek/react-redux-typescript-guide).
Loading