Resolve merge conflicts in example

Author: marcodlk

example/plugins/HelloWorld/__init__.py

@@ -1,22 +1,12 @@
 from dash.dependencies import Output, Input, State
 import dash_html_components as html
 import dash_core_components as dcc
-<<<<<<< HEAD
-import dash_building_blocks as dbb
-import json
 
-    
-class HelloWorld(dbb.Block):
-    
-    def layout(self):
-        return dcc.Graph(
-=======
 
 def initialize(app, data, fl):
 
     fl.register_vis('HelloWorld',
         dcc.Graph(
->>>>>>> master
             id='basic-chart',
             figure={
                 'data': [
@@ -28,7 +18,7 @@ def initialize(app, data, fl):
                         'name': 'Trace 1',
                         'mode': 'markers',
                         'marker': {'size': 12}
-                        },
+                    },
                     {
                         'x': [1, 2, 3, 4],
                         'y': [9, 4, 1, 4],
@@ -37,19 +27,14 @@ def initialize(app, data, fl):
                         'name': 'Trace 2',
                         'mode': 'markers',
                         'marker': {'size': 12}
-                        }
-                    ]
-                },
+                    }
+                ]
+            },
             config={
                 'autosizable': True
-                }
-            )
-            
-
-def initialize(app, data, fl):
-    
-    hello_world = HelloWorld(app, data)
-    fl.register_vis('HelloWorld', hello_world.layout)
+            }
+        )
+    )         
 
 
 def finalize(app, data, fl):

example/plugins/InputForm/__init__.py

@@ -3,34 +3,7 @@
 import dash_html_components as html
 import json
 
-<<<<<<< HEAD
-from dash.dependencies import Input, Output, State
-import dash_html_components as html
-import dash_core_components as dcc
-# from example_blocks import InputForm
-import dash_building_blocks as dbb
-import json
-    
-    
-class InputForm(dbb.Block):
-    
-    def layout(self):
-        return html.Div([
-            dcc.Input(id=self.register('input-1-state'), type='text', value=self.data['state']),
-            dcc.Input(id=self.register('input-2-state'), type='text', value=self.data['country']),
-            html.Button(id=self.register('submit-button'), n_clicks=0, children='Submit')
-        ])
 
-def initialize(app, data, fl):
-    
-    input_form = InputForm(app, data)
-    fl.register_vis('InputForm', input_form.layout)
-    fl.blocks.register('input-form', input_form)
-    
-    fl.register_data('output-form-n-clicks', { 'n_clicks': 0 })
-    fl.register_data('for-fun', { 'hi': 'hello' })
-    
-=======
 def initialize(app, data, fl):
 
     # finish line client side data api
@@ -46,19 +19,11 @@ def initialize(app, data, fl):
         ])
     )
 
+    
 def finalize(app, data, fl):
 
     # example callback that updates client side data
->>>>>>> master
     @app.callback(Output('output-form-n-clicks', 'children'),
                   [Input('submit-button', 'n_clicks')])
     def callback(n_clicks):
         return json.dumps({ 'n_clicks': n_clicks })
-<<<<<<< HEAD
-    
-    
-def finalize(app, data, fl):
-    pass
-=======
-
->>>>>>> master

example/plugins/OutputForm/__init__.py

@@ -1,55 +1,14 @@
 import dash_html_components as html
-<<<<<<< HEAD
-import dash_building_blocks as dbb
-    
-
-class OutputForm(dbb.Block):
-    
-    def layout(self):
-        return html.Div([
-            html.Div(id=self.register('output-state'))
-        ])
-    
-    def callbacks(self, input_n_clicks, state_input1, state_input2):
-        
-        @self.app.callback(
-            self.output('output-state', 'children'),
-            [input_n_clicks],
-            [state_input1, state_input2]
-        )
-        def update_output(n_clicks, input1, input2):
-            return u'''
-                The Button has been pressed {} times,
-                Input 1 is "{}",
-                and Input 2 is "{}"
-            '''.format(n_clicks, input1, input2) 
-            
-            
-def initialize(app, data, fl):
-            
-    output_form = OutputForm(app, data)
-    
-    fl.register_vis('OutputForm', output_form.layout)
-    fl.blocks.register('output-form', output_form)
-    
-=======
 from dash.dependencies import Input, Output, State
 
+
 def initialize(app, data, fl):
->>>>>>> master
 
     fl.register_vis('OutputForm', html.Div(id='output-state'))
 
+    
 def finalize(app, data, fl):
-<<<<<<< HEAD
-            
-    fl.blocks['output-form'].callbacks(
-        fl.blocks['input-form'].input('submit-button', 'n_clicks'),
-        fl.blocks['input-form'].state('input-1-state', 'value'),
-        fl.blocks['input-form'].state('input-2-state', 'value'),
-    )
-=======
-
+    
     @app.callback(Output('output-state', 'children'),
                   [Input('submit-button', 'n_clicks')],
                   [State('input-1-state', 'value'),
@@ -60,4 +19,3 @@ def update_output(n_clicks, input1, input2):
             Input 1 is "{}",
             and Input 2 is "{}"
         '''.format(n_clicks, input1, input2)
->>>>>>> master

example/plugins/RandomLayout/__init__.py

@@ -5,12 +5,8 @@
 import json
 from dash.exceptions import PreventUpdate
 
-def initialize(app, data, fl):
-<<<<<<< HEAD
-    
-=======
 
->>>>>>> master
+def initialize(app, data, fl):
     @app.callback(
         Output('default-fl-page-layout', 'layouts'),
         [Input('fun-button', 'n_clicks')],

example/server.py

@@ -1,5 +1,5 @@
-import sys
-sys.path.append('..')
+# import sys
+# sys.path.append('..')
 
 import dash
 from finishline import FinishLine
@@ -10,7 +10,10 @@
 
 data = { 'state': 'Montréal', 'country': "Canada" }
 
-fl = FinishLine(app=app, data=data, show_data=True, debug_path={'root':'/workspace/', 'target':'/jupyter/edit/'})
+fl = FinishLine(app=app, 
+                data=data, 
+                debug=True, 
+                debug_path={'root':'/workspace/', 'target':'/jupyter/edit/'})
 fl.load_plugins()
 app.layout = fl.generate_layout(layouts={
     'lg':[