React App

# HG changeset patch # User ymh # Date 1543628292 -3600 # Node ID 00cf90eb0f5ae76e0b400c1c52ed71e42c687da4 # Parent 7c745d8cb321d56d3eedc3d6ca1ae93ade9e229a Correct index file and add a favicon. increment version diff -r 7c745d8cb321 -r 00cf90eb0f5a client/README.md --- a/client/README.md Fri Nov 30 22:05:02 2018 +0100 +++ b/client/README.md Sat Dec 01 02:38:12 2018 +0100 @@ -3,6 +3,11 @@ Below you will find some information on how to perform common tasks.
You can find the most recent version of this guide [here](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md). +## Licences + +Code is under the [CeCILL C](http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html) licence +icon : https://creativecommons.org/licenses/by/3.0/ (https://dribbble.com/dewanto) + ## Table of Contents - [Updating to New Releases](#updating-to-new-releases) diff -r 7c745d8cb321 -r 00cf90eb0f5a client/package.json --- a/client/package.json Fri Nov 30 22:05:02 2018 +0100 +++ b/client/package.json Sat Dec 01 02:38:12 2018 +0100 @@ -1,8 +1,8 @@ { "name": "client", - "version": "0.1.0", + "version": "0.1.1", "private": true, - "homepage": "http://www.iri.centrepompidou.fr", + "homepage": "https://irinotes.iri-research.org", "dependencies": { "@types/react-modal": "^3.2.1", "@types/slate-html-serializer": "^0.6.2", diff -r 7c745d8cb321 -r 00cf90eb0f5a client/public/favicon.ico Binary file client/public/favicon.ico has changed diff -r 7c745d8cb321 -r 00cf90eb0f5a client/public/index.html --- a/client/public/index.html Fri Nov 30 22:05:02 2018 +0100 +++ b/client/public/index.html Sat Dec 01 02:38:12 2018 +0100 @@ -4,37 +4,14 @@ - - - React App + IRINOTES

- diff -r 7c745d8cb321 -r 00cf90eb0f5a deploy/deploy.yml --- a/deploy/deploy.yml Fri Nov 30 22:05:02 2018 +0100 +++ b/deploy/deploy.yml Sat Dec 01 02:38:12 2018 +0100 @@ -287,6 +287,12 @@ name: "file://{{backend_temp_folder.path}}/irinotes-{{backend_pkg_version}}.tar.gz" notify: restart irinotes backend service + - name: add the manage command + template: + src: "manage.j2" + dest: "{{backend_venv}}/bin/manage" + mode: 0755 + - name: irinotes migrate command: "{{backend_venv}}/bin/django-admin migrate --noinput" args: diff -r 7c745d8cb321 -r 00cf90eb0f5a deploy/templates/manage.j2 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deploy/templates/manage.j2 Sat Dec 01 02:38:12 2018 +0100 @@ -0,0 +1,23 @@ +#!{{backend_venv}}/bin/python3 +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("IRINOTES_CONFIG_BASE", "{{backend_config_base}}") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "irinotes.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff -r 7c745d8cb321 -r 00cf90eb0f5a src/irinotes/__init__.py --- a/src/irinotes/__init__.py Fri Nov 30 22:05:02 2018 +0100 +++ b/src/irinotes/__init__.py Sat Dec 01 02:38:12 2018 +0100 @@ -1,4 +1,4 @@ -VERSION = (0, 1, 0, 'final', 0) +VERSION = (0, 1, 1, 'final', 0) VERSION_STR = ".".join(map(lambda i:"%02d" % (i,), VERSION[:2])) ### diff -r 7c745d8cb321 -r 00cf90eb0f5a src/setup.py --- a/src/setup.py Fri Nov 30 22:05:02 2018 +0100 +++ b/src/setup.py Sat Dec 01 02:38:12 2018 +0100 @@ -61,8 +61,8 @@ with os.fdopen(fh,'w') as temp_file: with open(filepath, 'r') as initfiles: for l in initfiles: - if re.match(r"\s*VERSION\s*=\s*\(\d+\s*,\s*\d+\s*,\s*\d+,\s*\".+\",\s*.+\s*\)", l): - temp_file.write("VERSION = %r" % (self.version_tuple,)) + if re.match(r"\s*VERSION\s*=\s*\(\d+\s*,\s*\d+\s*,\s*\d+,\s*[\"\'].+[\"\'],\s*.+\s*\)", l): + temp_file.write("VERSION = %r\n" % (self.version_tuple,)) else: temp_file.write(l) os.remove(filepath)