Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
refactor: Replace favicon and term Knora by DSP (DSP-1181 / DSP-1342) (
…#441)

* chore: replace favicon

* refactor: replace dasch logo

* refactor: replace knora by DSP
  • Loading branch information
kilchenmann committed May 12, 2021
1 parent 583a338 commit 3b038b6
Show file tree
Hide file tree
Showing 22 changed files with 122 additions and 108 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -6,7 +6,7 @@

> **_NOTE:_** The current DSP-APP version presents the **admin view** only.
This app is a simple user interface for the Data and Service Center for the Humanities DaSCH, which uses the DSP-API/Knora server application in the backend. It's a system for annotation and linkage of resources in arts and humanities.
This app is a simple user interface for the Data and Service Center for the Humanities DaSCH, which uses the DSP-API server application in the backend. It's a system for annotation and linkage of resources in arts and humanities.

DSP-APP implements [DSP-JS-LIB](https://www.npmjs.com/package/@dasch-swiss/dsp-js) to connect with [DSP-API](https://docs.dasch.swiss/developers/knora/api-reference/). DSP (DaSCH Service Platform) is a software framework for storing, sharing, and working with primary resources and data in the humanities.

Expand Down
5 changes: 2 additions & 3 deletions docs/how-to-use/data.md
Expand Up @@ -31,7 +31,7 @@ DSP-APP offers the possibility to the user to search in 3 different ways: **full

### Full text search

Full text search performs queries including one or more terms or phrases, and returns data that matches search conditions. By default, the search is performed in all projects stored in Knora. However, it is possible to filter by project using the menu "Filter by project" on the left side of the search bar.
Full text search performs queries including one or more terms or phrases, and returns data that matches search conditions. By default, the search is performed in all projects stored in DSP. However, it is possible to filter by project using the menu "Filter by project" on the left side of the search bar.

![Filter your full text search by specific project](../assets/images/search-fulltext-filterByProject.png)*https://app2.dasch.swiss - Search 1: Full text search*

Expand Down Expand Up @@ -70,13 +70,12 @@ The expert search can be more powerful than the advanced search, but requires kn

![Expert search is a text area in which you can create Gravsearch queries.](../assets/images/search-expert.png)*https://app2.dasch.swiss/search/expert - Search 3: Expert search is a text area in which you can create Gravsearch queries. Here is the default example you can find in the app.*

To learn Gravsearch, go to the Knora documentation [→ Gravsearch](https://docs.knora.org/paradox/03-apis/api-v2/query-language.html)
To learn Gravsearch, go to the DSP-API documentation [→ Gravsearch](https://docs-api.dasch.swiss/03-apis/api-v2/query-language/)

---

## Search results


### Simple list
The results of the search are displayed in an organised list with a small preview. You can select one result at a time to get more information.

Expand Down
2 changes: 1 addition & 1 deletion docs/how-to-use/index.md
@@ -1,6 +1,6 @@
# User Guide

This is the documentation for the generic Knora Web Application of the Data and Service Center for the Humanities DaSCH. You can reach the app on **[app2.dasch.swiss](https://app2.dasch.swiss)**.
This is the documentation for the generic DSP Web Application of the Data and Service Center for the Humanities DaSCH. You can reach the app on **[app2.dasch.swiss](https://app2.dasch.swiss)**.

---

Expand Down
9 changes: 4 additions & 5 deletions docs/how-to-use/system.md
Expand Up @@ -2,15 +2,15 @@

<span style="color:red">&#9888; Only for System administrator</span>

System administrators can get an overview of all projects and all users stored in Knora.
System administrators can get an overview of all projects and all users stored in DSP.

![Get access to the system admin part from the user menu](../assets/images/system-user-menu.png)*System administration part is accessible from the user menu in the header.*

---

## All projects

System admin gets the list of all activated projects as well as archived projects. It is possible to create a new research project, the required information must be filled in.
System admin gets the list of all activated projects as well as archived projects. It is possible to create a new research project, the required information must be filled in.
For each project, the system admin has the possibility to edit the project information and archive the project.

![Overview of all projects](../assets/images/system-all-projects.png)*Overview of all activated projects, the list of archived projects is displayed below.*
Expand All @@ -19,8 +19,8 @@ For each project, the system admin has the possibility to edit the project infor

## All users

System admin gets the list of all activated and suspended users registered in Knora.
New users can be created from this page only (button "Create new").
System admin gets the list of all activated and suspended users registered in DSP.
New users can be created from this page only (button "Create new").

![Overview of all users](../assets/images/system-all-users.png)*Overview of all users where the system admin has access to several actions.*

Expand All @@ -39,4 +39,3 @@ For each user, the system admin has access to several actions:
![System admin can add a user as a member user of a project](../assets/images/system-manage-project-membership.png)

- *Suspend user*: the user is deactivated and has no more access to DSP-APP. The system admin can reactivate it at any time.

2 changes: 1 addition & 1 deletion e2e/src/help.e2e-spec.ts
Expand Up @@ -52,7 +52,7 @@ describe('help page', () => {
});
});

it('should route to knora-app release note page', async () => {
it('should route to dsp-app release note page', async () => {
await browser.waitForAngularEnabled(false);
page.navigateTo();
await browser.waitForAngularEnabled(true);
Expand Down
6 changes: 4 additions & 2 deletions src/app/main/header/header.component.scss
Expand Up @@ -9,8 +9,10 @@
.home-button {
display: inline-block;
.mat-icon {
height: 40px;
margin: 0 6px 6px 0;
margin: 6px 6px 6px 0;
min-width: 40px;
height: auto;
max-height: 40px;

&.small {
width: 40px;
Expand Down
10 changes: 0 additions & 10 deletions src/app/main/header/header.component.ts
Expand Up @@ -41,16 +41,6 @@ export class HeaderComponent implements OnInit, OnDestroy {
private _componentCommsService: ComponentCommunicationEventService) {

// create tool icons to use them in mat-icons
// knora-app icon with text
this._matIconRegistry.addSvgIcon(
'dsp_app_banner',
this._domSanitizer.bypassSecurityTrustResourceUrl('/assets/images/knora-app-banner.svg')
);
// knora-app icon (for smaller screens)
this._matIconRegistry.addSvgIcon(
'dsp_app_icon',
this._domSanitizer.bypassSecurityTrustResourceUrl('/assets/images/knora-app-icon.svg')
);
this._matIconRegistry.addSvgIcon(
'dasch_icon_black',
this._domSanitizer.bypassSecurityTrustResourceUrl('/assets/images/dasch-icon-black.svg')
Expand Down
16 changes: 1 addition & 15 deletions src/app/main/help/help.component.ts
@@ -1,6 +1,4 @@
import { Component, Inject, OnInit } from '@angular/core';
import { MatIconRegistry } from '@angular/material/icon';
import { DomSanitizer } from '@angular/platform-browser';
import { ApiResponseData, ApiResponseError, HealthResponse, KnoraApiConnection } from '@dasch-swiss/dsp-js';
import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
import { ErrorHandlerService } from '../error/error-handler.service';
Expand Down Expand Up @@ -92,19 +90,7 @@ export class HelpComponent implements OnInit {

constructor(
@Inject(DspApiConnectionToken) private _dspApiConnection: KnoraApiConnection,
private _errorHandler: ErrorHandlerService,
private _domSanitizer: DomSanitizer,
private _matIconRegistry: MatIconRegistry) {

// create tool icons to use them in mat-icons
this._matIconRegistry.addSvgIcon(
'knora_app_icon',
this._domSanitizer.bypassSecurityTrustResourceUrl('/assets/images/knora-app-icon.svg')
);
this._matIconRegistry.addSvgIcon(
'knora_icon',
this._domSanitizer.bypassSecurityTrustResourceUrl('/assets/images/knora-icon.svg')
);
private _errorHandler: ErrorHandlerService) {
}

ngOnInit() {
Expand Down
1 change: 0 additions & 1 deletion src/app/main/main.component.html
Expand Up @@ -16,7 +16,6 @@
<section class="intro parallax-wrapper bg-1">
<div class="parallax-curtain">
<div class="content medium middle">
<!-- <h2 class="mat-title">Knora User Interface &middot; Research Layer</h2> -->
<h1 class="mat-display-2 app-headline">bring everything together and simplify your research</h1>
<h2 class="mat-title">This is the generic web application of the Data and Service Center for the
Humanities
Expand Down
Expand Up @@ -50,7 +50,7 @@ export class ResourceClassInfoComponent implements OnInit {

/**
* translates iri from "sub class of" array
* - display label from default resource classes (as part of Knora System Project)
* - display label from default resource classes (as part of DSP System Project)
* - in case the class is a subclass of another class in the same ontology: display this class label
* - in none of those cases display the name from the class IRI
*
Expand Down
Expand Up @@ -15,7 +15,7 @@
</mat-hint>
</mat-form-field>

<!-- TODO: select and reuse existing ObjectProperty doesn't work yet; s. https://github.com/dasch-swiss/knora-app/pull/229#issuecomment-598276151 -->
<!-- TODO: select and reuse existing ObjectProperty doesn't work yet; s. https://github.com/dasch-swiss/dsp-app/pull/229#issuecomment-598276151 -->
<mat-autocomplete #auto="matAutocomplete" (optionSelected)="updateFieldsDependingOnLabel($event.option.value)" [matTooltip]="existingProperty ? 'Visible' : null">
<mat-option *ngFor="let prop of filteredProperties | async" [value]="prop"
matTooltip="Label: {{ prop?.label }} (Name is part of the id: {{prop?.name}})" matTooltipPosition="after">
Expand Down
2 changes: 1 addition & 1 deletion src/app/system/projects/projects.component.ts
Expand Up @@ -65,7 +65,7 @@ export class ProjectsComponent implements OnInit {
if (this.username) {
this._titleService.setTitle('Your projects');
} else {
this._titleService.setTitle('All projects from Knora');
this._titleService.setTitle('All projects from DSP');
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/system/users/users.component.ts
Expand Up @@ -29,7 +29,7 @@ export class UsersComponent implements OnInit {
private _titleService: Title
) {
// set the page title
this._titleService.setTitle('All users in Knora');
this._titleService.setTitle('All users in DSP');
}

ngOnInit() {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/de.json
Expand Up @@ -3,7 +3,7 @@
"dashboardComponent": {
"firstParagraph": "Willkommen bei DSP-APP – einer web-basierten virtuellen Forschungsumgebung, die Forschern in den Humanities bei der Arbeit mit digitalen Daten unterstützt. DSP-APP erlaubt die Annotation und die Verknüpfung mit beliebigen Quellen, seien es digitale Texte, bewegte oder unbewegte Bilder oder Ton.",
"secondParagraph": "DSP-APP ist eine (generische) Benutzerschnittstelle um auf Daten von einem Haupt-Repository zuzugreifen, das hier beschrieben ist: ",
"projectsIntro": "Öffentliche Projekte in Knora"
"projectsIntro": "Öffentliche Projekte in DSP"
},
"frameworkForListings": {
"list": {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en.json
Expand Up @@ -3,7 +3,7 @@
"dashboardComponent": {
"firstParagraph": "Welcome to DSP-APP — a web-based virtual research environment that helps researchers in the humanities to deal with digital data. It allows the annotation and linkage of arbitrary sources such as digital texts, still and moving images, and sound.",
"secondParagraph": "DSP-APP is one (generic) user interface to handle the data from the main repository called ",
"projectsIntro": "Public projects in Knora"
"projectsIntro": "Public projects in DSP"
},
"list": {
"title": {
Expand Down
8 changes: 0 additions & 8 deletions src/assets/images/akka-icon.svg

This file was deleted.

42 changes: 34 additions & 8 deletions src/assets/images/dasch-icon-black.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 34 additions & 8 deletions src/assets/images/dasch-icon-purple.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 34 additions & 8 deletions src/assets/images/dasch-icon-white.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3b038b6

Please sign in to comment.