Update QUERIES.md

QUERIES.md

@@ -69,5 +69,5 @@ def getPluckQuery(properties):
 //Get the top three entries
 r.db('rethinkdb_workshop').table('reddit').orderBy({ index: r.desc('superScore') }).limit(3).changes()
 // Add the pluck again
-r.db('rethinkdb_workshop').table('reddit').orderBy({ index: r.desc('superScore') }).limit(3).changes().pluck('title', 'score')
+r.db('rethinkdb_workshop').table('reddit').orderBy({ index: r.desc('superScore') }).limit(3).changes()('new_val').pluck('title', 'score')
 ```

README.md

@@ -55,9 +55,9 @@ Complete all 5 steps to get the chat app working. Each step will involve writing
 
 1. Sign up: [/server/auth/authcontroller.js:L20](https://github.com/thejsj/rethinkdb-workshop/blob/master/server/auth/auth-controller.js#L20)
 2. Login (2.1 and 2.2): [/server/auth/index.js:L28 and L29](https://github.com/thejsj/rethinkdb-workshop/blob/master/server/auth/index.js#L28)
-3. Inserting messages: [/server/index.js:116](https://github.com/thejsj/rethinkdb-workshop/blob/master/server/index.js#L138)
+3. Inserting messages: [/server/index.js:116](https://github.com/thejsj/rethinkdb-workshop/blob/master/server/index.js#L124)
 4. Getting messages: [/server/index.js:L55](https://github.com/thejsj/rethinkdb-workshop/blob/master/server/index.js#L76)
-5. Listening for messages: [/server/index.js:L90](https://github.com/thejsj/rethinkdb-workshop/blob/master/server/index.js#L110)
+5. Listening for messages: [/server/index.js:L90](https://github.com/thejsj/rethinkdb-workshop/blob/master/server/index.js#L103)
 
 After completing these 5 steps, your chat app will run correctly.
 

server/auth/auth-controller.js

@@ -32,14 +32,6 @@ authController.signup = function (req, res) {
        * to sign up in the front-end and see the registered user
        * in the database. You won't be able to sign in.
        */
-      return r.branch(
-        r.table('users').get(email),
-        false,
-        r.table('users').insert({
-          email: email,
-          password: hash
-        })
-      ).run(r.conn);
     })
     .then(function (result) {
        if (!result) res.send('User already exists');

server/auth/index.js

@@ -42,13 +42,6 @@ passport.deserializeUser(function (email, done) {
    * Once you complete the 2 queries in this file, you'll be able to
    * log in to the site.
    */
-  r
-    .table('users')
-    .get(email)
-    .run(r.conn)
-    .then(function (user) {
-      done(null, user);
-    });
 });
 
 // Local
@@ -76,24 +69,6 @@ passport.use(new LocalStrategy({
    * After completing step 2.1 and this step, you'll be able
    * to login with the created account.
    */
-   r.table('users')
-    .get(email)
-    .run(r.conn)
-    .then(function (user) {
-      if (!user || user === null) {
-        done(null, false);
-        return;
-      }
-      return doPasswordsMatch(password, user.password)
-        .then(function (isMatch) {
-          if (!isMatch)  {
-            done(null, false);
-            return;
-          }
-          done(null, user);
-        });
-    })
-    .catch(done);
   }
 ));
 

server/index.js

@@ -87,13 +87,6 @@ app
      * Once you have written this query, you'll be able to see
      * all previously inserted messages when loading the page
      */
-    r.table('messages')
-     .orderBy({index: 'created'})
-     .coerceTo('array')
-     .run(r.conn)
-     .then(function (messages) {
-       res.json(messages);
-     });
   })
   .use('/config.js', clientConfigParser)
   .get('/', function (req, res) {
@@ -124,13 +117,6 @@ io.on('connection', function (socket) {
    * once you write this query, you'll be able to see new messages be displayed
    * as they are being added
    */
-  r.table('messages')
-    .changes().run(r.conn)
-    .then(function(cursor) {
-      cursor.each(function (err, row) {
-        socket.emit('message', row.new_val);
-      }, function () { });
-    });
 
   // Insert new messages
   socket.on('message', function (data) {
@@ -155,11 +141,6 @@ io.on('connection', function (socket) {
      * Once you write this query, you'll be able to insert new
      * messages in the front-end and see them in the database
      */
-    r.table('messages').insert({
-      text: data.text,
-      email: data.email,
-      created: (new Date()).getTime()
-    }).run(r.conn);
   });
 
 });