Merge branch 'release/v0.1.0'

Author: metamarcdw

.gitignore

@@ -4,5 +4,5 @@ db.sqlite3
 __javascript__/
 node_modules/
 .pytest_cache/
-prod_secret.txt
+prod_secrets.json
 server.egg-info/

.travis.yml

@@ -4,6 +4,10 @@ python:
 install:
  - pip install -r requirements.txt
  - pip install -e src
- - echo "travis" > src/server/prod_secret.txt
+ - cp src/server/mock_secrets.json src/server/prod_secrets.json
 script:
  - pytest
+branches:
+ only:
+ - master
+ - develop

README.md

@@ -1,20 +1,20 @@
-[![Build Status](https://travis-ci.org/metamarcdw/python-fullstack-transcrypt.svg?branch=master)](https://travis-ci.org/metamarcdw/python-fullstack-transcrypt)
+[![Build Status](https://travis-ci.org/metamarcdw/python-fullstack-transcrypt.svg?branch=develop)](https://travis-ci.org/metamarcdw/python-fullstack-transcrypt)
 
 ## Example of React and Redux with Python using Transcrypt and Component.py
 ### Also uses Flask-RESTPlus backend with SQLAlchemy and JWT-Extended
 
 First install Python>=3.6/pip, NodeJS/npm>=5.2, and Git: 
 `sudo pacman -S python-pip npm git` 
 Next, clone the repo 
-`git clone https://github.com/metamarcdw/react-redux-transcrypt` 
+`git clone https://github.com/metamarcdw/python-fullstack-transcrypt` 
 Set up your React/Transcrypt environment: 
 (Use of a virtual environment is recommended but not required) 
 ```
 mkvirtualenv transcrypt
 pip install git+https://github.com/qquick/transcrypt@master#egg=transcrypt
 pip install git+https://github.com/metamarcdw/Component.py@master#egg=Component_py
 
-cd react-redux-transcrypt/
+cd python-fullstack-transcrypt/
 npm install
 npm install -g babel-cli # If running Windows
 ```

dist/bundle.js

@@ -1,6 +1,6 @@
 {
- "name": "react-transcrypt",
- "version": "1.0.0",
+ "name": "python-fullstack-transcrypt",
+ "version": "v0.1.0",
  "description": "",
  "main": "src/__javascript__/bundle.js",
  "scripts": {
@@ -12,6 +12,7 @@
 
  "api": "FLASK_APP=server TODOS_FS_MODE=development flask run",
  "apiwin": "set FLASK_APP=server&& set TODOS_FS_MODE=development&& flask run",
+ "apiinit": "pip install -r requirements.txt",
  "apiinstall": "pip install -e src",
  "apitest": "pytest"
  },

package.json

@@ -18,6 +18,7 @@ lazy-object-proxy==1.3.1
 MarkupSafe==1.0
 mccabe==0.6.1
 more-itertools==4.2.0
+mysqlclient==1.3.13
 pluggy==0.6.0
 py==1.5.3
 pycodestyle==2.4.0

requirements.txt

@@ -6,8 +6,8 @@
 from containers.TodoListContainer import TodoListContainer
 
 React = require("react")
-Row, Col, Jumbotron = destruct(
- require("reactstrap"), "Row", "Col", "Jumbotron")
+Form, Row, Col, Jumbotron = destruct(
+ require("reactstrap"), "Form", "Row", "Col", "Jumbotron")
 
 
 def App(props):
@@ -19,12 +19,20 @@ def render_login_panel():
  </div>
  ); """)
 
+ def on_submit(e):
+ e.preventDefault()
+
  def render_todo_panel():
  return __pragma__("xtrans", None, "{}", """ (
  <div>
  <TodoListContainer />
- <FormPanelContainer />
- <ButtonPanelContainer />
+ <Form
+ className="padding"
+ onSubmit={on_submit}
+ >
+ <FormPanelContainer />
+ <ButtonPanelContainer />
+ </Form>
  </div>
  ); """)
 

src/components/App.py

@@ -27,6 +27,7 @@ def on_click_logout():
  className="fixed-height"
  onClick={on_click_add}
  color="success"
+ type="submit"
  >Add Todo</Button>
  <Button
  className="fixed-height"

src/components/ButtonPanel.py

@@ -2,23 +2,21 @@
 from Component_py.component import destruct
 
 React = require("react")
-Form, FormGroup, Label, Input = destruct(
- require("reactstrap"), "Form", "FormGroup", "Label", "Input")
+FormGroup, Label, Input = destruct(
+ require("reactstrap"), "FormGroup", "Label", "Input")
 
 
 def FormPanel(props):
  def on_text_change(e):
  props.form_panel_update(e.target.value)
 
  return __pragma__("xtrans", None, "{}", """ (
- <Form className="padding">
- <FormGroup>
- <Label for="text_input">Enter new todo text:</Label>
- <Input
- onChange={on_text_change}
- value={props.form_panel.text}
- id="text_input"
- placeholder="What to do?" />
- </FormGroup>
- </Form>
+ <FormGroup>
+ <Label for="text_input">Enter new todo text:</Label>
+ <Input
+ onChange={on_text_change}
+ value={props.form_panel.text}
+ id="text_input"
+ placeholder="What to do?" />
+ </FormGroup>
  ); """)

src/components/FormPanel.py

@@ -1,4 +1,4 @@
-from Component_py.stubs import require, __pragma__ # __:skip
+from Component_py.stubs import require, __pragma__, window # __:skip
 from Component_py.component import Component, destruct
 
 React = require("react")
@@ -23,7 +23,14 @@ def closure():
 
  def on_click_delete(self, todo):
  token = self.props.login_user["token"]
- return lambda: self.props.delete_todo(todo["id"], token)
+
+ def closure():
+ should_delete = True
+ if not todo["complete"] and not window.confirm("Delete incomplete Todo?"):
+ should_delete = False
+ if should_delete:
+ self.props.delete_todo(todo["id"], token)
+ return closure
 
  def render_spinner(self):
  loading = True
@@ -61,6 +68,7 @@ def render_list_item(self, todo):
  className="fixed-height margin"
  color="primary"
  onClick={self.on_click_complete(todo)}
+ disabled={todo.complete}
  >Complete</Button>
  <Button
  className="fixed-height"