Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/smaranjitghose/doc2pen in…
Browse files Browse the repository at this point in the history 
…to husky
  • Loading branch information
@ashuvssut
ashuvssut committed Jun 1, 2021
2 parents 1722a06 + 514c646 commit c70af25
Show file tree
Hide file tree
Showing 4 changed files with 12,689 additions and 12,677 deletions.
14 changes: 13 additions & 1 deletion netlify.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
for = "*.js" # for caching js files
[headers.values]
Cache-Control = "public, max-age=34397077" # 1year 1month cache
[[headers]]
for = "*.jsx" # for caching jsx files
[headers.values]
Cache-Control = "public, max-age=34397077" # 1year 1month cache
[[headers]]
for = "*.css" # css files too
[headers.values]
Expand All @@ -10,11 +14,19 @@
for = "*.png" # png files too
[headers.values]
Cache-Control = "public, max-age=34397077"
[[headers]]
for = "*.jpg" # jpg files too
[headers.values]
Cache-Control = "public, max-age=34397077"
[[headers]]
for = "*.jpeg" # jpeg files too
[headers.values]
Cache-Control = "public, max-age=34397077"
[[headers]]
for = "*.webp" # webp files too
[headers.values]
Cache-Control = "public, max-age=34397077"
[[headers]]
for = "*.svg" # svg files too
[headers.values]
Cache-Control = "public, max-age=34397077"
Cache-Control = "public, max-age=34397077"
166 changes: 83 additions & 83 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,83 +1,83 @@
{
"private": true,
"name": "doc2pen",
"version": "0.1.0",
"homepage": ".",
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"predeploy": "npm run build",
"deploy": "gh-pages -d build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"lint": "eslint --ext js,jsx src",
"lint:fix": "eslint --ext js,jsx src --fix"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14",
"@material-ui/core": "^4.11.4",
"@material-ui/icons": "^4.11.2",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^13.1.9",
"bootstrap": "^5.0.1",
"dom-to-image": "^2.6.0",
"file-saver": "^2.0.5",
"jspdf": "^2.3.1",
"jszip": "^3.6.0",
"leaflet": "^1.7.1",
"mousetrap": "^1.6.5",
"pdf-lib": "^1.16.0",
"react": "^17.0.2",
"react-bootstrap": "^1.6.0",
"react-color": "^2.19.3",
"react-dom": "^17.0.2",
"react-draggable": "^4.4.3",
"react-dropzone": "^11.3.2",
"react-easy-emoji": "^1.4.0",
"react-helmet": "^6.1.0",
"react-icons": "^4.2.0",
"react-js-snackbar": "^1.0.4",
"react-leaflet": "^3.2.0",
"react-progressbar-semicircle": "^1.2.1",
"react-reveal": "^1.2.2",
"react-router-dom": "^5.2.0",
"react-scripts": "^4.0.3",
"react-scroll": "^1.8.2",
"react-useanimations": "^2.0.6",
"reactstrap": "^8.9.0",
"roughjs": "^4.4.1",
"sass": "^1.34.0",
"web-vitals": "^1.1.2"
},
"devDependencies": {
"eslint": "^7.27.0",
"eslint-plugin-react": "^7.24.0",
"gh-pages": "^3.2.0",
"husky": "^6.0.0",
"lint-staged": "^11.0.0",
"prettier": "^2.3.0"
},
"browserslist": [
">0.2%",
"not dead",
"not op_mini all"
],
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.json": "prettier-package-json --write",
"*./src/*.{js,jsx,ts,tsx}": [
"npx prettier --write",
"eslint --fix"
],
"*.{md,mdx,json,css,scss,yaml,yml}": [
"npx prettier --write"
]
}
}
{
"private": true,
"name": "doc2pen",
"version": "0.1.0",
"homepage": ".",
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"predeploy": "npm run build",
"deploy": "gh-pages -d build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"lint": "eslint --ext js,jsx src",
"lint:fix": "eslint --ext js,jsx src --fix"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14",
"@material-ui/core": "^4.11.4",
"@material-ui/icons": "^4.11.2",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^13.1.9",
"bootstrap": "^5.0.1",
"dom-to-image": "^2.6.0",
"file-saver": "^2.0.5",
"jspdf": "^2.3.1",
"jszip": "^3.6.0",
"leaflet": "^1.7.1",
"mousetrap": "^1.6.5",
"pdf-lib": "^1.16.0",
"react": "^17.0.2",
"react-bootstrap": "^1.6.0",
"react-color": "^2.19.3",
"react-dom": "^17.0.2",
"react-draggable": "^4.4.3",
"react-dropzone": "^11.3.2",
"react-easy-emoji": "^1.4.0",
"react-helmet": "^6.1.0",
"react-icons": "^4.2.0",
"react-js-snackbar": "^1.0.4",
"react-leaflet": "^3.2.0",
"react-progressbar-semicircle": "^1.2.1",
"react-reveal": "^1.2.2",
"react-router-dom": "^5.2.0",
"react-scripts": "^4.0.3",
"react-scroll": "^1.8.2",
"react-useanimations": "^2.0.6",
"reactstrap": "^8.9.0",
"roughjs": "^4.4.1",
"sass": "^1.34.0",
"web-vitals": "^1.1.2"
},
"devDependencies": {
"eslint": "^7.27.0",
"eslint-plugin-react": "^7.24.0",
"gh-pages": "^3.2.0",
"husky": "^6.0.0",
"lint-staged": "^11.0.0",
"prettier": "^2.3.0"
},
"browserslist": [
">0.2%",
"not dead",
"not op_mini all"
],
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.json": "prettier-package-json --write",
"*./src/*.{js,jsx,ts,tsx}": [
"npx prettier --write",
"eslint --fix"
],
"*.{md,mdx,json,css,scss,yaml,yml}": [
"npx prettier --write"
]
}
}
2 changes: 1 addition & 1 deletion src/pages/MediaManip/DragDrop/DragDrop.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function DragDrop(props) {
outputOptionsTemp.splice(index, 1);
setOutputOptions(outputOptionsTemp);
}

if (fileType === "pdf") setOutputOptions(["pdf"]);
return Object.assign(file, {
preview: URL.createObjectURL(file),
});
Expand Down
Loading

0 comments on commit c70af25

Please sign in to comment.