Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
SatyaJaiss committed Oct 6, 2024
2 parents 3e2fe8d + 48b6558 commit f0ff0d5
Show file tree
Hide file tree
Showing 117 changed files with 13,756 additions and 13,135 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

# 🎉 Welcome to the Enyanjyoti Platform! 🌟
# 🎉 Welcome to the E-nyanjyoti Platform! 🌟

This repository is part of **GirlScript Summer of Code 2024 Extended Edition!** 🚀

Enyanjyoti serves as a **one-stop solution** for:
E-nyanjyoti serves as a **one-stop solution** for:
- 📚 **Conceptual Learning**
- 💼 **Career and Employment Opportunities**
- 💰 **Information about Loans and Grants**
Expand Down Expand Up @@ -167,7 +167,7 @@ Thank you for your contributions!

## Our Contributors

- We extend our heartfelt gratitude for your invaluable contribution to our project! Your efforts play a pivotal role in elevating Ratna-Supermarket to greater heights.
- We extend our heartfelt gratitude for your invaluable contribution to our project! Your efforts play a pivotal role in elevating E-nyanjyoti to a greater heights.
- Make sure you show some love by giving ⭐ to our repository.

<div align="center">
Expand Down
19 changes: 19 additions & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store

npm-debug.log*
yarn-debug.log*
yarn-error.log*
23 changes: 23 additions & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "backend",
"version": "1.0.0",
"main": "index.js",
"directories": {
"test": "test"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "Vinisha Dsouza",
"license": "ISC",
"description": "Created for Backend Intrigration with E-nyanjyoti Platfrom",
"dependencies": {
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"express": "^4.21.0",
"firebase": "^10.14.0",
"mongoose": "^8.7.0",
"nodemon": "^3.1.7"
}
}
File renamed without changes.
File renamed without changes.
19 changes: 19 additions & 0 deletions backend/src/public/temp/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Now we know that Git only tracks files, so we know we need to add something to the folder.

You can add anything. You just need to add a really simple dummy file to make sure that the folder is tracked, and will be pushed.

You could copy and paste a text file file.txt with nothing in it, and that would work. You could put a PNG image of a cat.

A common, standardised practice to solve this exact issue, however, is to push a file called .gitkeep into your empty folders.

This isn't a feature of Git! So you could name it anything. There's nothing special about the name .gitkeep – some developers add .gitignore instead, for example.

.gitignore is a little confusing, though, as you are trying to make git not ignore your file, and actually push it into your branch.

Either way, by adding this simple file to your folders, they'll get pushed when the time comes.

.gitkeep is a common thing you will see in codebases, where an empty folder needs to be tracked via Git.

The name of the dummy file may not always be .gitkeep but you'll see the actual practice over and over again as a developer.

I tweet my articles here if you would like to read more of my writing.
File renamed without changes.
Loading

0 comments on commit f0ff0d5

Please sign in to comment.