Merge pull request #7 from qresp-code-development/feature_newcuratorui

Feature New Curator UI with added functionalities

.gitignore

@@ -1,9 +1,13 @@
 venv/
 .idea/
-web/papers/
+#web/papers/*
+#!web/papers/files_paper/data.json
 web/flask_session/
 flask_session/
 web/dist/
 web/project/__pycache__/
 web/build/
 web/qresp.egg-info/
+.cache/
+web/project/config_test.ini 
+web/project/tests/__pycache__/

.travis.yml

@@ -1,18 +1,15 @@
 language: python
 matrix:
     include:
-        - os: linux
-          python: 3.4
-          env: TOXENV=py34
         - os: linux
           python: 3.5
           env: TOXENV=py35
         - os: linux
           python: 3.6
           env: TOXENV=py36
-        - os: osx
-          env: PYTHON=3.4.4
-          language: generic
+        - os: linux
+          python: 3.7
+          env: TOXENV=py37
 
 before_install: |
   if [ "$TRAVIS_OS_NAME" == "osx" ]; then

CHANGELOG.md

@@ -1,6 +1,18 @@
 Change Log
 ==========
 
+v1.2.0 (2019/09/20)
+-------------------
+- Updated Curator UI
+- Added Preview Functionality
+- Added Share Functionality
+- Changed configuration scheme
+- Moved qresp schema to v1.1 from v1.0
+- Added more sections into Qresp explorer
+- Removed ssh connection and added Zenodo & HTTP connection
+- New unit tests
+
+
 v1.1.0 (2019/01/25)
 -------------------
 - Fixed bugs related to port number

docker-compose.yml

@@ -4,19 +4,16 @@ services:
   web:
     restart: always
     build: ./web
-    environment:
-      - KEY=<insert key>
-      - GOOGLE_CLIENT_ID=<insert google client id>
-      - GOOGLE_CLIENT_SECRET=<insert google client secret>
-      - REDIRECT_URI=<insert redirect uri>
-      - MAIL_ADDR=<administrators mail address>
-      - MAIL_PWD=<administrators password>
     expose:
       - "8080"
+    environment:
+      - PYTHONUNBUFFERED=TRUE
     volumes:
       - /usr/src/app/web/project/static
-    command: /usr/local/bin/gunicorn -w 2 -b :8080 project:app
-
+      - ./web/:/usr/src/app/web
+      - ./papercollection:/home/flask/app/web/papers
+    command: /usr/local/bin/gunicorn --enable-stdio-inheritance -w 4 -b :8080 project:app
+
   nginx:
     restart: always
     build: ./nginx

docker-compose.yml.services

@@ -5,28 +5,22 @@ services:
     restart: always
     build: ./web
     expose:
-      - 8080
-    ports:
-      - "8080:8080"
+      - "8080"
+    environment:
+      - PYTHONUNBUFFERED=TRUE
     volumes:
+      - /usr/src/app/web/project/static
       - ./web/:/usr/src/app/web
-    environment:
-      - KEY=<insert key>
-      - GOOGLE_CLIENT_ID=<insert google client id>
-      - GOOGLE_CLIENT_SECRET=<insert google client secret>
-      - REDIRECT_URI=<insert redirect uri>
-      - MAIL_ADDR=<administrators mail address>
-      - MAIL_PWD=<administrators password>
-    command: python run.py --host=0.0.0.0 --port 8080
+      - ./papercollection:/home/flask/app/web/papers
+    command: /usr/local/bin/gunicorn --enable-stdio-inheritance -w 4 -b :8080 project:app
 
   nginx:
     restart: always
     build: ./nginx
     ports:
-      - "8001:8001"
+      - "443:443"
     volumes:
       - /www/static
-      - ./papercollection:/usr/src/files
     volumes_from:
       - web
     depends_on:

nginx/family_recipes.conf

@@ -72,7 +72,7 @@ server {
         proxy_pass http://web:8080;
 
         # Redefine the header fields that NGINX sends to the upstream server
-        proxy_set_header Host $host;
+        proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 

web/.coverage

@@ -0,0 +1 @@
+!coverage.py: This is a private format, don't read it directly!{"lines":{"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\__init__.py":[1,2,3,4,5,6,7,9,12,15,16,17,20,21,22,23,24,25,26,29,38],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\config.py":[2,3,6,7,9,11,12,17,14,15,20,21,24,22,23],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\api.py":[1,5,30,47,64,81,98,115],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\paperdao.py":[1,2,3,4,7,10,11,17,24,31,38,45,46,120,127,136,142,168,213,231,243,257,267,277,384,387,388,395,438,449,460,478,489,506,12,13,14,15,57,58,67,68,73,78,86,94,105,113,117,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,118,42,43,124,125,21,22,87,88,89,90,91,92,93,114,115,74,75,76,77,106,107,108,109,110,111,112,59,60,61,63,64,65,79,80,81,82,83,84,85,69,70,71,72,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,28,29,218,219,220,221,222,223,224,279,280,295,315,337,358,359,360,361,362,363,364,365,366,367,368,370,371,372,373,376,377,378,379,296,297,298,299,300,301,302,303,304,305,306,307,308,311,312,313,338,339,340,341,342,343,344,345,346,347,348,349,350,351,354,355,356,316,317,318,319,320,321,322,323,324,325,327,328,329,330,333,334,335,281,282,283,284,285,286,287,288,289,290,293,294,225,226,236,237,238,239,240,246,247,251,252,269,270,271,272,273,274,253,254,262,263,255,264,265,248,249,241,138,139,129,130,131,389,390,391,392,393,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,439,440,441,442,443,444,514,515,531,552,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,593,594,595,516,517,518,532,533,534,535,536,537,538,539,540,541,542,543,544,545,548,549,550,445,446,447,454,455,456,597,598,457,466,467,468,472,473,497,498,499,500,501,502,503,474,475,484,485,476,469,470,553,458,132,133],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\db.py":[1,2,3,4,7,12,13,16,22,18,19,24,25,26,27,28,29,30,31,32,33,37,20],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\models.py":[1,3,5,6,7,8,9,10,12,14,15,16,17,18,19,20,21,22,23,24,25,27,29,30,31,33,35,36,37,38,39,40,41,42,43,44,46,48,49,50,51,52,53,54,55,56,57,58,59,60,61,63,65,66,67,68,69,70,71,72,74,76,77,78,79,80,81,82,83,85,87,88,89,92,94,95,96,97,98,99,100,101,102,103,104,106,107,110,112,113,114,116,118,119,120,121,122,123,126,128,129,130,131,134,136,138,146,155,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,143,144],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\util.py":[1,2,3,4,5,6,7,8,10,11,13,16,19,20,22,29,34,36,37,44,53,63,100,103,104,113,137,176,204,206,207,210,220,294,296,297,308,316,323,330,344,357,362,365,366,370,376,379,380,392,401,404,405,408,419,422,423,438,463,464,465,466,467,469,472,473,479,490,491,497,500,501,524,543,561,579,592,593,594,611,615,619,623,627,631,635,639,643,647,651,655,659,663,667,671,675,679,683,687,691,695,699,703,707,711,715,719,723,727,731,734,738,741,742,743,744,745,746,747,748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,764,765,766,767,768,769,770,771,773,776,777,778,779,780,782,785,786,787,788,789,790,791,793,796,797,798,799,800,801,802,803,595,617,596,625,597,633,598,641,599,649,600,657,601,665,602,673,603,681,604,689,605,697,606,705,607,713,608,721,609,729,645,569,570,572,574,576,577,508,509,510,511,512,513,514,522,531,532,533,534,535,536,537,538,539,540,541,549,550,552,559,516,517,518,519,520,521,553,556,557,573,571,393,394,395,396,397,398,39,40,41,42,58,59,60,49,50,51,298,299,300,301,302,303,304,305,306,424,426,427,432,433,436,443,444,445,446,447,448,449,458,459,460,429,430,431,367,368,371,372,373,208,224,226,228,229,230,231,232,233,234,235,236,237,238,239,240,241,214,215,218,243,245,247,249,251,257,259,261,216,252,253,254,255,256,250,242,248,262,263,264,265,266,267,274,275,276,277,278,244,260,246,279,280,281,282,283,284,285,286,287,288,292,331,332,333,334,339,340,341,342,324,325,326,327,328,345,346,347,350,351,352,353,354,355,358,381,388,389,390,382,383,384,385,386],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\routes.py":[2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,29,30,37,88,97,152,164,182,194,216,228,240,256,273,289,306,322,338,354,370,385,398,435,457,471,488,548,588,670,677,697,698,714,728,750,768,790,816,840,862,26,27,35,102,104,106,107,108,109,112,115,118,121,122,125,126,129,130,133,134,137,140,141,142,143,145,146,147,148,149,93,94,199,200,201,202,203,210,211,212,403,404,405,406,410,414,418,422,426,429,430,431,432,675,462,463,464,465,466,467,468,477,478,479,480,481,482,483,484,485,755,756,757,758,759,765,773,774,775,776,777,778,779,780,785,786,795,796,797,798,799,800,801,802,803,804,805,807,808,809,821,822,823,824,825,826,827,828,829,830,845,846,847,848,849,850,851,852,853,854,855,682,683,684,685,686,687,688,689,694,695,593,594,595,596,597,601,602,603,42,43,46,47,48,49,50,53,56,57,60,61,64,65,66,67,68,71,72,73,74,75,76,77,80,82,157,158,159,160,169,170,171,172,173,176,177,178,261,262,264,265,266,267,268,269,278,279,281,282,283,284,285,294,295,297,298,299,300,301,302,311,312,314,315,316,317,318,327,328,329,330,331,332,333,334,343,344,346,347,348,349,350,359,360,361,362,363,364,365,366,375,376,377,378,379,380,381,233,234,237,245,246,247,248,249,253,389,390,391,392,411,412,413,419,420,421,423,424,425,427,428,440,441,442,443,444,445,446,447,448,449,450,451,452,453,553,554,555,556,557,561,584,494,495,496,497,498,499,500,501,502,503,504,505,508,509,510,511,512,513,514,515,516,517,518,519,520,524,528,529,530,531,533,534,535,536,538,539,540,541,543,544,545,719,720,721,722,724,733,734,735,736,747,867,868,869,870,871,872,879,880,881,882],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\views.py":[1,2,3,4,6,13,14,16,22,31,32,34,35,36,37,38,39,40,41,43,44,45,46,47,48,50,51,54,55,56,57,59,60,61,62,63,64,66,67,68,17,18,19,69,70,72,73,74,75,76,77,78,79,80,81,82,84,85,86,87,88,89,91,92,93,95,96,97,98,99,100,101,102,104,106,107,108,109,110,111,112,113,114,115,116,117,119,120,121,122,123,124,126,127,128,129,130,131,133,134,135,138,139,140,141,142,143,144,145,146,147,148,149,151,152,154,155,156,158,159,161,162,163,164,166,167,168,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,23,24,25,27,29],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\constants.py":[2,3,4,5,6,7,8,9,10,11,12,13,14,15],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\tests\\__init__.py":[1],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\tests\\test_paperDAO.py":[1,2,3,4,5,7,8,10,12,27,35,43,59,67,75,83,91,99,107,115,123,131,139,152,162,172,182,194,16,17,18,19,20,21,22,23,24,25,71,72,73,6,31,32,63,64,65,135,136,137,39,40,41,119,120,121,111,112,113,95,96,97,127,128,129,79,80,81,103,104,105,87,88,89,166,167,168,169,47,48,49,176,177,178,179,187,188,189,190,191,192,156,157,158,159,143,144,145,146,147,148,149],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\tests\\test_routes.py":[1,2,3,4,5,6,7,8,9,10,13,19,59,64,67,70,81,103,21,60,61,62,22,23,24,25,26,27,28,29,30,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,71,72,73,74,75,78,76,65,82,83,84,85,86,88,89,90,96,99,91,92,95,87,97,93],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\templates\\index.html":[1,2,3,5,30,49,50,6,7,9,11,12,13,14,15,16,17,18,19,20,21,23,31,32,34,35,37,38,43,44,45,46,24,25,26,27],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\templates\\curatordetails.html":[1,2,3,5,16,196,197,6,7,9,11,12,13,14,17,18,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,39,40,41,42,44,45,47,48,49,50,51,52,53,54,55,56,57,59,60,62,63,64,65,66,68,69,70,71,72,73,74,75,76,78,79,81,82,83,84,85,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,110,111,113,114,115,116,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,136,137,139,140,141,142,144,145,146,147,148,149,150,152,153,155,156,157,158,160,161,162,163,164,165,166,168,169,171,172,173,174,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\templates\\base_curator.html":[1,2,3,5,50,67,73,74,6,7,9,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,43,51,52,54,56,57,62,63,64,65,44,45,46,47],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\templates\\_formhelpers.html":[1,2,3,5,164,165,6,7,9,11,84,85,86,87,161,162,12,13,16,17,19,26,39,40,41,42,44,45,47,49,50,51,52,61,62,64,80,81,83,21,22,23,24,28,29,30,31,32,33,34,35,88,89,92,93,95,104,105,106,107,109,110,112,121,122,124,133,134,135,136,138,139,141,157,158,160,97,98,99,100,126,127,128,129,114,115,116,117,118,119,66,67,69,71,72,73,74,76,77,78,56,57,58,59],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\templates\\mint.html":[1,2,3,5,16,23,24,6,7,9,11,12,13,14,17,18,21],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\templates\\paperdetails.html":[1,2,3,5,16,33,34,6,7,9,11,12,13,14,17,18,20,21,22,23,24,26,27,28,29,30],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\templates\\base_explorer.html":[1,2,3,5,46,63,69,70,6,7,9,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,39,47,48,50,52,53,58,59,60,61,40,41,42,43],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\templates\\qrespexplorer.html":[1,2,3,5,16,32,33,6,7,9,11,12,13,14,17,18,20,22,23,25,26,27,29,30],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\templates\\search.html":[1,2,3,5,16,60,61,6,7,9,11,12,13,14,17,18,20,21,22,23,24,25,26,28,29,30,32,38,39,40,46,47,48,54,55,56,57],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\templates\\admin.html":[1,2,3,5,16,41,42,6,7,9,11,12,13,14,17,18,20,21,22,23,25,26,27,28,30,31,32,33,34,35,36,37,38],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\run.py":[],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\setup.py":[],"C:\\Users\\adit4\\PycharmProjects\\Qresp\\web\\project\\__main__.py":[]}}

web/Dockerfile

@@ -54,6 +54,7 @@ RUN set -ex \
                 tk-dev \
                 xz-dev \
                 zlib-dev \
+                libxslt-dev \
 # add build deps before removing fetch deps in case there's overlap
         && apk del .fetch-deps \
         \
@@ -120,8 +121,8 @@ RUN set -ex; \
                 \) -exec rm -rf '{}' +; \
         rm -f get-pip.py
 
-RUN apk add --no-cache curl python pkgconfig python-dev openssl-dev libffi-dev musl-dev make gcc
-
+RUN apk add --no-cache curl python pkgconfig python-dev openssl-dev libffi-dev musl-dev make gcc libxslt-dev
+RUN pip install lxml
 
 # Create the working directory (and set it as the working directory)
 RUN mkdir -p /home/flask/app/web