Fix nginx configuration; add Web fonts

TODO.txt

@@ -14,7 +14,9 @@ Web interface:
 - [ ] Link to the JSON-LD version of the current page
 - [ ] Add a page listing languages
 - [ ] Add a page per language
-- [ ] Serve some Noto web fonts (not CJK ones though)
+- [x] API root should link to docs
+- [x] Serve some Noto web fonts (not CJK ones though)
+- [x] Handle MemoryErrors
 
 ConceptNet 5.6 perhaps:
 

web/Dockerfile

@@ -24,6 +24,7 @@ COPY server/nginx.conf /etc/nginx/conf.d/
 COPY server/uwsgi.ini /etc/uwsgi/
 
 COPY server/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+RUN rm /etc/nginx/sites-enabled/default
 
 ## End of tiangolo/uwsgi-nginx-docker
 

web/conceptnet_web/api.py

@@ -91,7 +91,8 @@ def see_documentation():
     This function redirects to the api documentation
     """
     return jsonify({
-        '@context': responses.CONTEXT
+        '@context': responses.CONTEXT,
+        'rdfs:comment': 'See http://www.conceptnet.io for more information about ConceptNet, and http://api.conceptnet.io/docs for the API documentation.'
     })
 
 
@@ -107,6 +108,7 @@ def query_top_related(uri):
 
 
 @app.errorhandler(IOError)
+@app.errorhandler(MemoryError)
 def error_data_unavailable(e):
     return render_error(503, str(e))
 

web/conceptnet_web/json_rendering.py

@@ -14,7 +14,7 @@ def request_wants_json():
     """
     best = flask.request.accept_mimetypes \
         .best_match(['application/ld+json', 'application/json', 'text/html'])
-    return 'json' in best
+    return (best is not None) and ('json' in best)
 
 
 def regex_replacement_stack(replacements):

web/conceptnet_web/web.py

@@ -141,6 +141,7 @@ def edge_list_query(criteria, offset=0, limit=50):
 
 
 @app.errorhandler(IOError)
+@app.errorhandler(MemoryError)
 def error_data_unavailable(e):
     return render_error(503, str(e))
 

web/server/nginx.conf

@@ -2,7 +2,8 @@ uwsgi_cache_path /data/nginx/cache levels=1:2 keys_zone=STATIC:1024m max_size=10
 uwsgi_temp_path /data/nginx/tmp;
 
 server {
-    server_name conceptnet.io www.conceptnet.io localhost;
+    listen 80 default_server;
+    server_name conceptnet.io www.conceptnet.io;
     gzip on;
     index index.html;
     charset utf-8;
@@ -19,6 +20,7 @@ server {
         root /var/www;
     }
     rewrite ^/docs https://github.com/commonsense/conceptnet5/wiki last;
+    rewrite ^/data/5../(.*)$ http://api.conceptnet.io/$1;
 }
 
 server {

web/static/css/conceptnet.css

@@ -1,3 +1,13 @@
+/* Web fonts */
+@import url('https://fonts.googleapis.com/css?family=Noto+Sans:400,700');
+@import url(http://fonts.googleapis.com/earlyaccess/notonastaliqurdu.css);
+@import url(http://fonts.googleapis.com/earlyaccess/notonaskharabic.css);
+@import url(http://fonts.googleapis.com/earlyaccess/notosanstelugu.css);
+@import url(http://fonts.googleapis.com/earlyaccess/notosanshebrew.css);
+@import url(http://fonts.googleapis.com/earlyaccess/notosansdevanagari.css);
+@import url(http://fonts.googleapis.com/earlyaccess/notosansthai.css);
+
+
 /* Element styles, from purecss.io/css/main.css */
 
 body {