diff --git a/.gitignore b/.gitignore index 8b9cb32..df5c68d 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,7 @@ Thumbs.db ############################# # Lock file so we don't bloat the git log stats -package-lock.json +# package-lock.json # Logs logs diff --git a/back-end/.env b/back-end/.env index 9f60093..161ab84 100644 --- a/back-end/.env +++ b/back-end/.env @@ -1,9 +1,11 @@ SESSION_SECRET='myKey123!' JWT_SECRET='myKey123!' -CLIENT_URL="http://143.198.14.199:5173/" +CLIENT_URL="http://192.168.1.159:5173/" + MONGODB_DATA_API = "https://us-east-1.aws.data.mongodb-api.com/app/data-fzvrf/endpoint/data/v1" MONGODB_API_KEY = "fxgnbKaz0PmfQVDJUG631Qz98KqkisGoXvBGSjziqS6faj9oNBx96MUon32t8gDZ" +MONGODB_URI = "mongodb+srv://yz5835:mlDMBoYStK63fpWj@bakerdb.imjpooa.mongodb.net/bakerdb" EMAIL_USER='goodoldmap@gmail.com' EMAIL_PASS='Goodoldmap123' diff --git a/back-end/src/app.mjs b/back-end/src/app.mjs index 521a9ef..1ca3fe6 100644 --- a/back-end/src/app.mjs +++ b/back-end/src/app.mjs @@ -49,11 +49,11 @@ app.use(cors(corsOptions)); console.log(process.env.CLIENT_URL); // Connect to MongoDB -// mongoose.connect(process.env.MONGODB_URI, { useNewUrlParser: true, useUnifiedTopology: true }) -// .then(() => { -// console.log('Connected to MongoDB...'); -// }) -// .catch(err => console.error('Could not connect to MongoDB...', err)); +mongoose.connect(process.env.MONGODB_URI, { useNewUrlParser: true, useUnifiedTopology: true }) + .then(() => { + console.log('Connected to MongoDB...'); + }) + .catch(err => console.error('Could not connect to MongoDB...', err)); // session to auto-save user data (like id) when they login app.use(session({ diff --git a/front-end/public/heart.svg b/front-end/public/heart.svg new file mode 100644 index 0000000..9399a21 --- /dev/null +++ b/front-end/public/heart.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/front-end/public/map.svg b/front-end/public/map.svg new file mode 100644 index 0000000..1449590 --- /dev/null +++ b/front-end/public/map.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/front-end/public/sunset.jpg b/front-end/public/sunset.jpg new file mode 100644 index 0000000..c32ab6c Binary files /dev/null and b/front-end/public/sunset.jpg differ diff --git a/front-end/public/user.svg b/front-end/public/user.svg new file mode 100644 index 0000000..13efef2 --- /dev/null +++ b/front-end/public/user.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/front-end/src/pages/Authenticate/Login.jsx b/front-end/src/pages/Authenticate/Login.jsx index 12be349..94f6b41 100644 --- a/front-end/src/pages/Authenticate/Login.jsx +++ b/front-end/src/pages/Authenticate/Login.jsx @@ -107,7 +107,7 @@ const Login = () => { background-size: cover; background-position: center; background-repeat: no-repeat; - filter: blur(2px); /* Apply the blur effect */ + filter: blur(0px); /* Apply the blur effect */ z-index: -1; /* Ensure it's behind the content */ } `} diff --git a/front-end/src/pages/Authenticate/Register.jsx b/front-end/src/pages/Authenticate/Register.jsx index 5614a2c..063f6f7 100644 --- a/front-end/src/pages/Authenticate/Register.jsx +++ b/front-end/src/pages/Authenticate/Register.jsx @@ -47,7 +47,7 @@ const Register = () => { background-size: cover; background-position: center; background-repeat: no-repeat; - filter: blur(2px); /* Apply the blur effect */ + filter: blur(0px); /* Apply the blur effect */ z-index: -1; /* Ensure it's behind the content */ } `} diff --git a/front-end/src/pages/FavoriteList/FavoriteList.jsx b/front-end/src/pages/FavoriteList/FavoriteList.jsx index 323b5ef..13ba2ca 100644 --- a/front-end/src/pages/FavoriteList/FavoriteList.jsx +++ b/front-end/src/pages/FavoriteList/FavoriteList.jsx @@ -42,12 +42,12 @@ const FavoriteList = () => { return ( <> -
-

My Favorite Arts

+
+

My Favorite Arts 🎨

-
-
+
+
- -
+
+
{arts.map((art) => ( -
handleArtItemClick(art)}> +
handleArtItemClick(art)} className="w-full md:w-1/2 lg:w-1/3">
))}
- +
diff --git a/front-end/src/pages/MainMap/MapLayout.jsx b/front-end/src/pages/MainMap/MapLayout.jsx index a70460e..fe5fa62 100644 --- a/front-end/src/pages/MainMap/MapLayout.jsx +++ b/front-end/src/pages/MainMap/MapLayout.jsx @@ -46,8 +46,8 @@ const MapLayout = () => { return ( <>
-
-