Skip to content

Commit

Permalink
fix-krishnaacharyaa#461: Updated requirement file, backend & frontend…
Browse files Browse the repository at this point in the history
… .env.sample with Google auth, Redis installation
  • Loading branch information
574n13y committed Aug 13, 2024
1 parent e298b45 commit 864c4ac
Show file tree
Hide file tree
Showing 10 changed files with 161 additions and 57 deletions.
Binary file added .husky/.pre-commit.swp
Binary file not shown.
9 changes: 6 additions & 3 deletions .husky/commit-msg
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"
#!/bin/bash

"$(dirname -- "$0")/_/husky.sh"

commit_msg_file="$1"
commit_msg=$(cat "$commit_msg_file")
regex_pattern="^(fix|feat|docs|chore|refactor)(-#[0-9]+)?: .+\$"

if [[ $commit_msg =~ $regex_pattern ]]; then
echo ""
echo "Hey, hurrah! Thank you for giving attention and following our community guidelines."
Expand All @@ -29,4 +31,5 @@ else
echo "Kindly refer to \033]8;;https://github.com/krishnaacharyaa/wanderlust/blob/9b11b769bb23150b746296cf9008056633d21921/.github/CONTRIBUTING.md#guidelines-for-contributions\aContributing Guidelines\033]8;;\a."
echo ""
exit 1
fi
fi

19 changes: 12 additions & 7 deletions .husky/pre-commit
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
#!/usr/bin/env sh
#!/usr/bin/env bash

. "$(dirname -- "$0")/_/husky.sh"
# Source the Husky script
source "$(dirname -- "$0")/_/husky.sh"

cd frontend
echo [FRONTEND] Running the prettier format for you.
# Run Prettier on frontend files
cd frontend || { echo "Failed to change directory to frontend"; exit 1; }
echo "[FRONTEND] Running the prettier format for you."
npx lint-staged

cd ../backend
echo [BACKEND] Running the prettier format for you
npx lint-staged
# Run Prettier on backend files
cd ../backend || { echo "Failed to change directory to backend"; exit 1; }
echo "[BACKEND] Running the prettier format for you."
npx lint-staged


8 changes: 4 additions & 4 deletions backend/.env.sample
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
PORT=8080
MONGODB_URI="mongodb://127.0.0.1/wanderlust"
REDIS_URL="redis://127.0.0.1:6379"
FRONTEND_URL=http://localhost:5173
BACKEND_URL=http://localhost:8080
FRONTEND_URL=http://52.64.165.85:5173/
BACKEND_URL=http://52.64.165.85:8080/
ACCESS_COOKIE_MAXAGE=120000
ACCESS_TOKEN_EXPIRES_IN='120s'
REFRESH_COOKIE_MAXAGE=120000
REFRESH_TOKEN_EXPIRES_IN='120s'
JWT_SECRET=70dd8b38486eee723ce2505f6db06f1ee503fde5eb06fc04687191a0ed665f3f98776902d2c89f6b993b1c579a87fedaf584c693a106f7cbf16e8b4e67e9d6df
NODE_ENV=Development
GOOGLE_CLIENT_ID=
GOOGLE_CLIENT_SECRET=
GOOGLE_CLIENT_ID=727566412925-8v35usp6ss5r7448ca3k96dsm7ssa687.apps.googleusercontent.com
GOOGLE_CLIENT_SECRET=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d
49 changes: 7 additions & 42 deletions backend/config/passport.js
Original file line number Diff line number Diff line change
@@ -1,54 +1,19 @@
import passport from 'passport';
import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
import User from '../models/user.js';

// Configure passport with Google Strategy
passport.use(
new GoogleStrategy(
{
clientID: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
callbackURL: `${process.env.BACKEND_URL}/api/auth/google/callback`,
clientID: process.env.GOOGLE_CLIENT_ID, // Ensure this is correctly defined
clientSecret: process.env.GOOGLE_CLIENT_SECRET, // Ensure this is correctly defined
callbackURL: '/auth/google/callback',
},
async (accessToken, refreshToken, profile, done) => {
try {
let user = await User.findOne({ googleId: profile.id });

if (!user) {
const email = profile.emails && profile.emails[0] ? profile.emails[0].value : '';
let fullName = profile.displayName || '';
if (fullName.length > 15) {
fullName = fullName.slice(0, 15); // Ensure fullName is less than 15 characters
}
const userName = email.split('@')[0] || fullName.replace(/\s+/g, '').toLowerCase();

user = new User({
googleId: profile.id,
email,
fullName,
userName,
avatar: profile.photos && profile.photos[0] ? profile.photos[0].value : '',
});

await user.save();
}

done(null, user);
} catch (err) {
done(err, null);
}
function (accessToken, refreshToken, profile, done) {
// Your verification logic here
return done(null, profile);
}
)
);

passport.serializeUser((user, done) => done(null, user.id));

passport.deserializeUser(async (id, done) => {
try {
const user = await User.findById(id);
done(null, user);
} catch (err) {
done(err, null);
}
});

export default passport;
2 changes: 1 addition & 1 deletion frontend/.env.sample
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VITE_API_PATH="http://localhost:8080"
VITE_API_PATH="http://52.64.165.85/:8080"
9 changes: 9 additions & 0 deletions frontend/nohup.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

> frontend@0.0.0 dev
> vite --host


VITE v4.5.3 ready in 431 ms

➜ Local: http://localhost:5173/
➜ Network: http://172.31.10.2:5173/
50 changes: 50 additions & 0 deletions key
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
-----BEGIN OPENSSH PRIVATE KEY-----
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
Hrg86gFBkSg5b7S1IH+4S9J9E=
-----END OPENSSH PRIVATE KEY-----
1 change: 1 addition & 0 deletions key.pub
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDLgnKqCO8tp/c+zj9brCutsrP1bTe+c2/vDTRHhnsxzaJSZLRIPLzCV5pOpDixo6BKs2wZRhvL3eQEGLTVtD6Fl7BKf0xKt8qjMN9Ul98QY/NPFhu9RhM7RUxTJIvFXCqcElUIDrku2z+B4TbSv+uwBDOwsIPzTkU9pCt5A0ksvBwat4Fmz4O0zuvHb8y84Nlrtqv8wy0Hg0QyR2PuNnI77JUoVfFiSH2SPmKHVxWoJbbrWKw/vIg5lcrWgjyIHw0t0mDxKen06zkMA5VGPG5j4Wtv/H6Ui3HKCVOfAwZv3uUTMYQJ2QIfM28k+29W6ufVEN4Tw2C0RTURp/MvrQBirFpf7x7MUNToL0rSXJ0tbIHmk1fneSuH8FNTBaMsm45WiIKk2MzzcByXy4IhTvw5UjATP/y5OPlZ+w33zCy8Xl5ijiGR0VPpwfvwi7YpFkD0Jxe6+3fS4w5M4vmCmWgVNfnKyAXxfnNkGSLXQbkv89kMPjHHYcCPPty21EkF4B9JgEfkn2umtVEewDprjzrsveVVhMurk4TMGrk0Q079DpBMkxeg0ay+nOGdADTq3u7/S+i8a1TlBog225wokuKi/Uyk0uZd2xkR7vxCGBWA16CIokFOAvnMgNoR5BW185hv5wluFcn7yD3wzq2hJ+ehnhiZGUBXiy9pK0HG4ec1Sw== vivesht@gmail.com
71 changes: 71 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
attrs==23.2.0
Automat==22.10.0
Babel==2.10.3
bcc==0.29.1
bcrypt==3.2.2
blinker==1.7.0
certifi==2023.11.17
chardet==5.2.0
click==8.1.6
cloud-init==24.1.3
colorama==0.4.6
command-not-found==0.3
configobj==5.0.8
constantly==23.10.4
cryptography==41.0.7
dbus-python==1.3.2
distro==1.9.0
distro-info==1.7+build1
ec2-hibinit-agent==1.0.0
hibagent==1.0.1
httplib2==0.20.4
hyperlink==21.0.0
idna==3.6
incremental==22.10.0
Jinja2==3.1.2
jsonpatch==1.32
jsonpointer==2.0
jsonschema==4.10.3
launchpadlib==1.11.0
lazr.restfulclient==0.14.6
lazr.uri==1.0.6
markdown-it-py==3.0.0
MarkupSafe==2.1.5
mdurl==0.1.2
netaddr==0.8.0
netifaces==0.11.0
oauthlib==3.2.2
pexpect==4.9.0
ptyprocess==0.7.0
pyasn1==0.4.8
pyasn1-modules==0.2.8
Pygments==2.17.2
PyGObject==3.48.2
PyHamcrest==2.1.0
PyJWT==2.7.0
pyOpenSSL==23.2.0
pyparsing==3.1.1
pyrsistent==0.20.0
pyserial==3.5
python-apt==2.7.7+ubuntu1
python-debian==0.1.49+ubuntu2
python-magic==0.4.27
pytz==2024.1
PyYAML==6.0.1
requests==2.31.0
rich==13.7.1
service-identity==24.1.0
setuptools==68.1.2
six==1.16.0
sos==4.5.6
ssh-import-id==5.11
systemd-python==235
Twisted==24.3.0
typing_extensions==4.10.0
ubuntu-pro-client==8001
ufw==0.36.2
unattended-upgrades==0.1
urllib3==2.0.7
wadllib==1.3.6
wheel==0.42.0
zope.interface==6.1

0 comments on commit 864c4ac

Please sign in to comment.