Upgrade dependencies

.circleci/config.yml

@@ -38,7 +38,7 @@ jobs:
   test:
     docker:
       # image for running tests
-      - image: cypress/browsers:node16.14.0-chrome99-ff97
+      - image: cypress/browsers:node18.12.0-chrome103-ff107
         environment:
           - DB_NAME=lunch_test
           - DB_USER=lunch_test

.env.sample

@@ -11,7 +11,7 @@ SUPERUSER_EMAIL=
 # Credentials for your Google Developer app
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
-GOOGLE_CLIENT_APIKEY= # optional
+GOOGLE_CLIENT_APIKEY=
 GOOGLE_SERVER_APIKEY=
 
 # Google Analytics ID

.eslintrc.js

@@ -10,7 +10,7 @@
 // ESLint configuration
 // http://eslint.org/docs/user-guide/configuring
 module.exports = {
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
 
   extends: [
     'airbnb',
@@ -77,6 +77,7 @@ module.exports = {
     'key-spacing': 0,
     'no-confusing-arrow': 0,
     'react/jsx-quotes': 0,
+    'react/jsx-props-no-spreading': 0,
     'max-len': 0,
     'jsx-quotes': [
       2,
@@ -88,6 +89,13 @@ module.exports = {
 
     'react/forbid-prop-types': 'off',
     'react/destructuring-assignment': 'off',
+    'react/function-component-definition': ['error', {
+      namedComponents: 'arrow-function',
+      unnamedComponents: 'arrow-function'
+    }],
+    'react/static-property-placement': 'off',
+    'import/no-relative-packages': 'off',
+    'import/no-import-module-exports': 'off'
   },
 
   settings: {

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm test && npx lint-staged

.mocharc.js

@@ -0,0 +1,5 @@
+module.exports = {
+  require: ['@babel/register', './test/setup'],
+  exit: true,
+  file: './test/mocha-setup',
+};

.stylelintrc.js

@@ -7,13 +7,15 @@
  * LICENSE.txt file in the root directory of this source tree.
  */
 
+const lowerKebabCase = /^[a-z][a-zA-Z0-9]+$/;
+
 // stylelint configuration
 // https://stylelint.io/user-guide/configuration/
 module.exports = {
 
   // The standard config based on a handful of CSS style guides
   // https://github.com/stylelint/stylelint-config-standard
-  extends: 'stylelint-config-standard',
+  extends: 'stylelint-config-standard-scss',
 
   plugins: [
     // stylelint plugin to sort CSS rules content with specified order
@@ -22,13 +24,10 @@ module.exports = {
   ],
 
   rules: {
-    'at-rule-no-unknown': [
-      true,
-      {
-        ignoreAtRules: ['include', 'mixin'],
-      },
-    ],
+    'at-rule-no-unknown': null,
+    'scss/at-rule-no-unknown': true,
     'declaration-empty-line-before': null,
+    'keyframes-name-pattern': lowerKebabCase,
     'number-leading-zero': 'never',
     'property-no-unknown': [true, {
       ignoreProperties: [
@@ -38,6 +37,7 @@ module.exports = {
         'overflow-anchor'
       ],
     }],
+    'selector-class-pattern': lowerKebabCase,
 
     'selector-pseudo-class-no-unknown': [
       true,

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.17.0
+FROM node:18.14.0
 
 # Set a working directory
 WORKDIR /usr/src/app

Dockerfile.local

@@ -1,4 +1,4 @@
-FROM node:16.17.0
+FROM node:18.14.0
 
 # Set a working directory
 WORKDIR /app

cypress/support/helpers/addRestaurant.js

@@ -5,10 +5,10 @@ export default () => {
   const lat = 37.7955703;
   const lng = -122.39332079999997;
   const name = 'Ferry Building Marketplace';
-  const place_id = 'ChIJWTGPjmaAhYARxz6l1hOj92w';
+  const placeId = 'ChIJWTGPjmaAhYARxz6l1hOj92w';
   cy.request('POST', `${Cypress.env('subdomain')}api/restaurants`, {
     name,
-    place_id,
+    placeId,
     address,
     lat,
     lng

cypress/support/helpers/deleteRestaurant.js

@@ -2,7 +2,7 @@
 export default () => {
   cy.visit('/');
   cy.get('button.RestaurantDropdown-toggle').click();
-  cy.get('ul.RestaurantDropdown-menu li').contains('Delete').should('be.visible').click();
+  cy.get('.RestaurantDropdown-menu a').contains('Delete').should('be.visible').click();
   cy.get('body').should('have.attr', 'class', 'modal-open');
   cy.get('.modal-footer .btn-primary').contains('Delete').click();
 };

db/migrations/20160303171210-AddGoogleParamsToRestaurants.js

@@ -1,6 +1,4 @@
-const Promise = require('bluebird');
-
-exports.up = (queryInterface, Sequelize) => Promise.all(
+exports.up = (queryInterface, Sequelize) => Promise.all([
   queryInterface.addColumn('restaurants', 'place_id', {
     type: Sequelize.STRING,
     unique: true
@@ -11,10 +9,10 @@ exports.up = (queryInterface, Sequelize) => Promise.all(
   queryInterface.addColumn('restaurants', 'lng', {
     type: Sequelize.FLOAT
   })
-);
+]);
 
-exports.down = queryInterface => Promise.all(
+exports.down = queryInterface => Promise.all([
   queryInterface.removeColumn('restaurants', 'place_id'),
   queryInterface.removeColumn('restaurants', 'lat'),
   queryInterface.removeColumn('restaurants', 'lng')
-);
+]);

db/migrations/20160308134329-AddTimestampsToRestaurants.js

@@ -1,6 +1,4 @@
-const Promise = require('bluebird');
-
-exports.up = (queryInterface, Sequelize) => Promise.all(
+exports.up = (queryInterface, Sequelize) => Promise.all([
   queryInterface.addColumn('restaurants', 'created_at', {
     type: Sequelize.DATE,
     allowNull: false
@@ -9,9 +7,9 @@ exports.up = (queryInterface, Sequelize) => Promise.all(
     type: Sequelize.DATE,
     allowNull: false
   })
-);
+]);
 
-exports.down = queryInterface => Promise.all(
+exports.down = queryInterface => Promise.all([
   queryInterface.removeColumn('restaurants', 'created_at'),
   queryInterface.removeColumn('restaurants', 'updated_at')
-);
+]);

db/migrations/20160308134819-AddTimestampsToVotes.js

@@ -1,6 +1,4 @@
-const Promise = require('bluebird');
-
-exports.up = (queryInterface, Sequelize) => Promise.all(
+exports.up = (queryInterface, Sequelize) => Promise.all([
   queryInterface.addColumn('votes', 'created_at', {
     type: Sequelize.DATE,
     allowNull: false
@@ -9,9 +7,9 @@ exports.up = (queryInterface, Sequelize) => Promise.all(
     type: Sequelize.DATE,
     allowNull: false
   })
-);
+]);
 
-exports.down = queryInterface => Promise.all(
+exports.down = queryInterface => Promise.all([
   queryInterface.removeColumn('votes', 'created_at'),
   queryInterface.removeColumn('votes', 'updated_at')
-);
+]);

db/migrations/20160308134835-AddTimestampsToUsers.js

@@ -1,6 +1,4 @@
-const Promise = require('bluebird');
-
-exports.up = (queryInterface, Sequelize) => Promise.all(
+exports.up = (queryInterface, Sequelize) => Promise.all([
   queryInterface.addColumn('users', 'created_at', {
     type: Sequelize.DATE,
     allowNull: false
@@ -9,9 +7,9 @@ exports.up = (queryInterface, Sequelize) => Promise.all(
     type: Sequelize.DATE,
     allowNull: false
   })
-);
+]);
 
-exports.down = queryInterface => Promise.all(
+exports.down = queryInterface => Promise.all([
   queryInterface.removeColumn('users', 'created_at'),
   queryInterface.removeColumn('users', 'updated_at')
-);
+]);

db/migrations/20170309225630-CreateTeams.js

@@ -1,7 +1,5 @@
-const db = require('../../src/models/db');
-
 exports.up = (queryInterface, Sequelize) => {
-  const Team = db.sequelize.define('team', {
+  const Team = queryInterface.sequelize.define('team', {
     name: Sequelize.STRING,
   }, {
     underscored: true

db/migrations/20170309230545-AddTeamIdToRestaurants.js

@@ -1,7 +1,5 @@
-const db = require('../../src/models/db');
-
 exports.up = (queryInterface, Sequelize) => {
-  const Team = db.sequelize.define('team', {
+  const Team = queryInterface.sequelize.define('team', {
     name: Sequelize.STRING,
   }, {
     underscored: true

db/migrations/20170309232003-AddTeamIdToTags.js

@@ -1,7 +1,5 @@
-const db = require('../../src/models/db');
-
 exports.up = (queryInterface, Sequelize) => {
-  const Team = db.sequelize.define('team', {
+  const Team = queryInterface.sequelize.define('team', {
     name: Sequelize.STRING,
   }, {
     underscored: true

db/migrations/20170309233227-ChangeTagNameUniqueness.js

@@ -1,10 +1,8 @@
-const db = require('../../src/models/db');
-
 exports.up = (queryInterface, Sequelize) => queryInterface.changeColumn('tags', 'name', {
   type: Sequelize.STRING,
   allowNull: false,
   unique: false
-}).then(() => db.sequelize.query('ALTER TABLE tags DROP CONSTRAINT IF EXISTS tags_name_key;'));
+}).then(() => queryInterface.sequelize.query('ALTER TABLE tags DROP CONSTRAINT IF EXISTS tags_name_key;'));
 
 exports.down = (queryInterface, Sequelize) => queryInterface.changeColumn('tags', 'name', {
   type: Sequelize.STRING,

db/migrations/20170310215129-ChangeUserGoogleIdNull.js

@@ -1,17 +1,15 @@
-const db = require('../../src/models/db');
-
 exports.up = (queryInterface, Sequelize) => queryInterface.changeColumn('users', 'google_id', {
   type: Sequelize.STRING
 });
 
 exports.down = (queryInterface, Sequelize) => {
-  const User = db.sequelize.define('user', {
+  const User = queryInterface.sequelize.define('user', {
     google_id: Sequelize.STRING,
   }, {
     underscored: true
   });
 
-  User.destroy({ where: { google_id: null } }).then(() => queryInterface.changeColumn('users', 'google_id', {
+  return User.destroy({ where: { google_id: null } }).then(() => queryInterface.changeColumn('users', 'google_id', {
     type: Sequelize.STRING,
     allowNull: false
   }));

db/migrations/20170310220402-CreateRoles.js

@@ -1,15 +1,13 @@
-const db = require('../../src/models/db');
-
 exports.up = (queryInterface, Sequelize) => {
-  const User = db.sequelize.define('user', {
+  const User = queryInterface.sequelize.define('user', {
     google_id: Sequelize.STRING,
     name: Sequelize.STRING,
     email: Sequelize.STRING
   }, {
     underscored: true
   });
 
-  const Team = db.sequelize.define('team', {
+  const Team = queryInterface.sequelize.define('team', {
     name: Sequelize.STRING,
   }, {
     underscored: true
@@ -61,7 +59,7 @@ exports.up = (queryInterface, Sequelize) => {
   })
     .then(() => User.findAll())
     .then((users) => Team.findOne({ where: { name: 'Lab Zero' } }).then(team => {
-      const Role = db.sequelize.define('role', {
+      const Role = queryInterface.sequelize.define('role', {
         type: {
           allowNull: false,
           type: Sequelize.ENUM('guest', 'member', 'owner'),
@@ -101,4 +99,4 @@ exports.up = (queryInterface, Sequelize) => {
     }));
 };
 
-exports.down = queryInterface => queryInterface.dropTable('roles').then(() => db.sequelize.query('DROP TYPE enum_roles_type'));
+exports.down = queryInterface => queryInterface.dropTable('roles').then(() => queryInterface.sequelize.query('DROP TYPE enum_roles_type'));

db/migrations/20170310221346-AddSuperuserToUsers.js

@@ -1,11 +1,9 @@
-const db = require('../../src/models/db');
-
 exports.up = (queryInterface, Sequelize) => queryInterface.addColumn('users', 'superuser', {
   allowNull: false,
   type: Sequelize.BOOLEAN,
   defaultValue: false
 }).then(() => {
-  const User = db.sequelize.define('user', {
+  const User = queryInterface.sequelize.define('user', {
     google_id: Sequelize.STRING,
     name: Sequelize.STRING,
     email: Sequelize.STRING,

db/migrations/20170317163119-AddTeamIdToDecisions.js

@@ -1,7 +1,5 @@
-const db = require('../../src/models/db');
-
 exports.up = (queryInterface, Sequelize) => {
-  const Team = db.sequelize.define('team', {
+  const Team = queryInterface.sequelize.define('team', {
     name: Sequelize.STRING,
     slug: Sequelize.STRING(63)
   }, {

db/migrations/20170317172934-ChangeTeamSlugAllowNull.js

@@ -1,7 +1,5 @@
-const db = require('../../src/models/db');
-
 exports.up = (queryInterface, Sequelize) => {
-  const Team = db.sequelize.define('team', {
+  const Team = queryInterface.sequelize.define('team', {
     name: Sequelize.STRING,
     slug: Sequelize.STRING(63)
   }, {

db/migrations/20170328222012-AddLatLngAndAddressToTeams.js

@@ -1,6 +1,4 @@
-const Promise = require('bluebird');
-
-exports.up = (queryInterface, Sequelize) => Promise.all(
+exports.up = (queryInterface, Sequelize) => Promise.all([
   queryInterface.addColumn('teams', 'lat', {
     type: Sequelize.DOUBLE
   }),
@@ -10,10 +8,10 @@ exports.up = (queryInterface, Sequelize) => Promise.all(
   queryInterface.addColumn('teams', 'address', {
     type: Sequelize.STRING
   })
-);
+]);
 
-exports.down = queryInterface => Promise.all(
+exports.down = queryInterface => Promise.all([
   queryInterface.removeColumn('teams', 'lat'),
   queryInterface.removeColumn('teams', 'lng'),
   queryInterface.removeColumn('teams', 'address')
-);
+]);