Rjose/merge v3

.gitignore

@@ -13,4 +13,6 @@ apps/examples/static/forthic/*
 .vscode
 .coverage
 forthic.egg-info
-build
+build
+.tox
+tmp

Makefile

@@ -3,8 +3,7 @@ SHELL := /bin/bash
 .PHONY: install-forthic test test-js credentials-server examples docs
 
 example-server: install-forthic
-	pushd apps/examples && ln -sf ../../../../forthic-js . && popd
-	source myenv/bin/activate && cd apps/examples && FLASK_APP=run.py FLASK_ENV=development flask run --port=8000
+	source myenv/bin/activate && cd server && FLASK_APP=run.py FLASK_DEBUG=true flask run --port=8000
 
 myenv:
 	python3 -m venv myenv
@@ -21,13 +20,21 @@ test: myenv
 qa: myenv
 	source myenv/bin/activate && pip install tox && tox -eqa
 
+# NOTE: The Forthic JS code has been deprecated. Please use Forthic React for client side work
 test-js:
 	@echo
-	@echo "JS tests"
+	@echo "Forthic JS tests"
 	@echo "============"
 	node --experimental-modules ./tests/tests_js/test_all.mjs
 
-test-all: test test-js
+test-react:
+	@echo
+	@echo "Forthic React tests"
+	@echo "============"
+	cd forthic-react/v1 && npm install && CI=1 npm run test
+
+
+test-all: test test-react
 
 credentials-server:
 	FLASK_APP=apps/setup/run.py flask run --port=8000

README.md

@@ -19,16 +19,9 @@ This will create a Python virtual environment, install Forthic into it, and run
 web server on port 8000 that can run some sample applications.
 
 ## Examples
-The Forthic examples run as web apps. The urls for each sample app have the same structure, which matches the directory structure:
-```
-http://localhost:8000/examples/<example>
-```
-For instance, to see the `ex_cache` example, go to:
-```
-http://localhost:8000/examples/ex_cache
-```
+The Forthic examples run as web apps. To see a list of the examples run the server using `make` and then go here: [http://localhost:8000](http://localhost:8000)
 
-See [EXAMPLES.md](docs/EXAMPLES.md) for more info about each example.
+See [EXAMPLES.md](docs/EXAMPLES.md) for more info.
 
 
 ## Tests