Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/config/db.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const mongoose = require("mongoose");
import mongoose from "mongoose";

const connectDB = async () => {
try {
Expand All @@ -22,5 +22,5 @@ const connectDB = async () => {
}
};

module.exports = connectDB;
export default connectDB;

4 changes: 2 additions & 2 deletions backend/controllers/authController.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const User = require("../models/User")
import User from "../models/User.js";

const registerUser = async(req,res) => {
try {
Expand Down Expand Up @@ -33,4 +33,4 @@ const registerUser = async(req,res) => {
}
}

module.exports = {registerUser}
export { registerUser };
4 changes: 2 additions & 2 deletions backend/middleware/authentication.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -17,4 +17,4 @@ async function authMiddleware(req, res, next) {
}
}

module.exports = authMiddleware;
export default authMiddleware;
4 changes: 2 additions & 2 deletions backend/models/Event.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const mongoose = require('mongoose');
import mongoose from 'mongoose';

const EventSchema = new mongoose.Schema({
name: {
Expand Down Expand Up @@ -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);
4 changes: 2 additions & 2 deletions backend/models/Photo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const mongoose = require('mongoose');
import mongoose from 'mongoose';

const PhotoSchema = new mongoose.Schema({
userId: {
Expand Down Expand Up @@ -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);
4 changes: 2 additions & 2 deletions backend/models/User.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const mongoose = require('mongoose');
import mongoose from 'mongoose';

const UserSchema = new mongoose.Schema({
clerkUserId: {
Expand Down Expand Up @@ -48,4 +48,4 @@ const UserSchema = new mongoose.Schema({
}
});

module.exports = mongoose.model('User', UserSchema);
export default mongoose.model('User', UserSchema);
1 change: 1 addition & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions backend/routes/auth.js
Original file line number Diff line number Diff line change
@@ -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) => {
Expand All @@ -9,4 +9,4 @@ router.post("/login", (req, res) => {

router.post("/signup", authMiddleware, registerUser);

module.exports = router;
export default router;
4 changes: 2 additions & 2 deletions backend/routes/health.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const express = require("express");
import express from "express";
const router = express.Router();


router.get("/", (req, res) => {
res.json({ status: "ok" });
});

module.exports = router;
export default router;
8 changes: 4 additions & 4 deletions backend/server.js
Original file line number Diff line number Diff line change
@@ -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);

Expand Down
8 changes: 4 additions & 4 deletions backend/v1.js
Original file line number Diff line number Diff line change
@@ -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;
export default router;
6 changes: 6 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.