From 28a53a4f1bb2075b1bdbf5749ef0446f0e9d6bfa Mon Sep 17 00:00:00 2001 From: baristaGeek Date: Wed, 25 Oct 2023 11:55:42 -0500 Subject: [PATCH 1/9] Add consistent CSS for boxes regardless of login state + prettify design --- components/AsanaLoginLink.tsx | 38 ++++++++++++++++++++---------- components/GitLabLoginLink.tsx | 38 ++++++++++++++++++++---------- components/dashboard/InfoPanel.tsx | 20 +++++++++------- 3 files changed, 64 insertions(+), 32 deletions(-) diff --git a/components/AsanaLoginLink.tsx b/components/AsanaLoginLink.tsx index 89df59ad0..a507d0466 100644 --- a/components/AsanaLoginLink.tsx +++ b/components/AsanaLoginLink.tsx @@ -1,19 +1,33 @@ import Link from "next/link"; const AsanaLoginLink = ({ userEmail }) => ( -
- -
- -
-

Login to Asana

-

View your Tasks and Stories

+
+
+

+ + Asana +

+
+ +
+ +
+ +
+

Login to Asana

+

View your Tasks and Stories

+
-
- + +
); + + export default AsanaLoginLink; diff --git a/components/GitLabLoginLink.tsx b/components/GitLabLoginLink.tsx index 59298d522..8ecac7f7a 100644 --- a/components/GitLabLoginLink.tsx +++ b/components/GitLabLoginLink.tsx @@ -1,19 +1,33 @@ import Link from "next/link"; const GitLabLoginLink = ({ userEmail }) => ( -
- -
- -
-

Login to GitLab

-

View your Assigned Issues and Relevant Pull Requests

+
+
+

+ + GitLab +

+
+ +
+ +
+ +
+

Login to GitLab

+

View your Assigned Issues and Relevant Pull Requests

+
-
- + +
); + + export default GitLabLoginLink; diff --git a/components/dashboard/InfoPanel.tsx b/components/dashboard/InfoPanel.tsx index e8069b90e..d802ef73e 100644 --- a/components/dashboard/InfoPanel.tsx +++ b/components/dashboard/InfoPanel.tsx @@ -21,8 +21,8 @@ const InfoPanel = ({ info }) => { } }; return ( -
-
+
+

{ {service_name}

-
- -
-

{user_displayname}

- {user_email || "Unknown email"} -

{trimmedOrg(organization)}

+ +
+
+ + +
+

{user_displayname}

+ {user_email || "Unknown email"} +

{trimmedOrg(organization)}

+
From b361795b71fbf79c06ca0475a0fe592cb8d430c4 Mon Sep 17 00:00:00 2001 From: baristaGeek Date: Wed, 25 Oct 2023 12:22:04 -0500 Subject: [PATCH 2/9] Style the boxes for all integrations --- components/BitbucketLoginLink.tsx | 37 +++++++++++++++++++---------- components/ConfluenceLoginLink.tsx | 38 +++++++++++++++++++----------- components/GitHubLoginLink.tsx | 36 ++++++++++++++++++---------- components/JiraLoginLink.tsx | 38 +++++++++++++++++++----------- components/LinearLoginLink.tsx | 34 ++++++++++++++++---------- components/NotionLoginLink.tsx | 34 ++++++++++++++++---------- components/SlackLoginLink.tsx | 34 ++++++++++++++++---------- 7 files changed, 163 insertions(+), 88 deletions(-) diff --git a/components/BitbucketLoginLink.tsx b/components/BitbucketLoginLink.tsx index 639b38ffe..f84007512 100644 --- a/components/BitbucketLoginLink.tsx +++ b/components/BitbucketLoginLink.tsx @@ -1,19 +1,32 @@ import Link from "next/link"; const BitbucketLoginLink = ({ userEmail }) => ( -
- -
- -
-

Login to Bitbucket

-

View your Assigned Issues and Relevant Pull Requests

+
+
+

+ + Bitbucket +

+
+ +
+ +
+ +
+

Login to Bitbucket

+

View your Assigned Issues and Relevant Pull Requests

+
-
- + +
); + export default BitbucketLoginLink; diff --git a/components/ConfluenceLoginLink.tsx b/components/ConfluenceLoginLink.tsx index 38f8b66a3..bebb96603 100644 --- a/components/ConfluenceLoginLink.tsx +++ b/components/ConfluenceLoginLink.tsx @@ -1,21 +1,31 @@ import Link from "next/link"; const ConfluenceLoginLink = ({ userEmail }) => ( -
- -
- -
-

Login to Confluence

-

View your Most Relevant Docs

+
+
+

+ + Confluence +

+
+ +
+ +
+ +
+

Login to Confluence

+

Index Relevant Docs

+
-
- + +
); + export default ConfluenceLoginLink; diff --git a/components/GitHubLoginLink.tsx b/components/GitHubLoginLink.tsx index 80dcced32..7ff6c1ced 100644 --- a/components/GitHubLoginLink.tsx +++ b/components/GitHubLoginLink.tsx @@ -1,20 +1,32 @@ import Link from "next/link"; const GitHubLoginLink = ({ userEmail }) => ( -
- +
+
+

+ + GitHub +

+
-
- -
-

Login to GitHub

-

View your Assigned Issues and Relevant Pull Requests

+
+ +
+ +
+

Login to GitHub

+

Index Relevant Pull Requests

+
-
- - + +
); + export default GitHubLoginLink; diff --git a/components/JiraLoginLink.tsx b/components/JiraLoginLink.tsx index 9986c1765..0c834f9b1 100644 --- a/components/JiraLoginLink.tsx +++ b/components/JiraLoginLink.tsx @@ -1,21 +1,31 @@ import Link from "next/link"; const JiraLoginLink = ({ userEmail }) => ( -
- -
- -
-

Login to Jira

-

View your Most Relevant Ticket and Active Tickets

+
+
+

+ + Jira +

+
+ +
+ +
+ +
+

Login to Jira

+

Index Relevant Tickets

+
-
- + +
); + export default JiraLoginLink; diff --git a/components/LinearLoginLink.tsx b/components/LinearLoginLink.tsx index dc8f9df4f..426e3b6f9 100644 --- a/components/LinearLoginLink.tsx +++ b/components/LinearLoginLink.tsx @@ -1,19 +1,29 @@ import Link from "next/link"; const LinearLoginLink = ({ userEmail }) => ( -
- -
- -
-

Login to Linear

-

View your Most Relevant Tickets

+
+
+

+ + Linear +

+
+ +
+ +
+ +
+

Login to Linear

+

Index Relevant Tickets

+
-
- + +
); + export default LinearLoginLink; diff --git a/components/NotionLoginLink.tsx b/components/NotionLoginLink.tsx index f235c53b8..a0765222f 100644 --- a/components/NotionLoginLink.tsx +++ b/components/NotionLoginLink.tsx @@ -1,19 +1,29 @@ import Link from "next/link"; const NotionLoginLink = ({ userEmail }) => ( -
- -
- -
-

Login to Notion

-

View your Most Relevant Pages and Blocks

+
+
+

+ + Notion +

+
+ +
+ +
+ +
+

Login to Notion

+

Index Relevant Blocks

+
-
- + +
); + export default NotionLoginLink; diff --git a/components/SlackLoginLink.tsx b/components/SlackLoginLink.tsx index b16526561..df8feedf9 100644 --- a/components/SlackLoginLink.tsx +++ b/components/SlackLoginLink.tsx @@ -1,19 +1,29 @@ import Link from "next/link"; const SlackLoginLink = ({ userEmail }) => ( -
- -
- -
-

Login to Slack

-

View your Most Relevant Threads and Groups

+
+
+

+ + Slack +

+
+ +
+ +
+ +
+

Login to Slack

+

Index Relevant Messages

+
-
- + +
); + export default SlackLoginLink; From 2fd51f08800ba98c73f884001f3f4590cf8ac623 Mon Sep 17 00:00:00 2001 From: baristaGeek Date: Wed, 25 Oct 2023 13:08:27 -0500 Subject: [PATCH 3/9] Make IDE boxes consistenet with the integraitons boxes --- app/(loggedIn)/page.tsx | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/app/(loggedIn)/page.tsx b/app/(loggedIn)/page.tsx index 2f834e732..851c1d5a0 100644 --- a/app/(loggedIn)/page.tsx +++ b/app/(loggedIn)/page.tsx @@ -38,25 +38,21 @@ async function HomePage({}) {
{data && } {userEmail && ( -
-
-

IDEs

+
+
+

+ + IDEs +

+
-
+
-
+ +
-
+
Date: Wed, 25 Oct 2023 14:02:12 -0500 Subject: [PATCH 4/9] Rebuild sidebar --- components/Header.tsx | 4 ---- components/HeaderSignOut.tsx | 9 -------- components/Navbar.tsx | 40 ++++++++++++++++-------------------- 3 files changed, 18 insertions(+), 35 deletions(-) delete mode 100644 components/HeaderSignOut.tsx diff --git a/components/Header.tsx b/components/Header.tsx index b815731e6..b74bfadbc 100644 --- a/components/Header.tsx +++ b/components/Header.tsx @@ -1,6 +1,5 @@ "use client"; import Image from "next/image"; -import HeaderSignOut from "./HeaderSignOut"; export default function Header({ userEmail, userToken }) { return (
@@ -62,9 +61,6 @@ export default function Header({ userEmail, userToken }) { Settings -
  • - -
    • diff --git a/components/HeaderSignOut.tsx b/components/HeaderSignOut.tsx deleted file mode 100644 index 2ff554208..000000000 --- a/components/HeaderSignOut.tsx +++ /dev/null @@ -1,9 +0,0 @@ -"use client"; -import { signOut } from "next-auth/react"; -export default function HeaderSignOut() { - return ( - - ); -} diff --git a/components/Navbar.tsx b/components/Navbar.tsx index f8789766f..386d45634 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -1,42 +1,38 @@ import Link from "next/link"; -import HeaderSignOut from "./HeaderSignOut"; +import { signOut } from "next-auth/react"; export default function Navbar({ children }: { children: React.ReactNode }) { const links = [ { href: "/", label: "Home" }, { href: "/settings", label: "Settings" }, { href: "/team", label: "Team" }, - { href: "https://calendly.com/evargas-14/watermelon-business", label: "Billing" }, + { + href: "https://calendly.com/evargas-14/watermelon-business", + label: "Billing", + }, + { href: "/api/auth/signout", label: "Logout", onClick: signOut }, ]; return ( -
    -