Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Last fixes #492

Merged
merged 3 commits into from
Jun 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ We actively welcome your pull requests:
6. Make sure your code is pretty (`npm run prettier`)
7. Issue that pull request!

## Any contributions you make will be under the MIT Software License
## Any contributions you make will be under the Apache 2.0 License

In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project.
In short, when you submit code changes, your submissions are understood to be under the same Apache 2.0 License that covers the project.

## Report bugs using Github's [issues](https://github.com/gladysassistant/Gladys/issues)

Expand Down
84 changes: 53 additions & 31 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,53 +1,76 @@
<p align="center"><img width=60% src="https://gladysassistant.com/assets/images/external/gladys-logo-main-horizontal-01@2x.png"></p>

&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
![GitHub release](https://img.shields.io/github/release/gladysassistant/gladys.svg)
[![Build Status](https://travis-ci.org/GladysAssistant/Gladys.svg?branch=master)](https://travis-ci.org/GladysAssistant/Gladys)
![Contributions welcome](https://img.shields.io/badge/contributions-welcome-orange.svg)
![Discourse posts](https://img.shields.io/discourse/https/community.gladysassistant.com/posts.svg)
![GitHub](https://img.shields.io/github/license/GladysAssistant/Gladys.svg)
![Twitter Follow](https://img.shields.io/twitter/follow/gladysassistant.svg?style=social)
![GitHub stars](https://img.shields.io/github/stars/gladysassistant/gladys.svg?style=social)
<h1 align="center">
<br>
<img src="https://gladysassistant.com/assets/images/external/github-gladys-logo.png" width="200">
<br>
Gladys Assistant
</h1>

<h4 align="center">A privacy-first, open-source home assistant</h4>

<p align="center">

</p>

<p align="center">
<a href="#the-project">The Project</a> •
<a href="#getting-started">Getting Started</a> •
<a href="#contributing">Contributing</a> •
<a href="#support-financially">Support Financially</a> •
<a href="#links">Links</a> •
<a href="#copyright--license">Copyright & License</a>
</p>

<img src="https://gladysassistant.com/assets/images/external/github-gladys-4-mockups-devices.jpg" />

## What it does

Gladys is a home automation assistant to help you in your everyday life.
Gladys is a home assistant who helps you in your everyday life.

Yes, like a kind of **JARVIS**!
Like a kind of **JARVIS**!

Gladys is connected to all your devices in your home. She is connected to your calendar and to lots of API to help you. But let's pick an example :
Gladys is connected to all your devices in your home. She is connected to your calendars and tons of API to help you.

- It's 8 AM. Gladys wakes you up automatically because she knows that you need to be at work at 9 AM, and that according to the traffic, you'll need 30 min to get to work with your car. She knows that you like 30 min to get ready.
She wakes you up with a soft progressive warm light thanks to your Philips Hue, and puts on nice music in your room.
- It's 8.10 AM. Gladys detects, thanks to a motion sensor, that you are getting out of bed. She immediately starts the wake-up scenario : she tells the coffee machine to prepare the coffee, and opens the blinds.
- At 8.30 AM, you leave the house. Gladys detects, thanks to your smartphone, that you are not at home anymore, and shuts down everything inside.
- At 6.30 PM, you are on your way home : Everything is ready when you arrive.
- You are going to sleep, so you simply put your phone on your nightstand where a NFC tag is sticked. It immediately sends a request to Gladys to tell her you are going to sleep. She starts the "Going to sleep" scenario, and turns off all lights.
But let's pick an example:

This is just a simple scenario, possibilities with Gladys are just endless ! Don't hesitate to propose yours :)
- It's 8 AM. Gladys wakes you up automatically because she knows that you need to be at work at 9 AM, and that according to the traffic, you'll need 30min to go to work with your car. She knows that you like 30 min to get ready. She wakes you up with a soft progressive warm light thanks to your Philips Hue, and puts a nice music in your room.
- It's 8.10 AM, Gladys detects thanks to a motion sensor that you are getting out of bed. She immediately starts the wake-up scenario : she tells the coffee machine to prepare the coffee, and opens the blinds.
- At 8.30 AM, you leave the house. Gladys detects thanks to your smartphone that you are not at home anymore, and shuts down everything inside.
- At 6.30 PM, you are getting back home : Everything is ready when you arrive. You are going to sleep, so you simply put your phone on your nightstand where a NFC tag is sticked. It immediately sends a request to Gladys to tell here you are going to sleep. She starts the "Going to sleep" scenario, and turns off all lights.

Interested in Gladys ? Try it at home, it's free and Open-Source !
This is just a simple scenario, possibilities with Gladys are just endless. Don't hesitate to suggest yours 😉

**Website :** [https://gladysassistant.com](https://gladysassistant.com) <br>
**Community :** [https://community.gladysassistant.com/](https://community.gladysassistant.com/)
## Getting Started

Gladys Raspbian image has **more than 32 000 downloads**, and Gladys community has more than **2 000 members** !
Right now we are migrating from Gladys 3 to Gladys 4, a new release rewrote from scratch. If you want to install Gladys 3, visit [our website](https://gladysassistant.com).

## Who Am I?
To install Gladys 4 Alpha, read the following instructions.

My name is [Pierre-Gilles Leymarie](https://twitter.com/pierregillesl), I'm an indie maker, and recently I decided to move part-time on this open-source project Gladys!
We use Docker to deploy Gladys 4, so it's easy to install it on any system.

As I'm working completely for free for the community, you can support this open-source project by subscribing to the [Gladys Community Package](https://gladysassistant.com/gladys-community-package)!
### On a Raspberry Pi

Thanks a lot for your support 🙏
Read our tutorial: [Install Gladys 4 on a Raspberry Pi](https://documentation.gladysassistant.com/en/installation#raspberry-pi)

## Getting Started
### On MacOS/Windows

Read our tutorial: [Install Gladys 4 on MacOS/Windows](https://documentation.gladysassistant.com/en/installation#macos-windows)

## Contributing

Pull requests are welcomed!

See [Contributing.md](https://github.com/gladysassistant/Gladys/blob/master/.github/CONTRIBUTING.md).
Read [Contributing.md](https://github.com/gladysassistant/Gladys/blob/master/.github/CONTRIBUTING.md) for more details.

## Support Financially

My name is [Pierre-Gilles Leymarie](https://twitter.com/pierregillesl), I founded Gladys Assistant in 2013 and recently I decided to work almost full-time on open-source.

It's only thanks to donation from the community that my open-source work is sustainable.

To support the project, you can:

- Support monthly, 9.99€/month with the [Gladys Community Package](https://gladysassistant.com/gladys-community-package).
- Donate with Bitcoin: 3KQiX1FtbdXLXPH9UfLSyuzRMDRGY52EiA

## Links

Expand All @@ -56,7 +79,6 @@ See [Contributing.md](https://github.com/gladysassistant/Gladys/blob/master/.git
- [Twitter](https://twitter.com/gladysassistant)
- [Instagram](https://www.instagram.com/gladysassistant/)
- [Facebook](https://www.facebook.com/gladysassistant)
- [Support Gladys Financially](https://gladysassistant.com/gladys-community-package)

## Copyright & License

Expand Down
2 changes: 0 additions & 2 deletions front/src/actions/system.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ function createActions(store) {
const systemInfos = await state.httpClient.get('/api/v1/system/info');
const today = new Date().getTime();
const systemStartedAt = today - systemInfos.uptime * 1000;
systemInfos.latest_gladys_version = 'latest';
systemInfos.new_release_available = true;
systemInfos.uptime_formatted = dayjs(systemStartedAt)
.locale(state.user.language)
.fromNow();
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gladys",
"version": "4.0.0",
"description": "Gladys 4",
"version": "4.0.0-alpha",
"description": "An open-source home assistant",
"main": "index.js",
"scripts": {
"postinstall": "run-p install-server:dev install-front:dev",
Expand Down