diff --git a/README.md b/README.md index ada482e..2fc5364 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ `$./setup.sh` creates the virtual env, installs python and node module dependencies. -### running -`$yarn start` opens the browser pointing to the frontend of the blog, it also starts the blog api server. +### Running +`$./run.sh` opens the browser pointing to the frontend of the blog, it also starts the blog's api server. The request with prefix `/api` are forwarded to the api server by the frondtend. diff --git a/requirements.txt b/requirements.txt index 49d9985..9f11b9d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,20 @@ +aniso8601==1.2.1 click==6.7 Flask==0.12.2 Flask-FlatPages==0.6 Flask-Restless==0.17.0 +flask-restplus==0.10.1 Flask-SQLAlchemy==2.2 +functools32==3.2.3.post2 itsdangerous==0.24 Jinja2==2.9.6 +jsonschema==2.6.0 Markdown==2.6.8 MarkupSafe==1.0 mimerender==0.6.0 python-dateutil==2.6.1 python-mimeparse==1.6.0 +pytz==2017.2 PyYAML==3.12 six==1.10.0 SQLAlchemy==1.1.13 diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..ecc0ae5 --- /dev/null +++ b/run.sh @@ -0,0 +1,2 @@ +. env/bin/activate +yarn start diff --git a/setup.sh b/setup.sh index 267568b..0f0b1d4 100755 --- a/setup.sh +++ b/setup.sh @@ -7,7 +7,7 @@ ## Instalation ## Create a virtualenv, and activate this: -virtualenv env +virtualenv --python python2 env source env/bin/activate pip install -r requirements.txt yarn install