Skip to content

Commit

Permalink
iss #24: happy new year 2017 🎄
Browse files Browse the repository at this point in the history
  • Loading branch information
@maizy
maizy committed Jan 10, 2017
1 parent 2d602e7 commit b4d177d
Show file tree
Hide file tree
Showing 111 changed files with 212 additions and 85 deletions.
2 changes: 1 addition & 1 deletion ambient7-analysis/src/main/scala/ru/maizy/ambient7/analysis/AnalysisApp.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.analysis

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ambient7-analysis/src/main/scala/ru/maizy/ambient7/analysis/AppOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.analysis

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ...ent7-analysis/src/main/scala/ru/maizy/ambient7/analysis/command/AggregateCo2Command.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.analysis.command

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ambient7-analysis/src/main/scala/ru/maizy/ambient7/analysis/command/InitDbCommand.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.analysis.command

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ambient7-analysis/src/main/scala/ru/maizy/ambient7/analysis/command/ReturnStatus.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.analysis.command

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/
case class ReturnStatus(systemExitCode: Int)
Expand Down
2 changes: 1 addition & 1 deletion ambient7-analysis/src/main/scala/ru/maizy/ambient7/analysis/service/InfluxDbCo2Service.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.analysis.service

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
5 changes: 5 additions & 0 deletions ambient7-webapp/src/main/scala/ScalatraBootstrap.scala
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import org.scalatra._
import javax.servlet.ServletContext
import ru.maizy.ambient7.webapp.bootstrap.{ AppConfigInit, ScalikeJdbcInit }
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/Ambient7WebAppStack.scala
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package ru.maizy.ambient7.webapp

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import org.scalatra.{ BadRequest, InternalServerError, NotFound, ScalatraServlet }
import ru.maizy.ambient7.webapp.servlet.error.IllegalPathParam

Expand Down
5 changes: 5 additions & 0 deletions ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/AppConfig.scala
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package ru.maizy.ambient7.webapp

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import java.time.ZoneId
import ru.maizy.ambient7.core.config.Defaults
import ru.maizy.ambient7.webapp.data.Co2Device
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/JettyLauncher.scala
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package ru.maizy.ambient7.webapp

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import org.eclipse.jetty.server.Server
import org.eclipse.jetty.servlet.DefaultServlet
import org.eclipse.jetty.webapp.WebAppContext
Expand Down
2 changes: 1 addition & 1 deletion ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/WebAppConfigReader.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/WebAppLauncher.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/
object WebAppLauncher extends App {
Expand Down
2 changes: 1 addition & 1 deletion ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/bootstrap/AppConfigInit.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.bootstrap

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/bootstrap/ScalikeJdbcInit.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.bootstrap

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/data/Co2Device.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.data

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/
import ru.maizy.ambient7.core.data.Co2AgentId
Expand Down
2 changes: 1 addition & 1 deletion ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/json/Co2DeviceProtocol.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.json

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
5 changes: 5 additions & 0 deletions ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/servlet/Co2ReportServlet.scala
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package ru.maizy.ambient7.webapp.servlet

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import java.time.ZonedDateTime
import scalikejdbc._
import spray.json.{ JsNumber, JsObject, JsString, JsValue, pimpAny }
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/servlet/DevicesServlet.scala
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package ru.maizy.ambient7.webapp.servlet

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import spray.json.{ JsObject, pimpAny }
import ru.maizy.ambient7.webapp.servlet.error.IllegalPathParam
import ru.maizy.ambient7.webapp.servlet.helper.SprayJsonSupport
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/servlet/RootServlet.scala
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package ru.maizy.ambient7.webapp.servlet

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import ru.maizy.ambient7.webapp.Ambient7WebAppStack

class RootServlet extends Ambient7WebAppStack
2 changes: 1 addition & 1 deletion ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/servlet/error/IllegalPathParam.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.servlet.error

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ...ent7-webapp/src/main/scala/ru/maizy/ambient7/webapp/servlet/helper/AppConfigSupport.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ru.maizy.ambient7.webapp.servlet.helper
import ru.maizy.ambient7.webapp.AppConfig

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/
trait AppConfigSupport {
Expand Down
2 changes: 1 addition & 1 deletion ...nt7-webapp/src/main/scala/ru/maizy/ambient7/webapp/servlet/helper/DateParamsSupport.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.servlet.helper

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ...t7-webapp/src/main/scala/ru/maizy/ambient7/webapp/servlet/helper/DeviceParamSupport.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.servlet.helper

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ...ebapp/src/main/scala/ru/maizy/ambient7/webapp/servlet/helper/PrimitiveParamsSupport.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.servlet.helper

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ...ent7-webapp/src/main/scala/ru/maizy/ambient7/webapp/servlet/helper/SprayJsonSupport.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.servlet.helper

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/servlet/helper/TimeZoneSupport.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.servlet.helper

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ambient7-webapp/src/test/scala/ru/maizy/ambient7/webapp/tests/BaseServletAndDbTest.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.tests

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ambient7-webapp/src/test/scala/ru/maizy/ambient7/webapp/tests/BaseServletTest.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.tests

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ambient7-webapp/src/test/scala/ru/maizy/ambient7/webapp/tests/JsonAsserts.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.tests

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/
import org.json4s._
Expand Down
2 changes: 1 addition & 1 deletion ...7-webapp/src/test/scala/ru/maizy/ambient7/webapp/tests/servlet/Co2ReportServletSpec.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.tests.servlet

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
2 changes: 1 addition & 1 deletion ...nt7-webapp/src/test/scala/ru/maizy/ambient7/webapp/tests/servlet/DevicesServletSpec.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.maizy.ambient7.webapp.tests.servlet

/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/App.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';
import Navigation from './modules/Navigation';

Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/AppOpts.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import ImmutableJs from 'immutable';

class AppOpts {
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/Index.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';
import { render } from 'react-dom';
import { Router, Route, IndexRoute, hashHistory } from 'react-router';
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/components/About.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';
import Container from '../modules/Container';

Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/components/Co2Device.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';
import moment from 'moment';
import DatePicker from 'react-datepicker';
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/components/Home.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';
import Container from '../modules/Container';
import Jumbotron from '../modules/Jumbotron';
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/modules/Container.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';

function Container(props) {
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/modules/DeviceInfo.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';

Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/modules/DeviceItem.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';
import { Link } from 'react-router';

Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/modules/Devices.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';
import 'whatwg-fetch';
import { checkIsSuccessfull, toImmutableJs, buildApiUrl } from '../utils/rest';
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/modules/ErrorAlert.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';

function ErrorAlert(props) {
Expand Down
5 changes: 5 additions & 0 deletions ambient7-webui/src/modules/Jumbotron.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
* See LICENSE.txt for details.
*/

import React from 'react';

function Jumbotron(props) {
Expand Down
Loading

0 comments on commit b4d177d

Please sign in to comment.