From 42125bd099650152ea9b8f2681e1e9fa842bd40b Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Fri, 6 Oct 2017 21:31:56 +0900 Subject: [PATCH 01/27] Add Social Login Features MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add daemon.js fix facebook login button style github認証用gem追加 omniauthから取得したhashmapの取り扱いを修正 github認証処理を追加 * provider名に応じてusernameを自動生成 * userオブジェクトを取得できれば成功、ログイン * set_flash_messageも実行し、成功した旨のメッセージを設定する。ただしlayoutに設定されていないため表示されない 「ソーシャルログイン」表示にGitHub用ボタンを追加 メールアドレスの重複等によるGithubログイン失敗時のエラー表示を実装 GitHub認証と同様のエラー表示処理をFacebook認証に追加 SNS連携時、アイコンを自動取得する add omniauth-github to Gemfile --- .env.production.sample | 10 +++ Gemfile | 6 ++ Gemfile.lock | 30 ++++++++ .../auth/omniauth_callbacks_controller.rb | 51 ++++++++------ app/javascript/images/elephant-fren.png | Bin 34530 -> 413 bytes app/javascript/styles/application.scss | 1 + app/javascript/styles/mastodon/oauth.scss | 66 ++++++++++++++++++ app/models/user.rb | 20 +++++- app/views/about/_registration.html.haml | 27 +++---- app/views/auth/sessions/new.html.haml | 15 ++-- config/initializers/devise.rb | 3 + .../20170418133143_add_omniauth_to_users.rb | 6 ++ db/schema.rb | 3 + streaming/daemon.js | 2 + 14 files changed, 196 insertions(+), 44 deletions(-) create mode 100644 app/javascript/styles/mastodon/oauth.scss create mode 100644 db/migrate/20170418133143_add_omniauth_to_users.rb create mode 100644 streaming/daemon.js diff --git a/.env.production.sample b/.env.production.sample index ebb0788781d59a..5fb6acb965b1a1 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -229,3 +229,13 @@ STREAMING_CLUSTER_NUM=1 # http_proxy=http://gateway.local:8118 # Access control for hidden service. # ALLOW_ACCESS_TO_HIDDEN_SERVICE=true + +# Facebook +FACEBOOK_APP_ID=xxxxxxxx +FACEBOOK_APP_SECRET=xxxxxxxx +FACEBOOK_CALLBACK_URL=http://example.com/auth/auth/facebook/callback +FACEBOOK_PIXEL_ID=xxxxxxxx + +#GitHub +GITHUB_KEY=xxxxxxx +GITHUB_SECRET=xxxxxxxxxxxxxx diff --git a/Gemfile b/Gemfile index 7a6e1568d28c35..24e8dbf0b5da19 100644 --- a/Gemfile +++ b/Gemfile @@ -92,6 +92,12 @@ gem 'webpush' gem 'json-ld', '~> 2.2' gem 'rdf-normalize', '~> 0.3' +# Added by Kibousoft +gem 'omniauth-github' +gem 'omniauth-facebook' +gem 'react-rails-img' +gem 'json' + group :development, :test do gem 'fabrication', '~> 2.20' gem 'fuubar', '~> 2.2' diff --git a/Gemfile.lock b/Gemfile.lock index e1929a05c83069..117117721a24d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,6 +88,10 @@ GEM aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) aws-sigv4 (1.0.2) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) bcrypt (3.1.12) benchmark-ips (2.7.2) better_errors (2.4.0) @@ -205,6 +209,7 @@ GEM et-orbi (1.1.0) tzinfo excon (0.62.0) + execjs (2.7.0) fabrication (2.20.1) faker (1.8.7) i18n (>= 0.7) @@ -266,6 +271,7 @@ GEM domain_name (~> 0.5) http-form_data (2.1.0) http_accept_language (2.1.1) + httpauth (0.2.1) httplog (1.0.2) colorize (~> 0.8) rack (>= 1.0) @@ -356,6 +362,10 @@ GEM concurrent-ruby (~> 1.0.0) sidekiq (>= 3.5.0) statsd-ruby (~> 1.2.0) + oauth2 (0.6.1) + faraday (~> 0.7) + httpauth (~> 0.1) + multi_json (~> 1.3) oj (3.5.1) omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) @@ -364,6 +374,14 @@ GEM addressable (~> 2.3) nokogiri (~> 1.5) omniauth (~> 1.2) + omniauth-facebook (1.4.0) + omniauth-oauth2 (~> 1.0.2) + omniauth-github (1.0.1) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) + omniauth-oauth2 (1.0.2) + oauth2 (~> 0.6.0) + omniauth (~> 1.0) omniauth-saml (1.10.0) omniauth (~> 1.3, >= 1.3.2) ruby-saml (~> 1.7) @@ -468,6 +486,14 @@ GEM link_header (~> 0.0, >= 0.0.8) rdf-normalize (0.3.3) rdf (>= 2.2, < 4.0) + react-rails (2.4.6) + babel-transpiler (>= 0.7.0) + connection_pool + execjs + railties (>= 3.2) + tilt + react-rails-img (0.1.6) + react-rails redis (4.0.1) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -691,6 +717,7 @@ DEPENDENCIES i18n-tasks (~> 0.9) idn-ruby iso-639 + json json-ld (~> 2.2) kaminari (~> 1.1) letter_opener (~> 1.4) @@ -707,6 +734,8 @@ DEPENDENCIES oj (~> 3.5) omniauth (~> 1.2) omniauth-cas (~> 1.1) + omniauth-facebook + omniauth-github omniauth-saml (~> 1.10) ostatus2 (~> 2.0) ox (~> 2.9) @@ -730,6 +759,7 @@ DEPENDENCIES rails-i18n (~> 5.1) rails-settings-cached (~> 0.6) rdf-normalize (~> 0.3) + react-rails-img redis (~> 4.0) redis-namespace (~> 1.5) redis-rails (~> 5.0) diff --git a/app/controllers/auth/omniauth_callbacks_controller.rb b/app/controllers/auth/omniauth_callbacks_controller.rb index bbf63bed304f9e..6372781cfd1751 100644 --- a/app/controllers/auth/omniauth_callbacks_controller.rb +++ b/app/controllers/auth/omniauth_callbacks_controller.rb @@ -1,33 +1,42 @@ # frozen_string_literal: true class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController - skip_before_action :verify_authenticity_token + def facebook + # You need to implement the method below in your model (e.g. app/models/user.rb) + @user = User.from_omniauth(request.env["omniauth.auth"]) - def self.provides_callback_for(provider) - provider_id = provider.to_s.chomp '_oauth2' - - define_method provider do - @user = User.find_for_oauth(request.env['omniauth.auth'], current_user) + if @user.errors.any? + reason = @user.errors.full_messages.join(' / ') + set_flash_message(:alert, :failure, kind: "Facebook", reason: reason) + redirect_to new_user_session_path and return + end - if @user.persisted? - sign_in_and_redirect @user, event: :authentication - set_flash_message(:notice, :success, kind: provider_id.capitalize) if is_navigational_format? - else - session["devise.#{provider}_data"] = request.env['omniauth.auth'] - redirect_to new_user_registration_url - end + if @user.present? + p "Login Success" + sign_in @user + redirect_to root_path + set_flash_message(:notice, :success, :kind => "Facebook") if is_navigational_format? + else + session["devise.facebook_data"] = request.env["omniauth.auth"] + redirect_to root_path end end - Devise.omniauth_configs.each_key do |provider| - provides_callback_for provider - end + def github + @user = User.from_omniauth(request.env["omniauth.auth"]) - def after_sign_in_path_for(resource) - if resource.email_verified? - root_path - else - finish_signup_path + if @user.present? + sign_in @user + set_flash_message(:notice, :success, :kind => "GitHub") if is_navigational_format? + redirect_to root_path and return end + + failure_reason = if @user.errors.any? @user.errors.full_messages.join(' / '); else nil end + set_flash_message(:notice, :failure, kind: "GitHub", reason: failure_reason) + redirect_to new_user_session_path + end + + def failure + redirect_to root_path end end diff --git a/app/javascript/images/elephant-fren.png b/app/javascript/images/elephant-fren.png index 38b1e3cba5a677da3cc109e3a149112b8d940b5f..40535007c530bed052bf4ea48f4163dfc000f465 100644 GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0y~yVDtjAzi_Yt$-ndRw*V>50*}aI1_o|n5N2eUHAe!d z%HPw)F{EP7+k=LTKqZG3eD%-e^j`pEjsh}5phEg}05Iggm>7dJd%F6$taD0e0szB4 B7}x*+ literal 34530 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 t('simple_form.labels.defaults.username'), :autocomplete => 'off' } - .append - = "@#{site_hostname}" - - = f.input :email, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email'), :autocomplete => 'off' } - = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' } - = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password'), :autocomplete => 'off' } - - .actions - = f.button :button, t('auth.register'), type: :submit, class: 'button button-primary' +.oauth-signup + %h3= t 'auth.register' + %div.login-buttons-box + %ul.login-button-list + %li + = link_to button_tag(t('activerecord.attributes.user.email'), class: "email-login-button"), new_user_registration_path + %li + = link_to button_tag("facebook", class: "facebook-login-button") , user_facebook_omniauth_authorize_path + %li + = link_to button_tag("github", class: "github-login-button") , user_github_omniauth_authorize_path + %p + 認証するだけで、自動で会員登録できます。 + %br + タイムラインに無断で投稿することはありません。 %p.hint.subtle-hint=t('auth.agreement_html', rules_path: about_more_path, terms_path: terms_path) diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml index 0c9f9d5fe8fa9c..812ae8cb876435 100644 --- a/app/views/auth/sessions/new.html.haml +++ b/app/views/auth/sessions/new.html.haml @@ -14,13 +14,12 @@ .actions = f.button :button, t('auth.login'), type: :submit -- if devise_mapping.omniauthable? and resource_class.omniauth_providers.any? - .simple_form.alternative-login - %h4= t('auth.or_log_in_with') - - .actions - - resource_class.omniauth_providers.each do |provider| - = link_to omniauth_authorize_path(resource_name, provider), class: "button button-#{provider}" do - = t("auth.providers.#{provider}", default: provider.to_s.chomp("_oauth2").capitalize) +%div.oauth-signin + %h3= "ソーシャルログイン" + %ul.login-button-list + %li + = link_to button_tag("Log in with facebook", class: "facebook-login-button") , user_facebook_omniauth_authorize_path + %li + = link_to button_tag("Log in with github", class: "github-login-button") , user_github_omniauth_authorize_path .form-footer= render 'auth/shared/links' diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index e0d263f16f6cc1..cbd21f34922e65 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -315,6 +315,9 @@ def valid? # Add a new OmniAuth provider. Check the wiki for more information on setting # up on your models and hooks. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + config.omniauth :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'], + callback_url: ENV['FACEBOOK_CALLBACK_URL'] + config.omniauth :github, ENV['GITHUB_KEY'], ENV['GITHUB_SECRET'], scope: 'user:email' # ==> Warden configuration # If you want to use other strategies, that are not supported by Devise, or diff --git a/db/migrate/20170418133143_add_omniauth_to_users.rb b/db/migrate/20170418133143_add_omniauth_to_users.rb new file mode 100644 index 00000000000000..63c42e443ab896 --- /dev/null +++ b/db/migrate/20170418133143_add_omniauth_to_users.rb @@ -0,0 +1,6 @@ +class AddOmniauthToUsers < ActiveRecord::Migration[5.0] + def change + add_column :users, :provider, :string + add_column :users, :uid, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 02032c54826b47..1b768c451a2004 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -458,6 +458,7 @@ t.bigint "account_id", null: false t.bigint "application_id" t.bigint "in_reply_to_account_id" + t.json "enquete" t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc } t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id" t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id" @@ -529,6 +530,8 @@ t.boolean "otp_required_for_login", default: false, null: false t.datetime "last_emailed_at" t.string "otp_backup_codes", array: true + t.string "provider" + t.string "uid" t.string "filtered_languages", default: [], null: false, array: true t.bigint "account_id", null: false t.boolean "disabled", default: false, null: false diff --git a/streaming/daemon.js b/streaming/daemon.js new file mode 100644 index 00000000000000..2a34d402ab76fc --- /dev/null +++ b/streaming/daemon.js @@ -0,0 +1,2 @@ +require('babel-register'); +require('./index.js'); From d80487eb87cd1336d426de4f1ffbe0bede9753e7 Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Sun, 18 Feb 2018 20:13:38 +0900 Subject: [PATCH 02/27] Add BBCode features --- Gemfile | 1 + Gemfile.lock | 3 + .../mastodon/features/emoji/emoji.js | 7 +- app/javascript/styles/application.scss | 1 + app/javascript/styles/mastodon/bbcode.scss | 102 ++++++++++++++++++ app/lib/formatter.rb | 92 +++++++++++++++- app/lib/sanitize_config.rb | 1 + 7 files changed, 205 insertions(+), 2 deletions(-) create mode 100644 app/javascript/styles/mastodon/bbcode.scss diff --git a/Gemfile b/Gemfile index 24e8dbf0b5da19..e0c5032443cc15 100644 --- a/Gemfile +++ b/Gemfile @@ -93,6 +93,7 @@ gem 'json-ld', '~> 2.2' gem 'rdf-normalize', '~> 0.3' # Added by Kibousoft +gem 'ruby-bbcode' gem 'omniauth-github' gem 'omniauth-facebook' gem 'react-rails-img' diff --git a/Gemfile.lock b/Gemfile.lock index 117117721a24d9..bed454c834f14e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -549,6 +549,8 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) + ruby-bbcode (2.0.2) + activesupport (>= 3.2.3) ruby-progressbar (1.9.0) ruby-saml (1.7.2) nokogiri (>= 1.5.10) @@ -767,6 +769,7 @@ DEPENDENCIES rspec-rails (~> 3.7) rspec-sidekiq (~> 3.0) rubocop (~> 0.55) + ruby-bbcode ruby-progressbar (~> 1.4) sanitize (~> 4.6) scss_lint (~> 0.57) diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js index 0f005dd5040d13..64405511cbdd13 100644 --- a/app/javascript/mastodon/features/emoji/emoji.js +++ b/app/javascript/mastodon/features/emoji/emoji.js @@ -69,7 +69,12 @@ const emojify = (str, customEmojis = {}) => { return rtn + str; }; -export default emojify; +const emojify_bbcode = (str, customEmojis = {}) => [ + { re: / { const emojis = []; diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index 16def729347ab5..e155e3b57c8c7f 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -24,3 +24,4 @@ @import 'mastodon/rtl'; @import 'mastodon/accessibility'; @import 'mastodon/oauth'; +@import 'mastodon/bbcode'; diff --git a/app/javascript/styles/mastodon/bbcode.scss b/app/javascript/styles/mastodon/bbcode.scss new file mode 100644 index 00000000000000..0c5a98cf0bbd0a --- /dev/null +++ b/app/javascript/styles/mastodon/bbcode.scss @@ -0,0 +1,102 @@ +$bbcode1: $classic-highlight-color !default; +$bbcode2: lighten($black, 15%) !default; + +.faicon_FTL { + display: none; +} + +.bbcode { + &__pulse { + animation: pulse 1s ease-in-out infinite; + animation-direction: alternate; + } + + &__spin { + display: inline-block; + -webkit-animation: fa-spin 2s infinite linear; + animation: fa-spin 2s infinite linear; + } + + &__b { + font-family: 'kozuka-gothic-pro', sans-serif; + font-weight: 900; + } + + &__i { + font-family: 'kozuka-gothic-pro', sans-serif; + font-style: italic; + -moz-font-feature-settings: 'ital'; + -webkit-font-feature-settings: 'ital'; + font-feature-settings: 'ital'; + } + + &__flip-horizontal { + display: inline-block; + -webkit-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + transform: scale(-1, 1); + } + + &__flip-vertical { + display: inline-block; + -webkit-transform: scale(1, -1); + -ms-transform: scale(1, -1); + transform: scale(1, -1); + } + + @for $i from 2 through 5 { + &__large-#{$i}x { + font-size: #{$i}em; + + & .emojione { + width: #{18 * $i}px !important; + height: #{18 * $i}px !important; + } + } + } + + /* attr color is not supported!!! + &__color { + color: attr(data-bbcodecolor color); + } + */ + + &__faicon { + display: inline-block !important; + } + + &__quote { + padding: 10px 10px; + border-left: 5px solid $bbcode1; + } + + &__code { + display: block; + padding: 9px; + line-height: 1.42857143; + color: $white; + word-break: break-all; + word-wrap: break-word; + background-color: $bbcode2; + border: 1px solid $bbcode2; + border-radius: 4px; + overflow-x: scroll; + } + + &__u { + text-decoration: underline; + } + + &__s { + text-decoration: line-through; + } +} + +@keyframes pulse { + 0% { + opacity: 1; + } + 100% { + opacity: 0.5; + } +} diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index e1ab05cc0bf769..4d3ec114d3d968 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -24,6 +24,7 @@ def format(status, **options) unless status.local? html = reformat(raw_content) html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify] + html = format_bbcode(html) return html.html_safe # rubocop:disable Rails/OutputSafety end @@ -36,12 +37,14 @@ def format(status, **options) html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify] html = simple_format(html, {}, sanitize: false) html = html.delete("\n") + html = format_bbcode(html) html.html_safe # rubocop:disable Rails/OutputSafety end def reformat(html) - sanitize(html, Sanitize::Config::MASTODON_STRICT) + html = sanitize(html, Sanitize::Config::MASTODON_STRICT) + format_bbcode(html) end def plaintext(status) @@ -84,6 +87,7 @@ def linkify(text) html = encode_and_link_urls(text) html = simple_format(html, {}, sanitize: false) html = html.delete("\n") + html = format_bbcode(html) html.html_safe # rubocop:disable Rails/OutputSafety end @@ -241,4 +245,90 @@ def hashtag_html(tag) def mention_html(account) "@#{account.username}" end + + def format_bbcode(html) + begin + html = html.bbcode_to_html(false, { + :spin => { + :html_open => '', :html_close => '', + :description => 'Make text spin', + :example => 'This is [spin]spin[/spin].'}, + :pulse => { + :html_open => '', :html_close => '', + :description => 'Make text pulse', + :example => 'This is [pulse]pulse[/pulse].'}, + :b => { + :html_open => '', :html_close => '', + :description => 'Make text bold', + :example => 'This is [b]bold[/b].'}, + :i => { + :html_open => '', :html_close => '', + :description => 'Make text italic', + :example => 'This is [i]italic[/i].'}, + :flip => { + :html_open => '', :html_close => '', + :description => 'Flip text', + :example => '[flip=horizontal]This is flip[/flip]', + :allow_quick_param => true, :allow_between_as_param => false, + :quick_param_format => /(horizontal|vertical)/, + :quick_param_format_description => 'The size parameter \'%param%\' is incorrect, a number is expected', + :param_tokens => [{:token => :direction}]}, + :large => { + :html_open => '', :html_close => '', + :description => 'Large text', + :example => '[large=2x]Large text[/large]', + :allow_quick_param => true, :allow_between_as_param => false, + :quick_param_format => /(2x|3x|4x|5x)/, + :quick_param_format_description => 'The size parameter \'%param%\' is incorrect, a number is expected', + :param_tokens => [{:token => :size}]}, + :size => { + :html_open => '', :html_close => '', + :description => 'Change the size of the text', + :example => '[size=32]This is 32px[/size]', + :allow_quick_param => true, :allow_between_as_param => false, + :quick_param_format => /(\d+)/, + :quick_param_format_description => 'The size parameter \'%param%\' is incorrect, a number is expected', + :param_tokens => [{:token => :size}]}, + :color => { + :html_open => '', :html_close => '', + :description => 'Use color', + :example => '[color=red]This is red[/color]', + :allow_quick_param => true, :allow_between_as_param => false, + :quick_param_format => /([a-z]+)/i, + :param_tokens => [{:token => :color}]}, + :colorhex => { + :html_open => '', :html_close => '', + :description => 'Use color code', + :example => '[colorhex=ffffff]White text[/colorhex]', + :allow_quick_param => true, :allow_between_as_param => false, + :quick_param_format => /([0-9a-fA-F]{6})/, + :quick_param_format_description => 'The size parameter \'%param%\' is incorrect', + :param_tokens => [{:token => :colorcode}]}, + :faicon => { + :html_open => '%between%', :html_close => '', + :description => 'Use Font Awesome Icons', + :example => '[faicon]users[/faicon]', + :only_allow => [], + :require_between => true}, + :quote => { + :html_open => '
', :html_close => '
', + :description => 'Quote', + :example => 'This is [quote]quote[/quote].'}, + :code => { + :html_open => '
', :html_close => '
', + :description => 'Code', + :example => 'This is [code]Code[/code].'}, + :u => { + :html_open => '', :html_close => '', + :description => 'Under line', + :example => 'This is [u]Under line[/u].'}, + :s => { + :html_open => '', :html_close => '', + :description => 'line through', + :example => 'This is [s]line through[/s].'}, + }, :enable, :i, :b, :color, :quote, :code, :size, :u, :s, :spin, :pulse, :flip, :large, :colorhex, :faicon) + rescue Exception => e + end + html + end end diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb index c2b4669245af23..89d2e2fae6a33b 100644 --- a/app/lib/sanitize_config.rb +++ b/app/lib/sanitize_config.rb @@ -14,6 +14,7 @@ module Config next true if e =~ /^(h|p|u|dt|e)-/ # microformats classes next true if e =~ /^(mention|hashtag)$/ # semantic classes next true if e =~ /^(ellipsis|invisible)$/ # link formatting classes + next true if e =~ /^bbcode__([a-z2-5\-]+)$/ # bbcode end node['class'] = class_list.join(' ') From b028ec3dc45c65714ed0cbe81d1c09aff82ae7fb Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Sun, 18 Feb 2018 20:22:01 +0900 Subject: [PATCH 03/27] Allow 4096 characters --- .../mastodon/features/compose/components/compose_form.js | 6 +++--- app/validators/status_length_validator.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 6eb01123e46da9..88095d54d9ef4a 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -80,7 +80,7 @@ export default class ComposeForm extends ImmutablePureComponent { const { is_submitting, is_uploading, anyMedia } = this.props; const fulltext = [this.props.spoiler_text, countableText(this.props.text)].join(''); - if (is_submitting || is_uploading || length(fulltext) > 500 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) { + if (is_submitting || is_uploading || length(fulltext) > 4096 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) { return; } @@ -156,7 +156,7 @@ export default class ComposeForm extends ImmutablePureComponent { const { intl, onPaste, showSearch, anyMedia } = this.props; const disabled = this.props.is_submitting; const text = [this.props.spoiler_text, countableText(this.props.text)].join(''); - const disabledButton = disabled || this.props.is_uploading || length(text) > 500 || (text.length !== 0 && text.trim().length === 0 && !anyMedia); + const disabledButton = disabled || this.props.is_uploading || length(text) > 4096 || (text.length !== 0 && text.trim().length === 0 && !anyMedia); let publishText = ''; if (this.props.privacy === 'private' || this.props.privacy === 'direct') { @@ -208,7 +208,7 @@ export default class ComposeForm extends ImmutablePureComponent { -
+
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb index ed5563f64f1d1b..5ed97de25a5a7b 100644 --- a/app/validators/status_length_validator.rb +++ b/app/validators/status_length_validator.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class StatusLengthValidator < ActiveModel::Validator - MAX_CHARS = 500 + MAX_CHARS = 4096 def validate(status) return unless status.local? && !status.reblog? From 1f6427b549d468107584aa5eba67ceb07781391c Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Sun, 18 Feb 2018 20:24:23 +0900 Subject: [PATCH 04/27] Change github urls --- app/javascript/mastodon/features/getting_started/index.js | 2 +- .../mastodon/features/ui/components/onboarding_modal.js | 2 +- spec/views/about/show.html.haml_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 99642c911578b6..e5c78f4bc8523d 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -149,7 +149,7 @@ export default class GettingStarted extends ImmutablePureComponent { tootsuite/mastodon }} + values={{ github: kibousoft/mastodon }} />

diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js index 9b713cf9ee5951..cecb2b5e57cf58 100644 --- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js +++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js @@ -159,7 +159,7 @@ const PageSix = ({ admin, domain }) => {

{adminSection} -

GitHub }} />

+

GitHub }} />

}} />

diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb index cbe5aa93b68923..540cab4509c52b 100644 --- a/spec/views/about/show.html.haml_spec.rb +++ b/spec/views/about/show.html.haml_spec.rb @@ -13,7 +13,7 @@ site_title: 'something', site_description: 'something', version_number: '1.0', - source_url: 'https://github.com/tootsuite/mastodon', + source_url: 'https://github.com/kibousoft/mastodon', open_registrations: false, thumbnail: nil, hero: nil, From 62c344da4ccbba870d924c70abf961e27be076a5 Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Sun, 18 Feb 2018 21:48:21 +0900 Subject: [PATCH 05/27] rm failed migrates --- ...604144747_add_foreign_keys_for_accounts.rb | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 db/migrate/20170604144747_add_foreign_keys_for_accounts.rb diff --git a/db/migrate/20170604144747_add_foreign_keys_for_accounts.rb b/db/migrate/20170604144747_add_foreign_keys_for_accounts.rb deleted file mode 100644 index 76a836ca08d17d..00000000000000 --- a/db/migrate/20170604144747_add_foreign_keys_for_accounts.rb +++ /dev/null @@ -1,41 +0,0 @@ -class AddForeignKeysForAccounts < ActiveRecord::Migration[5.1] - def change - add_foreign_key :statuses, :accounts, on_delete: :cascade - add_foreign_key :statuses, :accounts, column: :in_reply_to_account_id, on_delete: :nullify - add_foreign_key :statuses, :statuses, column: :in_reply_to_id, on_delete: :nullify - add_foreign_key :account_domain_blocks, :accounts, on_delete: :cascade - add_foreign_key :conversation_mutes, :accounts, on_delete: :cascade - add_foreign_key :conversation_mutes, :conversations, on_delete: :cascade - add_foreign_key :favourites, :accounts, on_delete: :cascade - add_foreign_key :favourites, :statuses, on_delete: :cascade - add_foreign_key :blocks, :accounts, on_delete: :cascade - add_foreign_key :blocks, :accounts, column: :target_account_id, on_delete: :cascade - add_foreign_key :follow_requests, :accounts, on_delete: :cascade - add_foreign_key :follow_requests, :accounts, column: :target_account_id, on_delete: :cascade - add_foreign_key :follows, :accounts, on_delete: :cascade - add_foreign_key :follows, :accounts, column: :target_account_id, on_delete: :cascade - add_foreign_key :mutes, :accounts, on_delete: :cascade - add_foreign_key :mutes, :accounts, column: :target_account_id, on_delete: :cascade - add_foreign_key :imports, :accounts, on_delete: :cascade - add_foreign_key :media_attachments, :accounts, on_delete: :nullify - add_foreign_key :media_attachments, :statuses, on_delete: :nullify - add_foreign_key :mentions, :accounts, on_delete: :cascade - add_foreign_key :mentions, :statuses, on_delete: :cascade - add_foreign_key :notifications, :accounts, on_delete: :cascade - add_foreign_key :notifications, :accounts, column: :from_account_id, on_delete: :cascade - add_foreign_key :preview_cards, :statuses, on_delete: :cascade - add_foreign_key :reports, :accounts, on_delete: :cascade - add_foreign_key :reports, :accounts, column: :target_account_id, on_delete: :cascade - add_foreign_key :reports, :accounts, column: :action_taken_by_account_id, on_delete: :nullify - add_foreign_key :statuses_tags, :statuses, on_delete: :cascade - add_foreign_key :statuses_tags, :tags, on_delete: :cascade - add_foreign_key :stream_entries, :accounts, on_delete: :cascade - add_foreign_key :subscriptions, :accounts, on_delete: :cascade - add_foreign_key :users, :accounts, on_delete: :cascade - add_foreign_key :web_settings, :users, on_delete: :cascade - add_foreign_key :oauth_access_grants, :users, column: :resource_owner_id, on_delete: :cascade - add_foreign_key :oauth_access_grants, :oauth_applications, column: :application_id, on_delete: :cascade - add_foreign_key :oauth_access_tokens, :users, column: :resource_owner_id, on_delete: :cascade - add_foreign_key :oauth_access_tokens, :oauth_applications, column: :application_id, on_delete: :cascade - end -end From 988cb5a9948c0e4cc458b36aadcac6d5704e3c79 Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Sun, 18 Feb 2018 22:09:04 +0900 Subject: [PATCH 06/27] add omniauth methods --- app/models/user.rb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 7b0a35b8b72f71..379f3c83fd7a07 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -346,6 +346,35 @@ def needs_feed_update? last_sign_in_at < ACTIVE_DURATION.ago end + def self.from_omniauth(auth) + uid = auth['uid'] + provider = auth['provider'] + email = auth['info']['email'] || '' + avator_url = auth['info']['image'] || '' + + username = omniauth_username provider, uid + display_name = auth['info']['name'] || auth['info']['nickname'] || username + + user = find_or_create_by(provider: provider, uid: uid) do |user| + password = Devise.friendly_token[0,20] + user.email = email + user.password = password + user.password_confirmation = password + user.skip_confirmation! + user.create_account(username: username, display_name: display_name) + user.account.avatar_remote_url = avator_url if avator_url + end + user + end + + def self.new_with_session(params, session) + super.tap do |user| + if data = session["devise.facebook_data"] && session["devise.facebook_data"]["extra"]["raw_info"] + user.email = data["email"] if user.email.blank? + end + end + end + private_class_method def self.omniauth_username(provider, uid) From 16e74aab416a6a2f35fcccded6bec73f33b3ccb9 Mon Sep 17 00:00:00 2001 From: imbsky Date: Sat, 31 Mar 2018 19:32:25 +0900 Subject: [PATCH 07/27] Fix bbcode (#28) --- .../mastodon/features/emoji/emoji.js | 7 +- app/javascript/styles/mastodon/bbcode.scss | 78 +++++-------------- app/lib/formatter.rb | 39 +--------- app/lib/sanitize_config.rb | 6 +- 4 files changed, 31 insertions(+), 99 deletions(-) diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js index 64405511cbdd13..0f005dd5040d13 100644 --- a/app/javascript/mastodon/features/emoji/emoji.js +++ b/app/javascript/mastodon/features/emoji/emoji.js @@ -69,12 +69,7 @@ const emojify = (str, customEmojis = {}) => { return rtn + str; }; -const emojify_bbcode = (str, customEmojis = {}) => [ - { re: / { const emojis = []; diff --git a/app/javascript/styles/mastodon/bbcode.scss b/app/javascript/styles/mastodon/bbcode.scss index 0c5a98cf0bbd0a..aa6a9332d1e8da 100644 --- a/app/javascript/styles/mastodon/bbcode.scss +++ b/app/javascript/styles/mastodon/bbcode.scss @@ -29,67 +29,31 @@ $bbcode2: lighten($black, 15%) !default; -webkit-font-feature-settings: 'ital'; font-feature-settings: 'ital'; } +} - &__flip-horizontal { - display: inline-block; - -webkit-transform: scale(-1, 1); - -ms-transform: scale(-1, 1); - transform: scale(-1, 1); - } - - &__flip-vertical { - display: inline-block; - -webkit-transform: scale(1, -1); - -ms-transform: scale(1, -1); - transform: scale(1, -1); - } - - @for $i from 2 through 5 { - &__large-#{$i}x { - font-size: #{$i}em; - - & .emojione { - width: #{18 * $i}px !important; - height: #{18 * $i}px !important; - } - } - } - - /* attr color is not supported!!! - &__color { - color: attr(data-bbcodecolor color); - } - */ - - &__faicon { - display: inline-block !important; - } - - &__quote { - padding: 10px 10px; - border-left: 5px solid $bbcode1; - } - - &__code { - display: block; - padding: 9px; - line-height: 1.42857143; - color: $white; - word-break: break-all; - word-wrap: break-word; - background-color: $bbcode2; - border: 1px solid $bbcode2; - border-radius: 4px; - overflow-x: scroll; +@for $i from 2 through 5 { + .fa-#{$i}x .emojione { + width: #{18 * $i}px !important; + height: #{18 * $i}px !important; } +} - &__u { - text-decoration: underline; - } +div.quote { + padding: 10px 10px; + border-left: 5px solid $bbcode1; +} - &__s { - text-decoration: line-through; - } +pre { + display: block; + padding: 9px; + line-height: 1.42857143; + color: $white; + word-break: break-all; + word-wrap: break-word; + background-color: $bbcode2; + border: 1px solid $bbcode2; + border-radius: 4px; + overflow-x: scroll; } @keyframes pulse { diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 4d3ec114d3d968..f9af1f93865174 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -266,7 +266,7 @@ def format_bbcode(html) :description => 'Make text italic', :example => 'This is [i]italic[/i].'}, :flip => { - :html_open => '', :html_close => '', + :html_open => '', :html_close => '', :description => 'Flip text', :example => '[flip=horizontal]This is flip[/flip]', :allow_quick_param => true, :allow_between_as_param => false, @@ -274,30 +274,15 @@ def format_bbcode(html) :quick_param_format_description => 'The size parameter \'%param%\' is incorrect, a number is expected', :param_tokens => [{:token => :direction}]}, :large => { - :html_open => '', :html_close => '', + :html_open => '', :html_close => '', :description => 'Large text', :example => '[large=2x]Large text[/large]', :allow_quick_param => true, :allow_between_as_param => false, :quick_param_format => /(2x|3x|4x|5x)/, :quick_param_format_description => 'The size parameter \'%param%\' is incorrect, a number is expected', :param_tokens => [{:token => :size}]}, - :size => { - :html_open => '', :html_close => '', - :description => 'Change the size of the text', - :example => '[size=32]This is 32px[/size]', - :allow_quick_param => true, :allow_between_as_param => false, - :quick_param_format => /(\d+)/, - :quick_param_format_description => 'The size parameter \'%param%\' is incorrect, a number is expected', - :param_tokens => [{:token => :size}]}, - :color => { - :html_open => '', :html_close => '', - :description => 'Use color', - :example => '[color=red]This is red[/color]', - :allow_quick_param => true, :allow_between_as_param => false, - :quick_param_format => /([a-z]+)/i, - :param_tokens => [{:token => :color}]}, :colorhex => { - :html_open => '', :html_close => '', + :html_open => '', :html_close => '', :description => 'Use color code', :example => '[colorhex=ffffff]White text[/colorhex]', :allow_quick_param => true, :allow_between_as_param => false, @@ -305,27 +290,11 @@ def format_bbcode(html) :quick_param_format_description => 'The size parameter \'%param%\' is incorrect', :param_tokens => [{:token => :colorcode}]}, :faicon => { - :html_open => '%between%', :html_close => '', + :html_open => '%between%', :html_close => '', :description => 'Use Font Awesome Icons', :example => '[faicon]users[/faicon]', :only_allow => [], :require_between => true}, - :quote => { - :html_open => '
', :html_close => '
', - :description => 'Quote', - :example => 'This is [quote]quote[/quote].'}, - :code => { - :html_open => '
', :html_close => '
', - :description => 'Code', - :example => 'This is [code]Code[/code].'}, - :u => { - :html_open => '', :html_close => '', - :description => 'Under line', - :example => 'This is [u]Under line[/u].'}, - :s => { - :html_open => '', :html_close => '', - :description => 'line through', - :example => 'This is [s]line through[/s].'}, }, :enable, :i, :b, :color, :quote, :code, :size, :u, :s, :spin, :pulse, :flip, :large, :colorhex, :faicon) rescue Exception => e end diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb index 89d2e2fae6a33b..0268527ecfd7ad 100644 --- a/app/lib/sanitize_config.rb +++ b/app/lib/sanitize_config.rb @@ -14,7 +14,11 @@ module Config next true if e =~ /^(h|p|u|dt|e)-/ # microformats classes next true if e =~ /^(mention|hashtag)$/ # semantic classes next true if e =~ /^(ellipsis|invisible)$/ # link formatting classes - next true if e =~ /^bbcode__([a-z2-5\-]+)$/ # bbcode + next true if e =~ /^fa$/ # font awesome + next true if e =~ /^fa-flip-(horizontal|vertical)$/ # font awesome + next true if e =~ /^fa-(2x|3x|4x|5x)$/ # font awesome + next true if e =~ /^bbcode__(spin|pulse|b|i)$/ # bbcode + next true if e =~ /^faicon_FTL$/ # bbcode end node['class'] = class_list.join(' ') From 51bd7733f39322ab89ff86240b24c0f6c60332c6 Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 17:05:17 +0900 Subject: [PATCH 08/27] Add ICO Models --- app/models/ico_event.rb | 16 +++++++++++ app/models/ico_request.rb | 17 +++++++++++ app/models/ico_token.rb | 13 +++++++++ app/models/status.rb | 1 + app/models/user.rb | 2 ++ .../20180514075904_create_ico_tokens.rb | 10 +++++++ .../20180514080029_create_ico_events.rb | 13 +++++++++ .../20180514080302_create_ico_requests.rb | 14 ++++++++++ db/schema.rb | 28 +++++++++++++++++++ spec/fabricators/ico_event_fabricator.rb | 6 ++++ spec/fabricators/ico_request_fabricator.rb | 8 ++++++ spec/fabricators/ico_token_fabricator.rb | 4 +++ spec/models/ico_event_spec.rb | 5 ++++ spec/models/ico_request_spec.rb | 5 ++++ spec/models/ico_token_spec.rb | 5 ++++ 15 files changed, 147 insertions(+) create mode 100644 app/models/ico_event.rb create mode 100644 app/models/ico_request.rb create mode 100644 app/models/ico_token.rb create mode 100644 db/migrate/20180514075904_create_ico_tokens.rb create mode 100644 db/migrate/20180514080029_create_ico_events.rb create mode 100644 db/migrate/20180514080302_create_ico_requests.rb create mode 100644 spec/fabricators/ico_event_fabricator.rb create mode 100644 spec/fabricators/ico_request_fabricator.rb create mode 100644 spec/fabricators/ico_token_fabricator.rb create mode 100644 spec/models/ico_event_spec.rb create mode 100644 spec/models/ico_request_spec.rb create mode 100644 spec/models/ico_token_spec.rb diff --git a/app/models/ico_event.rb b/app/models/ico_event.rb new file mode 100644 index 00000000000000..e44e531a5ed676 --- /dev/null +++ b/app/models/ico_event.rb @@ -0,0 +1,16 @@ +# == Schema Information +# +# Table name: ico_events +# +# id :bigint(8) not null, primary key +# ico_token_id :integer +# begin_at :datetime +# end_at :datetime +# sale_limit :float +# name :string +# created_at :datetime not null +# updated_at :datetime not null +# + +class IcoEvent < ApplicationRecord +end diff --git a/app/models/ico_request.rb b/app/models/ico_request.rb new file mode 100644 index 00000000000000..cb1f3e412eaab7 --- /dev/null +++ b/app/models/ico_request.rb @@ -0,0 +1,17 @@ +# == Schema Information +# +# Table name: ico_requests +# +# id :bigint(8) not null, primary key +# user_id :integer +# ico_event_id :integer +# amount :float +# email :string +# eth_wallet_address :string +# token_wallet_address :string +# created_at :datetime not null +# updated_at :datetime not null +# + +class IcoRequest < ApplicationRecord +end diff --git a/app/models/ico_token.rb b/app/models/ico_token.rb new file mode 100644 index 00000000000000..177ab1a2cbdd61 --- /dev/null +++ b/app/models/ico_token.rb @@ -0,0 +1,13 @@ +# == Schema Information +# +# Table name: ico_tokens +# +# id :bigint(8) not null, primary key +# name :string +# url :string +# created_at :datetime not null +# updated_at :datetime not null +# + +class IcoToken < ApplicationRecord +end diff --git a/app/models/status.rb b/app/models/status.rb index e7dd0df29e0d66..0bb48e9bdf0226 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -23,6 +23,7 @@ # account_id :bigint(8) not null # application_id :bigint(8) # in_reply_to_account_id :bigint(8) +# enquete :json # class Status < ApplicationRecord diff --git a/app/models/user.rb b/app/models/user.rb index 379f3c83fd7a07..bd612bedf8bfff 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -29,6 +29,8 @@ # otp_required_for_login :boolean default(FALSE), not null # last_emailed_at :datetime # otp_backup_codes :string is an Array +# provider :string +# uid :string # filtered_languages :string default([]), not null, is an Array # account_id :bigint(8) not null # disabled :boolean default(FALSE), not null diff --git a/db/migrate/20180514075904_create_ico_tokens.rb b/db/migrate/20180514075904_create_ico_tokens.rb new file mode 100644 index 00000000000000..33923b8b384ce4 --- /dev/null +++ b/db/migrate/20180514075904_create_ico_tokens.rb @@ -0,0 +1,10 @@ +class CreateIcoTokens < ActiveRecord::Migration[5.1] + def change + create_table :ico_tokens do |t| + t.string :name + t.string :url + + t.timestamps + end + end +end diff --git a/db/migrate/20180514080029_create_ico_events.rb b/db/migrate/20180514080029_create_ico_events.rb new file mode 100644 index 00000000000000..fbbce621e5cee2 --- /dev/null +++ b/db/migrate/20180514080029_create_ico_events.rb @@ -0,0 +1,13 @@ +class CreateIcoEvents < ActiveRecord::Migration[5.1] + def change + create_table :ico_events do |t| + t.integer :ico_token_id + t.datetime :begin_at + t.datetime :end_at + t.float :sale_limit + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20180514080302_create_ico_requests.rb b/db/migrate/20180514080302_create_ico_requests.rb new file mode 100644 index 00000000000000..564dd8ce13fe0e --- /dev/null +++ b/db/migrate/20180514080302_create_ico_requests.rb @@ -0,0 +1,14 @@ +class CreateIcoRequests < ActiveRecord::Migration[5.1] + def change + create_table :ico_requests do |t| + t.integer :user_id + t.integer :ico_event_id + t.float :amount + t.string :email + t.string :eth_wallet_address + t.string :token_wallet_address + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 1b768c451a2004..0dc6771cc296c6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -201,6 +201,34 @@ t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true end + create_table "ico_events", force: :cascade do |t| + t.integer "ico_token_id" + t.datetime "begin_at" + t.datetime "end_at" + t.float "sale_limit" + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "ico_requests", force: :cascade do |t| + t.integer "user_id" + t.integer "ico_event_id" + t.float "amount" + t.string "email" + t.string "eth_wallet_address" + t.string "token_wallet_address" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "ico_tokens", force: :cascade do |t| + t.string "name" + t.string "url" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "identities", id: :serial, force: :cascade do |t| t.integer "user_id" t.string "provider", default: "", null: false diff --git a/spec/fabricators/ico_event_fabricator.rb b/spec/fabricators/ico_event_fabricator.rb new file mode 100644 index 00000000000000..9197518a4d5980 --- /dev/null +++ b/spec/fabricators/ico_event_fabricator.rb @@ -0,0 +1,6 @@ +Fabricator(:ico_event) do + ico_token_id 1 + begin_at "2018-05-14 17:00:29" + end_at "2018-05-14 17:00:29" + name "MyString" +end diff --git a/spec/fabricators/ico_request_fabricator.rb b/spec/fabricators/ico_request_fabricator.rb new file mode 100644 index 00000000000000..6fc89eade14b8e --- /dev/null +++ b/spec/fabricators/ico_request_fabricator.rb @@ -0,0 +1,8 @@ +Fabricator(:ico_request) do + user_id 1 + ico_event_id 1 + amount 1.5 + email "MyString" + eth_wallet_address "MyString" + token_wallet_address "MyString" +end diff --git a/spec/fabricators/ico_token_fabricator.rb b/spec/fabricators/ico_token_fabricator.rb new file mode 100644 index 00000000000000..748b1afde30ef2 --- /dev/null +++ b/spec/fabricators/ico_token_fabricator.rb @@ -0,0 +1,4 @@ +Fabricator(:ico_token) do + name "MyString" + url "MyString" +end diff --git a/spec/models/ico_event_spec.rb b/spec/models/ico_event_spec.rb new file mode 100644 index 00000000000000..ee1b039161c46a --- /dev/null +++ b/spec/models/ico_event_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe IcoEvent, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/ico_request_spec.rb b/spec/models/ico_request_spec.rb new file mode 100644 index 00000000000000..953ddc68e5c031 --- /dev/null +++ b/spec/models/ico_request_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe IcoRequest, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/ico_token_spec.rb b/spec/models/ico_token_spec.rb new file mode 100644 index 00000000000000..bbe7af801f01c9 --- /dev/null +++ b/spec/models/ico_token_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe IcoToken, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From a7fb0d1ab8638527c3ef9f0fd6cfd5c31f8a3f36 Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 17:15:43 +0900 Subject: [PATCH 09/27] Add bootstrap --- Gemfile | 3 +++ Gemfile.lock | 25 +++++++++++++++++++ app/assets/javascripts/application.js | 10 ++++++++ app/assets/javascripts/bootstrap.js | 4 +++ app/assets/stylesheets/application.css | 7 ++++++ .../stylesheets/bootstrap_and_overrides.css | 6 +++++ config/locales/en.bootstrap.yml | 23 +++++++++++++++++ 7 files changed, 78 insertions(+) create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/bootstrap.js create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/assets/stylesheets/bootstrap_and_overrides.css create mode 100644 config/locales/en.bootstrap.yml diff --git a/Gemfile b/Gemfile index e0c5032443cc15..97fe017060fcdf 100644 --- a/Gemfile +++ b/Gemfile @@ -98,6 +98,9 @@ gem 'omniauth-github' gem 'omniauth-facebook' gem 'react-rails-img' gem 'json' +gem 'twitter-bootstrap-rails' +gem 'therubyracer' +gem 'jquery-rails' group :development, :test do gem 'fabrication', '~> 2.20' diff --git a/Gemfile.lock b/Gemfile.lock index bed454c834f14e..fb87feb058c430 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -150,6 +150,7 @@ GEM climate_control (>= 0.0.3, < 1.0) coderay (1.1.2) colorize (0.8.1) + commonjs (0.2.7) concurrent-ruby (1.0.5) connection_pool (2.2.1) crack (0.4.3) @@ -291,6 +292,10 @@ GEM ipaddress (0.8.3) iso-639 (0.2.8) jmespath (1.4.0) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) json (2.1.0) json-ld (2.2.1) multi_json (~> 1.12) @@ -311,12 +316,20 @@ GEM kaminari-core (1.1.1) launchy (2.4.3) addressable (~> 2.3) + less (2.6.0) + commonjs (~> 0.2.7) + less-rails (2.8.0) + actionpack (>= 4.0) + less (~> 2.6.0) + sprockets (> 2, < 4) + tilt letter_opener (1.6.0) launchy (~> 2.2) letter_opener_web (1.3.4) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) + libv8 (3.16.14.19) link_header (0.0.8) lograge (0.10.0) actionpack (>= 4) @@ -513,6 +526,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.5.0) redis (>= 2.2, < 5) + ref (2.0.0) request_store (1.4.1) rack (>= 1.4) responders (2.4.0) @@ -617,6 +631,9 @@ GEM unicode-display_width (~> 1.1, >= 1.1.1) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) + ref thor (0.20.0) thread (0.2.2) thread_safe (0.3.6) @@ -638,6 +655,11 @@ GEM tty-screen (~> 0.6.4) wisper (~> 2.0.0) tty-screen (0.6.4) + twitter-bootstrap-rails (4.0.0) + actionpack (~> 5.0, >= 5.0.1) + execjs (~> 2.7) + less-rails (~> 2.8, >= 2.8.0) + railties (~> 5.0, >= 5.0.1) twitter-text (1.14.7) unf (~> 0.1.0) tzinfo (1.2.5) @@ -719,6 +741,7 @@ DEPENDENCIES i18n-tasks (~> 0.9) idn-ruby iso-639 + jquery-rails json json-ld (~> 2.2) kaminari (~> 1.1) @@ -785,8 +808,10 @@ DEPENDENCIES stoplight (~> 2.1.3) streamio-ffmpeg (~> 3.0) strong_migrations (~> 0.2) + therubyracer tty-command (~> 0.8) tty-prompt (~> 0.16) + twitter-bootstrap-rails twitter-text (~> 1.14) tzinfo-data (~> 1.2018) webmock (~> 3.3) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 00000000000000..1732ea338140ad --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,10 @@ +// This is a manifest file that'll be compiled into including all the files listed below. +// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically +// be included in the compiled file accessible from http://example.com/assets/application.js +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// the compiled file. +// +//= require jquery +//= require jquery_ujs +//= require twitter/bootstrap +//= require_tree . diff --git a/app/assets/javascripts/bootstrap.js b/app/assets/javascripts/bootstrap.js new file mode 100644 index 00000000000000..1c4a1f79411baf --- /dev/null +++ b/app/assets/javascripts/bootstrap.js @@ -0,0 +1,4 @@ +jQuery(function() { + $("a[rel~=popover], .has-popover").popover(); + $("a[rel~=tooltip], .has-tooltip").tooltip(); +}); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 00000000000000..db803ee40a4ba6 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,7 @@ +/* + * This is a manifest file that'll automatically include all the stylesheets available in this directory + * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at + * the top of the compiled file, but it's generally better to create a new file per style scope. + *= require_self + *= require_tree . +*/ diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css b/app/assets/stylesheets/bootstrap_and_overrides.css new file mode 100644 index 00000000000000..5b887c7b5eace2 --- /dev/null +++ b/app/assets/stylesheets/bootstrap_and_overrides.css @@ -0,0 +1,6 @@ +/* + =require twitter-bootstrap-static/bootstrap + + Static version of css will use Glyphicons sprites by default + =require twitter-bootstrap-static/sprites +*/ \ No newline at end of file diff --git a/config/locales/en.bootstrap.yml b/config/locales/en.bootstrap.yml new file mode 100644 index 00000000000000..8d7511904c1655 --- /dev/null +++ b/config/locales/en.bootstrap.yml @@ -0,0 +1,23 @@ +# Sample localization file for English. Add more files in this directory for other locales. +# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. + +en: + breadcrumbs: + application: + root: "Index" + pages: + pages: "Pages" + helpers: + actions: "Actions" + links: + back: "Back" + cancel: "Cancel" + confirm: "Are you sure?" + destroy: "Delete" + new: "New" + edit: "Edit" + titles: + edit: "Edit %{model}" + save: "Save %{model}" + new: "New %{model}" + delete: "Delete %{model}" From fd939b8537765e484b858b9a523d3c5b04619064 Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 17:33:50 +0900 Subject: [PATCH 10/27] Add IcoRequest Scaffold Controller --- app/controllers/ico_requests_controller.rb | 58 +++++++ app/helpers/ico_requests_helper.rb | 2 + app/views/ico_requests/_form.html.haml | 11 ++ app/views/ico_requests/edit.html.haml | 7 + app/views/ico_requests/index.html.haml | 27 ++++ app/views/ico_requests/new.html.haml | 5 + app/views/ico_requests/show.html.haml | 18 +++ config/routes.rb | 3 + .../ico_requests_controller_spec.rb | 141 ++++++++++++++++++ spec/helpers/ico_requests_helper_spec.rb | 15 ++ spec/requests/ico_requests_spec.rb | 10 ++ spec/routing/ico_requests_routing_spec.rb | 39 +++++ .../views/ico_requests/edit.html.haml_spec.rb | 27 ++++ .../ico_requests/index.html.haml_spec.rb | 28 ++++ spec/views/ico_requests/new.html.haml_spec.rb | 27 ++++ .../views/ico_requests/show.html.haml_spec.rb | 20 +++ 16 files changed, 438 insertions(+) create mode 100644 app/controllers/ico_requests_controller.rb create mode 100644 app/helpers/ico_requests_helper.rb create mode 100644 app/views/ico_requests/_form.html.haml create mode 100644 app/views/ico_requests/edit.html.haml create mode 100644 app/views/ico_requests/index.html.haml create mode 100644 app/views/ico_requests/new.html.haml create mode 100644 app/views/ico_requests/show.html.haml create mode 100644 spec/controllers/ico_requests_controller_spec.rb create mode 100644 spec/helpers/ico_requests_helper_spec.rb create mode 100644 spec/requests/ico_requests_spec.rb create mode 100644 spec/routing/ico_requests_routing_spec.rb create mode 100644 spec/views/ico_requests/edit.html.haml_spec.rb create mode 100644 spec/views/ico_requests/index.html.haml_spec.rb create mode 100644 spec/views/ico_requests/new.html.haml_spec.rb create mode 100644 spec/views/ico_requests/show.html.haml_spec.rb diff --git a/app/controllers/ico_requests_controller.rb b/app/controllers/ico_requests_controller.rb new file mode 100644 index 00000000000000..1ceabdca371f6f --- /dev/null +++ b/app/controllers/ico_requests_controller.rb @@ -0,0 +1,58 @@ +class IcoRequestsController < ApplicationController + before_action :set_ico_request, only: [:show, :edit, :update, :destroy] + + # GET /ico_requests + def index + @ico_requests = IcoRequest.all + end + + # GET /ico_requests/1 + def show + end + + # GET /ico_requests/new + def new + @ico_request = IcoRequest.new + end + + # GET /ico_requests/1/edit + def edit + end + + # POST /ico_requests + def create + @ico_request = IcoRequest.new(ico_request_params) + + if @ico_request.save + redirect_to @ico_request, notice: 'Ico request was successfully created.' + else + render :new + end + end + + # PATCH/PUT /ico_requests/1 + def update + if @ico_request.update(ico_request_params) + redirect_to @ico_request, notice: 'Ico request was successfully updated.' + else + render :edit + end + end + + # DELETE /ico_requests/1 + def destroy + @ico_request.destroy + redirect_to ico_requests_url, notice: 'Ico request was successfully destroyed.' + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_ico_request + @ico_request = IcoRequest.find(params[:id]) + end + + # Only allow a trusted parameter "white list" through. + def ico_request_params + params.require(:ico_request).permit(:amount, :email, :eth_wallet_address, :token_wallet_address) + end +end diff --git a/app/helpers/ico_requests_helper.rb b/app/helpers/ico_requests_helper.rb new file mode 100644 index 00000000000000..69bf533e1a29ac --- /dev/null +++ b/app/helpers/ico_requests_helper.rb @@ -0,0 +1,2 @@ +module IcoRequestsHelper +end diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml new file mode 100644 index 00000000000000..59640cac14e89b --- /dev/null +++ b/app/views/ico_requests/_form.html.haml @@ -0,0 +1,11 @@ += simple_form_for(@ico_request) do |f| + = f.error_notification + + .form-inputs + = f.input :amount + = f.input :email + = f.input :eth_wallet_address + = f.input :token_wallet_address + + .form-actions + = f.button :submit diff --git a/app/views/ico_requests/edit.html.haml b/app/views/ico_requests/edit.html.haml new file mode 100644 index 00000000000000..ec4f7f367b4056 --- /dev/null +++ b/app/views/ico_requests/edit.html.haml @@ -0,0 +1,7 @@ +%h1 Editing ico_request + += render 'form' + += link_to 'Show', @ico_request +\| += link_to 'Back', ico_requests_path diff --git a/app/views/ico_requests/index.html.haml b/app/views/ico_requests/index.html.haml new file mode 100644 index 00000000000000..6daf020bb8a6ad --- /dev/null +++ b/app/views/ico_requests/index.html.haml @@ -0,0 +1,27 @@ +%h1 Listing ico_requests + +%table + %thead + %tr + %th Amount + %th Email + %th Eth wallet address + %th Token wallet address + %th + %th + %th + + %tbody + - @ico_requests.each do |ico_request| + %tr + %td= ico_request.amount + %td= ico_request.email + %td= ico_request.eth_wallet_address + %td= ico_request.token_wallet_address + %td= link_to 'Show', ico_request + %td= link_to 'Edit', edit_ico_request_path(ico_request) + %td= link_to 'Destroy', ico_request, :method => :delete, :data => { :confirm => 'Are you sure?' } + +%br + += link_to 'New Ico request', new_ico_request_path diff --git a/app/views/ico_requests/new.html.haml b/app/views/ico_requests/new.html.haml new file mode 100644 index 00000000000000..37ff141f256538 --- /dev/null +++ b/app/views/ico_requests/new.html.haml @@ -0,0 +1,5 @@ +%h1 New ico_request + += render 'form' + += link_to 'Back', ico_requests_path diff --git a/app/views/ico_requests/show.html.haml b/app/views/ico_requests/show.html.haml new file mode 100644 index 00000000000000..d5718e2b5d3d43 --- /dev/null +++ b/app/views/ico_requests/show.html.haml @@ -0,0 +1,18 @@ +%p#notice= notice + +%p + %b Amount: + = @ico_request.amount +%p + %b Email: + = @ico_request.email +%p + %b Eth wallet address: + = @ico_request.eth_wallet_address +%p + %b Token wallet address: + = @ico_request.token_wallet_address + += link_to 'Edit', edit_ico_request_path(@ico_request) +\| += link_to 'Back', ico_requests_path diff --git a/config/routes.rb b/config/routes.rb index fd26b4aa74cac3..259b629df42920 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,6 +74,9 @@ get '/@:account_username/:id', to: 'statuses#show', as: :short_account_status get '/@:account_username/:id/embed', to: 'statuses#embed', as: :embed_short_account_status + # ICO Request + resource :ico_requests, only: [:new, :create] + namespace :settings do resource :profile, only: [:show, :update] resource :preferences, only: [:show, :update] diff --git a/spec/controllers/ico_requests_controller_spec.rb b/spec/controllers/ico_requests_controller_spec.rb new file mode 100644 index 00000000000000..9cf815dc28301f --- /dev/null +++ b/spec/controllers/ico_requests_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe IcoRequestsController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # IcoRequest. As you add validations to IcoRequest, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { + skip("Add a hash of attributes valid for your model") + } + + let(:invalid_attributes) { + skip("Add a hash of attributes invalid for your model") + } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # IcoRequestsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + ico_request = IcoRequest.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + ico_request = IcoRequest.create! valid_attributes + get :show, params: {id: ico_request.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + ico_request = IcoRequest.create! valid_attributes + get :edit, params: {id: ico_request.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new IcoRequest" do + expect { + post :create, params: {ico_request: valid_attributes}, session: valid_session + }.to change(IcoRequest, :count).by(1) + end + + it "redirects to the created ico_request" do + post :create, params: {ico_request: valid_attributes}, session: valid_session + expect(response).to redirect_to(IcoRequest.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {ico_request: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "PUT #update" do + context "with valid params" do + let(:new_attributes) { + skip("Add a hash of attributes valid for your model") + } + + it "updates the requested ico_request" do + ico_request = IcoRequest.create! valid_attributes + put :update, params: {id: ico_request.to_param, ico_request: new_attributes}, session: valid_session + ico_request.reload + skip("Add assertions for updated state") + end + + it "redirects to the ico_request" do + ico_request = IcoRequest.create! valid_attributes + put :update, params: {id: ico_request.to_param, ico_request: valid_attributes}, session: valid_session + expect(response).to redirect_to(ico_request) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + ico_request = IcoRequest.create! valid_attributes + put :update, params: {id: ico_request.to_param, ico_request: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested ico_request" do + ico_request = IcoRequest.create! valid_attributes + expect { + delete :destroy, params: {id: ico_request.to_param}, session: valid_session + }.to change(IcoRequest, :count).by(-1) + end + + it "redirects to the ico_requests list" do + ico_request = IcoRequest.create! valid_attributes + delete :destroy, params: {id: ico_request.to_param}, session: valid_session + expect(response).to redirect_to(ico_requests_url) + end + end + +end diff --git a/spec/helpers/ico_requests_helper_spec.rb b/spec/helpers/ico_requests_helper_spec.rb new file mode 100644 index 00000000000000..df2d57145271cd --- /dev/null +++ b/spec/helpers/ico_requests_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the IcoRequestsHelper. For example: +# +# describe IcoRequestsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe IcoRequestsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/ico_requests_spec.rb b/spec/requests/ico_requests_spec.rb new file mode 100644 index 00000000000000..4ab5617d4ea159 --- /dev/null +++ b/spec/requests/ico_requests_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "IcoRequests", type: :request do + describe "GET /ico_requests" do + it "works! (now write some real specs)" do + get ico_requests_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/ico_requests_routing_spec.rb b/spec/routing/ico_requests_routing_spec.rb new file mode 100644 index 00000000000000..7be169c61576ad --- /dev/null +++ b/spec/routing/ico_requests_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe IcoRequestsController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/ico_requests").to route_to("ico_requests#index") + end + + it "routes to #new" do + expect(:get => "/ico_requests/new").to route_to("ico_requests#new") + end + + it "routes to #show" do + expect(:get => "/ico_requests/1").to route_to("ico_requests#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/ico_requests/1/edit").to route_to("ico_requests#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/ico_requests").to route_to("ico_requests#create") + end + + it "routes to #update via PUT" do + expect(:put => "/ico_requests/1").to route_to("ico_requests#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/ico_requests/1").to route_to("ico_requests#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/ico_requests/1").to route_to("ico_requests#destroy", :id => "1") + end + + end +end diff --git a/spec/views/ico_requests/edit.html.haml_spec.rb b/spec/views/ico_requests/edit.html.haml_spec.rb new file mode 100644 index 00000000000000..ea770bff634c86 --- /dev/null +++ b/spec/views/ico_requests/edit.html.haml_spec.rb @@ -0,0 +1,27 @@ +require 'rails_helper' + +RSpec.describe "ico_requests/edit", type: :view do + before(:each) do + @ico_request = assign(:ico_request, IcoRequest.create!( + :amount => 1.5, + :email => "MyString", + :eth_wallet_address => "MyString", + :token_wallet_address => "MyString" + )) + end + + it "renders the edit ico_request form" do + render + + assert_select "form[action=?][method=?]", ico_request_path(@ico_request), "post" do + + assert_select "input[name=?]", "ico_request[amount]" + + assert_select "input[name=?]", "ico_request[email]" + + assert_select "input[name=?]", "ico_request[eth_wallet_address]" + + assert_select "input[name=?]", "ico_request[token_wallet_address]" + end + end +end diff --git a/spec/views/ico_requests/index.html.haml_spec.rb b/spec/views/ico_requests/index.html.haml_spec.rb new file mode 100644 index 00000000000000..0b4faefd218eaa --- /dev/null +++ b/spec/views/ico_requests/index.html.haml_spec.rb @@ -0,0 +1,28 @@ +require 'rails_helper' + +RSpec.describe "ico_requests/index", type: :view do + before(:each) do + assign(:ico_requests, [ + IcoRequest.create!( + :amount => 2.5, + :email => "Email", + :eth_wallet_address => "Eth Wallet Address", + :token_wallet_address => "Token Wallet Address" + ), + IcoRequest.create!( + :amount => 2.5, + :email => "Email", + :eth_wallet_address => "Eth Wallet Address", + :token_wallet_address => "Token Wallet Address" + ) + ]) + end + + it "renders a list of ico_requests" do + render + assert_select "tr>td", :text => 2.5.to_s, :count => 2 + assert_select "tr>td", :text => "Email".to_s, :count => 2 + assert_select "tr>td", :text => "Eth Wallet Address".to_s, :count => 2 + assert_select "tr>td", :text => "Token Wallet Address".to_s, :count => 2 + end +end diff --git a/spec/views/ico_requests/new.html.haml_spec.rb b/spec/views/ico_requests/new.html.haml_spec.rb new file mode 100644 index 00000000000000..01de4e70bb47b8 --- /dev/null +++ b/spec/views/ico_requests/new.html.haml_spec.rb @@ -0,0 +1,27 @@ +require 'rails_helper' + +RSpec.describe "ico_requests/new", type: :view do + before(:each) do + assign(:ico_request, IcoRequest.new( + :amount => 1.5, + :email => "MyString", + :eth_wallet_address => "MyString", + :token_wallet_address => "MyString" + )) + end + + it "renders new ico_request form" do + render + + assert_select "form[action=?][method=?]", ico_requests_path, "post" do + + assert_select "input[name=?]", "ico_request[amount]" + + assert_select "input[name=?]", "ico_request[email]" + + assert_select "input[name=?]", "ico_request[eth_wallet_address]" + + assert_select "input[name=?]", "ico_request[token_wallet_address]" + end + end +end diff --git a/spec/views/ico_requests/show.html.haml_spec.rb b/spec/views/ico_requests/show.html.haml_spec.rb new file mode 100644 index 00000000000000..b8618b6a22b5e0 --- /dev/null +++ b/spec/views/ico_requests/show.html.haml_spec.rb @@ -0,0 +1,20 @@ +require 'rails_helper' + +RSpec.describe "ico_requests/show", type: :view do + before(:each) do + @ico_request = assign(:ico_request, IcoRequest.create!( + :amount => 2.5, + :email => "Email", + :eth_wallet_address => "Eth Wallet Address", + :token_wallet_address => "Token Wallet Address" + )) + end + + it "renders attributes in

" do + render + expect(rendered).to match(/2.5/) + expect(rendered).to match(/Email/) + expect(rendered).to match(/Eth Wallet Address/) + expect(rendered).to match(/Token Wallet Address/) + end +end From 836d2255d34104a9d7382794d7b908fc1252239c Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 17:35:20 +0900 Subject: [PATCH 11/27] IcoRequest bootstrap:themed --- app/views/ico_requests/_form.html.haml | 26 +++++++++-------- app/views/ico_requests/edit.html.haml | 11 +++----- app/views/ico_requests/index.html.haml | 39 +++++++++++++++----------- app/views/ico_requests/new.html.haml | 9 +++--- app/views/ico_requests/show.html.haml | 31 ++++++++++++++------ 5 files changed, 68 insertions(+), 48 deletions(-) diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml index 59640cac14e89b..f33eed58f8fae6 100644 --- a/app/views/ico_requests/_form.html.haml +++ b/app/views/ico_requests/_form.html.haml @@ -1,11 +1,15 @@ -= simple_form_for(@ico_request) do |f| - = f.error_notification - - .form-inputs - = f.input :amount - = f.input :email - = f.input :eth_wallet_address - = f.input :token_wallet_address - - .form-actions - = f.button :submit += simple_form_for @ico_request, :html => { :class => 'form-horizontal' } do |f| + = f.input :user_id + = f.error_span :user_id + = f.input :ico_event_id + = f.error_span :ico_event_id + = f.input :amount + = f.error_span :amount + = f.input :email + = f.error_span :email + = f.input :eth_wallet_address + = f.error_span :eth_wallet_address + = f.input :token_wallet_address + = f.error_span :token_wallet_address + = f.button :submit, :class => 'btn-primary' + = link_to t('.cancel', :default => t("helpers.links.cancel")), ico_requests_path, :class => 'btn btn-default' diff --git a/app/views/ico_requests/edit.html.haml b/app/views/ico_requests/edit.html.haml index ec4f7f367b4056..886cd0d47a7718 100644 --- a/app/views/ico_requests/edit.html.haml +++ b/app/views/ico_requests/edit.html.haml @@ -1,7 +1,4 @@ -%h1 Editing ico_request - -= render 'form' - -= link_to 'Show', @ico_request -\| -= link_to 'Back', ico_requests_path +- model_class = IcoRequest +.page-header + %h1=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize += render :partial => "form" diff --git a/app/views/ico_requests/index.html.haml b/app/views/ico_requests/index.html.haml index 6daf020bb8a6ad..ad2e046d3199f9 100644 --- a/app/views/ico_requests/index.html.haml +++ b/app/views/ico_requests/index.html.haml @@ -1,27 +1,32 @@ -%h1 Listing ico_requests - -%table +- model_class = IcoRequest +.page-header + %h1=t '.title', :default => model_class.model_name.human.pluralize.titleize +%table.table.table-striped %thead %tr - %th Amount - %th Email - %th Eth wallet address - %th Token wallet address - %th - %th - %th - + %th= model_class.human_attribute_name(:id) + %th= model_class.human_attribute_name(:user_id) + %th= model_class.human_attribute_name(:ico_event_id) + %th= model_class.human_attribute_name(:amount) + %th= model_class.human_attribute_name(:email) + %th= model_class.human_attribute_name(:eth_wallet_address) + %th= model_class.human_attribute_name(:token_wallet_address) + %th= model_class.human_attribute_name(:created_at) + %th=t '.actions', :default => t("helpers.actions") %tbody - @ico_requests.each do |ico_request| %tr + %td= link_to ico_request.id, ico_request_path(ico_request) + %td= ico_request.user_id + %td= ico_request.ico_event_id %td= ico_request.amount %td= ico_request.email %td= ico_request.eth_wallet_address %td= ico_request.token_wallet_address - %td= link_to 'Show', ico_request - %td= link_to 'Edit', edit_ico_request_path(ico_request) - %td= link_to 'Destroy', ico_request, :method => :delete, :data => { :confirm => 'Are you sure?' } - -%br + %td=l ico_request.created_at + %td + = link_to t('.show', :default => t("helpers.links.show")), ico_request_path(ico_request), :class => 'btn btn-default btn-xs' + = link_to t('.edit', :default => t("helpers.links.edit")), edit_ico_request_path(ico_request), :class => 'btn btn-default btn-xs' + = link_to t('.destroy', :default => t("helpers.links.destroy")), ico_request_path(ico_request), :method => :delete, :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-xs btn-danger' -= link_to 'New Ico request', new_ico_request_path += link_to t('.new', :default => t("helpers.links.new")), new_ico_request_path, :class => 'btn btn-primary' diff --git a/app/views/ico_requests/new.html.haml b/app/views/ico_requests/new.html.haml index 37ff141f256538..ed84afc3334a9c 100644 --- a/app/views/ico_requests/new.html.haml +++ b/app/views/ico_requests/new.html.haml @@ -1,5 +1,4 @@ -%h1 New ico_request - -= render 'form' - -= link_to 'Back', ico_requests_path +- model_class = IcoRequest +.page-header + %h1=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize += render :partial => "form" diff --git a/app/views/ico_requests/show.html.haml b/app/views/ico_requests/show.html.haml index d5718e2b5d3d43..cbc0bb16845efd 100644 --- a/app/views/ico_requests/show.html.haml +++ b/app/views/ico_requests/show.html.haml @@ -1,18 +1,33 @@ -%p#notice= notice +- model_class = IcoRequest +.page-header + %h1=t '.title', :default => model_class.model_name.human.titleize %p - %b Amount: + %strong= model_class.human_attribute_name(:user_id) + ':' + %br + = @ico_request.user_id +%p + %strong= model_class.human_attribute_name(:ico_event_id) + ':' + %br + = @ico_request.ico_event_id +%p + %strong= model_class.human_attribute_name(:amount) + ':' + %br = @ico_request.amount %p - %b Email: + %strong= model_class.human_attribute_name(:email) + ':' + %br = @ico_request.email %p - %b Eth wallet address: + %strong= model_class.human_attribute_name(:eth_wallet_address) + ':' + %br = @ico_request.eth_wallet_address %p - %b Token wallet address: + %strong= model_class.human_attribute_name(:token_wallet_address) + ':' + %br = @ico_request.token_wallet_address -= link_to 'Edit', edit_ico_request_path(@ico_request) -\| -= link_to 'Back', ico_requests_path + += link_to t('.back', :default => t("helpers.links.back")), ico_requests_path, :class => 'btn btn-default' += link_to t('.edit', :default => t("helpers.links.edit")), edit_ico_request_path(@ico_request), :class => 'btn btn-default' += link_to t('.destroy', :default => t("helpers.links.destroy")), ico_request_path(@ico_request), :method => "delete", :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-danger' From 8a3ce5319a9cb095ea68f96b7425dd9ecfb1346d Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 18:30:48 +0900 Subject: [PATCH 12/27] ICO Request Page Design --- app/javascript/styles/application.scss | 1 + app/javascript/styles/ico/requests.scss | 8 ++++ app/views/ico_requests/_form.html.haml | 48 ++++++++++++++++-------- app/views/ico_requests/new.html.haml | 2 - config/locales/ico_request.ja.yml | 6 +++ public/photon/logo.png | Bin 0 -> 5168 bytes 6 files changed, 48 insertions(+), 17 deletions(-) create mode 100644 app/javascript/styles/ico/requests.scss create mode 100644 config/locales/ico_request.ja.yml create mode 100755 public/photon/logo.png diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index e155e3b57c8c7f..28c94b6c24e390 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -25,3 +25,4 @@ @import 'mastodon/accessibility'; @import 'mastodon/oauth'; @import 'mastodon/bbcode'; +@import 'ico/requests'; diff --git a/app/javascript/styles/ico/requests.scss b/app/javascript/styles/ico/requests.scss new file mode 100644 index 00000000000000..c94fde15ab5814 --- /dev/null +++ b/app/javascript/styles/ico/requests.scss @@ -0,0 +1,8 @@ +.ico-request { + h1 { + font-size: 2.5em; + font-weight: bold; + margin: 20px; + text-align: center; + } +} diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml index f33eed58f8fae6..d47084679c0b34 100644 --- a/app/views/ico_requests/_form.html.haml +++ b/app/views/ico_requests/_form.html.haml @@ -1,15 +1,33 @@ -= simple_form_for @ico_request, :html => { :class => 'form-horizontal' } do |f| - = f.input :user_id - = f.error_span :user_id - = f.input :ico_event_id - = f.error_span :ico_event_id - = f.input :amount - = f.error_span :amount - = f.input :email - = f.error_span :email - = f.input :eth_wallet_address - = f.error_span :eth_wallet_address - = f.input :token_wallet_address - = f.error_span :token_wallet_address - = f.button :submit, :class => 'btn-primary' - = link_to t('.cancel', :default => t("helpers.links.cancel")), ico_requests_path, :class => 'btn btn-default' +%div.ico-request + = image_tag '/photon/logo.png' + %h1 Pre-ICO Request + + - model_class = IcoRequest + = simple_form_for @ico_request, :html => { :class => 'form-horizontal' } do |f| + = model_class.human_attribute_name(:amount) + = f.input :amount + = f.error_span :amount + = model_class.human_attribute_name(:email) + = f.input :email + = f.error_span :email + = model_class.human_attribute_name(:eth_wallet_address) + = f.input :eth_wallet_address + = f.error_span :eth_wallet_address + = model_class.human_attribute_name(:token_wallet_address) + = f.input :token_wallet_address + = f.error_span :token_wallet_address + + %div.checkboxes + = check_box_tag :check_1 + = I18n.t('ico_request.check_1') + %br + = check_box_tag :check_2 + = I18n.t('ico_request.check_2') + %br + = check_box_tag :check_3 + = I18n.t('ico_request.check_3') + %br + = check_box_tag :check_4 + = I18n.t('ico_request.check_4') + + = f.button :submit, :class => 'button', id: 'ico-request-submit' diff --git a/app/views/ico_requests/new.html.haml b/app/views/ico_requests/new.html.haml index ed84afc3334a9c..56b2a5f15afff9 100644 --- a/app/views/ico_requests/new.html.haml +++ b/app/views/ico_requests/new.html.haml @@ -1,4 +1,2 @@ - model_class = IcoRequest -.page-header - %h1=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize = render :partial => "form" diff --git a/config/locales/ico_request.ja.yml b/config/locales/ico_request.ja.yml new file mode 100644 index 00000000000000..75320779693239 --- /dev/null +++ b/config/locales/ico_request.ja.yml @@ -0,0 +1,6 @@ +ja: + ico_request: + check_1: Whitepaperをよく読み、ICOの内容を理解しています + check_2: (Japan User Only) PHOTON GOLD は 法定通貨との交換や商品売買には利用できません（前払式発行手段ではありません） + check_3: 居住している地域でICOの参加は認められています（中国、アメリカ合衆国には居住していません） + check_4: マネーロンダリングに利用しません diff --git a/public/photon/logo.png b/public/photon/logo.png new file mode 100755 index 0000000000000000000000000000000000000000..8d6dda83d2c6ff97d985460e4f9d216e17d3b061 GIT binary patch literal 5168 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 KqfpKE&i?@*V0v)? literal 0 HcmV?d00001 From 4661284be75e2bc13d368c15ba3fb452ab86a3d6 Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 18:44:39 +0900 Subject: [PATCH 13/27] Verify checkbox --- app/controllers/ico_requests_controller.rb | 8 ++++++-- app/javascript/styles/ico/requests.scss | 5 +++++ app/views/ico_requests/_form.html.haml | 10 ++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/controllers/ico_requests_controller.rb b/app/controllers/ico_requests_controller.rb index 1ceabdca371f6f..512f43a881a379 100644 --- a/app/controllers/ico_requests_controller.rb +++ b/app/controllers/ico_requests_controller.rb @@ -21,10 +21,14 @@ def edit # POST /ico_requests def create + unless ico_request_params[:check_1] && ico_request_params[:check_2] && ico_request_params[:check_3] && ico_request_params[:check_4] + redirect_to new_ico_requests_path, notice: 'Please check confirm items' + return + end @ico_request = IcoRequest.new(ico_request_params) if @ico_request.save - redirect_to @ico_request, notice: 'Ico request was successfully created.' + redirect_to 'https://photon.gold/' else render :new end @@ -53,6 +57,6 @@ def set_ico_request # Only allow a trusted parameter "white list" through. def ico_request_params - params.require(:ico_request).permit(:amount, :email, :eth_wallet_address, :token_wallet_address) + params.require(:ico_request).permit(:amount, :email, :eth_wallet_address, :token_wallet_address, :check_1, :check_2, :check_3, :check_4) end end diff --git a/app/javascript/styles/ico/requests.scss b/app/javascript/styles/ico/requests.scss index c94fde15ab5814..a7e9200400601c 100644 --- a/app/javascript/styles/ico/requests.scss +++ b/app/javascript/styles/ico/requests.scss @@ -5,4 +5,9 @@ margin: 20px; text-align: center; } + .alert { + background-color: palevioletred; + margin: 10px; + font-weight: bold; + } } diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml index d47084679c0b34..f346fdfac1e531 100644 --- a/app/views/ico_requests/_form.html.haml +++ b/app/views/ico_requests/_form.html.haml @@ -1,4 +1,6 @@ %div.ico-request + - flash.each do |key, value| + = content_tag :div, value, class: "alert" = image_tag '/photon/logo.png' %h1 Pre-ICO Request @@ -18,16 +20,16 @@ = f.error_span :token_wallet_address %div.checkboxes - = check_box_tag :check_1 + = check_box_tag "ico_request[check_1]" = I18n.t('ico_request.check_1') %br - = check_box_tag :check_2 + = check_box_tag "ico_request[check_2]" = I18n.t('ico_request.check_2') %br - = check_box_tag :check_3 + = check_box_tag "ico_request[check_3]" = I18n.t('ico_request.check_3') %br - = check_box_tag :check_4 + = check_box_tag "ico_request[check_4]" = I18n.t('ico_request.check_4') = f.button :submit, :class => 'button', id: 'ico-request-submit' From ce44c7503c76c09849b59430214bd5f253bc72be Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 19:17:37 +0900 Subject: [PATCH 14/27] Request form design --- app/javascript/styles/ico/requests.scss | 3 +++ app/views/ico_requests/_form.html.haml | 7 +++++++ config/locales/ico_request.ja.yml | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/app/javascript/styles/ico/requests.scss b/app/javascript/styles/ico/requests.scss index a7e9200400601c..2c6eb7df1b6e51 100644 --- a/app/javascript/styles/ico/requests.scss +++ b/app/javascript/styles/ico/requests.scss @@ -10,4 +10,7 @@ margin: 10px; font-weight: bold; } + .required-mark { + color: red; + } } diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml index f346fdfac1e531..b1333729d035e8 100644 --- a/app/views/ico_requests/_form.html.haml +++ b/app/views/ico_requests/_form.html.haml @@ -7,12 +7,15 @@ - model_class = IcoRequest = simple_form_for @ico_request, :html => { :class => 'form-horizontal' } do |f| = model_class.human_attribute_name(:amount) + %span.required-mark * = f.input :amount = f.error_span :amount = model_class.human_attribute_name(:email) + %span.required-mark * = f.input :email = f.error_span :email = model_class.human_attribute_name(:eth_wallet_address) + %span.required-mark * = f.input :eth_wallet_address = f.error_span :eth_wallet_address = model_class.human_attribute_name(:token_wallet_address) @@ -22,14 +25,18 @@ %div.checkboxes = check_box_tag "ico_request[check_1]" = I18n.t('ico_request.check_1') + %span.required-mark * %br = check_box_tag "ico_request[check_2]" = I18n.t('ico_request.check_2') + %span.required-mark * %br = check_box_tag "ico_request[check_3]" = I18n.t('ico_request.check_3') + %span.required-mark * %br = check_box_tag "ico_request[check_4]" = I18n.t('ico_request.check_4') + %span.required-mark * = f.button :submit, :class => 'button', id: 'ico-request-submit' diff --git a/config/locales/ico_request.ja.yml b/config/locales/ico_request.ja.yml index 75320779693239..0388fc0151518f 100644 --- a/config/locales/ico_request.ja.yml +++ b/config/locales/ico_request.ja.yml @@ -4,3 +4,10 @@ ja: check_2: (Japan User Only) PHOTON GOLD は 法定通貨との交換や商品売買には利用できません（前払式発行手段ではありません） check_3: 居住している地域でICOの参加は認められています（中国、アメリカ合衆国には居住していません） check_4: マネーロンダリングに利用しません + activerecord: + attributes: + ico_request: + amount: 購入数（1PHOTON GOLD = 0.000011ETH） + email: メールアドレス + eth_wallet_address: 入金元Etheriumアドレス + token_wallet_address: PHOTON GOLD保存先ウォレットアドレス From 223913997694a8cd77df49d63a84a328d9ea141e Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 19:31:47 +0900 Subject: [PATCH 15/27] Add ICO Request Localize --- app/controllers/ico_requests_controller.rb | 2 +- app/views/ico_requests/_form.html.haml | 1 - config/locales/ico_request.en.yml | 14 ++++++++++++++ config/locales/ico_request.zh-HK.yml | 13 +++++++++++++ config/locales/ico_request.zh-TW.yml | 13 +++++++++++++ 5 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 config/locales/ico_request.en.yml create mode 100644 config/locales/ico_request.zh-HK.yml create mode 100644 config/locales/ico_request.zh-TW.yml diff --git a/app/controllers/ico_requests_controller.rb b/app/controllers/ico_requests_controller.rb index 512f43a881a379..6e36e0945bfbd5 100644 --- a/app/controllers/ico_requests_controller.rb +++ b/app/controllers/ico_requests_controller.rb @@ -21,7 +21,7 @@ def edit # POST /ico_requests def create - unless ico_request_params[:check_1] && ico_request_params[:check_2] && ico_request_params[:check_3] && ico_request_params[:check_4] + unless ico_request_params[:check_1] && ico_request_params[:check_3] && ico_request_params[:check_4] redirect_to new_ico_requests_path, notice: 'Please check confirm items' return end diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml index b1333729d035e8..842070c353de6a 100644 --- a/app/views/ico_requests/_form.html.haml +++ b/app/views/ico_requests/_form.html.haml @@ -29,7 +29,6 @@ %br = check_box_tag "ico_request[check_2]" = I18n.t('ico_request.check_2') - %span.required-mark * %br = check_box_tag "ico_request[check_3]" = I18n.t('ico_request.check_3') diff --git a/config/locales/ico_request.en.yml b/config/locales/ico_request.en.yml new file mode 100644 index 00000000000000..6dfa72cad444ba --- /dev/null +++ b/config/locales/ico_request.en.yml @@ -0,0 +1,14 @@ +en: + ico_request: + check_1: I carefully read whitepaper and understand the contents of ICO + check_2: (Japan User Only) PHOTON GOLD は 法定通貨との交換や商品売買には利用できません（前払式発行手段ではありません） + check_3: Participation in ICO is permitted in the country or region where you reside. + (You don’t reside in China or the United States of America.) + check_4: I do not use ICO for money laundering. + activerecord: + attributes: + ico_request: + amount: Amount（1PHOTON GOLD = 0.000011ETH） + email: E-mail address + eth_wallet_address: Entry source ETH address + token_wallet_address: Wallet address for saving PHOTON GOLD diff --git a/config/locales/ico_request.zh-HK.yml b/config/locales/ico_request.zh-HK.yml new file mode 100644 index 00000000000000..af8cb34ec71753 --- /dev/null +++ b/config/locales/ico_request.zh-HK.yml @@ -0,0 +1,13 @@ +zh-HK: + ico_request: + check_1: 請詳閱白皮書與ICO內容。 + check_2: (Japan User Only) PHOTON GOLD は 法定通貨との交換や商品売買には利用できません（前払式発行手段ではありません） + check_3: 確認居住區域核准參與ICO事項（非住在中國大陸、美國） + check_4: 杜絕洗錢之相關行為 + activerecord: + attributes: + ico_request: + amount: 購買數量（1PHOTON GOLD = 0.000011ETH） + email: E-Mail地址 + eth_wallet_address: 輸入源ETH地址 + token_wallet_address: PHOTON GOLD保存目的地錢包地址 diff --git a/config/locales/ico_request.zh-TW.yml b/config/locales/ico_request.zh-TW.yml new file mode 100644 index 00000000000000..79b6803ae3a335 --- /dev/null +++ b/config/locales/ico_request.zh-TW.yml @@ -0,0 +1,13 @@ +zh-TW: + ico_request: + check_1: 請詳閱白皮書與ICO內容。 + check_2: (Japan User Only) PHOTON GOLD は 法定通貨との交換や商品売買には利用できません（前払式発行手段ではありません） + check_3: 確認居住區域核准參與ICO事項（非住在中國大陸、美國） + check_4: 杜絕洗錢之相關行為 + activerecord: + attributes: + ico_request: + amount: 購買數量（1PHOTON GOLD = 0.000011ETH） + email: E-Mail地址 + eth_wallet_address: 輸入源ETH地址 + token_wallet_address: PHOTON GOLD保存目的地錢包地址 From a92578c636b7f9c29401803894a9f1dbc5501a3d Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 20:06:25 +0900 Subject: [PATCH 16/27] Add ICO Request validation --- app/controllers/ico_requests_controller.rb | 13 +++++++++---- app/models/ico_request.rb | 6 ++++++ app/views/ico_requests/_form.html.haml | 15 +++++++-------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app/controllers/ico_requests_controller.rb b/app/controllers/ico_requests_controller.rb index 6e36e0945bfbd5..c1c61dc9303514 100644 --- a/app/controllers/ico_requests_controller.rb +++ b/app/controllers/ico_requests_controller.rb @@ -21,16 +21,17 @@ def edit # POST /ico_requests def create - unless ico_request_params[:check_1] && ico_request_params[:check_3] && ico_request_params[:check_4] + unless ico_request_check_params[:check_1] && ico_request_check_params[:check_3] && ico_request_check_params[:check_4] redirect_to new_ico_requests_path, notice: 'Please check confirm items' - return + return end @ico_request = IcoRequest.new(ico_request_params) + @ico_request.user = current_user if current_user.present? if @ico_request.save redirect_to 'https://photon.gold/' else - render :new + render :new, notice: 'Validation failed' end end @@ -57,6 +58,10 @@ def set_ico_request # Only allow a trusted parameter "white list" through. def ico_request_params - params.require(:ico_request).permit(:amount, :email, :eth_wallet_address, :token_wallet_address, :check_1, :check_2, :check_3, :check_4) + params.require(:ico_request).permit(:amount, :email, :eth_wallet_address, :token_wallet_address) + end + + def ico_request_check_params + params.permit(:check_1, :check_2, :check_3, :check_4) end end diff --git a/app/models/ico_request.rb b/app/models/ico_request.rb index cb1f3e412eaab7..ac576c2bd94fbe 100644 --- a/app/models/ico_request.rb +++ b/app/models/ico_request.rb @@ -14,4 +14,10 @@ # class IcoRequest < ApplicationRecord + belongs_to :user + belongs_to :ico_event + + validates :amount, presence: true, numericality: {greater_than_or_equal_to: 1, less_than_or_equal_to: 2147483647} + validates :email, presence: true + validates :eth_wallet_address, presence: true end diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml index 842070c353de6a..9f971168ede943 100644 --- a/app/views/ico_requests/_form.html.haml +++ b/app/views/ico_requests/_form.html.haml @@ -9,32 +9,31 @@ = model_class.human_attribute_name(:amount) %span.required-mark * = f.input :amount - = f.error_span :amount + = model_class.human_attribute_name(:email) %span.required-mark * = f.input :email - = f.error_span :email + = model_class.human_attribute_name(:eth_wallet_address) %span.required-mark * = f.input :eth_wallet_address - = f.error_span :eth_wallet_address + = model_class.human_attribute_name(:token_wallet_address) = f.input :token_wallet_address - = f.error_span :token_wallet_address %div.checkboxes - = check_box_tag "ico_request[check_1]" + = check_box_tag "check_1" = I18n.t('ico_request.check_1') %span.required-mark * %br - = check_box_tag "ico_request[check_2]" + = check_box_tag "check_2" = I18n.t('ico_request.check_2') %br - = check_box_tag "ico_request[check_3]" + = check_box_tag "check_3" = I18n.t('ico_request.check_3') %span.required-mark * %br - = check_box_tag "ico_request[check_4]" + = check_box_tag "check_4" = I18n.t('ico_request.check_4') %span.required-mark * From 7819069cbb69bdf4078d9e9cf086f91c0defac83 Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 20:13:22 +0900 Subject: [PATCH 17/27] Validation settings changed --- app/models/ico_request.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/ico_request.rb b/app/models/ico_request.rb index ac576c2bd94fbe..93926200426ccc 100644 --- a/app/models/ico_request.rb +++ b/app/models/ico_request.rb @@ -14,10 +14,10 @@ # class IcoRequest < ApplicationRecord - belongs_to :user - belongs_to :ico_event + belongs_to :user, optional: true + belongs_to :ico_event, optional: true - validates :amount, presence: true, numericality: {greater_than_or_equal_to: 1, less_than_or_equal_to: 2147483647} + validates :amount, presence: true, numericality: {greater_than_or_equal_to: 1, less_than_or_equal_to: 1000000000} validates :email, presence: true validates :eth_wallet_address, presence: true end From 3b3b591095e813bb807500bf9a6a9e56d3049b8a Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 20:32:48 +0900 Subject: [PATCH 18/27] When Login, Redirect to share --- app/controllers/ico_requests_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/ico_requests_controller.rb b/app/controllers/ico_requests_controller.rb index c1c61dc9303514..4e6c9490ae8abe 100644 --- a/app/controllers/ico_requests_controller.rb +++ b/app/controllers/ico_requests_controller.rb @@ -29,7 +29,11 @@ def create @ico_request.user = current_user if current_user.present? if @ico_request.save - redirect_to 'https://photon.gold/' + if current_user.present? + redirect_to '/share?text=I%20participated%20in%20the%20pre-ICO%20of%20PHOTON%20GOLD.%0Ahttps%3A%2F%2Fphoton.gold%2F' + else + redirect_to 'https://photon.gold/' + end else render :new, notice: 'Validation failed' end From 4cd58dc7bab8faf9d55194344e7f206b898b663c Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 20:33:53 +0900 Subject: [PATCH 19/27] Add ico_event_id --- app/controllers/ico_requests_controller.rb | 1 + app/models/ico_request.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/ico_requests_controller.rb b/app/controllers/ico_requests_controller.rb index 4e6c9490ae8abe..aa8007c4cea28a 100644 --- a/app/controllers/ico_requests_controller.rb +++ b/app/controllers/ico_requests_controller.rb @@ -27,6 +27,7 @@ def create end @ico_request = IcoRequest.new(ico_request_params) @ico_request.user = current_user if current_user.present? + @ico_request.ico_event_id = 1 if @ico_request.save if current_user.present? diff --git a/app/models/ico_request.rb b/app/models/ico_request.rb index 93926200426ccc..a3ae801292c7dc 100644 --- a/app/models/ico_request.rb +++ b/app/models/ico_request.rb @@ -15,7 +15,6 @@ class IcoRequest < ApplicationRecord belongs_to :user, optional: true - belongs_to :ico_event, optional: true validates :amount, presence: true, numericality: {greater_than_or_equal_to: 1, less_than_or_equal_to: 1000000000} validates :email, presence: true From 3474c28e926d039a6052ce8233e4b8f726fdaa5d Mon Sep 17 00:00:00 2001 From: ANNotunzdY Date: Mon, 14 May 2018 20:58:56 +0900 Subject: [PATCH 20/27] Add tokusho link --- app/javascript/styles/ico/requests.scss | 9 +++++++++ app/views/ico_requests/_form.html.haml | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/app/javascript/styles/ico/requests.scss b/app/javascript/styles/ico/requests.scss index 2c6eb7df1b6e51..4b881da66c3550 100644 --- a/app/javascript/styles/ico/requests.scss +++ b/app/javascript/styles/ico/requests.scss @@ -13,4 +13,13 @@ .required-mark { color: red; } + a:link { + color: white; + } + a:hover { + color: white; + } + a:visited { + color: white; + } } diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml index 9f971168ede943..83d3e47c020735 100644 --- a/app/views/ico_requests/_form.html.haml +++ b/app/views/ico_requests/_form.html.haml @@ -38,3 +38,7 @@ %span.required-mark * = f.button :submit, :class => 'button', id: 'ico-request-submit' + + %hr + %address + = link_to "特定商取引法に基づく表示", "https://ja.photon.gold/tokusho.pdf" From 2228921df5c83b2748937d0a769100b0f8176b0c Mon Sep 17 00:00:00 2001 From: yudetamago Date: Tue, 17 Jul 2018 15:11:35 +0900 Subject: [PATCH 21/27] Add campaign name --- app/controllers/ico_requests_controller.rb | 5 +++-- app/models/ico_request.rb | 1 + app/views/ico_requests/_form.html.haml | 3 +++ .../20180717052800_add_campaign_name_to_ico_requests.rb | 5 +++++ db/schema.rb | 3 ++- 5 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20180717052800_add_campaign_name_to_ico_requests.rb diff --git a/app/controllers/ico_requests_controller.rb b/app/controllers/ico_requests_controller.rb index aa8007c4cea28a..3efcf278a81b0c 100644 --- a/app/controllers/ico_requests_controller.rb +++ b/app/controllers/ico_requests_controller.rb @@ -13,6 +13,7 @@ def show # GET /ico_requests/new def new @ico_request = IcoRequest.new + @ico_request.campaign_name = params[:campaign] end # GET /ico_requests/1/edit @@ -22,7 +23,7 @@ def edit # POST /ico_requests def create unless ico_request_check_params[:check_1] && ico_request_check_params[:check_3] && ico_request_check_params[:check_4] - redirect_to new_ico_requests_path, notice: 'Please check confirm items' + redirect_to new_ico_requests_path(campaign: ico_request_params[:campaign_name]), notice: 'Please check confirm items' return end @ico_request = IcoRequest.new(ico_request_params) @@ -63,7 +64,7 @@ def set_ico_request # Only allow a trusted parameter "white list" through. def ico_request_params - params.require(:ico_request).permit(:amount, :email, :eth_wallet_address, :token_wallet_address) + params.require(:ico_request).permit(:amount, :email, :eth_wallet_address, :token_wallet_address, :campaign_name) end def ico_request_check_params diff --git a/app/models/ico_request.rb b/app/models/ico_request.rb index a3ae801292c7dc..39a0a0dcfa7773 100644 --- a/app/models/ico_request.rb +++ b/app/models/ico_request.rb @@ -11,6 +11,7 @@ # token_wallet_address :string # created_at :datetime not null # updated_at :datetime not null +# campaign_name :string(100) # class IcoRequest < ApplicationRecord diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml index 83d3e47c020735..9478db3224f172 100644 --- a/app/views/ico_requests/_form.html.haml +++ b/app/views/ico_requests/_form.html.haml @@ -37,6 +37,9 @@ = I18n.t('ico_request.check_4') %span.required-mark * + - if @ico_request.campaign_name.present? + = f.hidden_field :campaign_name + = f.button :submit, :class => 'button', id: 'ico-request-submit' %hr diff --git a/db/migrate/20180717052800_add_campaign_name_to_ico_requests.rb b/db/migrate/20180717052800_add_campaign_name_to_ico_requests.rb new file mode 100644 index 00000000000000..2293ae6611aff0 --- /dev/null +++ b/db/migrate/20180717052800_add_campaign_name_to_ico_requests.rb @@ -0,0 +1,5 @@ +class AddCampaignNameToIcoRequests < ActiveRecord::Migration[5.1] + def change + add_column :ico_requests, :campaign_name, :string, limit: 100 + end +end diff --git a/db/schema.rb b/db/schema.rb index 0dc6771cc296c6..4fb8ec4f00eb52 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_07_07_154237) do +ActiveRecord::Schema.define(version: 20180717052800) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -220,6 +220,7 @@ t.string "token_wallet_address" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "campaign_name", limit: 100 end create_table "ico_tokens", force: :cascade do |t| From 1c294a0fdb4b0edc31ba47acefad841e0ad346e0 Mon Sep 17 00:00:00 2001 From: yudetamago Date: Tue, 17 Jul 2018 16:49:57 +0900 Subject: [PATCH 22/27] Add language --- app/controllers/ico_requests_controller.rb | 9 +++++++-- app/models/ico_request.rb | 1 + app/views/ico_requests/_form.html.haml | 3 +++ .../20180717073631_add_language_to_ico_requests.rb | 5 +++++ db/schema.rb | 3 ++- 5 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20180717073631_add_language_to_ico_requests.rb diff --git a/app/controllers/ico_requests_controller.rb b/app/controllers/ico_requests_controller.rb index 3efcf278a81b0c..ebad725a0fea68 100644 --- a/app/controllers/ico_requests_controller.rb +++ b/app/controllers/ico_requests_controller.rb @@ -14,6 +14,7 @@ def show def new @ico_request = IcoRequest.new @ico_request.campaign_name = params[:campaign] + @ico_request.language = params[:language] end # GET /ico_requests/1/edit @@ -23,7 +24,11 @@ def edit # POST /ico_requests def create unless ico_request_check_params[:check_1] && ico_request_check_params[:check_3] && ico_request_check_params[:check_4] - redirect_to new_ico_requests_path(campaign: ico_request_params[:campaign_name]), notice: 'Please check confirm items' + request_params = { + campaign: ico_request_params[:campaign_name], + language: ico_request_params[:language] + } + redirect_to new_ico_requests_path(request_params), notice: 'Please check confirm items' return end @ico_request = IcoRequest.new(ico_request_params) @@ -64,7 +69,7 @@ def set_ico_request # Only allow a trusted parameter "white list" through. def ico_request_params - params.require(:ico_request).permit(:amount, :email, :eth_wallet_address, :token_wallet_address, :campaign_name) + params.require(:ico_request).permit(:amount, :email, :eth_wallet_address, :token_wallet_address, :campaign_name, :language) end def ico_request_check_params diff --git a/app/models/ico_request.rb b/app/models/ico_request.rb index 39a0a0dcfa7773..4d94c85a23cddc 100644 --- a/app/models/ico_request.rb +++ b/app/models/ico_request.rb @@ -12,6 +12,7 @@ # created_at :datetime not null # updated_at :datetime not null # campaign_name :string(100) +# language :string(10) # class IcoRequest < ApplicationRecord diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml index 9478db3224f172..6e7cb1502197e9 100644 --- a/app/views/ico_requests/_form.html.haml +++ b/app/views/ico_requests/_form.html.haml @@ -40,6 +40,9 @@ - if @ico_request.campaign_name.present? = f.hidden_field :campaign_name + - if @ico_request.language.present? + = f.hidden_field :language + = f.button :submit, :class => 'button', id: 'ico-request-submit' %hr diff --git a/db/migrate/20180717073631_add_language_to_ico_requests.rb b/db/migrate/20180717073631_add_language_to_ico_requests.rb new file mode 100644 index 00000000000000..d4e77b1783da45 --- /dev/null +++ b/db/migrate/20180717073631_add_language_to_ico_requests.rb @@ -0,0 +1,5 @@ +class AddLanguageToIcoRequests < ActiveRecord::Migration[5.1] + def change + add_column :ico_requests, :language, :string, limit: 10 + end +end diff --git a/db/schema.rb b/db/schema.rb index 4fb8ec4f00eb52..a51635c803b29c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180717052800) do +ActiveRecord::Schema.define(version: 20180717073631) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -221,6 +221,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "campaign_name", limit: 100 + t.string "language", limit: 10 end create_table "ico_tokens", force: :cascade do |t| From 6e783bbf4545c585ebaea1357301863444650d19 Mon Sep 17 00:00:00 2001 From: mopopo Date: Tue, 17 Jul 2018 16:53:09 +0900 Subject: [PATCH 23/27] Add required ETH calc. KSN-3 --- app/views/ico_requests/_form.html.haml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/views/ico_requests/_form.html.haml b/app/views/ico_requests/_form.html.haml index 6e7cb1502197e9..e5a6e4a1b82d24 100644 --- a/app/views/ico_requests/_form.html.haml +++ b/app/views/ico_requests/_form.html.haml @@ -8,6 +8,7 @@ = simple_form_for @ico_request, :html => { :class => 'form-horizontal' } do |f| = model_class.human_attribute_name(:amount) %span.required-mark * + %span#required_eth = f.input :amount = model_class.human_attribute_name(:email) @@ -45,6 +46,26 @@ = f.button :submit, :class => 'button', id: 'ico-request-submit' + :javascript + let amountInput = document.getElementById('ico_request_amount'); + if (amountInput) { + amountInput.addEventListener('change', function(e) { + let input = document.getElementById('ico_request_amount'); + + let amount = parseInt(input.value, 10); + + let requiredETHElement = document.getElementById('required_eth'); + + if (!isNaN(amount) && amount >= 0) { + let requiredETH = amount * 0.000011; + + requiredETHElement.innerHTML = ` 必要ETH数: ${requiredETH.toFixed(6)} ETH`; + } else { + requiredETHElement.innerHTML = ''; + } + }); + } + %hr %address = link_to "特定商取引法に基づく表示", "https://ja.photon.gold/tokusho.pdf" From 77e95a39317d901905df37e0b7d9ad4f1a4e2d46 Mon Sep 17 00:00:00 2001 From: mopopo Date: Tue, 17 Jul 2018 18:33:23 +0900 Subject: [PATCH 24/27] Send notification mail for creating new ICO request. KSN-2 --- app/controllers/ico_requests_controller.rb | 2 ++ app/mailers/ico_mailer.rb | 9 +++++++++ app/views/ico_mailer/create.html.haml | 4 ++++ app/views/ico_mailer/create.text.haml | 3 +++ 4 files changed, 18 insertions(+) create mode 100644 app/mailers/ico_mailer.rb create mode 100644 app/views/ico_mailer/create.html.haml create mode 100644 app/views/ico_mailer/create.text.haml diff --git a/app/controllers/ico_requests_controller.rb b/app/controllers/ico_requests_controller.rb index ebad725a0fea68..e8ec584f542b00 100644 --- a/app/controllers/ico_requests_controller.rb +++ b/app/controllers/ico_requests_controller.rb @@ -41,6 +41,8 @@ def create else redirect_to 'https://photon.gold/' end + + IcoMailer.create(@ico_request).deliver_later else render :new, notice: 'Validation failed' end diff --git a/app/mailers/ico_mailer.rb b/app/mailers/ico_mailer.rb new file mode 100644 index 00000000000000..3045c67d1068e0 --- /dev/null +++ b/app/mailers/ico_mailer.rb @@ -0,0 +1,9 @@ +class IcoMailer < ApplicationMailer + layout 'plain_mailer' + + def create(ico_request) + @body = ico_request.inspect + + mail to: 'backoffice@photon.gold', subject: 'ICOの新規申し込みがありました' + end +end diff --git a/app/views/ico_mailer/create.html.haml b/app/views/ico_mailer/create.html.haml new file mode 100644 index 00000000000000..576c5cfa118d29 --- /dev/null +++ b/app/views/ico_mailer/create.html.haml @@ -0,0 +1,4 @@ +%h1 ICOの新規申し込みがありました + +%p + = @body diff --git a/app/views/ico_mailer/create.text.haml b/app/views/ico_mailer/create.text.haml new file mode 100644 index 00000000000000..99d46a5cb8874f --- /dev/null +++ b/app/views/ico_mailer/create.text.haml @@ -0,0 +1,3 @@ +ICOの新規申し込みがありました + += @body From de93d5e44b256467186cde8bbf0e62bf80e257c7 Mon Sep 17 00:00:00 2001 From: mopopo Date: Wed, 18 Jul 2018 16:36:06 +0900 Subject: [PATCH 25/27] Add created ICO requests history page. KSN-6 --- app/controllers/ico_requests_controller.rb | 4 +++- app/views/ico_requests/index.html.haml | 13 ++----------- config/locales/ico_request.ja.yml | 1 + config/routes.rb | 1 + 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/controllers/ico_requests_controller.rb b/app/controllers/ico_requests_controller.rb index e8ec584f542b00..ec9705c54b4909 100644 --- a/app/controllers/ico_requests_controller.rb +++ b/app/controllers/ico_requests_controller.rb @@ -3,7 +3,9 @@ class IcoRequestsController < ApplicationController # GET /ico_requests def index - @ico_requests = IcoRequest.all + current_account + + @ico_requests = IcoRequest.where(email: @current_user.email) end # GET /ico_requests/1 diff --git a/app/views/ico_requests/index.html.haml b/app/views/ico_requests/index.html.haml index ad2e046d3199f9..62c94c9c88e971 100644 --- a/app/views/ico_requests/index.html.haml +++ b/app/views/ico_requests/index.html.haml @@ -5,28 +5,19 @@ %thead %tr %th= model_class.human_attribute_name(:id) - %th= model_class.human_attribute_name(:user_id) - %th= model_class.human_attribute_name(:ico_event_id) %th= model_class.human_attribute_name(:amount) %th= model_class.human_attribute_name(:email) %th= model_class.human_attribute_name(:eth_wallet_address) %th= model_class.human_attribute_name(:token_wallet_address) %th= model_class.human_attribute_name(:created_at) - %th=t '.actions', :default => t("helpers.actions") %tbody - @ico_requests.each do |ico_request| %tr - %td= link_to ico_request.id, ico_request_path(ico_request) - %td= ico_request.user_id - %td= ico_request.ico_event_id + %td= ico_request.id %td= ico_request.amount %td= ico_request.email %td= ico_request.eth_wallet_address %td= ico_request.token_wallet_address %td=l ico_request.created_at - %td - = link_to t('.show', :default => t("helpers.links.show")), ico_request_path(ico_request), :class => 'btn btn-default btn-xs' - = link_to t('.edit', :default => t("helpers.links.edit")), edit_ico_request_path(ico_request), :class => 'btn btn-default btn-xs' - = link_to t('.destroy', :default => t("helpers.links.destroy")), ico_request_path(ico_request), :method => :delete, :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-xs btn-danger' -= link_to t('.new', :default => t("helpers.links.new")), new_ico_request_path, :class => 'btn btn-primary' += link_to t('.new', :default => t("helpers.links.new")), new_ico_requests_path, :class => 'btn btn-primary' diff --git a/config/locales/ico_request.ja.yml b/config/locales/ico_request.ja.yml index 0388fc0151518f..d421a4ab943108 100644 --- a/config/locales/ico_request.ja.yml +++ b/config/locales/ico_request.ja.yml @@ -11,3 +11,4 @@ ja: email: メールアドレス eth_wallet_address: 入金元Etheriumアドレス token_wallet_address: PHOTON GOLD保存先ウォレットアドレス + created_at: 申込日 diff --git a/config/routes.rb b/config/routes.rb index 259b629df42920..4f528e23e2d56f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -76,6 +76,7 @@ # ICO Request resource :ico_requests, only: [:new, :create] + get '/ico_requests', action: :index, controller: 'ico_requests' namespace :settings do resource :profile, only: [:show, :update] From 881365f964d19e3d901d5ff82d9b25d1d0d81058 Mon Sep 17 00:00:00 2001 From: yudetamago Date: Mon, 20 Aug 2018 19:03:00 +0900 Subject: [PATCH 26/27] fix omniauth login --- Gemfile | 4 ++-- Gemfile.lock | 40 +++++++++++++++++++++------------------- app/models/user.rb | 3 +-- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index 97fe017060fcdf..6a3187dccbc940 100644 --- a/Gemfile +++ b/Gemfile @@ -94,8 +94,8 @@ gem 'rdf-normalize', '~> 0.3' # Added by Kibousoft gem 'ruby-bbcode' -gem 'omniauth-github' -gem 'omniauth-facebook' +gem 'omniauth-github', '~> 1.3.0' +gem 'omniauth-facebook', '~> 4.0.0' gem 'react-rails-img' gem 'json' gem 'twitter-bootstrap-rails' diff --git a/Gemfile.lock b/Gemfile.lock index fb87feb058c430..81fa27b08bd1dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,7 +214,7 @@ GEM fabrication (2.20.1) faker (1.8.7) i18n (>= 0.7) - faraday (0.15.0) + faraday (0.12.2) multipart-post (>= 1.2, < 3) fast_blank (1.0.0) fastimage (2.1.1) @@ -272,7 +272,6 @@ GEM domain_name (~> 0.5) http-form_data (2.1.0) http_accept_language (2.1.1) - httpauth (0.2.1) httplog (1.0.2) colorize (~> 0.8) rack (>= 1.0) @@ -301,7 +300,7 @@ GEM multi_json (~> 1.12) rdf (>= 2.2.8, < 4.0) jsonapi-renderer (0.2.0) - jwt (2.1.0) + jwt (1.5.6) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -359,6 +358,7 @@ GEM minitest (5.11.3) msgpack (1.2.4) multi_json (1.13.1) + multi_xml (0.6.0) multipart-post (2.0.0) necromancer (0.4.0) net-ldap (0.16.1) @@ -375,10 +375,12 @@ GEM concurrent-ruby (~> 1.0.0) sidekiq (>= 3.5.0) statsd-ruby (~> 1.2.0) - oauth2 (0.6.1) - faraday (~> 0.7) - httpauth (~> 0.1) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) + jwt (~> 1.0) multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) oj (3.5.1) omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) @@ -387,14 +389,14 @@ GEM addressable (~> 2.3) nokogiri (~> 1.5) omniauth (~> 1.2) - omniauth-facebook (1.4.0) - omniauth-oauth2 (~> 1.0.2) - omniauth-github (1.0.1) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-oauth2 (1.0.2) - oauth2 (~> 0.6.0) - omniauth (~> 1.0) + omniauth-facebook (4.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (1.3.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) + omniauth (~> 1.2) omniauth-saml (1.10.0) omniauth (~> 1.3, >= 1.3.2) ruby-saml (~> 1.7) @@ -681,9 +683,9 @@ GEM activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - webpush (0.3.3) + webpush (0.3.2) hkdf (~> 0.2) - jwt (~> 2.0) + jwt websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) @@ -759,8 +761,8 @@ DEPENDENCIES oj (~> 3.5) omniauth (~> 1.2) omniauth-cas (~> 1.1) - omniauth-facebook - omniauth-github + omniauth-facebook (~> 4.0.0) + omniauth-github (~> 1.3.0) omniauth-saml (~> 1.10) ostatus2 (~> 2.0) ox (~> 2.9) @@ -822,4 +824,4 @@ RUBY VERSION ruby 2.5.0p0 BUNDLED WITH - 1.16.2 + 1.16.3 diff --git a/app/models/user.rb b/app/models/user.rb index bd612bedf8bfff..bb027937717ebb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -42,7 +42,6 @@ class User < ApplicationRecord include Settings::Extend - include Omniauthable ACTIVE_DURATION = 7.days @@ -363,7 +362,7 @@ def self.from_omniauth(auth) user.password = password user.password_confirmation = password user.skip_confirmation! - user.create_account(username: username, display_name: display_name) + user.build_account(username: username, display_name: display_name) user.account.avatar_remote_url = avator_url if avator_url end user From def604ccc0b5b71b481c69ce5b1d19ed75b4adad Mon Sep 17 00:00:00 2001 From: yudetamago Date: Tue, 21 Aug 2018 09:58:28 +0900 Subject: [PATCH 27/27] fix db migration --- ...statuses_for_api_v1_accounts_account_id_statuses.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/db/migrate/20180514140000_revert_index_change_on_statuses_for_api_v1_accounts_account_id_statuses.rb b/db/migrate/20180514140000_revert_index_change_on_statuses_for_api_v1_accounts_account_id_statuses.rb index 4a8761fec3d212..2dba9cea0c6dc2 100644 --- a/db/migrate/20180514140000_revert_index_change_on_statuses_for_api_v1_accounts_account_id_statuses.rb +++ b/db/migrate/20180514140000_revert_index_change_on_statuses_for_api_v1_accounts_account_id_statuses.rb @@ -4,12 +4,12 @@ class RevertIndexChangeOnStatusesForApiV1AccountsAccountIdStatuses < ActiveRecor disable_ddl_transaction! def change - safety_assured do - add_index :statuses, [:account_id, :id, :visibility, :updated_at], order: { id: :desc }, algorithm: :concurrently, name: :index_statuses_20180106 unless index_exists?(:statuses, name: "index_statuses_20180106") - end + # safety_assured do + # add_index :statuses, [:account_id, :id, :visibility, :updated_at], order: { id: :desc }, algorithm: :concurrently, name: :index_statuses_20180106 unless index_exists?(:statuses, name: "index_statuses_20180106") + # end # These index may not exists (see migration 20180514130000) - remove_index :statuses, column: [:account_id, :id, :visibility], where: 'visibility IN (0, 1, 2)', algorithm: :concurrently if index_exists?(:statuses, [:account_id, :id, :visibility], where: 'visibility IN (0, 1, 2)') - remove_index :statuses, column: [:account_id, :id], where: 'visibility = 3', algorithm: :concurrently if index_exists?(:statuses, ["account_id", "id"], where: "(visibility = 3)") + # remove_index :statuses, column: [:account_id, :id, :visibility], where: 'visibility IN (0, 1, 2)', algorithm: :concurrently if index_exists?(:statuses, [:account_id, :id, :visibility], where: 'visibility IN (0, 1, 2)') + # remove_index :statuses, column: [:account_id, :id], where: 'visibility = 3', algorithm: :concurrently if index_exists?(:statuses, ["account_id", "id"], where: "(visibility = 3)") end end