Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
147b656
package changes
kxviel Jul 16, 2021
855eb9e
code refactors
kxviel Jul 16, 2021
2246a7c
refactored code
kxviel Jul 16, 2021
c252995
scss structure fixes
kxviel Jul 16, 2021
b5579c2
Blog list fixes
kxviel Jul 17, 2021
2ffc4e6
Minor color fixes
kxviel Jul 17, 2021
d1412aa
Merge pull request #2 from kevkanae/kevin-dev
kxviel Jul 17, 2021
8438c78
Fixed auth
kxviel Jul 18, 2021
d6340ea
Merge pull request #3 from kevkanae/kevin-dev
kxviel Jul 18, 2021
7be8201
Merge pull request #4 from kevkanae/dev-collab
kxviel Jul 18, 2021
32ed5a4
Publication backend added
Jul 18, 2021
43b8d8f
landing
Rohan-3000 Jul 20, 2021
d685a6b
Merge pull request #5 from Rohan-3000/dev-collab
kxviel Jul 20, 2021
eebd695
Update index.tsx
Rohan-3000 Jul 21, 2021
c09b518
Project Restructure
kxviel Jul 23, 2021
51213c9
project restructure
kxviel Jul 25, 2021
9e09f97
header header-body done
kxviel Jul 25, 2021
5d3ff0f
landing page ok
kxviel Jul 26, 2021
4d64522
navigation done
kxviel Jul 26, 2021
0e392e6
Merge pull request #7 from kevkanae/kevin-dev
kxviel Jul 26, 2021
a180d22
Merge pull request #8 from kevkanae/dev-collab
kxviel Jul 26, 2021
93ec65b
Accounts section done
kxviel Jul 27, 2021
1b1f0f9
Backed integrated
Jul 28, 2021
743d3a5
Merge pull request #10 from kevkanae/dev-gracypatel
kxviel Jul 28, 2021
8ce918e
publication and blogs
Rohan-3000 Jul 30, 2021
7af39c2
Merge pull request #12 from kevkanae/kevin-dev
kxviel Jul 31, 2021
c890d96
Merge branch 'kevkanae:dev-collab' into dev-collab
Rohan-3000 Jul 31, 2021
da861d7
some changes in publication and blog list
Rohan-3000 Aug 5, 2021
7fc9748
Merge pull request #13 from Rohan-3000/dev-collab
kxviel Aug 5, 2021
8277346
+ Add Post Feature
kxviel Aug 6, 2021
40dd4ba
Merge pull request #14 from kevkanae/kevin-dev
kxviel Aug 6, 2021
3962e19
Apis added
Aug 16, 2021
47ebc9e
Merge pull request #15 from kevkanae/gracyAPI
kxviel Aug 17, 2021
47e84da
Fixed blog add bugs
kxviel Aug 18, 2021
3eface7
minor bug
kxviel Aug 18, 2021
22b8247
Merge pull request #16 from kevkanae/kevin-dev
kxviel Aug 18, 2021
9a8d966
Merge pull request #17 from kevkanae/dev-collab
kxviel Aug 18, 2021
9154c9a
errors remvoved
kxviel Aug 18, 2021
7df3078
Merge pull request #18 from kevkanae/kevin-dev
kxviel Aug 18, 2021
4757037
Merge pull request #19 from kevkanae/kevin-dev
kxviel Aug 18, 2021
6239174
+ removed comments
kxviel Aug 18, 2021
05df39e
Merge pull request #20 from kevkanae/kevin-dev
kxviel Aug 18, 2021
fdba817
Merge pull request #21 from kevkanae/dev-collab
kxviel Aug 18, 2021
2c927f4
Account section
Aug 19, 2021
7e6b8d2
Merge pull request #22 from kevkanae/finalGracy
kxviel Aug 19, 2021
cf07bd8
Final touches
Aug 19, 2021
033b4fa
Merge pull request #23 from kevkanae/finalGracy
gracyspatel Aug 19, 2021
96c503a
UI Changes
kxviel Aug 25, 2021
1285457
minor fix
kxviel Sep 2, 2021
7fef440
package updates
kxviel Sep 2, 2021
49d68fa
Merge pull request #24 from kevkanae/kevin-dev
kxviel Sep 2, 2021
b0221d7
Update README.md
kxviel Sep 2, 2021
d21383b
temporary changes
Jul 20, 2022
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
5 changes: 3 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
GOOGLE_ID=452084354911-nm9m0ml9ujqnr471j3uqsv3370401r8q.apps.googleusercontent.com
GOOGLE_SECRET=9qxc7pSBdMFBGZGQR_UO8RS-

API_URL = http://localhost:7070
API_URL = http://localhost:7070
MONGODB_URI=mongodb+srv://kevkanae:[email protected]/?retryWrites=true&w=majority
MONGODB_DB=webx
5 changes: 0 additions & 5 deletions .idea/.gitignore

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/BloggerWeb.iml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/prettier.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

10 changes: 10 additions & 0 deletions Backend/Models/UserModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const mongoose = require("mongoose")

const UserModel = new mongoose.Schema({
userName: { type: String },
userEmail: { type: String },
userPassword: { type: String },
});

const UserModels = mongoose.model("user_collections", UserModel)
module.exports = UserModels
155 changes: 155 additions & 0 deletions Backend/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
const express = require("express")
const App = express()
const PORT = process.env.PORT || 5000
const cors = require('cors')
const mongoose = require('mongoose')
const bcrypt = require('bcrypt')
const jwt = require('jsonwebtoken')
const UserModel = require("./Models/UserModel.js")


const dburi = "mongodb+srv://kevkanae:[email protected]/webx?retryWrites=true&w=majority"

App.use(express.json())
App.use(cors())

try {
mongoose.connect(dburi, { useNewUrlParser: true, useUnifiedTopology: true }).then(() => {
App.listen(PORT)
console.log("Connected to database")
})
console.log("MongoDB Connection: ✔");
} catch (err) {
console.log(err);
throw err;
}

// Test
App.get('/',(req,res)=>{
res.send('Yeah it works')
})

// LLogin
var add_minutes = function (dt, minutes) {
return new Date(dt.getTime() + minutes * 60000);
};

App.post('/login',(req,res)=>{
const { email, password } = req.body;
// Check if email exists
UserModel.findOne(
{
userEmail: email,
},


(err, docs) => {
if (err) console.log(err);
else {
if (docs) {
// Compare passwords
if (bcrypt.compare(password, docs["userPassword"])) {
const token = jwt.sign(
{ email: docs["userEmail"], id: docs["_id"] },
"kamiwajinseides",
{ expiresIn: "1h" }
);

let now = new Date();
// Proceed to login
res.send({
code: 200,
response: docs,
expiresIn: add_minutes(now, 60),
signedToken: token,
userResponse: "Proceed",
});
} else
res.send({
code: 401,
userResponse: "Wrong Password",
});
} else {
// Register first
res.send({
code: 401,
userResponse: "Unregistered",
});
}
}
}
);
})


// Register
App.post('/register',async(req,res)=>{
const { name, email, password } = req.body;
const hashPassword = await bcrypt.hash(password, 7);

UserModel.findOne({ userEmail: email }, (err, docs) => {
if (err) console.log(err);
else {
if (docs) {
// Account already exists
res.send({
code: 422,
userResponse: "Account Exists",
});
} else {
// Create account
new UserModel({
userName: name,
userEmail: email,
userPassword: hashPassword,
})
.save()
.then(() => {
UserModel.findOne(
{
userEmail: email,
},
(err, docs) => {
if (err) console.log(err);
else {
if (docs) {
const token = jwt.sign(
{ email: docs["userEmail"], id: docs["_id"] },
"kamiwajinseides",
{ expiresIn: "1h" }
);

let now = new Date();
// Proceed to login
res.send({
code: 200,
response: docs,
expiresIn: add_minutes(now, 60),
signedToken: token,
userResponse: "Proceed",
});
} else {
// Register first
res.send({
code: 401,
userResponse: "Unregistered",
});
}
}
}
);
})
.catch((err) => {
console.log(err);
res.send({
code: 400,
response: err,
userResponse: "Oops",
});
});
}
}
});
})


Loading