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.

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

599 bug update rxjs to deal with a dependacy conflict #600

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ad75bff
Updating dependancies
markiianbabiak Jul 17, 2024
9fc4dc9
Updating Angular from v12 to v13
markiianbabiak Jul 17, 2024
d1c82fd
Updating angular v13 to v14
markiianbabiak Jul 17, 2024
d8a7652
Updating Angular from v14 to v15
markiianbabiak Jul 17, 2024
6174912
Updating @angular-eslint from v12 to v15
markiianbabiak Jul 18, 2024
ce5ae7a
Updating @angular/cdk from v12 to v13
markiianbabiak Jul 18, 2024
90f92e6
Updating @angular/cdk from v13 to v14
markiianbabiak Jul 18, 2024
e88e243
Updating @angular/sdk from v14 to v15
markiianbabiak Jul 18, 2024
4aad888
Updating @angular/material from v12 to v13
markiianbabiak Jul 18, 2024
fb5c231
Updating @angular/material from v13 to v14
markiianbabiak Jul 18, 2024
f873115
Updating @angular/material from v14 to v15
markiianbabiak Jul 19, 2024
225e28f
Removing firebase calls
markiianbabiak Jul 19, 2024
57aaa95
Removing a warning during compilation
markiianbabiak Jul 19, 2024
b235501
Fixing errors
markiianbabiak Jul 19, 2024
4e8ce79
Commenting out all the references to fileUploadService
markiianbabiak Jul 19, 2024
638681b
Removing unused imports which messed up the styling
markiianbabiak Jul 19, 2024
8a94f5f
Changes in package-lock.json
markiianbabiak Jul 19, 2024
c30e334
Fixing the icon not showing up correctly
markiianbabiak Aug 26, 2024
de95e62
Fixed return to dashboard projectID undefined bug; fixed cancel x but…
JoelWiebe Aug 29, 2024
120f710
Trying to fix slider visibility issue
marieklinaeva Aug 30, 2024
404b6e6
Merge branch '597-feature-updating-node-to-version-17' of https://git…
marieklinaeva Aug 30, 2024
fe81677
Solved the peer dependancies conflict
markiianbabiak Sep 10, 2024
83d6866
Revert "Solved the peer dependancies conflict"
markiianbabiak Sep 10, 2024
b313dba
Dependencies update for node v18
markiianbabiak Sep 18, 2024
f17373a
Styling fix
markiianbabiak Sep 18, 2024
6faa2f8
Checkpoint
markiianbabiak Sep 27, 2024
d4654ff
Updating files to accommodate new rxjs version
markiianbabiak Sep 28, 2024
0d395b8
Styling fixes
markiianbabiak Sep 28, 2024
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
10,838 changes: 3,879 additions & 6,959 deletions backend/package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@
"@types/crypto-js": "^4.1.1",
"@types/express": "^4.17.13",
"@types/jsonwebtoken": "^8.5.8",
"@types/node": "^17.0.31",
"@types/node": "^18.19.50",
"@types/uuid": "^8.3.4",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"cross-env": "^7.0.3",
"eslint": "^8.17.0",
"migrate-mongo": "^9.0.0",
"ts-node": "^10.7.0",
"ts-node-dev": "^1.1.8",
"typescript": "^4.6.4"
"ts-node": "^10.9.1",
"ts-node-dev": "^2.0.0",
"typescript": "^4.7.4"
},
"author": "",
"license": "ISC",
Expand Down
17 changes: 0 additions & 17 deletions frontend/.browserslistrc

This file was deleted.

1 change: 1 addition & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ chrome-profiler-events*.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
42 changes: 33 additions & 9 deletions frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,17 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"scripts": [],
"allowedCommonJsDependencies": ["fabric"]
"allowedCommonJsDependencies": [
"fabric"
]
},
"configurations": {
"production": {
Expand Down Expand Up @@ -90,23 +97,40 @@
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
}
},
"defaultProject": "ck-board",
"cli": {
"defaultCollection": "@angular-eslint/schematics",
"analytics": false
"analytics": false,
"schematicCollections": [
"@angular-eslint/schematics"
]
},
"schematics": {
"@angular-eslint/schematics:application": {
"setParserOptionsProject": true
},
"@angular-eslint/schematics:library": {
"setParserOptionsProject": true
}
}
}
Loading
Loading