summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-06-05 15:46:59 -0400
committerJules Laplace <jules@okfoc.us>2014-06-05 15:46:59 -0400
commit1cde3b9fd49e397a2106baca0f6bef378041589c (patch)
treef18a83d2234e360df16642250dcb5fca4eb434c2
parent1c8ecab7cc040196cf585d618b5eb9289a2efbc6 (diff)
splitting out UI
Diffstat
-rw-r--r--public/assets/javascripts/app.js2
-rw-r--r--server/index.js2
-rw-r--r--server/lib/views.js4
-rwxr-xr-xviews/app.ejs194
-rw-r--r--views/controls/light-control.ejs18
-rw-r--r--views/controls/media-drawer.ejs96
-rw-r--r--views/controls/settings.ejs41
-rw-r--r--views/controls/signed-out.ejs14
-rw-r--r--views/controls/toolbar.ejs9
-rw-r--r--views/controls/video-toolbar.ejs7
-rw-r--r--views/controls/wallpaper.ejs10
-rw-r--r--views/edit-profile.ejs2
-rwxr-xr-xviews/home.ejs (renamed from views/index.ejs)0
-rwxr-xr-xviews/signed-out.ejs19
14 files changed, 214 insertions, 204 deletions
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 ]]
</head>
<body class="editing loading">
+
<div id="scene"></div>
+
<div class="rapper">
- <a href="/front.html" class="logo"><img src="assets/img/logo4.svg"></a>
+ <a href="/front.html" class="logo"><img src="/assets/img/logo4.svg"></a>
<a href="/profile.html"><span class="icon-ios7-person-outline profile"></span></a>
- <div class="edit menu vvbox">
- <span class="icon-ios7-photos-outline addMedia" data-info="add media"></span>
- <span class="icon-arrow-resize" data-info="resize media"></span>
- <span class="icon-ios7-keypad-outline" data-info="add wallpaper"></span>
- <span class="icon-ios7-sunny-outline" data-info="light control"></span>
- <span class="icon-ios7-trash-outline delete-image-toggle" data-info="delete images"></span>
- <span class="icon-ios7-compose-outline edit-text-toggle" data-info="edit wall text"></span>
- <span class="icon-key" data-info="room settings"></span>
- </div>
+ [[ include controls/toolbar ]]
+ [[ include controls/video-toolbar ]]
+ [[ include controls/media-drawer ]]
+ [[ include controls/wallpaper ]]
+ [[ include controls/light-control ]]
+ [[ include controls/settings ]]
- <div class="edit menu edit-video">
- <span class="icon-volume-mute toggled" data-info="mute"></span>
- <span class="icon-ios7-compose-outline edit-text-toggle" data-info="edit wall text"></span>
- <span class="icon-ios7-reload" data-info="loop"></span>
- <span class="icon-ios7-arrow-forward" data-info="autoplay"></span>
- <span class="icon-ios7-trash-outline" data-info="delete video"></span>
- </div>
-
- <span class="fileUpload">
- <form>
- <span class="icon-ios7-upload-outline"></span><br>
- Upload File
- <input type="file" name="pic" accept="image/*">
- </form>
- <small>~ or ~</small><br>
- <input type="text" placeholder="Enter Vimeo or YouTube Link"></input>
- </span>
- <div class="ants">
- <div class="leftborder"></div>
- <img class="floatingImg">
- </div>
-
- <div class="mediaDrawer fixed animate">
- <h2><a href="#" class="yourMedia active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
- <h3 class="editBtn" id="deleteMedia">delete media</h3>
- <div class="myMedia">
- <span class="mediaContainer">
- <img src="http://2.bp.blogspot.com/-GD6IxUvsdOo/UdrcMFLVYNI/AAAAAAAAF2E/kbRfxMxiUlQ/s1600/okeeffe.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://www.bobkessel.com/wordpress/wp-content/uploads/2009/10/moma-bob-kessel-410.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52f28f348b3b81f2fc000364/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static3.artsy.net/partner_show_images/52e83674c9dc24397f0000d8/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static0.artsy.net/partner_show_images/52d96d484b84801ef0000273/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52778616275b24f95c00011d/1/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52dc65311a1e86be6b000205/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/post_images/52ec0e20c9dc24f1d8000067/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4e6bf67bc23f490001004579/1/tall.jpg">
- </span>
- <span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52dcca28139b2135030002a8/tall.jpg">
- </span>
- <span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52927bb2b202a3669d000704/larger.jpg">
- </span>
- <span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4f9f3a3ce262e60001000fb3/large.jpg">
- </span>
- </div>
-
- <div class="foundMedia">
- <span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/post_images/52ec0e20c9dc24f1d8000067/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4e6bf67bc23f490001004579/1/tall.jpg">
- </span>
- <span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52dcca28139b2135030002a8/tall.jpg">
- </span>
- <span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52927bb2b202a3669d000704/larger.jpg">
- </span>
- <span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4f9f3a3ce262e60001000fb3/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://2.bp.blogspot.com/-GD6IxUvsdOo/UdrcMFLVYNI/AAAAAAAAF2E/kbRfxMxiUlQ/s1600/okeeffe.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://www.bobkessel.com/wordpress/wp-content/uploads/2009/10/moma-bob-kessel-410.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52f28f348b3b81f2fc000364/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static3.artsy.net/partner_show_images/52e83674c9dc24397f0000d8/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static0.artsy.net/partner_show_images/52d96d484b84801ef0000273/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52778616275b24f95c00011d/1/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52dc65311a1e86be6b000205/large.jpg">
- </span>
- </div>
- </div>
-
- <div class="vvbox wallpaper">
- <span class="paper1"></span>
- <span class="paper2"></span>
- <span class="paper3"></span>
- <span class="paper4"></span>
- <span class="paper5"></span>
- <span class="paper6"></span>
- <span class="paper7"></span>
- <span class="paper8"></span>
- </div>
-
- <div class="vvbox lightcontrol">
- <div class="slider">
- <input type="range" min="0" max="100" value="0" id="shadow-control" />
- <h4>Outline Hue</h4>
- </div>
- <div class="slider">
- <input type="range" min="0" max="100" value="100" id="brightness-control" />
- <h4>Wall Hue</h4>
- </div>
- <div class="slider">
- <input type="range" min="0" max="100" value="0" id="brightness-control" />
- <h4>Brightness</h4>
- </div>
- <div class="slider">
- <input type="range" min="0" max="100" value="0" id="shadow-control" />
- <h4>Shadow</h4>
- </div>
- </div>
-
- <div class="vvbox settings">
-
- <div class="setting">
- <a href="#" id="startpoint">
- <span class="icon-ios7-navigate-outline"></span>
- <span id="startText">Select Startpoint</span>
- <span id="moveText">Move to Desired Point</span></a>
- </div>
-
- <div class="setting">
- <input type="text" placeholder="room name" />
- </div>
-
- <div class="setting">
- <textarea placeholder="short description"></textarea>
- </div>
- <div class="setting">
- <input type="text" placeholder="http://vvalls.com/t987" />
- </div>
- <div class="setting">
- <div class="radio-group">
- <input id="opt_1" class="radio-group__option" type="radio" name="opt" checked="checked">
- <label class="radio-group__label" for="opt_1">
- Everyone
- </label>
-
- <input id="opt_2" class="radio-group__option" type="radio" name="opt">
- <label class="radio-group__label" for="opt_2">
- Just for me
- </label>
- </div>
- </div>
- <div class="setting">
- <button>Save</button>
- </div>
- <div class="setting subButtons">
- <a href="#">Clone </a>
- <a href="#">Clear </a>
- <a href="#" id="deleteRoom">Delete </a>
- </div>
- </div>
<div id="minimap" class="vvbox">
<span class="el"></span>
</div>
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 @@
+<div class="vvbox lightcontrol">
+ <div class="slider">
+ <input type="range" min="0" max="100" value="0" id="shadow-control" />
+ <h4>Outline Hue</h4>
+ </div>
+ <div class="slider">
+ <input type="range" min="0" max="100" value="100" id="brightness-control" />
+ <h4>Wall Hue</h4>
+ </div>
+ <div class="slider">
+ <input type="range" min="0" max="100" value="0" id="brightness-control" />
+ <h4>Brightness</h4>
+ </div>
+ <div class="slider">
+ <input type="range" min="0" max="100" value="0" id="shadow-control" />
+ <h4>Shadow</h4>
+ </div>
+</div> \ 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 @@
+<span class="fileUpload">
+ <form>
+ <span class="icon-ios7-upload-outline"></span><br>
+ Upload File
+ <input type="file" name="pic" accept="image/*">
+ </form>
+ <small>~ or ~</small><br>
+ <input type="text" placeholder="Enter Vimeo or YouTube Link"></input>
+</span>
+
+<div class="ants">
+ <div class="leftborder"></div>
+ <img class="floatingImg">
+</div>
+
+<div class="mediaDrawer fixed animate">
+ <h2><a href="#" class="yourMedia active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
+ <h3 class="editBtn" id="deleteMedia">delete media</h3>
+ <div class="myMedia">
+ <span class="mediaContainer">
+ <img src="http://2.bp.blogspot.com/-GD6IxUvsdOo/UdrcMFLVYNI/AAAAAAAAF2E/kbRfxMxiUlQ/s1600/okeeffe.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://www.bobkessel.com/wordpress/wp-content/uploads/2009/10/moma-bob-kessel-410.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static1.artsy.net/partner_show_images/52f28f348b3b81f2fc000364/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static3.artsy.net/partner_show_images/52e83674c9dc24397f0000d8/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static0.artsy.net/partner_show_images/52d96d484b84801ef0000273/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static1.artsy.net/partner_show_images/52778616275b24f95c00011d/1/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static1.artsy.net/partner_show_images/52dc65311a1e86be6b000205/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="https://d1ycxz9plii3tb.cloudfront.net/post_images/52ec0e20c9dc24f1d8000067/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4e6bf67bc23f490001004579/1/tall.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52dcca28139b2135030002a8/tall.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52927bb2b202a3669d000704/larger.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4f9f3a3ce262e60001000fb3/large.jpg">
+ </span>
+ </div>
+
+ <div class="foundMedia">
+ <span class="mediaContainer">
+ <img src="https://d1ycxz9plii3tb.cloudfront.net/post_images/52ec0e20c9dc24f1d8000067/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4e6bf67bc23f490001004579/1/tall.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52dcca28139b2135030002a8/tall.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52927bb2b202a3669d000704/larger.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4f9f3a3ce262e60001000fb3/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://2.bp.blogspot.com/-GD6IxUvsdOo/UdrcMFLVYNI/AAAAAAAAF2E/kbRfxMxiUlQ/s1600/okeeffe.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://www.bobkessel.com/wordpress/wp-content/uploads/2009/10/moma-bob-kessel-410.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static1.artsy.net/partner_show_images/52f28f348b3b81f2fc000364/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static3.artsy.net/partner_show_images/52e83674c9dc24397f0000d8/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static0.artsy.net/partner_show_images/52d96d484b84801ef0000273/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static1.artsy.net/partner_show_images/52778616275b24f95c00011d/1/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static1.artsy.net/partner_show_images/52dc65311a1e86be6b000205/large.jpg">
+ </span>
+ </div>
+</div> \ 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 @@
+<div class="vvbox settings">
+
+ <div class="setting">
+ <a href="#" id="startpoint">
+ <span class="icon-ios7-navigate-outline"></span>
+ <span id="startText">Select Startpoint</span>
+ <span id="moveText">Move to Desired Point</span></a>
+ </div>
+
+ <div class="setting">
+ <input type="text" placeholder="room name" />
+ </div>
+
+ <div class="setting">
+ <textarea placeholder="short description"></textarea>
+ </div>
+ <div class="setting">
+ <input type="text" placeholder="http://vvalls.com/t987" />
+ </div>
+ <div class="setting">
+ <div class="radio-group">
+ <input id="opt_1" class="radio-group__option" type="radio" name="opt" checked="checked">
+ <label class="radio-group__label" for="opt_1">
+ Everyone
+ </label>
+
+ <input id="opt_2" class="radio-group__option" type="radio" name="opt">
+ <label class="radio-group__label" for="opt_2">
+ Just for me
+ </label>
+ </div>
+ </div>
+ <div class="setting">
+ <button>Save</button>
+ </div>
+ <div class="setting subButtons">
+ <a href="#">Clone </a>
+ <a href="#">Clear </a>
+ <a href="#" id="deleteRoom">Delete </a>
+ </div>
+</div> \ 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 @@
+<a href="#" class="signUp topLink">Sign Up</span></a>
+<a href="#" class="signIn topLink">Sign In</span></a>
+
+<div class="aboutRoom vvbox">
+ <h1>Roomname, <a href="profilelink">Ivan Sidorov</a></h1>
+ <h2>Last modified 3/12/14</h2>
+ <span>Nulla vitae elit libero, a pharetra augue. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</span>
+</div>
+
+<div class="share">
+ <h2>Share this on–</h2>
+ <a href="#">Facebook</a>
+ <a href="#">Twitter</a>
+</div>
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 @@
+<div class="edit menu vvbox">
+ <span class="icon-ios7-photos-outline addMedia" data-info="add media"></span>
+ <span class="icon-arrow-resize" data-info="resize media"></span>
+ <span class="icon-ios7-keypad-outline" data-info="add wallpaper"></span>
+ <span class="icon-ios7-sunny-outline" data-info="light control"></span>
+ <span class="icon-ios7-trash-outline delete-image-toggle" data-info="delete images"></span>
+ <span class="icon-ios7-compose-outline edit-text-toggle" data-info="edit wall text"></span>
+ <span class="icon-key" data-info="room settings"></span>
+</div>
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 @@
+<div class="edit menu edit-video">
+ <span class="icon-volume-mute toggled" data-info="mute"></span>
+ <span class="icon-ios7-compose-outline edit-text-toggle" data-info="edit wall text"></span>
+ <span class="icon-ios7-reload" data-info="loop"></span>
+ <span class="icon-ios7-arrow-forward" data-info="autoplay"></span>
+ <span class="icon-ios7-trash-outline" data-info="delete video"></span>
+</div>
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 @@
+<div class="vvbox wallpaper">
+ <span class="paper1"></span>
+ <span class="paper2"></span>
+ <span class="paper3"></span>
+ <span class="paper4"></span>
+ <span class="paper5"></span>
+ <span class="paper6"></span>
+ <span class="paper7"></span>
+ <span class="paper8"></span>
+</div> \ 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 @@
</head>
<body>
<div class="rapper page">
- <a href="/front.html" class="logo"><img src="assets/img/logo4.svg"></a>
+ <a href="/" class="logo"><img src="/assets/img/logo4.svg"></a>
<div id="form_container">
diff --git a/views/index.ejs b/views/home.ejs
index 155f2ca..155f2ca 100755
--- a/views/index.ejs
+++ b/views/home.ejs
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 @@
<div id="scene"></div>
<div class="rapper">
- <a href="/front.html" class="logo"><img src="assets/img/logo4.svg"></a>
- <a href="#" class="signUp topLink">Sign Up</span></a>
- <a href="#" class="signIn topLink">Sign In</span></a>
- <div class="aboutRoom vvbox">
- <h1>Roomname, <a href="profilelink">Ivan Sidorov</a></h1>
- <h2>Last modified 3/12/14</h2>
- <span>Nulla vitae elit libero, a pharetra augue. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</span>
- </div>
-
- <div class="share">
- <h2>Share this on–</h2>
- <a href="#">Facebook</a>
- <a href="#">Twitter</a>
- </div>
+ <a href="/front.html" class="logo"><img src="/assets/img/logo4.svg"></a>
+
+ [[ include controls/signed-out ]]
</div>
- [[ include partials/signin ]]
+ [[ include partials/sign-in ]]
</body>
[[ include partials/scripts ]]
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 11:50:16 +0000