-
-
-
-
-
-
-
-
-
diff --git a/果仁/app/views/index.html.erb b/果仁/app/views/index.html.erb
deleted file mode 100644
index a26047d..0000000
--- a/果仁/app/views/index.html.erb
+++ /dev/null
@@ -1,165 +0,0 @@
-
-
-
- <%= render 'layouts/nav' %>
-
-
-
-
-
\ No newline at end of file
diff --git a/果仁/app/views/layouts/_footer.html.erb b/果仁/app/views/layouts/_footer.html.erb
deleted file mode 100644
index e69de29..0000000
diff --git a/果仁/app/views/layouts/_head.html.erb b/果仁/app/views/layouts/_head.html.erb
deleted file mode 100644
index e69de29..0000000
diff --git a/果仁/app/views/layouts/_nav.html.erb b/果仁/app/views/layouts/_nav.html.erb
deleted file mode 100644
index 14c9351..0000000
--- a/果仁/app/views/layouts/_nav.html.erb
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/果仁/app/views/layouts/_refer.html.erb b/果仁/app/views/layouts/_refer.html.erb
deleted file mode 100644
index e89881a..0000000
--- a/果仁/app/views/layouts/_refer.html.erb
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/果仁/app/views/layouts/_title.html.erb b/果仁/app/views/layouts/_title.html.erb
deleted file mode 100644
index 84dd418..0000000
--- a/果仁/app/views/layouts/_title.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 我的联系人
-
- -
- <% @chat_with_users.each do |name,readed| %>
- <% if readed == false%>
-
-
-
-
- <%=name.to_s%>
-
-
-
- <% else %>
- -
-
-
- <%=name.to_s%>
-
-
- <% end %>
- <% end %>
-
-
- <%= @current_chat_user.name %>
-
-
- <% if !@current_chat_user.nil? %>
-
-
- -
- <% @current_messages.each do |message| %>
- <% if message.send_user == @user.id %>
-
-
-
- - --- <%= message.create_time %> -
-
-
- <% else %>
- -
-
- - - --
- <%= message.create_time %> -
-
- <% end %>
- <% end %>
-
 %>){kind=avatar}
<%= @user.name %>
- 
-
- <%= form_tag(controller: "login", action: "login", method: "post") do %>
-
-
\ No newline at end of file
diff --git a/果仁/app/views/main/main.html.erb b/果仁/app/views/main/main.html.erb
deleted file mode 100644
index eea207c..0000000
--- a/果仁/app/views/main/main.html.erb
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
- <%= form_tag(controller: "login", action: "login", method: "post") do %>
-
-
-
-
-
-
-
- 忘记密码？
-
-
-
-
-
-
-
- <% end %>
- - 还没有果壳账号？ -
- <%= link_to "注册新账户", signup_path, class: "btn btn-default-outline btn-block" %> -
-
-
-
-
diff --git a/果仁/app/views/shared/_error_messages.html.erb b/果仁/app/views/shared/_error_messages.html.erb
deleted file mode 100644
index 6aab48a..0000000
--- a/果仁/app/views/shared/_error_messages.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% if object.errors.any? %>
-
- <%= render 'layouts/nav' %>
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
- 用户名称
-
- - 发布时间 -
-
-
- - 的积分卡开始大家了解法律考试大家分开了贾老师的空间发了卡死了的解放军爱上的龙卷风阿斯兰的减肥了婕拉抗衰老的减肥了加拉克是大家拉来的解放军垃圾收来的快放假了阿里山的记录发来看埃里克圣诞节福利及拉得少两块街坊邻居拉来的减肥了垃圾是来得及
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 用户名称
-
- - 发布时间 -
-
-
-
- - 的积分卡开始大家了解法律考试大家分开了贾老师的空间发了卡死了的解放军爱上的龙卷风阿斯兰的减肥了婕拉抗衰老的减肥了加拉克是大家拉来的解放军垃圾收来的快放假了阿里山的记录发来看埃里克圣诞节福利及拉得少两块街坊邻居拉来的减肥了垃圾是来得及
-
-
-
-
-
-
-<% end %>
\ No newline at end of file
diff --git a/果仁/app/views/users/new.html.erb b/果仁/app/views/users/new.html.erb
deleted file mode 100644
index baf4e01..0000000
--- a/果仁/app/views/users/new.html.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-<% provide(:title, '用户注册') %>
-<% provide(:body_class, 'login2') %>
-
-
- The form contains <%= pluralize(object.errors.count, "error") %>.
-
- -
- <% object.errors.full_messages.each do |msg| %>
-
- <%= msg %> - <% end %> -
-
-
-
-
- <%= form_for(@user) do |f| %>
- <%= render 'shared/error_messages', object: f.object %>
-
-
\ No newline at end of file
diff --git a/果仁/back_code b/果仁/back_code
deleted file mode 100644
index 835b7f8..0000000
--- a/果仁/back_code
+++ /dev/null
@@ -1,12 +0,0 @@
- Message.create(content:"hello",send_user:5,recieve_user:6,create_time:DateTime.now,readed:false)
- user.send_messages.find_by(send_user:user.id)[:recieve_user]
- user.send_messages.select("recieve_user").
- user.send_messages.select(:recieve_user).find(1).recieve_user
-
- Message.where(send_user:5,recieve_user:6)
-
-
-Message.where(send_user:[6,8],recieve_user:[6,8]).select(:send_user,:recieve_user)
-user.recieve_messages.where(readed: false).count
-
-
diff --git a/果仁/bin/bundle b/果仁/bin/bundle
deleted file mode 100644
index 66e9889..0000000
--- a/果仁/bin/bundle
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')
diff --git a/果仁/bin/rails b/果仁/bin/rails
deleted file mode 100644
index 5badb2f..0000000
--- a/果仁/bin/rails
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-begin
- load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
- raise unless e.message.include?('spring')
-end
-APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
-require 'rails/commands'
diff --git a/果仁/bin/rake b/果仁/bin/rake
deleted file mode 100644
index d87d5f5..0000000
--- a/果仁/bin/rake
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-begin
- load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
- raise unless e.message.include?('spring')
-end
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run
diff --git a/果仁/bin/setup b/果仁/bin/setup
deleted file mode 100644
index e620b4d..0000000
--- a/果仁/bin/setup
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-require 'pathname'
-require 'fileutils'
-include FileUtils
-
-# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
-
-def system!(*args)
- system(*args) || abort("\n== Command #{args} failed ==")
-end
-
-chdir APP_ROOT do
- # This script is a starting point to setup your application.
- # Add necessary setup steps to this file.
-
- puts '== Installing dependencies =='
- system! 'gem install bundler --conservative'
- system('bundle check') || system!('bundle install')
-
- # puts "\n== Copying sample files =="
- # unless File.exist?('config/database.yml')
- # cp 'config/database.yml.sample', 'config/database.yml'
- # end
-
- puts "\n== Preparing database =="
- system! 'bin/rails db:setup'
-
- puts "\n== Removing old logs and tempfiles =="
- system! 'bin/rails log:clear tmp:clear'
-
- puts "\n== Restarting application server =="
- system! 'bin/rails restart'
-end
diff --git a/果仁/bin/spring b/果仁/bin/spring
deleted file mode 100644
index 9bc076b..0000000
--- a/果仁/bin/spring
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-# This file loads spring without using Bundler, in order to be fast.
-# It gets overwritten when you run the `spring binstub` command.
-
-unless defined?(Spring)
- require 'rubygems'
- require 'bundler'
-
- lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
- if spring = lockfile.specs.detect { |spec| spec.name == "spring" }
- Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
- gem 'spring', spring.version
- require 'spring/binstub'
- end
-end
diff --git a/果仁/bin/update b/果仁/bin/update
deleted file mode 100644
index a8e4462..0000000
--- a/果仁/bin/update
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-require 'pathname'
-require 'fileutils'
-include FileUtils
-
-# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
-
-def system!(*args)
- system(*args) || abort("\n== Command #{args} failed ==")
-end
-
-chdir APP_ROOT do
- # This script is a way to update your development environment automatically.
- # Add necessary update steps to this file.
-
- puts '== Installing dependencies =='
- system! 'gem install bundler --conservative'
- system('bundle check') || system!('bundle install')
-
- puts "\n== Updating database =="
- system! 'bin/rails db:migrate'
-
- puts "\n== Removing old logs and tempfiles =="
- system! 'bin/rails log:clear tmp:clear'
-
- puts "\n== Restarting application server =="
- system! 'bin/rails restart'
-end
diff --git a/果仁/config.ru b/果仁/config.ru
deleted file mode 100644
index f7ba0b5..0000000
--- a/果仁/config.ru
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is used by Rack-based servers to start the application.
-
-require_relative 'config/environment'
-
-run Rails.application
diff --git a/果仁/config/application.rb b/果仁/config/application.rb
deleted file mode 100644
index 086705c..0000000
--- a/果仁/config/application.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require_relative 'boot'
-
-require 'rails/all'
-
-# Require the gems listed in Gemfile, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(*Rails.groups)
-
-module GuorenPro
- class Application < Rails::Application
- # Settings in config/environments/* take precedence over those specified here.
- # Application configuration should go into files in config/initializers
- # -- all .rb files in that directory are automatically loaded.
- end
-end
diff --git a/果仁/config/boot.rb b/果仁/config/boot.rb
deleted file mode 100644
index 30f5120..0000000
--- a/果仁/config/boot.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-
-require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/果仁/config/cable.yml b/果仁/config/cable.yml
deleted file mode 100644
index 0bbde6f..0000000
--- a/果仁/config/cable.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-development:
- adapter: async
-
-test:
- adapter: async
-
-production:
- adapter: redis
- url: redis://localhost:6379/1
diff --git a/果仁/config/database.yml b/果仁/config/database.yml
deleted file mode 100644
index 1c1a37c..0000000
--- a/果仁/config/database.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# SQLite version 3.x
-# gem install sqlite3
-#
-# Ensure the SQLite 3 gem is defined in your Gemfile
-# gem 'sqlite3'
-#
-default: &default
- adapter: sqlite3
- pool: 5
- timeout: 5000
-
-development:
- <<: *default
- database: db/development.sqlite3
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
- <<: *default
- database: db/test.sqlite3
-
-production:
- <<: *default
- database: db/production.sqlite3
diff --git a/果仁/config/environment.rb b/果仁/config/environment.rb
deleted file mode 100644
index 426333b..0000000
--- a/果仁/config/environment.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Load the Rails application.
-require_relative 'application'
-
-# Initialize the Rails application.
-Rails.application.initialize!
diff --git a/果仁/config/environments/development.rb b/果仁/config/environments/development.rb
deleted file mode 100644
index 6f71970..0000000
--- a/果仁/config/environments/development.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-Rails.application.configure do
- # Settings specified here will take precedence over those in config/application.rb.
-
- # In the development environment your application's code is reloaded on
- # every request. This slows down response time but is perfect for development
- # since you don't have to restart the web server when you make code changes.
- config.cache_classes = false
-
- # Do not eager load code on boot.
- config.eager_load = false
-
- # Show full error reports.
- config.consider_all_requests_local = true
-
- # Enable/disable caching. By default caching is disabled.
- if Rails.root.join('tmp/caching-dev.txt').exist?
- config.action_controller.perform_caching = true
-
- config.cache_store = :memory_store
- config.public_file_server.headers = {
- 'Cache-Control' => 'public, max-age=172800'
- }
- else
- config.action_controller.perform_caching = false
-
- config.cache_store = :null_store
- end
-
- # Don't care if the mailer can't send.
- config.action_mailer.raise_delivery_errors = false
-
- config.action_mailer.perform_caching = false
-
- # Print deprecation notices to the Rails logger.
- config.active_support.deprecation = :log
-
- # Raise an error on page load if there are pending migrations.
- config.active_record.migration_error = :page_load
-
- # Debug mode disables concatenation and preprocessing of assets.
- # This option may cause significant delays in view rendering with a large
- # number of complex assets.
- config.assets.debug = true
-
- # Suppress logger output for asset requests.
- config.assets.quiet = true
-
- # Raises error for missing translations
- # config.action_view.raise_on_missing_translations = true
-
- # Use an evented file watcher to asynchronously detect changes in source code,
- # routes, locales, etc. This feature depends on the listen gem.
- config.file_watcher = ActiveSupport::EventedFileUpdateChecker
-end
diff --git a/果仁/config/environments/production.rb b/果仁/config/environments/production.rb
deleted file mode 100644
index 7d2eb3f..0000000
--- a/果仁/config/environments/production.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-Rails.application.configure do
- # Settings specified here will take precedence over those in config/application.rb.
-
- # Code is not reloaded between requests.
- config.cache_classes = true
-
- # Eager load code on boot. This eager loads most of Rails and
- # your application in memory, allowing both threaded web servers
- # and those relying on copy on write to perform better.
- # Rake tasks automatically ignore this option for performance.
- config.eager_load = true
-
- # Full error reports are disabled and caching is turned on.
- config.consider_all_requests_local = false
- config.action_controller.perform_caching = true
-
- # Disable serving static files from the `/public` folder by default since
- # Apache or NGINX already handles this.
- config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
-
- # Compress JavaScripts and CSS.
- config.assets.js_compressor = :uglifier
- # config.assets.css_compressor = :sass
-
- # Do not fallback to assets pipeline if a precompiled asset is missed.
- config.assets.compile = false
-
- # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
- # Enable serving of images, stylesheets, and JavaScripts from an asset server.
- # config.action_controller.asset_host = 'http://assets.example.com'
-
- # Specifies the header that your server uses for sending files.
- # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
- # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
-
- # Mount Action Cable outside main process or domain
- # config.action_cable.mount_path = nil
- # config.action_cable.url = 'wss://example.com/cable'
- # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
-
- # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
- # config.force_ssl = true
-
- # Use the lowest log level to ensure availability of diagnostic information
- # when problems arise.
- config.log_level = :debug
-
- # Prepend all log lines with the following tags.
- config.log_tags = [ :request_id ]
-
- # Use a different cache store in production.
- # config.cache_store = :mem_cache_store
-
- # Use a real queuing backend for Active Job (and separate queues per environment)
- # config.active_job.queue_adapter = :resque
- # config.active_job.queue_name_prefix = "guorenPro_#{Rails.env}"
- config.action_mailer.perform_caching = false
-
- # Ignore bad email addresses and do not raise email delivery errors.
- # Set this to true and configure the email server for immediate delivery to raise delivery errors.
- # config.action_mailer.raise_delivery_errors = false
-
- # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
- # the I18n.default_locale when a translation cannot be found).
- config.i18n.fallbacks = true
-
- # Send deprecation notices to registered listeners.
- config.active_support.deprecation = :notify
-
- # Use default logging formatter so that PID and timestamp are not suppressed.
- config.log_formatter = ::Logger::Formatter.new
-
- # Use a different logger for distributed setups.
- # require 'syslog/logger'
- # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
-
- if ENV["RAILS_LOG_TO_STDOUT"].present?
- logger = ActiveSupport::Logger.new(STDOUT)
- logger.formatter = config.log_formatter
- config.logger = ActiveSupport::TaggedLogging.new(logger)
- end
-
- # Do not dump schema after migrations.
- config.active_record.dump_schema_after_migration = false
-end
diff --git a/果仁/config/environments/test.rb b/果仁/config/environments/test.rb
deleted file mode 100644
index 30587ef..0000000
--- a/果仁/config/environments/test.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-Rails.application.configure do
- # Settings specified here will take precedence over those in config/application.rb.
-
- # The test environment is used exclusively to run your application's
- # test suite. You never need to work with it otherwise. Remember that
- # your test database is "scratch space" for the test suite and is wiped
- # and recreated between test runs. Don't rely on the data there!
- config.cache_classes = true
-
- # Do not eager load code on boot. This avoids loading your whole application
- # just for the purpose of running a single test. If you are using a tool that
- # preloads Rails for running tests, you may have to set it to true.
- config.eager_load = false
-
- # Configure public file server for tests with Cache-Control for performance.
- config.public_file_server.enabled = true
- config.public_file_server.headers = {
- 'Cache-Control' => 'public, max-age=3600'
- }
-
- # Show full error reports and disable caching.
- config.consider_all_requests_local = true
- config.action_controller.perform_caching = false
-
- # Raise exceptions instead of rendering exception templates.
- config.action_dispatch.show_exceptions = false
-
- # Disable request forgery protection in test environment.
- config.action_controller.allow_forgery_protection = false
- config.action_mailer.perform_caching = false
-
- # Tell Action Mailer not to deliver emails to the real world.
- # The :test delivery method accumulates sent emails in the
- # ActionMailer::Base.deliveries array.
- config.action_mailer.delivery_method = :test
-
- # Print deprecation notices to the stderr.
- config.active_support.deprecation = :stderr
-
- # Raises error for missing translations
- # config.action_view.raise_on_missing_translations = true
-end
diff --git a/果仁/config/initializers/application_controller_renderer.rb b/果仁/config/initializers/application_controller_renderer.rb
deleted file mode 100644
index 51639b6..0000000
--- a/果仁/config/initializers/application_controller_renderer.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# ApplicationController.renderer.defaults.merge!(
-# http_host: 'example.org',
-# https: false
-# )
diff --git a/果仁/config/initializers/assets.rb b/果仁/config/initializers/assets.rb
deleted file mode 100644
index 01ef3e6..0000000
--- a/果仁/config/initializers/assets.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
-
-# Add additional assets to the asset load path
-# Rails.application.config.assets.paths << Emoji.images_path
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
diff --git a/果仁/config/initializers/backtrace_silencers.rb b/果仁/config/initializers/backtrace_silencers.rb
deleted file mode 100644
index 59385cd..0000000
--- a/果仁/config/initializers/backtrace_silencers.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
-
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
diff --git a/果仁/config/initializers/cookies_serializer.rb b/果仁/config/initializers/cookies_serializer.rb
deleted file mode 100644
index 5a6a32d..0000000
--- a/果仁/config/initializers/cookies_serializer.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Specify a serializer for the signed and encrypted cookie jars.
-# Valid options are :json, :marshal, and :hybrid.
-Rails.application.config.action_dispatch.cookies_serializer = :json
diff --git a/果仁/config/initializers/filter_parameter_logging.rb b/果仁/config/initializers/filter_parameter_logging.rb
deleted file mode 100644
index 4a994e1..0000000
--- a/果仁/config/initializers/filter_parameter_logging.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
diff --git a/果仁/config/initializers/inflections.rb b/果仁/config/initializers/inflections.rb
deleted file mode 100644
index ac033bf..0000000
--- a/果仁/config/initializers/inflections.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new inflection rules using the following format. Inflections
-# are locale specific, and you may define rules for as many different
-# locales as you wish. All of these examples are active by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
-# inflect.plural /^(ox)$/i, '\1en'
-# inflect.singular /^(ox)en/i, '\1'
-# inflect.irregular 'person', 'people'
-# inflect.uncountable %w( fish sheep )
-# end
-
-# These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
-# inflect.acronym 'RESTful'
-# end
diff --git a/果仁/config/initializers/mime_types.rb b/果仁/config/initializers/mime_types.rb
deleted file mode 100644
index dc18996..0000000
--- a/果仁/config/initializers/mime_types.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
diff --git a/果仁/config/initializers/new_framework_defaults.rb b/果仁/config/initializers/new_framework_defaults.rb
deleted file mode 100644
index 0706caf..0000000
--- a/果仁/config/initializers/new_framework_defaults.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file contains migration options to ease your Rails 5.0 upgrade.
-#
-# Read the Rails 5.0 release notes for more info on each option.
-
-# Enable per-form CSRF tokens. Previous versions had false.
-Rails.application.config.action_controller.per_form_csrf_tokens = true
-
-# Enable origin-checking CSRF mitigation. Previous versions had false.
-Rails.application.config.action_controller.forgery_protection_origin_check = true
-
-# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
-# Previous versions had false.
-ActiveSupport.to_time_preserves_timezone = true
-
-# Require `belongs_to` associations by default. Previous versions had false.
-Rails.application.config.active_record.belongs_to_required_by_default = true
-
-# Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = false
-
-# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
-Rails.application.config.ssl_options = { hsts: { subdomains: true } }
diff --git a/果仁/config/initializers/session_store.rb b/果仁/config/initializers/session_store.rb
deleted file mode 100644
index 98213e1..0000000
--- a/果仁/config/initializers/session_store.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-Rails.application.config.session_store :cookie_store, key: '_guorenPro_session'
diff --git a/果仁/config/initializers/wrap_parameters.rb b/果仁/config/initializers/wrap_parameters.rb
deleted file mode 100644
index bbfc396..0000000
--- a/果仁/config/initializers/wrap_parameters.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# This file contains settings for ActionController::ParamsWrapper which
-# is enabled by default.
-
-# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-ActiveSupport.on_load(:action_controller) do
- wrap_parameters format: [:json]
-end
-
-# To enable root element in JSON for ActiveRecord objects.
-# ActiveSupport.on_load(:active_record) do
-# self.include_root_in_json = true
-# end
diff --git a/果仁/config/locales/en.yml b/果仁/config/locales/en.yml
deleted file mode 100644
index 0653957..0000000
--- a/果仁/config/locales/en.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-# I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-# <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-# I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
-en:
- hello: "Hello world"
diff --git a/果仁/config/puma.rb b/果仁/config/puma.rb
deleted file mode 100644
index f597e49..0000000
--- a/果仁/config/puma.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# Puma can serve each request in a thread from an internal thread pool.
-# The `threads` method setting takes two numbers a minimum and maximum.
-# Any libraries that use thread pools should be configured to match
-# the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum, this matches the default thread size of Active Record.
-#
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i
-threads threads_count, threads_count
-
-# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
-#
-port ENV.fetch("PORT") { 3000 }
-
-# Specifies the `environment` that Puma will run in.
-#
-environment ENV.fetch("RAILS_ENV") { "development" }
-
-# Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked webserver processes. If using threads and workers together
-# the concurrency of the application would be max `threads` * `workers`.
-# Workers do not work on JRuby or Windows (both of which do not support
-# processes).
-#
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
-
-# Use the `preload_app!` method when specifying a `workers` number.
-# This directive tells Puma to first boot the application and load code
-# before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory. If you use this option
-# you need to make sure to reconnect any threads in the `on_worker_boot`
-# block.
-#
-# preload_app!
-
-# The code in the `on_worker_boot` will be called if you are using
-# clustered mode by specifying a number of `workers`. After each worker
-# process is booted this block will be run, if you are using `preload_app!`
-# option you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, Ruby
-# cannot shared connections between processes.
-#
-# on_worker_boot do
-# ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
-# end
-
-# Allow puma to be restarted by `rails restart` command.
-plugin :tmp_restart
diff --git a/果仁/config/routes.rb b/果仁/config/routes.rb
deleted file mode 100644
index 9e445d4..0000000
--- a/果仁/config/routes.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-Rails.application.routes.draw do
- # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
- root 'login#init'
-
- get '/login', to: 'login#init'
- post '/login', to: 'login#login'
- get 'logout', to: 'login#logout'
-
- get '/signup', to: 'users#new'
-
- get '/main', to: 'main#show'
-
- get '/chat', to: 'chat#index'
- post '/newmsg', to: 'chat#new'
- get '/notify', to: 'chat#notify'
- get '/query', to: 'chat#query'
- get '/online',to: 'chat#online'
-
- resource :users
-
-end
diff --git a/果仁/config/secrets.yml b/果仁/config/secrets.yml
deleted file mode 100644
index 9da0ca9..0000000
--- a/果仁/config/secrets.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key is used for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rails secret` to generate a secure secret key.
-
-# Make sure the secrets in this file are kept private
-# if you're sharing your code publicly.
-
-development:
- secret_key_base: 8ab3235e7dc44697c9e006fd6671c54febf98219061b0d4dbff2fa773a193a2065a27e6c346d89ea3c2744c583ae55c39cc11961680df1fb60ccc075234ba0a9
-
-test:
- secret_key_base: 85eb5cb87c57f0a3d3d6f274489afbb7207608a4d95ac2faf5f7c3f5994aa96de132ab3b4a413cccf59542841e9d244bdb213f58d15942fcc4591871f31c28c5
-
-# Do not keep production secrets in the repository,
-# instead read values from the environment.
-production:
- secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff --git a/果仁/config/spring.rb b/果仁/config/spring.rb
deleted file mode 100644
index c9119b4..0000000
--- a/果仁/config/spring.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-%w(
- .ruby-version
- .rbenv-vars
- tmp/restart.txt
- tmp/caching-dev.txt
-).each { |path| Spring.watch(path) }
diff --git a/果仁/db/migrate/20161126085652_create_users.rb b/果仁/db/migrate/20161126085652_create_users.rb
deleted file mode 100644
index 17c7a68..0000000
--- a/果仁/db/migrate/20161126085652_create_users.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class CreateUsers < ActiveRecord::Migration[5.0]
- def change
- create_table :users do |t|
- t.string :name, unique: true
- t.string :email, unique: true
- t.string :picurl
- t.string :profession
- t.string :academy
- t.boolean :sexual
-
- t.timestamps
- end
- end
-end
diff --git a/果仁/db/migrate/20161126101925_create_messages.rb b/果仁/db/migrate/20161126101925_create_messages.rb
deleted file mode 100644
index e1ed96c..0000000
--- a/果仁/db/migrate/20161126101925_create_messages.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class CreateMessages < ActiveRecord::Migration[5.0]
- def change
- create_table :messages do |t|
- t.text :content
- t.integer :send_user
- t.integer :recieve_user
- t.datetime :create_time
- t.boolean :readed
- t.timestampcs
- end
- end
-end
diff --git a/果仁/db/migrate/20161126121451_add_password_digest_to_users.rb b/果仁/db/migrate/20161126121451_add_password_digest_to_users.rb
deleted file mode 100644
index 30a8d13..0000000
--- a/果仁/db/migrate/20161126121451_add_password_digest_to_users.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddPasswordDigestToUsers < ActiveRecord::Migration[5.0]
- def change
- add_column :users, :password_digest, :string
- end
-end
diff --git a/果仁/db/schema.rb b/果仁/db/schema.rb
deleted file mode 100644
index 6f0deb6..0000000
--- a/果仁/db/schema.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended that you check this file into your version control system.
-
-ActiveRecord::Schema.define(version: 20161126121451) do
-
- create_table "messages", force: :cascade do |t|
- t.text "content"
- t.integer "send_user"
- t.integer "recieve_user"
- t.datetime "create_time"
- t.boolean "readed"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
- end
-
- create_table "users", force: :cascade do |t|
- t.string "name"
- t.string "email"
- t.string "picurl"
- t.string "profession"
- t.string "academy"
- t.boolean "sexual"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
- t.string "password_digest"
- end
-
-end
diff --git a/果仁/db/seeds.rb b/果仁/db/seeds.rb
deleted file mode 100644
index 1beea2a..0000000
--- a/果仁/db/seeds.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
-#
-# Examples:
-#
-# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
-# Character.create(name: 'Luke', movie: movies.first)
diff --git a/果仁/lib/assets/.keep b/果仁/lib/assets/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/果仁/lib/tasks/.keep b/果仁/lib/tasks/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/果仁/log/.keep b/果仁/log/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/果仁/public/.DS_Store b/果仁/public/.DS_Store
deleted file mode 100644
index 6c7cf2e..0000000
Binary files a/果仁/public/.DS_Store and /dev/null differ
diff --git a/果仁/public/404.html b/果仁/public/404.html
deleted file mode 100644
index b612547..0000000
--- a/果仁/public/404.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
- <%= form_for(@user) do |f| %>
- <%= render 'shared/error_messages', object: f.object %>
-
-
-
-
-
-
- <%= f.text_field :name, class: 'form-control', placeholder: "请输入名称" %>
-
-
-
-
-
-
- <%= f.email_field :email, class: 'form-control', placeholder: "请输入邮箱" %>
-
-
-
-
-
-
- <%= f.password_field :password, class: 'form-control', placeholder: "请输入密码" %>
-
-
-
-
- <%= f.submit "注册", class: "btn btn-primary btn-block" %>
- <% end %>
-
-
-
- <%= f.password_field :password_confirmation, class: 'form-control',placeholder: "请再次输入密码" %>
-
- - 已经有果壳账号？ -
- <%= link_to "登陆", login_path, class: "btn btn-default-outline btn-block" %> - -
-
-
-
diff --git a/果仁/public/422.html b/果仁/public/422.html
deleted file mode 100644
index a21f82b..0000000
--- a/果仁/public/422.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
- The page you were looking for doesn't exist.
-You may have mistyped the address or the page may have moved.
-If you are the application owner check the logs for more information.
-
-
-
-
diff --git a/果仁/public/500.html b/果仁/public/500.html
deleted file mode 100644
index 061abc5..0000000
--- a/果仁/public/500.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
- The change you wanted was rejected.
-Maybe you tried to change something you didn't have access to.
-If you are the application owner check the logs for more information.
-
-
-
-
diff --git a/果仁/public/apple-touch-icon-precomposed.png b/果仁/public/apple-touch-icon-precomposed.png
deleted file mode 100644
index e69de29..0000000
diff --git a/果仁/public/apple-touch-icon.png b/果仁/public/apple-touch-icon.png
deleted file mode 100644
index e69de29..0000000
diff --git a/果仁/public/favicon.ico b/果仁/public/favicon.ico
deleted file mode 100644
index e69de29..0000000
diff --git a/果仁/public/font/fontawesome-webfont.eot b/果仁/public/font/fontawesome-webfont.eot
deleted file mode 100644
index 0662cb9..0000000
Binary files a/果仁/public/font/fontawesome-webfont.eot and /dev/null differ
diff --git a/果仁/public/font/fontawesome-webfont.svg b/果仁/public/font/fontawesome-webfont.svg
deleted file mode 100644
index 2edb4ec..0000000
--- a/果仁/public/font/fontawesome-webfont.svg
+++ /dev/null
@@ -1,399 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/果仁/public/font/fontawesome-webfont.ttf b/果仁/public/font/fontawesome-webfont.ttf
deleted file mode 100644
index d365924..0000000
Binary files a/果仁/public/font/fontawesome-webfont.ttf and /dev/null differ
diff --git a/果仁/public/font/fontawesome-webfont.woff b/果仁/public/font/fontawesome-webfont.woff
deleted file mode 100644
index b9bd17e..0000000
Binary files a/果仁/public/font/fontawesome-webfont.woff and /dev/null differ
diff --git a/果仁/public/font/fontawesome-webfontd41d.eot b/果仁/public/font/fontawesome-webfontd41d.eot
deleted file mode 100644
index 0662cb9..0000000
Binary files a/果仁/public/font/fontawesome-webfontd41d.eot and /dev/null differ
diff --git a/果仁/public/font/glyphicons-halflings-regular.eot b/果仁/public/font/glyphicons-halflings-regular.eot
deleted file mode 100644
index 87eaa43..0000000
Binary files a/果仁/public/font/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/果仁/public/font/glyphicons-halflings-regular.svg b/果仁/public/font/glyphicons-halflings-regular.svg
deleted file mode 100644
index 5fee068..0000000
--- a/果仁/public/font/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/果仁/public/font/glyphicons-halflings-regular.ttf b/果仁/public/font/glyphicons-halflings-regular.ttf
deleted file mode 100644
index be784dc..0000000
Binary files a/果仁/public/font/glyphicons-halflings-regular.ttf and /dev/null differ
diff --git a/果仁/public/font/glyphicons-halflings-regular.woff b/果仁/public/font/glyphicons-halflings-regular.woff
deleted file mode 100644
index 2cc3e48..0000000
Binary files a/果仁/public/font/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/果仁/public/font/glyphicons-halflings-regulard41d.eot b/果仁/public/font/glyphicons-halflings-regulard41d.eot
deleted file mode 100644
index 87eaa43..0000000
Binary files a/果仁/public/font/glyphicons-halflings-regulard41d.eot and /dev/null differ
diff --git a/果仁/public/font/se7en.eot b/果仁/public/font/se7en.eot
deleted file mode 100644
index f7f5482..0000000
Binary files a/果仁/public/font/se7en.eot and /dev/null differ
diff --git a/果仁/public/font/se7en.svg b/果仁/public/font/se7en.svg
deleted file mode 100644
index 1725ca4..0000000
--- a/果仁/public/font/se7en.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/果仁/public/font/se7en.ttf b/果仁/public/font/se7en.ttf
deleted file mode 100644
index 459ac42..0000000
Binary files a/果仁/public/font/se7en.ttf and /dev/null differ
diff --git a/果仁/public/font/se7en.woff b/果仁/public/font/se7en.woff
deleted file mode 100644
index e39aaa4..0000000
Binary files a/果仁/public/font/se7en.woff and /dev/null differ
diff --git a/果仁/public/font/se7end41d.eot b/果仁/public/font/se7end41d.eot
deleted file mode 100644
index f7f5482..0000000
Binary files a/果仁/public/font/se7end41d.eot and /dev/null differ
diff --git a/果仁/public/images/.DS_Store b/果仁/public/images/.DS_Store
deleted file mode 100644
index 235d260..0000000
Binary files a/果仁/public/images/.DS_Store and /dev/null differ
diff --git a/果仁/public/images/Thumbs.db b/果仁/public/images/Thumbs.db
deleted file mode 100644
index a8e798b..0000000
Binary files a/果仁/public/images/Thumbs.db and /dev/null differ
diff --git a/果仁/public/images/alpha.png b/果仁/public/images/alpha.png
deleted file mode 100644
index 684416d..0000000
Binary files a/果仁/public/images/alpha.png and /dev/null differ
diff --git a/果仁/public/images/avatar-female.jpg b/果仁/public/images/avatar-female.jpg
deleted file mode 100644
index 5af41f5..0000000
Binary files a/果仁/public/images/avatar-female.jpg and /dev/null differ
diff --git a/果仁/public/images/avatar-female.png b/果仁/public/images/avatar-female.png
deleted file mode 100644
index 2c5c8cd..0000000
Binary files a/果仁/public/images/avatar-female.png and /dev/null differ
diff --git a/果仁/public/images/avatar-female2.png b/果仁/public/images/avatar-female2.png
deleted file mode 100644
index b137eac..0000000
Binary files a/果仁/public/images/avatar-female2.png and /dev/null differ
diff --git a/果仁/public/images/avatar-male.jpg b/果仁/public/images/avatar-male.jpg
deleted file mode 100644
index f2e5526..0000000
Binary files a/果仁/public/images/avatar-male.jpg and /dev/null differ
diff --git a/果仁/public/images/avatar-male2.png b/果仁/public/images/avatar-male2.png
deleted file mode 100644
index 831b0dd..0000000
Binary files a/果仁/public/images/avatar-male2.png and /dev/null differ
diff --git a/果仁/public/images/chat-left.png b/果仁/public/images/chat-left.png
deleted file mode 100644
index 5932b75..0000000
Binary files a/果仁/public/images/chat-left.png and /dev/null differ
diff --git a/果仁/public/images/chat-left@2x.png b/果仁/public/images/chat-left@2x.png
deleted file mode 100644
index 4f7a188..0000000
Binary files a/果仁/public/images/chat-left@2x.png and /dev/null differ
diff --git a/果仁/public/images/chat-right.png b/果仁/public/images/chat-right.png
deleted file mode 100644
index 2e1b1f3..0000000
Binary files a/果仁/public/images/chat-right.png and /dev/null differ
diff --git a/果仁/public/images/chat-right@2x.png b/果仁/public/images/chat-right@2x.png
deleted file mode 100644
index 54f97f4..0000000
Binary files a/果仁/public/images/chat-right@2x.png and /dev/null differ
diff --git a/果仁/public/images/checkmark.png b/果仁/public/images/checkmark.png
deleted file mode 100644
index d0a0d76..0000000
Binary files a/果仁/public/images/checkmark.png and /dev/null differ
diff --git a/果仁/public/images/checkmark@2x.png b/果仁/public/images/checkmark@2x.png
deleted file mode 100644
index 8c0184b..0000000
Binary files a/果仁/public/images/checkmark@2x.png and /dev/null differ
diff --git a/果仁/public/images/fancybox_overlay.png b/果仁/public/images/fancybox_overlay.png
deleted file mode 100644
index d362949..0000000
Binary files a/果仁/public/images/fancybox_overlay.png and /dev/null differ
diff --git a/果仁/public/images/hue.png b/果仁/public/images/hue.png
deleted file mode 100644
index 56dd428..0000000
Binary files a/果仁/public/images/hue.png and /dev/null differ
diff --git a/果仁/public/images/icon-search.png b/果仁/public/images/icon-search.png
deleted file mode 100644
index 0cafe8c..0000000
Binary files a/果仁/public/images/icon-search.png and /dev/null differ
diff --git a/果仁/public/images/icon-search@2x.png b/果仁/public/images/icon-search@2x.png
deleted file mode 100644
index fd87533..0000000
Binary files a/果仁/public/images/icon-search@2x.png and /dev/null differ
diff --git a/果仁/public/images/image-iso.png b/果仁/public/images/image-iso.png
deleted file mode 100644
index ed294db..0000000
Binary files a/果仁/public/images/image-iso.png and /dev/null differ
diff --git a/果仁/public/images/image-iso2.jpg b/果仁/public/images/image-iso2.jpg
deleted file mode 100644
index 152668c..0000000
Binary files a/果仁/public/images/image-iso2.jpg and /dev/null differ
diff --git a/果仁/public/images/image-iso3.png b/果仁/public/images/image-iso3.png
deleted file mode 100644
index 031ad84..0000000
Binary files a/果仁/public/images/image-iso3.png and /dev/null differ
diff --git a/果仁/public/images/image-iso4.png b/果仁/public/images/image-iso4.png
deleted file mode 100644
index 887b53a..0000000
Binary files a/果仁/public/images/image-iso4.png and /dev/null differ
diff --git a/果仁/public/images/image-iso5.png b/果仁/public/images/image-iso5.png
deleted file mode 100644
index 701ec0a..0000000
Binary files a/果仁/public/images/image-iso5.png and /dev/null differ
diff --git a/果仁/public/images/image-iso6.png b/果仁/public/images/image-iso6.png
deleted file mode 100644
index 861ddd7..0000000
Binary files a/果仁/public/images/image-iso6.png and /dev/null differ
diff --git a/果仁/public/images/image-iso7.png b/果仁/public/images/image-iso7.png
deleted file mode 100644
index c75a914..0000000
Binary files a/果仁/public/images/image-iso7.png and /dev/null differ
diff --git a/果仁/public/images/image-iso8.png b/果仁/public/images/image-iso8.png
deleted file mode 100644
index bb2a0bf..0000000
Binary files a/果仁/public/images/image-iso8.png and /dev/null differ
diff --git a/果仁/public/images/image-iso9.png b/果仁/public/images/image-iso9.png
deleted file mode 100644
index c83b021..0000000
Binary files a/果仁/public/images/image-iso9.png and /dev/null differ
diff --git a/果仁/public/images/image5.jpg b/果仁/public/images/image5.jpg
deleted file mode 100644
index 9c99cc3..0000000
Binary files a/果仁/public/images/image5.jpg and /dev/null differ
diff --git a/果仁/public/images/image6.png b/果仁/public/images/image6.png
deleted file mode 100644
index 1e5ed77..0000000
Binary files a/果仁/public/images/image6.png and /dev/null differ
diff --git a/果仁/public/images/image7.png b/果仁/public/images/image7.png
deleted file mode 100644
index 943d783..0000000
Binary files a/果仁/public/images/image7.png and /dev/null differ
diff --git a/果仁/public/images/img-coast.jpg b/果仁/public/images/img-coast.jpg
deleted file mode 100644
index 2cfafb2..0000000
Binary files a/果仁/public/images/img-coast.jpg and /dev/null differ
diff --git a/果仁/public/images/info-data-sprite.png b/果仁/public/images/info-data-sprite.png
deleted file mode 100644
index ef940c6..0000000
Binary files a/果仁/public/images/info-data-sprite.png and /dev/null differ
diff --git a/果仁/public/images/info-data-sprite@2x.png b/果仁/public/images/info-data-sprite@2x.png
deleted file mode 100644
index c34bdae..0000000
Binary files a/果仁/public/images/info-data-sprite@2x.png and /dev/null differ
diff --git a/果仁/public/images/login-blurry-bg.jpg b/果仁/public/images/login-blurry-bg.jpg
deleted file mode 100644
index 6d22610..0000000
Binary files a/果仁/public/images/login-blurry-bg.jpg and /dev/null differ
diff --git a/果仁/public/images/logo-login@2x.png b/果仁/public/images/logo-login@2x.png
deleted file mode 100644
index a1e858c..0000000
Binary files a/果仁/public/images/logo-login@2x.png and /dev/null differ
diff --git a/果仁/public/images/logo/.DS_Store b/果仁/public/images/logo/.DS_Store
deleted file mode 100644
index 938d526..0000000
Binary files a/果仁/public/images/logo/.DS_Store and /dev/null differ
diff --git a/果仁/public/images/logo/guoke.png b/果仁/public/images/logo/guoke.png
deleted file mode 100644
index 636fd5e..0000000
Binary files a/果仁/public/images/logo/guoke.png and /dev/null differ
diff --git a/果仁/public/images/logo/guoren-small.png b/果仁/public/images/logo/guoren-small.png
deleted file mode 100644
index d080ad3..0000000
Binary files a/果仁/public/images/logo/guoren-small.png and /dev/null differ
diff --git a/果仁/public/images/logo/guoren-xs.png b/果仁/public/images/logo/guoren-xs.png
deleted file mode 100644
index 5615930..0000000
Binary files a/果仁/public/images/logo/guoren-xs.png and /dev/null differ
diff --git a/果仁/public/images/logo/guoren.png b/果仁/public/images/logo/guoren.png
deleted file mode 100644
index 294f76a..0000000
Binary files a/果仁/public/images/logo/guoren.png and /dev/null differ
diff --git a/果仁/public/images/nature1.jpg b/果仁/public/images/nature1.jpg
deleted file mode 100644
index 82a3ee2..0000000
Binary files a/果仁/public/images/nature1.jpg and /dev/null differ
diff --git a/果仁/public/images/nature2.jpg b/果仁/public/images/nature2.jpg
deleted file mode 100644
index c0a2c79..0000000
Binary files a/果仁/public/images/nature2.jpg and /dev/null differ
diff --git a/果仁/public/images/nature3.jpg b/果仁/public/images/nature3.jpg
deleted file mode 100644
index 12eb69e..0000000
Binary files a/果仁/public/images/nature3.jpg and /dev/null differ
diff --git a/果仁/public/images/nature4.jpg b/果仁/public/images/nature4.jpg
deleted file mode 100644
index ead2fa2..0000000
Binary files a/果仁/public/images/nature4.jpg and /dev/null differ
diff --git a/果仁/public/images/saturation.png b/果仁/public/images/saturation.png
deleted file mode 100644
index 3a8f199..0000000
Binary files a/果仁/public/images/saturation.png and /dev/null differ
diff --git a/果仁/public/images/se7en-logo.png b/果仁/public/images/se7en-logo.png
deleted file mode 100644
index f50078e..0000000
Binary files a/果仁/public/images/se7en-logo.png and /dev/null differ
diff --git a/果仁/public/images/se7en-logo@2x.png b/果仁/public/images/se7en-logo@2x.png
deleted file mode 100644
index 5ff322b..0000000
Binary files a/果仁/public/images/se7en-logo@2x.png and /dev/null differ
diff --git a/果仁/public/images/select2-spinner.gif b/果仁/public/images/select2-spinner.gif
deleted file mode 100644
index 5b33f7e..0000000
Binary files a/果仁/public/images/select2-spinner.gif and /dev/null differ
diff --git a/果仁/public/images/select2.png b/果仁/public/images/select2.png
deleted file mode 100644
index 1d804ff..0000000
Binary files a/果仁/public/images/select2.png and /dev/null differ
diff --git a/果仁/public/images/select2x2.png b/果仁/public/images/select2x2.png
deleted file mode 100644
index 6ebd939..0000000
Binary files a/果仁/public/images/select2x2.png and /dev/null differ
diff --git a/果仁/public/images/sn-logo@2x.png b/果仁/public/images/sn-logo@2x.png
deleted file mode 100644
index 0e9f602..0000000
Binary files a/果仁/public/images/sn-logo@2x.png and /dev/null differ
diff --git a/果仁/public/images/social-image.jpg b/果仁/public/images/social-image.jpg
deleted file mode 100644
index feedd5f..0000000
Binary files a/果仁/public/images/social-image.jpg and /dev/null differ
diff --git a/果仁/public/javascripts/.DS_Store b/果仁/public/javascripts/.DS_Store
deleted file mode 100644
index b7297f7..0000000
Binary files a/果仁/public/javascripts/.DS_Store and /dev/null differ
diff --git a/果仁/public/javascripts/application.js b/果仁/public/javascripts/application.js
deleted file mode 100644
index 032bb4b..0000000
--- a/果仁/public/javascripts/application.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-;
diff --git a/果仁/public/javascripts/bootstrap-colorpicker.js b/果仁/public/javascripts/bootstrap-colorpicker.js
deleted file mode 100644
index 623dd93..0000000
--- a/果仁/public/javascripts/bootstrap-colorpicker.js
+++ /dev/null
@@ -1,542 +0,0 @@
-/* =========================================================
- * bootstrap-colorpicker.js
- * http://www.eyecon.ro/bootstrap-colorpicker
- * =========================================================
- * Copyright 2012 Stefan Petre
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-
-!function( $ ) {
-
- // Color object
-
- var Color = function(val) {
- this.value = {
- h: 1,
- s: 1,
- b: 1,
- a: 1
- };
- this.setColor(val);
- };
-
- Color.prototype = {
- constructor: Color,
-
- //parse a string to HSB
- setColor: function(val){
- val = val.toLowerCase();
- var that = this;
- $.each( CPGlobal.stringParsers, function( i, parser ) {
- var match = parser.re.exec( val ),
- values = match && parser.parse( match ),
- space = parser.space||'rgba';
- if ( values ) {
- if (space === 'hsla') {
- that.value = CPGlobal.RGBtoHSB.apply(null, CPGlobal.HSLtoRGB.apply(null, values));
- } else {
- that.value = CPGlobal.RGBtoHSB.apply(null, values);
- }
- return false;
- }
- });
- },
-
- setHue: function(h) {
- this.value.h = 1- h;
- },
-
- setSaturation: function(s) {
- this.value.s = s;
- },
-
- setLightness: function(b) {
- this.value.b = 1- b;
- },
-
- setAlpha: function(a) {
- this.value.a = parseInt((1 - a)*100, 10)/100;
- },
-
- // HSBtoRGB from RaphaelJS
- // https://github.com/DmitryBaranovskiy/raphael/
- toRGB: function(h, s, b, a) {
- if (!h) {
- h = this.value.h;
- s = this.value.s;
- b = this.value.b;
- }
- h *= 360;
- var R, G, B, X, C;
- h = (h % 360) / 60;
- C = b * s;
- X = C * (1 - Math.abs(h % 2 - 1));
- R = G = B = b - C;
-
- h = ~~h;
- R += [C, X, 0, 0, X, C][h];
- G += [X, C, C, X, 0, 0][h];
- B += [0, 0, X, C, C, X][h];
- return {
- r: Math.round(R*255),
- g: Math.round(G*255),
- b: Math.round(B*255),
- a: a||this.value.a
- };
- },
-
- toHex: function(h, s, b, a){
- var rgb = this.toRGB(h, s, b, a);
- return '#'+((1 << 24) | (parseInt(rgb.r) << 16) | (parseInt(rgb.g) << 8) | parseInt(rgb.b)).toString(16).substr(1);
- },
-
- toHSL: function(h, s, b, a){
- if (!h) {
- h = this.value.h;
- s = this.value.s;
- b = this.value.b;
- }
- var H = h,
- L = (2 - s) * b,
- S = s * b;
- if (L > 0 && L <= 1) {
- S /= L;
- } else {
- S /= 2 - L;
- }
- L /= 2;
- if (S > 1) {
- S = 1;
- }
- return {
- h: H,
- s: S,
- l: L,
- a: a||this.value.a
- };
- }
- };
-
- // Picker object
-
- var Colorpicker = function(element, options){
- this.element = $(element);
- var format = options.format||this.element.data('color-format')||'hex';
- this.format = CPGlobal.translateFormats[format];
- this.isInput = this.element.is('input');
- this.component = this.element.is('.color') ? this.element.find('.input-group-addon') : false;
-
- this.picker = $(CPGlobal.template)
- .appendTo('body')
- .on('mousedown', $.proxy(this.mousedown, this));
-
- if (this.isInput) {
- this.element.on({
- 'focus': $.proxy(this.show, this),
- 'keyup': $.proxy(this.update, this)
- });
- } else if (this.component){
- this.component.on({
- 'click': $.proxy(this.show, this)
- });
- } else {
- this.element.on({
- 'click': $.proxy(this.show, this)
- });
- }
- if (format === 'rgba' || format === 'hsla') {
- this.picker.addClass('alpha');
- this.alpha = this.picker.find('.colorpicker-alpha')[0].style;
- }
-
- if (this.component){
- this.picker.find('.colorpicker-color').hide();
- this.preview = this.element.find('i')[0].style;
- } else {
- this.preview = this.picker.find('div:last')[0].style;
- }
-
- this.base = this.picker.find('div:first')[0].style;
- this.update();
- };
-
- Colorpicker.prototype = {
- constructor: Colorpicker,
-
- show: function(e) {
- this.picker.show();
- this.height = this.component ? this.component.outerHeight() : this.element.outerHeight();
- this.place();
- $(window).on('resize', $.proxy(this.place, this));
- if (!this.isInput) {
- if (e) {
- e.stopPropagation();
- e.preventDefault();
- }
- }
- $(document).on({
- 'mousedown': $.proxy(this.hide, this)
- });
- this.element.trigger({
- type: 'show',
- color: this.color
- });
- },
-
- update: function(){
- this.color = new Color(this.isInput ? this.element.prop('value') : this.element.data('color'));
- this.picker.find('i')
- .eq(0).css({left: this.color.value.s*100, top: 100 - this.color.value.b*100}).end()
- .eq(1).css('top', 100 * (1 - this.color.value.h)).end()
- .eq(2).css('top', 100 * (1 - this.color.value.a));
- this.previewColor();
- },
-
- setValue: function(newColor) {
- this.color = new Color(newColor);
- this.picker.find('i')
- .eq(0).css({left: this.color.value.s*100, top: 100 - this.color.value.b*100}).end()
- .eq(1).css('top', 100 * (1 - this.color.value.h)).end()
- .eq(2).css('top', 100 * (1 - this.color.value.a));
- this.previewColor();
- this.element.trigger({
- type: 'changeColor',
- color: this.color
- });
- },
-
- hide: function(){
- this.picker.hide();
- $(window).off('resize', this.place);
- if (!this.isInput) {
- $(document).off({
- 'mousedown': this.hide
- });
- if (this.component){
- this.element.find('input').prop('value', this.format.call(this));
- }
- this.element.data('color', this.format.call(this));
- } else {
- this.element.prop('value', this.format.call(this));
- }
- this.element.trigger({
- type: 'hide',
- color: this.color
- });
- },
-
- place: function(){
- var offset = this.component ? this.component.offset() : this.element.offset();
- this.picker.css({
- top: offset.top + this.height,
- left: offset.left
- });
- },
-
- //preview color change
- previewColor: function(){
- try {
- this.preview.backgroundColor = this.format.call(this);
- } catch(e) {
- this.preview.backgroundColor = this.color.toHex();
- }
- //set the color for brightness/saturation slider
- this.base.backgroundColor = this.color.toHex(this.color.value.h, 1, 1, 1);
- //set te color for alpha slider
- if (this.alpha) {
- this.alpha.backgroundColor = this.color.toHex();
- }
- },
-
- pointer: null,
-
- slider: null,
-
- mousedown: function(e){
- e.stopPropagation();
- e.preventDefault();
-
- var target = $(e.target);
-
- //detect the slider and set the limits and callbacks
- var zone = target.closest('div');
- if (!zone.is('.colorpicker')) {
- if (zone.is('.colorpicker-saturation')) {
- this.slider = $.extend({}, CPGlobal.sliders.saturation);
- }
- else if (zone.is('.colorpicker-hue')) {
- this.slider = $.extend({}, CPGlobal.sliders.hue);
- }
- else if (zone.is('.colorpicker-alpha')) {
- this.slider = $.extend({}, CPGlobal.sliders.alpha);
- } else {
- return false;
- }
- var offset = zone.offset();
- //reference to knob's style
- this.slider.knob = zone.find('i')[0].style;
- this.slider.left = e.pageX - offset.left;
- this.slider.top = e.pageY - offset.top;
- this.pointer = {
- left: e.pageX,
- top: e.pageY
- };
- //trigger mousemove to move the knob to the current position
- $(document).on({
- mousemove: $.proxy(this.mousemove, this),
- mouseup: $.proxy(this.mouseup, this)
- }).trigger('mousemove');
- }
- return false;
- },
-
- mousemove: function(e){
- e.stopPropagation();
- e.preventDefault();
- var left = Math.max(
- 0,
- Math.min(
- this.slider.maxLeft,
- this.slider.left + ((e.pageX||this.pointer.left) - this.pointer.left)
- )
- );
- var top = Math.max(
- 0,
- Math.min(
- this.slider.maxTop,
- this.slider.top + ((e.pageY||this.pointer.top) - this.pointer.top)
- )
- );
- this.slider.knob.left = left + 'px';
- this.slider.knob.top = top + 'px';
- if (this.slider.callLeft) {
- this.color[this.slider.callLeft].call(this.color, left/100);
- }
- if (this.slider.callTop) {
- this.color[this.slider.callTop].call(this.color, top/100);
- }
- this.previewColor();
- this.element.trigger({
- type: 'changeColor',
- color: this.color
- });
- return false;
- },
-
- mouseup: function(e){
- e.stopPropagation();
- e.preventDefault();
- $(document).off({
- mousemove: this.mousemove,
- mouseup: this.mouseup
- });
- return false;
- }
- }
-
- $.fn.colorpicker = function ( option, val ) {
- return this.each(function () {
- var $this = $(this),
- data = $this.data('colorpicker'),
- options = typeof option === 'object' && option;
- if (!data) {
- $this.data('colorpicker', (data = new Colorpicker(this, $.extend({}, $.fn.colorpicker.defaults,options))));
- }
- if (typeof option === 'string') data[option](val);
- });
- };
-
- $.fn.colorpicker.defaults = {
- };
-
- $.fn.colorpicker.Constructor = Colorpicker;
-
- var CPGlobal = {
-
- // translate a format from Color object to a string
- translateFormats: {
- 'rgb': function(){
- var rgb = this.color.toRGB();
- return 'rgb('+rgb.r+','+rgb.g+','+rgb.b+')';
- },
-
- 'rgba': function(){
- var rgb = this.color.toRGB();
- return 'rgba('+rgb.r+','+rgb.g+','+rgb.b+','+rgb.a+')';
- },
-
- 'hsl': function(){
- var hsl = this.color.toHSL();
- return 'hsl('+Math.round(hsl.h*360)+','+Math.round(hsl.s*100)+'%,'+Math.round(hsl.l*100)+'%)';
- },
-
- 'hsla': function(){
- var hsl = this.color.toHSL();
- return 'hsla('+Math.round(hsl.h*360)+','+Math.round(hsl.s*100)+'%,'+Math.round(hsl.l*100)+'%,'+hsl.a+')';
- },
-
- 'hex': function(){
- return this.color.toHex();
- }
- },
-
- sliders: {
- saturation: {
- maxLeft: 100,
- maxTop: 100,
- callLeft: 'setSaturation',
- callTop: 'setLightness'
- },
-
- hue: {
- maxLeft: 0,
- maxTop: 100,
- callLeft: false,
- callTop: 'setHue'
- },
-
- alpha: {
- maxLeft: 0,
- maxTop: 100,
- callLeft: false,
- callTop: 'setAlpha'
- }
- },
-
- // HSBtoRGB from RaphaelJS
- // https://github.com/DmitryBaranovskiy/raphael/
- RGBtoHSB: function (r, g, b, a){
- r /= 255;
- g /= 255;
- b /= 255;
-
- var H, S, V, C;
- V = Math.max(r, g, b);
- C = V - Math.min(r, g, b);
- H = (C === 0 ? null :
- V == r ? (g - b) / C :
- V == g ? (b - r) / C + 2 :
- (r - g) / C + 4
- );
- H = ((H + 360) % 6) * 60 / 360;
- S = C === 0 ? 0 : C / V;
- return {h: H||1, s: S, b: V, a: a||1};
- },
-
- HueToRGB: function (p, q, h) {
- if (h < 0)
- h += 1;
- else if (h > 1)
- h -= 1;
-
- if ((h * 6) < 1)
- return p + (q - p) * h * 6;
- else if ((h * 2) < 1)
- return q;
- else if ((h * 3) < 2)
- return p + (q - p) * ((2 / 3) - h) * 6;
- else
- return p;
- },
-
- HSLtoRGB: function (h, s, l, a)
- {
- if (s < 0) {
- s = 0;
- }
- var q;
- if (l <= 0.5) {
- q = l * (1 + s);
- } else {
- q = l + s - (l * s);
- }
-
- var p = 2 * l - q;
-
- var tr = h + (1 / 3);
- var tg = h;
- var tb = h - (1 / 3);
-
- var r = Math.round(CPGlobal.HueToRGB(p, q, tr) * 255);
- var g = Math.round(CPGlobal.HueToRGB(p, q, tg) * 255);
- var b = Math.round(CPGlobal.HueToRGB(p, q, tb) * 255);
- return [r, g, b, a||1];
- },
-
- // a set of RE's that can match strings and generate color tuples.
- // from John Resig color plugin
- // https://github.com/jquery/jquery-color/
- stringParsers: [
- {
- re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
- parse: function( execResult ) {
- return [
- execResult[ 1 ],
- execResult[ 2 ],
- execResult[ 3 ],
- execResult[ 4 ]
- ];
- }
- }, {
- re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
- parse: function( execResult ) {
- return [
- 2.55 * execResult[1],
- 2.55 * execResult[2],
- 2.55 * execResult[3],
- execResult[ 4 ]
- ];
- }
- }, {
- re: /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,
- parse: function( execResult ) {
- return [
- parseInt( execResult[ 1 ], 16 ),
- parseInt( execResult[ 2 ], 16 ),
- parseInt( execResult[ 3 ], 16 )
- ];
- }
- }, {
- re: /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/,
- parse: function( execResult ) {
- return [
- parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ),
- parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ),
- parseInt( execResult[ 3 ] + execResult[ 3 ], 16 )
- ];
- }
- }, {
- re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
- space: 'hsla',
- parse: function( execResult ) {
- return [
- execResult[1]/360,
- execResult[2] / 100,
- execResult[3] / 100,
- execResult[4]
- ];
- }
- }
- ],
- template: ''
- };
-
-}( window.jQuery )
-;
diff --git a/果仁/public/javascripts/bootstrap-datepicker.js b/果仁/public/javascripts/bootstrap-datepicker.js
deleted file mode 100644
index 42aecda..0000000
--- a/果仁/public/javascripts/bootstrap-datepicker.js
+++ /dev/null
@@ -1,1259 +0,0 @@
-/* =========================================================
- * bootstrap-datepicker.js
- * http://www.eyecon.ro/bootstrap-datepicker
- * =========================================================
- * Copyright 2012 Stefan Petre
- * Improvements by Andrew Rowls
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-
-(function( $ ) {
-
- function UTCDate(){
- return new Date(Date.UTC.apply(Date, arguments));
- }
- function UTCToday(){
- var today = new Date();
- return UTCDate(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate());
- }
-
- // Picker object
-
- var Datepicker = function(element, options) {
- var that = this;
-
- this._process_options(options);
-
- this.element = $(element);
- this.isInline = false;
- this.isInput = this.element.is('input');
- this.component = this.element.is('.date') ? this.element.find('.add-on, .btn, .input-group-addon') : false;
- this.hasInput = this.component && this.element.find('input').length;
- if(this.component && this.component.length === 0)
- this.component = false;
-
- this.picker = $(DPGlobal.template);
- this._buildEvents();
- this._attachEvents();
-
- if(this.isInline) {
- this.picker.addClass('datepicker-inline').appendTo(this.element);
- } else {
- this.picker.addClass('datepicker-dropdown dropdown-menu');
- }
-
- if (this.o.rtl){
- this.picker.addClass('datepicker-rtl');
- this.picker.find('.prev i, .next i')
- .toggleClass('glyphicon glyphicon-arrow-left glyphicon-arrow-right');
- }
-
-
- this.viewMode = this.o.startView;
-
- if (this.o.calendarWeeks)
- this.picker.find('tfoot th.today')
- .attr('colspan', function(i, val){
- return parseInt(val) + 1;
- });
-
- this._allow_update = false;
-
- this.setStartDate(this.o.startDate);
- this.setEndDate(this.o.endDate);
- this.setDaysOfWeekDisabled(this.o.daysOfWeekDisabled);
-
- this.fillDow();
- this.fillMonths();
-
- this._allow_update = true;
-
- this.update();
- this.showMode();
-
- if(this.isInline) {
- this.show();
- }
- };
-
- Datepicker.prototype = {
- constructor: Datepicker,
-
- _process_options: function(opts){
- // Store raw options for reference
- this._o = $.extend({}, this._o, opts);
- // Processed options
- var o = this.o = $.extend({}, this._o);
-
- // Check if "de-DE" style date is available, if not language should
- // fallback to 2 letter code eg "de"
- var lang = o.language;
- if (!dates[lang]) {
- lang = lang.split('-')[0];
- if (!dates[lang])
- lang = defaults.language;
- }
- o.language = lang;
-
- switch(o.startView){
- case 2:
- case 'decade':
- o.startView = 2;
- break;
- case 1:
- case 'year':
- o.startView = 1;
- break;
- default:
- o.startView = 0;
- }
-
- switch (o.minViewMode) {
- case 1:
- case 'months':
- o.minViewMode = 1;
- break;
- case 2:
- case 'years':
- o.minViewMode = 2;
- break;
- default:
- o.minViewMode = 0;
- }
-
- o.startView = Math.max(o.startView, o.minViewMode);
-
- o.weekStart %= 7;
- o.weekEnd = ((o.weekStart + 6) % 7);
-
- var format = DPGlobal.parseFormat(o.format)
- if (o.startDate !== -Infinity) {
- o.startDate = DPGlobal.parseDate(o.startDate, format, o.language);
- }
- if (o.endDate !== Infinity) {
- o.endDate = DPGlobal.parseDate(o.endDate, format, o.language);
- }
-
- o.daysOfWeekDisabled = o.daysOfWeekDisabled||[];
- if (!$.isArray(o.daysOfWeekDisabled))
- o.daysOfWeekDisabled = o.daysOfWeekDisabled.split(/[,\s]*/);
- o.daysOfWeekDisabled = $.map(o.daysOfWeekDisabled, function (d) {
- return parseInt(d, 10);
- });
- },
- _events: [],
- _secondaryEvents: [],
- _applyEvents: function(evs){
- for (var i=0, el, ev; i
-
- We're sorry, but something went wrong.
-If you are the application owner check the logs for more information.
-'+
- '
';
-
- $.fn.datepicker.DPGlobal = DPGlobal;
-
-
- /* DATEPICKER NO CONFLICT
- * =================== */
-
- $.fn.datepicker.noConflict = function(){
- $.fn.datepicker = old;
- return this;
- };
-
-
- /* DATEPICKER DATA-API
- * ================== */
-
- $(document).on(
- 'focus.datepicker.data-api click.datepicker.data-api',
- '[data-provide="datepicker"]',
- function(e){
- var $this = $(this);
- if ($this.data('datepicker')) return;
- e.preventDefault();
- // component click requires us to explicitly show it
- $this.datepicker('show');
- }
- );
- $(function(){
- $('[data-provide="datepicker-inline"]').datepicker();
- });
-
-}( window.jQuery ));
diff --git a/果仁/public/javascripts/bootstrap-fileupload.js b/果仁/public/javascripts/bootstrap-fileupload.js
deleted file mode 100644
index cbd7808..0000000
--- a/果仁/public/javascripts/bootstrap-fileupload.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/* ===========================================================
- * bootstrap-fileupload.js j2
- * http://jasny.github.com/bootstrap/javascript.html#fileupload
- * ===========================================================
- * Copyright 2012 Jasny BV, Netherlands.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
- "use strict"; // jshint ;_
-
- /* FILEUPLOAD PUBLIC CLASS DEFINITION
- * ================================= */
-
- var Fileupload = function (element, options) {
- this.$element = $(element)
- this.type = this.$element.data('uploadtype') || (this.$element.find('.img-thumbnail').length > 0 ? "image" : "file")
-
- this.$input = this.$element.find(':file')
- if (this.$input.length === 0) return
-
- // this.name = this.$input.attr('name') || options.name
-
- this.$hidden = this.$element.find('input[type=hidden][name="'+this.name+'"]')
- if (this.$hidden.length === 0) {
- this.$hidden = $('')
- this.$element.prepend(this.$hidden)
- }
-
- this.$preview = this.$element.find('.fileupload-preview')
- var height = this.$preview.css('height')
- if (this.$preview.css('display') != 'inline' && height != '0px' && height != 'none') this.$preview.css('line-height', height)
-
- this.original = {
- 'exists': this.$element.hasClass('fileupload-exists'),
- 'preview': this.$preview.html(),
- 'hiddenVal': this.$hidden.val()
- }
-
- this.$remove = this.$element.find('[data-dismiss="fileupload"]')
-
- this.$element.find('[data-trigger="fileupload"]').on('click.fileupload', $.proxy(this.trigger, this))
-
- this.listen()
- }
-
- Fileupload.prototype = {
-
- listen: function() {
- this.$input.on('change.fileupload', $.proxy(this.change, this))
- $(this.$input[0].form).on('reset.fileupload', $.proxy(this.reset, this))
- if (this.$remove) this.$remove.on('click.fileupload', $.proxy(this.clear, this))
- },
-
- change: function(e, invoked) {
- if (invoked === 'clear') return
-
- var file = e.target.files !== undefined ? e.target.files[0] : (e.target.value ? { name: e.target.value.replace(/^.+\\/, '') } : null)
-
- if (!file) {
- this.clear()
- return
- }
-
- this.$hidden.val('')
- this.$hidden.attr('name', '')
- this.$input.attr('name', this.name)
-
- if (this.type === "image" && this.$preview.length > 0 && (typeof file.type !== "undefined" ? file.type.match('image.*') : file.name.match(/\.(gif|png|jpe?g)$/i)) && typeof FileReader !== "undefined") {
- var reader = new FileReader()
- var preview = this.$preview
- var element = this.$element
-
- console.log(preview.css('max-height'));
-
- reader.onload = function(e) {
- preview.html(''+
- ''+
- DPGlobal.headTemplate+
- ''+
- DPGlobal.footTemplate+
- '
'+
- '
'+
- ''+
- ''+
- DPGlobal.headTemplate+
- DPGlobal.contTemplate+
- DPGlobal.footTemplate+
- '
'+
- '
'+
- ''+
- ''+
- DPGlobal.headTemplate+
- DPGlobal.contTemplate+
- DPGlobal.footTemplate+
- '
'+
- '
'+
- '
- 评论时间 -
-- 评论内容 -
-