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

feat(app): version intégrable #43

Open
wants to merge 31 commits into
base: next
Choose a base branch
from
Open

feat(app): version intégrable #43

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
51c4a23
Create filter & list components
matt-litwiller May 19, 2023
ddee8cf
reformatted folder structure for lists & filters
matt-litwiller May 30, 2023
00247d8
simple list reformatting
matt-litwiller May 30, 2023
f6ebeb7
Combining code from igo2-lib and igo2 into igo2-quebec
matt-litwiller Jun 2, 2023
662d9bd
First commit
matt-litwiller Jun 8, 2023
f345883
First commit
matt-litwiller Jun 28, 2023
cc0b3aa
Demo version
matt-litwiller Jul 6, 2023
e7d8d9a
list works with entities
matt-litwiller Jul 7, 2023
13bb81a
Filters, map, and list all interact in the way they should (with some…
matt-litwiller Jul 19, 2023
39631c8
fit map to filtered features
matt-litwiller Jul 19, 2023
7c7b098
reformatted code to make portal contain only the map
matt-litwiller Jul 21, 2023
cdc00ac
Update portal.component.ts
matt-litwiller Jul 31, 2023
6387af5
Components are more modular and their display can be controled with c…
matt-litwiller Aug 7, 2023
0241b15
simpleFilters demo 2 version
matt-litwiller Aug 9, 2023
84a6d40
Merge branch 'master' into simpleFilters2
matt-litwiller Aug 10, 2023
b09694b
merge master into simpleFilters
matt-litwiller Aug 10, 2023
192ee94
bug(app): interractions avec la carte
matt-litwiller Aug 15, 2023
3279bcc
refactor(app): Code cleanup
matt-litwiller Aug 15, 2023
6d3f16e
bug(simple-filters): condition added for uniqueKey
matt-litwiller Aug 15, 2023
379a042
feat(app): embedded version polishing configs, filtering, etc
matt-litwiller Aug 21, 2023
aa6c89b
refactor(*): code cleanup
matt-litwiller Aug 21, 2023
3005956
fix(app): error handling for terrAPI types
matt-litwiller Aug 22, 2023
54ffa29
refactor(simple-list): changed email regex
matt-litwiller Aug 22, 2023
cd9cfc4
Update app.module.ts
matt-litwiller Aug 22, 2023
525ef99
refactor(app): remove angular elements code
matt-litwiller Aug 22, 2023
e3cbf30
Update app.module.ts
matt-litwiller Aug 22, 2023
8423f95
docs(*): code cleanup
matt-litwiller Aug 22, 2023
a174c85
refactor(simpleFeatureList): reformatted regex
matt-litwiller Aug 23, 2023
611169d
refactor(simpleFeatureList): modified interface to match documentation
matt-litwiller Aug 23, 2023
006fdd8
refactor(app): added types for feature selection in list
matt-litwiller Aug 23, 2023
e6cf88f
Update config.json
matt-litwiller Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions package-lock.json
View file
Open in desktop
alecarn marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ne pas commiter ce fichier si aucun changement n'a été apporté aux dépendances du projet.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 41 additions & 3 deletions src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,45 @@
<igo-spinner igoSpinnerActivity></igo-spinner>

<app-header *ngIf="hasHeader" #header></app-header>
<app-header *ngIf="hasHeader && !useEmbeddedVersion" #header></app-header>

<app-menu *ngIf="hasMenu"></app-menu>
<app-menu *ngIf="hasMenu && !useEmbeddedVersion"></app-menu>
Comment on lines +3 to +5
Copy link
Collaborator

Choose a reason for hiding this comment

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

On pourrait wrapper le tout dans une condition if/else.

<ng-container *ngIf="useEmbeddedVersion; else otherContentWithRelevantName">
...Your html for the embeddedVersion
</ng-container>

<ng-template #otherContentWithRelevantName>
...You html for the other content with header, menu and portal
</ng-template>


<app-portal *ngIf="!hasMenu" [ngClass]="hasHeader? 'portal-hasHeader': 'portal'"></app-portal>
<div cdkScrollable *ngIf="useEmbeddedVersion" [ngClass]="isMobile ? 'portal-mobile-embedded': 'portal-desktop-embedded'">
<div [ngClass]="isMobile ? 'filters-and-map-mobile' : showSimpleFeatureList ? (showMap || showSimpleFilters ? 'filters-and-map-desktop' : 'filters-and-map-mobile') : 'filters-and-map-only-desktop'">

<app-simple-filters class="app-simple-filters" *ngIf="showSimpleFilters && workspace"
[entitiesAll]="entitiesAll"
[entitiesList]="entitiesList"
[isMobile]="isMobile"
[terrAPITypes]="terrAPITypes"
[properties]="properties"
[additionalProperties]="additionalProperties"
[dataInitialized]="dataInitialized"
></app-simple-filters>

<app-portal class="app-portal" [ngClass]="hasHeader? 'portal-hasHeader': 'portal'" (workspaceSelected)="setSelectedWorkspace($event)"
(mapQueryEvent)="setClickedEntities($event)"
[features]="features"
[additionalProperties]="additionalProperties"
[entitiesAll]="entitiesAll"
[entitiesList]="entitiesList"
[dataInitialized]="dataInitialized"
></app-portal>

</div>
<div class="list">
<app-simple-feature-list *ngIf="workspace && showSimpleFeatureList"
[entityStore]="workspace.entityStore"
[clickedEntities]="clickedEntities"
[terrAPITypes]="terrAPITypes"
[properties]="properties"
[entitiesAll]="entitiesAll"
[entitiesList]="entitiesList"
[additionalTypes]="additionalTypes"
[additionalProperties]="additionalProperties"
(listSelection)="onListSelection($event)"
></app-simple-feature-list>
</div>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Est-ce qu'on pourrait isoler le code qui concerne le EmbeddedVersion dans une composante. Cela permettrait de mieux segmenter les responsabilités entre le AppComponent et le EmbeddedVersion et d'isoler les futures changements ce qui facilite la maintenance

</div>

<app-portal *ngIf="!hasMenu && !useEmbeddedVersion" [ngClass]="hasHeader? 'portal-hasHeader': 'portal'"></app-portal>
81 changes: 81 additions & 0 deletions src/app/app.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,25 @@
font-family: Roboto, 'Helvetica Neue', sans-serif;
}

.portal-desktop-embedded {
font-family: Roboto, 'Helvetica Neue', sans-serif;
height: 100%;
width: 100%;
overflow: auto;
gap: 20px;
display: flex;
}

.portal-mobile-embedded {
font-family: Roboto, 'Helvetica Neue', sans-serif;
height: 100%;
width: 100%;
overflow: auto;
gap: 20px;
display: flex;
flex-direction: column;
}

/*** Message-center ***/
igo-message-center ::ng-deep simple-notifications ::ng-deep div.simple-notification-wrapper {
right: 10px;
Expand Down Expand Up @@ -49,3 +68,65 @@ igo-spinner {
height: -webkit-fill-available !important;
}
}

spinner-with-legend-dialog {
position: absolute;
top: calc(#{$header-height-mobile} + 4px) !important;
right: 345px;
z-index: 100;
}

@media (min-width: 768px){
igo-spinner {
top: calc(#{$header-height} + 4px)!important;
right: 4px;
z-index: 100;
}

spinner-with-legend-dialog {
top: calc(#{$header-height} + 4px)!important;
right: 345px!important;
z-index: 100;
}
}

.list {
height: fit-content;
width: 100%
}

.filters-and-map-only-desktop {
min-width: 100%;
height: 100%;
display: flex;
gap: 20px;
}

.filters-and-map-only-desktop .app-portal {
width: 100%;
}

.filters-and-map-only-desktop .app-simple-filters {
min-width: 300px;
width: 30%;
}

.filters-and-map-desktop {
min-width: 400;
display: flex;
width: 50%;
flex-direction: column;
height: 100%;
gap: 20px;
height: fit-content;
}

.filters-and-map-mobile {
display: flex;
flex-direction: column;
height: 100%;
gap: 20px;
height: fit-content;
}


Loading
Loading