glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

great progress

Browse source
This commit is contained in:
Connor Turland 2015-12-11 14:23:41 -05:00
parent 2929547736
commit 089528c46d
20 changed files with 524 additions and 226 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Gemfile.lock
View file

@ -42,14 +42,8 @@ GEM
aws-sdk-v1 (1.66.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
aws-sdk (2.1.19)
aws-sdk-resources (= 2.1.19)
aws-sdk-core (2.1.19)
jmespath (~> 1.0)
aws-sdk-resources (2.1.19)
aws-sdk-core (= 2.1.19)
bcrypt (3.1.10)
best_in_place (3.0.3)
best_in_place (3.1.0)
actionpack (>= 3.2)
railties (>= 3.2)
better_errors (2.1.1)
@ -59,12 +53,11 @@ GEM
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (4.0.5)
columnize (= 0.9.0)
cancancan (1.12.0)
byebug (8.2.1)
cancancan (1.13.1)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.7)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0)
coffee-rails (4.1.0)
@ -73,8 +66,8 @@ GEM
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
columnize (0.9.0)
coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
debug_inspector (0.0.2)
devise (3.5.2)
bcrypt (~> 3.0)
@ -83,7 +76,7 @@ GEM
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
dotenv (2.0.0)
dotenv (2.0.2)
erubis (2.7.0)
execjs (2.6.0)
ezcrypto (0.7.2)
@ -94,7 +87,7 @@ GEM
globalid (0.3.6)
activesupport (>= 4.1.0)
i18n (0.7.0)
jbuilder (2.3.1)
jbuilder (2.3.2)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (4.0.5)
@ -112,28 +105,28 @@ GEM
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.6.1)
mime-types (2.99)
mimemagic (0.3.0)
mini_portile (0.6.2)
minitest (5.8.0)
mini_portile2 (2.0.0)
minitest (5.8.3)
multi_json (1.11.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.6.7)
mini_portile2 (~> 2.0.0.rc2)
oauth (0.4.7)
orm_adapter (0.5.0)
paperclip (4.3.0)
paperclip (4.3.2)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
pg (0.18.3)
pry (0.10.1)
pg (0.18.4)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.1.0)
byebug (~> 4.0)
pry-byebug (3.3.0)
byebug (~> 8.0)
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
@ -174,10 +167,10 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
redis (3.2.1)
redis (3.2.2)
responders (2.1.0)
railties (>= 4.2.0, < 5)
sass (3.4.18)
sass (3.4.19)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
@ -185,8 +178,9 @@ GEM
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
slop (3.6.0)
sprockets (3.3.4)
rack (~> 1.0)
sprockets (3.5.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)

16
app/assets/javascripts/src/Metamaps.Backbone.js.erb
View file

@ -206,6 +206,22 @@ Metamaps.Backbone.MapsCollection = Backbone.Collection.extend({
}
});
Metamaps.Backbone.Message = Backbone.Model.extend({
urlRoot: '/messages',
blacklist: ['created_at', 'updated_at'],
toJSON: function (options) {
return _.omit(this.attributes, this.blacklist);
},
prepareLiForFilter: function () {
/*var li = '';
li += '<li data-id="' + this.id.toString() + '">';      
li += '<img src="' + this.get("image") + '" data-id="' + this.id.toString() + '"';
li += ' alt="' + this.get('name') + '" />';      
li += '<p>' + this.get('name') + '</p></li>';
return li;*/
}
});
Metamaps.Backbone.Mapper = Backbone.Model.extend({
urlRoot: '/users',
blacklist: ['created_at', 'updated_at'],

1
app/assets/javascripts/src/Metamaps.GlobalUI.js.erb
View file

@ -333,7 +333,6 @@ Metamaps.GlobalUI.Account = {
open: function () {
var self = Metamaps.GlobalUI.Account;
Metamaps.Realtime.close();
Metamaps.Filter.close();
$('.sidebarAccountIcon .tooltipsUnder').addClass('hide');

370
app/assets/javascripts/src/Metamaps.js.erb
View file

File diff suppressed because it is too large Load diff

17
app/assets/javascripts/src/views/chatView.js
View file

@ -7,7 +7,7 @@ Metamaps.Views.chatView = (function () {
var Private = {
messageHTML: "<div class='chat-message'>" +
"<div class='chat-message-user'><img src='<%= image %>' title='<%= user %>'/></div>" +
"<div class='chat-message-user'><img src='<%= user_image %>' title='<%= user_name %>'/></div>" +
"<div class='chat-message-text'><%= message %></div>" +
"<div class='chat-message-time'><%= timestamp %></div>" +
"<div class='clearfloat'></div>" +
@ -46,9 +46,9 @@ Metamaps.Views.chatView = (function () {
this.$container.append(this.$juntoHeader);
this.$container.append(this.$participants);
this.$container.append(this.$chatHeader);
this.$container.append(this.$messageInput);
this.$container.append(this.$button);
this.$container.append(this.$messages);
this.$container.append(this.$messageInput);
},
addEventListeners: function() {
var self = this;
@ -116,12 +116,12 @@ Metamaps.Views.chatView = (function () {
var m = _.clone(message.attributes);
var today = new Date();
m.timestamp = new Date(m.timestamp);
m.timestamp = new Date(m.created_at);
var date = (m.timestamp.getMonth() + 1) + '/' + m.timestamp.getDate();
date += " " + addZero(m.timestamp.getHours()) + ":" + addZero(m.timestamp.getMinutes());
m.timestamp = date;
m.image = m.image || 'http://www.hotpepper.ca/wp-content/uploads/2014/11/default_profile_1_200x200.png';
m.image = m.user_image || 'http://www.hotpepper.ca/wp-content/uploads/2014/11/default_profile_1_200x200.png';
m.message = linker.link(m.message);
var $html = $(this.messageTemplate(m));
this.$messages.append($html);
@ -138,9 +138,6 @@ Metamaps.Views.chatView = (function () {
handleInputMessage: function() {
var message = {
message: this.$messageInput.val(),
timestamp: Date.now(),
user: this.mapper.get('name'),
image: this.mapper.get('image')
};
this.$messageInput.val('');
$(document).trigger(chatView.events.message + '-' + this.room, [message]);
@ -247,6 +244,12 @@ Metamaps.Views.chatView = (function () {
}, duration);
}
chatView.prototype.clearMessages = function () {
this.unreadMessages = 0;
this.$unread.hide();
this.$messages.empty();
}
chatView.prototype.close = function () {
this.$container.css({
right: '-300px'

79
app/assets/javascripts/src/views/room.js
View file

@ -40,6 +40,8 @@ Metamaps.Views.room = (function () {
this.isActiveRoom = false;
this.webrtc.leaveRoom();
this.chat.removeParticipants();
this.chat.clearMessages();
this.messages.reset();
}
room.prototype.setPeopleCount = function(count) {
@ -76,6 +78,55 @@ Metamaps.Views.room = (function () {
}
});
this.webrtc.on('mute', function (data) {
var v = self.videos[data.id];
if (!v) return;
if (data.name === 'audio') {
v.audioStatus = false;
}
else if (data.name === 'video') {
v.videoStatus = false;
v.$avatar.show();
}
if (!v.audioStatus && !v.videoStatus) v.$container.hide();
});
this.webrtc.on('unmute', function (data) {
var v = self.videos[data.id];
if (!v) return;
if (data.name === 'audio') {
v.audioStatus = true;
}
else if (data.name === 'video') {
v.videoStatus = true;
v.$avatar.hide();
}
v.$container.show();
});
this.socket.on('addVideo', function (data) {
var existingPeer = self.webrtc.webrtc.peers.find(function(p) { return p.id === data.id; });
if (!existingPeer) {
var peer = self.webrtc.webrtc.createPeer({
id: data.id,
type: 'video',
enableDataChannels: true,
receiveMedia: {
mandatory: {
OfferToReceiveAudio: true,
OfferToReceiveVideo: true
}
}
});
peer.avatar = data.avatar;
self.webrtc.emit('createdPeer', peer);
peer.start();
// the rest will happen automatically through the 'peerStreamAdded' event and associated event handlers
}
});
var sendChatMessage = function (event, data) {
self.sendChatMessage(data);
};
@ -90,22 +141,46 @@ Metamaps.Views.room = (function () {
var
id = this.webrtc.getDomId(peer),
video = attachMediaStream(peer.stream);
v = new VideoView(video, null, id, false, { DOUBLE_CLICK_TOLERANCE: 200 });
v = new VideoView(video, null, id, false, { DOUBLE_CLICK_TOLERANCE: 200, avatar: peer.avatar });
if (this._videoAdded) this._videoAdded(v);
this.videos[peer.id] = v;
}
room.prototype.removeVideo = function (peer) {
console.log(peer);
console.log('removeVideo', peer);
var id = typeof peer == 'string' ? peer : peer.id;
this.videos[id].remove();
delete this.videos[id];
}
room.prototype.sendChatMessage = function (data) {
var self = this;
//this.roomRef.child('messages').push(data);
console.log(data);
var m = new Metamaps.Backbone.Message({
message: data.message,
resource_id: Metamaps.Active.Map.id,
resource_type: "Map"
});
m.save(null, {
success: function (model, response) {
self.messages.add(model);
$(document).trigger(room.events.newMessage, [model]);
},
error: function (model, response) {
console.log('error!', response);
}
});
}
/**
* @class
* @static
*/
room.events = {
newMessage: "Room:newMessage"
};
return room;
})();

8
app/assets/javascripts/src/views/videoView.js
View file

@ -127,7 +127,8 @@ Metamaps.Views.videoView = (function () {
$vidContainer.addClass('video-cutoff');
$vidContainer.append(this.video);
this.$avatar = $('<img draggable="false" class="collaborator-video-avatar" src="/assets/default_profile.png" width="150" height="150" />');
this.avatar = config.avatar;
this.$avatar = $('<img draggable="false" class="collaborator-video-avatar" src="' + config.avatar + '" width="150" height="150" />');
$vidContainer.append(this.$avatar);
this.$container.append($vidContainer);
@ -157,6 +158,11 @@ Metamaps.Views.videoView = (function () {
});
}
videoView.prototype.setAvatar = function (src) {
this.$avatar.attr('src', src);
this.avatar = src;
}
videoView.prototype.remove = function () {
this.$container.off();
if (this.$parent) this.$parent.off('.video' + this.id);

10
app/assets/stylesheets/junto.css
View file

@ -69,6 +69,8 @@
}
.chat-box {
position: relative;
display: flex;
flex-direction: column;
z-index: 1;
width: 300px;
float: right;
@ -141,7 +143,7 @@
}
.chat-box .participants {
width: 100%;
height: 150px;
min-height: 150px;
padding: 16px 0px 0px 0px;
text-align: left;
color: #f5f5f5;
@ -203,10 +205,7 @@
background-position-y: -24px;
}
.chat-box .chat-input {
position: absolute;
bottom: 0;
left: 0;
height: 80px;
min-height: 80px;
width: 100%;
padding: 8px 8px 8px 8px;
font-size: 13px;
@ -214,7 +213,6 @@
}
.chat-box .chat-messages {
width: 100%;
height: 196px;
padding: 16px 0px 0px 0px;
overflow-y: auto;
}

4
app/controllers/maps_controller.rb
View file

@ -78,8 +78,9 @@ class MapsController < ApplicationController
object = m.mappable
!object || (object.permission == "private" && (!authenticated? || (authenticated? && @current.id != object.user_id)))
}
@allmessages = @map.messages
respond_with(@allmappers, @allmappings, @allsynapses, @alltopics, @map)
respond_with(@allmappers, @allmappings, @allsynapses, @alltopics, @allmessages, @map)
}
format.json { render json: @map }
end
@ -109,6 +110,7 @@ class MapsController < ApplicationController
@json['synapses'] = @allsynapses
@json['mappings'] = @allmappings
@json['mappers'] = @allmappers
@json['messages'] = @map.messages
respond_to do |format|
format.json { render json: @json }

62
app/controllers/messages_controller.rb Normal file
View file

@ -0,0 +1,62 @@
class MessagesController < ApplicationController
before_filter :require_user, except: [:show]
# GET /messages/1.json
def show
@message = Message.find(params[:id])
respond_to do |format|
format.json { render json: @message }
end
end
# POST /messages
# POST /messages.json
def create
@message = Message.new(message_params)
@message.user = current_user
respond_to do |format|
if @message.save
format.json { render json: @message, status: :created, location: messages_url }
else
format.json { render json: @message.errors, status: :unprocessable_entity }
end
end
end
# PUT /messages/1
# PUT /messages/1.json
def update
@message = Message.find(params[:id])
respond_to do |format|
if @message.update_attributes(message_params)
format.json { head :no_content }
else
format.json { render json: @message.errors, status: :unprocessable_entity }
end
end
end
# DELETE /messages/1
# DELETE /messages/1.json
def destroy
@message = Message.find(params[:id])
@message.destroy
respond_to do |format|
format.json { head :no_content }
end
end
private
# Never trust parameters from the scary internet, only allow the white list through.
def message_params
#params.require(:message).permit(:id, :resource_id, :message)
params.permit(:id, :resource_id, :resource_type, :message)
end
end

1
app/models/map.rb
View file

@ -6,6 +6,7 @@ class Map < ActiveRecord::Base
has_many :synapsemappings, -> { Mapping.synapsemapping }, class_name: :Mapping, dependent: :destroy
has_many :topics, through: :topicmappings, source: :mappable, source_type: "Topic"
has_many :synapses, through: :synapsemappings, source: :mappable, source_type: "Synapse"
has_many :messages, as: :resource, dependent: :destroy
# This method associates the attribute ":image" with a file attachment
has_attached_file :screenshot, :styles => {

54
app/models/message.rb Normal file
View file

@ -0,0 +1,54 @@
class Message < ActiveRecord::Base
belongs_to :user
belongs_to :resource, polymorphic: true
def user_name
self.user.name
end
def user_image
self.user.image.url
end
def as_json(options={})
json = super(:methods =>[:user_name, :user_image])
json
end
##### PERMISSIONS ######
def authorize_to_delete(user)
if (self.user != user)
return false
end
return self
end
# returns false if user not allowed to 'show' Topic, Synapse, or Map
def authorize_to_show(user)
if (self.resource && self.resource.permission == "private" && self.resource.user != user)
return false
end
return self
end
# returns false if user not allowed to 'edit' Topic, Synapse, or Map
def authorize_to_edit(user)
if !user
return false
elsif (self.user != user)
return false
end
return self
end
# returns Boolean if user allowed to view Topic, Synapse, or Map
def authorize_to_view(user)
if (self.resource && self.resource.permission == "private" && self.resource.user != user)
return false
end
return true
end
end

16
app/models/user.rb
View file

@ -10,9 +10,9 @@ class User < ActiveRecord::Base
before_create :generate_code
devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable
serialize :settings, UserPreference
validates :password, :presence => true,
:length => { :within => 8..40 },
:on => :create
@ -27,7 +27,7 @@ class User < ActiveRecord::Base
validates_uniqueness_of :email # done by devise
validates :joinedwithcode, :presence => true, :inclusion => { :in => $codes, :message => "%{value} is not valid" }, :on => :create
# This method associates the attribute ":image" with a file attachment
has_attached_file :image, :styles => {
:thirtytwo => ['32x32#', :png],
@ -36,7 +36,7 @@ class User < ActiveRecord::Base
:onetwentyeight => ['128x128#', :png]
},
:default_url => 'https://s3.amazonaws.com/metamaps-assets/site/user.png'
# Validate the attached image is image/jpg, image/png, etc
validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/
@ -61,7 +61,7 @@ class User < ActiveRecord::Base
json['rtype'] = "mapper"
json
end
#generate a random 8 letter/digit code that they can use to invite people
def generate_code
self.code = rand(36**8).to_s(36)
@ -78,10 +78,10 @@ class User < ActiveRecord::Base
if code == joinedwithcode
update(generation: 0)
else
update(generation: User.find_by_code(joinedwithcode) + 1)
update(generation: User.find_by_code(joinedwithcode).generation + 1)
end
end
def settings
# make sure we always return a UserPreference instance
if read_attribute(:settings).nil?
@ -89,7 +89,7 @@ class User < ActiveRecord::Base
end
read_attribute :settings
end
def settings=(val)
write_attribute :settings, val
end

1
app/views/layouts/_upperelements.html.erb
View file

@ -20,6 +20,7 @@
<div class="upperRightUI">
<div class="supportUs upperRightEl openLightbox" data-open="donate">SUPPORT US!</div>
<div class="mapElement upperRightEl upperRightMapButtons">
<div class="startVideo upperRightEl">start my video</div>
<!-- filtering -->
<div class="sidebarFilter upperRightEl">
<div class="sidebarFilterIcon upperRightIcon"><div class="tooltipsUnder">Filter</div></div>

1
app/views/maps/show.html.erb
View file

@ -13,5 +13,6 @@
Metamaps.Topics = <%= @alltopics.to_json.html_safe %>;
Metamaps.Synapses = <%= @allsynapses.to_json.html_safe %>;
Metamaps.Mappings = <%= @allmappings.to_json.html_safe %>;
Metamaps.Messages = <%= @allmessages.to_json.html_safe %>;
Metamaps.Visualize.type = "ForceDirected";
</script>

1
config/routes.rb
View file

@ -9,6 +9,7 @@ Metamaps::Application.routes.draw do
get 'search/mappers', to: 'main#searchmappers', as: :searchmappers
get 'search/synapses', to: 'main#searchsynapses', as: :searchsynapses
resources :messages, only: [:show, :create, :update, :destroy]
resources :mappings, except: [:index, :new, :edit]
resources :metacode_sets, :except => [:show]
resources :metacodes, :except => [:show, :destroy]

15
db/migrate/20151205205831_messages.rb Normal file
View file

@ -0,0 +1,15 @@
class Messages < ActiveRecord::Migration
def change
create_table :messages do |t|
t.text :message
t.references :user
t.integer :resource_id
t.string :resource_type
t.timestamps
end
add_index :messages, :user_id
add_index :messages, :resource_id
add_index :messages, :resource_type
end
end

15
db/schema.rb
View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20151025083043) do
ActiveRecord::Schema.define(version: 20151205205831) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -63,6 +63,19 @@ ActiveRecord::Schema.define(version: 20151025083043) do
add_index "maps", ["user_id"], name: "index_maps_on_user_id", using: :btree
create_table "messages", force: :cascade do |t|
t.text "message"
t.integer "user_id"
t.integer "resource_id"
t.string "resource_type"
t.datetime "created_at"
t.datetime "updated_at"
end
add_index "messages", ["resource_id"], name: "index_messages_on_resource_id", using: :btree
add_index "messages", ["resource_type"], name: "index_messages_on_resource_type", using: :btree
add_index "messages", ["user_id"], name: "index_messages_on_user_id", using: :btree
create_table "metacode_sets", force: :cascade do |t|
t.string "name"
t.text "desc"

9
realtime/realtime-server.js
View file

@ -3,6 +3,8 @@ var
signalServer = require('./signal'),
stunservers = [{"url": "stun:stun.l.google.com:19302"}];
io.set('log', false);
function start() {
signalServer(io, stunservers);
@ -91,6 +93,13 @@ function start() {
socket.broadcast.emit('maps-' + mapId + '-topicDrag', data);
});
socket.on('newMessage', function (data) {
var mapId = data.mapid;
delete data.mapid;
socket.broadcast.emit('maps-' + mapId + '-newMessage', data);
});
socket.on('newTopic', function (data) {
var mapId = data.mapid;
delete data.mapid;

18
realtime/signal.js
View file

@ -9,10 +9,12 @@ module.exports = function(io, stunservers) {
function describeRoom(name) {
var clients = io.sockets.clients(name);
var result = {
clients: {}
clients: {},
avatars: {}
};
clients.forEach(function (client) {
result.clients[client.id] = client.resources;
result.avatars[client.id] = client.avatar;
});
return result;
}
@ -38,7 +40,7 @@ module.exports = function(io, stunservers) {
client.resources = {
screen: false,
video: true,
video: false,
audio: false
};
@ -63,6 +65,18 @@ module.exports = function(io, stunservers) {
});
client.on('join', join);
client.on('videoAdded', videoAdded);
function videoAdded(data) {
var socketsInRoom = io.sockets.clients(client.room);
client.resources.video = true;
client.avatar = data.avatar;
socketsInRoom.forEach(function(socket) {
if (socket.id !== client.id) {
socket.emit('addVideo', { id: client.id, avatar: data.avatar });
}
});
}
client.on('requestRoomCount', function(name) {
client.emit('room_count', {