<commit_before>const express = require('express');
const flash = require('connect-flash');
const app = express();
const bodyParser = require('body-parser');
// const route = require('./routes/route.js');
// const passport = require('passport');
// const LocalStrategy = require ('passport-local');
const session = require('express-session');
const RedisStore = require('connect-redis')(session);
const db = require('./models');
// const config = require('./config/config.json');
const bcrypt = require('bcrypt');
const saltRounds = 10;

app.use(bodyParser.urlencoded({extended:true}));
app.use(express.static('./public'));

app.get('/apiP',(req,res) =>{
  db.Card.findAll({
    where: {
      status: 'Progress'
    }
  })
  .then(data =>{
    res.json({data});
  });
});
app.get('/apiQ',(req,res) =>{
  db.Card.findAll({
    where: {
      status: 'Queue'
    }
  })
  .then(data =>{
    res.json({data});
  });
});
app.get('/apiD',(req,res) =>{
  db.Card.findAll({
    where: {
      status: 'Done'
    }
  })
  .then(data =>{
    res.json({data});
  })
})
app.post('/moveToProgress',(req,res) =>{
  db.Card.findById(req.body.id)
    .then(card => {
      card.update({
        title: card.title,
        priority: card.priority,
        status: 'Progress',
        createdBy: card.createdBy,
        assignedTo: card.assignedTo
      })
      res.redirect('/');
    })
    .catch(err => {
      console.error(err);
    })
})
app.post('/moveToQueue',(req,res) =>{
  db.Card.findById(req.body.id)
    .then(card => {
      card.update({
        title: card.title,
        priority: card.priority,
        status: 'Queue',
        createdBy: card.createdBy,
        assignedTo: card.assignedTo
      })
      res.redirect('/');
    })
    .catch(err => {
      console.error(err);
    })
})
app.post('/moveToDone',(req,res) =>{
  db.Card.findById(req.body.id)
    .then(card => {
      card.update({
        title: card.title,
        priority: card.priority,
        status: 'Done',
        createdBy: card.createdBy,
        assignedTo: card.assignedTo
      })
      res.redirect('/');
    })
    .catch(err => {
      console.error(err);
    })
})
app.post('/newTask',(req,res) => {
  db.Card.create({
    title: req.body.title,
    priority: req.body.priority,
    status: 'Queue',
    createdBy: req.body.createdBy,
    assignedTo: req.body.assignedTo
  })
  res.redirect('/');
})
>>>>>>> bd927fda3b932285f133af365a47b45751877d52


app.listen(8080, function() {
  console.log('server');
  db.sequelize.sync()
    .catch(err =>{
      res.json({
        success: false,
        error: err
      });
    });
});
<commit_msg>gets rid of residual merge conflict line<commit_after>const express = require('express');
const flash = require('connect-flash');
const app = express();
const bodyParser = require('body-parser');
// const route = require('./routes/route.js');
// const passport = require('passport');
// const LocalStrategy = require ('passport-local');
const session = require('express-session');
const RedisStore = require('connect-redis')(session);
const db = require('./models');
// const config = require('./config/config.json');
const bcrypt = require('bcrypt');
const saltRounds = 10;

app.use(bodyParser.urlencoded({extended:true}));
app.use(express.static('./public'));

app.get('/apiP',(req,res) =>{
  db.Card.findAll({
    where: {
      status: 'Progress'
    }
  })
  .then(data =>{
    res.json({data});
  });
});
app.get('/apiQ',(req,res) =>{
  db.Card.findAll({
    where: {
      status: 'Queue'
    }
  })
  .then(data =>{
    res.json({data});
  });
});
app.get('/apiD',(req,res) =>{
  db.Card.findAll({
    where: {
      status: 'Done'
    }
  })
  .then(data =>{
    res.json({data});
  })
})
app.post('/moveToProgress',(req,res) =>{
  db.Card.findById(req.body.id)
    .then(card => {
      card.update({
        title: card.title,
        priority: card.priority,
        status: 'Progress',
        createdBy: card.createdBy,
        assignedTo: card.assignedTo
      })
      res.redirect('/');
    })
    .catch(err => {
      console.error(err);
    })
})
app.post('/moveToQueue',(req,res) =>{
  db.Card.findById(req.body.id)
    .then(card => {
      card.update({
        title: card.title,
        priority: card.priority,
        status: 'Queue',
        createdBy: card.createdBy,
        assignedTo: card.assignedTo
      })
      res.redirect('/');
    })
    .catch(err => {
      console.error(err);
    })
})
app.post('/moveToDone',(req,res) =>{
  db.Card.findById(req.body.id)
    .then(card => {
      card.update({
        title: card.title,
        priority: card.priority,
        status: 'Done',
        createdBy: card.createdBy,
        assignedTo: card.assignedTo
      })
      res.redirect('/');
    })
    .catch(err => {
      console.error(err);
    })
})
app.post('/newTask',(req,res) => {
  db.Card.create({
    title: req.body.title,
    priority: req.body.priority,
    status: 'Queue',
    createdBy: req.body.createdBy,
    assignedTo: req.body.assignedTo
  })
  res.redirect('/');
})


app.listen(8080, function() {
  console.log('server');
  db.sequelize.sync()
    .catch(err =>{
      res.json({
        success: false,
        error: err
      });
    });
});

{'fraction_non_alphanumeric': 0.1996560947649981, 'fraction_numerical': 0.007642338555598013, 'mean_word_length': 2.6128364389233956, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 44, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '7071935', 'n_tokens_mistral': 1818, 'n_tokens_neox': 1795, 'n_words': 281}