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.

Sign up for GitHub

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

Jump to bottom

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

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f8c44f
refactor(app+main): comment out routes and tags related to resources,…
Jan 27, 2021
52e90f2
doc(readme): add info about the new branch system
Jan 27, 2021
c861530
refactor(readme): update readme
Jan 28, 2021
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
5 changes: 3 additions & 2 deletions src/app/app-global.ts
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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> -->