Commit Graph

26 Commits

Author SHA1 Message Date
Emma Dauterman
953fb9f1b4 Blockly Factory: Check for Unsaved Changes in Workspace Factory (#617)
* Bug fix for adding variables and procedures categories with prompt, removed blocks from category name, check if unsaved changes in workspace factory before leave

* Updated flags in clear all. Added more comments

* Solved merge conflicts
2016-09-01 10:38:52 -07:00
Tina Quach
66188b4c54 Blockly Factory: Global Self Bug Fix (#616)
* fix bug with global self

* cleaned up code, moved warn into block lib controller, check for starter block in FactoryUtils.savedBlockChanges
2016-09-01 09:56:16 -07:00
Tina Quach
cbdf8a597e Blockly Factory: Warn user when leaving/refreshing page (#607)
* warn user upon refreshing page and leaving page (by going to prev page or by exiting the window or tab)

* alert upon leaving page ONLY when unsaved changes

* nit remove log

* no alert when on starter block, added clarifying comment
2016-08-31 13:39:47 -07:00
Tina Quach
a1ead192a6 Blockly Factory: Enhanced Block Library UI (#603)
* block library now dynamically updates buttons based on the current block open in block factory--whether or not it is saved, whether or not changes have been made, whether or not it's the starter block.

update buttons rather than switching to new block on delete

remove warning about updating block

alert when creating new block with unsaved changes

working warnings on tab switches and create new block

green buttons indicate user can save or update block, red save button indicates that user cannot save the block ( but encourages user to click button)

consistent button name on default

added alert upon switching between blocks without saving

 nit comments, condensing if statements, removing extra code

throw errors in sameBlockXml function of factory utils

created wrapper function for warning user about unsaved changes and checking if they'd like to proceed

cleaned up code for setSelected block

* nit change to warning message on block type being one of core block types

* nit helper text for exporter

* nit comments and spacing
2016-08-30 09:19:05 -07:00
Tina Quach
7bbd125bd0 changed tab ordering and export selector buttons (#605) 2016-08-29 10:22:27 -07:00
Tina Quach
6e88d5c035 alert when creating new block with unsaved changes (#594)
working warnings on tab switches and create new block
2016-08-26 11:24:56 -07:00
Emma Dauterman
0cf5d12374 Blockly Factory: Resize Workspaces in Workspace Factory (#593)
* Made workspace factory toolboxes take up height of screen, made workspce options properly scrollable, fixed being able to accidentally see Block factory some times, made Exporter and workspace factory scrollable if necessary

* Nit alphabetize css rules

* Fixed display none problems for Block factory, making it so that it can be hidden properly

* Nit css style
2016-08-25 16:40:25 -07:00
Tina Quach
31d6e941e7 Blockly Factory: Disable Disconnected Blocks, Nit UI, Bug fix (#595)
* disabled disconnected blocks in block factory

change to block def and also warn user

fixed bug and renamed math_foo

* clearUndo upon opening a saved block, change alert messages that use ok

* removed warning for unsaved blocks. in separate CL

* fix bug and make the blank option clickable
2016-08-25 11:29:29 -07:00
Emma Dauterman
359e48c41b Blockly Factory: Warning for Undefined Blocks (#581)
* Done adding warning if not using defined block

* Nit comments

* Nit warning message

* Small fix for clear

* Fixed merging errors
2016-08-24 11:19:19 -07:00
Tina Quach
134b40c275 Blockly Factory: Use StandardCategories, No Abbreviations (#583)
* used standard categories

no abbrevs in function names for controllers

* no abbreviations in factory_utils function names
2016-08-24 10:31:29 -07:00
Tina Quach
8e44684c81 Blockly Factory: Clean Up Workspace on Save Block, Import Lowercase Types (#584)
* save only factory base block upon save to library; import block library with lowercase blocktypes

* nit comment
2016-08-24 10:29:24 -07:00
Tina Quach
b0432306a1 Blockly Factory: New Selector UI (#579)
* generate block selector with checkboxes

working click handler

updated block exporter view and controller to work with new UI

select a block by clicking on the option--not just checkbox

renamed selectorWorkspace and fixed checkbox selecting bug

adding used blocks works

added and cleaned up css, removed extra exporter controller function, nit  comment

simplified code

* style

* does not clear selected blocks upon tab switch

* added tooltips to buttons, reworded some buttons

* remove console.log statement and clarify this.selected in blockoption

* removed console log & nit comment
2016-08-23 13:39:01 -07:00
Emma Dauterman
ab850b9863 Blockly Factory: Workspace Factory UI (#577)
* Some UI changes made

* CSS changes

* Done with UI tweaks

* Changing arrow key event listeners, also changing category header in category list

* Fixed bug with error on updating toolbox with read only

* Changes to factory.css and workspacefactory view

* Bug fixes and UI changes and refactoring to have enableKeyEvents in wfactory controller

* Uncommented catch

* Changes to app_controller.js to use constants, other nit changes

* Nit line breaks
2016-08-23 10:48:36 -07:00
Tina Quach
6953afb0b5 added preview of code to export in exporter tab, it dynamically updates with each block selection (#573)
moved inject code out to factory utils, refactored updatePreview and similar functions in exporter controller

refactor
2016-08-23 10:33:48 -07:00
Tina Quach
7516866804 Blockly Factory: Select Used Blocks for Export (#565)
* addAllUsedBlocks in exporter works when you hand set the instance variable.

added click handler for export button (which got lost in refactor).

saveStateFromWorkspace on tab switch

fixed bug in deselect block in exporter; added warning alert for add all used blocks

* nit line

* not warning for standard block types
2016-08-22 18:07:52 -07:00
Emma Dauterman
61af94314e Blockly Factory: Generate Block Library Category in Workspace Factory (#568)
* Added block library category to toolbox workspace in workspace factory and update it each time user switches to workspace factory

* Added whitespace to end of index.html

* Bug fixes for convertShadowBlocks and updateState

* Last part of bug fix for adding separators
2016-08-19 09:48:51 -07:00
Tina Quach
204e28f63f block library now exports valid xml and properly handles the imported xml in a robust way (#555) 2016-08-18 09:20:09 -07:00
Emma Dauterman
7b854f85a4 Blockly Factory: Update Workspace Factory Tab (#562)
* Updated tab in blockly factory to reflect changes made to workspace factory, changes mainly in index.html and wfactory_init.js

* Added tab for workspace editing mode

* Changed font size in dropdown menu

* Added class for options inputs to add event listeners more easily
2016-08-17 15:56:30 -07:00
Emma Dauterman
e633539d52 Blockly Factory: Rename WorkspaceFactory Classes (#553)
* Changed all namespaces from 'Factory' to 'WorkspaceFactory'

* Fixed brace problem in factory.js, syntax error in app_controller.js
2016-08-16 16:14:51 -07:00
Emma Dauterman
8ec5745611 Add Workspace Factory to Blockly Factory Tab (#538)
* Starting to integrate workspacefactory

* Committing before switching branches

* Tab for workspace factory working

* Committing before switching branches

* Refactored to have FactoryInit namespace and move logic out of AppController

* Nit typo fix.

* Fixed bugs from rebasing

* Nit fix in factory.css

* Added this. to previewWorkspace
2016-08-16 15:52:12 -07:00
Emma Dauterman
7810a5397d Blockly Factory: UI for Navigation Bar, Help Button, Exporter (#549)
* Did cherry-picking for style changes with different resolution, no workspace factory style yet

* Nit changes

* Moving style out of index.html to factory.css

* Nit ordering in factory.css
2016-08-16 15:38:44 -07:00
Tina Quach
f6f39c48f5 Blockly Factory: Factory Utils (#535)
* created FactoryUtils, to share useful generator code between the different apps within Blockly Factory

* undo removal of alert upon empty block library

nit removed specification of wfactory exporter param in comment for export controller

* remove alert from index and nit comment in wfactory generator
2016-08-15 17:45:08 -07:00
Tina Quach
6885a88a82 removed unneeded download buttons and alert (#547) 2016-08-15 13:23:54 -07:00
Tina Quach
3748b6f8bd refactored onTab to call a single function for visually turning tabs on or off depending on whether it is selected (#544) 2016-08-12 14:17:18 -07:00
Tina Quach
73fbc06d4a Blockly Factory: Foundation for Integrating Workspace Factory (#533)
* working tabs using closure

expanded export settings menu

added old blockfactory and moved new files into blocklyfactory

expanded export to lay groundwork for workspace factory integration

fixed BlockFactory escapeString bug

* added TODO for refactoring onTab
2016-08-10 14:56:21 -07:00
Tina Quach
9819d677a9 Blockly Factory: Block Library & Block Exporter (#530)
Created Blockly Factory, an expansion of the Block Factory demo that adds the Block Library and Block Exporter to the Block Factory. 

The Block Library provides the interfaces for the user to save their blocks to local storage so that upon opening and closing the page, their blocks will still persist. In Blockly Factory, Users can re-open saved blocks for edit through a dropdown interface, delete blocks from their library, clear their block library, and import and export their block library. Importing and exporting their block library may be useful for creating specific sets of in-progress blocks for editing.

The Block Exporter allows users to export block definitions and generator stubs of their saved blocks easily by using a visual interface powered by Blockly. It contains a selector workspace in which users add and remove blocks to the workspace to select and deselect them for export.
The exporter also contains an export settings form through which people may export block definitions and generator stubs.
2016-08-10 10:49:19 -07:00