Skip to content

Commit

Permalink
fix: run prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
TKussel committed Sep 26, 2023
1 parent 578d666 commit b060008
Show file tree
Hide file tree
Showing 10 changed files with 10,573 additions and 9,724 deletions.
138 changes: 69 additions & 69 deletions src/app/app.component.css
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
::ng-deep :root {
--color-gray: #3C3C3D;
--color-orange: #dc3545;
--color-blue: #007bff;
--color-site-background: #0036742b;
}

* {
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol;
}

::ng-deep body {
}

/* Selects the app root */
:host {
background: ghostwhite;
display: grid;
/* Angulars Router Outlet is an anchor for inserting components. It will stay, even if component is inserted */
grid-template-rows: auto 0 1fr auto;

height: 100vh;
}

.line {
padding: 0.6rem;
background: white;
border: 1px solid #dee2e6;
border-radius: 4px;
display: flex;
flex-flow: row;
align-items: center;
justify-content: space-between;
}

.main {
display: flex;
overflow: hidden;
gap: 0.6rem;
}

.column {
overflow:auto; /* scrollable */
}

.sidebar {
flex: 1 1 25%;
}

.content {
flex: 1 1 75%
}

::ng-deep .line>p-image>span>img {
max-height: 100px;
min-height: 40px;
}

.ccp-header {
color: #00489c;
font-weight: 200;
font-size: 1.9rem;
font-family: 'Open Sans', sans-serif;
}


::ng-deep lens-result-renderer-grid>.wide-diagram {
grid-column: auto / span 3!important;
}
::ng-deep :root {
--color-gray: #3c3c3d;
--color-orange: #dc3545;
--color-blue: #007bff;
--color-site-background: #0036742b;
}

* {
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica,
Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", Segoe UI Symbol;
}

::ng-deep body {
}

/* Selects the app root */
:host {
background: ghostwhite;
display: grid;
/* Angulars Router Outlet is an anchor for inserting components. It will stay, even if component is inserted */
grid-template-rows: auto 0 1fr auto;

height: 100vh;
}

.line {
padding: 0.6rem;
background: white;
border: 1px solid #dee2e6;
border-radius: 4px;
display: flex;
flex-flow: row;
align-items: center;
justify-content: space-between;
}

.main {
display: flex;
overflow: hidden;
gap: 0.6rem;
}

.column {
overflow: auto; /* scrollable */
}

.sidebar {
flex: 1 1 25%;
}

.content {
flex: 1 1 75%;
}

::ng-deep .line > p-image > span > img {
max-height: 100px;
min-height: 40px;
}

.ccp-header {
color: #00489c;
font-weight: 200;
font-size: 1.9rem;
font-family: "Open Sans", sans-serif;
}

::ng-deep lens-result-renderer-grid > .wide-diagram {
grid-column: auto / span 3 !important;
}
114 changes: 83 additions & 31 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,46 +1,98 @@
<header>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
<a class="navbar-brand" href="index.html"><img src="../assets/images/[email protected]" width="131" height="37" alt="EUCAIM Cancer Image Europe"/>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> </button>
<a class="navbar-brand" href="index.html"
><img
src="../assets/images/[email protected]"
width="131"
height="37"
alt="EUCAIM Cancer Image Europe"
/>
</a>
<button
class="navbar-toggler"
type="button"
data-toggle="collapse"
data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent"
aria-expanded="false"
aria-label="Toggle navigation"
>
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto mr-5">
<li class="nav-item active"> <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a> </li>
<li class="nav-item"> <a class="nav-link" href="public-catalogue.html">PUBLIC CATALOGUE&nbsp;</a> </li>
<li class="nav-item active">
<a class="nav-link" href="#"
>Home <span class="sr-only">(current)</span></a
>
</li>
<li class="nav-item">
<a class="nav-link" href="public-catalogue.html"
>PUBLIC CATALOGUE&nbsp;</a
>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Dropdown </a>
<a
class="nav-link dropdown-toggle"
href="#"
id="navbarDropdown"
role="button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
>
Dropdown
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="#">Action</a> <a class="dropdown-item" href="#">Another action</a>
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Something else here</a>
<a class="dropdown-item" href="#">Something else here</a>
</div>
</li>
<li class="nav-item"> <a class="nav-link disabled" href="#">Disabled</a> </li>
</ul>
<button class="btn btn-profile my-2 my-sm-0"><i class="fa-solid fa-user" style="color: #ffffff; padding-right:5px"></i> My proFILE</button>

<li class="nav-item">
<a class="nav-link disabled" href="#">Disabled</a>
</li>
</ul>
<button class="btn btn-profile my-2 my-sm-0">
<i
class="fa-solid fa-user"
style="color: #ffffff; padding-right: 5px"
></i>
My proFILE
</button>
</div>
</nav>
</header>
<app-main></app-main>

<footer class="d-flex flex-wrap justify-content-between align-items-end pt-5 mt-auto">
</header>
<app-main></app-main>

<footer
class="d-flex flex-wrap justify-content-between align-items-end pt-5 mt-auto"
>
<div class="container row">
<div class="col-md-8 d-flex align-items-center">
<a href="/" class="mb-3 me-2 mb-md-0 text-muted text-decoration-none lh-1">
<img src="../assets/images/[email protected]" width="216" height="66" alt=""/>
</a>
</div>
<div class="col-md-4">


</div>
<a
href="/"
class="mb-3 me-2 mb-md-0 text-muted text-decoration-none lh-1"
>
<img
src="../assets/images/[email protected]"
width="216"
height="66"
alt=""
/>
</a>
</div>
<div class="col-md-4"></div>
</div>
<div class="container-fluid mb-0" style="background-color: #416097;">
<ul class="nav align-items-center justify-content-center">
<li class="nav-item"><a href="#" class="nav-link px-2 text-white">Privacy Policy</a></li>
<li class="nav-item"><a href="#" class="nav-link px-2 text-white">Cookies Policy</a></li>
</ul>
<div class="container-fluid mb-0" style="background-color: #416097">
<ul class="nav align-items-center justify-content-center">
<li class="nav-item">
<a href="#" class="nav-link px-2 text-white">Privacy Policy</a>
</li>
<li class="nav-item">
<a href="#" class="nav-link px-2 text-white">Cookies Policy</a>
</li>
</ul>
</div>


</footer>
21 changes: 8 additions & 13 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@ import {
TypescriptCatalogueFetcherService,
} from '@samply/lens-core';

import {
CqlTranslatorService,
} from '@samply/lens-core/cql';
import { CqlTranslatorService } from '@samply/lens-core/cql';

import {
EucaimResultTransformerService
} from '@samply/lens-core/eucaim'
import { EucaimResultTransformerService } from '@samply/lens-core/eucaim';

import { SearchBarModule } from '@samply/lens-components/search-bar';
import { CriteriaCatalogueModule } from '@samply/lens-components/criteria-catalogue';
Expand Down Expand Up @@ -56,23 +52,22 @@ const routes: Routes = [{ path: '', component: MainComponent }];
providers: [
{
provide: QUERY_TRANSLATOR_TOKEN,
useClass: CqlTranslatorService
useClass: CqlTranslatorService,
},
{
provide: RESULT_TRANSFORMER_TOKEN,
useClass: EucaimResultTransformerService
useClass: EucaimResultTransformerService,
},
{
provide: CATALOGUE_FETCHER_TOKEN,
useClass: TypescriptCatalogueFetcherService
useClass: TypescriptCatalogueFetcherService,
},
{
provide: STATIC_CATALOGUE_TOKEN,
useValue: staticCatalogue
useValue: staticCatalogue,
},
ChipTransformPipe,
],
bootstrap: [AppComponent]
bootstrap: [AppComponent],
})

export class AppModule { }
export class AppModule {}
14 changes: 7 additions & 7 deletions src/app/main/main.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

div {
display: flex;
gap: .6rem;
gap: 0.6rem;
height: 100%;
overflow: hidden;
}
Expand All @@ -27,7 +27,7 @@ div > div {
overflow: auto;
}

.search-bar-wrapper{
.search-bar-wrapper {
display: flex;
align-items: center;
justify-content: space-between;
Expand All @@ -38,7 +38,6 @@ div > div {
overflow: unset;
}


.search-bar-wrapper lens-search-bar {
display: grid;
grid-template-columns: 1fr auto auto;
Expand All @@ -47,13 +46,14 @@ div > div {
grid-gap: 20px;
}
::ng-deep .search-bar-wrapper lens-search-bar div {
margin-top: 0! important;
margin-top: 0 !important;
}

::ng-deep .p-card {
border: solid 1px #27326b;
}

::ng-deep lens-result-summary-bar, ::ng-deep p-chip .p-chip {
background-color: unset!important;
}
::ng-deep lens-result-summary-bar,
::ng-deep p-chip .p-chip {
background-color: unset !important;
}
9 changes: 6 additions & 3 deletions src/app/main/main.component.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@

<div class="search-bar-wrapper">
<lens-search-bar></lens-search-bar>
</div>
<div>
<lens-criteria-catalogue></lens-criteria-catalogue>
<div>
<lens-single-result-renderer [resultRenderer]="summaryBar"></lens-single-result-renderer>
<lens-result-renderer-grid [resultRenderers]="diagrams"></lens-result-renderer-grid>
<lens-single-result-renderer
[resultRenderer]="summaryBar"
></lens-single-result-renderer>
<lens-result-renderer-grid
[resultRenderers]="diagrams"
></lens-result-renderer-grid>
</div>
</div>
Loading

0 comments on commit b060008

Please sign in to comment.