Merge branch 'refs/heads/master' into charts2

# Conflicts: # src/app/class/network/network.component.html
rhizomik · Jul 10, 2024 · 9b8c023 · 9b8c023
2 parents 62d8346 + e75e23c
commit 9b8c023
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 29 deletions.
diff --git a/angular.json b/angular.json
@@ -24,6 +24,7 @@
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
+              "src/robots.txt",
               "src/assets",
               "src/manifest.webmanifest",
               {

diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html
@@ -8,7 +8,7 @@
         <strong>Overview</strong>: <em>get the full picture of the data set at hand</em>
       <ul>
         <li>Rhizomer generates an overview of the kinds of things in a dataset using a <strong>wordcloud</strong>.
-          It is also possible to shown how things are related using a <strong>network</strong> overview.
+          It is also possible to show how things are related using a <strong>network</strong> overview.
         </li>
       </ul>
     </li>
@@ -18,7 +18,7 @@
       <a href="https://rhizomer.rhizomik.net/datasets/dbpedia" target="_blank">
         <img alt="Rhizomer - Dataset Overview Word Cloud" class="img-fluid" src="assets/rhizomer-wordcloud.png">
       </a>
-      <p class="small font-weight-bold text-center">Worcloud generated by Rhizomer for DBPedia</p>
+      <p class="small font-weight-bold text-center">Wordcloud generated by Rhizomer for DBPedia</p>
     </div>
     <div class="col-lg-6 mt-3">
       <a href="https://rhizomik.net" target="_blank">
@@ -42,7 +42,7 @@
       <ul>
         <li>All <strong>properties and values</strong> are shown for the selected resource.
           It is also possible to <strong>browse</strong> linked resources.
-          Future works it to include visualisations like maps or timelines.
+          It is work in progress to include visualisations like maps or timelines.
         </li>
       </ul>
     </li>

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -53,8 +53,8 @@ const routes: Routes = [
 
 export function nonStaticFiles(url: UrlSegment[]) {
   return url.length === 0 ||
-         ( !(url[0].path === 'html') && !(url[0].path === 'images') &&
-           !(url[0].path === 'ontologies') && !(url[0].path === '.well-known') ) ||
+         ( !(url[0].path === 'html') && !(url[0].path === 'images') && !(url[0].path === 'ontologies') &&
+           !(url[0].path === 'robots.txt') && !(url[0].path === '.well-known') ) ||
          ( (url[0].path === 'ontologies') && !url[url.length - 1].path.includes('.')) ?
          ({consumed: url}) : null;
 }

diff --git a/src/app/class/network/network.component.css b/src/app/class/network/network.component.css
@@ -46,3 +46,11 @@ circle {
   stroke: white;
   stroke-width: 2;
 }
+
+#search {
+  height: fit-content;
+}
+
+.invalid-feedback {
+  display: block;
+}
diff --git a/src/app/class/network/network.component.html b/src/app/class/network/network.component.html
@@ -5,10 +5,10 @@
       <span class="fa fa-info-circle"></span> {{ 'overview.details' | translate }}</button>
   </div>
   <div class="col-md form-group input-group">
-    <input id="search" type="text" class="form-control" #text placeholder="{{ 'overview.searchAll' | translate }}"
-           (keyup.enter)="search(text.value)"/>
+    <input id="search" type="text" class="form-control" #text
+           placeholder="{{ 'overview.searchAll' | translate }}" (keyup.enter)="search(text.value)"/>
     <div class="input-group-append">
-      <button class="btn btn-sm btn-secondary" type="button" (click)="search(text.value)">
+      <button class="btn btn-secondary" type="button" (click)="search(text.value)">
         <span class="fa fa-search"></span>
       </button>
     </div>
@@ -19,17 +19,8 @@
            placeholder="{{ 'overview.searchClasses' | translate }}"
            [class.loading]="searching" (selectItem)="browse($event.item)"/>
     <div class="invalid-feedback" *ngIf="searchFailed">{{ 'overview.sorry' | translate }}</div>
-  </div>
-</div>
-
-<div class="row" style="margin-top: -20px">
-  <div *ngIf="isLoggedIn()" class="col-sm-3 pull-left"></div>
-  <div class="col-sm">&nbsp;</div>
-  <div class="col-sm-3">
-    <small class="form-text text-muted" *ngIf="typeahead.value.length > 0 && typeahead.value.length < 3">
-      {{ 'overview.three-ch' | translate }}</small>
-    <small class="form-text text-muted" *ngIf="typeahead.value.length > 2 && emptyAutocomplete && !searching">
-      {{ 'overview.no-classes' | translate }}</small>
+    <div class="invalid-feedback" *ngIf="typeahead.value.length > 0 && typeahead.value.length < 3">{{ 'overview.three-ch' | translate }}</div>
+    <div class="invalid-feedback" *ngIf="typeahead.value.length > 2 && emptyAutocomplete && !searching">{{ 'overview.no-classes' | translate }}</div>
   </div>
 </div>
 
@@ -45,10 +36,10 @@
   <div class="col alert-danger m-3 text-center" >{{ 'overview.no-class-instances' | translate }}</div>
 </div>
 
-<svg style="width: 100%; height: auto; margin-top: -58px"></svg>
+<svg style="width: 100%; height: auto"></svg>
 
-<div *ngIf="links !== undefined" style="margin-top: -50px">
-    <div class="fa fa-minus-square me-1" (click)="contract()"></div>
+<div *ngIf="links !== undefined" style="margin-top: -75px">
+    <div class="fa fa-minus-square mr-1" (click)="contract()"></div>
     <div class="fa fa-plus-square" (click)="expand()"></div>
 </div>
 

diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
@@ -19,10 +19,10 @@
         "showing": "Mostrant",
         "top": "les millors",
         "classes and": "classes i",
-        "relations": "relacions amb una freqüència",
-        "show-all": "mostrar totes les relacions",
+        "relations": "relacions amb freqüència",
+        "show-all": "mostrar-les totes",
         "all-rel": "totes les relacions",
-        "show-less": "mostrar menys relacions",
+        "show-less": "mostrar-ne menys",
         "warning-showing-just": "Atenció: mostrant només les",
         "classes": "classes més freqüents"
     },

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -20,9 +20,9 @@
         "top": "top",
         "classes and": "classes and",
         "relations": "relations with frequency",
-        "show-all": "show all relations",
+        "show-all": "show all",
         "all-rel": "all relations",
-        "show-less": "show less relations",
+        "show-less": "show less",
         "warning-showing-just": "Warning: showing just top",
         "classes": "classes"
     },

diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
@@ -20,9 +20,9 @@
         "top": "las mejores",
         "classes and": "clases y",
         "relations": "relaciones con frequencia",
-        "show-all": "mostrar todas las relaciones",
+        "show-all": "mostrar todas",
         "all-rel": "todas las relaciones",
-        "show-less": "mostrar menos relaciones",
+        "show-less": "mostrar menos",
         "warning-showing-just": "Atención: mostrando solo las",
         "classes": "clases más frecuentes"
     },

diff --git a/src/robots.txt b/src/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /*/resource?uri=*