Skip to content

Commit

Permalink
Merge branch 'pr-21' into test-pr-123
Browse files Browse the repository at this point in the history
  • Loading branch information
prasadhonrao committed Sep 18, 2024
2 parents 6b1c68a + 6912915 commit 873e6f4
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to MERN Bootcamp
# Contributing to DevCamper

We welcome contributions to the MERN Bootcamp project! By contributing, you can help improve the project and make it more useful for everyone.
We welcome contributions to the DevCamper project! By contributing, you can help improve the project and make it more useful for everyone.

## How to Contribute

Expand All @@ -9,8 +9,8 @@ We welcome contributions to the MERN Bootcamp project! By contributing, you can
Fork the repository on GitHub and clone your fork locally.

```sh
git clone https://github.com/your-username/mern-bootcamp.git
cd mern-bootcamp
git clone https://github.com/your-username/devcamper.git
cd DevCamper
```

2. **Create a branch:**
Expand Down
10 changes: 5 additions & 5 deletions SETUP.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MERN Bootcamp Project Setup Instructions
# DevCamper Project Setup Instructions

Welcome to the MERN Bootcamp project! This guide will walk you through the process of setting up the API server and the UI application. Please follow the steps carefully to get the application up and running.
Welcome to the DevCamper project! This guide will walk you through the process of setting up the API server and the UI application. Please follow the steps carefully to get the application up and running.

## Prerequisites

Expand All @@ -16,8 +16,8 @@ Before starting, make sure you have the following installed on your machine:
### Step 1: Clone the repository

```bash
git clone https://github.com/prasadhonrao/mern-bootcamp
cd mern-bootcamp
git clone https://github.com/prasadhonrao/devcamper
cd DevCamper
cd api
```

Expand Down Expand Up @@ -49,7 +49,7 @@ PORT=5000
NODE_ENV=development
# Database configuration
MONGO_URI=mongodb://localhost:27017/mern-bootcamp-dev-db
MONGO_URI=mongodb://localhost:27017/devcamper-dev-db
# Geocoder configuration
GEOCODER_PROVIDER=mapquest
Expand Down
2 changes: 1 addition & 1 deletion api/_postman/prod-environment.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"values": [
{
"key": "url",
"value": "http://mern-bootcamp.io",
"value": "http://devcamper.io",
"type": "default",
"enabled": true
},
Expand Down
4 changes: 2 additions & 2 deletions api/package-lock.json

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

10 changes: 5 additions & 5 deletions api/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mern-bootcamp-api",
"name": "devcamper-api",
"version": "1.0.0",
"description": "API for MERN Bootcamp web application",
"description": "API for devcamper web application",
"main": "server.js",
"type": "module",
"scripts": {
Expand All @@ -14,7 +14,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/prasadhonrao/mern-bootcamp.git"
"url": "git+https://github.com/prasadhonrao/devcamper.git"
},
"keywords": [
"api",
Expand All @@ -26,9 +26,9 @@
"author": "Prasad Honrao",
"license": "MIT",
"bugs": {
"url": "https://github.com/prasadhonrao/mern-bootcamp/issues"
"url": "https://github.com/prasadhonrao/devcamper/issues"
},
"homepage": "https://github.com/prasadhonrao/mern-bootcamp#readme",
"homepage": "https://github.com/prasadhonrao/devcamper#readme",
"dependencies": {
"bcryptjs": "^2.4.3",
"colors": "^1.4.0",
Expand Down
2 changes: 1 addition & 1 deletion api/routes/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import express from 'express';
const router = express.Router();

router.get('/', (req, res) => {
res.send('Welcome to MERN bootcamp API!');
res.send('Welcome to DevCamper API!');
});

router.get('/status', (req, res) => {
Expand Down
2 changes: 1 addition & 1 deletion api/seeder.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if (ENV === 'development') {
}

// Connect to MongoDB
const MONGO_URI = process.env.MONGO_URI || 'mongodb://localhost:27017/mern-bootcamp-db';
const MONGO_URI = process.env.MONGO_URI || 'mongodb://localhost:27017/devcamper-db';
await mongoose.connect(MONGO_URI);

// Read JSON files
Expand Down
4 changes: 2 additions & 2 deletions ui/package-lock.json

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

2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "mern-bootcamp-ui",
"name": "devcamper-ui",
"version": "0.1.0",
"private": true,
"dependencies": {
Expand Down

0 comments on commit 873e6f4

Please sign in to comment.