Skip to content

Commit d9d5086

Browse files
endormiendormi
authored
Merge pull request #55 from devisle/refactor
Refactor cliRoutes' install and uninstall
2 parents 29c97ed + aa79e21 commit d9d5086

29 files changed

Lines changed: 414 additions & 737 deletions

‎.babelrc‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎cliRoutes/AccesibilityPackages/a11y.js‎

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,53 +21,37 @@ const prompt = inquirer.createPromptModule()
2121
*/
2222

2323
module.exports = class Reacta11y {
24-
installOrUninstall (packageInstaller) {
24+
installOrUninstall (packageManager) {
2525
prompt(installOption).then(({ decision }) => {
2626
if (decision === 'Install') {
27-
this.install(packageInstaller)
27+
this.install(packageManager)
2828
} else if (decision === 'Uninstall') {
29-
this.uninstall(packageInstaller)
29+
this.uninstall(packageManager)
3030
}
3131
})
3232
}
3333

34-
install (packageInstaller) {
35-
switch (packageInstaller) {
36-
case 'NPM':
37-
customCMD.get(
38-
`${reacta11yObj.install}`,
39-
'Install',
40-
'Package: react-a11y has been installed successfully!'
41-
)
42-
break
43-
44-
case 'Yarn':
45-
customCMD.get(
46-
`${reacta11yObjYarn.install}`,
47-
'Install',
48-
'Package: react-a11y has been installed successfully!'
49-
)
50-
break
51-
}
34+
install (packageManager) {
35+
customCMD.get(
36+
`${
37+
packageManager === 'NPM'
38+
? `${reacta11yObj.install}`
39+
: `${reacta11yObjYarn.install}`
40+
}`,
41+
'Install',
42+
'Package: react-a11y has been installed successfully!'
43+
)
5244
}
5345

54-
uninstall (packageInstaller) {
55-
switch (packageInstaller) {
56-
case 'NPM':
57-
customCMD.get(
58-
`${reacta11yObj.uninstall}`,
59-
'Uninstall',
60-
'Package: react-a11y has been uninstalled successfully!'
61-
)
62-
break
63-
64-
case 'Yarn':
65-
customCMD.get(
66-
`${reacta11yObjYarn.uninstall}`,
67-
'Uninstall',
68-
'Package: react-a11y has been uninstalled successfully!'
69-
)
70-
break
71-
}
46+
uninstall (packageManager) {
47+
customCMD.get(
48+
`${
49+
packageManager === 'NPM'
50+
? `${reacta11yObj.uninstall}`
51+
: `${reacta11yObjYarn.uninstall}`
52+
}`,
53+
'Uninstall',
54+
'Package: react-a11y has been uninstalled successfully!'
55+
)
7256
}
7357
}

‎cliRoutes/AccesibilityPackages/axe.js‎

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,53 +21,37 @@ const prompt = inquirer.createPromptModule()
2121
*/
2222

2323
module.exports = class Reactaxe {
24-
installOrUninstall (packageInstaller) {
24+
installOrUninstall (packageManager) {
2525
prompt(installOption).then(({ decision }) => {
2626
if (decision === 'Install') {
27-
this.install(packageInstaller)
27+
this.install(packageManager)
2828
} else if (decision === 'Uninstall') {
29-
this.uninstall(packageInstaller)
29+
this.uninstall(packageManager)
3030
}
3131
})
3232
}
3333

34-
install (packageInstaller) {
35-
switch (packageInstaller) {
36-
case 'NPM':
37-
customCMD.get(
38-
`${reactaxeObj.install}`,
39-
'Install',
40-
'Package: react-axe has been installed successfully!'
41-
)
42-
break
43-
44-
case 'Yarn':
45-
customCMD.get(
46-
`${reactaxeObjYarn.install}`,
47-
'Install',
48-
'Package: react-axe has been installed successfully!'
49-
)
50-
break
51-
}
34+
install (packageManager) {
35+
customCMD.get(
36+
`${
37+
packageManager === 'NPM'
38+
? `${reactaxeObj.install}`
39+
: `${reactaxeObjYarn.install}`
40+
}`,
41+
'Install',
42+
'Package: react-axe has been installed successfully!'
43+
)
5244
}
5345

54-
uninstall (packageInstaller) {
55-
switch (packageInstaller) {
56-
case 'NPM':
57-
customCMD.get(
58-
`${reactaxeObj.uninstall}`,
59-
'uninstall',
60-
'Package: react-axe has been uninstalled successfully!'
61-
)
62-
break
63-
64-
case 'Yarn':
65-
customCMD.get(
66-
`${reactaxeObjYarn.uninstall}`,
67-
'uninstall',
68-
'Package: react-axe has been uninstalled successfully!'
69-
)
70-
break
71-
}
46+
uninstall (packageManager) {
47+
customCMD.get(
48+
`${
49+
packageManager === 'NPM'
50+
? `${reactaxeObj.uninstall}`
51+
: `${reactaxeObjYarn.uninstall}`
52+
}`,
53+
'Uninstall',
54+
'Package: react-axe has been uninstalled successfully!'
55+
)
7256
}
7357
}

‎cliRoutes/AccesibilityPackages/index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ const prompt = inquirer.createPromptModule()
1919

2020
module.exports = class AccesibilityPackages {
2121
prompt () {
22-
prompt(YarnOrNpm).then(({ packageManager }) => {
23-
const packageInstaller = packageManager
22+
prompt(YarnOrNpm).then(({ packageInstaller }) => {
2423
prompt(accesibilityPackage).then(({ access }) => {
2524
switch (access) {
2625
case 'Reacta11y':

‎cliRoutes/CRA/cra.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const prompt = inquirer.createPromptModule()
2222
module.exports = class CRA {
2323
CRAPrompt () {
2424
prompt(YarnOrNpm).then(({ packageManager }) => {
25-
const packageInstaller = packageManager
2625
prompt({
2726
...installFolder[0],
2827
message: 'Please give project name, example (my-app)'
@@ -44,9 +43,9 @@ module.exports = class CRA {
4443
message: 'Would you like to add Redux? (Y/N)'
4544
}).then(({ packageAdd }) => {
4645
if (['y', 'yes', ''].includes(packageAdd.toLowerCase())) {
47-
installAll(folderName, packageInstaller)
46+
installAll(folderName, packageManager)
4847
} else if (['n', 'no'].includes(packageAdd.toLowerCase())) {
49-
installCRAandReactRouter(folderName, packageInstaller)
48+
installCRAandReactRouter(folderName, packageManager)
5049
}
5150
})
5251
/*
@@ -61,9 +60,9 @@ module.exports = class CRA {
6160
message: 'Would you like to add Redux? (Y/N)'
6261
}).then(({ packageAdd }) => {
6362
if (['y', 'yes', ''].includes(packageAdd.toLowerCase())) {
64-
installCRAandRedux(folderName, packageInstaller)
63+
installCRAandRedux(folderName, packageManager)
6564
} else if (['n', 'no'].includes(packageAdd.toLowerCase())) {
66-
installCRA(folderName, packageInstaller)
65+
installCRA(folderName, packageManager)
6766
}
6867
})
6968
}

‎cliRoutes/CRA/installAll.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ const {
1919
// Import Redux Boilerplate
2020
const ReduxBoilerPlate = require('../../cliModel/starter-code/redux')
2121

22-
module.exports = (folderName, packageInstaller) => {
23-
switch (packageInstaller) {
22+
module.exports = (folderName, packageManager) => {
23+
switch (packageManager) {
2424
case 'NPM':
2525
fs.appendFile('store.js', ReduxBoilerPlate, err => {
2626
if (err) throw err

‎cliRoutes/CRA/installCRA.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const { createReactApp } = require('../../cliModel/install-commands')
66

77
const { createReactAppYarn } = require('../../cliModel/install-commands-yarn')
88

9-
module.exports = (folderName, packageInstaller) => {
10-
switch (packageInstaller) {
9+
module.exports = (folderName, packageManager) => {
10+
switch (packageManager) {
1111
case 'NPM':
1212
customCMD.get(
1313
` mkdir ${folderName} && cd ${folderName} && ${createReactApp} .`,

‎cliRoutes/CRA/installCRAandReactRouter.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const {
1111
reactRouterObjYarn
1212
} = require('../../cliModel/install-commands-yarn')
1313

14-
module.exports = (folderName, packageInstaller) => {
15-
switch (packageInstaller) {
14+
module.exports = (folderName, packageManager) => {
15+
switch (packageManager) {
1616
case 'NPM':
1717
customCMD.get(
1818
` mkdir ${folderName} && cd ${folderName} && ${createReactApp} . && ${

‎cliRoutes/CRA/installCRAandRedux.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ const {
1414
// Import Redux Boilerplate
1515
const ReduxBoilerPlate = require('../../cliModel/starter-code/redux')
1616

17-
module.exports = (folderName, packageInstaller) => {
18-
switch (packageInstaller) {
17+
module.exports = (folderName, packageManager) => {
18+
switch (packageManager) {
1919
case 'NPM':
2020
fs.appendFile('store.js', ReduxBoilerPlate, err => {
2121
if (err) throw err

‎cliRoutes/CustomSearch/index.js‎

Lines changed: 20 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -36,68 +36,34 @@ module.exports = class SearchOnline {
3636
switch (confirmation) {
3737
case 'Yes':
3838
prompt(YarnOrNpm).then(({ packageManager }) => {
39-
switch (packageManager) {
40-
case 'Yarn':
41-
prompt(GlobalOrNot).then(({ confirm }) => {
42-
switch (confirm) {
43-
case 'Yes':
44-
customCMD.get(
45-
`yarn add ${this.packagesSelected.join(' ')} -g`,
46-
'install',
47-
`Package(s): ${this.packagesSelected.join(
48-
' '
49-
)} have been installed successfully!`
50-
)
51-
break
52-
53-
case 'No':
54-
customCMD.get(
55-
`yarn add ${this.packagesSelected.join(' ')}`,
56-
'install',
57-
`Package(s): ${this.packagesSelected.join(
58-
' '
59-
)} have been installed successfully!`
60-
)
61-
break
62-
}
63-
})
64-
break
65-
66-
case 'NPM':
67-
prompt(GlobalOrNot).then(({ confirm }) => {
68-
switch (confirm) {
69-
case 'Yes':
70-
customCMD.get(
71-
`npm install ${this.packagesSelected.join(' ')} -g`,
72-
'install',
73-
`Package(s): ${this.packagesSelected.join(
74-
' '
75-
)} have been installed successfully!`
76-
)
77-
break
78-
79-
case 'No':
80-
customCMD.get(
81-
`npm install ${this.packagesSelected.join(' ')}`,
82-
'install',
83-
`Package(s): ${this.packagesSelected.join(
84-
' '
85-
)} have been installed successfully!`
86-
)
87-
break
88-
}
89-
})
90-
break
91-
}
39+
prompt(GlobalOrNot).then(({ confirm }) => {
40+
customCMD.get(
41+
`${
42+
packageManager === 'NPM'
43+
? 'npm install'
44+
: `yarn ${
45+
confirm === 'Yes' ? 'global' : ''
46+
} add`
47+
} ${
48+
confirm === 'Yes' && packageManager === 'NPM'
49+
? '-g'
50+
: ''
51+
} ${this.packagesSelected.join(' ')}`,
52+
'install',
53+
`Package(s): ${this.packagesSelected.join(
54+
' '
55+
)} have been installed successfully!`
56+
)
57+
})
9258
})
9359
break
60+
9461
case 'No':
9562
return this.search()
9663
}
9764
})
9865
})
9966
} else {
100-
// console.log("No packages found");
10167
return this.search()
10268
}
10369
})

0 commit comments

Comments
 (0)