Skip to content

Commit deac8c9

Browse files
committed
revert sadaf commit for category changes
1 parent 1ebd808 commit deac8c9

File tree

3 files changed

+25
-79
lines changed

3 files changed

+25
-79
lines changed

backend/package.json

+19-9
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,53 @@
11
{
22
"name": "backend",
3-
"version": "1.0.0",
4-
"description": "vigybag server and backend credentials",
3+
"version": "1.0.1",
4+
"description": "VigyBag server and backend credentials",
55
"main": "server.js",
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1",
8-
"start": "nodemon server.js"
8+
"start": "nodemon server.js",
9+
"dev": "nodemon server.js",
10+
"prod": "node server.js"
911
},
1012
"repository": {
1113
"type": "git",
12-
"url": "git+https://github.com/codervivek5/VigyBag.git"
14+
"url": "https://github.com/codervivek5/VigyBag.git"
1315
},
1416
"keywords": [
1517
"vigybag",
1618
"backend",
17-
"Vigy Bag"
19+
"Vigy Bag",
20+
"server",
21+
"API"
1822
],
19-
"author": "Vivek Prajapti",
23+
"author": "Vivek Prajapati",
2024
"license": "ISC",
2125
"bugs": {
2226
"url": "https://github.com/codervivek5/VigyBag/issues"
2327
},
2428
"homepage": "https://github.com/codervivek5/VigyBag#readme",
2529
"dependencies": {
2630
"bcrypt": "^5.1.1",
27-
"bcryptjs": "^2.4.3",
2831
"cors": "^2.8.5",
2932
"dotenv": "^16.4.5",
3033
"express": "^4.19.2",
3134
"express-session": "^1.18.0",
3235
"jsonwebtoken": "^9.0.2",
3336
"mongoose": "^8.5.1",
34-
"mongoose-findorcreate": "^4.0.0",
3537
"multer": "^1.4.5-lts.1",
3638
"nodemailer": "^6.9.14",
3739
"nodemon": "^3.1.4",
3840
"passport": "^0.7.0",
3941
"passport-google-oauth20": "^2.0.0",
4042
"passport-local": "^1.0.0",
4143
"passport-local-mongoose": "^8.0.0"
42-
}
44+
},
45+
"devDependencies": {
46+
"eslint": "^8.45.0"
47+
},
48+
"browserslist": [
49+
"defaults",
50+
"not IE 11",
51+
"last 2 versions"
52+
]
4353
}

src/App.jsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,15 @@ export default function App() {
157157
{/* Other user routes */}
158158
<Route path="contributors" element={<Contributors />} />
159159
<Route path="about-us" element={<AboutUs />} />
160+
<<<<<<< HEAD
160161
<Route path="help" element={<Help />} /> {/* Help page route */}
161162
<Route path="privacy-policy" element={<Privacy />} />
163+
=======
164+
<Route path="help" element={<Help />} />
165+
<Route path="privacy" element={<Privacy />} />
166+
>>>>>>> 5eed12d9 (revert sadaf commit for category changes)
162167
{/* Privacy policy page route */}
163-
<Route path="cart" element={<Cart />} /> {/* Cart page route */}
168+
<Route path="cart" element={<Cart />} />
164169
<Route
165170
path="productDetails/:productId"
166171
element={<ProductDetails />}

src/index.css

-69
Original file line numberDiff line numberDiff line change
@@ -27,72 +27,3 @@
2727
cursor: pointer;
2828
}
2929

30-
31-
/* :root {
32-
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
33-
line-height: 1.5;
34-
font-weight: 400;
35-
36-
color-scheme: light dark;
37-
color: rgba(255, 255, 255, 0.87);
38-
background-color: #242424;
39-
40-
font-synthesis: none;
41-
text-rendering: optimizeLegibility;
42-
-webkit-font-smoothing: antialiased;
43-
-moz-osx-font-smoothing: grayscale;
44-
}
45-
46-
a {
47-
font-weight: 500;
48-
color: #646cff;
49-
text-decoration: inherit;
50-
}
51-
a:hover {
52-
color: #535bf2;
53-
}
54-
55-
body {
56-
margin: 0;
57-
display: flex;
58-
place-items: center;
59-
min-width: 320px;
60-
min-height: 100vh;
61-
}
62-
63-
h1 {
64-
font-size: 3.2em;
65-
line-height: 1.1;
66-
}
67-
68-
button {
69-
border-radius: 8px;
70-
border: 1px solid transparent;
71-
padding: 0.6em 1.2em;
72-
font-size: 1em;
73-
font-weight: 500;
74-
font-family: inherit;
75-
background-color: #1a1a1a;
76-
cursor: pointer;
77-
transition: border-color 0.25s;
78-
}
79-
button:hover {
80-
border-color: #646cff;
81-
}
82-
button:focus,
83-
button:focus-visible {
84-
outline: 4px auto -webkit-focus-ring-color;
85-
}
86-
87-
@media (prefers-color-scheme: light) {
88-
:root {
89-
color: #213547;
90-
background-color: #ffffff;
91-
}
92-
a:hover {
93-
color: #747bff;
94-
}
95-
button {
96-
background-color: #f9f9f9;
97-
}
98-
} */

0 commit comments

Comments
 (0)