Permalink
Browse files

Merge pull request #5 from iGerli/dev/sgerli

Add new menu and animations
  • Loading branch information...
sGerli committed Feb 4, 2017
2 parents 4df8867 + cc7e0fb commit 1ed484dd6daef4b3392caeaa77729e6800912dc5
Showing with 4,326 additions and 107,975 deletions.
  1. +8 −12 Dockerfile.template
  2. +18 −0 README.md
  3. +11 −0 app/.editorconfig
  4. +5 −0 app/.eslintrc
  5. BIN app/data/MaterialIcons-Regular.012cf6a10129e2275d79.woff
  6. BIN app/data/MaterialIcons-Regular.570eb83859dc23dd0eec.woff2
  7. BIN app/data/MaterialIcons-Regular.a37b0c01c0baf1888ca8.ttf
  8. BIN app/data/MaterialIcons-Regular.e79bfd88537def476913.eot
  9. BIN app/data/{Roboto-Black.ttf → Roboto-Black.893fe14628bd7ac498d5.ttf}
  10. BIN app/data/{Roboto-BlackItalic.ttf → Roboto-BlackItalic.256aab654d3c4dd0e12f.ttf}
  11. BIN app/data/{Roboto-Bold.ttf → Roboto-Bold.d329cc8b34667f114a95.ttf}
  12. BIN app/data/{Roboto-BoldItalic.ttf → Roboto-BoldItalic.b37d0bb73a2f688ecaee.ttf}
  13. BIN app/data/{Roboto-Italic.ttf → Roboto-Italic.de74c60991cd63c8b922.ttf}
  14. BIN app/data/{Roboto-Light.ttf → Roboto-Light.7b5fb88f12bec8143f00.ttf}
  15. BIN app/data/{Roboto-LightItalic.ttf → Roboto-LightItalic.129c5057f4480f9a353e.ttf}
  16. BIN app/data/{Roboto-Medium.ttf → Roboto-Medium.fe13e4170719c2fc5865.ttf}
  17. BIN app/data/{Roboto-MediumItalic.ttf → Roboto-MediumItalic.5b25afa871e1b8960118.ttf}
  18. BIN app/data/{Roboto-Regular.ttf → Roboto-Regular.ac3f799d5bbaf5196fab.ttf}
  19. BIN app/data/{Roboto-Thin.ttf → Roboto-Thin.3f68500b267c20051088.ttf}
  20. BIN app/data/{Roboto-ThinItalic.ttf → Roboto-ThinItalic.1e5737be5c68c15c3a10.ttf}
  21. BIN app/data/assets/fonts/Roboto-Black.ttf
  22. BIN app/data/assets/fonts/Roboto-BlackItalic.ttf
  23. BIN app/data/assets/fonts/Roboto-Bold.ttf
  24. BIN app/data/assets/fonts/Roboto-BoldItalic.ttf
  25. BIN app/data/assets/fonts/Roboto-Italic.ttf
  26. BIN app/data/assets/fonts/Roboto-Light.ttf
  27. BIN app/data/assets/fonts/Roboto-LightItalic.ttf
  28. BIN app/data/assets/fonts/Roboto-Medium.ttf
  29. BIN app/data/assets/fonts/Roboto-MediumItalic.ttf
  30. BIN app/data/assets/fonts/Roboto-Regular.ttf
  31. BIN app/data/assets/fonts/Roboto-Thin.ttf
  32. BIN app/data/assets/fonts/Roboto-ThinItalic.ttf
  33. BIN app/data/favicon.ico
  34. +2 −2 app/data/index.html
  35. +1 −0 app/data/inline.3a1ce6c7367181824214.bundle.js
  36. +1 −0 app/data/inline.85d9b1c9bf2fe9119f91.bundle.js
  37. +0 −146 app/data/inline.bundle.js
  38. +0 −1 app/data/inline.bundle.map
  39. +1 −0 app/data/main.9639c7e3b95a368727f4.bundle.js
  40. BIN app/data/main.9639c7e3b95a368727f4.bundle.js.gz
  41. +0 −463 app/data/main.bundle.js
  42. +0 −1 app/data/main.bundle.map
  43. +1 −0 app/data/main.cef84db6ad4b1961e086.bundle.js
  44. BIN app/data/main.cef84db6ad4b1961e086.bundle.js.gz
  45. +1 −0 app/data/styles.9bc434302f60b8dc6e4b.bundle.css
  46. BIN app/data/styles.9bc434302f60b8dc6e4b.bundle.css.gz
  47. BIN app/data/styles.9f0089769a486e2f3f51.bundle.js.gz
  48. BIN app/data/styles.a89e1c11cb33c5dc0b06.bundle.js.gz
  49. +0 −223 app/data/styles.bundle.css
  50. +0 −1 app/data/styles.bundle.map
  51. +1 −0 app/data/styles.e2987daf373e7b0d2fe1.bundle.css
  52. BIN app/data/styles.e2987daf373e7b0d2fe1.bundle.css.gz
  53. +2,092 −0 app/data/vendor.19328e6fefd18e9117c9.bundle.js
  54. BIN app/data/vendor.19328e6fefd18e9117c9.bundle.js.gz
  55. +2,092 −0 app/data/vendor.4f8996d70ea561e7ff02.bundle.js
  56. BIN app/data/vendor.4f8996d70ea561e7ff02.bundle.js.gz
  57. +0 −107,089 app/data/vendor.bundle.js
  58. +0 −1 app/data/vendor.bundle.map
  59. +79 −31 app/main.js
  60. +13 −5 app/package.json
View
@@ -1,4 +1,4 @@
FROM resin/%%RESIN_MACHINE_NAME%%-node:6.9.2
FROM resin/%%RESIN_MACHINE_NAME%%-node:6.9
# debian httpredir mirror proxy often ends up with 404s - editing source file to avoid it
RUN sed -i "s!httpredir.debian.org!`curl -s -D - http://httpredir.debian.org/demo/debian/ | awk '/^Link:/ { print $2 }' | sed -e 's@<http://\(.*\)/debian/>;@\1@g'`!" /etc/apt/sources.list
@@ -28,7 +28,9 @@ RUN apt-get update && apt-get install -y \
libsmbclient \
libssh-4 \
fbset \
libexpat-dev && rm -rf /var/lib/apt/lists/*
libexpat-dev\
libxtst-dev \
libpng-dev && rm -rf /var/lib/apt/lists/*
# Set Xorg and FLUXBOX preferences
RUN mkdir ~/.fluxbox
@@ -37,25 +39,19 @@ RUN echo "#!/bin/bash" > /etc/X11/xinit/xserverrc \
&& echo "" >> /etc/X11/xinit/xserverrc \
&& echo 'exec /usr/bin/X -s 0 dpms -nocursor -nolisten tcp "$@"' >> /etc/X11/xinit/xserverrc
# Save source folder
RUN printf "%s\n" "${PWD##}" > SOURCEFOLDER
# Move to app dir
WORKDIR /usr/src/app
# Move package.json and deps.sh to filesystem
COPY "$SOURCEFOLDER/app/package.json" ./
COPY "$SOURCEFOLDER/app/deps.sh" ./
# Install Deps
COPY "./app/package.json" ./
COPY "./app/deps.sh" ./
# Install npm modules for the application
RUN JOBS=MAX npm install --unsafe-perm --production \
&& npm cache clean
&& npm cache clean && node_modules/.bin/electron-rebuild
# Move app to filesystem
COPY "$SOURCEFOLDER/app" ./
COPY ./app ./
## uncomment if you want systemd
ENV INITSYSTEM on
View
@@ -8,4 +8,22 @@ For contributing take a look at the <a href="https://github.com/iGerli/clockOS/w
For any suggestion add an issue on GitHub.
## Getting Started
Before getting started you need to setup your Pi and attach your TFT to then set it up with [Resin.io](http://resin.io) if you haven't already.
- First make sure your display is working with ResinOS. To make your display work you might need to set a `Fleet Configuration` with the name `RESIN_HOST_CONFIG_dtoverlay` with value `pitft28-resistive,rotate=90`, you may want to tweak that depending on your display. Note: Some overlays may not be available, that depends on your ResinOS version, I had to sideload mine `rpi-display` in my SD card.
- Then wire your navigation buttons, you're going to need 4.
Default pins are (you can modify this in main.js):
```
upButton: 16,
downButton: 17,
backButton: 27,
selectButton: 22
```
- To change your time zone modify [this](https://github.com/iGerli/clockOS/blob/master/Dockerfile.template#L64) line from your `Dockerfile.template`.
## Deploying to Resin.io
To deploy clone or fork and clone this project to desktop and add resin.io remote.
Then just run `git push resin master`. And this will deploy to all your devices in that app.
## License
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
View
@@ -0,0 +1,11 @@
root = true
[*]
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
# editorconfig-tools is unable to ignore longs strings or urls
max_line_length = null
View
@@ -0,0 +1,5 @@
// Use this file as a starting point for your project's .eslintrc.
// Copy this file, and add rule overrides as needed.
{
"extends": "airbnb-base"
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
@@ -6,8 +6,8 @@
<base href="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="styles.bundle.css" rel="stylesheet"/></head>
<link href="styles.e2987daf373e7b0d2fe1.bundle.css" rel="stylesheet"/></head>
<body>
<app-root></app-root>
<script type="text/javascript" src="inline.bundle.js"></script><script type="text/javascript" src="vendor.bundle.js"></script><script type="text/javascript" src="main.bundle.js"></script></body>
<script type="text/javascript" src="inline.3a1ce6c7367181824214.bundle.js"></script><script type="text/javascript" src="vendor.4f8996d70ea561e7ff02.bundle.js"></script><script type="text/javascript" src="main.cef84db6ad4b1961e086.bundle.js"></script></body>
</html>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 1ed484d

Please sign in to comment.