Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
cptpiepmatz committed Aug 21, 2024
2 parents a4eb55b + 413077d commit 9608d7b
Show file tree
Hide file tree
Showing 9 changed files with 6,491 additions and 5,790 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ package-lock.json

# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
Expand Down
3 changes: 2 additions & 1 deletion .meta
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"./wisdom_modules/pump-models": "https://github.com/wisdom-oss/frontend-pump-models.git",
"./wisdom_modules/water-usage-forecasts": "https://github.com/wisdom-oss/frontend-water-usage-forecasts.git",
"./wisdom_modules/be-water-smart": "https://github.com/wisdom-oss/frontend-be-water-smart.git",
"./wisdom_modules/weather-data": "https://github.com/wisdom-oss/frontend-weather-data.git"
"./wisdom_modules/weather-data": "https://github.com/wisdom-oss/frontend-weather-data.git",
"./wisdom_modules/growl": "https://github.com/wisdom-oss/frontend-growl.git"
}
}
33 changes: 33 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,39 @@
}
}
}
},
"growl": {
"projectType": "library",
"root": "wisdom_modules/growl",
"sourceRoot": "wisdom_modules/growl/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "wisdom_modules/growl/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "wisdom_modules/growl/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "wisdom_modules/growl/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "wisdom_modules/growl/tsconfig.spec.json",
"polyfills": [
"zone.js",
"zone.js/testing"
]
}
}
}
}
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"bulma": "^0.9.4",
"bulma-calendar": "^6.1.19",
"bulma-prefers-dark": "0.1.0-beta.1",
"bulma-slider": "^2.0.5",
"bulma-switch": "^2.0.4",
"chart.js": "~4.4.1",
"chartjs-plugin-annotation": "^3.0.1",
Expand Down
Loading

0 comments on commit 9608d7b

Please sign in to comment.