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

3.1.0 -> 3.2.0 #76

Merged
merged 48 commits into from
Jan 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
313d6b9
added auth and reconfiguring firebase
Dec 31, 2021
e62a958
cleaning for update
Dec 31, 2021
62acfbe
stashing for update
Dec 31, 2021
c0f253c
installing store
Dec 31, 2021
86c0dda
after store update
Dec 31, 2021
3b96834
after cli update
Dec 31, 2021
a5c89be
after cli update
Dec 31, 2021
45008f4
after CDK 10 update
Dec 31, 2021
7bf0901
updated angular material9
Dec 31, 2021
37aee39
updating to cli11
Dec 31, 2021
5cd5b5c
before update from 12-13
Dec 31, 2021
8fc74b2
after update to cdk 12
Dec 31, 2021
c853978
after failed material 10 update
Dec 31, 2021
3018d06
updated cli finally
Dec 31, 2021
62bf606
Finalizing CLI update
Dec 31, 2021
5fcbb5a
before final cdk update
Dec 31, 2021
9fb3795
After pushed update to 13
Dec 31, 2021
d4c7659
before updateing to material 12
Dec 31, 2021
fdecade
updating dialog refs
Dec 31, 2021
c8abdc0
updated angular material
Dec 31, 2021
8661b71
fixing breaks due to update
Dec 31, 2021
c44dba7
"adding before fire update"
Dec 31, 2021
d8d8629
commit before updating fire
Dec 31, 2021
38f2e57
updated angular fire
Dec 31, 2021
b3ce381
uninstalled angular fire
Dec 31, 2021
93ee8c9
updated code FINALLY compiling
Dec 31, 2021
5a1acda
updated firebase
Jan 1, 2022
634eac6
working through fire bugs
Jan 1, 2022
287cc9f
hidden file updates
Jan 1, 2022
bb8e145
updated firebase to avoid compat versions to avoid error
Jan 1, 2022
2afece3
removed collections service and ml modals as they are unusued
Jan 1, 2022
7fb8b74
support for login and file saving implemented
Jan 2, 2022
15bc72f
writes user state to db to recover last state on login
Jan 2, 2022
1f4ca32
implementing auth and bug fixing subsequent breaks from update
Jan 3, 2022
1b62f1c
fixed errors on expand draft
Jan 3, 2022
13e08e3
fixed scaling bugs by adding support for scaling notes and fixing id …
Jan 3, 2022
dc98990
removed ada files from download and import
Jan 4, 2022
63076d8
added dimensions to marquee and removed snackbar on marquee
Jan 4, 2022
70f8840
updated join left and join top to default to unset and support materials
Jan 6, 2022
c7b827b
added color support to assign warp and weft
Jan 6, 2022
9a2673f
fixed upload forms to work with updated firebase config
Jan 6, 2022
2bde938
added materials support to overlay
Jan 6, 2022
461efd5
file name updates, material updates
Jan 6, 2022
b8a7f00
added standardized systems on assigning warp and weft
Jan 6, 2022
0776dcb
fixed type error on checkbox op params
Jan 6, 2022
a974c9b
added support for loading node names
Jan 6, 2022
026d630
fixed filename bug
Jan 6, 2022
82aa15d
fixed error on creating draft from selection
Jan 7, 2022
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
File renamed without changes.
11 changes: 10 additions & 1 deletion .firebaserc
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
{
"projects": {
"default": "adacad-weaver"
},
"targets": {
"adacad-weaver": {
"hosting": {
"adacad-weaver": [
"adacad-weaver"
]
}
}
}
}
}
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
!.vscode/extensions.json

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand All @@ -42,3 +43,8 @@ testem.log
# System Files
.DS_Store
Thumbs.db

# Firebase
.firebase
*-debug.log
.runtimeconfig.json
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}
46 changes: 17 additions & 29 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@
"styles": [
"src/styles.scss"
],
"scripts": []
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand All @@ -36,9 +42,7 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand All @@ -49,7 +53,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down Expand Up @@ -85,21 +90,15 @@
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"deploy": {
"builder": "@angular/fire:deploy",
"options": {}
"options": {
"prerender": false,
"ssr": false,
"browserTarget": "adacad-weaver:build:production",
"firebaseProject": "adacad-weaver",
"firebaseHostingSite": "adacad-weaver"
}
}
}
},
Expand All @@ -114,17 +113,6 @@
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "adacad-weaver:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
Expand All @@ -133,7 +121,7 @@
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
"style": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
Expand Down
65 changes: 50 additions & 15 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,51 @@
{
"hosting": {
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
}
"hosting": [
{
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
},
{
"target": "adacad-weaver",
"public": "dist",
"ignore": [
"**/.*"
],
"headers": [
{
"source": "*.[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].+(css|js)",
"headers": [
{
"key": "Cache-Control",
"value": "public,max-age=31536000,immutable"
}
]
},
{
"source": "/@(ngsw-worker.js|ngsw.json)",
"headers": [
{
"key": "Cache-Control",
"value": "no-cache"
}
]
}
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
]
}
Loading