diff --git a/backend/config/db.js b/backend/config/db.js index f8d8cb2..68ef845 100644 --- a/backend/config/db.js +++ b/backend/config/db.js @@ -1,4 +1,4 @@ -const mongoose = require("mongoose"); +import mongoose from "mongoose"; const connectDB = async () => { try { @@ -22,5 +22,5 @@ const connectDB = async () => { } }; -module.exports = connectDB; +export default connectDB; diff --git a/backend/controllers/authController.js b/backend/controllers/authController.js index 0cb85df..fdfd3be 100644 --- a/backend/controllers/authController.js +++ b/backend/controllers/authController.js @@ -1,4 +1,4 @@ -const User = require("../models/User") +import User from "../models/User.js"; const registerUser = async(req,res) => { try { @@ -33,4 +33,4 @@ const registerUser = async(req,res) => { } } -module.exports = {registerUser} \ No newline at end of file +export { registerUser }; \ No newline at end of file diff --git a/backend/middleware/authentication.js b/backend/middleware/authentication.js index 6bc1815..aec466f 100644 --- a/backend/middleware/authentication.js +++ b/backend/middleware/authentication.js @@ -1,4 +1,4 @@ -const { verifyToken } = require("@clerk/clerk-sdk-node"); +import { verifyToken } from "@clerk/clerk-sdk-node"; async function authMiddleware(req, res, next) { try { @@ -17,4 +17,4 @@ async function authMiddleware(req, res, next) { } } -module.exports = authMiddleware; +export default authMiddleware; diff --git a/backend/models/Event.js b/backend/models/Event.js index 4761e75..51704ef 100644 --- a/backend/models/Event.js +++ b/backend/models/Event.js @@ -1,4 +1,4 @@ -const mongoose = require('mongoose'); +import mongoose from 'mongoose'; const EventSchema = new mongoose.Schema({ name: { @@ -31,4 +31,4 @@ const EventSchema = new mongoose.Schema({ EventSchema.index({ locationCenter: '2dsphere' }); -module.exports = mongoose.model('Event', EventSchema); +export default mongoose.model('Event', EventSchema); diff --git a/backend/models/Photo.js b/backend/models/Photo.js index dd9e330..7f31cd8 100644 --- a/backend/models/Photo.js +++ b/backend/models/Photo.js @@ -1,4 +1,4 @@ -const mongoose = require('mongoose'); +import mongoose from 'mongoose'; const PhotoSchema = new mongoose.Schema({ userId: { @@ -38,4 +38,4 @@ const PhotoSchema = new mongoose.Schema({ PhotoSchema.index({ location: '2dsphere' }); -module.exports = mongoose.model('Photo', PhotoSchema); +export default mongoose.model('Photo', PhotoSchema); diff --git a/backend/models/User.js b/backend/models/User.js index 4192648..2e1cce4 100644 --- a/backend/models/User.js +++ b/backend/models/User.js @@ -1,4 +1,4 @@ -const mongoose = require('mongoose'); +import mongoose from 'mongoose'; const UserSchema = new mongoose.Schema({ clerkUserId: { @@ -48,4 +48,4 @@ const UserSchema = new mongoose.Schema({ } }); -module.exports = mongoose.model('User', UserSchema); +export default mongoose.model('User', UserSchema); diff --git a/backend/package.json b/backend/package.json index 87f9696..c2f2cb3 100644 --- a/backend/package.json +++ b/backend/package.json @@ -3,6 +3,7 @@ "version": "1.0.0", "description": "Backend for Snap Map application", "main": "server.js", + "type": "module", "scripts": { "start": "node server.js", "dev": "nodemon server.js" diff --git a/backend/routes/auth.js b/backend/routes/auth.js index c86cf29..4adbd7f 100644 --- a/backend/routes/auth.js +++ b/backend/routes/auth.js @@ -1,6 +1,6 @@ -const express = require("express"); -const authMiddleware = require("../middleware/authentication"); -const {registerUser} = require("../controllers/authController") +import express from "express"; +import authMiddleware from "../middleware/authentication.js"; +import { registerUser } from "../controllers/authController.js"; const router = express.Router(); router.post("/login", (req, res) => { @@ -9,4 +9,4 @@ router.post("/login", (req, res) => { router.post("/signup", authMiddleware, registerUser); -module.exports = router; +export default router; diff --git a/backend/routes/health.js b/backend/routes/health.js index 4ff74d4..53af288 100644 --- a/backend/routes/health.js +++ b/backend/routes/health.js @@ -1,4 +1,4 @@ -const express = require("express"); +import express from "express"; const router = express.Router(); @@ -6,4 +6,4 @@ router.get("/", (req, res) => { res.json({ status: "ok" }); }); -module.exports = router; \ No newline at end of file +export default router; \ No newline at end of file diff --git a/backend/server.js b/backend/server.js index 7dd9e09..28344b1 100644 --- a/backend/server.js +++ b/backend/server.js @@ -1,15 +1,15 @@ -const express = require("express"); -const dotenv = require("dotenv"); +import express from "express"; +import dotenv from "dotenv"; dotenv.config(); //-----db connection-------- -const connectDB = require("./config/db"); +import connectDB from "./config/db.js"; connectDB(); //------------------------------------------------------------ const app = express(); app.use(express.json()); -const router = require("../backend/v1") +import router from "./v1.js"; app.use("/api/v1", router); diff --git a/backend/v1.js b/backend/v1.js index 9568a93..56ee504 100644 --- a/backend/v1.js +++ b/backend/v1.js @@ -1,12 +1,12 @@ -const express = require("express"); +import express from "express"; const router = express.Router(); -const healthRoute = require("../backend/routes/health"); -const authRoute = require ("../backend/routes/auth"); +import healthRoute from "./routes/health.js"; +import authRoute from "./routes/auth.js"; router.use("/health", healthRoute); router.use("/auth", authRoute); router.get("/", (req, res) => { res.send("SnapMap API v1"); }); -module.exports = router; \ No newline at end of file +export default router; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..507194c --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "SnapMap", + "lockfileVersion": 3, + "requires": true, + "packages": {} +}