From 978bc1a29ad46862066141971615f246d59b06a1 Mon Sep 17 00:00:00 2001 From: Mauryan Kansara <86093112+MauryanKansara@users.noreply.github.com> Date: Sat, 18 Nov 2023 00:07:49 +0530 Subject: [PATCH 01/11] fix: tags with enter #9103 (#9508) * Revert "data: alevel7 (#9459)" This reverts commit 553bed87c1023c8be8f76b8e11de7d934bc96854. * Fixes #9103 Using Chips in the 'add Tags' * Revert "Revert "data: alevel7 (#9459)"" This reverts commit 8ba32c04fc0917326f1dc758708b8a1044c90a15. * Renamed inputRef to tagInputRef * renamed tagInputRef to inputRef * solved 'inputRef.current is undefined' error on manage events page * renamed inputRef to tagInputRef in profile.js and [[...data]].js files * removed debug code --------- Co-authored-by: Eddie Jaoude --- components/tag/TagsInput.js | 10 +++++----- pages/account/manage/event/[[...data]].js | 7 ++++++- pages/account/manage/profile.js | 10 +++++++++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/components/tag/TagsInput.js b/components/tag/TagsInput.js index fc833d067f5..4271c17ba25 100644 --- a/components/tag/TagsInput.js +++ b/components/tag/TagsInput.js @@ -1,19 +1,19 @@ -import { useRef } from "react"; import XMarkIcon from "@heroicons/react/20/solid/XMarkIcon"; import Input from "../form/Input"; -export default function TagsInput({ tags, onTagAdd, onTagRemove }) { - const inputRef = useRef(null); +export default function TagsInput({ tags, onTagAdd, onTagRemove, inputRef }) { + //key code - const { comma, backspace } = { + const { comma, backspace, enter } = { comma: 188, backspace: 8, + enter: 13, }; const handleKeyUp = (e) => { const inputValue = inputRef.current.value; - if (e.keyCode === comma || inputValue.endsWith(",")) { + if (e.keyCode === comma || inputValue.endsWith(",") || e.keyCode === enter) { const newTag = inputValue.trim().replace(/,/g, ""); if (!newTag) { return; diff --git a/pages/account/manage/event/[[...data]].js b/pages/account/manage/event/[[...data]].js index c9765c0b068..0c584a046cf 100644 --- a/pages/account/manage/event/[[...data]].js +++ b/pages/account/manage/event/[[...data]].js @@ -1,5 +1,5 @@ import Router from "next/router"; -import { useState, useEffect } from "react"; +import { useState, useEffect, useRef } from "react"; import { authOptions } from "../../../api/auth/[...nextauth]"; import { getServerSession } from "next-auth/next"; @@ -57,6 +57,7 @@ export default function ManageEvent({ BASE_URL, event }) { const [endDate, setEndDate] = useState(""); const [speakingTopic, setspeakingTopic] = useState(event.speakingTopic || ""); const [tags, setTags] = useState(event.tags || []); + const tagInputRef = useRef(null); useEffect(() => { if (!isSpeaking) { @@ -105,6 +106,9 @@ export default function ManageEvent({ BASE_URL, event }) { const handleSubmit = async (e) => { e.preventDefault(); + if (document.activeElement === tagInputRef.current) { + return; + } let alert = "created"; let putEvent = { name, @@ -336,6 +340,7 @@ export default function ManageEvent({ BASE_URL, event }) { onTagAdd={handleTagAdd} onTagRemove={handleTagRemove} tags={tags} + inputRef={tagInputRef} />

Separate tags with commas. diff --git a/pages/account/manage/profile.js b/pages/account/manage/profile.js index 616b04f8198..d727f2cd7fb 100644 --- a/pages/account/manage/profile.js +++ b/pages/account/manage/profile.js @@ -3,7 +3,7 @@ import path from "path"; import { authOptions } from "../../api/auth/[...nextauth]"; import { getServerSession } from "next-auth/next"; -import { useState } from "react"; +import { useRef, useState } from "react"; import { clientEnv } from "@config/schemas/clientSchema"; import config from "@config/app.json"; @@ -76,6 +76,8 @@ export default function Profile({ BASE_URL, profile, fileExists }) { }; }); + const tagInputRef = useRef(null); + const { pronouns } = config; const handleTagAdd = (newTag) => { @@ -89,6 +91,11 @@ export default function Profile({ BASE_URL, profile, fileExists }) { const handleSubmit = async (e) => { e.preventDefault(); + + if (document.activeElement === tagInputRef.current) { + return; + } + const res = await fetch(`${BASE_URL}/api/account/manage/profile`, { method: "PUT", headers: { @@ -243,6 +250,7 @@ export default function Profile({ BASE_URL, profile, fileExists }) { onTagAdd={handleTagAdd} onTagRemove={handleTagRemove} tags={tags} + inputRef={tagInputRef} />

Separate tags with commas. From a7a258af1524a646efc9d6ee16ba0cd12bb63151 Mon Sep 17 00:00:00 2001 From: Conventional Changelog Action Date: Fri, 17 Nov 2023 18:38:12 +0000 Subject: [PATCH 02/11] chore(release): v2.87.5 [skip ci] --- CHANGELOG.md | 18 +++++++++--------- config/app.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95e248614df..9ba55fc028c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [2.87.5](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.4...v2.87.5) (2023-11-17) + + +### Bug Fixes + +* tags with enter [#9103](https://github.com/EddieHubCommunity/BioDrop/issues/9103) ([#9508](https://github.com/EddieHubCommunity/BioDrop/issues/9508)) ([978bc1a](https://github.com/EddieHubCommunity/BioDrop/commit/978bc1a29ad46862066141971615f246d59b06a1)), closes [#9459](https://github.com/EddieHubCommunity/BioDrop/issues/9459) [#9459](https://github.com/EddieHubCommunity/BioDrop/issues/9459) + + + ## [2.87.4](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.3...v2.87.4) (2023-11-13) @@ -34,12 +43,3 @@ -# [2.87.0](https://github.com/EddieHubCommunity/BioDrop/compare/v2.86.1...v2.87.0) (2023-11-12) - - -### Features - -* reload pwa ([#9773](https://github.com/EddieHubCommunity/BioDrop/issues/9773)) ([a6c841b](https://github.com/EddieHubCommunity/BioDrop/commit/a6c841b7c47f64368a17987c0713b89f66184e10)) - - - diff --git a/config/app.json b/config/app.json index 1722a06cf72..fd205a70606 100644 --- a/config/app.json +++ b/config/app.json @@ -1,5 +1,5 @@ { - "version": "2.87.4", + "version": "2.87.5", "alerts": [], "layouts": [ "classic", diff --git a/package-lock.json b/package-lock.json index 3c7115f7221..aca29f0c5de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "biodrop", - "version": "2.87.4", + "version": "2.87.5", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index 600278a6820..fbf52af83af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "biodrop", - "version": "2.87.4", + "version": "2.87.5", "private": false, "homepage": "https://biodrop.io", "engines": { From 5ac57bad5a685a5e688d972c95caa8c9e1a173dd Mon Sep 17 00:00:00 2001 From: Muhammadh Kamaruddheen <57263951+Kamaruddheen@users.noreply.github.com> Date: Sat, 18 Nov 2023 00:11:35 +0530 Subject: [PATCH 03/11] feat: issue bug template steps to reproduce (#9789) * feat: Add required 'Steps to Reproduce' in bug template * Remove unnecessary comment and improve description Removed unnecessary code comments in the issue template per feedback. Also improved the description in the Steps to Reproduce section for more clarity. * Update .github/ISSUE_TEMPLATE/bug.yml --------- Co-authored-by: Eddie Jaoude --- .github/ISSUE_TEMPLATE/bug.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 56df5233a2f..0d9e415c268 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -30,6 +30,28 @@ body: description: A clear description of the bug you have found. Please include relevant information and resources (for example the steps to reproduce the bug) validations: required: true + - type: textarea + id: steps + attributes: + label: Steps to Reproduce + description: To help us recreate the bug, provide a numbered list of the exact steps taken to trigger the buggy behavior. + value: | + If you know the steps, follow the below format and provide steps to reproduce + + For example: + + 1. Go to page. + 1. On top right side, close to the menu + 1. Some menu are not working properly. + 1. Continue... + + If you don't know exact steps, include any relevant details like: + + - What page you were on... + - What you were trying to do... + - What went wrong... + validations: + required: true - type: textarea id: screenshots attributes: From 7a0312d8e0fd5ed3c352402d4d0928a2a41458b3 Mon Sep 17 00:00:00 2001 From: Conventional Changelog Action Date: Fri, 17 Nov 2023 18:41:56 +0000 Subject: [PATCH 04/11] chore(release): v2.88.0 [skip ci] --- CHANGELOG.md | 18 +++++++++--------- config/app.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ba55fc028c..9a7921bd272 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# [2.88.0](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.5...v2.88.0) (2023-11-17) + + +### Features + +* issue bug template steps to reproduce ([#9789](https://github.com/EddieHubCommunity/BioDrop/issues/9789)) ([5ac57ba](https://github.com/EddieHubCommunity/BioDrop/commit/5ac57bad5a685a5e688d972c95caa8c9e1a173dd)) + + + ## [2.87.5](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.4...v2.87.5) (2023-11-17) @@ -34,12 +43,3 @@ -## [2.87.1](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.0...v2.87.1) (2023-11-12) - - -### Bug Fixes - -* reduce bg-size on :after to fix safari bug ([#9770](https://github.com/EddieHubCommunity/BioDrop/issues/9770)) ([db657aa](https://github.com/EddieHubCommunity/BioDrop/commit/db657aa757b9ed99a8da82d371fc196d8f25557d)) - - - diff --git a/config/app.json b/config/app.json index fd205a70606..6f818cb9a3d 100644 --- a/config/app.json +++ b/config/app.json @@ -1,5 +1,5 @@ { - "version": "2.87.5", + "version": "2.88.0", "alerts": [], "layouts": [ "classic", diff --git a/package-lock.json b/package-lock.json index aca29f0c5de..4fab33a5333 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "biodrop", - "version": "2.87.5", + "version": "2.88.0", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index fbf52af83af..2af46e0c920 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "biodrop", - "version": "2.87.5", + "version": "2.88.0", "private": false, "homepage": "https://biodrop.io", "engines": { From 2d15ac38b42660e4a28e5421592b2b6f290f4058 Mon Sep 17 00:00:00 2001 From: Anirudh Patel <107875381+anirudhp26@users.noreply.github.com> Date: Sat, 18 Nov 2023 00:17:56 +0530 Subject: [PATCH 05/11] feat: account nav button use profile picture (#9703) * Account Button replaced with User's GitHub Profile Picture * design changes to the profile button * additional div fixed * navbar closing issue solved --- components/navbar/Navbar.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/components/navbar/Navbar.js b/components/navbar/Navbar.js index 49fc15a1fa3..5c4507ec210 100644 --- a/components/navbar/Navbar.js +++ b/components/navbar/Navbar.js @@ -7,6 +7,7 @@ import NavLink from "@components/navbar/NavLink"; import Link from "@components/Link"; import { useTheme } from "next-themes"; import { classNames } from "@services/utils/classNames"; +import Image from "next/image"; import { FaGithub } from "react-icons/fa6"; import SunIcon from "@heroicons/react/20/solid/SunIcon"; @@ -115,10 +116,16 @@ export default function Navbar() { {session && ( <> - + + setIsOpen(false)} + src={`https://github.com/${session.username}.png`} + alt="Account" + /> + Date: Fri, 17 Nov 2023 18:48:21 +0000 Subject: [PATCH 06/11] chore(release): v2.89.0 [skip ci] --- CHANGELOG.md | 18 +++++++++--------- config/app.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a7921bd272..de66fcb02f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# [2.89.0](https://github.com/EddieHubCommunity/BioDrop/compare/v2.88.0...v2.89.0) (2023-11-17) + + +### Features + +* account nav button use profile picture ([#9703](https://github.com/EddieHubCommunity/BioDrop/issues/9703)) ([2d15ac3](https://github.com/EddieHubCommunity/BioDrop/commit/2d15ac38b42660e4a28e5421592b2b6f290f4058)) + + + # [2.88.0](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.5...v2.88.0) (2023-11-17) @@ -34,12 +43,3 @@ -## [2.87.2](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.1...v2.87.2) (2023-11-12) - - -### Bug Fixes - -* login page logo ([#9777](https://github.com/EddieHubCommunity/BioDrop/issues/9777)) ([f3b4cc1](https://github.com/EddieHubCommunity/BioDrop/commit/f3b4cc17739dcefb5c82a2bf7025edf846fe54fc)) - - - diff --git a/config/app.json b/config/app.json index 6f818cb9a3d..d08d3a6a846 100644 --- a/config/app.json +++ b/config/app.json @@ -1,5 +1,5 @@ { - "version": "2.88.0", + "version": "2.89.0", "alerts": [], "layouts": [ "classic", diff --git a/package-lock.json b/package-lock.json index 4fab33a5333..9edd18bb507 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "biodrop", - "version": "2.88.0", + "version": "2.89.0", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index 2af46e0c920..2d84113dfb9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "biodrop", - "version": "2.88.0", + "version": "2.89.0", "private": false, "homepage": "https://biodrop.io", "engines": { From 97e198ee21ad3e3511c9b12dc7c6072bb6826028 Mon Sep 17 00:00:00 2001 From: Eddie Jaoude Date: Fri, 17 Nov 2023 19:36:39 +0000 Subject: [PATCH 07/11] docs: do not force push (#9796) --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff3eeb53733..1154a511f66 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,6 +28,7 @@ Before working on an existing Issue please follow these steps: 1. **only** start working on this Issue (and open a Pull Request) when it has been assigned to you - this will prevent confusion, multiple people working on the same issue and work not being used 1. do **not** enable GitHub Actions on your fork 1. reference the Issue in your Pull Request (for example `closes #123`) +1. please do **not** force push to your PR branch, this makes it very difficult to re-review - commits will be squashed when merged > Notes: > From 81dde4e27d4d5bbd06e07c5a69f35dc164f2c7be Mon Sep 17 00:00:00 2001 From: Mamunur Rashid Date: Sat, 18 Nov 2023 02:45:29 +0600 Subject: [PATCH 08/11] fix: docs nav refresh when using side nav #9486 (#9513) --- components/navbar/SideNav.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/navbar/SideNav.js b/components/navbar/SideNav.js index 58043171a98..1a76dfc819f 100644 --- a/components/navbar/SideNav.js +++ b/components/navbar/SideNav.js @@ -62,8 +62,7 @@ export default function SideNav({ navigation }) { {item.children.map((subItem) => (

  • {/* 44px */} - {subItem.name} - +
    • ))} From 9b5ec46a3ffda5c7352f03e4e6158de5f3e80d25 Mon Sep 17 00:00:00 2001 From: Conventional Changelog Action Date: Fri, 17 Nov 2023 20:45:50 +0000 Subject: [PATCH 09/11] chore(release): v2.89.1 [skip ci] --- CHANGELOG.md | 18 +++++++++--------- config/app.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de66fcb02f6..93cbfb337fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [2.89.1](https://github.com/EddieHubCommunity/BioDrop/compare/v2.89.0...v2.89.1) (2023-11-17) + + +### Bug Fixes + +* docs nav refresh when using side nav [#9486](https://github.com/EddieHubCommunity/BioDrop/issues/9486) ([#9513](https://github.com/EddieHubCommunity/BioDrop/issues/9513)) ([81dde4e](https://github.com/EddieHubCommunity/BioDrop/commit/81dde4e27d4d5bbd06e07c5a69f35dc164f2c7be)) + + + # [2.89.0](https://github.com/EddieHubCommunity/BioDrop/compare/v2.88.0...v2.89.0) (2023-11-17) @@ -34,12 +43,3 @@ -## [2.87.3](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.2...v2.87.3) (2023-11-12) - - -### Bug Fixes - -* disable pwa due to caching errors ([#9781](https://github.com/EddieHubCommunity/BioDrop/issues/9781)) ([f23dc7c](https://github.com/EddieHubCommunity/BioDrop/commit/f23dc7cd68a6c2b93282980edbf5da5970654860)) - - - diff --git a/config/app.json b/config/app.json index d08d3a6a846..ecf070a0b8d 100644 --- a/config/app.json +++ b/config/app.json @@ -1,5 +1,5 @@ { - "version": "2.89.0", + "version": "2.89.1", "alerts": [], "layouts": [ "classic", diff --git a/package-lock.json b/package-lock.json index 9edd18bb507..2a5a0c709b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "biodrop", - "version": "2.89.0", + "version": "2.89.1", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index 2d84113dfb9..bec59138f10 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "biodrop", - "version": "2.89.0", + "version": "2.89.1", "private": false, "homepage": "https://biodrop.io", "engines": { From c02950376893a8c370be914fb40390b38634416f Mon Sep 17 00:00:00 2001 From: Eddie Jaoude Date: Sat, 18 Nov 2023 07:31:04 +0000 Subject: [PATCH 10/11] fix: homepage video (#9799) --- pages/index.js | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pages/index.js b/pages/index.js index 4f198075e36..c029e10c7bd 100644 --- a/pages/index.js +++ b/pages/index.js @@ -1,7 +1,9 @@ +import Image from "next/image"; import { IconContext } from "react-icons"; -import Script from "next/script"; import { MdHelpOutline } from "react-icons/md"; import va from "@vercel/analytics"; +import { FaDollarSign, FaGithub, FaLock } from "react-icons/fa6"; + import config from "@config/app.json"; import { clientEnv } from "@config/schemas/clientSchema"; import { getTodayStats } from "./api/statistics/today"; @@ -19,7 +21,6 @@ import ThemedImage from "@components/ThemedImage"; import { serverEnv } from "@config/schemas/serverSchema"; import { PROJECT_NAME } from "@constants/index"; import Button from "@components/Button"; -import { FaDollarSign, FaGithub, FaLock } from "react-icons/fa6"; export async function getStaticProps() { const pageConfig = config.isr.homepage; @@ -233,7 +234,7 @@ export default function Home({
    - @@ -286,18 +287,12 @@ export default function Home({
    -
    -
    -