Merge branch 'main' into main

jatingodnani · Nov 18, 2023 · 7e01432 · 7e01432
2 parents 5bef203 + 70a070e
commit 7e01432
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 46 deletions.
diff --git 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 <replace your> page.
+        1. On top right side, close to the <Account> 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:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,45 +1,45 @@
-## [2.87.4](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.3...v2.87.4) (2023-11-13)
+## [2.89.2](https://github.com/EddieHubCommunity/BioDrop/compare/v2.89.1...v2.89.2) (2023-11-18)
 
 
 ### Bug Fixes
 
-* pwa fix cache ([#9784](https://github.com/EddieHubCommunity/BioDrop/issues/9784)) ([0ee0fad](https://github.com/EddieHubCommunity/BioDrop/commit/0ee0fad958d76a87a751fe3fc1e189ff01dca032))
+* homepage video ([#9799](https://github.com/EddieHubCommunity/BioDrop/issues/9799)) ([c029503](https://github.com/EddieHubCommunity/BioDrop/commit/c02950376893a8c370be914fb40390b38634416f))
 
 
 
-## [2.87.3](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.2...v2.87.3) (2023-11-12)
+## [2.89.1](https://github.com/EddieHubCommunity/BioDrop/compare/v2.89.0...v2.89.1) (2023-11-17)
 
 
 ### Bug Fixes
 
-* disable pwa due to caching errors ([#9781](https://github.com/EddieHubCommunity/BioDrop/issues/9781)) ([f23dc7c](https://github.com/EddieHubCommunity/BioDrop/commit/f23dc7cd68a6c2b93282980edbf5da5970654860))
+* 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.87.2](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.1...v2.87.2) (2023-11-12)
+# [2.89.0](https://github.com/EddieHubCommunity/BioDrop/compare/v2.88.0...v2.89.0) (2023-11-17)
 
 
-### Bug Fixes
+### Features
 
-* login page logo ([#9777](https://github.com/EddieHubCommunity/BioDrop/issues/9777)) ([f3b4cc1](https://github.com/EddieHubCommunity/BioDrop/commit/f3b4cc17739dcefb5c82a2bf7025edf846fe54fc))
+* account nav button use profile picture ([#9703](https://github.com/EddieHubCommunity/BioDrop/issues/9703)) ([2d15ac3](https://github.com/EddieHubCommunity/BioDrop/commit/2d15ac38b42660e4a28e5421592b2b6f290f4058))
 
 
 
-## [2.87.1](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.0...v2.87.1) (2023-11-12)
+# [2.88.0](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.5...v2.88.0) (2023-11-17)
 
 
-### Bug Fixes
+### Features
 
-* 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))
+* issue bug template steps to reproduce ([#9789](https://github.com/EddieHubCommunity/BioDrop/issues/9789)) ([5ac57ba](https://github.com/EddieHubCommunity/BioDrop/commit/5ac57bad5a685a5e688d972c95caa8c9e1a173dd))
 
 
 
-# [2.87.0](https://github.com/EddieHubCommunity/BioDrop/compare/v2.86.1...v2.87.0) (2023-11-12)
+## [2.87.5](https://github.com/EddieHubCommunity/BioDrop/compare/v2.87.4...v2.87.5) (2023-11-17)
 
 
-### Features
+### Bug Fixes
 
-* reload pwa ([#9773](https://github.com/EddieHubCommunity/BioDrop/issues/9773)) ([a6c841b](https://github.com/EddieHubCommunity/BioDrop/commit/a6c841b7c47f64368a17987c0713b89f66184e10))
+* 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)
 
 
 
diff --git 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:
 >

diff --git 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 && (
         <>
-          <NavLink
-            item={{ name: "Account", url: "/account/onboarding" }}
-            setIsOpen={setIsOpen}
-          />
+          <Link href="/account/onboarding" aria-label="Account">
+            <Image
+              className="flex-none hover:ring-2 hover:ring-tertiary-medium rounded-full mx-2"
+              width={40}
+              height={40}
+              onClick={() => setIsOpen(false)}
+              src={`https://github.com/${session.username}.png`}
+              alt="Account"
+            />
+          </Link>
           <NavLink
             item={{ name: "Logout", url: "/" }}
             setIsOpen={setIsOpen}

diff --git a/components/navbar/SideNav.js b/components/navbar/SideNav.js
@@ -62,8 +62,7 @@ export default function SideNav({ navigation }) {
                         {item.children.map((subItem) => (
                           <li key={subItem.name}>
                             {/* 44px */}
-                            <Disclosure.Button
-                              as="a"
+                            <Link
                               href={subItem.href}
                               className={classNames(
                                 subItem.href.toLowerCase() == pathname &&
@@ -72,7 +71,7 @@ export default function SideNav({ navigation }) {
                               )}
                             >
                               {subItem.name}
-                            </Disclosure.Button>
+                            </Link>
                           </li>
                         ))}
                       </Disclosure.Panel>

diff --git 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/config/app.json b/config/app.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.87.4",
+  "version": "2.89.2",
   "alerts": [],
   "layouts": [
     "classic",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "biodrop",
-  "version": "2.87.4",
+  "version": "2.89.2",
   "private": false,
   "homepage": "https://biodrop.io",
   "engines": {

diff --git 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}
                     />
                     <p className="text-sm text-primary-medium-low dark:text-primary-low-high">
                       Separate tags with commas.

diff --git 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}
                       />
                       <p className="text-sm text-primary-medium-low dark:text-primary-low-high">
                         Separate tags with commas.

diff --git 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({
               </div>
             </div>
             <div className="mt-10 flex flex-col sm:flex-row items-center justify-center gap-6 sm:mx-24">
-              <Button href="/docs" primary={true}>
+              <Button href="/docs/quickstart-forms" primary={true}>
                 Get started
               </Button>
               <Button href="/#section-features">Explore features</Button>
@@ -286,26 +287,20 @@ export default function Home({
                 </h3>
               </div>
             </div>
-            <div className="aspect-w-16 aspect-h-9">
-              <div
-                className="kartra_video_containeroxibVr4Q0NlF js_kartra_trackable_object"
-                data-kt-type="video"
-                data-kt-value="oxibVr4Q0NlF"
-                data-kt-owner="nkmvj7Xr"
-              ></div>
-              <Script
-                src="https://app.kartra.com/video/oxibVr4Q0NlF"
-                strategy="lazyOnload"
-              />
-            </div>
+            <Image
+              src="https://user-images.githubusercontent.com/109926117/234534981-9db096eb-dc79-4310-a7a6-e7fd46799dff.png"
+              alt="BioDrop screenshot of statistics"
+              width="600"
+              height="300"
+            />
           </div>
         </div>
       </div>
 
       <CallToAction
         title="Ready to dive in?"
         description="Add your free Profile today!"
-        button1Link="/docs"
+        button1Link="/docs/quickstart-forms"
         button1Text="Get started"
         button2Link="/eddiejaoude"
         button2Text="Example"