diff --git a/backend/package.json b/backend/package.json index 2c0c832..cde3add 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,14 +1,13 @@ { "name": "backend", - "version": "1.0.0", "license": "MIT", "main": "build/index.js", + "author": "Adrian Delgado", "scripts": { "start": "node build/index.js", "dev": "nodemon --ignore './tests' index.ts", "build": "tsc -p ." }, - "author": "Adrian Delgado", "dependencies": { "bcrypt": "^5.0.1", "body-parser": "^1.19.0", diff --git a/bin/index.js b/bin/index.js index cae1544..558a2b7 100755 --- a/bin/index.js +++ b/bin/index.js @@ -54,11 +54,8 @@ async function setup() { process.chdir(appPath); - await fs.rm(path.join(appPath, "./bin"), { - recursive: true, - force: true - }); - console.log("\x1b[35mRemoved unnecessary bin directory.\x1b[0m"); + await fs.rm(path.join(appPath, "./bin/index.js")); + console.log("\x1b[35mRemoved unnecessary create-eth script.\x1b[0m"); console.log("Installing packages. This might take a couple of minutes."); const install = runCommand(`yarn install`); diff --git a/bin/installDeps.sh b/bin/installDeps.sh new file mode 100755 index 0000000..d022ff1 --- /dev/null +++ b/bin/installDeps.sh @@ -0,0 +1,5 @@ +#!/bin/bash +[ -d backend ] && cd backend && yarn install && cd .. +[ -d frontend ] && cd frontend && yarn install && cd .. +[ -d hardhat ] && cd hardhat && yarn install && cd .. +find . -type f -name .example.env -execdir mv {} .env ";" \ No newline at end of file diff --git a/frontend/next-env.d.ts b/frontend/next-env.d.ts index 9bc3dd4..4f11a03 100644 --- a/frontend/next-env.d.ts +++ b/frontend/next-env.d.ts @@ -1,5 +1,4 @@ /// -/// /// // NOTE: This file should not be edited diff --git a/frontend/package.json b/frontend/package.json index 28f4cb3..19ea49c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,6 @@ { - "private": true, + "name": "frontend", + "license": "MIT", "scripts": { "dev": "next dev", "build": "next build", @@ -20,6 +21,7 @@ "react-toggle-dark-mode": "^1.0.4" }, "devDependencies": { + "@tailwindcss/typography": "^0.5.0", "@types/lodash": "^4.14.175", "@types/node": "^17.0.8", "@types/react": "17.0.38", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 4cbd201..830b593 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -699,6 +699,16 @@ resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.0.tgz#7f698254aadf921e48dda8c0a6b304026b8a9323" integrity sha512-JLo+Y592QzIE+q7Dl2pMUtt4q8SKYI5jDrZxrozEQxnGVOyYE+GWK9eLkwTaeN9DDctlaRAQ3TBmzZ1qdLE30A== +"@tailwindcss/typography@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.0.tgz#47886ec46ac41e1211d24fea05301046d9b30906" + integrity sha512-1p/3C6C+JJziS/ghtG8ACYalbA2SyLJY27Pm33cVTlAoY6VQ7zfm2H64cPxUMBkVIlWXTtWHhZcZJPobMRmQAA== + dependencies: + lodash.castarray "^4.4.0" + lodash.isplainobject "^4.0.6" + lodash.merge "^4.6.2" + lodash.uniq "^4.5.0" + "@tsconfig/node10@^1.0.7": version "1.0.8" resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" @@ -2368,11 +2378,26 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" +lodash.castarray@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" + integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= + lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" diff --git a/package.json b/package.json index 6318630..f0e79df 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "create-eth-ts-dapp", "description": "A template for building Full-Stack Blockchain Dapps using Next.js (React), TypeScript, Tailwind CSS, Hardhat, Solidity, and many more!", - "version": "1.1.42", + "version": "1.1.43", "author": "Adrian Delgado", "license": "MIT", "bin": "./bin/index.js", @@ -16,10 +16,12 @@ }, "homepage": "https://github.com/adriandelgg/create-eth-ts-dapp#readme", "scripts": { - "dev": "concurrently \"cd ./hardhat && npx hardhat node\" \"cd ./frontend && npm run dev\" \"cd ./backend && yarn dev\"", - "hardhat": "cd ./hardhat && hh node", - "frontend": "cd ./frontend && npm run dev", - "postinstall": "cd backend && yarn install && cd ../frontend && yarn install && cd ../hardhat && yarn install" + "dev": "concurrently \"[ -d hardhat ] && cd ./hardhat && npx hardhat node && cd ..\" \"[ -d frontend ] && cd ./frontend && yarn dev && cd ..\" \"[ -d backend ] && cd ./backend && echo 'Please enable MongoDB server (mongod)' && yarn dev\"", + "hardhat": "cd ./hardhat && npx hardhat node", + "frontend": "cd ./frontend && yarn dev", + "backend": "cd ./backend && yarn dev", + "installdeps": "./bin/installDeps.sh", + "postinstall": "./bin/installDeps.sh" }, "devDependencies": { "concurrently": "^6.2.1"