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

Feature: Recipe - List of Commands to be executed #439

Merged
merged 86 commits into from
Jun 4, 2022
Merged
Show file tree
Hide file tree
Changes from 78 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
d96e591
create new logic-step libraries
negue Mar 10, 2022
740387f
fix eslint issues + adding js files
negue Mar 10, 2022
e593d95
fix eslint issues
negue Mar 12, 2022
034f3b4
move highlight directive to directives.module.ts
negue Mar 12, 2022
8f91935
create base ui components for the abstracted logic
negue Mar 12, 2022
383edfb
memebox metadate for script apis
negue Mar 12, 2022
9c0fbc8
edit / change variables
negue Mar 12, 2022
fd1afaf
recursive logic-group
negue Mar 12, 2022
581d8ed
edit steps variable / method
negue Mar 12, 2022
52483af
show and edit the first method argument
negue Mar 12, 2022
647635c
logic step context
negue Mar 15, 2022
8db6db4
moved angular specific code from core to ui library
negue Mar 15, 2022
00c2eff
generate variable declaration code
negue Mar 15, 2022
5b2a95d
generate variable declaration code
negue Mar 15, 2022
e01f97e
steps inside argument callback
negue Mar 15, 2022
e94a81c
cleanup
negue Mar 17, 2022
003579a
fix orderBy of actions overview
negue Mar 17, 2022
3540326
Merge remote-tracking branch 'origin/develop' into feature/clickable-…
negue Mar 17, 2022
6a51096
save / load blueprint in media edit
negue Mar 17, 2022
601f082
execute blueprints in the serverside
negue Mar 17, 2022
af7ebfc
fix CI
negue Mar 17, 2022
6bc0003
fix CI
negue Mar 18, 2022
e79f1ad
wip blueprint
negue Mar 19, 2022
c8a810e
Merge remote-tracking branch 'origin/feature/clickable-logic' into fe…
negue Mar 19, 2022
9bf331e
WIP new blueprint datastructure
negue Apr 22, 2022
3506c95
blueprint to script generator + step registry
negue Apr 23, 2022
1158871
Merge remote-tracking branch 'origin/develop' into feature/clickable-…
negue Apr 23, 2022
b784c4b
edit / save / run blueprint action
negue Apr 24, 2022
23b82b5
WIP configArguments Types + memebox triggerRandom API
negue Apr 24, 2022
47d5741
Merge remote-tracking branch 'origin/develop' into feature/clickable-…
negue Apr 24, 2022
097b139
blueprint dynamic generic step config dialog
negue Apr 28, 2022
eb8dd1f
number config
negue Apr 28, 2022
c27bef0
Merge remote-tracking branch 'origin/develop' into feature/clickable-…
negue Apr 30, 2022
3d26bb5
Merge remote-tracking branch 'origin/develop' into feature/clickable-…
negue Apr 30, 2022
795d296
blueprint: delete step
negue Apr 30, 2022
3da73c2
blueprint: edit step
negue Apr 30, 2022
860d208
split blueprint registry + add milliseconds step
negue Apr 30, 2022
01b64da
hide variables labels if there arent any
negue Apr 30, 2022
c501b90
Blueprint Config ActionList
negue Apr 30, 2022
18a5f0d
Merge remote-tracking branch 'origin/develop' into feature/clickable-…
negue May 1, 2022
088ea9b
more obs apis + cleanup
negue May 3, 2022
69b93a0
Merge remote-tracking branch 'origin/feature/clickable-logic' into fe…
negue May 3, 2022
37a0880
Autofix issues in 23 files
deepsource-autofix[bot] May 3, 2022
ca24b27
OBS Step: Switch to Scene - first try
negue May 3, 2022
1e1d71f
reset script context when blueprint is changed
negue May 3, 2022
fcd0771
OBS Step: Set Filter State
negue May 3, 2022
f91f7c0
fixes
negue May 3, 2022
b4a0da3
Memebox Step: Trigger Random Element
negue May 7, 2022
5f8bf52
Merge remote-tracking branch 'origin/develop' into feature/clickable-…
negue May 7, 2022
5bd8b6f
refactor blueprint definitions
negue May 10, 2022
2d960db
Memebox Step: Update Action Properties
negue May 10, 2022
9b43f83
Merge remote-tracking branch 'origin/develop' into feature/clickable-…
negue May 14, 2022
fca3e72
rename PipesModule to UiComponentsPipesModule
negue May 14, 2022
451e7a1
replace showScreenSelection Observable with a Pipe
negue May 14, 2022
7640811
extract createMemeboxApiVariable
negue May 14, 2022
68c7e12
add screenSelection in blueprint action step config
negue May 14, 2022
7991211
Merge remote-tracking branch 'origin/develop' into feature/clickable-…
negue May 21, 2022
24617a7
group by Command Blocks Selection + clean up
negue May 21, 2022
f1639de
fix action queue
negue May 21, 2022
456ec93
Delete Command Blocks inside sub entries
negue May 21, 2022
c472ff5
clean up some ui + adding items
negue May 21, 2022
23002bb
Merge remote-tracking branch 'origin/develop' into feature/clickable-…
negue May 28, 2022
901ed9f
fix compile issues after merge + rename to recipe
negue May 28, 2022
e5ac46f
fix UI after merge + also show the generated script code
negue May 28, 2022
364ad21
refactor recipe group labels to be dynamic + import/export recipes
negue May 28, 2022
8f51d5c
Command Block: OBS Raw Commands
negue May 28, 2022
42fcd83
rename libaries to recipe
negue May 28, 2022
1033865
rename libaries to recipe - part 2
negue May 28, 2022
e56546c
rename libaries to recipe - part 3
negue May 28, 2022
19a6582
rename libaries to recipe - part 4
negue May 30, 2022
f4ec42f
improve css / layout / other fixes
negue May 30, 2022
1128459
fix deepsource issues
negue May 30, 2022
c6f03aa
fix angular json
negue May 30, 2022
c84bbf5
fix nx json
negue May 30, 2022
7d8ecb5
Merge remote-tracking branch 'origin/feature/clickable-logic' into fe…
negue May 31, 2022
ace951f
add back file?
negue May 31, 2022
44caeb2
Migration of Meta to Recipe Action - Part 1
negue May 31, 2022
0d5e4fb
Migration of Meta to Recipe Action - Part 2
negue May 31, 2022
216c8b8
fix sorting command blocks
negue Jun 4, 2022
cb49680
Feature: Selection List of already used Actions in this Recipe
negue Jun 4, 2022
fa557c2
Show Action Icons inside Recipe List
negue Jun 4, 2022
c63cfc8
Add Twitch Command Block
negue Jun 4, 2022
4e534ad
fix issue where action payload did not have any overrides
negue Jun 4, 2022
f8e9b6f
add Command Block Name to the Config Dialog
negue Jun 4, 2022
3f05e37
fix lint
negue Jun 4, 2022
a3559e9
fix lint
negue Jun 4, 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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Misc:
<tr>
<td>

[`Trigger multiple / random Media`][URL_META_CLIPS]
[`Trigger multiple / random Media`][URL_RECIPE]
</td>
</tr>
<tr>
Expand Down Expand Up @@ -147,12 +147,12 @@ Misc:

`Advanced`:

- [`Trigger multiple / randoms`][URL_META_CLIPS]
- [`Trigger multiple / randoms`][URL_RECIPE]
- [`Screen / Media Settings`][URL_ADVANCED_SETTINGS]
- [`Scripts`][URL_SCRIPTS]
- [`Widgets`][URL_WIDGETS]

[URL_META_CLIPS]: tutorials/meta_media.md
[URL_RECIPE]: tutorials/recipe.md
[URL_SCRIPTS]: tutorials/scripts.md
[URL_WIDGETS]: tutorials/widgets.md
[URL_ADVANCED_SETTINGS]: ./tutorials/screen_media_advanced_settings.md
Expand All @@ -174,7 +174,7 @@ See finished and upcoming changes in:
* [ ] OBS Websockets
* [ ] Screen Arrange View gets the current OBS-Scene as Background to move stuff around
* [ ] Overview of local media files not existing anymore
* [ ] Replace all selected Trigger Action with an inline Blueprint #439 (name pending)
* [ ] Replace all selected Trigger Action with an inline Recipes #439

### Future, if you want to help open a PR :)
* [ ] Change media options by triggered variables (e.g. different style, or something)
Expand Down
107 changes: 93 additions & 14 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "",
"cli": {
"defaultCollection": "@nrwl/angular"
},
"projects": {
"action-variables": {
"projectType": "library",
Expand Down Expand Up @@ -103,9 +100,7 @@
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"projects/app-state/**/*.ts"
]
"lintFilePatterns": ["projects/app-state/**/*.ts"]
}
}
}
Expand Down Expand Up @@ -315,7 +310,11 @@
"builder": "@nrwl/linter:eslint",
"options": {
"cache": true,
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html", "!src/**/*.spec.ts"]
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html",
"!src/**/*.spec.ts"
]
}
},
"cypress-run": {
Expand Down Expand Up @@ -377,7 +376,7 @@
"optimization": true,
"extractLicenses": true,
"inspect": false,
"fileReplacements": [ ]
"fileReplacements": []
}
}
},
Expand Down Expand Up @@ -528,29 +527,109 @@
"tsConfig": "projects/utils/tsconfig.spec.json"
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["projects/utils/**/*.ts"]
}
}
}
},
"recipe-ui": {
"projectType": "library",
"root": "projects/recipe-ui",
"sourceRoot": "projects/recipe-ui/src",
"prefix": "memebox",
"architect": {
"build": {
"builder": "@nrwl/angular:ng-packagr-lite",
"options": {
"tsConfig": "projects/recipe-ui/tsconfig.lib.json",
"project": "projects/recipe-ui/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/recipe-ui/tsconfig.lib.prod.json"
}
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"projects/utils/**/*.ts"
"projects/recipe-ui/src/**/*.ts",
"projects/recipe-ui/src/**/*.html"
]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/projects/recipe-ui"],
"options": {
"jestConfig": "projects/recipe-ui/jest.config.js",
"passWithNoTests": true
}
}
}
},
"recipe-core": {
"projectType": "library",
"root": "projects/recipe-core",
"sourceRoot": "projects/recipe-core/src",
"prefix": "memebox",
"architect": {
"build": {
"builder": "@nrwl/angular:ng-packagr-lite",
"options": {
"tsConfig": "projects/recipe-core/tsconfig.lib.json",
"project": "projects/recipe-core/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/recipe-core/tsconfig.lib.prod.json"
}
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"projects/recipe-core/src/**/*.ts",
"projects/recipe-core/src/**/*.html"
]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/projects/recipe-core"],
"options": {
"jestConfig": "projects/recipe-core/jest.config.js",
"passWithNoTests": true
}
}
}
}
},
"cli": {
"defaultCollection": "@nrwl/angular"
},
"schematics": {
"@schematics/angular:component": {
"style": "scss"
"@nrwl/angular:application": {
"style": "scss",
"linter": "eslint",
"unitTestRunner": "jest"
},
"@nrwl/angular:library": {
"style": "scss",
"linter": "eslint",
"unitTestRunner": "jest",
"buildable": true,
"style": "scss",
"strict": true
},
"@nrwl/angular:component": {
"style": "scss"
"@schematics/angular:component": {
"prefix": "app",
"style": "scss",
"skipTests": true
}
}
}
8 changes: 4 additions & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ for (const [key, value] of currentPaths) {
module.exports = {
moduleNameMapper,
modulePathIgnorePatterns: [
"<rootDir>/dist/",
"<rootDir>/out*",
"<rootDir>/memebox-streamdeck",
"<rootDir>/cypress"
'<rootDir>/dist/',
'<rootDir>/out*',
'<rootDir>/memebox-streamdeck',
'<rootDir>/cypress'
],
rootDir: __dirname,
preset: 'jest-preset-angular',
Expand Down
3 changes: 3 additions & 0 deletions jest.preset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const nxPreset = require('@nrwl/jest/preset');

module.exports = { ...nxPreset };
66 changes: 32 additions & 34 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,49 @@
"default": {
"runner": "@nrwl/workspace/tasks-runners/default",
"options": {
"cacheableOperations": [
"build",
"test",
"lint",
"package",
"prepare"
]
"cacheableOperations": ["build", "test", "lint", "package", "prepare"]
}
}
},
"targetDependencies": {
"prepare": [
{
"target": "prepare",
"projects": "dependencies"
}
],
"package": [
{
"target": "package",
"projects": "dependencies"
}
]
},
"affected": {
"defaultBase": "develop"
},
"workspaceLayout": {
"libsDir": "projects",
"appsDir": "projects"
},
"cli": {
"analytics": false,
"defaultCollection": "@nrwl/angular"
"prepare": [{ "target": "prepare", "projects": "dependencies" }],
"package": [{ "target": "package", "projects": "dependencies" }]
},
"affected": { "defaultBase": "develop" },
"workspaceLayout": { "libsDir": "projects", "appsDir": "projects" },
"cli": { "analytics": false, "defaultCollection": "@nrwl/angular" },
"generators": {
"@schematics/angular:component": {
"prefix": "app",
"style": "scss",
"skipTests": true
},
"@schematics/angular:directive": {
"prefix": "app",
"skipTests": true
"@schematics/angular:directive": { "prefix": "app", "skipTests": true },
"@nrwl/angular:application": {
"linter": "eslint",
"unitTestRunner": "jest"
},
"@nrwl/angular:library": {
"linter": "eslint",
"unitTestRunner": "jest",
"buildable": true,
"style": "scss",
"strict": true
}
},
"defaultProject": "memebox-app"
"defaultProject": "memebox-app",
"projects": {
"action-variables": { "tags": [] },
"action-variables-ui": { "tags": [] },
"app-state": { "tags": [] },
"contracts": { "tags": [] },
"memebox-app": { "tags": [] },
"server": { "tags": [] },
"shared-state": { "tags": [] },
"state-components": { "tags": [] },
"ui-components": { "tags": [] },
"utils": { "tags": [] },
"recipe-core": { "tags": [] },
"recipe-ui": { "tags": [] }
}
}
Loading