From 563d40fe442742106412a443778fe63a0293aa69 Mon Sep 17 00:00:00 2001 From: Dunsin <78784850+Dun-sin@users.noreply.github.com> Date: Thu, 24 Aug 2023 17:23:59 +0100 Subject: [PATCH 001/591] data: remove Dun-sin (#8756) *remove Dun-sin json --- data/Dun-sin.json | 85 ----------------------------------------------- 1 file changed, 85 deletions(-) delete mode 100644 data/Dun-sin.json diff --git a/data/Dun-sin.json b/data/Dun-sin.json deleted file mode 100644 index 6b310e1e181..00000000000 --- a/data/Dun-sin.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "name": "Dunsin", - "bio": "Web Developer, Content Creator and Open Source Enthusiast!", - "tags": [ - "Content Creation", - "Open Source", - "GitHub", - "Web Developer", - "JavaScript", - "Reactjs/Nextjs", - "TailwindCSS" - ], - "socials": [ - { - "icon": "FaTwitter", - "url": "https://twitter.com/dunsinwebdev" - }, - { - "icon": "FaGithub", - "url": "https://github.com/Dun-sin" - }, - { - "icon": "FaInstagram", - "url": "https://www.instagram.com/dunsincodes" - } - ], - "links": [ - { - "name": "Follow me on Instagram", - "url": "https://www.instagram.com/dunsincodes", - "icon": "FaInstagram" - }, - { - "name": "Follow me on GitHub", - "url": "https://github.com/Dun-sin", - "icon": "FaGithub" - }, - { - "name": "Follow me on Twitter", - "url": "https://twitter.com/dunsinwebdev", - "icon": "FaTwitter" - }, - { - "name": "Check out my portfolio", - "url": "https://dunsin.vercel.app", - "icon": "FaGlobe" - }, - { - "name": "Let's connect on LinkedIn", - "url": "https://linkedin.com/in/favour-faiyetole-99a438229", - "icon": "FaLinkedin" - }, - { - "name": "Buy me a coffee", - "url": "https://buymeacoffee.com/dunsinCodes", - "icon": "FaCoffee" - } - ], - "milestones": [ - { - "title": "Started Web Development", - "date": "August 2021", - "icon": "FaCode", - "color": "blue", - "description": "Started Learning Web Development", - "url": "https://dunsin.vercel.app/" - }, - { - "title": "Content Creation", - "date": "December 2021", - "icon": "FaInstagram", - "color": "pink", - "description": "Started Content Creating on Instagram", - "url": "https://www.instagram.com/dunsincodes" - }, - { - "title": "First Internship", - "date": "March 2022", - "icon": "FaCode", - "color": "purple", - "description": "Got my first internship at pixul", - "url": "https://dunsin.vercel.app/" - } - ] -} From 110c2cb22209df77d490fcd2e8f7e664364553bd Mon Sep 17 00:00:00 2001 From: Soha Mubashir <81903428+SohaMubashir@users.noreply.github.com> Date: Thu, 24 Aug 2023 21:26:45 +0500 Subject: [PATCH 002/591] data: SohaMubashir (#8755) --- data/SohaMubashir.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 data/SohaMubashir.json diff --git a/data/SohaMubashir.json b/data/SohaMubashir.json new file mode 100644 index 00000000000..11986cbe975 --- /dev/null +++ b/data/SohaMubashir.json @@ -0,0 +1,16 @@ +{ + "name": "Soha Mubashir", + "bio": "Web Developer | Python and JavaScript enthusiast | Open Source", + "links": [ + { + "name": "Follow on GitHub", + "url": "https://github.com/SohaMubashir", + "icon": "FaGithub" + }, + { + "name": "Follow on Linkedin", + "url": "https://www.linkedin.com/in/soha-mubashir-196r", + "icon": "FaLinkedin" + } + ] +} From f03f3f3f60a0233ff8cea1b62e216dd0031acd24 Mon Sep 17 00:00:00 2001 From: eddiejaoude Date: Fri, 25 Aug 2023 01:22:54 +0000 Subject: [PATCH 003/591] style: format files --- data/Myrausman.json | 2 +- data/SohaMubashir.json | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/Myrausman.json b/data/Myrausman.json index 118bdeb09a2..74af517a743 100644 --- a/data/Myrausman.json +++ b/data/Myrausman.json @@ -23,7 +23,7 @@ { "group": "Primary Socials", "name": "Twitter: Follow me", - "url": "https://twitter.com/Myra_5703", + "url": "https://twitter.com/Myra_5703", "icon": "FaTwitter" }, { diff --git a/data/SohaMubashir.json b/data/SohaMubashir.json index 11986cbe975..dfa8aee2c5f 100644 --- a/data/SohaMubashir.json +++ b/data/SohaMubashir.json @@ -1,16 +1,16 @@ { - "name": "Soha Mubashir", - "bio": "Web Developer | Python and JavaScript enthusiast | Open Source", - "links": [ - { - "name": "Follow on GitHub", - "url": "https://github.com/SohaMubashir", - "icon": "FaGithub" - }, - { - "name": "Follow on Linkedin", - "url": "https://www.linkedin.com/in/soha-mubashir-196r", - "icon": "FaLinkedin" - } - ] + "name": "Soha Mubashir", + "bio": "Web Developer | Python and JavaScript enthusiast | Open Source", + "links": [ + { + "name": "Follow on GitHub", + "url": "https://github.com/SohaMubashir", + "icon": "FaGithub" + }, + { + "name": "Follow on Linkedin", + "url": "https://www.linkedin.com/in/soha-mubashir-196r", + "icon": "FaLinkedin" + } + ] } From 15f1260da1b07d71aa71346fcfa2891415ba9103 Mon Sep 17 00:00:00 2001 From: Bemdoo Maor Date: Fri, 25 Aug 2023 03:51:09 +0100 Subject: [PATCH 004/591] data: MaorBemdoo (#8758) --- data/MaorBemdoo.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 data/MaorBemdoo.json diff --git a/data/MaorBemdoo.json b/data/MaorBemdoo.json new file mode 100644 index 00000000000..db9dc1ccee1 --- /dev/null +++ b/data/MaorBemdoo.json @@ -0,0 +1,21 @@ + { + "name": "Bemdoo Maor", + "bio": "15 year old passionate Full-stack developer | Student | Open source lover", + "links": [ + { + "name": "Follow me on Github", + "url": "https://twitter.com/MaorBemdoo", + "icon": "FaGithub" + }, + { + "name": "Follow me on Twitter", + "url": "https://twitter.com/BemdooMaor", + "icon": "FaTwitter" + }, + { + "name": "Follow me on Linkedin", + "url": "https://www.linkedin.com/in/bemdoo-maor-449698279", + "icon": "FaLinkedin" + } + ] +} From a86f356cd0eefaeb1b44a63040808441ec5a4668 Mon Sep 17 00:00:00 2001 From: Patrick Murimi Date: Fri, 25 Aug 2023 05:52:39 +0300 Subject: [PATCH 005/591] data: update grand-rick001 (#8759) --- data/grand-rick001.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/grand-rick001.json b/data/grand-rick001.json index e662598ccf1..2db414b7314 100644 --- a/data/grand-rick001.json +++ b/data/grand-rick001.json @@ -29,7 +29,7 @@ { "group": "Socials", "name": "Twitter: Let's converse", - "url": "https://twitter.com/grandrick001", + "url": "https://twitter.com/patrick_murimi_", "icon": "FaTwitter", "color": "#00ACEE" }, From 56203b71d5224bbf1b2a6f6d919513c4d8726de1 Mon Sep 17 00:00:00 2001 From: Grut <72060440+akash19coder@users.noreply.github.com> Date: Fri, 25 Aug 2023 12:47:46 +0530 Subject: [PATCH 006/591] fix: event speaker status and speaker title (#8006) * added userStatus and speakingTopic fields * required input fields added on events form * included userStatus and speakingTopic in putEvent object * DropDown comonent replaced with Select component * updated the reload script * chore: update config file * chore: updated the app.json * update: adds max field in speaking topic field in event.js file * update: adds max field in speaking topic field in event.js file * chore: displays speaking topic in event card * chore: changed select with toggle for speaking status * chore: remove changes * chore: fixes indentation * fixes indentation * fixes indentation * fixes layouts indentation * fixes layouts indentation * chore: removes redundant code in EventCard --- components/event/EventCard.js | 7 ++--- models/Profile/Event.js | 5 +++ pages/account/manage/event/[[...data]].js | 38 +++++++++++++++++++++++ pages/api/system/reload.js | 2 ++ 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/components/event/EventCard.js b/components/event/EventCard.js index ecf16793fb5..802042c98af 100644 --- a/components/event/EventCard.js +++ b/components/event/EventCard.js @@ -66,11 +66,10 @@ export default function EventCard({ manage, event, usernames }) { )} - {event.userStatus && ( + {event.isSpeaking && (
- {event.userStatus} - {event.userStatus == "speaking" && " at "} this event - {event.userStatus == "speaking" && event?.speakingTopic && ( + {"Speaking at "} this event + {event?.speakingTopic && ( <> {" "} on {event.speakingTopic} diff --git a/models/Profile/Event.js b/models/Profile/Event.js index c795b80fdf3..4a55daf57c2 100644 --- a/models/Profile/Event.js +++ b/models/Profile/Event.js @@ -34,6 +34,11 @@ const EventSchema = new Schema({ price: { startingFrom: Number, }, + isSpeaking: Boolean, + speakingTopic: { + type: String, + max: 256, + }, color: { type: String, min: 2, diff --git a/pages/account/manage/event/[[...data]].js b/pages/account/manage/event/[[...data]].js index ed7c499702e..3225b4c9985 100644 --- a/pages/account/manage/event/[[...data]].js +++ b/pages/account/manage/event/[[...data]].js @@ -56,11 +56,20 @@ export default function ManageEvent({ BASE_URL, event }) { additionalMessage: "", }); const [isVirtual, setIsVirtual] = useState(event.isVirtual ? true : false); + const [isSpeaking, setIsSpeaking] = useState(event.isSpeaking ? true : false); const [name, setName] = useState(event.name || ""); const [description, setDescription] = useState(event.description || ""); const [url, setUrl] = useState(event.url || ""); const [startDate, setStartDate] = useState(""); const [endDate, setEndDate] = useState(""); + const [speakingTopic, setspeakingTopic] = useState(event.speakingTopic || ""); + + useEffect(() => { + if (!isSpeaking) { + setspeakingTopic(""); + } + }, [isSpeaking]); + const [price, setPrice] = useState(event.price?.startingFrom || 0); const [color, setColor] = useState(event.color || ""); @@ -110,6 +119,8 @@ export default function ManageEvent({ BASE_URL, event }) { date: { start: submitDate(startDate), end: submitDate(endDate) }, isVirtual, price: { startingFrom: price }, + isSpeaking, + speakingTopic, color, }; let apiUrl = `${BASE_URL}/api/account/manage/event/`; @@ -217,6 +228,7 @@ export default function ManageEvent({ BASE_URL, event }) {