various updates

app/corpora/routes.py

@@ -14,7 +14,7 @@ from .forms import CreateCorpusForm
 
 @bp.route('')
 def corpora():
-    return render_template('corpora/corpora.html.j2', title='Corpora')
+    return redirect(url_for('main.dashboard', _anchor='corpora'))
 
 
 @bp.route('/create', methods=['GET', 'POST'])

app/jobs/routes.py

@@ -12,8 +12,7 @@ from . import bp
 
 @bp.route('')
 def jobs():
-    # return redirect(url_for('main.dashboard', _anchor='jobs'))
+    return redirect(url_for('main.dashboard', _anchor='jobs'))
-    return render_template('jobs/jobs.html.j2', title='Jobs')
 
 
 @bp.route('/<hashid:job_id>')

app/static/css/materialize.override.css

@@ -12,7 +12,7 @@ body[data-sidenav-fixed="true" i] main,
 body[data-sidenav-fixed="true" i] footer {
   padding-left: 300px;
 }
- 
+
 @media only screen and (max-width : 992px) {
   body[data-sidenav-fixed="true" i] header,
   body[data-sidenav-fixed="true" i] main,
@@ -34,7 +34,7 @@ body[data-sidenav-fixed="true" i] .navbar-fixed > nav {
 
 /* #region sticky-footer */
 /*
- * Sticky Footer: 
+ * Sticky Footer:
  * A sticky footer always stays on the bottom of the page regardless of how
  * little content is on the page. However, this footer will be pushed down if
  * there is a lot of content, so it is different from a fixed footer.

app/static/css/nopaque-icons.css

@@ -35,3 +35,67 @@
   /* Support for IE. */
   font-feature-settings: 'liga';
 }
+
+[data-nopaque-icon="speedometer"] {
+  --nopaque-icon-character: "A";
+  --nopaque-negative-icon-character: "a";
+}
+
+[data-nopaque-icon="cloud-processes"] {
+  --nopaque-icon-character: "B";
+  --nopaque-negative-icon-character: "b";
+}
+
+[data-nopaque-icon="account-circle"] {
+  --nopaque-icon-character: "C";
+  --nopaque-negative-icon-character: "c";
+}
+
+[data-nopaque-icon="meshed-gears"] {
+  --nopaque-icon-character: "D";
+  --nopaque-negative-icon-character: "d";
+}
+
+[data-nopaque-icon="file-setup-pipeline"] {
+  --nopaque-icon-character: "E";
+  --nopaque-negative-icon-character: "e";
+}
+
+[data-nopaque-icon="tesseract-ocr-pipeline"],
+[data-nopaque-icon="transkribus-htr-pipeline"] {
+  --nopaque-icon-character: "F";
+  --nopaque-negative-icon-character: "f";
+}
+
+[data-nopaque-icon="spacy-nlp-pipeline"] {
+  --nopaque-icon-character: "G";
+  --nopaque-negative-icon-character: "g";
+}
+
+[data-nopaque-icon="corpus-analysis"] {
+  --nopaque-icon-character: "H";
+  --nopaque-negative-icon-character: "h";
+}
+
+[data-nopaque-icon="file-cabinet"] {
+  --nopaque-icon-character: "I";
+  --nopaque-negative-icon-character: "i";
+}
+
+[data-nopaque-icon="suitcase"] {
+  --nopaque-icon-character: "J";
+  --nopaque-negative-icon-character: "j";
+}
+
+[data-nopaque-icon="wrench"] {
+  --nopaque-icon-character: "K";
+  --nopaque-negative-icon-character: "k";
+}
+
+.nopaque-icons[data-nopaque-icon]:empty::before {
+    content: var(--nopaque-icon-character);
+}
+
+.nopaque-icons.negative[data-nopaque-icon]:empty::before{
+    content: var(--nopaque-negative-icon-character);
+}

app/templates/_base/sidenav.html.j2

@@ -33,7 +33,7 @@
     <a class="waves-effect" href="{{ url_for('jobs.jobs') }}"><i class="nopaque-icons">J</i>My Jobs</a>
   </li>
   <li>
-    <a class="waves-effect" href="{{ url_for('main.dashboard', _anchor='contributions') }}"><i class="material-icons">new_label</i>My Contributions</a>
+    <a class="waves-effect" href="{{ url_for('contributions.contributions') }}"><i class="material-icons">new_label</i>My Contributions</a>
   </li>
 
   {# processes & services items #}

app/templates/corpora/corpora.html.j2

@@ -1,38 +0,0 @@
-{% extends "base.html.j2" %}
-
-
-{% block page_content %}
-<div class="container">
-  <h1>{{ title }}</h1>
-
-  <div class="card">
-    <div class="card-content">
-      <div class="corpus-list" data-user-id="{{ current_user.hashid }}"></div>
-    </div>
-    <div class="card-action right-align">
-      <a class="btn waves-effect waves-light" href="{{ url_for('corpora.create_corpus') }}">Create corpus<i class="material-icons right">add</i></a>
-    </div>
-  </div>
-</div>
-
-{#
-<div class="parallax-container">
-  <div class="parallax">
-    <img src="{{ url_for('static', filename='images/parallax_lq/01_books_antique_book_old.jpg') }}">
-  </div>
-</div>
-
-<div class="container">
-  <div style="position: relative; top: -225px;">
-    <div class="card white">
-      <div class="card-content">
-        <div class="corpus-list" data-user-id="{{ current_user.hashid }}"></div>
-      </div>
-      <div class="card-action right-align">
-        <a class="btn waves-effect waves-light" href="{{ url_for('corpora.create_corpus') }}">Create corpus<i class="material-icons right">add</i></a>
-      </div>
-    </div>
-  </div>
-</div>
-#}
-{% endblock page_content %}

app/templates/jobs/jobs.html.j2

@@ -1,98 +0,0 @@
-{% extends "base.html.j2" %}
-
-
-{% block page_content %}
-<div class="container">
-  <h1>{{ title }}</h1>
-
-  <div class="card">
-    <div class="card-content">
-      <div class="job-list" data-user-id="{{ current_user.hashid }}"></div>
-    </div>
-    <div class="card-action right-align">
-      <a class="btn modal-trigger waves-effect waves-light" data-target="create-job-modal">Create job<i class="material-icons right">add</i></a>
-    </div>
-  </div>
-
-  <div class="fixed-action-btn">
-    <a class="btn-floating btn-large">
-      <i class="large material-icons">add</i>
-    </a>
-    <ul>
-      <li>
-        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="File Setup Pipeline" data-service="file-setup-pipeline">
-          <i class="nopaque-icons service-icons" data-service="file-setup-pipeline"></i>
-        </a>
-      </li>
-      <li>
-        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="Tesseract OCR Pipeline" data-service="tesseract-ocr-pipeline">
-          <i class="nopaque-icons service-icons" data-service="tesseract-ocr-pipeline"></i>
-        </a>
-      </li>
-      {% if config.NOPAQUE_TRANSKRIBUS_ENABLED %}
-      <li>
-        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="Transkribus HTR Pipeline" data-service="transkribus-htr-pipeline">
-          <i class="nopaque-icons service-icons" data-service="transkribus-htr-pipeline"></i>
-        </a>
-      </li>
-      {% endif %}
-      <li>
-        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="SpaCy NLP Pipeline" data-service="spacy-nlp-pipeline">
-          <i class="nopaque-icons service-icons" data-service="spacy-nlp-pipeline"></i>
-        </a>
-      </li>
-    </ul>
-  </div>
-</div>
-
-{# 
-<div class="parallax-container">
-  <div class="parallax">
-    <img src="{{ url_for('static', filename='images/parallax_lq/01_books_antique_book_old.jpg') }}">
-  </div>
-</div>
-
-<div class="container">
-  <div class="fixed-action-btn">
-    <a class="btn-floating btn-large">
-      <i class="large material-icons">add</i>
-    </a>
-    <ul>
-      <li>
-        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="File Setup Pipeline" data-service="file-setup-pipeline">
-          <i class="nopaque-icons service-icons" data-service="file-setup-pipeline"></i>
-        </a>
-      </li>
-      <li>
-        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="Tesseract OCR Pipeline" data-service="tesseract-ocr-pipeline">
-          <i class="nopaque-icons service-icons" data-service="tesseract-ocr-pipeline"></i>
-        </a>
-      </li>
-      {% if config.NOPAQUE_TRANSKRIBUS_ENABLED %}
-      <li>
-        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="Transkribus HTR Pipeline" data-service="transkribus-htr-pipeline">
-          <i class="nopaque-icons service-icons" data-service="transkribus-htr-pipeline"></i>
-        </a>
-      </li>
-      {% endif %}
-      <li>
-        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="SpaCy NLP Pipeline" data-service="spacy-nlp-pipeline">
-          <i class="nopaque-icons service-icons" data-service="spacy-nlp-pipeline"></i>
-        </a>
-      </li>
-    </ul>
-  </div>
-
-  <div style="position: relative; top: -90px;">
-    <div class="card">
-      <div class="card-content">
-        <div class="job-list" data-user-id="{{ current_user.hashid }}"></div>
-      </div>
-      <div class="card-action right-align">
-        <a class="btn modal-trigger waves-effect waves-light" data-target="create-job-modal">Create job<i class="material-icons right">add</i></a>
-      </div>
-    </div>
-  </div>
-</div>
-#}
-{% endblock page_content %}

app/templates/main/dashboard.html.j2

@@ -9,7 +9,6 @@
 
     <div class="col s12" id="corpora">
       <h2>My Corpora</h2>
-      <p>Hallo <span class="pink-text">Audrey</span></p>
       <p>Create a corpus to interactively perform linguistic analysis.</p>
     </div>
 
@@ -34,7 +33,6 @@
         pre-processing step. You will need the result of each step for the
         next step.
       </p>
-      <p><b>Where is my Job data?</b> Don't worry, please read <a href="{{ url_for('main.news', _anchor='april-2022-update') }}">this news</a> entry</p>
     </div>
 
     <div class="col s12">
@@ -56,7 +54,7 @@
       <div class="card extension-selector hoverable service-color" data-service="tesseract-ocr-pipeline">
         <a href="{{ url_for('contributions.tesseract_ocr_pipeline_models') }}" style="position: absolute; width: 100%; height: 100%;"></a>
         <div class="card-content">
-          <span class="card-title" data-service="tesseract-ocr-pipeline">Tesseract OCR Pipeline Models</span>
+          <span class="card-title">Tesseract OCR Pipeline Models</span>
           <p>Here you can see and edit the models that you have created. You can also create new models.</p>
         </div>
       </div>

app/templates/main/index.html.j2

@@ -20,22 +20,22 @@
         <div class="col s12">
           <div class="row">
             <div class="col s12 m6 l3 center-align">
-              <i class="large nopaque-icons primary-color-text">A</i><br>
+              <i class="large nopaque-icons primary-color-text" data-nopaque-icon="speedometer"></i><br>
               <b class="primary-color-text">Speeds up your work</b>
               <p class="light">All tools provided by nopaque are carefully selected to provide a complete tool suite without being held up by compatibility issues.</p>
             </div>
             <div class="col s12 m6 l3 center-align">
-              <i class="large nopaque-icons primary-color-text">B</i><br>
+              <i class="large nopaque-icons primary-color-text" data-nopaque-icon="cloud-processes"></i><br>
               <b class="primary-color-text">Cloud infrastructure</b>
               <p class="light">All computational work is processed within nopaque’s cloud infrastructure. You don't need to install any software. Great, right?</p>
             </div>
             <div class="col s12 m6 l3 center-align">
-              <i class="large nopaque-icons primary-color-text">C</i><br>
+              <i class="large nopaque-icons primary-color-text" data-nopaque-icon="account-circle"></i><br>
               <b class="primary-color-text">User friendly</b>
               <p class="light">You can start right away without having to read mile-long manuals. All services come with default settings that make it easy for you to just get going. Also great, right?</p>
             </div>
             <div class="col s12 m6 l3 center-align">
-              <i class="large nopaque-icons primary-color-text">D</i><br>
+              <i class="large nopaque-icons primary-color-text" data-nopaque-icon="meshed-gears"></i><br>
               <b class="primary-color-text">Meshing processes</b>
               <p class="light">No matter where you step in, nopaque facilitates and accompanies your research. Its workflow perfectly ties in with your research process.</p>
             </div>