Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(app+main)!: comment out the search and everything related to resources (DSP-1291) #371

Merged
merged 3 commits into from Jan 28, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 13 additions & 3 deletions README.md
@@ -1,18 +1,18 @@
# DSP APP — Generic user interface of DaSCH Service Platform
# DSP-ADMIN — Admin user interface of DaSCH Service Platform
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It could be confusing when the repo's name is dsp-app but the title is dsp-admin...


[![Github](https://img.shields.io/github/v/tag/dasch-swiss/dsp-app?include_prereleases&label=Github%20tag)](https://github.com/dasch-swiss/dsp-app)
[![Docker](https://img.shields.io/docker/v/daschswiss/dsp-app?label=Docker%20image)](https://hub.docker.com/r/daschswiss/dsp-app)
[![CI](https://github.com/dasch-swiss/dsp-app/workflows/CI/badge.svg)](https://github.com/dasch-swiss/dsp-app/actions?query=workflow%3ACI)

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.

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-API is a software framework for storing, sharing, and working with primary resources and data in the humanities.
DSP-ADMIN 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-API is a software framework for storing, sharing, and working with primary resources and data in the humanities.

Additionaly it's built with [DSP-UI-LIB](https://www.npmjs.com/package/@dasch-swiss/dsp-ui) — reusable DSP specific Angular modules.

Please check our [DSP Release Compatibility Matrix](https://docs.google.com/spreadsheets/d/e/2PACX-1vQe-0nFKqYHwHT3cNI2M_ZCycKOgDZBxtaabxEQDDkNKJf6funMVrJBJPgMFEJdiBdCesahUhURN6MS/pubhtml) to use this app with the correct and required versions of the dependent packages.

DSP-APP is [free software](http://www.gnu.org/philosophy/free-sw.en.html), released under [GNU Affero General Public](http://www.gnu.org/licenses/agpl-3.0.en.html) license.
DSP-ADMIN is [free software](http://www.gnu.org/philosophy/free-sw.en.html), released under [GNU Affero General Public](http://www.gnu.org/licenses/agpl-3.0.en.html) license.

## Development server

Expand Down Expand Up @@ -43,6 +43,16 @@ To get more help on the Angular CLI use `ng help` or go check out the [Angular C

We built the user guidelines and developer documentation with [MkDocs](https://www.mkdocs.org/) in a separate [repository](https://github.com/dasch-swiss/dsp-docs). The user guide is published on [docs.dasch.swiss/user-guide](https://docs.dasch.swiss/user-guide).

## Work on GitHub

### "main" branch

- use the branch "main" to work on the DSP-ADMIN app. Any changes should be created in branches from "main" and should be merged into the "main" branch.

### "develop" branch

- use the branch "develop" to work on the whole DSP-APP app (admin + research parts). Any new developments should be created in branches from "develop" and should be merged into the "develop" branch.

## Publish a new version to DockerHub

Before publishing:
Expand Down
5 changes: 3 additions & 2 deletions src/app/app-global.ts
Expand Up @@ -52,12 +52,13 @@ export class AppGlobal {
route: '/projects',
icon: 'assignment'
},
{
// label to reactivate when dsp-app will be used as a research platform again: -->
/* {
label: 'My Collections',
shortLabel: 'Collections',
route: '/collections',
icon: 'star'
},
}, */
{
label: 'My Account',
shortLabel: 'Account',
Expand Down
12 changes: 6 additions & 6 deletions src/app/app-routing.module.ts
Expand Up @@ -118,11 +118,11 @@ const routes: Routes = [
component: UserComponent,
canActivate: [AuthGuard]
},
{
/* {
path: 'collections',
component: UserComponent,
canActivate: [AuthGuard]
},
}, */
{
path: 'system',
component: SystemComponent,
Expand All @@ -143,7 +143,7 @@ const routes: Routes = [
}
]
},
{
/* {
path: 'search',
children: [
{
Expand All @@ -155,12 +155,12 @@ const routes: Routes = [
component: ResultsComponent
}
]
},
{
}, */
/* {
path: 'resource/:id',
component: ResourceComponent,
runGuardsAndResolvers: 'always'
},
}, */
{
path: 'cookie-policy',
component: CookiePolicyComponent
Expand Down
21 changes: 12 additions & 9 deletions src/app/main/header/header.component.html
Expand Up @@ -11,14 +11,15 @@ <h1 class="mat-headline phone-tablet-only">DSP</h1>
<span class="fill-remaining-space"></span>

<!-- search-panel (in desktop and tablet version) -->
<span class="action">
<dsp-search-panel
<!-- <span class="action"> -->
<!-- button to reactivate when dsp-app will be used as a research platform again: -->
<!-- <dsp-search-panel
[projectfilter]="true"
[advanced]="true"
[expert]="true"
(search)="doSearch($event)">
</dsp-search-panel>
<!-- advanced and expert search (in desktop and tablet version) -->
</dsp-search-panel> -->
<!-- to keep? > advanced and expert search (in desktop and tablet version) -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"to keep?" --> good point. I think we can delete it. It could be done in a separate refactoring task

<!-- <span class="other-search-link">
<button mat-button color="primary" class="advanced-search-link" routerLink="/search/advanced">
<span>Advanced search</span>
Expand All @@ -27,7 +28,7 @@ <h1 class="mat-headline phone-tablet-only">DSP</h1>
<span>Expert search</span>
</button>
</span> -->
</span>
<!-- </span> -->

<span class="fill-remaining-space desktop-only"></span>

Expand All @@ -38,9 +39,10 @@ <h1 class="mat-headline phone-tablet-only">DSP</h1>

<!-- action tools: info menu, select language, login button, user menu -->
<span class="action">
<button mat-icon-button *ngIf="session" aria-label="Add a new resource" (click)="openNewResourceForm('createResource')" class="main-toolbar-button new-resource" >
<!-- button to reactivate when dsp-app will be used as a research platform again: -->
<!-- <button mat-icon-button *ngIf="session" aria-label="Add a new resource" (click)="openNewResourceForm('createResource')" class="main-toolbar-button new-resource" >
<mat-icon>add_circle_outline</mat-icon>
</button>
</button> -->

<button mat-button [routerLink]="'/help'" class="main-toolbar-button help">Help</button>

Expand All @@ -58,7 +60,8 @@ <h1 class="mat-headline phone-tablet-only">DSP</h1>
</div>

<!-- search-panel (in phone version) -->
<div class="search-panel-phone" *ngIf="show">
<!-- div to reactivate when dsp-app will be used as a research platform again: -->
<!-- <div class="search-panel-phone" *ngIf="show">
<dsp-fulltext-search class="dsp-fulltext-search" (search)="doSearch($event)" [projectfilter]="true">
</dsp-fulltext-search>
</div>
</div> -->