Correct index file and add a favicon. increment version
--- 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.<br>
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)
--- 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",
Binary file client/public/favicon.ico has changed
--- 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 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
- <!--
- manifest.json provides metadata used when your web app is added to the
- homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
- -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
- <!--
- Notice the use of %PUBLIC_URL% in the tags above.
- It will be replaced with the URL of the `public` folder during the build.
- Only files inside the `public` folder can be referenced from the HTML.
-
- Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
- work correctly both with client-side routing and a non-root public URL.
- Learn how to configure a non-root public URL by running `npm run build`.
- -->
- <title>React App</title>
+ <title>IRINOTES</title>
</head>
<body>
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<div id="root"></div>
- <!--
- This HTML file is a template.
- If you open it directly in the browser, you will see an empty page.
-
- You can add webfonts, meta tags, or analytics to this file.
- The build step will place the bundled scripts into the <body> tag.
-
- To begin the development, run `npm start` or `yarn start`.
- To create a production bundle, use `npm run build` or `yarn build`.
- -->
</body>
</html>
--- 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:
--- /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)
--- 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]))
###
--- 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)