Split remaining controllers into separate files. Added iOS homescreen icon. Removed additional logging from weather module.

controllers/categories/createCategory.js

@@ -0,0 +1,28 @@
+const asyncWrapper = require('../../middleware/asyncWrapper');
+const Category = require('../../models/Category');
+const loadConfig = require('../../utils/loadConfig');
+
+// @desc      Create new category
+// @route     POST /api/categories
+// @access    Public
+const createCategory = asyncWrapper(async (req, res, next) => {
+  const { pinCategoriesByDefault: pinCategories } = await loadConfig();
+
+  let category;
+
+  if (pinCategories) {
+    category = await Category.create({
+      ...req.body,
+      isPinned: true,
+    });
+  } else {
+    category = await Category.create(req.body);
+  }
+
+  res.status(201).json({
+    success: true,
+    data: category,
+  });
+});
+
+module.exports = createCategory;

controllers/categories/deleteCategory.js

@@ -0,0 +1,45 @@
+const asyncWrapper = require('../../middleware/asyncWrapper');
+const ErrorResponse = require('../../utils/ErrorResponse');
+const Category = require('../../models/Category');
+const Bookmark = require('../../models/Bookmark');
+
+// @desc      Delete category
+// @route     DELETE /api/categories/:id
+// @access    Public
+const deleteCategory = asyncWrapper(async (req, res, next) => {
+  const category = await Category.findOne({
+    where: { id: req.params.id },
+    include: [
+      {
+        model: Bookmark,
+        as: 'bookmarks',
+      },
+    ],
+  });
+
+  if (!category) {
+    return next(
+      new ErrorResponse(
+        `Category with id of ${req.params.id} was not found`,
+        404
+      )
+    );
+  }
+
+  category.bookmarks.forEach(async (bookmark) => {
+    await Bookmark.destroy({
+      where: { id: bookmark.id },
+    });
+  });
+
+  await Category.destroy({
+    where: { id: req.params.id },
+  });
+
+  res.status(200).json({
+    success: true,
+    data: {},
+  });
+});
+
+module.exports = deleteCategory;

controllers/categories/getAllCategories.js

@@ -0,0 +1,43 @@
+const asyncWrapper = require('../../middleware/asyncWrapper');
+const Category = require('../../models/Category');
+const Bookmark = require('../../models/Bookmark');
+const { Sequelize } = require('sequelize');
+const loadConfig = require('../../utils/loadConfig');
+
+// @desc      Get all categories
+// @route     GET /api/categories
+// @access    Public
+const getAllCategories = asyncWrapper(async (req, res, next) => {
+  const { useOrdering: orderType } = await loadConfig();
+
+  let categories;
+
+  if (orderType == 'name') {
+    categories = await Category.findAll({
+      include: [
+        {
+          model: Bookmark,
+          as: 'bookmarks',
+        },
+      ],
+      order: [[Sequelize.fn('lower', Sequelize.col('Category.name')), 'ASC']],
+    });
+  } else {
+    categories = await Category.findAll({
+      include: [
+        {
+          model: Bookmark,
+          as: 'bookmarks',
+        },
+      ],
+      order: [[orderType, 'ASC']],
+    });
+  }
+
+  res.status(200).json({
+    success: true,
+    data: categories,
+  });
+});
+
+module.exports = getAllCategories;

controllers/categories/getSingleCategory.js

@@ -0,0 +1,35 @@
+const asyncWrapper = require('../../middleware/asyncWrapper');
+const ErrorResponse = require('../../utils/ErrorResponse');
+const Category = require('../../models/Category');
+const Bookmark = require('../../models/Bookmark');
+
+// @desc      Get single category
+// @route     GET /api/categories/:id
+// @access    Public
+const getSingleCategory = asyncWrapper(async (req, res, next) => {
+  const category = await Category.findOne({
+    where: { id: req.params.id },
+    include: [
+      {
+        model: Bookmark,
+        as: 'bookmarks',
+      },
+    ],
+  });
+
+  if (!category) {
+    return next(
+      new ErrorResponse(
+        `Category with id of ${req.params.id} was not found`,
+        404
+      )
+    );
+  }
+
+  res.status(200).json({
+    success: true,
+    data: category,
+  });
+});
+
+module.exports = getSingleCategory;

controllers/categories/index.js

@@ -0,0 +1,8 @@
+module.exports = {
+  createCategory: require('./createCategory'),
+  getAllCategories: require('./getAllCategories'),
+  getSingleCategory: require('./getSingleCategory'),
+  updateCategory: require('./updateCategory'),
+  deleteCategory: require('./deleteCategory'),
+  reorderCategories: require('./reorderCategories'),
+};

controllers/categories/reorderCategories.js

@@ -0,0 +1,22 @@
+const asyncWrapper = require('../../middleware/asyncWrapper');
+const Category = require('../../models/Category');
+// @desc      Reorder categories
+// @route     PUT /api/categories/0/reorder
+// @access    Public
+const reorderCategories = asyncWrapper(async (req, res, next) => {
+  req.body.categories.forEach(async ({ id, orderId }) => {
+    await Category.update(
+      { orderId },
+      {
+        where: { id },
+      }
+    );
+  });
+
+  res.status(200).json({
+    success: true,
+    data: {},
+  });
+});
+
+module.exports = reorderCategories;

controllers/categories/updateCategory.js

@@ -0,0 +1,30 @@
+const asyncWrapper = require('../../middleware/asyncWrapper');
+const ErrorResponse = require('../../utils/ErrorResponse');
+const Category = require('../../models/Category');
+
+// @desc      Update category
+// @route     PUT /api/categories/:id
+// @access    Public
+const updateCategory = asyncWrapper(async (req, res, next) => {
+  let category = await Category.findOne({
+    where: { id: req.params.id },
+  });
+
+  if (!category) {
+    return next(
+      new ErrorResponse(
+        `Category with id of ${req.params.id} was not found`,
+        404
+      )
+    );
+  }
+
+  category = await category.update({ ...req.body });
+
+  res.status(200).json({
+    success: true,
+    data: category,
+  });
+});
+
+module.exports = updateCategory;