diff --git a/.gitignore b/.gitignore index 928f7949c63c41e9d6a4d1a281cee35a3c07042c..49156f5aa6034f7f4d7434e17408e71b9faa5737 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ ebin/ -*/node_modules + */tmp */npm-debug.log */webpack-assets.json @@ -21,4 +21,6 @@ logs # Mac files .DS_Store -.editorconfig \ No newline at end of file +.editorconfig +Будет удалено public/ +/node_modules/ diff --git a/src/assets/css/font.css b/assets/css/font.css similarity index 100% rename from src/assets/css/font.css rename to assets/css/font.css diff --git a/src/assets/css/global.css b/assets/css/global.css similarity index 100% rename from src/assets/css/global.css rename to assets/css/global.css diff --git a/src/assets/css/index.css b/assets/css/index.css similarity index 100% rename from src/assets/css/index.css rename to assets/css/index.css diff --git a/src/assets/fonts/Avenir/AvenirLTStd-Black.woff b/assets/fonts/Avenir/AvenirLTStd-Black.woff similarity index 100% rename from src/assets/fonts/Avenir/AvenirLTStd-Black.woff rename to assets/fonts/Avenir/AvenirLTStd-Black.woff diff --git a/src/assets/fonts/Avenir/AvenirLTStd-Heavy.woff b/assets/fonts/Avenir/AvenirLTStd-Heavy.woff similarity index 100% rename from src/assets/fonts/Avenir/AvenirLTStd-Heavy.woff rename to assets/fonts/Avenir/AvenirLTStd-Heavy.woff diff --git a/src/assets/fonts/Avenir/AvenirLTStd-Light.woff b/assets/fonts/Avenir/AvenirLTStd-Light.woff similarity index 100% rename from src/assets/fonts/Avenir/AvenirLTStd-Light.woff rename to assets/fonts/Avenir/AvenirLTStd-Light.woff diff --git a/src/assets/fonts/Avenir/AvenirLTStd-Medium.woff b/assets/fonts/Avenir/AvenirLTStd-Medium.woff similarity index 100% rename from src/assets/fonts/Avenir/AvenirLTStd-Medium.woff rename to assets/fonts/Avenir/AvenirLTStd-Medium.woff diff --git a/src/assets/fonts/Avenir/AvenirLTStd-Roman.woff b/assets/fonts/Avenir/AvenirLTStd-Roman.woff similarity index 100% rename from src/assets/fonts/Avenir/AvenirLTStd-Roman.woff rename to assets/fonts/Avenir/AvenirLTStd-Roman.woff diff --git a/src/assets/fonts/Lato/LatoBold/LatoBold.eot b/assets/fonts/Lato/LatoBold/LatoBold.eot similarity index 100% rename from src/assets/fonts/Lato/LatoBold/LatoBold.eot rename to assets/fonts/Lato/LatoBold/LatoBold.eot diff --git a/src/assets/fonts/Lato/LatoBold/LatoBold.ttf b/assets/fonts/Lato/LatoBold/LatoBold.ttf similarity index 100% rename from src/assets/fonts/Lato/LatoBold/LatoBold.ttf rename to assets/fonts/Lato/LatoBold/LatoBold.ttf diff --git a/src/assets/fonts/Lato/LatoBold/LatoBold.woff b/assets/fonts/Lato/LatoBold/LatoBold.woff similarity index 100% rename from src/assets/fonts/Lato/LatoBold/LatoBold.woff rename to assets/fonts/Lato/LatoBold/LatoBold.woff diff --git a/src/assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.eot b/assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.eot similarity index 100% rename from src/assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.eot rename to assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.eot diff --git a/src/assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.ttf b/assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.ttf similarity index 100% rename from src/assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.ttf rename to assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.ttf diff --git a/src/assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.woff b/assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.woff similarity index 100% rename from src/assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.woff rename to assets/fonts/Lato/LatoBoldItalic/LatoBoldItalic.woff diff --git a/src/assets/fonts/Lato/LatoItalic/LatoItalic.eot b/assets/fonts/Lato/LatoItalic/LatoItalic.eot similarity index 100% rename from src/assets/fonts/Lato/LatoItalic/LatoItalic.eot rename to assets/fonts/Lato/LatoItalic/LatoItalic.eot diff --git a/src/assets/fonts/Lato/LatoItalic/LatoItalic.ttf b/assets/fonts/Lato/LatoItalic/LatoItalic.ttf similarity index 100% rename from src/assets/fonts/Lato/LatoItalic/LatoItalic.ttf rename to assets/fonts/Lato/LatoItalic/LatoItalic.ttf diff --git a/src/assets/fonts/Lato/LatoItalic/LatoItalic.woff b/assets/fonts/Lato/LatoItalic/LatoItalic.woff similarity index 100% rename from src/assets/fonts/Lato/LatoItalic/LatoItalic.woff rename to assets/fonts/Lato/LatoItalic/LatoItalic.woff diff --git a/src/assets/fonts/Lato/LatoLight/LatoLight.eot b/assets/fonts/Lato/LatoLight/LatoLight.eot similarity index 100% rename from src/assets/fonts/Lato/LatoLight/LatoLight.eot rename to assets/fonts/Lato/LatoLight/LatoLight.eot diff --git a/src/assets/fonts/Lato/LatoLight/LatoLight.ttf b/assets/fonts/Lato/LatoLight/LatoLight.ttf similarity index 100% rename from src/assets/fonts/Lato/LatoLight/LatoLight.ttf rename to assets/fonts/Lato/LatoLight/LatoLight.ttf diff --git a/src/assets/fonts/Lato/LatoLight/LatoLight.woff b/assets/fonts/Lato/LatoLight/LatoLight.woff similarity index 100% rename from src/assets/fonts/Lato/LatoLight/LatoLight.woff rename to assets/fonts/Lato/LatoLight/LatoLight.woff diff --git a/src/assets/fonts/Lato/LatoLightItalic/LatoLightItalic.eot b/assets/fonts/Lato/LatoLightItalic/LatoLightItalic.eot similarity index 100% rename from src/assets/fonts/Lato/LatoLightItalic/LatoLightItalic.eot rename to assets/fonts/Lato/LatoLightItalic/LatoLightItalic.eot diff --git a/src/assets/fonts/Lato/LatoLightItalic/LatoLightItalic.ttf b/assets/fonts/Lato/LatoLightItalic/LatoLightItalic.ttf similarity index 100% rename from src/assets/fonts/Lato/LatoLightItalic/LatoLightItalic.ttf rename to assets/fonts/Lato/LatoLightItalic/LatoLightItalic.ttf diff --git a/src/assets/fonts/Lato/LatoLightItalic/LatoLightItalic.woff b/assets/fonts/Lato/LatoLightItalic/LatoLightItalic.woff similarity index 100% rename from src/assets/fonts/Lato/LatoLightItalic/LatoLightItalic.woff rename to assets/fonts/Lato/LatoLightItalic/LatoLightItalic.woff diff --git a/src/assets/fonts/Lato/LatoRegular/LatoRegular.eot b/assets/fonts/Lato/LatoRegular/LatoRegular.eot similarity index 100% rename from src/assets/fonts/Lato/LatoRegular/LatoRegular.eot rename to assets/fonts/Lato/LatoRegular/LatoRegular.eot diff --git a/src/assets/fonts/Lato/LatoRegular/LatoRegular.ttf b/assets/fonts/Lato/LatoRegular/LatoRegular.ttf similarity index 100% rename from src/assets/fonts/Lato/LatoRegular/LatoRegular.ttf rename to assets/fonts/Lato/LatoRegular/LatoRegular.ttf diff --git a/src/assets/fonts/Lato/LatoRegular/LatoRegular.woff b/assets/fonts/Lato/LatoRegular/LatoRegular.woff similarity index 100% rename from src/assets/fonts/Lato/LatoRegular/LatoRegular.woff rename to assets/fonts/Lato/LatoRegular/LatoRegular.woff diff --git a/src/assets/img/7zip.png b/assets/img/7zip.png similarity index 100% rename from src/assets/img/7zip.png rename to assets/img/7zip.png diff --git a/src/assets/img/Beverly_Johnson.png b/assets/img/Beverly_Johnson.png similarity index 100% rename from src/assets/img/Beverly_Johnson.png rename to assets/img/Beverly_Johnson.png diff --git a/src/assets/img/Christopher_Pryor.png b/assets/img/Christopher_Pryor.png similarity index 100% rename from src/assets/img/Christopher_Pryor.png rename to assets/img/Christopher_Pryor.png diff --git a/src/assets/img/David_Mickelson.png b/assets/img/David_Mickelson.png similarity index 100% rename from src/assets/img/David_Mickelson.png rename to assets/img/David_Mickelson.png diff --git a/src/assets/img/Jennifer-Lawrence.png b/assets/img/Jennifer-Lawrence.png similarity index 100% rename from src/assets/img/Jennifer-Lawrence.png rename to assets/img/Jennifer-Lawrence.png diff --git a/src/assets/img/Mary.png b/assets/img/Mary.png similarity index 100% rename from src/assets/img/Mary.png rename to assets/img/Mary.png diff --git a/src/assets/img/Richard_Smith.png b/assets/img/Richard_Smith.png similarity index 100% rename from src/assets/img/Richard_Smith.png rename to assets/img/Richard_Smith.png diff --git a/src/assets/img/Rose_Willis.png b/assets/img/Rose_Willis.png similarity index 100% rename from src/assets/img/Rose_Willis.png rename to assets/img/Rose_Willis.png diff --git a/src/assets/img/Stephanie.png b/assets/img/Stephanie.png similarity index 100% rename from src/assets/img/Stephanie.png rename to assets/img/Stephanie.png diff --git a/src/assets/img/arrow-next.png b/assets/img/arrow-next.png similarity index 100% rename from src/assets/img/arrow-next.png rename to assets/img/arrow-next.png diff --git a/src/assets/img/audio_call.png b/assets/img/audio_call.png similarity index 100% rename from src/assets/img/audio_call.png rename to assets/img/audio_call.png diff --git a/src/assets/img/beerpong_at_spotkaraoke.png b/assets/img/beerpong_at_spotkaraoke.png similarity index 100% rename from src/assets/img/beerpong_at_spotkaraoke.png rename to assets/img/beerpong_at_spotkaraoke.png diff --git a/src/assets/img/bird.png b/assets/img/bird.png similarity index 100% rename from src/assets/img/bird.png rename to assets/img/bird.png diff --git a/src/assets/img/calls.png b/assets/img/calls.png similarity index 100% rename from src/assets/img/calls.png rename to assets/img/calls.png diff --git a/src/assets/img/chats.png b/assets/img/chats.png similarity index 100% rename from src/assets/img/chats.png rename to assets/img/chats.png diff --git a/src/assets/img/chats_tedst.png b/assets/img/chats_tedst.png similarity index 100% rename from src/assets/img/chats_tedst.png rename to assets/img/chats_tedst.png diff --git a/src/assets/img/contact_1.png b/assets/img/contact_1.png similarity index 100% rename from src/assets/img/contact_1.png rename to assets/img/contact_1.png diff --git a/src/assets/img/contact_photo.png b/assets/img/contact_photo.png similarity index 100% rename from src/assets/img/contact_photo.png rename to assets/img/contact_photo.png diff --git a/src/assets/img/contacts.png b/assets/img/contacts.png similarity index 100% rename from src/assets/img/contacts.png rename to assets/img/contacts.png diff --git a/src/assets/img/country-icon.png b/assets/img/country-icon.png similarity index 100% rename from src/assets/img/country-icon.png rename to assets/img/country-icon.png diff --git a/src/assets/img/drag.png b/assets/img/drag.png similarity index 100% rename from src/assets/img/drag.png rename to assets/img/drag.png diff --git a/src/assets/img/drag_handle.png b/assets/img/drag_handle.png similarity index 100% rename from src/assets/img/drag_handle.png rename to assets/img/drag_handle.png diff --git a/src/assets/img/emoji.png b/assets/img/emoji.png similarity index 100% rename from src/assets/img/emoji.png rename to assets/img/emoji.png diff --git a/src/assets/img/events.png b/assets/img/events.png similarity index 100% rename from src/assets/img/events.png rename to assets/img/events.png diff --git a/src/assets/img/family.png b/assets/img/family.png similarity index 100% rename from src/assets/img/family.png rename to assets/img/family.png diff --git a/src/assets/img/favorite.png b/assets/img/favorite.png similarity index 100% rename from src/assets/img/favorite.png rename to assets/img/favorite.png diff --git a/src/assets/img/file.png b/assets/img/file.png similarity index 100% rename from src/assets/img/file.png rename to assets/img/file.png diff --git a/src/assets/img/from_pc.png b/assets/img/from_pc.png similarity index 100% rename from src/assets/img/from_pc.png rename to assets/img/from_pc.png diff --git a/src/assets/img/groups.png b/assets/img/groups.png similarity index 100% rename from src/assets/img/groups.png rename to assets/img/groups.png diff --git a/src/assets/img/icon_completed.png b/assets/img/icon_completed.png similarity index 100% rename from src/assets/img/icon_completed.png rename to assets/img/icon_completed.png diff --git a/src/assets/img/left_arrow.png b/assets/img/left_arrow.png similarity index 100% rename from src/assets/img/left_arrow.png rename to assets/img/left_arrow.png diff --git a/src/assets/img/link.png b/assets/img/link.png similarity index 100% rename from src/assets/img/link.png rename to assets/img/link.png diff --git a/src/assets/img/link_share.png b/assets/img/link_share.png similarity index 100% rename from src/assets/img/link_share.png rename to assets/img/link_share.png diff --git a/src/assets/img/location.png b/assets/img/location.png similarity index 100% rename from src/assets/img/location.png rename to assets/img/location.png diff --git a/src/assets/img/location_icon.png b/assets/img/location_icon.png similarity index 100% rename from src/assets/img/location_icon.png rename to assets/img/location_icon.png diff --git a/src/assets/img/logo-s.png b/assets/img/logo-s.png similarity index 100% rename from src/assets/img/logo-s.png rename to assets/img/logo-s.png diff --git a/src/assets/img/logo.png b/assets/img/logo.png similarity index 100% rename from src/assets/img/logo.png rename to assets/img/logo.png diff --git a/src/assets/img/micro_background.png b/assets/img/micro_background.png similarity index 100% rename from src/assets/img/micro_background.png rename to assets/img/micro_background.png diff --git a/src/assets/img/micro_icon.png b/assets/img/micro_icon.png similarity index 100% rename from src/assets/img/micro_icon.png rename to assets/img/micro_icon.png diff --git a/src/assets/img/new_chat.png b/assets/img/new_chat.png similarity index 100% rename from src/assets/img/new_chat.png rename to assets/img/new_chat.png diff --git a/src/assets/img/notifications.png b/assets/img/notifications.png similarity index 100% rename from src/assets/img/notifications.png rename to assets/img/notifications.png diff --git a/src/assets/img/number-icon.png b/assets/img/number-icon.png similarity index 100% rename from src/assets/img/number-icon.png rename to assets/img/number-icon.png diff --git a/src/assets/img/pdf.png b/assets/img/pdf.png similarity index 100% rename from src/assets/img/pdf.png rename to assets/img/pdf.png diff --git a/src/assets/img/photo_icon.png b/assets/img/photo_icon.png similarity index 100% rename from src/assets/img/photo_icon.png rename to assets/img/photo_icon.png diff --git a/src/assets/img/photos.png b/assets/img/photos.png similarity index 100% rename from src/assets/img/photos.png rename to assets/img/photos.png diff --git a/src/assets/img/profile.png b/assets/img/profile.png similarity index 100% rename from src/assets/img/profile.png rename to assets/img/profile.png diff --git a/src/assets/img/psd.png b/assets/img/psd.png similarity index 100% rename from src/assets/img/psd.png rename to assets/img/psd.png diff --git a/src/assets/img/recents.png b/assets/img/recents.png similarity index 100% rename from src/assets/img/recents.png rename to assets/img/recents.png diff --git a/src/assets/img/right_arrow.png b/assets/img/right_arrow.png similarity index 100% rename from src/assets/img/right_arrow.png rename to assets/img/right_arrow.png diff --git a/src/assets/img/right_bar_arrow.png b/assets/img/right_bar_arrow.png similarity index 100% rename from src/assets/img/right_bar_arrow.png rename to assets/img/right_bar_arrow.png diff --git a/src/assets/img/right_bar_arrow_down.png b/assets/img/right_bar_arrow_down.png similarity index 100% rename from src/assets/img/right_bar_arrow_down.png rename to assets/img/right_bar_arrow_down.png diff --git a/src/assets/img/right_bar_arrow_up.png b/assets/img/right_bar_arrow_up.png similarity index 100% rename from src/assets/img/right_bar_arrow_up.png rename to assets/img/right_bar_arrow_up.png diff --git a/src/assets/img/search_icon.png b/assets/img/search_icon.png similarity index 100% rename from src/assets/img/search_icon.png rename to assets/img/search_icon.png diff --git a/src/assets/img/security-icon.png b/assets/img/security-icon.png similarity index 100% rename from src/assets/img/security-icon.png rename to assets/img/security-icon.png diff --git a/src/assets/img/send_background.png b/assets/img/send_background.png similarity index 100% rename from src/assets/img/send_background.png rename to assets/img/send_background.png diff --git a/src/assets/img/send_icon.png b/assets/img/send_icon.png similarity index 100% rename from src/assets/img/send_icon.png rename to assets/img/send_icon.png diff --git a/src/assets/img/send_image.png b/assets/img/send_image.png similarity index 100% rename from src/assets/img/send_image.png rename to assets/img/send_image.png diff --git a/src/assets/img/send_image_2.png b/assets/img/send_image_2.png similarity index 100% rename from src/assets/img/send_image_2.png rename to assets/img/send_image_2.png diff --git a/src/assets/img/send_image_3.png b/assets/img/send_image_3.png similarity index 100% rename from src/assets/img/send_image_3.png rename to assets/img/send_image_3.png diff --git a/src/assets/img/send_image_4.png b/assets/img/send_image_4.png similarity index 100% rename from src/assets/img/send_image_4.png rename to assets/img/send_image_4.png diff --git a/src/assets/img/settings.png b/assets/img/settings.png similarity index 100% rename from src/assets/img/settings.png rename to assets/img/settings.png diff --git a/src/assets/img/sidebar_logo.png b/assets/img/sidebar_logo.png similarity index 100% rename from src/assets/img/sidebar_logo.png rename to assets/img/sidebar_logo.png diff --git a/src/assets/img/storage.png b/assets/img/storage.png similarity index 100% rename from src/assets/img/storage.png rename to assets/img/storage.png diff --git a/src/assets/img/text imput.png b/assets/img/text imput.png similarity index 100% rename from src/assets/img/text imput.png rename to assets/img/text imput.png diff --git a/src/assets/img/video_call.png b/assets/img/video_call.png similarity index 100% rename from src/assets/img/video_call.png rename to assets/img/video_call.png diff --git a/src/assets/img/video_icon.png b/assets/img/video_icon.png similarity index 100% rename from src/assets/img/video_icon.png rename to assets/img/video_icon.png diff --git a/src/assets/img/video_icon_chat.png b/assets/img/video_icon_chat.png similarity index 100% rename from src/assets/img/video_icon_chat.png rename to assets/img/video_icon_chat.png diff --git a/src/assets/img/video_share.png b/assets/img/video_share.png similarity index 100% rename from src/assets/img/video_share.png rename to assets/img/video_share.png diff --git a/src/assets/img/work.png b/assets/img/work.png similarity index 100% rename from src/assets/img/work.png rename to assets/img/work.png diff --git a/src/assets/themes/index.scss b/assets/themes/index.scss similarity index 100% rename from src/assets/themes/index.scss rename to assets/themes/index.scss diff --git a/src/assets/vendor/n2o/bert.js b/assets/vendor/n2o/bert.js similarity index 100% rename from src/assets/vendor/n2o/bert.js rename to assets/vendor/n2o/bert.js diff --git a/src/assets/vendor/n2o/bullet.js b/assets/vendor/n2o/bullet.js similarity index 100% rename from src/assets/vendor/n2o/bullet.js rename to assets/vendor/n2o/bullet.js diff --git a/src/assets/vendor/n2o/ftp.js b/assets/vendor/n2o/ftp.js similarity index 100% rename from src/assets/vendor/n2o/ftp.js rename to assets/vendor/n2o/ftp.js diff --git a/src/assets/vendor/n2o/mq.js b/assets/vendor/n2o/mq.js similarity index 100% rename from src/assets/vendor/n2o/mq.js rename to assets/vendor/n2o/mq.js diff --git a/src/assets/vendor/n2o/n2o.js b/assets/vendor/n2o/n2o.js similarity index 100% rename from src/assets/vendor/n2o/n2o.js rename to assets/vendor/n2o/n2o.js diff --git a/src/assets/vendor/n2o/nitrogen.js b/assets/vendor/n2o/nitrogen.js similarity index 100% rename from src/assets/vendor/n2o/nitrogen.js rename to assets/vendor/n2o/nitrogen.js diff --git a/src/assets/vendor/n2o/utf8.js b/assets/vendor/n2o/utf8.js similarity index 100% rename from src/assets/vendor/n2o/utf8.js rename to assets/vendor/n2o/utf8.js diff --git a/src/assets/vendor/utils/dashboard.js b/assets/vendor/utils/dashboard.js similarity index 99% rename from src/assets/vendor/utils/dashboard.js rename to assets/vendor/utils/dashboard.js index b3422e60525ea4a5a809cc03f2462773499e6a39..0fb827003e4989ec3e1fb6e1bfc3983b7ce30d2e 100644 --- a/src/assets/vendor/utils/dashboard.js +++ b/assets/vendor/utils/dashboard.js @@ -60,7 +60,7 @@ var recorder, links_list: '#links_list', files_list: '#files_list', }, - titleTemplate: 'Dashboard | ', + titleTemplate: 'NinjaApp | ', init: function () { t = this; el = this.elements; diff --git a/src/assets/vendor/utils/global.js b/assets/vendor/utils/global.js similarity index 100% rename from src/assets/vendor/utils/global.js rename to assets/vendor/utils/global.js diff --git a/src/assets/vendor/utils/handlers.js b/assets/vendor/utils/handlers.js similarity index 100% rename from src/assets/vendor/utils/handlers.js rename to assets/vendor/utils/handlers.js diff --git a/src/assets/vendor/utils/json-bert-old.js b/assets/vendor/utils/json-bert-old.js similarity index 100% rename from src/assets/vendor/utils/json-bert-old.js rename to assets/vendor/utils/json-bert-old.js diff --git a/src/assets/vendor/utils/json-bert-test.js b/assets/vendor/utils/json-bert-test.js similarity index 100% rename from src/assets/vendor/utils/json-bert-test.js rename to assets/vendor/utils/json-bert-test.js diff --git a/src/assets/vendor/utils/json-bert.js b/assets/vendor/utils/json-bert.js similarity index 100% rename from src/assets/vendor/utils/json-bert.js rename to assets/vendor/utils/json-bert.js diff --git a/src/assets/vendor/utils/recorder.js b/assets/vendor/utils/recorder.js similarity index 100% rename from src/assets/vendor/utils/recorder.js rename to assets/vendor/utils/recorder.js diff --git a/src/assets/vendor/utils/signin.js b/assets/vendor/utils/signin.js similarity index 100% rename from src/assets/vendor/utils/signin.js rename to assets/vendor/utils/signin.js diff --git a/src/assets/vendor/utils/signup.js b/assets/vendor/utils/signup.js similarity index 100% rename from src/assets/vendor/utils/signup.js rename to assets/vendor/utils/signup.js diff --git a/src/assets/vendor/utils/spa_mq.js b/assets/vendor/utils/spa_mq.js similarity index 100% rename from src/assets/vendor/utils/spa_mq.js rename to assets/vendor/utils/spa_mq.js diff --git a/src/assets/vendor/utils/timer.js b/assets/vendor/utils/timer.js similarity index 100% rename from src/assets/vendor/utils/timer.js rename to assets/vendor/utils/timer.js diff --git a/src/assets/vendor/utils/voximplant.js b/assets/vendor/utils/voximplant.js similarity index 100% rename from src/assets/vendor/utils/voximplant.js rename to assets/vendor/utils/voximplant.js diff --git a/src/assets/vendor/utils/welcome.js b/assets/vendor/utils/welcome.js similarity index 100% rename from src/assets/vendor/utils/welcome.js rename to assets/vendor/utils/welcome.js diff --git a/bundle/index.html b/bundle/index.html index b310463a9ae945a054c870a4e5c9870d0a7e5145..1e56ce0c6a4c734f37dfa2f12911111efbfcfb3c 100644 --- a/bundle/index.html +++ b/bundle/index.html @@ -1,9 +1,9 @@ - +
- + diff --git a/package.json b/package.json index 2f1b7a9b1f5e4ff1661a969d0f2b95b56c11959a..0a4aa9c098efac83987513d23c190b88f8be0800 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "localforage": "^1.5.6", "lodash": "^4.17.4", "material-ui": "^1.0.0-beta.29", + "material-ui-icons": "^1.0.0-beta.17", "mqtt": "^2.15.1", "mqtt-localforage-store": "^1.0.5", "object-assign": "4.1.0", @@ -59,6 +60,7 @@ "babel-eslint": "7.2.3", "babel-jest": "20.0.3", "babel-loader": "7.1.1", + "babel-plugin-transform-class-properties": "^6.24.1", "babel-plugin-transform-react-constant-elements": "6.23.0", "babel-plugin-transform-react-remove-prop-types": "0.4.6", "babel-polyfill": "6.23.0", @@ -138,6 +140,9 @@ "presets": [ "env", "react-hmre" + ], + "plugins": [ + "transform-class-properties" ] }, "production": { diff --git a/src/Index.router.js b/src/Index.router.js deleted file mode 100644 index 991064c0f6cf8da43afba9e9e3059689a6f9e46b..0000000000000000000000000000000000000000 --- a/src/Index.router.js +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react'; -import { IndexRoute, Route } from 'react-router'; -import { IndexContainer } from './pages/index'; -import { HomeContainer } from './pages/home'; -import { SignupContainer } from './pages/signup'; -import { NotFoundContainer } from './pages/not-found'; - - -export default ( - - - - - -); \ No newline at end of file diff --git a/src/componets/SvgIcons/CallsIcon/CallsIcon.js b/src/componets/SvgIcons/CallsIcon/CallsIcon.js new file mode 100644 index 0000000000000000000000000000000000000000..5c43f390b88325e1279bf4928bf5bc4cda189c8f --- /dev/null +++ b/src/componets/SvgIcons/CallsIcon/CallsIcon.js @@ -0,0 +1,41 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { withStyles } from 'material-ui/styles'; +import green from 'material-ui/colors/green'; +import SvgIcon from 'material-ui/SvgIcon'; + +const styles = { + iconHover: { + '&:hover': { + fill: green[200], + } + }, +}; + +const CallsIcon = props => ( + + + +); + +function SvgCallsIcon(props) { + const { classes } = props; + return ( +
+ +
+ ); +} + +SvgCallsIcon.propTypes = { + classes: PropTypes.object.isRequired, +}; + +export default withStyles(styles)(SvgCallsIcon); \ No newline at end of file diff --git a/src/componets/SvgIcons/ChatIcon/ChatIcon.js b/src/componets/SvgIcons/ChatIcon/ChatIcon.js new file mode 100644 index 0000000000000000000000000000000000000000..47d8856734e627574cf2a21cf252fcc30c3936f3 --- /dev/null +++ b/src/componets/SvgIcons/ChatIcon/ChatIcon.js @@ -0,0 +1,41 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { withStyles } from 'material-ui/styles'; +import green from 'material-ui/colors/green'; +import SvgIcon from 'material-ui/SvgIcon'; + +const styles = { + iconHover: { + '&:hover': { + fill: green[200], + } + }, +}; + +const ChatIcon = props => ( + + + +); + +function SvgChatIcon(props) { + const { classes } = props; + return ( +
+ +
+ ); +} + +SvgChatIcon.propTypes = { + classes: PropTypes.object.isRequired, +}; + +export default withStyles(styles)(SvgChatIcon); \ No newline at end of file diff --git a/src/componets/SvgIcons/ContactsIcon/ContactsIcon.js b/src/componets/SvgIcons/ContactsIcon/ContactsIcon.js new file mode 100644 index 0000000000000000000000000000000000000000..ea60264694214d15921a4490a729de5b0ea6898c --- /dev/null +++ b/src/componets/SvgIcons/ContactsIcon/ContactsIcon.js @@ -0,0 +1,46 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { withStyles } from 'material-ui/styles'; +import green from 'material-ui/colors/green'; +import SvgIcon from 'material-ui/SvgIcon'; + +const styles = { + iconHover: { + '&:hover': { + fill: green[200], + }, + }, +}; + +const ContactsIcon = props => ( + + + + + + + + +); + +function SvgContactsIcon(props) { + const { classes } = props; + return ( +
+ +
+ ); +} + +SvgContactsIcon.propTypes = { + classes: PropTypes.object.isRequired, +}; + +export default withStyles(styles)(SvgContactsIcon); \ No newline at end of file diff --git a/src/componets/SvgIcons/GropsIcon/GroupsIcon.js b/src/componets/SvgIcons/GropsIcon/GroupsIcon.js new file mode 100644 index 0000000000000000000000000000000000000000..e870a25702c735c256d5deaa00980654438cf9b0 --- /dev/null +++ b/src/componets/SvgIcons/GropsIcon/GroupsIcon.js @@ -0,0 +1,41 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { withStyles } from 'material-ui/styles'; +import green from 'material-ui/colors/green'; +import SvgIcon from 'material-ui/SvgIcon'; + +const styles = { + iconHover: { + '&:hover': { + fill: green[200], + } + }, +}; + +const GroupsIcon = props => ( + + + +); + +function SvgGroupsIcon(props) { + const { classes } = props; + return ( +
+ +
+ ); +} + +SvgGroupsIcon.propTypes = { + classes: PropTypes.object.isRequired, +}; + +export default withStyles(styles)(SvgGroupsIcon); \ No newline at end of file diff --git a/src/componets/SvgIcons/LogoIcon/LogoIcon.js b/src/componets/SvgIcons/LogoIcon/LogoIcon.js new file mode 100644 index 0000000000000000000000000000000000000000..a2e6acb64215d98a85d1769f6948f98cd3a00f1a --- /dev/null +++ b/src/componets/SvgIcons/LogoIcon/LogoIcon.js @@ -0,0 +1,40 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { withStyles } from 'material-ui/styles'; +import green from 'material-ui/colors/green'; +import SvgIcon from 'material-ui/SvgIcon'; + +const styles = { + iconHover: { + '&:hover': { + fill: green[200], + }, + }, +}; + +const LogoIcon = props => ( + + //TODO: Add path for svg icon + +); + +function SvgLogo(props) { + const { classes } = props; + return ( +
+ +
+ ); +} + +SvgLogo.propTypes = { + classes: PropTypes.object.isRequired, +}; + +export default withStyles(styles)(SvgLogo); \ No newline at end of file diff --git a/src/componets/SvgIcons/OptionsIcon/OptionsIcon.js b/src/componets/SvgIcons/OptionsIcon/OptionsIcon.js new file mode 100644 index 0000000000000000000000000000000000000000..dd58daaf85c0540da6e1331c5bed91e05374129c --- /dev/null +++ b/src/componets/SvgIcons/OptionsIcon/OptionsIcon.js @@ -0,0 +1,40 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { withStyles } from 'material-ui/styles'; +import green from 'material-ui/colors/green'; +import SvgIcon from 'material-ui/SvgIcon'; + +const styles = { + iconHover: { + '&:hover': { + fill: green[200], + }, + }, +}; + +const OptionsIcon = props => ( + + + +); + +function SvgOptionsIcon(props) { + const { classes } = props; + return ( +
+ +
+ ); +} + +SvgOptionsIcon.propTypes = { + classes: PropTypes.object.isRequired, +}; + +export default withStyles(styles)(SvgOptionsIcon); \ No newline at end of file diff --git a/src/componets/SvgIcons/index.js b/src/componets/SvgIcons/index.js new file mode 100644 index 0000000000000000000000000000000000000000..7c12f639e330d4efb0d7053715e115258698ff07 --- /dev/null +++ b/src/componets/SvgIcons/index.js @@ -0,0 +1,14 @@ +import LogoIcon from './LogoIcon/LogoIcon'; +import ChatIcon from './ChatIcon/ChatIcon'; +import CallsIcon from './CallsIcon/CallsIcon'; +import GroupsIcon from './GropsIcon/GroupsIcon'; +import ContactsIcon from './ContactsIcon/ContactsIcon'; +import OptionsIcon from './OptionsIcon/OptionsIcon' +export { + LogoIcon, + CallsIcon, + ChatIcon, + GroupsIcon, + ContactsIcon, + OptionsIcon +} \ No newline at end of file diff --git a/src/componets/index.js b/src/componets/index.js new file mode 100644 index 0000000000000000000000000000000000000000..cb6dad6a1a2d1795dd5008abb4dece9b7c66f41b --- /dev/null +++ b/src/componets/index.js @@ -0,0 +1,9 @@ +import MenuAppBar from '../containers/MenuAppBar/MenuAppBar'; +import LogoIcon from './SvgIcons/LogoIcon/LogoIcon'; +import LeftMenu from '../containers/ActionMenu/ActionMenu'; + +export { + MenuAppBar, + LogoIcon, + LeftMenu +}; \ No newline at end of file diff --git a/src/containers/ActionMenu/ActionMenu.js b/src/containers/ActionMenu/ActionMenu.js new file mode 100644 index 0000000000000000000000000000000000000000..fd0535ed9cca561efd391a68879cb5db07a24ca8 --- /dev/null +++ b/src/containers/ActionMenu/ActionMenu.js @@ -0,0 +1,104 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { withStyles } from 'material-ui/styles'; +import List, { + ListItem, + ListItemText, + ListItemIcon, +} from 'material-ui/List'; +import FolderIcon from 'material-ui-icons/Folder'; +import Divider from 'material-ui/Divider'; +import {Link} from 'react-router'; +import Grid from 'material-ui/Grid'; +import {CallsIcon, ChatIcon, GroupsIcon, ContactsIcon, OptionsIcon} from '../../componets/SvgIcons/index' + +const styles = theme => ({ + root: { + flexGrow: 1, + maxWidth: 120, + }, + demo: { + backgroundColor: theme.palette.background.paper, + }, + menu: { + height:'100%', + }, + title: { + margin: `${theme.spacing.unit * 4}px 0 ${theme.spacing.unit * 2}px`, + }, +}); + + +class LeftMenu extends React.Component { + state = { + dense: false, + secondary: false, + }; + + render() { + const { classes } = this.props; + const { dense, secondary } = this.state; + + return ( +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ ); + } +} + +LeftMenu.propTypes = { + classes: PropTypes.object.isRequired, +}; + +export default withStyles(styles)(LeftMenu); \ No newline at end of file diff --git a/src/containers/ActivityList/ActivityList.js b/src/containers/ActivityList/ActivityList.js new file mode 100644 index 0000000000000000000000000000000000000000..aa84fbb018e61231aa0229982356c21fdfaed3c1 --- /dev/null +++ b/src/containers/ActivityList/ActivityList.js @@ -0,0 +1,63 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { withStyles } from 'material-ui/styles'; +import Drawer from 'material-ui/Drawer'; +import Button from 'material-ui/Button'; +import List from 'material-ui/List'; + + +const styles = { + list: { + width: 250, + }, + listFull: { + width: 'auto', + }, +}; + +class ActivityList extends React.Component { + state = { + top: false, + left: false, + bottom: false, + right: false, + }; + + toggleDrawer = (side, open) => () => { + this.setState({ + [side]: open, + }); + }; + + render() { + const { classes } = this.props; + + const sideList = ( +
+ Contacts +
+ ); + + return ( +
+ + +
+ {sideList} +
+
+
+ ); + } +} + +ActivityList.propTypes = { + classes: PropTypes.object.isRequired, +}; + +export default withStyles(styles)(ActivityList); \ No newline at end of file diff --git a/src/containers/MenuAppBar/MenuAppBar.js b/src/containers/MenuAppBar/MenuAppBar.js new file mode 100644 index 0000000000000000000000000000000000000000..08e4460cf8408bdd32dbf7799ea7e27816f7363a --- /dev/null +++ b/src/containers/MenuAppBar/MenuAppBar.js @@ -0,0 +1,50 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import AppBar from 'material-ui/AppBar'; +import Toolbar from 'material-ui/Toolbar'; +import IconButton from 'material-ui/IconButton'; +import MenuIcon from 'material-ui-icons/Menu'; +import { Grid,Avatar, Input,InputAdornment } from 'material-ui'; +import { withStyles } from 'material-ui/styles'; +import avatar from '../../../assets/img/Richard_Smith.png'; +import Icon from 'material-ui/Icon'; +import { LogoIcon } from '../../componets/index'; + +const styles = { + root: { + width: '100%', + }, + + title:{ + textAlign:'center' + } +}; + +class MenuAppBar extends React.Component { + state = { + auth: true, + anchorEl: null, + }; + + + render() { + const { classes } = this.props; + return ( +
+ + + +
+ DashBoard +
+ + +
+
+
+ ); + } +} + + +export default withStyles(styles)(MenuAppBar); \ No newline at end of file diff --git a/src/containers/index.js b/src/containers/index.js new file mode 100644 index 0000000000000000000000000000000000000000..c51634bacb37534a370d3f6f7f841d60e318af87 --- /dev/null +++ b/src/containers/index.js @@ -0,0 +1,9 @@ +import ActionMenu from './ActionMenu/ActionMenu'; +import MenuAppBar from './MenuAppBar/MenuAppBar'; +import ActivityList from './ActivityList/ActivityList'; + +export { + ActionMenu, + MenuAppBar, + ActivityList +} \ No newline at end of file diff --git a/src/core/configs/mqtt.config.js b/src/core/configs/mqtt.config.js index 6250626d3117a12192c32c41b9234ad422ae5598..53331c065f05018277a7e89db0a2a4fca39fa7b6 100644 --- a/src/core/configs/mqtt.config.js +++ b/src/core/configs/mqtt.config.js @@ -8,8 +8,8 @@ export default ({ provider: 'mqtt', timeout: 2, will : { - topic: 'version/2', - payload:'version/2', + topic: 'version/1', + payload:'version/1', qos: '2' } }); diff --git a/src/index.js b/src/index.js index ed5785724179df7c25c006329332b44571158a3d..07350b5e278cdc5352ae4c348002de51ae458e85 100644 --- a/src/index.js +++ b/src/index.js @@ -2,9 +2,10 @@ import React from 'react'; import { render } from 'react-dom'; import { AppContainer } from 'react-hot-loader'; -import Root from './Root.container'; +import Root from './root'; import { devStore as configureStore } from './core/store' +import Reboot from 'material-ui/Reboot'; require('./favicon.ico'); @@ -14,8 +15,12 @@ require('./favicon.ico'); ////tmp remove HOC`s (wrappers), just for keep simple render( - - - , +
+ + + + +
, + document.getElementById('app') ); \ No newline at end of file diff --git a/src/modules/Chats/Chats.js b/src/modules/Chats/Chats.js new file mode 100644 index 0000000000000000000000000000000000000000..b66569be65ea490ab574aad4d8d55ab801dc9193 --- /dev/null +++ b/src/modules/Chats/Chats.js @@ -0,0 +1,12 @@ +import React, { PureComponent } from 'react'; + +export default class Chats extends PureComponent { + render() { + return ( +
+ Chats +
+ ); + } +} + diff --git a/src/modules/Dashboard/Dashboard.js b/src/modules/Dashboard/Dashboard.js new file mode 100644 index 0000000000000000000000000000000000000000..0682dff7579530ebd18ea5622be96c536d69db42 --- /dev/null +++ b/src/modules/Dashboard/Dashboard.js @@ -0,0 +1,12 @@ +import React, { PureComponent } from 'react'; + +export default class Dashboard extends PureComponent { + render() { + return ( +
+ HomePage +
+ ); + } +} + diff --git a/src/modules/Home/Home.js b/src/modules/Home/Home.js new file mode 100644 index 0000000000000000000000000000000000000000..3d97fc3ffa322a67978470084415cb8a1e124a6c --- /dev/null +++ b/src/modules/Home/Home.js @@ -0,0 +1,12 @@ +import React, { PureComponent } from 'react'; + +export default class Home extends PureComponent { + render() { + return ( +
+ HomePage +
+ ); + } +} + diff --git a/src/modules/Login/Login.js b/src/modules/Login/Login.js new file mode 100644 index 0000000000000000000000000000000000000000..526e5482e7f816ac89f9cb4dbbbeed7e512426a8 --- /dev/null +++ b/src/modules/Login/Login.js @@ -0,0 +1,78 @@ +import React, { PureComponent } from 'react'; +import Paper from 'material-ui/Paper'; +import Grid from 'material-ui/Grid'; +import { withStyles } from 'material-ui/styles'; +import { blue } from 'material-ui/colors'; +import TextField from 'material-ui/TextField'; +import Button from 'material-ui/Button'; + +const styles = theme => ({ + root: { + flexGrow: 1, + marginTop: 30, + }, + paper: { + padding: 16, + textAlign: 'center', + color: blue[500] + // color: theme.palette.text.secondary, + }, + textField: { + marginLeft: theme.spacing.unit, + marginRight: theme.spacing.unit, + width: 200, + }, + button: { + margin: theme.spacing.unit, + }, +}); + +export class Login extends PureComponent { + + constructor(props) { + super(props); + } + + render() { + const { classes } = this.props; + + return ( +
+ + + + Login Test Container + + + + + + + + + + + + +
+ ); + } +} + +export default withStyles(styles)(Login); \ No newline at end of file diff --git a/src/modules/SignUp/SignUp.js b/src/modules/SignUp/SignUp.js new file mode 100644 index 0000000000000000000000000000000000000000..7a3e1e8d379895fe89db4d44499019ac105e9f66 --- /dev/null +++ b/src/modules/SignUp/SignUp.js @@ -0,0 +1,127 @@ +import React, { Component, PropTypes } from 'react'; + +export default class SignUp extends Component { + static propTypes = { + + }; + constructor(props) { + super(props); + this.state = { + + }; + } + render() { + return (
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+

Phone Number

+
+

Please choose your country and enter your phone number.

+
+
+
+ + + +
+
+
+
+ + +
+
+ + +
+
+ +
+
+
+
+
+
+
+
+
+

Security Code

+
+

We've sent a security code to your phone.

+

You should receive it within 60 seconds.

+

+ Haven't received the code? + Haven't received the code? +

+
+
+
+ + +
+
+ +
+
+ + +
+ +
+
+
+
+
+
+
+
+
+

Your Name

+
+

How would you like to be called?

+
+
+
+ + +
+
+ + +
+
+ +
+
+
+
+
+
+
+
+
+
+ By signing in, you acknowledge that you have read and accept our Terms of + Service. +
+
+
+
+
+
+
+
) + } +} \ No newline at end of file diff --git a/src/modules/index.js b/src/modules/index.js new file mode 100644 index 0000000000000000000000000000000000000000..8411bd6a52cbb1304c55c0e30e8f0efd9b0379fd --- /dev/null +++ b/src/modules/index.js @@ -0,0 +1,13 @@ +import Home from './Home/Home'; +import Login from './Login/Login'; +import SignUp from './SignUp/SignUp'; +import Dashboard from './Dashboard/Dashboard'; +import Chats from './Chats/Chats'; + +export { + Home, + Login, + SignUp, + Dashboard, + Chats +}; \ No newline at end of file diff --git a/src/modules/messages/scheduled/index.js b/src/modules/messages/scheduled/index.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/modules/messages/shared/index.js b/src/modules/messages/shared/index.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/modules/messages/starred/index.js b/src/modules/messages/starred/index.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/modules/shared/index.js b/src/modules/shared/index.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/pages/App/App.js b/src/pages/App/App.js new file mode 100644 index 0000000000000000000000000000000000000000..67200d885169ea0712e8d9cf74e2f4c171f9c10f --- /dev/null +++ b/src/pages/App/App.js @@ -0,0 +1,37 @@ +import React, { Component, PropTypes } from 'react'; +import { MuiThemeProvider } from 'material-ui'; +import {createMuiTheme} from "material-ui/styles/index"; + +export default class App extends Component { + + constructor(props) { + super(props); + } + static propTypes = { + }; + componentWillMount(){ + + } + + renderChildren(globalProps, childProps) { + return React.cloneElement(globalProps, childProps); + } + render() { + const theme = createMuiTheme({ + palette: { + type:'dark' + }, + }); + console.log(theme); + return ( +
+ + { this.renderChildren(this.props.children, {}) } + +
+ + ) + } +} + + diff --git a/src/pages/NinjaApp/NinjaApp.js b/src/pages/NinjaApp/NinjaApp.js new file mode 100644 index 0000000000000000000000000000000000000000..a28eb4ce210f034e7593def6e2efcd1911d4ed90 --- /dev/null +++ b/src/pages/NinjaApp/NinjaApp.js @@ -0,0 +1,41 @@ +import React, { Component, PropTypes } from 'react'; + +import { connect, dispatch } from 'react-redux'; +import { MenuAppBar,ActionMenu } from '../../containers'; +import {Grid} from 'material-ui'; + +export default class Dashboard extends Component { + + constructor(props) { + super(props); + } + + static propTypes = { + }; + + componentWillMount(){ + + } + + renderChildren(globalProps, childProps) { + return React.cloneElement(globalProps, childProps); + } + + render() { + console.log(this.props) + + return ( +
+ + + +
+ { this.renderChildren(this.props.children, {}) } +
+
+ + ) + } +} + + diff --git a/src/pages/NotFound/NotFoundPage.js b/src/pages/NotFound/NotFoundPage.js new file mode 100644 index 0000000000000000000000000000000000000000..a805b3c8ff533242c5e06748c08896d4285e5257 --- /dev/null +++ b/src/pages/NotFound/NotFoundPage.js @@ -0,0 +1,9 @@ +import React, { PureComponent } from 'react'; + +export default class NotFoundPage extends PureComponent { + render() { + return ( +
404
+ ); + } +} diff --git a/src/pages/Unauthorized/UnauthorizedPage.js b/src/pages/Unauthorized/UnauthorizedPage.js new file mode 100644 index 0000000000000000000000000000000000000000..99feeb7ce961a82b1882ef93422d9964e4f17660 --- /dev/null +++ b/src/pages/Unauthorized/UnauthorizedPage.js @@ -0,0 +1,25 @@ +import React, { Component, PropTypes } from 'react'; + +export default class UnauthorizedPage extends Component { + static propTypes = { + }; + constructor(props) { + super(props); + this.state = { + + }; + } + + renderChildren(globalProps, childProps) { + return React.cloneElement(globalProps, childProps); + } + render() { + console.log(this.props.children); + return ( +
+ { this.renderChildren(this.props.children, {}) } +
+ ) + } +} + diff --git a/src/pages/dashboard/index/Index.container.js b/src/pages/dashboard/index/Index.container.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/pages/dashboard/index/index.js b/src/pages/dashboard/index/index.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/pages/dashboard/main/Main.container.js b/src/pages/dashboard/main/Main.container.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/pages/dashboard/main/index.js b/src/pages/dashboard/main/index.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/pages/home/Home.container.js b/src/pages/home/Home.container.js deleted file mode 100644 index 73626021611443560c034b45fea09da54f227c6c..0000000000000000000000000000000000000000 --- a/src/pages/home/Home.container.js +++ /dev/null @@ -1,7 +0,0 @@ -import React, { Component } from 'react'; - -export default class HomeContainer extends Component { - render() { - return (
Home
) - } -} \ No newline at end of file diff --git a/src/pages/home/index.js b/src/pages/home/index.js deleted file mode 100644 index b59f844866db06d4e6a0af8d297bf339a623adae..0000000000000000000000000000000000000000 --- a/src/pages/home/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import HomeContainer from './Home.container'; - -export { HomeContainer }; \ No newline at end of file diff --git a/src/pages/index.js b/src/pages/index.js new file mode 100644 index 0000000000000000000000000000000000000000..f624d2e2cabe6009ea28521fc45c8da5c46a47e1 --- /dev/null +++ b/src/pages/index.js @@ -0,0 +1,11 @@ +import App from './App/App'; +import NotFoundPage from './NotFound/NotFoundPage'; +import UnauthorizedPage from './Unauthorized/UnauthorizedPage'; +import NinjaApp from './NinjaApp/NinjaApp'; + +export { + App, + NotFoundPage, + UnauthorizedPage, + NinjaApp +}; \ No newline at end of file diff --git a/src/pages/index/Index.container.js b/src/pages/index/Index.container.js deleted file mode 100644 index c42ad866a2c37261053ad3a821f0140125c73832..0000000000000000000000000000000000000000 --- a/src/pages/index/Index.container.js +++ /dev/null @@ -1,18 +0,0 @@ -import React, { Component } from 'react'; -import Helmet from 'react-helmet'; - -export default class Index extends Component { - render() { - return ( -
- - { this.props.children } -
- ) - } -} \ No newline at end of file diff --git a/src/pages/index/index.js b/src/pages/index/index.js deleted file mode 100644 index d091974c9adab2af09bc04cf59a2205de7b41b3a..0000000000000000000000000000000000000000 --- a/src/pages/index/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import IndexContainer from './Index.container'; - -export { IndexContainer }; \ No newline at end of file diff --git a/src/pages/not-found/NotFound.container.js b/src/pages/not-found/NotFound.container.js deleted file mode 100644 index 42d14a4ed0af3828fbac4420be3e0042d5967eb9..0000000000000000000000000000000000000000 --- a/src/pages/not-found/NotFound.container.js +++ /dev/null @@ -1,9 +0,0 @@ -import React, { Component } from 'react'; - -export default class NotFoundContainer extends Component { - render() { - return( -
Not found
- ) - } -} diff --git a/src/pages/not-found/index.js b/src/pages/not-found/index.js deleted file mode 100644 index 607d8ab1bab79ecac0b59cc2591b0bb3a421557e..0000000000000000000000000000000000000000 --- a/src/pages/not-found/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import NotFoundContainer from './NotFound.container'; - -export { NotFoundContainer }; \ No newline at end of file diff --git a/src/pages/signup/Signup.container.js b/src/pages/signup/Signup.container.js deleted file mode 100644 index a5577f8a3e511b6d71020c959d19d8edd6e87a66..0000000000000000000000000000000000000000 --- a/src/pages/signup/Signup.container.js +++ /dev/null @@ -1,9 +0,0 @@ -import React, { Component } from 'react'; - -export default class Signup extends Component { - render() { - return( -
Signup
- ) - } -} \ No newline at end of file diff --git a/src/pages/signup/index.js b/src/pages/signup/index.js deleted file mode 100644 index 27c07f191058725101d78e4c7bd83445a62e6dae..0000000000000000000000000000000000000000 --- a/src/pages/signup/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import SignupContainer from './Signup.container'; - -export { SignupContainer }; \ No newline at end of file diff --git a/src/pages/terms/index.js b/src/pages/terms/index.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/Root.container.js b/src/root.js similarity index 66% rename from src/Root.container.js rename to src/root.js index 33c8e3f1c615fa825222dd88fd4c0707e53e70dd..0118dee1a265cb5086d555935e838ac196e78084 100644 --- a/src/Root.container.js +++ b/src/root.js @@ -1,15 +1,10 @@ import React, { Component } from 'react'; -import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles'; import Reboot from 'material-ui/Reboot'; import { Provider } from 'react-redux'; //import LoadingBar from 'react-redux-loading-bar' import { Router, browserHistory } from 'react-router'; -import routes from './Index.router'; +import routes from './routes'; import { connecting } from './core/resource/Init.resource' -import './assets/css/font.css'; -import './assets/css/global.css'; - -const theme = createMuiTheme(); class Root extends Component { componentDidMount() { @@ -19,13 +14,11 @@ class Root extends Component { render() { const { store } = this.props; return ( - - { routes } + { routes(store) } - ) } } diff --git a/src/routes.js b/src/routes.js new file mode 100644 index 0000000000000000000000000000000000000000..ed61dfc91dd515a7c94da9f1e0304868cda464bc --- /dev/null +++ b/src/routes.js @@ -0,0 +1,26 @@ +import React from 'react'; +import { IndexRoute, Route } from 'react-router'; +import { App, NotFoundPage, UnauthorizedPage, NinjaApp } from './pages'; +import { Home, Login, SignUp,Dashboard, Chats } from './modules'; +export default () => { + /** + * Please keep routes in alphabetical order + */ + return ( + + + + + + + + + + + + + + + + ); +}; \ No newline at end of file diff --git a/src/template.ejs b/src/template.ejs index a4451f4d717c9012d80c3f9c4467e843b29a4639..5003b1ded244e6690b8b11367661c0b1d91f5ab2 100755 --- a/src/template.ejs +++ b/src/template.ejs @@ -1,4 +1,4 @@ - +