Merge pull request #27 from hive-one/basecamp-fixes

more profile page and editing fixes
hive-one · Nov 1, 2023 · 4e0bd77 · 4e0bd77
2 parents d231883 + 30f6dbc
commit 4e0bd77
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 35 deletions.
diff --git a/apps/web/components/edit-profile/Account/BooksSection.js b/apps/web/components/edit-profile/Account/BooksSection.js
@@ -16,6 +16,7 @@ const BooksSection = ({ profile, setProfile, addBook, removeBook }) => {
               <div className="col-span-2">
                 <Label>ISBN</Label>
                 <Input
+                  required
                   label="ISBN"
                   placeholder="Enter book's ISBN e.g 9780471696483"
                   value={book.isbn}

diff --git a/apps/web/components/edit-profile/Account/Experience.js b/apps/web/components/edit-profile/Account/Experience.js
@@ -30,6 +30,7 @@ const Experience = ({ profile, setProfile, addExperience, removeExperience, remo
               <div className="sm:col-span-3">
                 <Label>Company/Institution</Label>
                 <Input
+                  required
                   value={company.name}
                   onChange={(e) => {
                     const newExperience = profile.experience;
@@ -71,6 +72,7 @@ const Experience = ({ profile, setProfile, addExperience, removeExperience, remo
                     <div className="sm:col-span-3">
                       <Label>Role/Title</Label>
                       <Input
+                        required
                         label="Role/Title"
                         value={role.title}
                         onChange={(e) => {

diff --git a/apps/web/components/edit-profile/Account/LinkedinImporter.js b/apps/web/components/edit-profile/Account/LinkedinImporter.js
@@ -68,18 +68,18 @@ const LinkedinImporter = ({ setProfile }) => {
             className={!isValidLinkedInUrl(linkedinUrl) && "cursor-not-allowed opacity-50"}
             loading={loading}
             onClick={() => handleSubmit(linkedinUrl, setLoading, setLinkedinData)}>
-            Start Importing
+            Fetch profile
           </Button>
         </div>
         <br />
         <hr />
         {linkedinData && linkedinData?.name && (
           <div className="mt-4">
             <p className="mb-4 font-mono text-sm">
-              ✅ Linkeding profile data available, click the button below to prefill the form.
+              ✅ LinkedIn profile data available, click the button below to prefill the form.
             </p>
             <Button type="button" variant="primary" onClick={startAutoFill}>
-              Confirm and Save
+              Add LinkedIn Data to Profile
             </Button>
           </div>
         )}

diff --git a/apps/web/components/edit-profile/Account/PodcastAppearancesSection.js b/apps/web/components/edit-profile/Account/PodcastAppearancesSection.js
@@ -21,6 +21,7 @@ const PodcastAppearancesSection = ({
               <div className="col-span-full">
                 <Label>Title</Label>
                 <Input
+                  required
                   placeholder="e.g State of the web 2021"
                   value={appearance.title}
                   onChange={(e) => {

diff --git a/apps/web/components/edit-profile/Account/ProjectsSection.js b/apps/web/components/edit-profile/Account/ProjectsSection.js
@@ -16,6 +16,7 @@ const ProjectsSection = ({ profile, setProfile, addProject, removeProject }) =>
               <div className="sm:col-span-3">
                 <Label>Title</Label>
                 <Input
+                  required
                   placeholder="e.g Social media app for private circles"
                   value={project.title}
                   onChange={(e) => {

diff --git a/apps/web/components/edit-profile/Account/VideosSection.js b/apps/web/components/edit-profile/Account/VideosSection.js
@@ -16,6 +16,7 @@ const VideosSection = ({ profile, setProfile, addVideo, removeVideo }) => {
               <div className="col-span-full">
                 <Label>Title</Label>
                 <Input
+                  required
                   value={video.title}
                   placeholder="Enter video title"
                   onChange={(e) => {
@@ -31,6 +32,7 @@ const VideosSection = ({ profile, setProfile, addVideo, removeVideo }) => {
               <div className="col-span-2">
                 <Label>URL</Label>
                 <Input
+                  required
                   value={video.url}
                   placeholder="e.g https://youtube.com/watch?v=1234"
                   onChange={(e) => {

diff --git a/apps/web/components/getting-started/steps-views/UserProfile.js b/apps/web/components/getting-started/steps-views/UserProfile.js
@@ -49,8 +49,6 @@ const UserProfile = () => {
   const telemetry = useTelemetry();
   const [firstRender, setFirstRender] = useState(true);
 
-  const linksMutation = trpc.viewer.updateLinks.useMutation({});
-
   const mutation = trpc.viewer.updateProfile.useMutation({
     onSuccess: async (_data, context) => {
       if (context.avatar) {
@@ -86,7 +84,7 @@ const UserProfile = () => {
     const payload = {
       bio: data?.bio,
       adviceOn: data?.advises,
-      pricePerHour: data?.pricePerHour,
+      pricePerHour: data?.pricePerHour?.value,
       completedOnboarding: true,
     };
 
@@ -95,7 +93,6 @@ const UserProfile = () => {
     telemetry.event(telemetryEventTypes.onboardingFinished);
 
     mutation.mutate(payload);
-    linksMutation.mutate(data?.socialLinks);
   });
 
   async function updateProfileHandler(event) {

diff --git a/apps/web/pages/_document.tsx b/apps/web/pages/_document.tsx
@@ -61,7 +61,7 @@ class MyDocument extends Document<Props> {
         </Head>
 
         <body
-          className="dark:bg-darkgray-50 desktop-transparent bg-subtle antialiased"
+          className="dark:bg-darkgray-50 desktop-transparent bg-white antialiased"
           style={
             isEmbed
               ? {

diff --git a/apps/web/pages/edit-profile.js b/apps/web/pages/edit-profile.js
@@ -102,7 +102,7 @@ const EditProfile = () => {
   };
 
   useEffect(() => {
-    setProfile((prev) => ({ ...prev, experience: transformExpForUI(profile) }));
+    setProfile((prev) => ({ ...prev, experience: transformExpForUI(user) }));
   }, [user]);
 
   const mutation = trpc.viewer.updateProfile.useMutation({
@@ -722,7 +722,7 @@ const EditProfile = () => {
         <div className="my-5 md:my-20">
           <Container width="960px" className="">
             <div className="grid items-start md:grid-cols-[200px_1fr] md:gap-12">
-              <div className="flex h-[calc(100vh-200px)] max-w-full flex-row flex-nowrap gap-2 overflow-scroll whitespace-nowrap md:sticky md:top-[100px] md:flex-col md:gap-1 md:whitespace-normal">
+              <div className="flex h-[calc(100vh-100px)] max-w-full flex-row flex-nowrap gap-2 overflow-scroll whitespace-nowrap md:sticky md:top-[100px] md:flex-col md:gap-1 md:whitespace-normal">
                 {SETTINGS?.map((item) => (
                   <div key={item?.value} className="pb-3 md:w-full md:pb-0">
                     <Button
@@ -811,7 +811,6 @@ export const getServerSideProps = async (context) => {
   return {
     props: {
       trpcState: ssr.dehydrate(),
-      user: JSON.stringify(user),
     },
   };
 };

diff --git a/apps/web/ui/valery/podcast-item.js b/apps/web/ui/valery/podcast-item.js
@@ -1,4 +1,7 @@
 import { Microphone } from "@phosphor-icons/react";
+import Link from "next/link";
+
+import ExternalLinkIcon from "../../ui/icons/external-link-icon";
 
 const PodcastItem = ({ podcast }) => {
   return (
@@ -18,8 +21,12 @@ const PodcastItem = ({ podcast }) => {
             </div>
           )}
         </div>
-        <div className="flex-col justify-between space-y-3 sm:flex sm:space-y-0">
+        <div className="flex-col space-y-3 sm:flex sm:space-y-0">
           <p className="font-semibold">{podcast?.title}</p>
+          <Link href={podcast?.url || "/"} className="mt-2 text-sm text-gray-400 hover:underline">
+            link
+            <ExternalLinkIcon className="mt-0.5 inline-block align-top text-gray-300" />
+          </Link>
           {/* <p className="text-gray-500">Recent episodes:</p>
           {podcast?.episodes?.length > 0 &&
             podcast?.episodes.map((episode, i) => (

diff --git a/apps/web/ui/valery/project-item.js b/apps/web/ui/valery/project-item.js
@@ -2,27 +2,30 @@ import Link from "next/link";
 
 import ExternalLinkIcon from "../../ui/icons/external-link-icon";
 
-const Project = ({ title, description, url }) => (
-  <div className="inline-block w-full">
-    <div className="mb-7 flex w-full flex-col">
-      <div className="flex">
-        <Link
-          href={url || "/"}
-          target="_blank"
-          className="font-semibold decoration-gray-400 underline-offset-4 hover:underline">
-          {title}
-          <span className="whitespace-nowrap">
-            {"\u2009"}
-            <ExternalLinkIcon className="mt-0.5 inline-block align-top text-gray-300" />
-          </span>
-        </Link>
+const Project = ({ title, description, url }) => {
+  if (!title) return "";
+  return (
+    <div className="inline-block w-full">
+      <div className="mb-7 flex w-full flex-col">
+        <div className="flex">
+          <Link
+            href={url || "/"}
+            target="_blank"
+            className="font-semibold decoration-gray-400 underline-offset-4 hover:underline">
+            {title}
+            <span className="whitespace-nowrap">
+              {"\u2009"}
+              <ExternalLinkIcon className="mt-0.5 inline-block align-top text-gray-300" />
+            </span>
+          </Link>
+        </div>
+        {description && (
+          <div className="prose max-w-none break-words" dangerouslySetInnerHTML={{ __html: description }} />
+        )}
+        <div className="flex flex-row items-center justify-between gap-4 self-start text-gray-400" />
       </div>
-      {description && (
-        <div className="prose max-w-none break-words" dangerouslySetInnerHTML={{ __html: description }} />
-      )}
-      <div className="flex flex-row items-center justify-between gap-4 self-start text-gray-400" />
     </div>
-  </div>
-);
+  );
+};
 
 export default Project;
diff --git a/package.json b/package.json
@@ -94,6 +94,7 @@
     "vitest-mock-extended": "^1.1.3"
   },
   "dependencies": {
+    "@prisma/client": "latest",
     "@tiptap/extension-link": "^2.1.11",
     "@tiptap/pm": "^2.1.11",
     "@tiptap/react": "^2.1.11",

diff --git a/packages/prisma/package.json b/packages/prisma/package.json
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@calcom/lib": "*",
-    "@prisma/client": "^5.2.0",
+    "@prisma/client": "5.2.0",
     "@prisma/extension-accelerate": "^0.6.2",
     "@prisma/generator-helper": "^5.2.0",
     "prisma": "^5.2.0",

diff --git a/yarn.lock b/yarn.lock
@@ -3673,7 +3673,7 @@ __metadata:
   resolution: "@calcom/prisma@workspace:packages/prisma"
   dependencies:
     "@calcom/lib": "*"
-    "@prisma/client": ^5.2.0
+    "@prisma/client": 5.2.0
     "@prisma/extension-accelerate": ^0.6.2
     "@prisma/generator-helper": ^5.2.0
     npm-run-all: ^4.1.5
@@ -7428,7 +7428,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@prisma/client@npm:^5.2.0":
+"@prisma/client@npm:5.2.0":
   version: 5.2.0
   resolution: "@prisma/client@npm:5.2.0"
   dependencies:
@@ -7442,6 +7442,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@prisma/client@npm:latest":
+  version: 5.5.2
+  resolution: "@prisma/client@npm:5.5.2"
+  dependencies:
+    "@prisma/engines-version": 5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a
+  peerDependencies:
+    prisma: "*"
+  peerDependenciesMeta:
+    prisma:
+      optional: true
+  checksum: 71ac5830041106070744645b882aa3270b8fb2d4a6bdf844c5e936543b2fccc3a6939e2ce47a5aad07f5c958e97ade06b7843a6664d8c9038403a357d04c5f88
+  languageName: node
+  linkType: hard
+
 "@prisma/debug@npm:3.8.1":
   version: 3.8.1
   resolution: "@prisma/debug@npm:3.8.1"
@@ -7471,6 +7485,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@prisma/engines-version@npm:5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a":
+  version: 5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a
+  resolution: "@prisma/engines-version@npm:5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a"
+  checksum: bd0a1dd20f9c69526099800a9b1870ab5969ad8da728e3cec676b826f5d7e8751e118486901bde2f14f4edce02e98a26da1ad93560c4b51ec38be3356b1b6913
+  languageName: node
+  linkType: hard
+
 "@prisma/engines@npm:5.2.0":
   version: 5.2.0
   resolution: "@prisma/engines@npm:5.2.0"
@@ -15590,6 +15611,7 @@ __metadata:
     "@changesets/cli": ^2.26.1
     "@deploysentinel/playwright": ^0.3.3
     "@playwright/test": ^1.31.2
+    "@prisma/client": latest
     "@snaplet/copycat": ^0.3.0
     "@testing-library/jest-dom": ^5.16.5
     "@tiptap/extension-link": ^2.1.11