Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
cca7a38
Merge pull request #5 from FreemanHsu/dev
FreemanHsu Jun 2, 2015
1ecfb27
Merge pull request #10 from DeanChensj/master
FreemanHsu Jun 3, 2015
9f3ae7a
database schema
FreemanHsu Jun 3, 2015
58976f9
加入聊天室
DeanChensj Jun 3, 2015
ae3acfc
Merge pull request #11 from DeanChensj/dev
FreemanHsu Jun 3, 2015
a9eb0bc
Merge pull request #12 from FreemanHsu/dev
FreemanHsu Jun 3, 2015
068c505
add_friends
DeanChensj Jun 5, 2015
eadb5b2
Merge pull request #13 from DeanChensj/dev
FreemanHsu Jun 5, 2015
4d86795
Playground grunt setup
FreemanHsu Jun 5, 2015
07e356c
Added Gitter badge
gitter-badger Jun 5, 2015
bab02a7
edit user info now
DeanChensj Jun 5, 2015
08f279d
user_has_msg
DeanChensj Jun 5, 2015
7509894
Merge pull request #14 from gitter-badger/gitter-badge
FreemanHsu Jun 5, 2015
436e576
Merge pull request #15 from DeanChensj/dev
FreemanHsu Jun 5, 2015
dc4d784
playground
FreemanHsu Jun 5, 2015
f226c5f
Merge branch 'master' into dev
FreemanHsu Jun 5, 2015
b33bff5
Merge branch 'master' of https://github.com/FreemanHsu/CloudChat
FreemanHsu Jun 5, 2015
e2e9c81
站内信
DeanChensj Jun 6, 2015
b75f669
Merge pull request #16 from DeanChensj/dev
FreemanHsu Jun 6, 2015
409ce4d
playground css
FreemanHsu Jun 6, 2015
3c05206
some little change
DeanChensj Jun 7, 2015
b5566ae
下拉菜单
DeanChensj Jun 8, 2015
826da38
add some css
DeanChensj Jun 8, 2015
da38db6
Merge pull request #17 from DeanChensj/dev
FreemanHsu Jun 8, 2015
24cf10c
Merge branch 'dev' of https://github.com/FreemanHsu/CloudChat into dev
FreemanHsu Jun 8, 2015
cd93ad2
merged & playground
FreemanHsu Jun 8, 2015
2f66290
Merge pull request #18 from FreemanHsu/dev
FreemanHsu Jun 8, 2015
9e7a967
left side
FreemanHsu Jun 8, 2015
964046a
分页与搜索
DeanChensj Jun 9, 2015
90d5d03
homepage & seed
FreemanHsu Jun 9, 2015
0dd94e8
conflicts solved
FreemanHsu Jun 9, 2015
a941a65
Merge branch 'Dean-dev' into dev
FreemanHsu Jun 9, 2015
0c93a06
seeds & homepage
FreemanHsu Jun 9, 2015
cf711fc
Merge pull request #20 from FreemanHsu/dev
FreemanHsu Jun 9, 2015
09152b4
migration bug fixed
FreemanHsu Jun 9, 2015
4386a94
homepage list & seeds
FreemanHsu Jun 9, 2015
70489ab
adjust project structure
FreemanHsu Jun 9, 2015
9e831fd
css adjust
FreemanHsu Jun 9, 2015
0bb4d80
Merge branch 'dev'
FreemanHsu Jun 9, 2015
fb29089
add tag
DeanChensj Jun 9, 2015
141ec1a
conflict solved
FreemanHsu Jun 9, 2015
3fe0e5f
Merge branch 'Dean-dev' into dev
FreemanHsu Jun 9, 2015
16e011d
renew
FreemanHsu Jun 9, 2015
db42695
Merge https://github.com/FreemanHsu/CloudChat into dev
DeanChensj Jun 9, 2015
f123aec
seeds done
FreemanHsu Jun 9, 2015
0df2b91
Merge pull request #23 from FreemanHsu/dev
FreemanHsu Jun 9, 2015
5c210ec
dummy
DeanChensj Jun 9, 2015
7957482
conflicts
DeanChensj Jun 9, 2015
1ed7634
Merge branch 'andy_mas' into dev
DeanChensj Jun 9, 2015
01d173e
fddf
DeanChensj Jun 9, 2015
0e25ca9
login btn & tag bug fixed
FreemanHsu Jun 9, 2015
b8f4928
chatroom color schema changed
FreemanHsu Jun 9, 2015
4f5caa2
statics
FreemanHsu Jun 10, 2015
9e732f6
What have I done...
FreemanHsu Jun 10, 2015
028acfb
What the f...
FreemanHsu Jun 10, 2015
251d30c
backbone into rails
FreemanHsu Jun 10, 2015
3dbcdeb
Merge pull request #24 from FreemanHsu/dev
FreemanHsu Jun 10, 2015
22bca41
gitignore updated
FreemanHsu Jun 10, 2015
b21ce47
update ignores
FreemanHsu Jun 10, 2015
ab25902
翻页
DeanChensj Jun 11, 2015
cd6eaea
Merge pull request #25 from FreemanHsu/dev
FreemanHsu Jun 11, 2015
24ab87b
dfd
DeanChensj Jun 11, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp

/public/stylesheets/node_modules
/public/stylesheets/*.map
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
#Web Chatroom
#Web Chatroom

[![Join the chat at https://gitter.im/FreemanHsu/CloudChat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/FreemanHsu/CloudChat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Binary file added app/assets/images/andy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/angular.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/bower.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/cloud.jpeg
Binary file not shown.
Binary file added app/assets/images/cloudbg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/clouds.jpeg
Binary file not shown.
Binary file added app/assets/images/cpp.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/grunt.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/h5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/haskell.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/java.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/lisp.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/lua.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/node.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/python.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/python2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@
//= require jquery
//= require jquery_ujs
//= require turbolinks
//= require_tree .
//= require vendor/jquery.anystretch.min
//= require_tree .
3 changes: 3 additions & 0 deletions app/assets/javascripts/coffees/room_mems.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/coffees/tag.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/coffees/user_has_msg.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/coffees/users.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
17 changes: 0 additions & 17 deletions app/assets/javascripts/vendor/jquery.anystretch.min.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
*= require_tree .
*= require_self
*= require font-awesome
*/
*/
24 changes: 0 additions & 24 deletions app/assets/stylesheets/chatrooms.css.scss

This file was deleted.

18 changes: 0 additions & 18 deletions app/assets/stylesheets/room_mems.css.scss

This file was deleted.

69 changes: 0 additions & 69 deletions app/assets/stylesheets/scaffolds.css.scss

This file was deleted.

3 changes: 3 additions & 0 deletions app/assets/stylesheets/sections/chat_log.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the ChatLog controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
69 changes: 69 additions & 0 deletions app/assets/stylesheets/sections/chatrooms.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// Place all the styles related to the Chatrooms controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

.thumbnail{
margin-top: 20px;
margin-bottom: 0;
background-color: rgba(255,255,255,.5);
&:hover{
background-color: rgba(255,255,255,1);
}
p{
margin: 10px 0;
height: 60px;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
font-weight: 400;
}
img{
width: 80px;
height: 80px;
border: 1px solid #eee;
border-radius: 50% 50%;
&:hover{
border: 2px solid #3297ff;
cursor: pointer;
}
}
h3{
margin-top: -5px;
text-align: center;
font-weight: 400;
}
a{
color: #000;
display: inline-block;
width: 60px;
height: 20px;
text-align: center;
background-color: #fff;
border-radius: 4px;
float: right;
&:hover{
text-decoration: none;
background-color: #3297ff;
color: #fff;
}
}
}

.home-page-roomtag{
height: 20px;
overflow: hidden;
margin-bottom: 10px;
span{
margin-right: 5px;
a{
float:none;
background:rgba(0,0,0,0);
&:hover{
background:rgba(0,0,0,0);
}
}
&:hover{
background-color: #337ab7;
cursor: pointer;
}
}
}
112 changes: 101 additions & 11 deletions app/assets/stylesheets/sections/homepage.css.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,108 @@
// Place all the styles related to the homepage controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
.home-banner {
.site-nav{
position: relative;

.homepage-index{
background-color: #f1f0ed;
}

.jumbotron{
height: 600px;
background: none;
&:after{
min-height: 600px;
max-height: 600px;
content: '';
display: block;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
top: 0;
z-index: 9999;
padding-top: 60px;
background: image-url("cloudbg.jpg") center center;
background-size: cover;
z-index: -9999;
}
font-family: DP,sans-serif;
color: #fff;
h1{
font-size: 5em;
span{
font-weight: 700;
}
}
p{
margin: 5px 0;
font-size: 1.5em;
font-weight: 300;
}
}

.sign-btn{
height: 54px;
width: 290px;
margin-top: 45px;
a{
text-align: center;
display: inline-block;
position: relative;
padding: 18px 0;
font-size: 18px;
font-weight: 600;
letter-spacing: 2px;
line-height: 1;
height: 100%;
width: 100%;
border-radius: 5px;
background-color: #fff;
color: rgba(50,151,255,1);
font-family: proxima-nova-alt,Proxima Nova Alt,sans-serif;
border-bottom: 4px solid #eee;
border-left: 2px solid #eee;
&:hover{
text-decoration: none;
border-bottom: 2px solid #eee;
border-left: none;
}
}
}

#explore{
position: relative;
margin-top: -40px;
padding-top: 0px;
height: 60px;
background-color: #dbd8d0;
p{
color: #7d7669;
padding-top: 20px;
font-size: 1em;
text-align: center;
font-weight: 700;
}
.banner-inner {
margin: 0 auto;
height: 800px;
position: relative;
}
}

.login-btn{
position: absolute;
right: 50px;
top: 50px;
a{
cursor: pointer;
display: block;
width: 220px;
height: 40px;
border: 2px solid #fff;
border-radius: 4px;
background-color: rgba(50,151,255,0);
color: #fff;
text-decoration: none;
text-align: center;
font-size: 14px;
padding: 9px 0;
&:hover{
cursor: pointer;
background-color: #fff;
color: rgba(50,151,255,1);
}
}
}
3 changes: 3 additions & 0 deletions app/assets/stylesheets/sections/message.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the message controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/sections/room_mems.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the room_mems controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/sections/tag.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the Tag controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/sections/user_has_msg.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the UserHasMsg controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
2 changes: 1 addition & 1 deletion app/assets/stylesheets/sections/users.css.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Place all the styles related to the users controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
// You can use Sass (SCSS) here: http://sass-lang.com/
Loading