From 878fe73e56ecce5d3966fc6d9dfd66c3b20b0358 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 17 Nov 2014 16:12:23 -0500 Subject: howto --- views/about/howto.ejs | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 views/about/howto.ejs (limited to 'views/about/howto.ejs') diff --git a/views/about/howto.ejs b/views/about/howto.ejs new file mode 100644 index 0000000..a3768e1 --- /dev/null +++ b/views/about/howto.ejs @@ -0,0 +1,88 @@ + + + + vvalls + [[ include ../partials/meta ]] + + +
+ [[ include ../partials/header ]] + + + +
+
+
+
+

How To Use VValls

+ +
+
+
+ + + +

1. Define Your Space.

+ Choose from one of our existing floor plan templates or create your own. + +
+
+ + +
+
+ + + +

2. Add Your Media Files.

+ Upload media files or choose media from our pre-loaded image/video stream. Position media on the walls. + +
+
+ + +
+
+ + + +

3. Customize.

+ Use color or wallpaper features to customize the look of your space. + +
+
+ +
+
+ + + +

4. Collaborate.

+ You can invite others to collaborate on your project. + +
+
+ +
+
+ + + +

5. Publish + Share.

+ Share a link to your creation on social media or embed your 3D space directly into your own web page. When on the go, make sure to show off your project on your phone. + +
+
+ +
+ + + [[ include ../partials/confirm-modal ]] + [[ include ../projects/layouts-modal ]] + [[ include ../partials/sign-in ]] + [[ include ../partials/footer ]] + +
+ +[[ include ../partials/scripts ]] + -- cgit v1.2.3-70-g09d2 From b60a065fc76706a835b1957cfcac8831daa5480c Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 17 Nov 2014 17:00:50 -0500 Subject: howto and button --- public/assets/stylesheets/app.css | 28 +++++++++++++++++++++++++--- views/about/howto.ejs | 2 +- views/home.ejs | 7 ++++--- 3 files changed, 30 insertions(+), 7 deletions(-) (limited to 'views/about/howto.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 65968f2..820c631 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -378,6 +378,18 @@ h5 { background-position:center; } +.projectList.about.howto .item span:nth-child(1){ + width: 300px; + height: 300px; + display: inline-block; + float: left; + border-radius: 0; + background-size:cover; + background-position:center; + border: 1px solid; + box-shadow: 2px 2px black; +} + .projectList.about .item span h3{ font-weight: 500; font-size: 25px; @@ -830,7 +842,7 @@ iframe.embed { margin: 0 auto; line-height: 50px; } -.gopro span a{ +.greenbtn{ width: 100%; display: inline-block; text-align: center; @@ -842,7 +854,14 @@ iframe.embed { -moz-transition:0.2s background; transition:0.2s background; } -.gopro span a:hover{ +.greenbtn.learn { + width: 80%; + clear: both; + font-size: 30px; + font-weight: 300; + margin: 110px 10% 0 10%; +} +.greenbtn:hover{ background:black; } .profilepage .about h2 .btn { @@ -963,7 +982,7 @@ border-left: 1px solid black; } .editing .mx-scenery:hover, .editing .mx-scenery.picked { - border: 2px dashed yellow; + border: 1px dashed black; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; @@ -3041,6 +3060,9 @@ a[data-role="forgot-password"] { .gopro span a{ margin-top: 20px; } + .greenbtn.learn { + display:none; + } } @media screen and (orientation:portrait) { diff --git a/views/about/howto.ejs b/views/about/howto.ejs index a3768e1..2e0f8ed 100644 --- a/views/about/howto.ejs +++ b/views/about/howto.ejs @@ -31,7 +31,7 @@
- +

2. Add Your Media Files.

diff --git a/views/home.ejs b/views/home.ejs index 6d53ca1..28499d7 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -53,8 +53,9 @@
- - + + Learn How To Use VValls +

Room Showcase

@@ -69,7 +70,7 @@ We can help make your content immersive and experiential. We offer white-label licensing of VValls customized to suit the various needs of your project. Customizations include more sophisticated floor plan, video, audio, and interactivity options, as well as automation of room creation. We can also completely integrate a custom version of VValls into your product offering or work with your team to enhance your advertising or marketing campaign. Give your audience a cutting-edge interactive experience with your brand. Please inquire to start a conversation. - Contact + Contact [[ include partials/confirm-modal ]] -- cgit v1.2.3-70-g09d2 From 3164203c0b196edee882e896adbd33fc65e32588 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 18 Nov 2014 12:33:51 -0500 Subject: add keyboard shortcuts to howto --- server/lib/views/index.js | 2 +- views/about/howto.ejs | 54 ++++++++++++++++++++++++++++++++++++++++++++--- views/about/index.ejs | 20 ------------------ views/home.ejs | 2 +- 4 files changed, 53 insertions(+), 25 deletions(-) delete mode 100644 views/about/index.ejs (limited to 'views/about/howto.ejs') diff --git a/server/lib/views/index.js b/server/lib/views/index.js index 8ca2113..145b5ac 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -111,7 +111,7 @@ var views = module.exports = { }, docs: function (req, res){ - var name = req.params.name || "index" + var name = req.params.name || "howto" if (name == "howto") { res.render('about/' + name) diff --git a/views/about/howto.ejs b/views/about/howto.ejs index 2e0f8ed..30497e1 100644 --- a/views/about/howto.ejs +++ b/views/about/howto.ejs @@ -8,8 +8,6 @@
[[ include ../partials/header ]] - -
@@ -73,7 +71,57 @@
- + +

Keyboard Shortcuts

+ +
+
+ + + +

Getting around VValls is easier with the keyboard.

+ + If you play video games, you should be familiar with using WASD to move -- left hand on the keyboard, right hand on the mouse. + We have added a few keys for pivoting and looking up and down. + + +
+ + + + + + + + + + + + +
WMove forward
AStrafe left
SMove backward
DStrafe right
 
QTurn left
ETurn right
 
RLook up
FLook down
+ + + + + + + + + + + +
Cmd-ZUndo
Shift-Cmd-ZRedo
Cmd-\Noclip mode
EscCancel
BackspaceDelete currently selected media
 
MousewheelMove forward/back
Shift-MousewheelTurn left/right
 
SpacebarJump
+ + +
+
diff --git a/views/about/index.ejs b/views/about/index.ejs deleted file mode 100644 index 2517225..0000000 --- a/views/about/index.ejs +++ /dev/null @@ -1,20 +0,0 @@ - - - - vvalls - [[ include ../partials/meta ]] - - -
- [[ include ../partials/header ]] - - - [[ include ../partials/confirm-modal ]] - [[ include ../projects/layouts-modal ]] - [[ include ../partials/sign-in ]] - [[ include ../partials/footer ]] - -
- -[[ include ../partials/scripts ]] - diff --git a/views/home.ejs b/views/home.ejs index cc108ba..8fc248e 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -48,7 +48,7 @@ -

Cutting Edge Presentations

+

Make Cutting Edge Presentations

There's no cooler way than VValls for displaying your images online. Take your pix out of that drab Tumblr theme and present them in the freshest way online! -- cgit v1.2.3-70-g09d2 From cdea8f57f8898b260e70ad327a54e3bf5021c9b3 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 18 Nov 2014 13:09:55 -0500 Subject: styling --- views/about/howto.ejs | 2 +- views/partials/footer.ejs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'views/about/howto.ejs') diff --git a/views/about/howto.ejs b/views/about/howto.ejs index 30497e1..d5aeab7 100644 --- a/views/about/howto.ejs +++ b/views/about/howto.ejs @@ -72,7 +72,7 @@ -

Keyboard Shortcuts

+

Keyboard Shortcuts

diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index 5b0c0e9..75d06e5 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -1,6 +1,6 @@
- Howto + How To Terms Privacy -- cgit v1.2.3-70-g09d2 From 8ab181a8706bf8638522fd0b762a7b53786db275 Mon Sep 17 00:00:00 2001 From: ryderr Date: Fri, 21 Nov 2014 14:31:58 -0500 Subject: new viewport tag --- public/assets/stylesheets/app.css | 2 +- views/about/howto.ejs | 2 +- views/partials/footer.ejs | 2 +- views/partials/meta.ejs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'views/about/howto.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 632d816..5aab111 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1,4 +1,3 @@ -@import url(http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic); *{ margin:0; @@ -3141,6 +3140,7 @@ a[data-role="forgot-password"] { } } + @media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (-webkit-min-device-pixel-ratio: 2) { .hero{ height: 500pt; diff --git a/views/about/howto.ejs b/views/about/howto.ejs index d5aeab7..74009d1 100644 --- a/views/about/howto.ejs +++ b/views/about/howto.ejs @@ -77,7 +77,7 @@
- +

Getting around VValls is easier with the keyboard.

diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index 4005507..7b01162 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -17,7 +17,7 @@ Terms Privacy Contact - +

©2014 Dot Dash 3, Inc. Site by OKFocus diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs index defb187..57453de 100644 --- a/views/partials/meta.ejs +++ b/views/partials/meta.ejs @@ -17,7 +17,7 @@ - + @@ -28,9 +28,9 @@ + - - + -- cgit v1.2.3-70-g09d2 From 9c6f8f8568d20d75eb22955dbf2752ea777e59f8 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 7 Jan 2015 14:34:41 -0500 Subject: stub in brochure page --- public/assets/stylesheets/app.css | 14 +++++++ server/lib/schemas/Plan.js | 6 +++ server/lib/schemas/Subscription.js | 2 +- server/lib/views/index.js | 5 +++ server/lib/views/subscription.js | 1 - views/about/_blank.ejs | 2 +- views/about/about.ejs | 16 +------- views/about/brochure.ejs | 79 ++++++++++++++++++++++++++++++++++++++ views/about/howto.ejs | 2 +- views/builder.ejs | 2 +- views/docs.ejs | 2 +- views/editor.ejs | 2 +- views/home.ejs | 2 +- views/modal.ejs | 2 +- views/profile.ejs | 2 +- views/reader.ejs | 2 +- views/staff/_header.ejs | 2 +- 17 files changed, 116 insertions(+), 27 deletions(-) create mode 100644 views/about/brochure.ejs (limited to 'views/about/howto.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index aecd6be..0463e26 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -673,7 +673,21 @@ iframe.embed { font-weight: 300; } +.aboutintro { + text-align: center; + line-height: 43px; + font-size: 24px; + padding: 5% 0; + font-weight: 300; +} +.aboutintro .inner { + max-width: 800px; + margin: 0 auto; + text-align: center; +} + /* PROFILE PAGE */ + .profilePic { background-size: cover; background-position: center; diff --git a/server/lib/schemas/Plan.js b/server/lib/schemas/Plan.js index 3e74997..1057bb2 100644 --- a/server/lib/schemas/Plan.js +++ b/server/lib/schemas/Plan.js @@ -13,6 +13,12 @@ var PlanSchema = new mongoose.Schema({ monthly_price: { type: Number }, yearly_price: { type: Number }, + basic_layout_monthly_price: { type: Number }, + basic_layout_yearly_price: { type: Number }, + + pro_layout_monthly_price: { type: Number }, + pro_layout_yearly_price: { type: Number }, + basic_layout_limit: { type: Number }, pro_layout_limit: { type: Number }, diff --git a/server/lib/schemas/Subscription.js b/server/lib/schemas/Subscription.js index 8d0b10e..8315009 100644 --- a/server/lib/schemas/Subscription.js +++ b/server/lib/schemas/Subscription.js @@ -15,7 +15,7 @@ var SubscriptionSchema = new mongoose.Schema({ plans: [{ tier: { type: String }, monthly: { type: Boolean }, - }] + }], created_at: { type: Date, default: Date.now }, updated_at: { type: Date, default: Date.now }, diff --git a/server/lib/views/index.js b/server/lib/views/index.js index 3326499..5f9088b 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -111,6 +111,11 @@ var views = module.exports = { res.render('about/' + name) return } + if (name == "brochure") { + // TODO: fetch plans + res.render('about/' + name) + return + } if (name == "about" || name == "index") { res.render('about/' + name) return diff --git a/server/lib/views/subscription.js b/server/lib/views/subscription.js index 77db1a0..ba54bb4 100644 --- a/server/lib/views/subscription.js +++ b/server/lib/views/subscription.js @@ -12,7 +12,6 @@ var subscription = module.exports = { fields: { user: "_id username displayName photo created_at updated_at last_seen created_ip last_ip", - project: "_id name slug user_id privacy created_at updated_at", }, defaults: { diff --git a/views/about/_blank.ejs b/views/about/_blank.ejs index 0e9ea7e..3c23fa7 100644 --- a/views/about/_blank.ejs +++ b/views/about/_blank.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include ../partials/meta ]] diff --git a/views/about/about.ejs b/views/about/about.ejs index dd536be..2aec982 100644 --- a/views/about/about.ejs +++ b/views/about/about.ejs @@ -1,7 +1,7 @@ - vvalls + About VValls [[ include ../partials/meta ]] @@ -50,17 +50,3 @@ [[ include ../partials/scripts ]] - \ No newline at end of file diff --git a/views/about/brochure.ejs b/views/about/brochure.ejs new file mode 100644 index 0000000..00083cf --- /dev/null +++ b/views/about/brochure.ejs @@ -0,0 +1,79 @@ + + + + VValls Subscriptions + [[ include ../partials/meta ]] + + +
+ [[ include ../partials/header ]] + +

Subscriptions

+ +
+
+ Want to get more out of VValls? Consider becoming a subscription user. +
+
+ +
+

[[- plans.free.name ]]

+
    +
  • One exhibition with pre-designed template floor plan +
+
+ +
+

[[- plans.premium.name ]]

+
    +
  • $[[- plans.premium.monthly_price ]]/mo or $[[- plans.premium.yearly_price ]]/year +
  • [[- plans.premium.stock_layout_project_limit ]] exhibitions included with pre-designed template floor plans +
  • Each new basic floor plan costs $[[- plans.premium.basic_layout_monthly_price ]]/mo + or $[[- plans.premium.basic_layout_yearly_price ]]/year, minimum 3 months +
  • Each new basic floor plan can have up to [[- plans.premium.basic_layout_project_limit ]] exhibitions +
  • VValls logo appears when embedding an exhibition on a web page +
+
+ +
+

[[- plans.pro.name ]]

+
    +
  • $[[- plans.pro.monthly_price ]]/mo or $[[- plans.pro.yearly_price ]]/year +
  • Comes with [[- plans.premium.pro_layout_limit ]] pro floor plan and [[- plans.premium.pro_layout_project_limit ]] exhibitions +
  • Each new pro floor plan costs $[[- plans.pro.pro_layout_monthly_price ]]/mo + or $[[- plans.pro.pro_layout_yearly_price ]]/year, minimum 3 months +
  • Each new pro floor plan can have up to [[- plans.pro.pro_layout_project_limit ]] exhibitions +
  • Includes planning for 3D objects in the room +
  • No VValls logo on embed +
+
+ +
+ Buying any extra floor plan unlocks collaboration. Invite an artist or curator to work on the exhibition with you. +
+ +
+ Basic Floor plan: Rectangle-based design of any dimension. +
+ +
+ Pro Floor plan: Trace an arbitrary floorplan. +
+ + +
+

Custom

+ We offer many types of customizations and white-label options for business and educational uses. + Contact us for more information +
+ + + [[ include ../partials/confirm-modal ]] + [[ include ../projects/layouts-modal ]] + [[ include ../partials/sign-in ]] + [[ include ../partials/footer ]] + +
+ +[[ include ../partials/scripts ]] + diff --git a/views/about/howto.ejs b/views/about/howto.ejs index 5278a40..914c3b3 100644 --- a/views/about/howto.ejs +++ b/views/about/howto.ejs @@ -1,7 +1,7 @@ - vvalls + How to Use VValls [[ include ../partials/meta ]] diff --git a/views/builder.ejs b/views/builder.ejs index afb8c66..0ba4238 100644 --- a/views/builder.ejs +++ b/views/builder.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/docs.ejs b/views/docs.ejs index b3ead82..a1f081f 100644 --- a/views/docs.ejs +++ b/views/docs.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/editor.ejs b/views/editor.ejs index 656615c..74e4d6d 100755 --- a/views/editor.ejs +++ b/views/editor.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/home.ejs b/views/home.ejs index 36fc2fc..ffb0976 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/modal.ejs b/views/modal.ejs index 7ca869c..732953d 100644 --- a/views/modal.ejs +++ b/views/modal.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/profile.ejs b/views/profile.ejs index a62652c..88af6b0 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -1,7 +1,7 @@ - vvalls + VValls | [[- profile.displayName ]] [[ include partials/meta ]] diff --git a/views/reader.ejs b/views/reader.ejs index 6c9856a..7035356 100644 --- a/views/reader.ejs +++ b/views/reader.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/staff/_header.ejs b/views/staff/_header.ejs index 3bbf4f1..a73c12e 100644 --- a/views/staff/_header.ejs +++ b/views/staff/_header.ejs @@ -1,7 +1,7 @@ - vvalls | staff + VValls | staff [[ include ../partials/meta ]] -- cgit v1.2.3-70-g09d2