Commit da2f1319 authored by Tifenn Guillas's avatar Tifenn Guillas
Browse files

Change design for datatable

parent c687104d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<app-anis-nav [isAuthenticated]="isAuthenticated | async" [loginToken]="loginToken | async" (logout)="logout()"> <app-anis-nav [isAuthenticated]="isAuthenticated | async" [loginToken]="loginToken | async" (logout)="logout()">
</app-anis-nav> </app-anis-nav>
</header> </header>
<main role="main" class="container flex-shrink-0 pb-4"> <main role="main" class="container-fluid pb-4">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</main> </main>
<footer class="footer mt-auto bg-light"> <footer class="footer mt-auto bg-light">
......
...@@ -91,15 +91,15 @@ ...@@ -91,15 +91,15 @@
} }
.datasetStep { .datasetStep {
width: 10%; width: 11%;
} }
.criteriaStep { .criteriaStep {
width: 35%; width: 36%;
} }
.outputStep { .outputStep {
width: 60%; width: 61%;
} }
.resultStep { .resultStep {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</div> </div>
<div *ngIf="(criteriaSearchMetaIsLoaded | async) && (datasetSearchMetaIsLoaded | async) && (attributeSearchMetaIsLoaded | async)" <div *ngIf="(criteriaSearchMetaIsLoaded | async) && (datasetSearchMetaIsLoaded | async) && (attributeSearchMetaIsLoaded | async)"
class="row mt-4"> class="row mt-4">
<div class="col-12 col-md-8"> <div class="col-12 col-md-8 col-lg-9">
<app-criteria-tabs <app-criteria-tabs
[criteriaFamilyList]="criteriaFamilyList | async" [criteriaFamilyList]="criteriaFamilyList | async"
[datasetAttributeList]="datasetAttributeList | async" [datasetAttributeList]="datasetAttributeList | async"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
(deleteCriterion)="deleteCriterion($event)"> (deleteCriterion)="deleteCriterion($event)">
</app-criteria-tabs> </app-criteria-tabs>
</div> </div>
<div class="col-12 col-md-4 pt-2"> <div class="col-12 col-md-4 col-lg-3 pt-2">
<app-summary <app-summary
[datasetName]="datasetName | async" [datasetName]="datasetName | async"
[currentStep]="currentStep | async" [currentStep]="currentStep | async"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<span class="sr-only">Loading...</span> <span class="sr-only">Loading...</span>
</div> </div>
<div *ngIf="datasetSearchMetaIsLoaded | async" class="row mt-4"> <div *ngIf="datasetSearchMetaIsLoaded | async" class="row mt-4">
<div class="col-12 col-md-8"> <div class="col-12 col-md-8 col-lg-9">
<app-dataset-tabs <app-dataset-tabs
[projectList]="projectList | async" [projectList]="projectList | async"
[datasetList]="datasetList | async" [datasetList]="datasetList | async"
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
(select)="selectDataset($event)"> (select)="selectDataset($event)">
</app-dataset-tabs> </app-dataset-tabs>
</div> </div>
<div class="col-12 col-md-4 pt-2"> <div class="col-12 col-md-4 col-lg-3 pt-2">
<div *ngIf="attributeSearchMetaIsLoading | async" class="row justify-content-center mt-5"> <div *ngIf="attributeSearchMetaIsLoading | async" class="row justify-content-center mt-5">
<span class="fas fa-circle-notch fa-spin fa-3x"></span> <span class="fas fa-circle-notch fa-spin fa-3x"></span>
<span class="sr-only">Loading...</span> <span class="sr-only">Loading...</span>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</div> </div>
<div *ngIf="(outputSearchMetaIsLoaded | async) && (datasetSearchMetaIsLoaded | async) && (attributeSearchMetaIsLoaded | async)" <div *ngIf="(outputSearchMetaIsLoaded | async) && (datasetSearchMetaIsLoaded | async) && (attributeSearchMetaIsLoaded | async)"
class="row mt-4"> class="row mt-4">
<div class="col-12 col-md-8"> <div class="col-12 col-md-8 col-lg-9">
<app-output-tabs <app-output-tabs
[outputFamilyList]="outputFamilyList | async" [outputFamilyList]="outputFamilyList | async"
[categoryList]="categoryList | async" [categoryList]="categoryList | async"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
(changed)="updateOutputList($event)"> (changed)="updateOutputList($event)">
</app-output-tabs> </app-output-tabs>
</div> </div>
<div class="col-12 col-md-4 pt-2"> <div class="col-12 col-md-4 col-lg-3 pt-2">
<app-summary <app-summary
[datasetName]="datasetName | async" [datasetName]="datasetName | async"
[currentStep]="currentStep | async" [currentStep]="currentStep | async"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<span class="sr-only">Loading...</span> <span class="sr-only">Loading...</span>
</div> </div>
<div *ngIf="(datasetSearchMetaIsLoaded | async) && (attributeSearchMetaIsLoaded | async)" class="row mt-4"> <div *ngIf="(datasetSearchMetaIsLoaded | async) && (attributeSearchMetaIsLoaded | async)" class="row mt-4">
<div class="col-12 col-md-8"> <div class="col-12 col-md-8 col-lg-9">
<app-url-display <app-url-display
[apiPath]="apiPath" [apiPath]="apiPath"
[instanceName]="instanceName" [instanceName]="instanceName"
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
(executeProcess)="executeProcess($event)"> (executeProcess)="executeProcess($event)">
</app-datatable> </app-datatable>
</div> </div>
<div class="col-12 col-md-4 pt-2"> <div class="col-12 col-md-4 col-lg-3 pt-2">
<app-summary <app-summary
[datasetName]="datasetName | async" [datasetName]="datasetName | async"
[currentStep]="currentStep | async" [currentStep]="currentStep | async"
......
<app-progress <div class="mx-5 px-5">
[currentStep]="currentStep | async" <app-progress
[datasetName]="datasetName | async" [currentStep]="currentStep | async"
[criteriaStepChecked]="criteriaStepChecked | async" [datasetName]="datasetName | async"
[outputStepChecked]="outputStepChecked | async" [criteriaStepChecked]="criteriaStepChecked | async"
[resultStepChecked]="resultStepChecked | async" [outputStepChecked]="outputStepChecked | async"
[queryParams]="queryParams | async"> [resultStepChecked]="resultStepChecked | async"
</app-progress> [queryParams]="queryParams | async">
<router-outlet></router-outlet> </app-progress>
\ No newline at end of file <router-outlet></router-outlet>
</div>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment