wip - didn't really mean to commit this to pride branch but i'm havin…

…g problems with git. it won't deploy anyway i think.
PRIDE-Archive · Dec 6, 2023 · 661e7a7 · 661e7a7
1 parent b6aa5ab
commit 661e7a7
Show file tree

Hide file tree

Showing 6 changed files with 244,175 additions and 383 deletions.
diff --git a/Pipfile b/Pipfile
@@ -7,6 +7,7 @@ name = "pypi"
 setuptools = "57.5.0"
 flask = "==2.2.3"
 flask_cors = "*"
+Werkzeug = ">=2.2,<3.0"
 #psycopg2 = "*"
 psycopg2-binary = "2.9.5"
 python-dotenv = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/static/pride.css b/static/pride.css
@@ -68,4 +68,28 @@
 
 #expDropdownPlaceholder > div > ul > li:nth-child(8) {
     display: none !important;
+}
+
+/*#main > div.controls {*/
+/*    display: none !important;*/
+/*}*/
+
+/*#main > div.mainContent {*/
+/*    bottom:0px;*/
+/*}*/
+
+#alternatives{
+    display: none !important;
+}
+
+/*#bottomDivTopOnly {*/
+/*    display: none !important;*/
+/*}*/
+
+#displayOptionsPlaceholder {
+    display: none !important;
+}
+
+#xiNetButtonBar > span.layoutLabel.noBreak.sectionDividerLeft {
+    border-left: 0;
 }
diff --git a/static/xiview.js b/static/xiview.js
diff --git a/templates/datasets.html b/templates/datasets.html
@@ -11,7 +11,7 @@
 <nav>
     <div class="nav-wrapper teal offset-s2">
 {#        <div class="col s2 offset-s2">#}
-            <a href="#" class="brand-logo">Cross-Linking Datasets</a>
+            <a href="#" class="brand-logo">Crosslinking Datasets</a>
 {#        </div>#}
     </div>
   </nav>
@@ -28,7 +28,7 @@
       {% for d in datasets %}
       <tr>
           <td>
-              <a href="dataset?pxid={{ d[0] }}">{{ d[0] }}</a>
+              <a href="network.html?project={{ d[0] }}">{{ d[0] }}</a>
           </td>
           <td>
               <p>{{ d[1] }}</p>

diff --git a/xi_web_api/pride_loader.py b/xi_web_api/pride_loader.py
@@ -11,7 +11,7 @@
 import os
 import logging.config
 
-logging.config.fileConfig('logging.ini')
+# logging.config.fileConfig('logging.ini')
 logger = logging.getLogger(__name__)
 
 
@@ -112,7 +112,7 @@ def get_data():
         pxid = request.args.get('project')
         if pxid is None:
             return jsonify({"error": "No project id provided"}), 400
-        elif not re.match(r'^[a-zA-Z0-9]+$', pxid):
+        elif not re.match(r'^[a-zA-Z0-9_]+$', pxid):
             return jsonify({"error": "Invalid project id"}), 400
 
         file = request.args.get('file')