merge and #845

storyInfo common is extracted.
mediacloud · Jul 19, 2018 · be8dfcf · be8dfcf
1 parent 6020bea
commit be8dfcf
Show file tree

Hide file tree

Showing 109 changed files with 1,217 additions and 257 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:5000",
+            "webRoot": "${workspaceFolder}/src"
+        }
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "search.exclude": {
+        "server/static/gen": true,
+      },
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,6 +38,8 @@
     "moment": "2.19.3",
     "nightmare-inline-download": "^0.2.2",
     "prop-types": "15.6.1",
+    "raven-for-redux": "^1.3.1",
+    "raven-js": "^3.26.3",
     "react": "16.3.2",
     "react-async-script": "0.9.1",
     "react-color": "^2.13.0",

diff --git a/server/__init__.py b/server/__init__.py
@@ -104,9 +104,10 @@ def create_app():
     my_app.config['MAX_CONTENT_LENGTH'] = 1 * 1024 * 1024  # 1MB
     my_app.config['UPLOAD_FOLDER'] = tempfile.gettempdir()
     # Set up sentry logging
+    my_app.config['SENTRY_USER_ATTRS'] = ['email']
     try:
         sentry_dsn = config.get('SENTRY_DSN')
-        Sentry(my_app, dsn=sentry_dsn)
+        Sentry(my_app, dsn=sentry_dsn, name=server_app)
     except ConfigException as e:
         logger.warn(e)
     # set up webpack
@@ -157,6 +158,8 @@ def create_app():
     my_app.session_interface = RedisSessionInterface(redis.StrictRedis.from_url(config.get('SESSION_REDIS_URL')))
     return my_app
 
+
+server_app = config.get('SERVER_APP')
 app = create_app()
 app.secret_key = config.get('SECRET_KEY')
 
@@ -181,7 +184,6 @@ def index():
 import server.views.sources.search
 import server.views.notebook.management
 import server.views.metadata
-server_app = config.get('SERVER_APP')
 if (server_app == SERVER_APP_SOURCES) or is_dev_mode():
     import server.views.sources.collection
     import server.views.sources.collectionedit

diff --git a/server/static/data/release_history.json b/server/static/data/release_history.json
@@ -1,5 +1,57 @@
 {
   "releases": [
+    {
+      "date": "2018-07-13",
+      "version": "v3.2.1",
+      "notes": [
+        {
+          "apps": [ "explorer" ],
+          "type": "Fix",
+          "note": "You can toggle between tabs in the Explorer Top Words results again."
+        },
+        {
+          "apps": [ "topics" ],
+          "type": "Fix",
+          "note": "The Topic Mapper homepage works again for logged-out users."
+        },
+        {
+          "apps": [ "topics" ],
+          "type": "Fix",
+          "note": "You can use the back button while created a new Topic."
+        }
+      ]
+    },
+    {
+      "date": "2018-07-05",
+      "version": "v3.2.0",
+      "notes": [
+        {
+          "apps": ["explorer"],
+          "type": "Feature",
+          "note": "Click a top word to see a 'Word Tree' showing how it is used in context."
+        },
+        {
+          "apps": ["explorer"],
+          "type": "Feature",
+          "note": "Renamed 'People & Places' to 'Representation'."
+        },
+        {
+          "apps": ["explorer", "topics"],
+          "type": "Feature",
+          "note": "Switch between 1k and 10k sample sizes for word clouds."
+        },
+        {
+          "apps": ["explorer"],
+          "type": "Feature",
+          "note": "Quickly choose from your starred sources & collections while picking media."
+        },
+        {
+          "apps": ["topics"],
+          "type": "Fix",
+          "note": "Links to source articles in Topic Mapper show up better."
+        }
+      ]
+    },
     {
       "date": "2018-06-21",
       "version": "v3.1.5",

diff --git a/server/static/gen/explorer/app_css.90f18887.css b/server/static/gen/explorer/app_css.90f18887.css
diff --git a/server/static/gen/explorer/app_css.90f18887.css.map b/server/static/gen/explorer/app_css.90f18887.css.map
diff --git a/server/static/gen/explorer/app_css.90f18887.js b/server/static/gen/explorer/app_css.90f18887.js
diff --git a/server/static/gen/explorer/app_css.90f18887.js.map b/server/static/gen/explorer/app_css.90f18887.js.map
diff --git a/server/static/gen/explorer/app_js.1aba8e1d.js b/server/static/gen/explorer/app_js.1aba8e1d.js
diff --git a/server/static/gen/explorer/app_js.1aba8e1d.js.map b/server/static/gen/explorer/app_js.1aba8e1d.js.map
diff --git a/server/static/gen/explorer/app_js.21797030.js b/server/static/gen/explorer/app_js.21797030.js
diff --git a/server/static/gen/explorer/app_js.21797030.js.map b/server/static/gen/explorer/app_js.21797030.js.map
diff --git a/server/static/gen/explorer/app_js.fd18d56d.js b/server/static/gen/explorer/app_js.fd18d56d.js
diff --git a/server/static/gen/explorer/app_js.fd18d56d.js.map b/server/static/gen/explorer/app_js.fd18d56d.js.map
diff --git a/server/static/gen/explorer/common_css.96badd4c.css b/server/static/gen/explorer/common_css.96badd4c.css
diff --git a/server/static/gen/explorer/common_css.96badd4c.css.map b/server/static/gen/explorer/common_css.96badd4c.css.map
diff --git a/server/static/gen/explorer/common_css.96badd4c.js b/server/static/gen/explorer/common_css.96badd4c.js
diff --git a/server/static/gen/explorer/common_css.96badd4c.js.map b/server/static/gen/explorer/common_css.96badd4c.js.map
diff --git a/server/static/gen/explorer/index.html b/server/static/gen/explorer/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset="UTF-8"><title>Webpack App</title><link href="/static/gen/explorer/app_css.5e4f5652.css" rel="stylesheet"><link href="/static/gen/explorer/common_css.c6a96d6a.css" rel="stylesheet"></head><body><script type="text/javascript" src="/static/gen/explorer/app_css.5e4f5652.js"></script><script type="text/javascript" src="/static/gen/explorer/common_css.c6a96d6a.js"></script><script type="text/javascript" src="/static/gen/explorer/app_js.051e5fd1.js"></script></body></html>
+<!DOCTYPE html><html><head><meta charset="UTF-8"><title>Webpack App</title><link href="/static/gen/explorer/app_css.90f18887.css" rel="stylesheet"><link href="/static/gen/explorer/common_css.96badd4c.css" rel="stylesheet"></head><body><script type="text/javascript" src="/static/gen/explorer/app_css.90f18887.js"></script><script type="text/javascript" src="/static/gen/explorer/common_css.96badd4c.js"></script><script type="text/javascript" src="/static/gen/explorer/app_js.21797030.js"></script></body></html>
diff --git a/server/static/gen/explorer/manifest.json b/server/static/gen/explorer/manifest.json
@@ -1 +1 @@
-{"assets":{"app_js.js":"app_js.051e5fd1.js","app_js.map":"app_js.051e5fd1.js.map","common_css.js":"common_css.c6a96d6a.js","common_css.css":"common_css.c6a96d6a.css","common_css.map":"common_css.c6a96d6a.css.map","app_css.js":"app_css.5e4f5652.js","app_css.css":"app_css.5e4f5652.css","app_css.map":"app_css.5e4f5652.css.map"},"publicPath":"/static/gen/explorer/"}
+{"assets":{"app_js.js":"app_js.21797030.js","app_js.map":"app_js.21797030.js.map","common_css.js":"common_css.96badd4c.js","common_css.css":"common_css.96badd4c.css","common_css.map":"common_css.96badd4c.css.map","app_css.js":"app_css.90f18887.js","app_css.css":"app_css.90f18887.css","app_css.map":"app_css.90f18887.css.map"},"publicPath":"/static/gen/explorer/"}