diff --git a/README.md b/README.md index 41e1f2c..36ac524 100644 --- a/README.md +++ b/README.md @@ -34,4 +34,14 @@ Welcome to your IRC project on Cloud9 IDE! ### You must host your code on github +# +Things to check if it isn't working. +Did we git add the file? +Did we git commit the file? +Did we git push? +Did you do a pull request? +Did I merge it on github? +Did I actually pull it? + + diff --git a/irc.sql b/irc.sql new file mode 100644 index 0000000..3076d76 --- /dev/null +++ b/irc.sql @@ -0,0 +1,22 @@ +DROP DATABASE IF EXISTS irc_db; +CREATE DATABASE irc_db; +\c irc_db; + +CREATE TABLE IF NOT EXISTS users ( + id serial, + username varchar(30), + password varchar(30), + PRIMARY KEY (id) +); + +INSERT INTO users (id, username, password) VALUES +(DEFAULT, 'SpiderBall', 'sb'), +(DEFAULT, 'MidnaPeach', 'mp'); + +CREATE TABLE IF NOT EXISTS messages ( + message_id serial, + original_poster_id int NOT NULL, + message_content bytea NULL, + PRIMARY KEY (message_id) +); + diff --git a/postgreSQLCommands.txt b/postgreSQLCommands.txt new file mode 100644 index 0000000..b9a21b8 --- /dev/null +++ b/postgreSQLCommands.txt @@ -0,0 +1,17 @@ +Command cheat sheet + +change column name +ALTER TABLE [tablename] RENAME COLUMN [oldname] TO [newname]; + +copy table +CREATE TABLE [newtablename] AS SELECT [columns] FROM [existing]; + +change column data type +ALTER TABLE[tablename] ALTER COLUMN [columnname] TYPE [newtype]; + + +insert +INSERT INTO [tablename] VALUES ([value1],[value2], ... ); + +update +UPDATE [tablename] SET [column1]=[value1] ... WHERE [somecolumn] = [somevalue]; diff --git a/server.py b/server.py index dcb0644..0a7f234 100644 --- a/server.py +++ b/server.py @@ -13,7 +13,7 @@ def updateRoster(): names = [] - for user_id in users: + for user_id in users: print users[user_id]['username'] if len(users[user_id]['username'])==0: names.append('Anonymous') @@ -23,6 +23,7 @@ def updateRoster(): emit('roster', names, broadcast=True) + @socketio.on('connect', namespace='/chat') def test_connect(): session['uuid']=uuid.uuid1() @@ -32,10 +33,10 @@ def test_connect(): users[session['uuid']]={'username':'New User'} updateRoster() - for message in messages: emit('message', message) + @socketio.on('message', namespace='/chat') def new_message(message): #tmp = {'text':message, 'name':'testName'} @@ -43,6 +44,8 @@ def new_message(message): messages.append(tmp) emit('message', tmp, broadcast=True) + + @socketio.on('identify', namespace='/chat') def on_identify(message): print 'identify' + message @@ -53,10 +56,12 @@ def on_identify(message): @socketio.on('login', namespace='/chat') def on_login(pw): print 'login ' + pw + #we need to connect here.? + + #users[session['uuid']]={'username':message} #updateRoster() - @socketio.on('disconnect', namespace='/chat') def on_disconnect():