Skip to content

Commit

Permalink
Merge newBase into develop (#13)
Browse files Browse the repository at this point in the history
* tsc

* actions wip

* Refactored, added Config Singleton

* readme update

* Update README.md

* few changes on architecture

* remove deprecated files

* bumped license

* fix: keyCombinations

* bumped electron to 8.2.0, running basic version

* Added tsc and lint command to .travis.yml (#11)

Fixes #8

* Added tsc command

* Updated .travis.yml

* removed before_scripts from travis file

* Fix: existing linting errors (#15), build passes from here

* removed linting errors

* cleared the renderer file

Co-authored-by: Piyush Agrawal <[email protected]>

Co-authored-by: Piyush Agrawal <[email protected]>
Co-authored-by: Divija Palleti <[email protected]>
Co-authored-by: Muskan0510 <[email protected]>
  • Loading branch information
4 people committed Jun 20, 2020
1 parent ac6894b commit 9a54c84
Show file tree
Hide file tree
Showing 47 changed files with 1,179 additions and 4,072 deletions.
3 changes: 0 additions & 3 deletions .eslintrc.js

This file was deleted.

8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ matrix:
- os: osx
fast_finish: true

before_script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sleep 3; fi

cache:
yarn: true

Expand All @@ -25,7 +20,8 @@ install:
- yarn

script:
- npm run test
- npm run lint
- tsc

before_deploy:
- npm run build
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 H2
Copyright (c) 2020 H2

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
31 changes: 5 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,44 +1,23 @@
# H2

Inspired by the Helium app, **H2** is a minimalist browser to watch embeded videos and more in picture-in-picture mode.

# Features

:tv: Works with any Youtube URL.

:scroll: Works with PDFs links, Google Docs URLs.

:computer: Works on all platforms, thanks to electron ❤️

:art: Image editor supports contrast, brightness, hue, sepia and save as PNG.

:clock9:[WIP] Many other features coming soon.

# Example

<a href="https://s3.amazonaws.com/h2org/h2-demo.gif" target="_blank">Watch Demo</a>
Supporting light weight extensions for heavy task lifting. The extensibility of H2's core enables building extensions that can provide you with small digital luxuries! Think Picture-in-picture for live streaming, youtube, images, videos or any other media source ([where it all began](https://github.com/h2org/H2)), cross-device clipboard sharing, mini games and other cool stuff.

## Installation

- [Windows](docs/windows.md)
- [Mac](docs/mac.md)
- [Linux](docs/linux.md)

## Usage

- Copy any youtube, PDF or google docs URL and press `Ctrl/Command + Shift + V`
- [Keyboards Shortcuts](docs/shortcuts.md)

## Contributing

```bash
# Clone this repository

git clone https://github.com/h2org/H2
git clone https://github.com/h2org/h2-core

# Go into the repository

cd H2
cd h2-core

# Install dependencies

Expand All @@ -51,9 +30,9 @@ npm start

## Bug

[Known Bugs](https://github.com/h2org/H2/issues?q=is%3Aopen+is%3Aissue+label%3Abug)
[Known Bugs](https://github.com/h2org/h2-core/issues?q=is%3Aopen+is%3Aissue+label%3Abug)


## License

[CC0-1.0](https://github.com/h2org/H2/blob/master/LICENSE.md)
[MIT](https://github.com/h2org/h2-core/blob/master/LICENSE.md)
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
6 changes: 6 additions & 0 deletions extensions/actions/pip-vimeo.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class action {

public hasAccess() {
return true;
}
}
12 changes: 12 additions & 0 deletions extensions/user.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"name": "PIP Media",
"filename": "pip-media",
"author": "xx",
"actions": {
"CLIPBOARD_TEXT": [
"pip-vimeo"
]
}
}
]
Loading

0 comments on commit 9a54c84

Please sign in to comment.