Skip to content

Commit

Permalink
Fix root requirements name
Browse files Browse the repository at this point in the history
  • Loading branch information
@antonkomarev
antonkomarev committed Jun 30, 2019
1 parent b6db694 commit d1f2563
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 44 deletions.
36 changes: 18 additions & 18 deletions public/app.js
View file
Expand Up @@ -3018,19 +3018,19 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
}(),
getRequirementVersion: function getRequirementVersion(name) {
var version;
version = this.findRequirementVersion(this.getRequirements('essentials', 'root'), name);
version = this.findRequirementVersion(this.getRequirements('roots', 'essential'), name);

if (version !== null) {
return version;
}

version = this.findRequirementVersion(this.getRequirements('essentials', 'dev'), name);
version = this.findRequirementVersion(this.getRequirements('roots', 'dev'), name);

if (version !== null) {
return version;
}

version = this.findRequirementVersion(this.getRequirements('dependencies', 'root'), name);
version = this.findRequirementVersion(this.getRequirements('dependencies', 'essential'), name);

if (version !== null) {
return version;
Expand Down Expand Up @@ -30446,12 +30446,12 @@ var render = function() {
_vm._v(" "),
_c("ul", { staticClass: "list-group list-group-flush mt-4" }, [
_c("li", { staticClass: "list-group-item" }, [
_c("strong", [_vm._v("Root:")]),
_c("strong", [_vm._v("Essential:")]),
_vm._v(
"\n " +
_vm._s(_vm.getRequirementsCount("essentials", "root")) +
" essentials\n +\n " +
_vm._s(_vm.getRequirementsCount("dependencies", "root")) +
_vm._s(_vm.getRequirementsCount("roots", "essential")) +
" roots\n +\n " +
_vm._s(_vm.getRequirementsCount("dependencies", "essential")) +
" dependencies\n "
)
]),
Expand All @@ -30460,8 +30460,8 @@ var render = function() {
_c("strong", [_vm._v("Development:")]),
_vm._v(
"\n " +
_vm._s(_vm.getRequirementsCount("essentials", "dev")) +
" essentials\n +\n " +
_vm._s(_vm.getRequirementsCount("roots", "dev")) +
" roots\n +\n " +
_vm._s(_vm.getRequirementsCount("dependencies", "dev")) +
" dependencies\n "
)
Expand Down Expand Up @@ -30640,14 +30640,14 @@ var render = function() {
_vm._v(" "),
_c("install-form", { staticClass: "mt-4" }),
_vm._v(" "),
_c("h2", { staticClass: "mt-4" }, [_vm._v("Essentials")]),
_c("h2", { staticClass: "mt-4" }, [_vm._v("Roots")]),
_vm._v(" "),
_c("h3", { staticClass: "mt-4" }, [_vm._v("Root")]),
_c("h3", { staticClass: "mt-4" }, [_vm._v("Essential")]),
_vm._v(" "),
_c(
"ul",
{ staticClass: "list-unstyled mb-0" },
_vm._l(_vm.getRequirements("essentials", "root"), function(
_vm._l(_vm.getRequirements("roots", "essential"), function(
requirement,
index
) {
Expand All @@ -30670,7 +30670,7 @@ var render = function() {
_c(
"ul",
{ staticClass: "list-unstyled mb-0" },
_vm._l(_vm.getRequirements("essentials", "dev"), function(
_vm._l(_vm.getRequirements("roots", "dev"), function(
requirement,
index
) {
Expand All @@ -30690,12 +30690,12 @@ var render = function() {
_vm._v(" "),
_c("h2", { staticClass: "mt-4" }, [_vm._v("Dependencies")]),
_vm._v(" "),
_c("h3", { staticClass: "mt-4" }, [_vm._v("Root")]),
_c("h3", { staticClass: "mt-4" }, [_vm._v("Essential")]),
_vm._v(" "),
_c(
"ul",
{ staticClass: "list-unstyled mb-0" },
_vm._l(_vm.getRequirements("dependencies", "root"), function(
_vm._l(_vm.getRequirements("dependencies", "essential"), function(
requirement,
index
) {
Expand Down Expand Up @@ -47697,11 +47697,11 @@ var actions = {
var getters = {
isRequirementInstalled: function isRequirementInstalled(state) {
return function (name) {
return state.requirements['essentials']['root'].filter(function (requirement) {
return state.requirements['roots']['essential'].filter(function (requirement) {
return requirement.name === name;
}).length > 0 || state.requirements['essentials']['dev'].filter(function (requirement) {
}).length > 0 || state.requirements['roots']['dev'].filter(function (requirement) {
return requirement.name === name;
}).length > 0 || state.requirements['dependencies']['root'].filter(function (requirement) {
}).length > 0 || state.requirements['dependencies']['essential'].filter(function (requirement) {
return requirement.name === name;
}).length > 0 || state.requirements['dependencies']['dev'].filter(function (requirement) {
return requirement.name === name;
Expand Down
2 changes: 1 addition & 1 deletion public/mix-manifest.json
View file
@@ -1,4 +1,4 @@
{
"/app.js": "/app.js?id=0797e9b4c8c69388d532",
"/app.js": "/app.js?id=bdd395b6d8b1887f9c51",
"/app.css": "/app.css?id=d28a9a9b210175ad114b"
}
14 changes: 7 additions & 7 deletions resources/js/screens/dashboard/index.vue
View file
Expand Up @@ -15,14 +15,14 @@
<h2 class="mt-4">Requirements</h2>
<ul class="list-group list-group-flush mt-4">
<li class="list-group-item">
<strong>Root:</strong>
{{ getRequirementsCount('essentials', 'root') }} essentials
<strong>Essential:</strong>
{{ getRequirementsCount('roots', 'essential') }} roots
+
{{ getRequirementsCount('dependencies', 'root') }} dependencies
{{ getRequirementsCount('dependencies', 'essential') }} dependencies
</li>
<li class="list-group-item">
<strong>Development:</strong>
{{ getRequirementsCount('essentials', 'dev') }} essentials
{{ getRequirementsCount('roots', 'dev') }} roots
+
{{ getRequirementsCount('dependencies', 'dev') }} dependencies
</li>
Expand All @@ -48,17 +48,17 @@
getRequirementVersion(name) {
let version;
version = this.findRequirementVersion(this.getRequirements('essentials', 'root'), name);
version = this.findRequirementVersion(this.getRequirements('roots', 'essential'), name);
if (version !== null) {
return version;
}
version = this.findRequirementVersion(this.getRequirements('essentials', 'dev'), name);
version = this.findRequirementVersion(this.getRequirements('roots', 'dev'), name);
if (version !== null) {
return version;
}
version = this.findRequirementVersion(this.getRequirements('dependencies', 'root'), name);
version = this.findRequirementVersion(this.getRequirements('dependencies', 'essential'), name);
if (version !== null) {
return version;
}
Expand Down
12 changes: 6 additions & 6 deletions resources/js/screens/requirements/index.vue
View file
Expand Up @@ -6,11 +6,11 @@

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

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

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

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

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

<h3 class="mt-4">Root</h3>
<h3 class="mt-4">Essential</h3>
<ul class="list-unstyled mb-0">
<li class="mt-2" v-for="(requirement, index) in getRequirements('dependencies', 'root')" v-bind:key="`${requirement.name}-${index}`">
<li class="mt-2" v-for="(requirement, index) in getRequirements('dependencies', 'essential')" v-bind:key="`${requirement.name}-${index}`">
<requirement
:requirement="requirement"
:is-dependency="true"
Expand Down
6 changes: 3 additions & 3 deletions resources/js/store.js
View file
Expand Up @@ -47,9 +47,9 @@ const actions = {

const getters = {
isRequirementInstalled: (state) => (name) => {
return state.requirements['essentials']['root'].filter(requirement => requirement.name === name).length > 0
|| state.requirements['essentials']['dev'].filter(requirement => requirement.name === name).length > 0
|| state.requirements['dependencies']['root'].filter(requirement => requirement.name === name).length > 0
return state.requirements['roots']['essential'].filter(requirement => requirement.name === name).length > 0
|| state.requirements['roots']['dev'].filter(requirement => requirement.name === name).length > 0
|| state.requirements['dependencies']['essential'].filter(requirement => requirement.name === name).length > 0
|| state.requirements['dependencies']['dev'].filter(requirement => requirement.name === name).length > 0;
},

Expand Down
18 changes: 9 additions & 9 deletions src/Http/Controllers/Api/Requirements/Collect/Action.php
View file
Expand Up @@ -45,47 +45,47 @@ private function getInstalledRequirements(): array
$requires = $jsonFile->getRequire()->getData();
$devRequires = $jsonFile->getRequireDev()->getData();

$essentials = [
'root' => [],
$roots = [
'essential' => [],
'dev' => [],
];
foreach ($platform as $name => $version) {
$essentials['root'][] = [
$roots['essential'][] = [
'name' => $name,
'version' => $version,
];
}
foreach ($devPlatform as $name => $version) {
$essentials['dev'][] = [
$roots['dev'][] = [
'name' => $name,
'version' => $version,
];
}
foreach ($packages as $key => $package) {
if (isset($requires[$package['name']]) || isset($devRequires[$package['name']])) {
$essentials['root'][] = $package;
$roots['essential'][] = $package;
unset($packages[$key]);
}
}
foreach ($devPackages as $key => $package) {
if (isset($requires[$package['name']]) || isset($devRequires[$package['name']])) {
$essentials['dev'][] = $package;
$roots['dev'][] = $package;
unset($devPackages[$key]);
}
}
$dependencies = [
'root' => [],
'essential' => [],
'dev' => [],
];
foreach ($packages as $key => $package) {
$dependencies['root'][] = $package;
$dependencies['essential'][] = $package;
}
foreach ($devPackages as $key => $package) {
$dependencies['dev'][] = $package;
}

return [
'essentials' => $essentials,
'roots' => $roots,
'dependencies' => $dependencies,
];
}
Expand Down

0 comments on commit d1f2563

Please sign in to comment.