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.

Sign up for GitHub

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

FOUR-20583 FOUR-20336: [WINTER] Improve vendors, boostrap and app-layout #7798

Open
wants to merge 38 commits into
base: epic/FOUR-20336
Choose a base branch
from
+3,510 −1,340
Open

FOUR-20583 FOUR-20336: [WINTER] Improve vendors, boostrap and app-layout #7798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
ebb8659
FOUR-20583: S2: Improve vendors
hjonathan Dec 5, 2024
489f064
FOUR-20583: S2: Improve vendors
hjonathan Dec 6, 2024
189442c
FOUR-20583: S2: Improve vendors
hjonathan Dec 6, 2024
a8ba708
FOUR-20583: S2: Improve vendors
hjonathan Dec 6, 2024
4dd49ee
FOUR-20583: A tests
hjonathan Dec 9, 2024
4bdfeb8
FOUR-20583-A: Cases Main change to new layout
hjonathan Dec 9, 2024
7cf6f2b
FOUR-20583-A: Tasks Main change to new layout
hjonathan Dec 10, 2024
03fcedd
FOUR-20583-A: Tasks Main change to new layout
hjonathan Dec 12, 2024
17e9353
FOUR-20583-A: Tasks Main change to new layout
hjonathan Dec 16, 2024
863d4cf
FOUR-20583-A: Tasks Main change to new layout , update with async fsc…
hjonathan Dec 17, 2024
087bbe2
FOUR-20583-A: Tasks Main change to new layout , update webpack mix fo…
hjonathan Dec 17, 2024
f9f998b
FOUR-20583-A: Tasks Main change to new layout , tests adjusments with…
hjonathan Dec 17, 2024
78d6fa2
FOUR-20583-A: Tasks Main change to new layout , adjustments in preview
hjonathan Dec 17, 2024
60d8230
Merge pull request #7812 from ProcessMaker/feature/FOUR-20583-A
pmPaulis Dec 18, 2024
8428fe3
FOUR-20583: Tasks Main change to new layout , adjustments in typeForm…
hjonathan Dec 18, 2024
d94354a
FOUR-20583: Tasks Main change to new layout , adjustments in all file…
hjonathan Dec 18, 2024
e1b87e6
FOUR-20583: Tasks Main change to new layout , adjustments with inflig…
hjonathan Dec 19, 2024
010da35
FOUR-20583: Tasks Main change to new layout , merge with inflilght mo…
hjonathan Dec 19, 2024
de60f82
FOUR-20583: Tasks Main change to new layout , add modeler next file
hjonathan Dec 19, 2024
cf753bb
Add webpack analyzer
nolanpro Dec 19, 2024
a9fc7a7
Update memory setting
nolanpro Dec 19, 2024
45f014e
FOUR-20583: Tasks Main change to new layout , add initialload to fix …
hjonathan Dec 20, 2024
b45b67a
Merge branch 'epic/FOUR-20336-FOUR-20337' of github.com:ProcessMaker/…
hjonathan Dec 20, 2024
97704ec
Merge pull request #7847 from ProcessMaker/webpack-bundle-analyzer
pmPaulis Dec 20, 2024
6202dcc
FOUR-20583: Tasks Main change to new layout , add initialload to fix …
hjonathan Dec 20, 2024
f4b9875
FOUR-20583: Tasks Main change to new layout , add initialload to fix …
hjonathan Dec 20, 2024
9463867
Merge branch 'feature/FOUR-20583' of github.com:ProcessMaker/processm…
hjonathan Dec 20, 2024
01d43d8
FOUR-20583: Tasks Main change to new layout , fix preview tasks
hjonathan Dec 20, 2024
31a405b
FOUR-20583: Tasks Main change to new layout , fix preview tasks
hjonathan Dec 20, 2024
ae76421
FOUR-20583: Tasks Main change to new layout , fix pmblock & webentry
hjonathan Dec 20, 2024
22c1738
FOUR-21371: Task: The conversational form is not showing correctly
hjonathan Dec 23, 2024
b5fdace
FOUR-21371: Task: The conversational form is not showing correctly
hjonathan Jan 3, 2025
8136040
Merge pull request #7853 from ProcessMaker/feature/FOUR-21371
pmPaulis Jan 7, 2025
67c9334
FOUR-20583: Tasks Main change to new layout
hjonathan Jan 7, 2025
c571780
FOUR-20583: Updating observations
hjonathan Jan 9, 2025
1d3a97c
Merge pull request #7869 from ProcessMaker/feature/FOUR-20583-D
pmPaulis Jan 10, 2025
82a3a65
FOUR-20583: Updating observations
hjonathan Jan 14, 2025
8bcdca4
Merge remote-tracking branch 'origin/epic/FOUR-20336' into feature/FO…
pmPaulis Jan 16, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ yarn-error.log
/public/img
/public/fonts
/public/mix-manifest.json
/public/stats.json
tests/js/coverage
tests/coverage-report
tests/coverage-report/*
Expand Down
4 changes: 3 additions & 1 deletion ProcessMaker/Http/Controllers/CasesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ class CasesController extends Controller
*/
public function index()
{
$manager = app(ScreenBuilderManager::class);
event(new ScreenBuilderStarting($manager, 'FORM'));
$currentUser = Auth::user()->only(['id', 'username', 'fullname', 'firstname', 'lastname', 'avatar']);

// This is a temporary API the engine team will provide the new
return view('cases.casesMain', compact('currentUser'));
return view('cases.casesMain', compact('currentUser', 'manager'));
}

/**
Expand Down
256 changes: 249 additions & 7 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"test-watch": "npm run test -- --watch --notify",
"lint": "eslint --fix --ignore-path .eslintignore resources/",
"font": "node ./devhub/pm-font/svgtofont.js && cp -f ./devhub/pm-font/dist/*.* ./resources/fonts/pm-font",
"dev-font": "node ./devhub/pm-font/svgtofont.js && http-server ./devhub/pm-font/dist -p 7771 && cp -f ./devhub/pm-font/dist/*.* ./resources/fonts/pm-font "
"dev-font": "node ./devhub/pm-font/svgtofont.js && http-server ./devhub/pm-font/dist -p 7771 && cp -f ./devhub/pm-font/dist/*.* ./resources/fonts/pm-font ",
"stats": "STATS=1 NODE_OPTIONS=\"--max-old-space-size=8000\" mix"
},
"devDependencies": {
"@babel/eslint-parser": "^7.15.8",
Expand All @@ -45,7 +46,8 @@
"sass-loader": "^12.6.0",
"tailwindcss": "^3.4.10",
"vue-loader": "^15.10.0",
"vue-template-compiler": "^2.7.16"
"vue-template-compiler": "^2.7.16",
"webpack-bundle-analyzer": "^4.10.2"
},
"dependencies": {
"@babel/runtime": "^7.23.8",
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/TreeView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default {
},
},
mounted() {
const jsonCrackEmbed = this.$refs.jsonCrackEmbed;
const { jsonCrackEmbed } = this.$refs;
const json = this.jsonData === "" ? "{}" : this.jsonData;
const options = {
theme: "light",
Expand Down
Loading
Loading