Folder structure update

Foxstream · Jul 27, 2016 · f2779a6 · f2779a6
1 parent 97e2cd3
commit f2779a6
Show file tree

Hide file tree

Showing 114 changed files with 0 additions and 45 deletions.
diff --git a/static/bower.json → client/bower.json b/static/bower.json → client/bower.json
diff --git a/...er_components/angular-animate/.bower.json → ...er_components/angular-animate/.bower.json b/...er_components/angular-animate/.bower.json → ...er_components/angular-animate/.bower.json
diff --git a/...wer_components/angular-animate/LICENSE.md → ...wer_components/angular-animate/LICENSE.md b/...wer_components/angular-animate/LICENSE.md → ...wer_components/angular-animate/LICENSE.md
diff --git a/...ower_components/angular-animate/README.md → ...ower_components/angular-animate/README.md b/...ower_components/angular-animate/README.md → ...ower_components/angular-animate/README.md
diff --git a/...onents/angular-animate/angular-animate.js → ...onents/angular-animate/angular-animate.js b/...onents/angular-animate/angular-animate.js → ...onents/angular-animate/angular-animate.js
diff --git a/...ts/angular-animate/angular-animate.min.js → ...ts/angular-animate/angular-animate.min.js b/...ts/angular-animate/angular-animate.min.js → ...ts/angular-animate/angular-animate.min.js
diff --git a/...ngular-animate/angular-animate.min.js.map → ...ngular-animate/angular-animate.min.js.map b/...ngular-animate/angular-animate.min.js.map → ...ngular-animate/angular-animate.min.js.map
diff --git a/...wer_components/angular-animate/bower.json → ...wer_components/angular-animate/bower.json b/...wer_components/angular-animate/bower.json → ...wer_components/angular-animate/bower.json
diff --git a/...bower_components/angular-animate/index.js → ...bower_components/angular-animate/index.js b/...bower_components/angular-animate/index.js → ...bower_components/angular-animate/index.js
diff --git a/...r_components/angular-animate/package.json → ...r_components/angular-animate/package.json b/...r_components/angular-animate/package.json → ...r_components/angular-animate/package.json
diff --git a/...ower_components/angular-touch/.bower.json → ...ower_components/angular-touch/.bower.json b/...ower_components/angular-touch/.bower.json → ...ower_components/angular-touch/.bower.json
diff --git a/...bower_components/angular-touch/LICENSE.md → ...bower_components/angular-touch/LICENSE.md b/...bower_components/angular-touch/LICENSE.md → ...bower_components/angular-touch/LICENSE.md
diff --git a/.../bower_components/angular-touch/README.md → .../bower_components/angular-touch/README.md b/.../bower_components/angular-touch/README.md → .../bower_components/angular-touch/README.md
diff --git a/...components/angular-touch/angular-touch.js → ...components/angular-touch/angular-touch.js b/...components/angular-touch/angular-touch.js → ...components/angular-touch/angular-touch.js
diff --git a/...onents/angular-touch/angular-touch.min.js → ...onents/angular-touch/angular-touch.min.js b/...onents/angular-touch/angular-touch.min.js → ...onents/angular-touch/angular-touch.min.js
diff --git a/...ts/angular-touch/angular-touch.min.js.map → ...ts/angular-touch/angular-touch.min.js.map b/...ts/angular-touch/angular-touch.min.js.map → ...ts/angular-touch/angular-touch.min.js.map
diff --git a/...bower_components/angular-touch/bower.json → ...bower_components/angular-touch/bower.json b/...bower_components/angular-touch/bower.json → ...bower_components/angular-touch/bower.json
diff --git a/...c/bower_components/angular-touch/index.js → ...t/bower_components/angular-touch/index.js b/...c/bower_components/angular-touch/index.js → ...t/bower_components/angular-touch/index.js
diff --git a/...wer_components/angular-touch/package.json → ...wer_components/angular-touch/package.json b/...wer_components/angular-touch/package.json → ...wer_components/angular-touch/package.json
diff --git a/static/bower_components/angular/.bower.json → client/bower_components/angular/.bower.json b/static/bower_components/angular/.bower.json → client/bower_components/angular/.bower.json
diff --git a/static/bower_components/angular/LICENSE.md → client/bower_components/angular/LICENSE.md b/static/bower_components/angular/LICENSE.md → client/bower_components/angular/LICENSE.md
diff --git a/static/bower_components/angular/README.md → client/bower_components/angular/README.md b/static/bower_components/angular/README.md → client/bower_components/angular/README.md
diff --git a/.../bower_components/angular/angular-csp.css → .../bower_components/angular/angular-csp.css b/.../bower_components/angular/angular-csp.css → .../bower_components/angular/angular-csp.css
diff --git a/static/bower_components/angular/angular.js → client/bower_components/angular/angular.js b/static/bower_components/angular/angular.js → client/bower_components/angular/angular.js
diff --git a/...c/bower_components/angular/angular.min.js → ...t/bower_components/angular/angular.min.js b/...c/bower_components/angular/angular.min.js → ...t/bower_components/angular/angular.min.js
diff --git a/...er_components/angular/angular.min.js.gzip → ...er_components/angular/angular.min.js.gzip b/...er_components/angular/angular.min.js.gzip → ...er_components/angular/angular.min.js.gzip
diff --git a/...wer_components/angular/angular.min.js.map → ...wer_components/angular/angular.min.js.map b/...wer_components/angular/angular.min.js.map → ...wer_components/angular/angular.min.js.map
diff --git a/static/bower_components/angular/bower.json → client/bower_components/angular/bower.json b/static/bower_components/angular/bower.json → client/bower_components/angular/bower.json
diff --git a/static/bower_components/angular/index.js → client/bower_components/angular/index.js b/static/bower_components/angular/index.js → client/bower_components/angular/index.js
diff --git a/static/bower_components/angular/package.json → client/bower_components/angular/package.json b/static/bower_components/angular/package.json → client/bower_components/angular/package.json
diff --git a/static/css/bootstrap.min.css → client/css/bootstrap.min.css b/static/css/bootstrap.min.css → client/css/bootstrap.min.css
diff --git a/static/css/main.css → client/css/main.css b/static/css/main.css → client/css/main.css
diff --git a/static/css/main.css.map → client/css/main.css.map b/static/css/main.css.map → client/css/main.css.map
diff --git a/static/css/my.css → client/css/my.css b/static/css/my.css → client/css/my.css
diff --git a/...ic/fonts/glyphicons-halflings-regular.eot → ...nt/fonts/glyphicons-halflings-regular.eot b/...ic/fonts/glyphicons-halflings-regular.eot → ...nt/fonts/glyphicons-halflings-regular.eot
diff --git a/...ic/fonts/glyphicons-halflings-regular.svg → ...nt/fonts/glyphicons-halflings-regular.svg b/...ic/fonts/glyphicons-halflings-regular.svg → ...nt/fonts/glyphicons-halflings-regular.svg
diff --git a/...ic/fonts/glyphicons-halflings-regular.ttf → ...nt/fonts/glyphicons-halflings-regular.ttf b/...ic/fonts/glyphicons-halflings-regular.ttf → ...nt/fonts/glyphicons-halflings-regular.ttf
diff --git a/...c/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff b/...c/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/static/img/alert.png → client/img/alert.png b/static/img/alert.png → client/img/alert.png
diff --git a/static/img/live.png → client/img/live.png b/static/img/live.png → client/img/live.png
diff --git a/static/img/logo-foxstream.gif → client/img/logo-foxstream.gif b/static/img/logo-foxstream.gif → client/img/logo-foxstream.gif
diff --git a/static/img/no_video.png → client/img/no_video.png b/static/img/no_video.png → client/img/no_video.png
diff --git a/static/img/osd-silhouette.png → client/img/osd-silhouette.png b/static/img/osd-silhouette.png → client/img/osd-silhouette.png
diff --git a/static/img/osd.png → client/img/osd.png b/static/img/osd.png → client/img/osd.png
diff --git a/static/img/settings.png → client/img/settings.png b/static/img/settings.png → client/img/settings.png
diff --git a/static/AlarmData.js → client/js/AlarmData.js b/static/AlarmData.js → client/js/AlarmData.js
diff --git a/static/EventSource.js → client/js/EventSource.js b/static/EventSource.js → client/js/EventSource.js
diff --git a/static/EventSource4IE.js → client/js/EventSource4IE.js b/static/EventSource4IE.js → client/js/EventSource4IE.js
diff --git a/static/accountcontroller.js → client/js/accountcontroller.js b/static/accountcontroller.js → client/js/accountcontroller.js
diff --git a/static/alarmviewer.js → client/js/alarmviewer.js b/static/alarmviewer.js → client/js/alarmviewer.js
diff --git a/static/angular-1.3.15.min.js → client/js/angular-1.3.15.min.js b/static/angular-1.3.15.min.js → client/js/angular-1.3.15.min.js
diff --git a/static/app.js → client/js/app.js b/static/app.js → client/js/app.js
diff --git a/static/appState.js → client/js/appState.js b/static/appState.js → client/js/appState.js
diff --git a/static/async.min.js → client/js/async.min.js b/static/async.min.js → client/js/async.min.js
diff --git a/static/bootstrap.min.js → client/js/bootstrap.min.js b/static/bootstrap.min.js → client/js/bootstrap.min.js
diff --git a/static/jquery-2.1.3.min.js → client/js/jquery-2.1.3.min.js b/static/jquery-2.1.3.min.js → client/js/jquery-2.1.3.min.js
diff --git a/static/jquery-mobile.min.js → client/js/jquery-mobile.min.js b/static/jquery-mobile.min.js → client/js/jquery-mobile.min.js
diff --git a/static/livecontroller.js → client/js/livecontroller.js b/static/livecontroller.js → client/js/livecontroller.js
diff --git a/static/navbarcontroller.js → client/js/navbarcontroller.js b/static/navbarcontroller.js → client/js/navbarcontroller.js
diff --git a/static/serverviewer.js → client/js/serverviewer.js b/static/serverviewer.js → client/js/serverviewer.js
diff --git a/static/spin.min.js → client/js/spin.min.js b/static/spin.min.js → client/js/spin.min.js
diff --git a/static/userdb.js → client/js/userdb.js b/static/userdb.js → client/js/userdb.js
diff --git a/static/userviewer.js → client/js/userviewer.js b/static/userviewer.js → client/js/userviewer.js
diff --git a/sass/action-buttons.scss → client/sass/action-buttons.scss b/sass/action-buttons.scss → client/sass/action-buttons.scss
diff --git a/sass/alarms.scss → client/sass/alarms.scss b/sass/alarms.scss → client/sass/alarms.scss
diff --git a/sass/block-header.scss → client/sass/block-header.scss b/sass/block-header.scss → client/sass/block-header.scss
diff --git a/sass/form.scss → client/sass/form.scss b/sass/form.scss → client/sass/form.scss
diff --git a/sass/header.scss → client/sass/header.scss b/sass/header.scss → client/sass/header.scss
diff --git a/sass/live.scss → client/sass/live.scss b/sass/live.scss → client/sass/live.scss
diff --git a/sass/login.scss → client/sass/login.scss b/sass/login.scss → client/sass/login.scss
diff --git a/sass/main.scss → client/sass/main.scss b/sass/main.scss → client/sass/main.scss
diff --git a/sass/mixins.scss → client/sass/mixins.scss b/sass/mixins.scss → client/sass/mixins.scss
diff --git a/sass/navbar.scss → client/sass/navbar.scss b/sass/navbar.scss → client/sass/navbar.scss
diff --git a/sass/notifications.scss → client/sass/notifications.scss b/sass/notifications.scss → client/sass/notifications.scss
diff --git a/sass/player.scss → client/sass/player.scss b/sass/player.scss → client/sass/player.scss
diff --git a/sass/settings.scss → client/sass/settings.scss b/sass/settings.scss → client/sass/settings.scss
diff --git a/sass/swiper.scss → client/sass/swiper.scss b/sass/swiper.scss → client/sass/swiper.scss
diff --git a/sass/table.scss → client/sass/table.scss b/sass/table.scss → client/sass/table.scss
diff --git a/sass/tabs.scss → client/sass/tabs.scss b/sass/tabs.scss → client/sass/tabs.scss
diff --git a/views/MainTemplate.jade → client/views/MainTemplate.jade b/views/MainTemplate.jade → client/views/MainTemplate.jade
diff --git a/views/accountsettings.jade → client/views/accountsettings.jade b/views/accountsettings.jade → client/views/accountsettings.jade
diff --git a/views/alarmview.jade → client/views/alarmview.jade b/views/alarmview.jade → client/views/alarmview.jade
diff --git a/views/imageplayer.jade → client/views/imageplayer.jade b/views/imageplayer.jade → client/views/imageplayer.jade
diff --git a/views/liveplayer.jade → client/views/liveplayer.jade b/views/liveplayer.jade → client/views/liveplayer.jade
diff --git a/views/liveswiper.jade → client/views/liveswiper.jade b/views/liveswiper.jade → client/views/liveswiper.jade
diff --git a/views/liveview.jade → client/views/liveview.jade b/views/liveview.jade → client/views/liveview.jade
diff --git a/views/login.jade → client/views/login.jade b/views/login.jade → client/views/login.jade
diff --git a/views/serverview.jade → client/views/serverview.jade b/views/serverview.jade → client/views/serverview.jade
diff --git a/views/swiper.jade → client/views/swiper.jade b/views/swiper.jade → client/views/swiper.jade
diff --git a/views/userview.jade → client/views/userview.jade b/views/userview.jade → client/views/userview.jade
diff --git a/data/test.db b/data/test.db
diff --git a/AlarmRemover.js → server/AlarmRemover.js b/AlarmRemover.js → server/AlarmRemover.js
diff --git a/Authenticator.js → server/Authenticator.js b/Authenticator.js → server/Authenticator.js
diff --git a/FoxXmlAlarmClient.js → server/FoxXmlAlarmClient.js b/FoxXmlAlarmClient.js → server/FoxXmlAlarmClient.js
diff --git a/FoxXmlClient.js → server/FoxXmlClient.js b/FoxXmlClient.js → server/FoxXmlClient.js
diff --git a/ServerSideEvent.js → server/ServerSideEvent.js b/ServerSideEvent.js → server/ServerSideEvent.js
diff --git a/ServersManager.js → server/ServersManager.js b/ServersManager.js → server/ServersManager.js
diff --git a/WebServer.js → server/WebServer.js b/WebServer.js → server/WebServer.js
diff --git a/XmlClient.js → server/XmlClient.js b/XmlClient.js → server/XmlClient.js
diff --git a/config/default.json → server/config/default.json b/config/default.json → server/config/default.json
diff --git a/config/test.json → server/config/test.json b/config/test.json → server/config/test.json
diff --git a/controller/AccountSettingsController.js → ...r/controller/AccountSettingsController.js b/controller/AccountSettingsController.js → ...r/controller/AccountSettingsController.js
diff --git a/controller/AlarmController.js → server/controller/AlarmController.js b/controller/AlarmController.js → server/controller/AlarmController.js
diff --git a/controller/LiveController.js → server/controller/LiveController.js b/controller/LiveController.js → server/controller/LiveController.js
diff --git a/controller/ServerController.js → server/controller/ServerController.js b/controller/ServerController.js → server/controller/ServerController.js
diff --git a/controller/UserController.js → server/controller/UserController.js b/controller/UserController.js → server/controller/UserController.js
diff --git a/karma.conf.js → server/karma.conf.js b/karma.conf.js → server/karma.conf.js
diff --git a/logger.js → server/logger.js b/logger.js → server/logger.js
diff --git a/main.js → server/main.js b/main.js → server/main.js
diff --git a/AlarmPersistence.js → server/persistence/AlarmPersistence.js b/AlarmPersistence.js → server/persistence/AlarmPersistence.js
diff --git a/ServerPersistance.js → server/persistence/ServerPersistance.js b/ServerPersistance.js → server/persistence/ServerPersistance.js
diff --git a/UserPersistance.js → server/persistence/UserPersistance.js b/UserPersistance.js → server/persistence/UserPersistance.js
diff --git a/static/responsive.js b/static/responsive.js