Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nghyd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Cassiopée
nghyd
Commits
83fc88b4
Commit
83fc88b4
authored
1 year ago
by
AUBRY JEAN-PASCAL
Browse files
Options
Downloads
Patches
Plain Diff
fix: add MaterialFileInputModule to make work ngx-mat-file-input
Refs
#659
parent
f5bf0e93
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!275
Release v4.19.0
,
!256
Mise à jour vers Angular 15
Pipeline
#170945
passed
1 year ago
Stage: install
Stage: build
Stage: clean-stale-branches
Stage: deploy-dev
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
package-lock.json
+18
-2
18 additions, 2 deletions
package-lock.json
package.json
+3
-2
3 additions, 2 deletions
package.json
src/app/app.module.ts
+11
-9
11 additions, 9 deletions
src/app/app.module.ts
with
32 additions
and
13 deletions
package-lock.json
+
18
−
2
View file @
83fc88b4
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
"mermaid": "^9.1.3",
"mermaid": "^9.1.3",
"ng2-charts": "^4.1.1",
"ng2-charts": "^4.1.1",
"ngx-markdown": "^15.1.2",
"ngx-markdown": "^15.1.2",
"ngx-material-file-input": "^4.0.1",
"ngx-webstorage-service": "^5.0.0",
"ngx-webstorage-service": "^5.0.0",
"pako": "^2.0.4",
"pako": "^2.0.4",
"primeng": "^15.4.1",
"primeng": "^15.4.1",
...
@@ -47,7 +48,6 @@
...
@@ -47,7 +48,6 @@
"rxjs": "^7.5.5",
"rxjs": "^7.5.5",
"screenfull": "^6.0.2",
"screenfull": "^6.0.2",
"svg-pan-zoom": "^3.6.1",
"svg-pan-zoom": "^3.6.1",
"tslib": "^2.4.0",
"webdriver-manager": "^12.1.9",
"webdriver-manager": "^12.1.9",
"xlsx": "^0.18.5",
"xlsx": "^0.18.5",
"zone.js": "~0.11.6"
"zone.js": "~0.11.6"
...
@@ -81,6 +81,7 @@
...
@@ -81,6 +81,7 @@
"jasmine-core": "~4.2.0",
"jasmine-core": "~4.2.0",
"jasmine-spec-reporter": "~7.0.0",
"jasmine-spec-reporter": "~7.0.0",
"ts-node": "^10.8.2",
"ts-node": "^10.8.2",
"tslib": "^2.6.2",
"typescript": "^4.8.2",
"typescript": "^4.8.2",
"wdio-wait-for": "^3.0.10",
"wdio-wait-for": "^3.0.10",
"webpack-dev-server": "^4.9.3"
"webpack-dev-server": "^4.9.3"
...
@@ -18181,6 +18182,20 @@
...
@@ -18181,6 +18182,20 @@
"zone.js": "~0.11.4 || ~0.12.0 || ~0.13.0"
"zone.js": "~0.11.4 || ~0.12.0 || ~0.13.0"
}
}
},
},
"node_modules/ngx-material-file-input": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/ngx-material-file-input/-/ngx-material-file-input-4.0.1.tgz",
"integrity": "sha512-syYvwlAdbiUkXFRQENfJSYErQLzRY0xnUIIDgwMeOw8uIZp+FyuTrFpOqA2yBVumi/EKdi4afv6fSHrNwrKvbg==",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/cdk": "^14.0.0",
"@angular/common": "^14.0.0",
"@angular/core": "^14.0.0",
"@angular/material": "^14.0.0"
}
},
"node_modules/ngx-webstorage-service": {
"node_modules/ngx-webstorage-service": {
"version": "5.0.0",
"version": "5.0.0",
"license": "MIT",
"license": "MIT",
...
@@ -23475,7 +23490,8 @@
...
@@ -23475,7 +23490,8 @@
},
},
"node_modules/tslib": {
"node_modules/tslib": {
"version": "2.6.2",
"version": "2.6.2",
"license": "0BSD"
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
},
},
"node_modules/tslint": {
"node_modules/tslint": {
"version": "6.1.3",
"version": "6.1.3",
...
...
This diff is collapsed.
Click to expand it.
package.json
+
3
−
2
View file @
83fc88b4
...
@@ -70,6 +70,7 @@
...
@@ -70,6 +70,7 @@
"
mermaid
"
:
"
^9.1.3
"
,
"
mermaid
"
:
"
^9.1.3
"
,
"
ng2-charts
"
:
"
^4.1.1
"
,
"
ng2-charts
"
:
"
^4.1.1
"
,
"
ngx-markdown
"
:
"
^15.1.2
"
,
"
ngx-markdown
"
:
"
^15.1.2
"
,
"
ngx-material-file-input
"
:
"
^4.0.1
"
,
"
ngx-webstorage-service
"
:
"
^5.0.0
"
,
"
ngx-webstorage-service
"
:
"
^5.0.0
"
,
"
pako
"
:
"
^2.0.4
"
,
"
pako
"
:
"
^2.0.4
"
,
"
primeng
"
:
"
^15.4.1
"
,
"
primeng
"
:
"
^15.4.1
"
,
...
@@ -77,7 +78,6 @@
...
@@ -77,7 +78,6 @@
"
rxjs
"
:
"
^7.5.5
"
,
"
rxjs
"
:
"
^7.5.5
"
,
"
screenfull
"
:
"
^6.0.2
"
,
"
screenfull
"
:
"
^6.0.2
"
,
"
svg-pan-zoom
"
:
"
^3.6.1
"
,
"
svg-pan-zoom
"
:
"
^3.6.1
"
,
"
tslib
"
:
"
^2.4.0
"
,
"
webdriver-manager
"
:
"
^12.1.9
"
,
"
webdriver-manager
"
:
"
^12.1.9
"
,
"
xlsx
"
:
"
^0.18.5
"
,
"
xlsx
"
:
"
^0.18.5
"
,
"
zone.js
"
:
"
~0.11.6
"
"
zone.js
"
:
"
~0.11.6
"
...
@@ -111,8 +111,9 @@
...
@@ -111,8 +111,9 @@
"
jasmine-core
"
:
"
~4.2.0
"
,
"
jasmine-core
"
:
"
~4.2.0
"
,
"
jasmine-spec-reporter
"
:
"
~7.0.0
"
,
"
jasmine-spec-reporter
"
:
"
~7.0.0
"
,
"
ts-node
"
:
"
^10.8.2
"
,
"
ts-node
"
:
"
^10.8.2
"
,
"
tslib
"
:
"
^2.6.2
"
,
"
typescript
"
:
"
^4.8.2
"
,
"
typescript
"
:
"
^4.8.2
"
,
"
wdio-wait-for
"
:
"
^3.0.10
"
,
"
wdio-wait-for
"
:
"
^3.0.10
"
,
"
webpack-dev-server
"
:
"
^4.9.3
"
"
webpack-dev-server
"
:
"
^4.9.3
"
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/app/app.module.ts
+
11
−
9
View file @
83fc88b4
...
@@ -23,14 +23,14 @@ import { MatLegacyTableModule as MatTableModule } from "@angular/material/legacy
...
@@ -23,14 +23,14 @@ import { MatLegacyTableModule as MatTableModule } from "@angular/material/legacy
import
{
MatLegacyTabsModule
as
MatTabsModule
}
from
"
@angular/material/legacy-tabs
"
;
import
{
MatLegacyTabsModule
as
MatTabsModule
}
from
"
@angular/material/legacy-tabs
"
;
import
{
MatToolbarModule
}
from
"
@angular/material/toolbar
"
;
import
{
MatToolbarModule
}
from
"
@angular/material/toolbar
"
;
import
{
MatLegacyTooltipModule
as
MatTooltipModule
}
from
"
@angular/material/legacy-tooltip
"
;
import
{
MatLegacyTooltipModule
as
MatTooltipModule
}
from
"
@angular/material/legacy-tooltip
"
;
import
{
MatExpansionModule
}
from
'
@angular/material/expansion
'
;
import
{
MatExpansionModule
}
from
"
@angular/material/expansion
"
;
import
{
DragDropModule
}
from
"
@angular/cdk/drag-drop
"
;
import
{
DragDropModule
}
from
"
@angular/cdk/drag-drop
"
;
import
{
TableModule
}
from
"
primeng/table
"
;
import
{
TableModule
}
from
"
primeng/table
"
;
import
{
MarkdownModule
,
MarkedOptions
}
from
"
ngx-markdown
"
;
import
{
MarkdownModule
,
MarkedOptions
}
from
"
ngx-markdown
"
;
import
{
FlexLayoutModule
}
from
'
@ngbracket/ngx-layout
'
;
import
{
FlexLayoutModule
}
from
"
@ngbracket/ngx-layout
"
;
import
{
import
{
CustomBreakPointsProvider
,
CustomBreakPointsProvider
,
FlexGtXxsShowHideDirective
,
FlexGtXxsShowHideDirective
,
...
@@ -123,10 +123,11 @@ import { DialogConfirmLoadSessionURLComponent } from "./components/dialog-confir
...
@@ -123,10 +123,11 @@ import { DialogConfirmLoadSessionURLComponent } from "./components/dialog-confir
import
{
BasinFieldsetContainerComponent
}
from
"
./components/basin-fieldset-container/basin-fieldset-container.component
"
;
import
{
BasinFieldsetContainerComponent
}
from
"
./components/basin-fieldset-container/basin-fieldset-container.component
"
;
import
{
PrebarrageService
}
from
"
./services/prebarrage.service
"
;
import
{
PrebarrageService
}
from
"
./services/prebarrage.service
"
;
import
{
SelectSectionDetailsComponent
}
from
"
./components/select-section-details/select-section-details.component
"
;
import
{
SelectSectionDetailsComponent
}
from
"
./components/select-section-details/select-section-details.component
"
;
import
{
ServiceWorkerModule
}
from
'
@angular/service-worker
'
;
import
{
ServiceWorkerModule
}
from
"
@angular/service-worker
"
;
import
{
environment
}
from
'
../environments/environment
'
;
import
{
environment
}
from
"
../environments/environment
"
;
import
{
ServiceWorkerUpdateService
}
from
"
./services/service-worker-update.service
"
;
import
{
ServiceWorkerUpdateService
}
from
"
./services/service-worker-update.service
"
;
import
{
UserConfirmationService
}
from
"
./services/user-confirmation.service
"
;
import
{
UserConfirmationService
}
from
"
./services/user-confirmation.service
"
;
import
{
MaterialFileInputModule
}
from
"
ngx-material-file-input
"
;
const
appRoutes
:
Routes
=
[
const
appRoutes
:
Routes
=
[
{
path
:
"
list/search
"
,
component
:
CalculatorListComponent
},
{
path
:
"
list/search
"
,
component
:
CalculatorListComponent
},
...
@@ -180,6 +181,7 @@ const appRoutes: Routes = [
...
@@ -180,6 +181,7 @@ const appRoutes: Routes = [
MatToolbarModule
,
MatToolbarModule
,
MatTooltipModule
,
MatTooltipModule
,
MatExpansionModule
,
MatExpansionModule
,
MaterialFileInputModule
,
NgxMatomoTrackerModule
.
forRoot
({
NgxMatomoTrackerModule
.
forRoot
({
// Matomo open-source Web analytics
// Matomo open-source Web analytics
siteId
:
1
,
siteId
:
1
,
...
@@ -190,11 +192,11 @@ const appRoutes: Routes = [
...
@@ -190,11 +192,11 @@ const appRoutes: Routes = [
enableTracing
:
false
enableTracing
:
false
}),
}),
TableModule
,
TableModule
,
ServiceWorkerModule
.
register
(
'
ngsw-worker.js
'
,
{
ServiceWorkerModule
.
register
(
"
ngsw-worker.js
"
,
{
enabled
:
environment
.
production
,
enabled
:
environment
.
production
,
// Register the ServiceWorker as soon as the application is stable
// Register the ServiceWorker as soon as the application is stable
// or after 30 seconds (whichever comes first).
// or after 30 seconds (whichever comes first).
registrationStrategy
:
'
registerWhenStable:30000
'
registrationStrategy
:
"
registerWhenStable:30000
"
})
})
],
],
declarations
:
[
declarations
:
[
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment