Xwitter 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9a7de9c9491bbb1ef648bb7d64cb3d596cc29803498e1d15180317a5a03a0e6
-  data.tar.gz: 6cb3d91654650cdef620521f02e643a87a62157b1912b099a9dd221fe5553568
+  metadata.gz: 0c3206d5937b3dd8ace31d035f2adf449345238404988dca84161ff08e6a6c92
+  data.tar.gz: f6e28c151af151500e1a89e8e2c82d7107c44e3e9b0d621ae567e30a7f6ca505
 SHA512:
-  metadata.gz: 21f27e91e3672305b8b7a777e3b49bea0a20581eb7436967b9014a2c5dc9dbee99529384483f0d2b98b76cfb954010439578d7171913cfac6d47595f17852db5
-  data.tar.gz: 624365d80d73c50c9e1f159fd6474ba175a2c5559fad1d6bef6ead1a9332e5912e66b4a25d40aaf1b2c374eaa37b77b4e715be0814602ddaa818a169efc552c3
+  metadata.gz: 9b2ec24637aaa2f548b36cd8f176ae49ca7bfb68615a9ea51e285dba740d694985dcd61c9f0fcb3920584e2bc19946db6c4d66282133a76c9019a729cbb5e2b5
+  data.tar.gz: 815a2749130be886714347715a2bef9c00cfe28850eb21bbc37592495273919acd9f507dbeaa4e361e42c1c52ec5e1e7f6fa444707c4ec296b230fd78e2cd7d7

data/Schemafile

@@ -8,6 +8,7 @@ create_table "users" do |t|
   t.boolean  "public", null: false, default: true
   t.datetime "reset_password_sent_at"
   t.datetime "remember_created_at"
+  t.string   "theme"
   t.timestamps null: false
   t.index ["name"], unique: true
 end

data/app/assets/stylesheets/{application.css → application.scss}

@@ -13,3 +13,4 @@
  *= require_tree .
  *= require_self
  */
+html, body { height: 100%; }

data/app/assets/stylesheets/messages.scss

@@ -1,3 +1,7 @@
-// Place all the styles related to the messages controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
+.timeline {
+  .message-item {
+    //cursor: pointer;
+    transition: background-color 0.6s;
+    &:hover { background-color: #f7f7f7; }
+  }
+}

data/app/assets/stylesheets/themes/dark.scss

@@ -0,0 +1,13 @@
+body.theme-dark {
+  background-color: #323a44;
+  color: #e2e5e6;
+  h1 {
+    color: #f4f6f7;
+  }
+  .timeline {
+    background-color: #293038;
+    .message-item:hover {
+      background-color: #525a63;
+    }
+  }
+}

data/app/controllers/profiles_controller.rb

@@ -45,6 +45,6 @@ class ProfilesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def user_params
-      params.require(:user).permit(:name, :screen_name)
+      params.require(:user).permit(:theme, :name, :screen_name)
     end
 end

data/app/views/layouts/application.html.slim

@@ -7,8 +7,9 @@ html
     = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
     = javascript_pack_tag 'application'
     = stylesheet_pack_tag 'application'
+    = stylesheet_link_tag 'application', 'data-turbolinks-track': 'reload'
     = stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/open-iconic/1.1.1/font/css/open-iconic-bootstrap.min.css'
-  body
+  body(class="theme-#{current_user.theme.to_s}")
     .navbar
       = link_to '/', root_path
 

data/app/views/messages/_index.html.slim

@@ -1,12 +1,14 @@
-- messages.order("created_at DESC").each do |message|
-  div
-    p
-      = message.user.screen_name
-      |  
-      = link_to '@' + message.user.name, '/' + message.user.name
+.timeline
+  ul
+    - messages.order("created_at DESC").each do |message|
+      li.message-item(onclick="Turbolinks.visit('/messages/#{message.id}')")
+        p
+          = message.user.screen_name
+          |  
+          = link_to '@' + message.user.name, '/' + message.user.name
 
-    p= message.text
-    p= l message.created_at
-    - if user_signed_in? && message.user == current_user
-      .oi.oi-trash
-      = link_to 'Destroy', message, data: { confirm: 'Are you sure?' }, method: :delete
+        p= message.text
+        p= l message.created_at
+        - if user_signed_in? && message.user == current_user
+          .oi.oi-trash
+          = link_to 'Destroy', message, data: { confirm: 'Are you sure?' }, method: :delete

data/app/views/messages/show.html.slim

@@ -1,9 +1,11 @@
-p#notice = notice
+h1
+  = @message.user.screen_name
+  |  
+  small= link_to "@#{@message.user.name}", '/' + @message.user.name
+p= @message.text
+p= l @message.created_at
 
-p
-  strong Text:
-  = @message.text
-
-=> link_to 'Edit', edit_message_path(@message)
-'|
+- if @message.user == current_user
+  => link_to 'Edit', edit_message_path(@message)
+  '|
 =< link_to 'Back', messages_path

data/app/views/profiles/_form.html.slim

@@ -12,4 +12,7 @@
   .field
     = f.label :screen_name
     = f.text_field :screen_name
+  .field
+    = f.label :theme
+    = f.select :theme, %w[dark], include_blank: 'default'
   .actions = f.submit

data/lib/Xwitter/version.rb

@@ -1,3 +1,3 @@
 module Xwitter
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Xwitter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - myun2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,9 +63,9 @@ files:
 - app/assets/javascripts/channels/.keep
 - app/assets/javascripts/messages.coffee
 - app/assets/javascripts/users.coffee
-- app/assets/stylesheets/application.css
+- app/assets/stylesheets/application.scss
 - app/assets/stylesheets/messages.scss
-- app/assets/stylesheets/scaffolds.scss
+- app/assets/stylesheets/themes/dark.scss
 - app/assets/stylesheets/users.scss
 - app/channels/application_cable/channel.rb
 - app/channels/application_cable/connection.rb

data/app/assets/stylesheets/scaffolds.scss

@@ -1,84 +0,0 @@
-body {
-  background-color: #fff;
-  color: #333;
-  margin: 33px;
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-}
-
-p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-a {
-  color: #000;
-
-  &:visited {
-    color: #666;
-  }
-
-  &:hover {
-    color: #fff;
-    background-color: #000;
-  }
-}
-
-th {
-  padding-bottom: 5px;
-}
-
-td {
-  padding: 0 5px 7px;
-}
-
-div {
-  &.field, &.actions {
-    margin-bottom: 10px;
-  }
-}
-
-#notice {
-  color: green;
-}
-
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table;
-}
-
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px 7px 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-
-  h2 {
-    text-align: left;
-    font-weight: bold;
-    padding: 5px 5px 5px 15px;
-    font-size: 12px;
-    margin: -7px -7px 0;
-    background-color: #c00;
-    color: #fff;
-  }
-
-  ul li {
-    font-size: 12px;
-    list-style: square;
-  }
-}
-
-label {
-  display: block;
-}