Skip to content

Commit d1f2563

Browse files
antonkomarevantonkomarev
committed
Fix root requirements name
1 parent b6db694 commit d1f2563

File tree

6 files changed

+44
-44
lines changed

6 files changed

+44
-44
lines changed

‎public/app.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,19 +3018,19 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
30183018
}(),
30193019
getRequirementVersion: function getRequirementVersion(name) {
30203020
var version;
3021-
version = this.findRequirementVersion(this.getRequirements('essentials', 'root'), name);
3021+
version = this.findRequirementVersion(this.getRequirements('roots', 'essential'), name);
30223022

30233023
if (version !== null) {
30243024
return version;
30253025
}
30263026

3027-
version = this.findRequirementVersion(this.getRequirements('essentials', 'dev'), name);
3027+
version = this.findRequirementVersion(this.getRequirements('roots', 'dev'), name);
30283028

30293029
if (version !== null) {
30303030
return version;
30313031
}
30323032

3033-
version = this.findRequirementVersion(this.getRequirements('dependencies', 'root'), name);
3033+
version = this.findRequirementVersion(this.getRequirements('dependencies', 'essential'), name);
30343034

30353035
if (version !== null) {
30363036
return version;
@@ -30446,12 +30446,12 @@ var render = function() {
3044630446
_vm._v(" "),
3044730447
_c("ul", { staticClass: "list-group list-group-flush mt-4" }, [
3044830448
_c("li", { staticClass: "list-group-item" }, [
30449-
_c("strong", [_vm._v("Root:")]),
30449+
_c("strong", [_vm._v("Essential:")]),
3045030450
_vm._v(
3045130451
"\n " +
30452-
_vm._s(_vm.getRequirementsCount("essentials", "root")) +
30453-
" essentials\n +\n " +
30454-
_vm._s(_vm.getRequirementsCount("dependencies", "root")) +
30452+
_vm._s(_vm.getRequirementsCount("roots", "essential")) +
30453+
" roots\n +\n " +
30454+
_vm._s(_vm.getRequirementsCount("dependencies", "essential")) +
3045530455
" dependencies\n "
3045630456
)
3045730457
]),
@@ -30460,8 +30460,8 @@ var render = function() {
3046030460
_c("strong", [_vm._v("Development:")]),
3046130461
_vm._v(
3046230462
"\n " +
30463-
_vm._s(_vm.getRequirementsCount("essentials", "dev")) +
30464-
" essentials\n +\n " +
30463+
_vm._s(_vm.getRequirementsCount("roots", "dev")) +
30464+
" roots\n +\n " +
3046530465
_vm._s(_vm.getRequirementsCount("dependencies", "dev")) +
3046630466
" dependencies\n "
3046730467
)
@@ -30640,14 +30640,14 @@ var render = function() {
3064030640
_vm._v(" "),
3064130641
_c("install-form", { staticClass: "mt-4" }),
3064230642
_vm._v(" "),
30643-
_c("h2", { staticClass: "mt-4" }, [_vm._v("Essentials")]),
30643+
_c("h2", { staticClass: "mt-4" }, [_vm._v("Roots")]),
3064430644
_vm._v(" "),
30645-
_c("h3", { staticClass: "mt-4" }, [_vm._v("Root")]),
30645+
_c("h3", { staticClass: "mt-4" }, [_vm._v("Essential")]),
3064630646
_vm._v(" "),
3064730647
_c(
3064830648
"ul",
3064930649
{ staticClass: "list-unstyled mb-0" },
30650-
_vm._l(_vm.getRequirements("essentials", "root"), function(
30650+
_vm._l(_vm.getRequirements("roots", "essential"), function(
3065130651
requirement,
3065230652
index
3065330653
) {
@@ -30670,7 +30670,7 @@ var render = function() {
3067030670
_c(
3067130671
"ul",
3067230672
{ staticClass: "list-unstyled mb-0" },
30673-
_vm._l(_vm.getRequirements("essentials", "dev"), function(
30673+
_vm._l(_vm.getRequirements("roots", "dev"), function(
3067430674
requirement,
3067530675
index
3067630676
) {
@@ -30690,12 +30690,12 @@ var render = function() {
3069030690
_vm._v(" "),
3069130691
_c("h2", { staticClass: "mt-4" }, [_vm._v("Dependencies")]),
3069230692
_vm._v(" "),
30693-
_c("h3", { staticClass: "mt-4" }, [_vm._v("Root")]),
30693+
_c("h3", { staticClass: "mt-4" }, [_vm._v("Essential")]),
3069430694
_vm._v(" "),
3069530695
_c(
3069630696
"ul",
3069730697
{ staticClass: "list-unstyled mb-0" },
30698-
_vm._l(_vm.getRequirements("dependencies", "root"), function(
30698+
_vm._l(_vm.getRequirements("dependencies", "essential"), function(
3069930699
requirement,
3070030700
index
3070130701
) {
@@ -47697,11 +47697,11 @@ var actions = {
4769747697
var getters = {
4769847698
isRequirementInstalled: function isRequirementInstalled(state) {
4769947699
return function (name) {
47700-
return state.requirements['essentials']['root'].filter(function (requirement) {
47700+
return state.requirements['roots']['essential'].filter(function (requirement) {
4770147701
return requirement.name === name;
47702-
}).length > 0 || state.requirements['essentials']['dev'].filter(function (requirement) {
47702+
}).length > 0 || state.requirements['roots']['dev'].filter(function (requirement) {
4770347703
return requirement.name === name;
47704-
}).length > 0 || state.requirements['dependencies']['root'].filter(function (requirement) {
47704+
}).length > 0 || state.requirements['dependencies']['essential'].filter(function (requirement) {
4770547705
return requirement.name === name;
4770647706
}).length > 0 || state.requirements['dependencies']['dev'].filter(function (requirement) {
4770747707
return requirement.name === name;

‎public/mix-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"/app.js": "/app.js?id=0797e9b4c8c69388d532",
2+
"/app.js": "/app.js?id=bdd395b6d8b1887f9c51",
33
"/app.css": "/app.css?id=d28a9a9b210175ad114b"
44
}

‎resources/js/screens/dashboard/index.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
<h2 class="mt-4">Requirements</h2>
1616
<ul class="list-group list-group-flush mt-4">
1717
<li class="list-group-item">
18-
<strong>Root:</strong>
19-
{{ getRequirementsCount('essentials', 'root') }} essentials
18+
<strong>Essential:</strong>
19+
{{ getRequirementsCount('roots', 'essential') }} roots
2020
+
21-
{{ getRequirementsCount('dependencies', 'root') }} dependencies
21+
{{ getRequirementsCount('dependencies', 'essential') }} dependencies
2222
</li>
2323
<li class="list-group-item">
2424
<strong>Development:</strong>
25-
{{ getRequirementsCount('essentials', 'dev') }} essentials
25+
{{ getRequirementsCount('roots', 'dev') }} roots
2626
+
2727
{{ getRequirementsCount('dependencies', 'dev') }} dependencies
2828
</li>
@@ -48,17 +48,17 @@
4848
getRequirementVersion(name) {
4949
let version;
5050
51-
version = this.findRequirementVersion(this.getRequirements('essentials', 'root'), name);
51+
version = this.findRequirementVersion(this.getRequirements('roots', 'essential'), name);
5252
if (version !== null) {
5353
return version;
5454
}
5555
56-
version = this.findRequirementVersion(this.getRequirements('essentials', 'dev'), name);
56+
version = this.findRequirementVersion(this.getRequirements('roots', 'dev'), name);
5757
if (version !== null) {
5858
return version;
5959
}
6060
61-
version = this.findRequirementVersion(this.getRequirements('dependencies', 'root'), name);
61+
version = this.findRequirementVersion(this.getRequirements('dependencies', 'essential'), name);
6262
if (version !== null) {
6363
return version;
6464
}

‎resources/js/screens/requirements/index.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
<install-form class="mt-4"></install-form>
88

9-
<h2 class="mt-4">Essentials</h2>
9+
<h2 class="mt-4">Roots</h2>
1010

11-
<h3 class="mt-4">Root</h3>
11+
<h3 class="mt-4">Essential</h3>
1212
<ul class="list-unstyled mb-0">
13-
<li class="mt-2" v-for="(requirement, index) in getRequirements('essentials', 'root')" v-bind:key="`${requirement.name}-${index}`">
13+
<li class="mt-2" v-for="(requirement, index) in getRequirements('roots', 'essential')" v-bind:key="`${requirement.name}-${index}`">
1414
<requirement
1515
:requirement="requirement"
1616
:is-dependency="false"
@@ -20,7 +20,7 @@
2020

2121
<h3 class="mt-4">Development</h3>
2222
<ul class="list-unstyled mb-0">
23-
<li class="mt-2" v-for="(requirement, index) in getRequirements('essentials', 'dev')" v-bind:key="`${requirement.name}-${index}`">
23+
<li class="mt-2" v-for="(requirement, index) in getRequirements('roots', 'dev')" v-bind:key="`${requirement.name}-${index}`">
2424
<requirement
2525
:requirement="requirement"
2626
:is-dependency="false"
@@ -30,9 +30,9 @@
3030

3131
<h2 class="mt-4">Dependencies</h2>
3232

33-
<h3 class="mt-4">Root</h3>
33+
<h3 class="mt-4">Essential</h3>
3434
<ul class="list-unstyled mb-0">
35-
<li class="mt-2" v-for="(requirement, index) in getRequirements('dependencies', 'root')" v-bind:key="`${requirement.name}-${index}`">
35+
<li class="mt-2" v-for="(requirement, index) in getRequirements('dependencies', 'essential')" v-bind:key="`${requirement.name}-${index}`">
3636
<requirement
3737
:requirement="requirement"
3838
:is-dependency="true"

‎resources/js/store.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ const actions = {
4747

4848
const getters = {
4949
isRequirementInstalled: (state) => (name) => {
50-
return state.requirements['essentials']['root'].filter(requirement => requirement.name === name).length > 0
51-
|| state.requirements['essentials']['dev'].filter(requirement => requirement.name === name).length > 0
52-
|| state.requirements['dependencies']['root'].filter(requirement => requirement.name === name).length > 0
50+
return state.requirements['roots']['essential'].filter(requirement => requirement.name === name).length > 0
51+
|| state.requirements['roots']['dev'].filter(requirement => requirement.name === name).length > 0
52+
|| state.requirements['dependencies']['essential'].filter(requirement => requirement.name === name).length > 0
5353
|| state.requirements['dependencies']['dev'].filter(requirement => requirement.name === name).length > 0;
5454
},
5555

‎src/Http/Controllers/Api/Requirements/Collect/Action.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,47 +45,47 @@ private function getInstalledRequirements(): array
4545
$requires = $jsonFile->getRequire()->getData();
4646
$devRequires = $jsonFile->getRequireDev()->getData();
4747

48-
$essentials = [
49-
'root' => [],
48+
$roots = [
49+
'essential' => [],
5050
'dev' => [],
5151
];
5252
foreach ($platform as $name => $version) {
53-
$essentials['root'][] = [
53+
$roots['essential'][] = [
5454
'name' => $name,
5555
'version' => $version,
5656
];
5757
}
5858
foreach ($devPlatform as $name => $version) {
59-
$essentials['dev'][] = [
59+
$roots['dev'][] = [
6060
'name' => $name,
6161
'version' => $version,
6262
];
6363
}
6464
foreach ($packages as $key => $package) {
6565
if (isset($requires[$package['name']]) || isset($devRequires[$package['name']])) {
66-
$essentials['root'][] = $package;
66+
$roots['essential'][] = $package;
6767
unset($packages[$key]);
6868
}
6969
}
7070
foreach ($devPackages as $key => $package) {
7171
if (isset($requires[$package['name']]) || isset($devRequires[$package['name']])) {
72-
$essentials['dev'][] = $package;
72+
$roots['dev'][] = $package;
7373
unset($devPackages[$key]);
7474
}
7575
}
7676
$dependencies = [
77-
'root' => [],
77+
'essential' => [],
7878
'dev' => [],
7979
];
8080
foreach ($packages as $key => $package) {
81-
$dependencies['root'][] = $package;
81+
$dependencies['essential'][] = $package;
8282
}
8383
foreach ($devPackages as $key => $package) {
8484
$dependencies['dev'][] = $package;
8585
}
8686

8787
return [
88-
'essentials' => $essentials,
88+
'roots' => $roots,
8989
'dependencies' => $dependencies,
9090
];
9191
}

0 commit comments

Comments
 (0)