Skip to content

Commit

Permalink
fix: add logo database if no source logo (#504)
Browse files Browse the repository at this point in the history
* fix: add logo database if no source logo

* fix: source defaut logo header and dora footer
  • Loading branch information
abelkhay committed Mar 27, 2024
1 parent 9445a5e commit c65ef8a
Show file tree
Hide file tree
Showing 13 changed files with 394 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/assets/fonts/remixicon/collection.remixicon
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
wifi-line,computer-line,printer-line,phone-line,map-pin-2-line,add-line,check-line,checkbox-blank-circle-line,calendar-check-line,mail-line,arrow-right-s-line,arrow-left-s-line,notification-3-line,mouse-line,group-line,wheelchair-line,parent-line,mail-line,user-3-line,tools-line,error-warning-line,service-line,checkbox-blank-circle-fill,equalizer-fill,account-pin-circle-fill,arrow-right-circle-fill,arrow-left-circle-fill,external-link-line,arrow-go-back-line,file-text-line,link,list-check,mail-send-line,skip-forward-line,map-pin-5-line,settings-4-line,calendar-todo-line,road-map-line,subtract-line,smartphone-line,user-line,user-star-line,slideshow-line,stethoscope-line,shopping-cart-line,settings-5-line,contacts-line,medal-line,image-2-line,pen-nib-line,map-pin-4-line,map-2-line,focus-3-line,sound-module-line,arrow-left-right-line,arrow-down-s-line,account-circle-fill,close-line,close-circle-fill,edit-line,information-line,close-circle-line,alert-line,compass-3-line,arrow-drop-right-fill,search-line,question-line,menu-line,map-pin-2-fill,pie-chart-2-fill,bank-fill,medal-2-line,community-line,timer-fill,arrow-down-line,smartphone-fill,mouse-fill,calendar-fill,vip-crown-fill,image-fill,medal-2-fill,parent-fill,palette-fill,stethoscope-fill,user-star-fill,wifi-fill,lifebuoy-fill,settings-5-fill,shopping-cart-fill,calendar-event-fill,arrow-right-line,arrow-left-line,user-fill,slideshow-2-fill,service-fill,group-fill,star-line,book-marked-line
,download-2-line
,download-2-line,numbers-fill,database-2-line
Binary file modified src/assets/fonts/remixicon/remixicon.eot
Binary file not shown.
366 changes: 354 additions & 12 deletions src/assets/fonts/remixicon/remixicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/assets/fonts/remixicon/remixicon.symbol.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/fonts/remixicon/remixicon.ttf
Binary file not shown.
Binary file modified src/assets/fonts/remixicon/remixicon.woff
Binary file not shown.
Binary file modified src/assets/fonts/remixicon/remixicon.woff2
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h1 class="h2 fw-bold mb-0 text-first-letter-uppercase">
<a
role="button"
(click)="scrollToSource.emit()"
*ngIf="source.logo as logo"
*ngIf="source.logo as logo; else noLogo"
class="d-none d-sm-block text-secondary mt-1 circle-wrapper">
<span class="circle-wrapper">
<img
Expand All @@ -63,6 +63,15 @@ <h1 class="h2 fw-bold mb-0 text-first-letter-uppercase">
alt="{{ source.label }}" />
</span>
</a>
<ng-template #noLogo>
<span class="circle-wrapper mt-1">
<span
role="img"
class="ri-lg ri-database-2-line text-primary"
title="{{ source.label }}"
aria-hidden="true"></span>
</span>
</ng-template>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ <h2 class="h5 text-muted text-uppercase mt-1 flex-grow-1">Une erreur sur les don
Vous travaillez dans cette structure ou 锚tes habilit茅s 脿 mettre 脿 jour les donn茅es de cette fiche ?
<br />
Si besoin, nous organisons des webinaires mensuels pour vous accompagner dans cette mise 脿 jour.
<div class="mt-2 row g-3">
<div #source class="mt-2 row g-3">
<div class="col-sm-6 col-12">
<app-source-footer [sources]="lieuMediationNumerique.source"></app-source-footer>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@
<div class="col-auto d-flex g-2">
<span *ngFor="let source of sources" class="circle-wrapper-light square-xl me-2">
<img
*ngIf="source.logo as logo"
*ngIf="source.update_link as update_link; else noUpdateLink"
class="img-fluid p-2"
[src]="assetsConfiguration.path + '/img/logo/source-update/' + logo + '.svg'"
[src]="assetsConfiguration.path + '/img/logo/source-update/' + source.logo + '.svg'"
alt="{{ source.label }}" />
<ng-template #noUpdateLink>
<img
class="img-fluid p-2"
[src]="assetsConfiguration.path + '/img/logo/source-update/' + 'dora.svg'"
alt="{{ source.label }}" />
</ng-template>
</span>
</div>
<div class="col">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ export class SourceFooterComponent {
public constructor(@Inject(ASSETS_TOKEN) public assetsConfiguration: AssetsConfiguration) {}

public getFirstUpdateLink(sources: SourcePresentation[] | undefined): string {
return sources?.find((source) => source.update_link)?.update_link || '';
return (
sources?.find((source) => source.update_link)?.update_link ||
'https://dora.inclusion.beta.gouv.fr/auth/connexion?next=%2F'
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,15 @@ const availableSourcesMap: Map<string, SourcePresentation> = new Map<string, Sou
logo: 'aidants-connect'
}
],
[
'Mairie Aix en Provence',
{
label: 'Ville Aix en Provence',
link: 'https://www.data.gouv.fr/fr/datasets/lieux-de-mediation-numerique-sur-le-territoire-bouches-du-rhone-fournis-par-mairie-aix-en-provence/',
detail: "Ces donn茅es sont int茅gr茅es via l'outil DORA",
logo: ''
}
],
[
'Angers',
{
Expand Down
4 changes: 4 additions & 0 deletions src/scss/components/_icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -537,3 +537,7 @@ $font-family-icons-lower: string.to-lower-case($font-family-icons);
.ri-download-2-fill::before {
content: '\ec53';
}

.ri-database-2-line::before {
content: '\ec16';
}

0 comments on commit c65ef8a

Please sign in to comment.