X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=README;h=cae4a2873aaef926592038b96f56eb5f4c757b3c;hb=refs%2Fheads%2Fdemo;hp=cadc88d2f3e319b7735eab60be9ed1cba18edf9f;hpb=43ee08c820533a61c01f1e9ee51e0452aadd7aa9;p=unfold.git diff --git a/README b/README index cadc88d2..cae4a287 100644 --- a/README +++ b/README @@ -1,27 +1,36 @@ This file documents the contents of this module +Last update 4 sept. 2013 + See the devel/ subdir for more devel-oriented doc. ==================== 1 minute howto -* REQUIREMENTS is to have python + django installed django +* REQUIREMENTS is to have python + django (1.5.2) installed django ** should be straightforward ** see devel/django-install.txt in case of trouble -* git clone git://git.onelab.eu/myslice-django.git +* git clone git://git.onelab.eu/myslice.git -- or -- -* git clone ssh://yourlogin@git.onelab.eu/git/myslice-django.git - -* edit myslice/settings.py and -** change the location of your backend API (not yet supported) +* git clone ssh://yourlogin@git.onelab.eu/git/myslice.git * edit myslice/config.py and enter the details of your manifold backend * init django -$ manage.py syncdb +$ ./manage.py syncdb +$ ./manage.py migrate * gather static files -$ ./manage.py collectstatic (formerly, we used make static, which is deprecated) +$ ./manage.py collectstatic +-- or -- +$ ./manage.py collectstatic --noinput +-- or -- +$ make static (which is a shorthand for cleaning up and run manage collectstatic --noinput) + +* gather templates files + for now we still seem to rely on a make-based templates-collection process + that creates templates/ +$ make templates [$ make redo (each time when you pull, do that and restart the server)] * run a local server: $ manage.py runserver 0.0.0.0:8000 @@ -32,20 +41,22 @@ when you just need to hit ^C yourself when your static files need to be refreshe * use it from your browser (See more notes on using the development server below) -* install dependencies +* install dependencies $ pip install -r path/to/requirements/file.txt +Note. not quite sure what this is about, I could not spot this file.. ==================== Status *** Authentication *** -Although there still are a few hard-coded accounts in the system, you -will only be able to see some static views and won't be able to send -real queries if you use these, so you'd better use a real account (one -that your manifold backend knows about). +Should be mostly fine +Not quite sure if/how the user gets proper notifications when +. his session has expired (i.e. his frontend is not logged into the backend any longer) +. his credentials have expired (i.e. the uploaded credentials, e.g. SFA delegated cred) + expired and she needs to run e.g. sfi myslice again + +Hard-coded accounts (from a very early stage) are gone -For logging out: click on 'logged as *jean*', this shows a -confirmation page for logging out. this is intended to be temporary. *** Packaging *** @@ -56,35 +67,9 @@ It seems like our app won't work on f14 as is because Django is only 1.3.1 on f1 Plan is to target f18 but I lack a test machine. Also of course I'll try to tackle debian/ubunti at some point. -*** Features *** - -We have a basic model for asynchroneous queries (referring to manifold -queries) and for plugins (in the most general sense a plugin is just a -piece of the output that may be connected to a query) - -Right now the UI has a handful of demo views only; as of this writing -only the list of slices actually comes from the manifold backend in an -asynchroneous way. - -Also all the views are gathered in the trash/ locations for now, being -that they're only for assessment purposes. - -* dahsboard : has one async. query and 2 plugins that share that - query; the intent was to demo a different layout in both cases, - although the datatables one won't work yet at this point. +There also is a working packaging for debian(s) and ubuntu(s) that we use +on an almost daily basis to upgrade manifold.pl.sophia.inria.fr -* the 'Plugin' view demonstrates most of the available plugins. - -* slice view : only demonstrates how to use URLs to pass arguments along - -* scroll view : mostly it only illustrates that some pages can be made - public (no need to login) - -* tab view : a hand-made tab widget - -Not much effort has yet been put into coming up with a nice layout, -feel free to tweak that but it's probably still way too early for -this. ==================== @@ -94,35 +79,46 @@ Third party tools shipped: * datatables * spin * bootstrap -* and others are added as we build the system when they become needed -I've tried to keep track of the version I picked and to have an easy upgrade path. +Others are added as we build the system when they become needed +Look in third-party/ for a more detailed list + +As a rule of thumb, please try to keep in mind that these will need to +be upgraded over time I've tried to keep track of the version I picked +and to have an easy upgrade path (depending on the way the original +package is published) ==================== Contents: 1st level subdirs ========== code from git -* myslice: + +* myslice/ this is the django 'project', where to look for . settings.py . urls.py -* manifold: +* manifold/ the code for dealing with queries, sending them to the backend, and offering the /manifold/proxy/ URL -* unfold: +* unfold/ the code for building / rendering plugins -* plugins: +* plugins/ the actual code for plugins -* auth: +* auth/ a django 'app' that deals with authentication; see especially auth.backend.MyCustomBackend for how to use a separate authentication system, as well as settings.py for how to enable it +* portal/ + this is where the first implementation of myslice, with complete + user-management including registration, is taking place + * trash/ - rough/preliminary views in here - as the name suggests this is temporary + rough/preliminary scaffolding views are in here + as the name suggests this is temporary * views/ will receive actual views over time @@ -141,11 +137,10 @@ I've tried to keep track of the version I picked and to have an easy upgrade pat ========== automatically generated -* all-static: (generated, no need to source-control) - this is where 'make static' will gather all your static contents if you run a local server - make has convenience targets to refresh this area - $ make static - $ make clean-static +* static/: (generated by collectstatic, see above, do not source-control) + $ manage.py [ --noinput ] collectstatic + +* templates/ * myslice.sqlite3 this is where django stores its own stuff, as per settings.py @@ -158,78 +153,106 @@ I've tried to keep track of the version I picked and to have an easy upgrade pat . second, when you do use it for developement purposes, please be aware that: -.. the recommended layout for the various files and pieces (py, html, js and css) with django is - IMHO really painful; we *SHOULD* use e.g. - plugins/simplelist.py, - plugins/templates/plugins.html, - plugins/static/js/simplelist.js - plugins/static/css/simplelist.css - which I have tried doing for a while but I found mmyself just hopping around in the file tree all - day long, wasting cycles all along - -.. as that does not make sense IMHO, I've rewritten the tool for gathering these pieces (this is in - the Makefile). Bottom line is we can essentially store this wherever we want. - The only restriction being that if you have a template that is *not* html, then it *has to* sit - in a templates/ directory, otherwise it gets shipped as a static file. - -.. as a result, we can now store all the files building a plugin in a single (git) directory; like e.g. - plugins/quickfilter/quickfilter.py - plugins/quickfilter/quickfilter.html - plugins/quickfilter/quickfilter.js - plugins/quickfilter/quickfilter.css +NOTE. this whole business is being changed +basically we come back to the way django has it by default... + +==changing== .. the recommended layout for the various files and pieces (py, html, js and css) with django is +==changing== IMHO really painful; we *SHOULD* use e.g. +==changing== plugins/quickfilter/quickfilter.py, +==changing== plugins/quickfilter/templates/quickfilter.html, +==changing== plugins/quickfilter/static/js/quickfilter.js +==changing== plugins/quickfilter/static/css/quickfilter.css +==changing== which I have tried doing for a while but I found myself just hopping around in the file tree all +==changing== day long, wasting cycles big time +==changing== +==changing== .. as that does not make sense IMHO, I've rewritten the tool for gathering these pieces (this is in +==changing== the Makefile). Bottom line is we can essentially store this wherever we want. +==changing== The only restriction being that if you have a template that is *not* html, then it *has to* sit +==changing== in a templates/ directory, otherwise it gets shipped as a static file. +==changing== +==changing== .. as a result, we can now store all the files building a plugin in a single (git) directory; like e.g. +==changing== plugins/quickfilter/quickfilter.py +==changing== plugins/quickfilter/quickfilter.html +==changing== plugins/quickfilter/quickfilter.js +==changing== plugins/quickfilter/quickfilter.css +==changing== +==changing== Of course it's a completely different matter once the service is packaged and installed, these +==changing== files of course get properly separated. +==changing== +==changing== .. as a result it is a little bit less convenient to use the development server when you change the +==changing== layout of your static and template files, you might need to re-run 'make static', so it is +==changing== recommended to use devel/server-loop.sh instead +==changing== +==changing== +==changing== All this being said, here are our current conventions for storing templates and static files +==changing== +==changing== * templates: +==changing== we store this under templates/ within the corresponding app, e.g. +==changing== auth/templates/login.html +==changing== for now this is mostly about html, but the engine can be used for rendering anything +==changing== including js(on) or whatever (in which case, as stated above, this *must* have /templates/ in its path. +==changing== +==changing== * static files: +==changing== we chose to have all static files (images, but also javascript and stylesheets) in the various +==changing== proj or app where they belong, with a layout like: +==changing== where-it-belongs/ +==changing== img/ +==changing== css/ +==changing== js/ +==changing== Honestly it's not yet very clear sometimes what 'where-it-belongs' should be sometimes, and it +==changing== does not matter too much anyway, given that the code doesn't need to change when we move things +==changing== around. So in particular it's fuzzy between myslice/ (where the logo could fit e.g.) views/ and +==changing== even trash/ +==changing== +==changing== Makefile has a few convenience targets to list all kinds of stuff; the 2 major targets are +==changing== +==changing== $ make static templates +==changing== +==changing== that would reset static/ and templates/ for you from the other contents +==changing== +==changing== * third-party +==changing== please note that the set of files that actually get exposed in all-static from third-party is +==changing== hand-coded in Makefile because we tried to preserve the original codebase layout from mainstream, +==changing== and there's only so much in common between 2 differents js libraries at this point. +==changing== - Of course it's a completely different matter once the service is packaged and installed, these - files of course get properly separated. -.. as a result it is a little bit less convenient to use the development server when you change the - layout of your static and template files, you might need to re-run 'make static', so it is - recommended to use devel/server-loop.sh instead +======== update django database to reflect changes in existing models without any migration system (e.g., south) ========= +# older version +$python manage.py reset -All this being said, here are our current conventions for storing templates and static files +#Django 1.5.1 or later +$python manage.py flush -* templates: - we store this under templates/ within the corresponding app, e.g. - auth/templates/login.html - for now this is mostly about html, but the engine can be used for rendering anything - including js(on) or whatever (in which case, as stated above, this *must* have /templates/ in its path. +This will update the database tables for your app, but will completely destroy any data that existed in those tables. +If the changes you made to your app model do not break your old schema (for instance, you added a new, optional field) +you can simply dump the data before and reload it afterwards, like so: -* static files: - we chose to have all static files (images, but also javascript and stylesheets) in the various - proj or app where they belong, with a layout like: - where-it-belongs/ - img/ - css/ - js/ - Honestly it's not yet very clear sometimes what 'where-it-belongs' should be sometimes, and it - does not matter too much anyway, given that the code doesn't need to change when we move things - around. So in particular it's fuzzy between myslice/ (where the logo could fit e.g.) views/ and - even trash/ +$python manage.py syncdb +$python manage.py dumpdata > temp_data.json +$python manage.py flush +$python manage.py loaddata temp_data.json -Makefile has a few convenience targets to list all kinds of stuff; the 2 major targets are +If your changes break your old schema this won't work - in which case tools like south or django evolution are great. -$ make static templates +======== update django database to reflect changes in existing models with migration system (e.g., south) ========= -that would reset all-static/ and all-templates/ for you from the other contents +As south is already installed , you just have to do: -* third-party - please note that the set of files that actually get exposed in all-static from third-party is - hand-coded in Makefile because we tried to preserve the original codebase layout from mainstream, - and there's only so much in common between 2 differents js libraries at this point. +$./manage.py migrate +if it fails: +1. go to myslice directory +2. do sqlite3 myslice.sqlite3 [if sqlite3: command not found, do $apt-get install sqlite3] +3. check the list of tables with sqlite> .tables +4. if you find those tables that was mentioned in the failure message while running $./manage.py migrate + do sqlite> DROP TABLE mentioned_table + [mentioned_table = the tables that was explicity mentioned in the failure message of $./manage.py migrate] +5. sqlite> .quit +6. $./manage.py migrate -======== update django database to reflect changes in existing models without any migration system (e.g., south) ========= -$python manage.py reset -This will update the database tables for your app, but will completely destroy any data that existed in those tables. -If the changes you made to your app model do not break your old schema (for instance, you added a new, optional field) -you can simply dump the data before and reload it afterwards, like so: - -$python manage.py dumpdata > temp_data.json -$python manage.py reset -$python manage.py loaddata temp_data.json - -If your changes break your old schema this won't work - in which case tools like south or django evolution are great.