Skip to content

Commit

Permalink
Merge pull request #6 from Youssef-ben/updating-libs
Browse files Browse the repository at this point in the history
Merge {Updating-libs} with {develop}
  • Loading branch information
Youssef-ben committed Dec 11, 2020
2 parents f1498b0 + e11d733 commit 728c9fa
Show file tree
Hide file tree
Showing 10 changed files with 14,395 additions and 14,414 deletions.
48 changes: 24 additions & 24 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
// auto-save configs
"editor.formatOnSave": true,

// turn it off for JS and JSX, we will do this via eslint
"[javascript]": {
"editor.formatOnSave": false
},
"[javascriptreact]": {
"editor.formatOnSave": false
},

// tell the ESLint plugin to run on save
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},

// 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
"prettier.disableLanguages": [
"javascript",
"javascriptreact"
],
"files.eol": "\n"
}
{
// auto-save configs
"editor.formatOnSave": true,

// turn it off for JS and JSX, we will do this via eslint
"[javascript]": {
"editor.formatOnSave": false
},
"[javascriptreact]": {
"editor.formatOnSave": false
},

// tell the ESLint plugin to run on save
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},

// 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
"prettier.disableLanguages": [
"javascript",
"javascriptreact"
],
"files.eol": "\n"
}
42 changes: 21 additions & 21 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# MIT License

Copyright (c) 2017 Lee Robinson

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
# MIT License

Copyright (c) 2017 Lee Robinson

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
146 changes: 73 additions & 73 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
<p align="center">
<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>
</p>

# Online video converter

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.

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.

## Disclaimer

This application should be used for **non-copyrighted** and open-source videos only and should be for personal use only.

If you wish to use any copyrighted videos from Youtube you must obtain expressed permission from the copyright owner.

## Stack

- [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.
- [ReactJS](https://fr.reactjs.org/): JavaScript library for creating user interfaces.
- [Electron](https://www.electronjs.org/): Develop cross-platform desktop applications with JavaScript, HTML and CSS
- [Sass](https://sass-lang.com/): Sass is a stylesheet language that’s compiled to CSS.
- [FFmpeg](https://www.ffmpeg.org/): A complete, cross-platform solution to record, convert and stream audio and video.

## Dependencies

- [Electron](https://www.npmjs.com/package/electron).
- [ytdl-core](https://www.npmjs.com/package/ytdl-core).
- [fluent-ffmpeg](https://www.npmjs.com/package/fluent-ffmpeg).
- [ffmpeg-static](https://www.npmjs.com/package/ffmpeg-static).
- [react-bootstrap](https://www.npmjs.com/package/react-bootstrap).

## Future Improvements

- [ ] Allow users to browse files to convert.
- [ ] Make the app as a web page.
- [ ] Add multiple videos to download.

## Getting started

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.

### Useful commands

```bash

## Install dependencies
yarn

## Run the application
yarn run-dev

or

yarn start
yarn run-electron

## Build the application
yarn build

## Package the application
yarn pack-win-electron or make pack-win

## Lint the project
yarn lint-fix

## Clean the project
make clean
```

## Preview

![Preview](src/assets/preview.png)
<p align="center">
<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>
</p>

# Online video converter

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.

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.

## Disclaimer

This application should be used for **non-copyrighted** and open-source videos only and should be for personal use only.

If you wish to use any copyrighted videos from Youtube you must obtain expressed permission from the copyright owner.

## Stack

- [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.
- [ReactJS](https://fr.reactjs.org/): JavaScript library for creating user interfaces.
- [Electron](https://www.electronjs.org/): Develop cross-platform desktop applications with JavaScript, HTML and CSS
- [Sass](https://sass-lang.com/): Sass is a stylesheet language that’s compiled to CSS.
- [FFmpeg](https://www.ffmpeg.org/): A complete, cross-platform solution to record, convert and stream audio and video.

## Dependencies

- [Electron](https://www.npmjs.com/package/electron).
- [ytdl-core](https://www.npmjs.com/package/ytdl-core).
- [fluent-ffmpeg](https://www.npmjs.com/package/fluent-ffmpeg).
- [ffmpeg-static](https://www.npmjs.com/package/ffmpeg-static).
- [react-bootstrap](https://www.npmjs.com/package/react-bootstrap).

## Future Improvements

- [ ] Allow users to browse files to convert.
- [ ] Make the app as a web page.
- [ ] Add multiple videos to download.

## Getting started

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.

### Useful commands

```bash

## Install dependencies
yarn

## Run the application
yarn run-dev

or

yarn start
yarn run-electron

## Build the application
yarn build

## Package the application
yarn pack-win-electron or make pack-win

## Lint the project
yarn lint-fix

## Clean the project
make clean
```

## Preview

![Preview](src/assets/preview.png)
82 changes: 41 additions & 41 deletions makefile
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
.PHONY: run lint pack-win clean-dist clean-build clean-node clean

run: ## Run the web app in the electron container.
@echo "running the web app and electron container..."
@yarn run-dev

lint: ## Lint the project and automaticlly fix the problems.
@echo "Linting and fixing all the issues..."
@yarn lint-fix

pack-win: clean-dist clean-build ## Build and pack the electron app.
@echo "Installing the Reatct-Electron app dependencies..."
@yarn

@echo "Building the Reatct-Electron app..."
@yarn build

@echo "Packing the React-Electron app..."
@yarn pack-win-electron

@echo "Persisting data..."
@yarn postinstall-electron

@echo "Done."

clean-dist: ## Delete the dist folder.
@echo "Cleaning the {dist} folder..."
@rm -rf dist

clean-build: ## Delete the Build folder.
@echo "Cleaning the {build} folder..."
@rm -rf build

clean-node: ## Delete the node module folder.
@echo "Cleaning the {node-modules} folder..."
@rm -rf node_modules

clean: clean-dist clean-build clean-node ## Delete all the folders [build, dist, node_modules]
@echo "Cleaning other files and folders..."
@rm -rf yarn-error.log

.PHONY: run lint pack-win clean-dist clean-build clean-node clean

run: ## Run the web app in the electron container.
@echo "running the web app and electron container..."
@yarn run-dev

lint: ## Lint the project and automaticlly fix the problems.
@echo "Linting and fixing all the issues..."
@yarn lint-fix

pack-win: clean-dist clean-build ## Build and pack the electron app.
@echo "Installing the Reatct-Electron app dependencies..."
@yarn

@echo "Building the Reatct-Electron app..."
@yarn build

@echo "Packing the React-Electron app..."
@yarn pack-win-electron

@echo "Persisting data..."
@yarn postinstall-electron

@echo "Done."

clean-dist: ## Delete the dist folder.
@echo "Cleaning the {dist} folder..."
@rm -rf dist

clean-build: ## Delete the Build folder.
@echo "Cleaning the {build} folder..."
@rm -rf build

clean-node: ## Delete the node module folder.
@echo "Cleaning the {node-modules} folder..."
@rm -rf node_modules

clean: clean-dist clean-build clean-node ## Delete all the folders [build, dist, node_modules]
@echo "Cleaning other files and folders..."
@rm -rf yarn-error.log

@echo "done."
Loading

0 comments on commit 728c9fa

Please sign in to comment.