Commit 568c92b1 authored by Romain Loth's avatar Romain Loth

Rename our server-side "graphExplorer" app to "graph", in order to prevent...

Rename our server-side "graphExplorer" app to "graph", in order to prevent confusion with client-side tina-based graphExplorer from static/lib
parent 5ba83ead
...@@ -54,7 +54,7 @@ INSTALLED_APPS = [ ...@@ -54,7 +54,7 @@ INSTALLED_APPS = [
'rest_framework', 'rest_framework',
'djcelery', 'djcelery',
'annotations', 'annotations',
'graphExplorer', 'graph',
'moissonneurs', 'moissonneurs',
] ]
...@@ -164,6 +164,3 @@ USE_I18N = True ...@@ -164,6 +164,3 @@ USE_I18N = True
USE_L10N = True USE_L10N = True
USE_TZ = True USE_TZ = True
...@@ -21,9 +21,8 @@ import gargantext.views.pages.urls ...@@ -21,9 +21,8 @@ import gargantext.views.pages.urls
from annotations import urls as annotations_urls from annotations import urls as annotations_urls
from annotations.views import main as annotations_main_view from annotations.views import main as annotations_main_view
# Module "Graph Explorer" # Module for graph service
#from graphExplorer import urls as graphExplorer_urls import graph.urls
import graphExplorer.urls
# Module Scrapers # Module Scrapers
import moissonneurs.urls import moissonneurs.urls
...@@ -35,8 +34,8 @@ urlpatterns = [ url(r'^admin/' , admin.site.urls ) ...@@ -35,8 +34,8 @@ urlpatterns = [ url(r'^admin/' , admin.site.urls )
, url(r'^favicon.ico$', Redirect.as_view( url=static.url('favicon.ico') , url(r'^favicon.ico$', Redirect.as_view( url=static.url('favicon.ico')
, permanent=False), name="favicon") , permanent=False), name="favicon")
# Module "Graph Explorer" # Module Graph
, url(r'^' , include( graphExplorer.urls ) ) , url(r'^' , include( graph.urls ) )
# Module Annotation # Module Annotation
# tempo: unchanged doc-annotations routes -- # tempo: unchanged doc-annotations routes --
......
...@@ -4,7 +4,7 @@ from . import nodes ...@@ -4,7 +4,7 @@ from . import nodes
from . import metrics from . import metrics
from . import ngramlists from . import ngramlists
from . import analytics from . import analytics
from graphExplorer.rest import Graph from graph.rest import Graph
urlpatterns = [ url(r'^nodes$' , nodes.NodeListResource.as_view() ) urlpatterns = [ url(r'^nodes$' , nodes.NodeListResource.as_view() )
, url(r'^nodes/(\d+)$' , nodes.NodeResource.as_view() ) , url(r'^nodes/(\d+)$' , nodes.NodeResource.as_view() )
......
...@@ -2,7 +2,7 @@ from gargantext.models import Node, NodeNgram, NodeNgramNgram, \ ...@@ -2,7 +2,7 @@ from gargantext.models import Node, NodeNgram, NodeNgramNgram, \
NodeHyperdata NodeHyperdata
from gargantext.util.db import session, aliased from gargantext.util.db import session, aliased
from graphExplorer.louvain import best_partition from graph.louvain import best_partition
from copy import copy from copy import copy
from collections import defaultdict from collections import defaultdict
......
...@@ -5,9 +5,9 @@ from gargantext.util.http import JsonHttpResponse ...@@ -5,9 +5,9 @@ from gargantext.util.http import JsonHttpResponse
from gargantext.models import Node, Ngram, NodeNgram, NodeNgramNgram from gargantext.models import Node, Ngram, NodeNgram, NodeNgramNgram
#from gargantext.util.toolchain.ngram_coocs import compute_coocs #from gargantext.util.toolchain.ngram_coocs import compute_coocs
from graphExplorer.cooccurrences import countCooccurrences, filterMatrix from graph.cooccurrences import countCooccurrences, filterMatrix
from graphExplorer.distances import clusterByDistances from graph.distances import clusterByDistances
from graphExplorer.bridgeness import filterByBridgeness from graph.bridgeness import filterByBridgeness
# Prelude lib # Prelude lib
from copy import copy, deepcopy from copy import copy, deepcopy
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
from gargantext.util.db import session from gargantext.util.db import session
from gargantext.models.nodes import Node from gargantext.models.nodes import Node
from graphExplorer.graph import get_graph from graph.graph import get_graph
from gargantext.util.http import APIView, APIException\ from gargantext.util.http import APIView, APIException\
, JsonHttpResponse, requires_auth , JsonHttpResponse, requires_auth
......
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
# Module "Graph Explorer" # Module "Graph Explorer"
from graphExplorer.rest import Graph from graph.rest import Graph
from graphExplorer.views import explorer, myGraphs from graph.views import explorer, myGraphs
from graphExplorer.intersection import intersection from graph.intersection import intersection
# TODO : factor urls # TODO : factor urls
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment