Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hackur/Ionic-Creator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: CedarLogic/Ionic-Creator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Aug 14, 2016

  1. Copy the full SHA
    91086a6 View commit details
  2. Fix: Appveyor file

    NuroDev committed Aug 14, 2016
    Copy the full SHA
    4b2a012 View commit details
  3. Fix: App Package.json

    NuroDev committed Aug 14, 2016
    Copy the full SHA
    760b24f View commit details
  4. Copy the full SHA
    062cf41 View commit details

Commits on Aug 17, 2016

  1. Copy the full SHA
    745f22f View commit details
  2. Copy the full SHA
    11e31d7 View commit details

Commits on Aug 18, 2016

  1. Finally added testing.

    NuroDev committed Aug 18, 2016
    Copy the full SHA
    102d681 View commit details
  2. App Menu optimization

    NuroDev committed Aug 18, 2016
    Copy the full SHA
    3a598af View commit details

Commits on Aug 20, 2016

  1. Copy the full SHA
    f0abbbd View commit details
  2. Fix: Windows Menu fix

    NuroDev committed Aug 20, 2016
    Copy the full SHA
    6190b6c View commit details
  3. Copy the full SHA
    7c5b104 View commit details
  4. Copy the full SHA
    1ab0331 View commit details
  5. Moved menu to single file

    NuroDev committed Aug 20, 2016
    Copy the full SHA
    62b551f View commit details
  6. Removed unneeded var

    NuroDev committed Aug 20, 2016
    Copy the full SHA
    adec4d9 View commit details

Commits on Aug 21, 2016

  1. Removed Live-reload

    NuroDev committed Aug 21, 2016
    Copy the full SHA
    4f7330c View commit details
  2. Copy the full SHA
    87953d1 View commit details

Commits on Aug 22, 2016

  1. Copy the full SHA
    2a7cd39 View commit details

Commits on Aug 23, 2016

  1. Copy the full SHA
    58c0cbf View commit details

Commits on Aug 24, 2016

  1. Dark theme additions

    NuroDev committed Aug 24, 2016
    Copy the full SHA
    6359d82 View commit details

Commits on Aug 25, 2016

  1. Copy the full SHA
    1500fac View commit details

Commits on Sep 3, 2016

  1. Updated README.md

    NuroDev committed Sep 3, 2016
    Copy the full SHA
    c8f36ab View commit details
  2. Fix: README.md

    NuroDev committed Sep 3, 2016
    Copy the full SHA
    cf4ac16 View commit details
  3. Removed live-reload script

    NuroDev committed Sep 3, 2016
    Copy the full SHA
    f568517 View commit details

Commits on Sep 19, 2016

  1. Updated dependencies

    NuroDev committed Sep 19, 2016
    Copy the full SHA
    9b36a53 View commit details

Commits on Sep 29, 2016

  1. Fix: Package.json

    NuroDev committed Sep 29, 2016
    Copy the full SHA
    0bbb6e8 View commit details
Showing with 553 additions and 406 deletions.
  1. +4 −0 .travis.yml
  2. +21 −30 README.md
  3. +10 −0 app/config.js
  4. +0 −58 app/index.html
  5. +0 −116 app/lib/menu_osx.js
  6. +0 −115 app/lib/menu_win.js
  7. +105 −56 app/main.js
  8. +259 −0 app/menu.js
  9. +27 −22 app/package.json
  10. +46 −0 app/style/app-dark.css
  11. +7 −0 app/style/app.css
  12. +3 −1 appveyor.yml
  13. +27 −8 package.json
  14. +44 −0 test/test.js
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
language: node_js
node_js:
- "node"
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start
script:
- npm install && npm test
51 changes: 21 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,48 +1,39 @@
<h1 align="center">
<a href="https://creator.ionic.io"><img alt='Ionic Creator' width='256' height='256' src="https://raw.githubusercontent.com/Meadowcottage/Ionic-Creator/master/build/icon.png"></a>
<br>
Ionic-Creator (UNOFFICIAL)
<br>
</h1>
<img src="https://raw.githubusercontent.com/Meadowcottage/Ionic-Creator/master/build/icon.png" align="left" width="192px" height="192px"/>
<img align="left" width="0" height="192px" hspace="10"/>

<h4 align="center">This is the unofficial <a href="https://creator.ionic.io/">Ionic-Creator</a> web app. Built using the <a href="http://electron.atom.io/">Electron</a> framework to take the current live feed site and give it to you as a desktop app.</h4>
# Ionic Creator (UNOFFICIAL)
> This is the unofficial [Ionic-Creator](https://creator.ionic.io/) web app. Built using the [Electron](http://electron.atom.io) framework to take the current live feed site and give it to you as a desktop app.
<p align="center">
<a href="https://travis-ci.org/Meadowcottage/Ionic-Creator"><img src="https://img.shields.io/travis/Meadowcottage/Ionic-Creator/master.svg?style=flat-square" alt="Travis"></a>
<a href="https://ci.appveyor.com/project/Meadowcottage/Ionic-Creator"><img src="https://img.shields.io/appveyor/ci/meadowcottage/Ionic-Creator.svg?style=flat-square" alt="Appveyor"></a>
<a href="https://github.com/Meadowcottage/Ionic-Creator/releases"><img src="https://img.shields.io/github/release/Meadowcottage/Ionic-Creator.svg?style=flat-square" alt="Release"></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=bendixon50%40gmail%2ecom&item_name=Tip%20for%20Meadowcottage&currency_code=GBP"><img src="https://img.shields.io/badge/Donate-PayPal-green.svg?style=flat-square" alt="Paypal"></a>
<a href="https://github.com/Meadowcottage/Ionic-Creator/releases"><img src="https://img.shields.io/github/downloads/meadowcottage/Ionic-Creator/total.svg?style=flat-square" alt="Downloads"></a>
</p>
[![Travis](https://img.shields.io/travis/Meadowcottage/Ionic-Creator/master.svg?style=flat-square)](https://travis-ci.org/Meadowcottage/Ionic-Creator) [![Appveyor](https://img.shields.io/appveyor/ci/meadowcottage/Ionic-Creator.svg?style=flat-square)](https://ci.appveyor.com/project/Meadowcottage/Ionic-Creator) [![Release](https://img.shields.io/github/release/Meadowcottage/Ionic-Creator.svg?style=flat-square)](https://github.com/Meadowcottage/Ionic-Creator/releases) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg?style=flat-square)](https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=bendixon50%40gmail%2ecom&item_name=Tip%20for%20Meadowcottage&currency_code=GBP) [![Downloads](https://img.shields.io/github/downloads/meadowcottage/Ionic-Creator/total.svg?style=flat-square)](https://github.com/Meadowcottage/Ionic-Creator/releases) [![License](https://img.shields.io/badge/License-GPL%20v3-blue.svg?style=flat-square)](http://www.gnu.org/licenses/)

## Screenshots
<br>
<br>

<img src="https://raw.githubusercontent.com/Meadowcottage/Ionic-Creator/master/build/Screenshot-light-1.png"/>
# Screenshots

<img src="https://raw.githubusercontent.com/Meadowcottage/Ionic-Creator/master/build/Screenshot-light-2.png"/>
[<img alt='Ionic Creator' src="https://raw.githubusercontent.com/Meadowcottage/Ionic-Creator/master/build/Screenshot-light-1.png">](https://github.com/Meadowcottage/Ionic-Creator/releases)

<img src="https://raw.githubusercontent.com/Meadowcottage/Ionic-Creator/master/build/Screenshot-dark-1.png"/>
[<img alt='Ionic Creator' src="https://raw.githubusercontent.com/Meadowcottage/Ionic-Creator/master/build/Screenshot-light-2.png">](https://github.com/Meadowcottage/Ionic-Creator/releases)

<img src="https://raw.githubusercontent.com/Meadowcottage/Ionic-Creator/master/build/Screenshot-dark-2.png"/>

## Install

[Download the lastest version](https://github.com/Meadowcottage/Ionic-Creator/releases).
## Downloads
> Downloads can be found on the [releases page](https://github.com/Meadowcottage/Ionic-Creator/releases)
## Development

- Clone: `$ git clone https://github.com/Meadowcottage/Ionic-Creator.git`
- Install NPM: `$ npm install`
- Start Preview: `$ npm start`
- Build: `$ npm run dist`
```
$ git clone https://github.com/Meadowcottage/Ionic-Creator.git
$ npm install
$ npm start
$ npm run dist
```

## SUPPORT

[<img width='45' height="45" align='left' alt='Ionic-Creator' src="https://raw.githubusercontent.com/Meadowcottage/Ionic-Creator/master/build/icon.png">](https://creator.ionic.io/) Most of the support for this app must go to the Ionic-Creator team and the work they put in to make the platform itself and continue to make it great for streamers to use. To support [Ionic-Creator](https://creator.ionic.io/), who built the platform, feel free to check out their site for more details.
[<img width='45' height="45" align='left' alt='Ionic-Creator' src="https://raw.githubusercontent.com/Meadowcottage/Ionic-Creator/master/build/icon.png">](https://creator.ionic.io/) Most of the support for this app must go to the Ionic-Creator team and the work they put in to make the platform itself and continue to make it great for us developers. To support [Ionic-Creator](https://creator.ionic.io/), who built the platform, feel free to check out their site for more details.

[<img width='45' height="45" align='left' alt='Github' src="https://upload.wikimedia.org/wikipedia/commons/9/91/Octicons-mark-github.svg">](https://github.com/Meadowcottage/Ionic-Creator) Feel free to help support this unofficial app by submitting issues or bugs so we can resolve and fox them or even feel free to submit pull requests if you have already helped develop a fix for one of the bugs in the app.
[<img width='45' height="45" align='left' alt='Github' src="https://upload.wikimedia.org/wikipedia/commons/9/91/Octicons-mark-github.svg">](https://github.com/Meadowcottage/Ionic-Creator) Feel free to help support this unofficial app by submitting issues or bugs so we can resolve and fix them or even feel free to submit pull requests if you have already helped develop a fix for one of the bugs in the app.

## LICENSE:
## License

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
10 changes: 10 additions & 0 deletions app/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const config = require('electron-config');

module.exports = new config({
defaults: {
lastWindowState: {
width: 1280,
height: 820
}
}
});
58 changes: 0 additions & 58 deletions app/index.html

This file was deleted.

116 changes: 0 additions & 116 deletions app/lib/menu_osx.js

This file was deleted.

115 changes: 0 additions & 115 deletions app/lib/menu_win.js

This file was deleted.

Loading