diff --git a/.gitignore b/.gitignore index de51f68..2beacad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,45 +1,4 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +.idea +.vscode -# compiled output -/dist -/tmp -/out-tsc -# Only exists if Bazel was run -/bazel-out - -# dependencies -/node_modules - -# profiling files -chrome-profiler-events*.json - -# IDEs and editors -/.idea -.project -.classpath -.c9/ -*.launch -.settings/ -*.sublime-workspace - -# IDE - VSCode -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -.history/* - -# misc -/.sass-cache -/connect.lock -/coverage -/libpeerconnection.log -npm-debug.log -yarn-error.log -testem.log -/typings - -# System Files -.DS_Store -Thumbs.db +node_modules diff --git a/HomeFront.iml b/HomeFront.iml deleted file mode 100644 index da8860c..0000000 --- a/HomeFront.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 7590574..6fe5dce 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,11 @@ -# Homefront +# HomeFront-Battery -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.0.1. +After obtaining 4 Tesla battery modules from a model X, a client and I decided to build our own knock off Tesla power wall and hook it up to a solar array to create an offgrid system. Part of this project was to log the voltage, battery tempature and control a set of fans through a website so it could be controleld and monitored remotely. -## Development server +We accomplished the software side in 3 steps: + - An arduino to log the raw data from sensors and transmit them over the serial port (See the arduino.ini file) + - A raspberry pi to recieve the serial data and send it to the cloud DB (See the monitor.js file) + - [A website to display the recorded data live](https://github.com/ztimson/HomeFront) -Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. - -## Code scaffolding - -Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`. - -## Build - -Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. - -## Running unit tests - -Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io). - -## Running end-to-end tests - -Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities. - -## Further help - -To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page. +![Power Wall](https://github.com/ztimson/HomeFront-Battery/blob/master/pictures/Resized_20181124_121520_5410.jpg?raw=true) +![Power Wall](https://github.com/ztimson/HomeFront-Battery/blob/master/pictures/03e615d9-f1b3-4439-9341-185cd3c14f3f.jpg?raw=true) diff --git a/.browserslistrc b/website/.browserslistrc similarity index 100% rename from .browserslistrc rename to website/.browserslistrc diff --git a/.circleci/config.yml b/website/.circleci/config.yml similarity index 100% rename from .circleci/config.yml rename to website/.circleci/config.yml diff --git a/.firebaserc b/website/.firebaserc similarity index 100% rename from .firebaserc rename to website/.firebaserc diff --git a/website/.gitignore b/website/.gitignore new file mode 100644 index 0000000..de51f68 --- /dev/null +++ b/website/.gitignore @@ -0,0 +1,45 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. + +# compiled output +/dist +/tmp +/out-tsc +# Only exists if Bazel was run +/bazel-out + +# dependencies +/node_modules + +# profiling files +chrome-profiler-events*.json + +# IDEs and editors +/.idea +.project +.classpath +.c9/ +*.launch +.settings/ +*.sublime-workspace + +# IDE - VSCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +.history/* + +# misc +/.sass-cache +/connect.lock +/coverage +/libpeerconnection.log +npm-debug.log +yarn-error.log +testem.log +/typings + +# System Files +.DS_Store +Thumbs.db diff --git a/angular.json b/website/angular.json similarity index 100% rename from angular.json rename to website/angular.json diff --git a/firebase.json b/website/firebase.json similarity index 100% rename from firebase.json rename to website/firebase.json diff --git a/ngsw-config.json b/website/ngsw-config.json similarity index 100% rename from ngsw-config.json rename to website/ngsw-config.json diff --git a/package-lock.json b/website/package-lock.json similarity index 100% rename from package-lock.json rename to website/package-lock.json diff --git a/package.json b/website/package.json similarity index 100% rename from package.json rename to website/package.json diff --git a/src/app/animations.ts b/website/src/app/animations.ts similarity index 100% rename from src/app/animations.ts rename to website/src/app/animations.ts diff --git a/src/app/app.module.ts b/website/src/app/app.module.ts similarity index 100% rename from src/app/app.module.ts rename to website/src/app/app.module.ts diff --git a/src/app/app.routes.ts b/website/src/app/app.routes.ts similarity index 100% rename from src/app/app.routes.ts rename to website/src/app/app.routes.ts diff --git a/src/app/components/battery-widget/batteryWidget.component.html b/website/src/app/components/battery-widget/batteryWidget.component.html similarity index 100% rename from src/app/components/battery-widget/batteryWidget.component.html rename to website/src/app/components/battery-widget/batteryWidget.component.html diff --git a/src/app/components/battery-widget/batteryWidget.component.ts b/website/src/app/components/battery-widget/batteryWidget.component.ts similarity index 100% rename from src/app/components/battery-widget/batteryWidget.component.ts rename to website/src/app/components/battery-widget/batteryWidget.component.ts diff --git a/src/app/components/weather-widget/weatherWidget.component.html b/website/src/app/components/weather-widget/weatherWidget.component.html similarity index 100% rename from src/app/components/weather-widget/weatherWidget.component.html rename to website/src/app/components/weather-widget/weatherWidget.component.html diff --git a/src/app/components/weather-widget/weatherWidget.component.ts b/website/src/app/components/weather-widget/weatherWidget.component.ts similarity index 100% rename from src/app/components/weather-widget/weatherWidget.component.ts rename to website/src/app/components/weather-widget/weatherWidget.component.ts diff --git a/src/app/guards/admin.guard.ts b/website/src/app/guards/admin.guard.ts similarity index 100% rename from src/app/guards/admin.guard.ts rename to website/src/app/guards/admin.guard.ts diff --git a/src/app/guards/guest.guard.ts b/website/src/app/guards/guest.guard.ts similarity index 100% rename from src/app/guards/guest.guard.ts rename to website/src/app/guards/guest.guard.ts diff --git a/src/app/guards/login.guard.ts b/website/src/app/guards/login.guard.ts similarity index 100% rename from src/app/guards/login.guard.ts rename to website/src/app/guards/login.guard.ts diff --git a/src/app/material.module.ts b/website/src/app/material.module.ts similarity index 100% rename from src/app/material.module.ts rename to website/src/app/material.module.ts diff --git a/src/app/models/battery.ts b/website/src/app/models/battery.ts similarity index 100% rename from src/app/models/battery.ts rename to website/src/app/models/battery.ts diff --git a/src/app/models/user.ts b/website/src/app/models/user.ts similarity index 100% rename from src/app/models/user.ts rename to website/src/app/models/user.ts diff --git a/src/app/models/weather.ts b/website/src/app/models/weather.ts similarity index 100% rename from src/app/models/weather.ts rename to website/src/app/models/weather.ts diff --git a/src/app/models/weatherIcons.ts b/website/src/app/models/weatherIcons.ts similarity index 100% rename from src/app/models/weatherIcons.ts rename to website/src/app/models/weatherIcons.ts diff --git a/src/app/pipes/round.pipe.ts b/website/src/app/pipes/round.pipe.ts similarity index 100% rename from src/app/pipes/round.pipe.ts rename to website/src/app/pipes/round.pipe.ts diff --git a/src/app/services/auth.service.ts b/website/src/app/services/auth.service.ts similarity index 100% rename from src/app/services/auth.service.ts rename to website/src/app/services/auth.service.ts diff --git a/src/app/services/battery.service.ts b/website/src/app/services/battery.service.ts similarity index 100% rename from src/app/services/battery.service.ts rename to website/src/app/services/battery.service.ts diff --git a/src/app/services/weather.service.ts b/website/src/app/services/weather.service.ts similarity index 100% rename from src/app/services/weather.service.ts rename to website/src/app/services/weather.service.ts diff --git a/src/app/views/app/app.component.html b/website/src/app/views/app/app.component.html similarity index 100% rename from src/app/views/app/app.component.html rename to website/src/app/views/app/app.component.html diff --git a/src/app/views/app/app.component.ts b/website/src/app/views/app/app.component.ts similarity index 100% rename from src/app/views/app/app.component.ts rename to website/src/app/views/app/app.component.ts diff --git a/src/app/views/battery/battery.component.html b/website/src/app/views/battery/battery.component.html similarity index 100% rename from src/app/views/battery/battery.component.html rename to website/src/app/views/battery/battery.component.html diff --git a/src/app/views/battery/battery.component.ts b/website/src/app/views/battery/battery.component.ts similarity index 100% rename from src/app/views/battery/battery.component.ts rename to website/src/app/views/battery/battery.component.ts diff --git a/src/app/views/dashboard/dashboard.component.html b/website/src/app/views/dashboard/dashboard.component.html similarity index 100% rename from src/app/views/dashboard/dashboard.component.html rename to website/src/app/views/dashboard/dashboard.component.html diff --git a/src/app/views/dashboard/dashboard.component.ts b/website/src/app/views/dashboard/dashboard.component.ts similarity index 100% rename from src/app/views/dashboard/dashboard.component.ts rename to website/src/app/views/dashboard/dashboard.component.ts diff --git a/src/app/views/login/login.component.html b/website/src/app/views/login/login.component.html similarity index 100% rename from src/app/views/login/login.component.html rename to website/src/app/views/login/login.component.html diff --git a/src/app/views/login/login.component.ts b/website/src/app/views/login/login.component.ts similarity index 100% rename from src/app/views/login/login.component.ts rename to website/src/app/views/login/login.component.ts diff --git a/src/app/views/security/security.component.html b/website/src/app/views/security/security.component.html similarity index 100% rename from src/app/views/security/security.component.html rename to website/src/app/views/security/security.component.html diff --git a/src/app/views/security/security.component.ts b/website/src/app/views/security/security.component.ts similarity index 100% rename from src/app/views/security/security.component.ts rename to website/src/app/views/security/security.component.ts diff --git a/src/app/views/weather/weather.component.html b/website/src/app/views/weather/weather.component.html similarity index 100% rename from src/app/views/weather/weather.component.html rename to website/src/app/views/weather/weather.component.html diff --git a/src/app/views/weather/weather.component.ts b/website/src/app/views/weather/weather.component.ts similarity index 100% rename from src/app/views/weather/weather.component.ts rename to website/src/app/views/weather/weather.component.ts diff --git a/src/assets/.gitkeep b/website/src/assets/.gitkeep similarity index 100% rename from src/assets/.gitkeep rename to website/src/assets/.gitkeep diff --git a/src/assets/bootstrap.min.css b/website/src/assets/bootstrap.min.css similarity index 100% rename from src/assets/bootstrap.min.css rename to website/src/assets/bootstrap.min.css diff --git a/src/assets/icon-inv.png b/website/src/assets/icon-inv.png similarity index 100% rename from src/assets/icon-inv.png rename to website/src/assets/icon-inv.png diff --git a/src/assets/icon.png b/website/src/assets/icon.png similarity index 100% rename from src/assets/icon.png rename to website/src/assets/icon.png diff --git a/src/assets/icons/icon-128x128.png b/website/src/assets/icons/icon-128x128.png similarity index 100% rename from src/assets/icons/icon-128x128.png rename to website/src/assets/icons/icon-128x128.png diff --git a/src/assets/icons/icon-144x144.png b/website/src/assets/icons/icon-144x144.png similarity index 100% rename from src/assets/icons/icon-144x144.png rename to website/src/assets/icons/icon-144x144.png diff --git a/src/assets/icons/icon-152x152.png b/website/src/assets/icons/icon-152x152.png similarity index 100% rename from src/assets/icons/icon-152x152.png rename to website/src/assets/icons/icon-152x152.png diff --git a/src/assets/icons/icon-192x192.png b/website/src/assets/icons/icon-192x192.png similarity index 100% rename from src/assets/icons/icon-192x192.png rename to website/src/assets/icons/icon-192x192.png diff --git a/src/assets/icons/icon-384x384.png b/website/src/assets/icons/icon-384x384.png similarity index 100% rename from src/assets/icons/icon-384x384.png rename to website/src/assets/icons/icon-384x384.png diff --git a/src/assets/icons/icon-512x512.png b/website/src/assets/icons/icon-512x512.png similarity index 100% rename from src/assets/icons/icon-512x512.png rename to website/src/assets/icons/icon-512x512.png diff --git a/src/assets/icons/icon-72x72.png b/website/src/assets/icons/icon-72x72.png similarity index 100% rename from src/assets/icons/icon-72x72.png rename to website/src/assets/icons/icon-72x72.png diff --git a/src/assets/icons/icon-96x96.png b/website/src/assets/icons/icon-96x96.png similarity index 100% rename from src/assets/icons/icon-96x96.png rename to website/src/assets/icons/icon-96x96.png diff --git a/src/assets/tesla.png b/website/src/assets/tesla.png similarity index 100% rename from src/assets/tesla.png rename to website/src/assets/tesla.png diff --git a/src/environments/environment.prod.ts b/website/src/environments/environment.prod.ts similarity index 100% rename from src/environments/environment.prod.ts rename to website/src/environments/environment.prod.ts diff --git a/src/environments/environment.ts b/website/src/environments/environment.ts similarity index 100% rename from src/environments/environment.ts rename to website/src/environments/environment.ts diff --git a/src/index.html b/website/src/index.html similarity index 100% rename from src/index.html rename to website/src/index.html diff --git a/src/main.ts b/website/src/main.ts similarity index 100% rename from src/main.ts rename to website/src/main.ts diff --git a/src/manifest.json b/website/src/manifest.json similarity index 100% rename from src/manifest.json rename to website/src/manifest.json diff --git a/src/polyfills.ts b/website/src/polyfills.ts similarity index 100% rename from src/polyfills.ts rename to website/src/polyfills.ts diff --git a/src/styles.scss b/website/src/styles.scss similarity index 100% rename from src/styles.scss rename to website/src/styles.scss diff --git a/tsconfig.app.json b/website/tsconfig.app.json similarity index 100% rename from tsconfig.app.json rename to website/tsconfig.app.json diff --git a/tsconfig.json b/website/tsconfig.json similarity index 100% rename from tsconfig.json rename to website/tsconfig.json