Merge branch 'release/v0.2.0'

gbmhunter · Dec 6, 2015 · e9992d4 · e9992d4
2 parents d4907e0 + 91cb15b
commit e9992d4
Show file tree

Hide file tree

Showing 20 changed files with 1,504 additions and 151 deletions.
diff --git a/README.rst b/README.rst
@@ -8,8 +8,8 @@ A embedded engineering calculator suite that's got your back.
 
 - Author: gbmhunter <[email protected]> (http://www.mbedded.ninja)
 - Created: 2015-11-02
-- Last Modified: 2015-11-20
-- Version: v0.1.0
+- Last Modified: 2015-12-06
+- Version: v0.2.0
 - Company: mbedded.ninja
 - Project: NinjaTerm
 - Language: HTML, js, jsx, LESS
@@ -67,8 +67,11 @@ Developing
 
 .. _node: https://nodejs.org/en/
 
-To Build The Windows Installer
-------------------------------
+Creating Installers
+-------------------
+
+#. Type :code:`npm run release` from the repo root directory.
+#. Go make a coffee (or soy latte, no judging) and enjoy the next 5-10 minutes before coming back to find an installer! An installer will be made for the operating system you are currently running on.
 
 
 

diff --git a/app/actions/calc-actions.jsx b/app/actions/calc-actions.jsx
@@ -2,7 +2,7 @@
 //! @file               calc-actions.js
 //! @author             Geoffrey Hunter <[email protected]> (www.mbedded.ninja)
 //! @created            2015-11-02
-//! @last-modified      2015-11-20
+//! @last-modified      2015-12-01
 //! @brief              Contains the "redux" actions for the NinjaCalc app.
 //! @details
 //!     See README.rst in repo root dir for more info.
@@ -45,6 +45,45 @@ export function addCalcType(model) {
 	}
 }
 
+//======================================================================//
+//===================== setCalcGridVisibility() ========================//
+//======================================================================//
+
+export var SET_CALC_GRID_VISIBILITY = 'SET_CALC_GRID_VISIBILITY';
+
+//! @brief    Changes the current variable being calculated.
+export function setCalcGridVisibility(trueFalse) {
+
+	return (dispatch, getState) => {
+		console.log('setCalcGridVisibility() thunk called.');
+
+		dispatch({
+			type: SET_CALC_GRID_VISIBILITY,
+			trueFalse,
+		});
+	}
+}
+
+//======================================================================//
+//========================= toggleCategory() ===========================//
+//======================================================================//
+
+export var TOGGLE_CATEGORY = 'TOGGLE_CATEGORY';
+
+//! @brief    Toggles the visibility of a node in the calculator category tree view.
+export function toggleCategory(node, toggled) {
+
+	console.log('toggleCategory() action called.');
+	return (dispatch, getState) => {
+		console.log('toggleCategory() thunk called.');
+		dispatch({
+			type: TOGGLE_CATEGORY,
+			node: node,
+			toggled: toggled,		
+		});
+	}
+}
+
 //======================================================================//
 //========================= setSearchTerm() ============================//
 //======================================================================//
@@ -72,7 +111,8 @@ export function setSearchTerm(searchTerm) {
 
 export var OPEN_CALC = 'OPEN_CALC';
 
-//! @brief    Changes the current variable being calculated.
+//! @brief    Opens a new calculator, the type being specified by calcId.
+//! @details  Also closes the calc grid view (so you can start using the calculator straight away).
 export function openCalc(calcId) {
 
 	return (dispatch, getState) => {
@@ -82,6 +122,13 @@ export function openCalc(calcId) {
 			type: OPEN_CALC,
 			calcId,
 		});
+
+		dispatch({
+			type: SET_CALC_GRID_VISIBILITY,
+			false,
+		});
+
+
 	}
 }
 

diff --git a/app/app.html b/app/app.html
@@ -2,10 +2,9 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>Electron Boilerplate</title>
+    <title>NinjaCalc</title>
 
 
-
     <script src="vendor/electron_boilerplate/env_config.js"></script>
     <script src="vendor/electron_boilerplate/context_menu.js"></script>
     <script src="vendor/electron_boilerplate/external_links.js"></script>
@@ -25,7 +24,7 @@ <h1 id="greet"></h1>
         </p>
     </div>-->
 
-    <div id="content"></div>
+    <div id="content" class="full-height full-width"></div>
     <script type="text/javascript">
         // This is that all javascript running in the renderer process can get access to the
         // root path of the application (not process.cwd(), this returns the NinjaCalc folder).
@@ -41,6 +40,8 @@ <h1 id="greet"></h1>
     <link rel="stylesheet" href="./node_modules/react-select/dist/react-select.css">
     <link rel="stylesheet" href="./node_modules/react-dropdown/style.css">
 
+    <link href="./utility/react-bootstrap-treeview/react-bootstrap-treeview.css" rel="stylesheet">
+
 
 
     <!-- Make sure to add this CSS last, so to override any 3rd party ones -->