From e63aebff7a4d978fddd7ed3ddc184ed300843a57 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 27 Sep 2016 23:12:33 +0200 Subject: Adding landing page --- app/assets/images/background-photo.jpeg | Bin 0 -> 1741384 bytes app/assets/images/background-photo.jpg | Bin 1329145 -> 0 bytes app/assets/javascripts/about.coffee | 3 ++ .../javascripts/components/components/button.jsx | 23 +++++++++++- app/assets/stylesheets/about.scss | 41 +++++++++++++++++++++ app/assets/stylesheets/application.scss | 5 ++- app/assets/stylesheets/components.scss | 17 +++++++++ app/controllers/about_controller.rb | 5 +++ app/controllers/home_controller.rb | 4 ++ app/helpers/about_helper.rb | 2 + app/views/about/index.html.haml | 19 ++++++++++ 11 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 app/assets/images/background-photo.jpeg delete mode 100644 app/assets/images/background-photo.jpg create mode 100644 app/assets/javascripts/about.coffee create mode 100644 app/assets/stylesheets/about.scss create mode 100644 app/controllers/about_controller.rb create mode 100644 app/helpers/about_helper.rb create mode 100644 app/views/about/index.html.haml (limited to 'app') diff --git a/app/assets/images/background-photo.jpeg b/app/assets/images/background-photo.jpeg new file mode 100644 index 000000000..8dad97289 Binary files /dev/null and b/app/assets/images/background-photo.jpeg differ diff --git a/app/assets/images/background-photo.jpg b/app/assets/images/background-photo.jpg deleted file mode 100644 index 3f2eeb121..000000000 Binary files a/app/assets/images/background-photo.jpg and /dev/null differ diff --git a/app/assets/javascripts/about.coffee b/app/assets/javascripts/about.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/about.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/components/components/button.jsx b/app/assets/javascripts/components/components/button.jsx index 6f7ace323..fe36d40c5 100644 --- a/app/assets/javascripts/components/components/button.jsx +++ b/app/assets/javascripts/components/components/button.jsx @@ -19,8 +19,29 @@ const Button = React.createClass({ }, render () { + const style = { + fontFamily: 'Roboto', + display: this.props.block ? 'block' : 'inline-block', + width: this.props.block ? '100%' : 'auto', + position: 'relative', + boxSizing: 'border-box', + textAlign: 'center', + border: '10px none', + color: '#fff', + fontSize: '14px', + fontWeight: '500', + letterSpacing: '0', + textTransform: 'uppercase', + padding: '0 16px', + height: '36px', + cursor: 'pointer', + lineHeight: '36px', + borderRadius: '4px', + textDecoration: 'none' + }; + return ( - ); diff --git a/app/assets/stylesheets/about.scss b/app/assets/stylesheets/about.scss new file mode 100644 index 000000000..df52ec184 --- /dev/null +++ b/app/assets/stylesheets/about.scss @@ -0,0 +1,41 @@ +@import url(https://fonts.googleapis.com/css?family=Montserrat); +@import url(https://fonts.googleapis.com/css?family=Judson); + +.about-body { + .wrapper { + width: 600px; + margin: 0 auto; + color: #9baec8; + padding-top: 200px; + } + + h1 { + font: 46px/52px 'Roboto', sans-serif; + font-weight: 600; + margin-bottom: 20px; + color: #2b90d9; + padding: 20px 0; + + img { + margin-bottom: -5px; + margin-right: 5px; + width: 46px; + height: 46px; + } + } + + p { + font: 20px/28px 'Judson', sans-serif; + font-weight: 300; + margin-bottom: 26px; + } + + em { + display: inline-block; + padding: 7px 7px 5px 7px; + background: #9baec8; + color: #282c37; + font: 16px/16px 'Montserrat', sans-serif; + font-weight: 300; + } +} diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 84f15eaca..1bae0b44e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -59,7 +59,7 @@ table { body { font-family: 'Roboto', sans-serif; - background: #282c37 image-url('background-photo.jpg'); + background: #282c37 image-url('background-photo.jpeg'); background-size: cover; background-attachment: fixed; font-size: 13px; @@ -334,4 +334,5 @@ body { @import 'accounts'; @import 'stream_entries'; -@import 'components' +@import 'components'; +@import 'about'; diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss index cf3dc8397..134d34ccb 100644 --- a/app/assets/stylesheets/components.scss +++ b/app/assets/stylesheets/components.scss @@ -1,5 +1,22 @@ .button { background-color: #2b90d9; + font-family: 'Roboto'; + display: inline-block; + position: relative; + box-sizing: border-box; + text-align: center; + border: 10px none; + color: #fff; + font-size: 14px; + font-weight: 500; + letter-spacing: 0; + text-transform: uppercase; + padding: 0 16px; + height: 36px; + cursor: pointer; + line-height: 36px; + border-radius: 4px; + text-decoration: none; &:hover { background-color: #489fde; diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb new file mode 100644 index 000000000..aac648d62 --- /dev/null +++ b/app/controllers/about_controller.rb @@ -0,0 +1,5 @@ +class AboutController < ApplicationController + def index + @body_classes = 'about-body' + end +end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 6b52b704d..974c5f7fd 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -10,6 +10,10 @@ class HomeController < ApplicationController private + def authenticate_user! + redirect_to about_path unless user_signed_in? + end + def find_or_create_access_token Doorkeeper::AccessToken.find_or_create_for(Doorkeeper::Application.where(superapp: true).first, current_user.id, nil, Doorkeeper.configuration.access_token_expires_in, Doorkeeper.configuration.refresh_token_enabled?) end diff --git a/app/helpers/about_helper.rb b/app/helpers/about_helper.rb new file mode 100644 index 000000000..68e69aee1 --- /dev/null +++ b/app/helpers/about_helper.rb @@ -0,0 +1,2 @@ +module AboutHelper +end diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml new file mode 100644 index 000000000..8e014760e --- /dev/null +++ b/app/views/about/index.html.haml @@ -0,0 +1,19 @@ +.wrapper + %h1 + = image_tag 'logo.png' + Mastodon + + %p + Mastodon is a + %em free, open-source + social network server. A + %em decentralized + alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the + %em social network + seamlessly. + %p + %em= Rails.configuration.x.local_domain + is a Mastodon instance. + + .actions + = link_to 'Get started', new_user_session_path, class: 'button' -- cgit