Skip to content

Commit 728c9fa

Browse files
Youssef-benYoussef-ben
authored
Merge pull request #6 from Youssef-ben/updating-libs
Merge {Updating-libs} with {develop}
2 parents f1498b0 + e11d733 commit 728c9fa

File tree

10 files changed

+14395
-14414
lines changed

10 files changed

+14395
-14414
lines changed

‎.vscode/settings.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
{
2-
// auto-save configs
3-
"editor.formatOnSave": true,
4-
5-
// turn it off for JS and JSX, we will do this via eslint
6-
"[javascript]": {
7-
"editor.formatOnSave": false
8-
},
9-
"[javascriptreact]": {
10-
"editor.formatOnSave": false
11-
},
12-
13-
// tell the ESLint plugin to run on save
14-
"editor.codeActionsOnSave": {
15-
"source.fixAll.eslint": true
16-
},
17-
18-
// Optional BUT IMPORTANT: If you have the prettier extension enabled for other languages like CSS and HTML, turn it off for JS since we are doing it through Eslint already
19-
"prettier.disableLanguages": [
20-
"javascript",
21-
"javascriptreact"
22-
],
23-
"files.eol": "\n"
24-
}
1+
{
2+
// auto-save configs
3+
"editor.formatOnSave": true,
4+
5+
// turn it off for JS and JSX, we will do this via eslint
6+
"[javascript]": {
7+
"editor.formatOnSave": false
8+
},
9+
"[javascriptreact]": {
10+
"editor.formatOnSave": false
11+
},
12+
13+
// tell the ESLint plugin to run on save
14+
"editor.codeActionsOnSave": {
15+
"source.fixAll.eslint": true
16+
},
17+
18+
// Optional BUT IMPORTANT: If you have the prettier extension enabled for other languages like CSS and HTML, turn it off for JS since we are doing it through Eslint already
19+
"prettier.disableLanguages": [
20+
"javascript",
21+
"javascriptreact"
22+
],
23+
"files.eol": "\n"
24+
}

‎LICENSE.md‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
# MIT License
2-
3-
Copyright (c) 2017 Lee Robinson
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
# MIT License
2+
3+
Copyright (c) 2017 Lee Robinson
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎README.md‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
1-
<p align="center">
2-
<a href="https://github.com/Youssef-ben"><img src="https://github.com/Youssef-ben/video-converter/blob/develop/src/assets/logo.png" alt="Online Video converter" width="200"></a>
3-
</p>
4-
5-
# Online video converter
6-
7-
The idea of this project came from the fact that most of the free tools that exist on the internet have some restrictions like the length of the video, must watch ads, or a confusion UI with a lot of download buttons. With this, the need to create a free tool that has none of the inconvenience or restrictions like the others became stronger.
8-
9-
The **Online video converter** is a web/desktop application that will allows you to download youtube videos as `MP4s` or convert them to `MP3s` without any restriction.
10-
11-
## Disclaimer
12-
13-
This application should be used for **non-copyrighted** and open-source videos only and should be for personal use only.
14-
15-
If you wish to use any copyrighted videos from Youtube you must obtain expressed permission from the copyright owner.
16-
17-
## Stack
18-
19-
- [Create React App](https://create-react-app.dev/docs/getting-started/): Create React App is an officially supported way to create single-page React applications. It offers a modern build setup with no configuration.
20-
- [ReactJS](https://fr.reactjs.org/): JavaScript library for creating user interfaces.
21-
- [Electron](https://www.electronjs.org/): Develop cross-platform desktop applications with JavaScript, HTML and CSS
22-
- [Sass](https://sass-lang.com/): Sass is a stylesheet language that’s compiled to CSS.
23-
- [FFmpeg](https://www.ffmpeg.org/): A complete, cross-platform solution to record, convert and stream audio and video.
24-
25-
## Dependencies
26-
27-
- [Electron](https://www.npmjs.com/package/electron).
28-
- [ytdl-core](https://www.npmjs.com/package/ytdl-core).
29-
- [fluent-ffmpeg](https://www.npmjs.com/package/fluent-ffmpeg).
30-
- [ffmpeg-static](https://www.npmjs.com/package/ffmpeg-static).
31-
- [react-bootstrap](https://www.npmjs.com/package/react-bootstrap).
32-
33-
## Future Improvements
34-
35-
- [ ] Allow users to browse files to convert.
36-
- [ ] Make the app as a web page.
37-
- [ ] Add multiple videos to download.
38-
39-
## Getting started
40-
41-
To start developing or using the application you need to make sure that you have [NodeJs v12.16.x](https://nodejs.org/dist/latest-v12.x/node-v12.16.2-x64.msi) and the package manager [yarn v1.22.x](https://classic.yarnpkg.com/en/docs/install#windows-stable) installed.
42-
43-
### Useful commands
44-
45-
```bash
46-
47-
## Install dependencies
48-
yarn
49-
50-
## Run the application
51-
yarn run-dev
52-
53-
or
54-
55-
yarn start
56-
yarn run-electron
57-
58-
## Build the application
59-
yarn build
60-
61-
## Package the application
62-
yarn pack-win-electron or make pack-win
63-
64-
## Lint the project
65-
yarn lint-fix
66-
67-
## Clean the project
68-
make clean
69-
```
70-
71-
## Preview
72-
73-
![Preview](src/assets/preview.png)
1+
<p align="center">
2+
<a href="https://github.com/Youssef-ben"><img src="https://github.com/Youssef-ben/video-converter/blob/develop/src/assets/logo.png" alt="Online Video converter" width="200"></a>
3+
</p>
4+
5+
# Online video converter
6+
7+
The idea of this project came from the fact that most of the free tools that exist on the internet have some restrictions like the length of the video, must watch ads, or a confusion UI with a lot of download buttons. With this, the need to create a free tool that has none of the inconvenience or restrictions like the others became stronger.
8+
9+
The **Online video converter** is a web/desktop application that will allows you to download youtube videos as `MP4s` or convert them to `MP3s` without any restriction.
10+
11+
## Disclaimer
12+
13+
This application should be used for **non-copyrighted** and open-source videos only and should be for personal use only.
14+
15+
If you wish to use any copyrighted videos from Youtube you must obtain expressed permission from the copyright owner.
16+
17+
## Stack
18+
19+
- [Create React App](https://create-react-app.dev/docs/getting-started/): Create React App is an officially supported way to create single-page React applications. It offers a modern build setup with no configuration.
20+
- [ReactJS](https://fr.reactjs.org/): JavaScript library for creating user interfaces.
21+
- [Electron](https://www.electronjs.org/): Develop cross-platform desktop applications with JavaScript, HTML and CSS
22+
- [Sass](https://sass-lang.com/): Sass is a stylesheet language that’s compiled to CSS.
23+
- [FFmpeg](https://www.ffmpeg.org/): A complete, cross-platform solution to record, convert and stream audio and video.
24+
25+
## Dependencies
26+
27+
- [Electron](https://www.npmjs.com/package/electron).
28+
- [ytdl-core](https://www.npmjs.com/package/ytdl-core).
29+
- [fluent-ffmpeg](https://www.npmjs.com/package/fluent-ffmpeg).
30+
- [ffmpeg-static](https://www.npmjs.com/package/ffmpeg-static).
31+
- [react-bootstrap](https://www.npmjs.com/package/react-bootstrap).
32+
33+
## Future Improvements
34+
35+
- [ ] Allow users to browse files to convert.
36+
- [ ] Make the app as a web page.
37+
- [ ] Add multiple videos to download.
38+
39+
## Getting started
40+
41+
To start developing or using the application you need to make sure that you have [NodeJs v12.16.x](https://nodejs.org/dist/latest-v12.x/node-v12.16.2-x64.msi) and the package manager [yarn v1.22.x](https://classic.yarnpkg.com/en/docs/install#windows-stable) installed.
42+
43+
### Useful commands
44+
45+
```bash
46+
47+
## Install dependencies
48+
yarn
49+
50+
## Run the application
51+
yarn run-dev
52+
53+
or
54+
55+
yarn start
56+
yarn run-electron
57+
58+
## Build the application
59+
yarn build
60+
61+
## Package the application
62+
yarn pack-win-electron or make pack-win
63+
64+
## Lint the project
65+
yarn lint-fix
66+
67+
## Clean the project
68+
make clean
69+
```
70+
71+
## Preview
72+
73+
![Preview](src/assets/preview.png)

‎makefile‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
.PHONY: run lint pack-win clean-dist clean-build clean-node clean
2-
3-
run: ## Run the web app in the electron container.
4-
@echo "running the web app and electron container..."
5-
@yarn run-dev
6-
7-
lint: ## Lint the project and automaticlly fix the problems.
8-
@echo "Linting and fixing all the issues..."
9-
@yarn lint-fix
10-
11-
pack-win: clean-dist clean-build ## Build and pack the electron app.
12-
@echo "Installing the Reatct-Electron app dependencies..."
13-
@yarn
14-
15-
@echo "Building the Reatct-Electron app..."
16-
@yarn build
17-
18-
@echo "Packing the React-Electron app..."
19-
@yarn pack-win-electron
20-
21-
@echo "Persisting data..."
22-
@yarn postinstall-electron
23-
24-
@echo "Done."
25-
26-
clean-dist: ## Delete the dist folder.
27-
@echo "Cleaning the {dist} folder..."
28-
@rm -rf dist
29-
30-
clean-build: ## Delete the Build folder.
31-
@echo "Cleaning the {build} folder..."
32-
@rm -rf build
33-
34-
clean-node: ## Delete the node module folder.
35-
@echo "Cleaning the {node-modules} folder..."
36-
@rm -rf node_modules
37-
38-
clean: clean-dist clean-build clean-node ## Delete all the folders [build, dist, node_modules]
39-
@echo "Cleaning other files and folders..."
40-
@rm -rf yarn-error.log
41-
1+
.PHONY: run lint pack-win clean-dist clean-build clean-node clean
2+
3+
run: ## Run the web app in the electron container.
4+
@echo "running the web app and electron container..."
5+
@yarn run-dev
6+
7+
lint: ## Lint the project and automaticlly fix the problems.
8+
@echo "Linting and fixing all the issues..."
9+
@yarn lint-fix
10+
11+
pack-win: clean-dist clean-build ## Build and pack the electron app.
12+
@echo "Installing the Reatct-Electron app dependencies..."
13+
@yarn
14+
15+
@echo "Building the Reatct-Electron app..."
16+
@yarn build
17+
18+
@echo "Packing the React-Electron app..."
19+
@yarn pack-win-electron
20+
21+
@echo "Persisting data..."
22+
@yarn postinstall-electron
23+
24+
@echo "Done."
25+
26+
clean-dist: ## Delete the dist folder.
27+
@echo "Cleaning the {dist} folder..."
28+
@rm -rf dist
29+
30+
clean-build: ## Delete the Build folder.
31+
@echo "Cleaning the {build} folder..."
32+
@rm -rf build
33+
34+
clean-node: ## Delete the node module folder.
35+
@echo "Cleaning the {node-modules} folder..."
36+
@rm -rf node_modules
37+
38+
clean: clean-dist clean-build clean-node ## Delete all the folders [build, dist, node_modules]
39+
@echo "Cleaning other files and folders..."
40+
@rm -rf yarn-error.log
41+
4242
@echo "done."

0 commit comments

Comments
 (0)