Skip to content

Commit

Permalink
Openapi client migration (#106)
Browse files Browse the repository at this point in the history
* keeping local model + implementing interface from client
* fixed V2 blankscreen
* fixed machete-client package, moved models to shared/models common dir
* migrated EmployersService to generated client
* Migrated ExportsService, added file download workaround
* more error logging, rm'ed redundant constructor args
* remaining app services converted to machete-client; consolidated reports
* commented out inactive, unpublished workers stuff
* fixed unit tests
nits broke cypress test. reverting.


new assets from ultima-12


wipz getting angular 12 css to work


primeng12 menu system mostly working. some png 404s. 

disabled the app-config menu configure tool. getting 'no value accessor' from ng-html stuff
restoring pngs, disabling Esteban's dashboard for now

 move profile functionality to inlinemenu
.


.


npm update


fix for angular 12 process variable missing

https://stackoverflow.com/questions/68630040/jasmine-karma-fails-with-referenceerror-process-is-not-defined/68641405#68641405
added tests and menu-rule update


support nested menus in MenuRule


routing array consolidation


.
  • Loading branch information
jcii committed Nov 20, 2022
1 parent 338ff78 commit f813c35
Show file tree
Hide file tree
Showing 372 changed files with 53,739 additions and 52,596 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
node-version: [12.x]
node-version: [14.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14.18.2
24 changes: 24 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,30 @@
"name": "Attach to Chrome",
"port": 9222,
"webRoot": "${workspaceRoot}"
},
{
"type": "chrome",
"request": "attach",
"name": "Attach to Karma",
"address": "localhost",
"restart": true,
"port": 9222,
"timeout": 600000,
"sourceMaps": true,
"webRoot": "${workspaceFolder}",
"pathMapping": {
"/_karma_webpack_": "${workspaceFolder}"
}
},
{
"type": "node",
"request": "launch",
"name": "Run test file",
"skipFiles": ["<node_internals>/**"],
"console": "integratedTerminal",
"program": "${workspaceFolder}/node_modules/.bin/ng",
"args": ["test", "--include", "${relativeFile}"],
"outFiles": ["${workspaceFolder}/**/*.js"]
}
]
}
36 changes: 21 additions & 15 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,30 @@
"file-saver",
"paypal-checkout",
"content-disposition",
"@ctrl/ngx-codemirror"
"@ctrl/ngx-codemirror",
"codemirror/addon/edit/closebrackets",
"codemirror/addon/edit/closetag",
"codemirror/addon/edit/matchbrackets",
"codemirror/addon/hint/show-hint",
"codemirror/addon/hint/sql-hint",
"codemirror/addon/scroll/simplescrollbars",
"codemirror/addon/selection/active-line",
"codemirror/mode/sql/sql"
],
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"assets": [
"src/assets",
{
"glob": "**/*",
"input": "src/assets/",
"ignore": [
"**/*.scss"
],
"output": "/assets/"
},
"src/favicon.ico",
{
"glob": "**/*.js",
Expand Down Expand Up @@ -64,11 +79,7 @@
"node_modules/codemirror/addon/hint/show-hint.css",
"src/styles.scss"
],
"scripts": [
"node_modules/jquery/dist/jquery.js",
"node_modules/nanoscroller/bin/javascripts/jquery.nanoscroller.js",
"src/assets/layout/js/ripple.js"
]
"scripts": []
},
"configurations": {
"test": {
Expand Down Expand Up @@ -182,11 +193,7 @@
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"scripts": [
"node_modules/jquery/dist/jquery.js",
"node_modules/nanoscroller/bin/javascripts/jquery.nanoscroller.js",
"src/assets/layout/js/ripple.js"
],
"scripts": [],
"styles": [
"node_modules/primeng/resources/primeng.min.css",
"node_modules/nanoscroller/bin/css/nanoscroller.css",
Expand Down Expand Up @@ -248,16 +255,15 @@
}
}
}

},
"defaultProject": "machete-ui",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"style": "css"
"style": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}
}
1 change: 1 addition & 0 deletions assets
Loading

0 comments on commit f813c35

Please sign in to comment.