conflict solve

api/models/widget.js

@@ -20,7 +20,6 @@ const BannerDataSchema = new Schema({
 // Define schema for list items
 const ListItemSchema = new Schema({
     bannerData: { type: BannerDataSchema, required: true },
-    display_order: { type: Number, required: true },
     dimension: {
         length: { type: Number, required: true },
         breadth: { type: Number, required: true }

api/template/service.js

@@ -70,7 +70,7 @@ const createTemplate = async (name, desc, platform, widgets, hashId) => {
       desc,
       platform,
       widgets,
-      hashId
+      hashId,
     });
 
     // Save the template to the database
@@ -108,5 +108,5 @@ const getParticularTemplate = async (page, platform) => {
 module.exports = {
   updateAndMapWidget,
   createTemplate,
-  getParticularTemplate
+  getParticularTemplate,
 };

package.json

@@ -11,6 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "body-parser": "^1.20.2",
+    "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
     "mongoose": "^8.6.0",

server.js

@@ -4,8 +4,14 @@ const bodyParser = require('body-parser');
 const swaggerUi = require('swagger-ui-express');
 const YAML = require('yamljs');
 const connectDB = require('./db');
+const cors = require('cors');
 
 const app = express();
+
+// enable cors
+app.use(cors());
+app.options('*', cors());
+
 app.use(bodyParser.json());
 const apiBaseRouter = require('./api/apiBaseRouter');
 
@@ -14,6 +20,7 @@ connectDB();
 
 // Serve Swagger API documentation
 const swaggerDocument = YAML.load('./swagger.yaml');
+
 app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
 
 // API base URL

swagger.yaml

@@ -46,9 +46,6 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties:
-                        widgetId:
-                          type: string
                         position:
                           type: integer
                         startTime: