From 1cde3b9fd49e397a2106baca0f6bef378041589c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 5 Jun 2014 15:46:59 -0400 Subject: splitting out UI --- public/assets/javascripts/app.js | 2 + server/index.js | 2 +- server/lib/views.js | 4 +- views/app.ejs | 194 ++------------------------------------- views/controls/light-control.ejs | 18 ++++ views/controls/media-drawer.ejs | 96 +++++++++++++++++++ views/controls/settings.ejs | 41 +++++++++ views/controls/signed-out.ejs | 14 +++ views/controls/toolbar.ejs | 9 ++ views/controls/video-toolbar.ejs | 7 ++ views/controls/wallpaper.ejs | 10 ++ views/edit-profile.ejs | 2 +- views/home.ejs | 56 +++++++++++ views/index.ejs | 56 ----------- views/signed-out.ejs | 19 +--- 15 files changed, 270 insertions(+), 260 deletions(-) create mode 100644 views/controls/light-control.ejs create mode 100644 views/controls/media-drawer.ejs create mode 100644 views/controls/settings.ejs create mode 100644 views/controls/signed-out.ejs create mode 100644 views/controls/toolbar.ejs create mode 100644 views/controls/video-toolbar.ejs create mode 100644 views/controls/wallpaper.ejs create mode 100755 views/home.ejs delete mode 100755 views/index.ejs diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js index ba210b8..6639fde 100644 --- a/public/assets/javascripts/app.js +++ b/public/assets/javascripts/app.js @@ -19,6 +19,8 @@ var app = new function(){} app.init = function () { app.tube = new Tube () + + app.launch() } app.launch = function () { diff --git a/server/index.js b/server/index.js index 0dfb640..3a28f0e 100644 --- a/server/index.js +++ b/server/index.js @@ -64,7 +64,7 @@ passport.use(new TwitterStrategy({ // app.all('*', middleware.enableCORS); // Initialize views -app.get('/', views.front); +app.get('/', views.home); app.get('/login', views.login); app.get('/logout', auth.logout); app.get('/auth/twitter', auth.login('twitter')); diff --git a/server/lib/views.js b/server/lib/views.js index ac72def..4ab2a21 100644 --- a/server/lib/views.js +++ b/server/lib/views.js @@ -10,8 +10,8 @@ exports.login = function (req, res) { }); }; -exports.index = function (req, res) { - res.render('index', { +exports.home = function (req, res) { + res.render('home', { config: config }) } diff --git a/views/app.ejs b/views/app.ejs index c853744..2186129 100755 --- a/views/app.ejs +++ b/views/app.ejs @@ -5,196 +5,20 @@ [[ include partials/meta ]] +
+
- + -
- - - - - - - -
+ [[ include controls/toolbar ]] + [[ include controls/video-toolbar ]] + [[ include controls/media-drawer ]] + [[ include controls/wallpaper ]] + [[ include controls/light-control ]] + [[ include controls/settings ]] -
- - - - - -
- - -
-
- Upload File - -
- ~ or ~
- - -
-
- -
- -
-

Your Media – Found Media


-

delete media

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- - - - - - - - -
- -
-
- -

Outline Hue

-
-
- -

Wall Hue

-
-
- -

Brightness

-
-
- -

Shadow

-
-
- -
- -
- - - Select Startpoint - Move to Desired Point -
- -
- -
- -
- -
-
- -
-
-
- - - - - -
-
-
- -
-
- Clone - Clear - Delete -
-
diff --git a/views/controls/light-control.ejs b/views/controls/light-control.ejs new file mode 100644 index 0000000..782c400 --- /dev/null +++ b/views/controls/light-control.ejs @@ -0,0 +1,18 @@ +
+
+ +

Outline Hue

+
+
+ +

Wall Hue

+
+
+ +

Brightness

+
+
+ +

Shadow

+
+
\ No newline at end of file diff --git a/views/controls/media-drawer.ejs b/views/controls/media-drawer.ejs new file mode 100644 index 0000000..af9ea71 --- /dev/null +++ b/views/controls/media-drawer.ejs @@ -0,0 +1,96 @@ + +
+
+ Upload File + +
+ ~ or ~
+ + + +
+
+ +
+ +
+

Your Media – Found Media


+

delete media

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
\ No newline at end of file diff --git a/views/controls/settings.ejs b/views/controls/settings.ejs new file mode 100644 index 0000000..4336ddf --- /dev/null +++ b/views/controls/settings.ejs @@ -0,0 +1,41 @@ +
+ +
+ + + Select Startpoint + Move to Desired Point +
+ +
+ +
+ +
+ +
+
+ +
+
+
+ + + + + +
+
+
+ +
+
+ Clone + Clear + Delete +
+
\ No newline at end of file diff --git a/views/controls/signed-out.ejs b/views/controls/signed-out.ejs new file mode 100644 index 0000000..20e3715 --- /dev/null +++ b/views/controls/signed-out.ejs @@ -0,0 +1,14 @@ + + + +
+

Roomname, Ivan Sidorov

+

Last modified 3/12/14

+ Nulla vitae elit libero, a pharetra augue. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. +
+ + diff --git a/views/controls/toolbar.ejs b/views/controls/toolbar.ejs new file mode 100644 index 0000000..1bf87eb --- /dev/null +++ b/views/controls/toolbar.ejs @@ -0,0 +1,9 @@ +
+ + + + + + + +
diff --git a/views/controls/video-toolbar.ejs b/views/controls/video-toolbar.ejs new file mode 100644 index 0000000..d4364a2 --- /dev/null +++ b/views/controls/video-toolbar.ejs @@ -0,0 +1,7 @@ +
+ + + + + +
diff --git a/views/controls/wallpaper.ejs b/views/controls/wallpaper.ejs new file mode 100644 index 0000000..82460b7 --- /dev/null +++ b/views/controls/wallpaper.ejs @@ -0,0 +1,10 @@ +
+ + + + + + + + +
\ No newline at end of file diff --git a/views/edit-profile.ejs b/views/edit-profile.ejs index 61bb592..0e39ade 100644 --- a/views/edit-profile.ejs +++ b/views/edit-profile.ejs @@ -6,7 +6,7 @@
- +
diff --git a/views/home.ejs b/views/home.ejs new file mode 100755 index 0000000..155f2ca --- /dev/null +++ b/views/home.ejs @@ -0,0 +1,56 @@ + + + + vvalls + [[ include partials/meta ]] + + + +
+ + + + + + + +
+
+ Welcome to VVALLS +
+ +

Room Showcase

+ + + + + + + + + + +
+ Pace Gallery • 7.1.14 + + Pace Gallery • 7.1.14 +
+ Pace Gallery • 7.1.14 + + Pace Gallery • 7.1.14 +
+ + View More + + [[ include partials/signin ]] + [[ include partials/footer ]] + +
+ +[[ include partials/scripts ]] + diff --git a/views/index.ejs b/views/index.ejs deleted file mode 100755 index 155f2ca..0000000 --- a/views/index.ejs +++ /dev/null @@ -1,56 +0,0 @@ - - - - vvalls - [[ include partials/meta ]] - - - -
- - - - - - - -
-
- Welcome to VVALLS -
- -

Room Showcase

- - - - - - - - - - -
- Pace Gallery • 7.1.14 - - Pace Gallery • 7.1.14 -
- Pace Gallery • 7.1.14 - - Pace Gallery • 7.1.14 -
- - View More - - [[ include partials/signin ]] - [[ include partials/footer ]] - -
- -[[ include partials/scripts ]] - diff --git a/views/signed-out.ejs b/views/signed-out.ejs index 3cdd769..c68d960 100755 --- a/views/signed-out.ejs +++ b/views/signed-out.ejs @@ -9,23 +9,12 @@
- - - -
-

Roomname, Ivan Sidorov

-

Last modified 3/12/14

- Nulla vitae elit libero, a pharetra augue. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. -
- - + + + [[ include controls/signed-out ]]
- [[ include partials/signin ]] + [[ include partials/sign-in ]] [[ include partials/scripts ]] -- cgit v1.2.3-70-g09d2