From 725af4e9aa44e900761ddfdc9b07d68049375f75 Mon Sep 17 00:00:00 2001 From: AdhamAliAbdelAal Date: Sat, 3 Dec 2022 14:37:38 +0200 Subject: [PATCH] fix: subreddit id bug --- .eslintrc.js | 2 + data/homePagePosts.json | 2 +- devops/jenkins/Jenkinsfile | 2 +- .../CreatePostForm/CreatePostForm.jsx | 7 ++- .../CreatePostForm/submitPostServer.js | 4 +- .../CreatePostContainer/createPostServer.js | 2 +- .../HomePageContainer/PostList/PostList.jsx | 3 +- .../HomePageContainer/homePageServer.js | 6 +-- src/components/Post/Post.jsx | 6 ++- src/components/Post/PostHeader/PostHeader.jsx | 47 +++++++++++-------- 10 files changed, 49 insertions(+), 32 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 802fb7df..3fbf12e0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -42,5 +42,7 @@ module.exports = { 'no-shadow': 'off', // disabling no await in loop 'no-await-in-loop': 'off', + // disabling no-underscore-dangle + 'no-underscore-dangle': 'off', }, }; diff --git a/data/homePagePosts.json b/data/homePagePosts.json index daba79eb..f7a0c5ec 100644 --- a/data/homePagePosts.json +++ b/data/homePagePosts.json @@ -10,6 +10,6 @@ "data":[{"_id":"638a424bba1380c745d9691c00","owner":{"_id":"638a4248ba1380c745d969060","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969060","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"text","text":"Welcome to r/Egypt. The Nile River, the birthplace of civilization, and the home of the ancient Pharaohs. We're a country-themed subreddit dedicated to posting on events that affect Egypt and Egyptians. We're a multilingual subreddit, therefore submissions made in either English or Arabic are welcome.Welcome to r/Egypt. The Nile River, the birthplace of civilization, and the home of the ancient Pharaohs. We're a country-themed subreddit dedicated to posting on events that affect Egypt and Egyptians. We're a multilingual subreddit, therefore submissions made in either English or Arabic are welcome.","images":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"createdAt":"2022-11-12T12:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":30,"shareCount":15,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"flairId":{"_id":1,"text":"sports/r/all","backgroundColor":"#0079D3","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c11","owner":{"_id":"638a4248ba1380c745d969061","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969061","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"image","images":["https://external-preview.redd.it/IRAK4IuafQCZdIC_OnB0X2ASJrSSRjqL7Vtnx3jt6mc.jpg?width=640&crop=smart&auto=webp&s=1db6de95af4fecf325ed1f06771b9a6eb947ac8e"],"createdAt":"2022-11-12T12:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":12,"shareCount":16,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://external-preview.redd.it/IRAK4IuafQCZdIC_OnB0X2ASJrSSRjqL7Vtnx3jt6mc.jpg?width=640&crop=smart&auto=webp&s=1db6de95af4fecf325ed1f06771b9a6eb947ac8e"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c22","owner":{"_id":"638a4248ba1380c745d969062","name":"stream","icon":"https://b.thumbs.redditmedia.com/xvwxkNXOkvdu9d6S67odp1gCPfhB1A3qKDs7kdwO5ts.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969062","name":"skylinestar1986"},"replies":[],"title":"Steam removed my old game that was purchased not direct from Steam. Should I avoid similar stores in the future?","kind":"image","images":["https://preview.redd.it/fvqw3ckksyx91.jpg?width=640&crop=smart&auto=webp&s=51ff5a35ac5cf489beeb0cb3eb5887d666d11aa4"],"createdAt":"2022-11-12T12:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":12,"shareCount":17,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/fvqw3ckksyx91.jpg?width=640&crop=smart&auto=webp&s=51ff5a35ac5cf489beeb0cb3eb5887d666d11aa4"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c33","owner":{"_id":"638a4248ba1380c745d969063","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969063","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"video","images":["/assets/videos/mov_bbb.mp4"],"createdAt":"2022-11-12T12:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":145,"views":0,"commentCount":12,"shareCount":18,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["/assets/videos/mov_bbb.mp4"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c44","owner":{"_id":"638a4248ba1380c745d969064","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969064","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"image","images":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"createdAt":"2022-11-12T12:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":225,"views":0,"commentCount":123,"shareCount":19,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c55","owner":{"_id":"638a4248ba1380c745d969065","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969065","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"video","images":["/assets/videos/These girls win Halloween with their Karens costume - TikTokCringe.mp4"],"createdAt":"2022-11-12T12:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":56,"shareCount":20,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["/assets/videos/These girls win Halloween with their Karens costume - TikTokCringe.mp4"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}}] }, "best":{ - "data":[{"_id":"638a424bba1380c745d9691c00","owner":{"_id":"638a4248ba1380c745d969060","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969060","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"image","images":["https://external-preview.redd.it/IRAK4IuafQCZdIC_OnB0X2ASJrSSRjqL7Vtnx3jt6mc.jpg?width=640&crop=smart&auto=webp&s=1db6de95af4fecf325ed1f06771b9a6eb947ac8e"],"createdAt":"2017-07-21T17:32:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":12,"shareCount":15,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://external-preview.redd.it/IRAK4IuafQCZdIC_OnB0X2ASJrSSRjqL7Vtnx3jt6mc.jpg?width=640&crop=smart&auto=webp&s=1db6de95af4fecf325ed1f06771b9a6eb947ac8e"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c11","owner":{"_id":"638a4248ba1380c745d969061","name":"stream","icon":"https://b.thumbs.redditmedia.com/xvwxkNXOkvdu9d6S67odp1gCPfhB1A3qKDs7kdwO5ts.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969061","name":"skylinestar1986"},"replies":[],"title":"Steam removed my old game that was purchased not direct from Steam. Should I avoid similar stores in the future?","kind":"image","images":["https://preview.redd.it/fvqw3ckksyx91.jpg?width=640&crop=smart&auto=webp&s=51ff5a35ac5cf489beeb0cb3eb5887d666d11aa4"],"createdAt":"2022-09-21T20:32:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":12,"shareCount":16,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/fvqw3ckksyx91.jpg?width=640&crop=smart&auto=webp&s=51ff5a35ac5cf489beeb0cb3eb5887d666d11aa4"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c22","owner":{"_id":"638a4248ba1380c745d969062","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969062","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"video","images":["/assets/videos/mov_bbb.mp4"],"createdAt":"2022-11-12T12:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":145,"views":0,"commentCount":12,"shareCount":17,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["/assets/videos/mov_bbb.mp4"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c33","owner":{"_id":"638a4248ba1380c745d969063","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969063","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"image","images":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"createdAt":"2022-11-10T14:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":225,"views":0,"commentCount":123,"shareCount":18,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c44","owner":{"_id":"638a4248ba1380c745d969064","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969064","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"video","images":["/assets/videos/These girls win Halloween with their Karens costume - TikTokCringe.mp4"],"createdAt":"2022-11-07T14:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":56,"shareCount":19,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["/assets/videos/These girls win Halloween with their Karens costume - TikTokCringe.mp4"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c55","owner":{"_id":"638a4248ba1380c745d969065","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969065","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"image","images":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"createdAt":"2022-10-07T14:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":30,"shareCount":20,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c66","owner":{"_id":"638a4248ba1380c745d969066","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969066","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"text","text":"Welcome to r/Egypt. The Nile River, the birthplace of civilization, and the home of the ancient Pharaohs. We're a country-themed subreddit dedicated to posting on events that affect Egypt and Egyptians. We're a multilingual subreddit, therefore submissions made in either English or Arabic are welcome.Welcome to r/Egypt. The Nile River, the birthplace of civilization, and the home of the ancient Pharaohs. We're a country-themed subreddit dedicated to posting on events that affect Egypt and Egyptians. We're a multilingual subreddit, therefore submissions made in either English or Arabic are welcome.","images":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"createdAt":"2022-11-04T14:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":30,"shareCount":21,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}}] + "data":[{"_id":"638a424bba1380c745d9691c00","owner":{"_id":"638a4248ba1380c745d969060","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"User","author":{"_id":"638a4248ba1380c745d969060","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"image","images":["https://external-preview.redd.it/IRAK4IuafQCZdIC_OnB0X2ASJrSSRjqL7Vtnx3jt6mc.jpg?width=640&crop=smart&auto=webp&s=1db6de95af4fecf325ed1f06771b9a6eb947ac8e"],"createdAt":"2017-07-21T17:32:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":12,"shareCount":15,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://external-preview.redd.it/IRAK4IuafQCZdIC_OnB0X2ASJrSSRjqL7Vtnx3jt6mc.jpg?width=640&crop=smart&auto=webp&s=1db6de95af4fecf325ed1f06771b9a6eb947ac8e"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c11","owner":{"_id":"638a4248ba1380c745d969061","name":"stream","icon":"https://b.thumbs.redditmedia.com/xvwxkNXOkvdu9d6S67odp1gCPfhB1A3qKDs7kdwO5ts.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969061","name":"skylinestar1986"},"replies":[],"title":"Steam removed my old game that was purchased not direct from Steam. Should I avoid similar stores in the future?","kind":"image","images":["https://preview.redd.it/fvqw3ckksyx91.jpg?width=640&crop=smart&auto=webp&s=51ff5a35ac5cf489beeb0cb3eb5887d666d11aa4"],"createdAt":"2022-09-21T20:32:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":12,"shareCount":16,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/fvqw3ckksyx91.jpg?width=640&crop=smart&auto=webp&s=51ff5a35ac5cf489beeb0cb3eb5887d666d11aa4"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c22","owner":{"_id":"638a4248ba1380c745d969062","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969062","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"video","images":["/assets/videos/mov_bbb.mp4"],"createdAt":"2022-11-12T12:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":145,"views":0,"commentCount":12,"shareCount":17,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["/assets/videos/mov_bbb.mp4"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c33","owner":{"_id":"638a4248ba1380c745d969063","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969063","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"image","images":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"createdAt":"2022-11-10T14:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":225,"views":0,"commentCount":123,"shareCount":18,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"]},{"_id":"638a424bba1380c745d9691c44","owner":{"_id":"638a4248ba1380c745d969064","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969064","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"video","images":["/assets/videos/These girls win Halloween with their Karens costume - TikTokCringe.mp4"],"createdAt":"2022-11-07T14:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":56,"shareCount":19,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["/assets/videos/These girls win Halloween with their Karens costume - TikTokCringe.mp4"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c55","owner":{"_id":"638a4248ba1380c745d969065","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969065","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"image","images":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"createdAt":"2022-10-07T14:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":30,"shareCount":20,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}},{"_id":"638a424bba1380c745d9691c66","owner":{"_id":"638a4248ba1380c745d969066","name":"toptalent","icon":"https://styles.redditmedia.com/t5_3ptyd/styles/communityIcon_p18jqwszxcv51.png"},"ownerType":"Subreddit","author":{"_id":"638a4248ba1380c745d969066","name":"righteous_boldness07"},"replies":[],"title":"In 1991 Michael Jordan shot a free throw with his eyes closed while playing the Denver Nuggets.","kind":"text","text":"Welcome to r/Egypt. The Nile River, the birthplace of civilization, and the home of the ancient Pharaohs. We're a country-themed subreddit dedicated to posting on events that affect Egypt and Egyptians. We're a multilingual subreddit, therefore submissions made in either English or Arabic are welcome.Welcome to r/Egypt. The Nile River, the birthplace of civilization, and the home of the ancient Pharaohs. We're a country-themed subreddit dedicated to posting on events that affect Egypt and Egyptians. We're a multilingual subreddit, therefore submissions made in either English or Arabic are welcome.","images":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"createdAt":"2022-11-04T14:29:28Z","locked":false,"isDeleted":false,"sendReplies":true,"nsfw":false,"spoiler":false,"votes":245,"views":0,"commentCount":30,"shareCount":21,"suggestedSort":"top","scheduled":false,"isHidden":false,"isSaved":true,"videos":["https://preview.redd.it/yr356u91nzx91.jpg?width=640&crop=smart&auto=webp&s=65ecee9450783d636fb9cc5bf54413b6bf8b41fc"],"flairId":{"_id":1,"text":"اي كلام/r/all","backgroundColor":"#ea0027","textColor":"#fff"}}] } } \ No newline at end of file diff --git a/devops/jenkins/Jenkinsfile b/devops/jenkins/Jenkinsfile index 4397af88..f2c15580 100644 --- a/devops/jenkins/Jenkinsfile +++ b/devops/jenkins/Jenkinsfile @@ -36,7 +36,7 @@ HOST=0.0.0.0 REACT_APP_GOOGLECLIENTID=\'"$GOOGLE_APP_ID"\' REACT_APP_FACEBOOKCLIENTID=\'"$FACEBOOK_APP_ID"\' REACT_APP_SITEKEY="6LdjH-kiAAAAANFbV6SUnCjXNK3Z0h7q7j4IFf7i" -REACT_APP_ENV='production' +REACT_APP_ENV='development' REACT_APP_PROXY_DEVELOPMENT="http://localhost:8000" REACT_APP_PROXY_PRODUCTION="https://api.nonlegit.click/api/v1"' > .env # Build the docker image diff --git a/src/components/CreatePost/CreatePostContainer/CreatePostForm/CreatePostForm.jsx b/src/components/CreatePost/CreatePostContainer/CreatePostForm/CreatePostForm.jsx index 8a2c132f..9e03eb31 100644 --- a/src/components/CreatePost/CreatePostContainer/CreatePostForm/CreatePostForm.jsx +++ b/src/components/CreatePost/CreatePostContainer/CreatePostForm/CreatePostForm.jsx @@ -4,7 +4,7 @@ import { import { useState, useEffect } from 'react'; -import { useParams } from 'react-router-dom'; +import { useNavigate, useParams } from 'react-router-dom'; import { FormContainer, Title, TitleContainer, DraftsButton, Badge, CustomDivider, PostFormContainer, FieldsContainer, PostTitle, PostText, PostUrl, WordCounter, } from './styles'; @@ -28,6 +28,7 @@ import currentSubredditServer from './currentSubredditServer'; function CreatePostForm() { // routes const { subredditName } = useParams(); + const navigate = useNavigate(); console.log(subredditName); // server @@ -52,6 +53,8 @@ function CreatePostForm() { const [spoiler, setSpoiler] = useState(false); const [nswf, setNswf] = useState(false); const [sendReplies, setSendReplies] = useState(true); + console.log('title', title); + console.log('community to post in', communityToPostIn); useEffect(() => { setCommunityToPostIn(subredditId); @@ -81,7 +84,7 @@ function CreatePostForm() { sendReplies, }; console.log(post); - submitPostServer(post); + submitPostServer(post, navigate); }; /** * This function handles title change diff --git a/src/components/CreatePost/CreatePostContainer/CreatePostForm/submitPostServer.js b/src/components/CreatePost/CreatePostContainer/CreatePostForm/submitPostServer.js index d46b14a2..3027750b 100644 --- a/src/components/CreatePost/CreatePostContainer/CreatePostForm/submitPostServer.js +++ b/src/components/CreatePost/CreatePostContainer/CreatePostForm/submitPostServer.js @@ -5,7 +5,7 @@ import axios from '../../../../services/instance'; * @function submitPostServer * @param {Object} post - post to be posted */ -const submitPostServer = (post) => { +const submitPostServer = (post, navigate) => { console.log(JSON.stringify(post)); axios.post('/posts', JSON.stringify(post)).then((response) => { console.log(response.data); @@ -14,7 +14,7 @@ const submitPostServer = (post) => { const { message } = response.data; console.log(message); } else { - // post created successfully + navigate('/'); } alert('posted successfully'); }).catch((e) => { diff --git a/src/components/CreatePost/CreatePostContainer/createPostServer.js b/src/components/CreatePost/CreatePostContainer/createPostServer.js index deabfa78..66f2f6c1 100644 --- a/src/components/CreatePost/CreatePostContainer/createPostServer.js +++ b/src/components/CreatePost/CreatePostContainer/createPostServer.js @@ -10,7 +10,7 @@ const createPostServer = () => { const communitiesUrl = '/subreddits/mine/subscriber'; const [data, communitiesError, statusCode] = useFetch(communitiesUrl); const communities = data?.data.map((community) => ({ - ...community, subredditName: community.fixedName, + ...community, subredditName: community.fixedName, id: community._id, })); console.log('communities', communities); console.log(statusCode); diff --git a/src/components/HomePage/HomePageContainer/PostList/PostList.jsx b/src/components/HomePage/HomePageContainer/PostList/PostList.jsx index 3a21a771..60965daa 100644 --- a/src/components/HomePage/HomePageContainer/PostList/PostList.jsx +++ b/src/components/HomePage/HomePageContainer/PostList/PostList.jsx @@ -13,7 +13,7 @@ function PostList(props) { <> {posts.map((post) => { const { - _id: id, createdAt, title, images, ownerName, ownerIcon, authorName, flairText, flairBackgroundColor, flairColor, kind, votes, commentCount, text, videos, + _id: id, createdAt, title, images, ownerName, ownerIcon, authorName, flairText, flairBackgroundColor, flairColor, kind, votes, commentCount, text, videos, ownerType, } = post; return ( ); })} diff --git a/src/components/HomePage/HomePageContainer/homePageServer.js b/src/components/HomePage/HomePageContainer/homePageServer.js index ad69fdd2..c86aec13 100644 --- a/src/components/HomePage/HomePageContainer/homePageServer.js +++ b/src/components/HomePage/HomePageContainer/homePageServer.js @@ -11,9 +11,9 @@ const homePageServer = (postClass) => { // for backend bugs const temp = { _id: 1, - text: 'اي كلام/r/all', - backgroundColor: '#ea0027', - textColor: '#fff', + text: '', + backgroundColor: '', + textColor: '', }; const { text: flairText, diff --git a/src/components/Post/Post.jsx b/src/components/Post/Post.jsx index b69c1338..885be50d 100644 --- a/src/components/Post/Post.jsx +++ b/src/components/Post/Post.jsx @@ -17,6 +17,7 @@ import PostHeader from './PostHeader/PostHeader'; * * @component Post * @property {string} title -Post title. + * @property {string} ownerType -Post owner type user or subreddit. * @property {string} ownerIcon -Post owner icon. * @property {string} ownerName -Post subreddit(post owner). * @property {string} authorName -Post author. @@ -35,7 +36,7 @@ import PostHeader from './PostHeader/PostHeader'; function Post(props) { const { - createdAt, title, images, ownerName, ownerIcon, authorName, flairText, flairBackgroundColor, flairColor, kind, votes, commentCount, text, videos, + createdAt, title, images, ownerType, ownerName, ownerIcon, authorName, flairText, flairBackgroundColor, flairColor, kind, votes, commentCount, text, videos, subredit, } = props; const theme = useTheme(); @@ -57,11 +58,12 @@ function Post(props) { ownerIcon={ownerIcon} ownerName={ownerName} authorName={authorName} - flair={flairText} + flairText={flairText} flairBackgroundColor={flairBackgroundColor} flairColor={flairColor} createdAt={createdAt} subredit={subredit} + ownerType={ownerType} /> {/* eslint-disable jsx-a11y/media-has-caption */} diff --git a/src/components/Post/PostHeader/PostHeader.jsx b/src/components/Post/PostHeader/PostHeader.jsx index 32c7cf1d..bd4d0174 100644 --- a/src/components/Post/PostHeader/PostHeader.jsx +++ b/src/components/Post/PostHeader/PostHeader.jsx @@ -16,6 +16,7 @@ import { * * @component PostHeader * @property {string} title -Post title. + * @property {string} ownerType -Post owner type user or subreddit. * @property {string} ownerIcon -Post ownerName icon. * @property {string} ownerName -Post subreddit(post ownerName). * @property {string} authorName -Post authorName. @@ -28,7 +29,7 @@ import { function PostHeader(props) { const { - title, ownerIcon, ownerName, authorName, flair, flairBackgroundColor, flairColor, createdAt, + title, ownerIcon, ownerType, ownerName, authorName, flairText, flairBackgroundColor, flairColor, createdAt, subredit, } = props; @@ -48,27 +49,30 @@ function PostHeader(props) { /> - r/ + {ownerType === 'Subreddit' ? 'r/' : 'u/'} {ownerName} )} - {!subredit && ( - - • - + {ownerType === 'Subreddit' && ( + <> + {!subredit && ( + + • + + )} +
Posted By
+ + u/ + {authorName} + + )} -
Posted By
- - u/ - {authorName} - {calculateTime(createdAt)} - {!subredit && ( @@ -84,13 +88,18 @@ function PostHeader(props) { > {title} {' '} - - {flair} - + { + flairText + && ( + + {flairText} + + ) + }