Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
acoffman committed Oct 23, 2024
2 parents b3b6e22 + 6e48267 commit b5d708b
Show file tree
Hide file tree
Showing 256 changed files with 6,506 additions and 3,721 deletions.
6 changes: 2 additions & 4 deletions client/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ root = true

[*]
charset = utf-8
tab_width = 2
indent_style = space
indent_size = 2
indent_size = tab
insert_final_newline = true
trim_trailing_whitespace = true

Expand All @@ -17,8 +18,5 @@ trim_trailing_whitespace = false

[*.less]
quote_type = double
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true
1 change: 1 addition & 0 deletions client/.graphqlrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ extensions:
- fragment-matcher
config:
apolloClientVersion: 3
useExplicitTyping: false
./src/app/generated/civic.apollo-helpers.ts:
plugins:
- typescript-apollo-client-helpers
Expand Down
15 changes: 15 additions & 0 deletions client/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against CIViC Dev",
"url": "http://127.0.0.1:4200",
"webRoot": "${workspaceFolder}"
}
]
}
9 changes: 9 additions & 0 deletions client/apollo.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"client": {
"service": {
// can be a string pointing to a single file or an array of strings
"localSchemaFile": "./src/app/generated/server.model.graphql"
},
"excludes": ["./src/app/generated/*.ts", "./src/app/generated/*.json"]
}
}
2 changes: 2 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
"rxjs-spy": "^8.0.2",
"ts-enum-util": "^4.0.2",
"ts-mixin-extended": "^1.1.1",
"vscroll": "1.6.1",
"ngx-ui-scroll": "3.2.0",
"zone.js": "0.14.3"
},
"devDependencies": {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit b5d708b

Please sign in to comment.