fixes and improvements

2023-12-04 10:24:45 -05:00
parent ee05975e10
commit 1f20180a51
15 changed files with 75 additions and 35 deletions
@@ -218,7 +218,7 @@ export default function LinkCard({ link, count, className }: Props) {
            width={64}
            height={64}
            alt=""
-            className={`absolute w-12 duration-100 bg-white rounded-md p-1 bottom-5 right-5 select-none z-10`}
+            className={`absolute w-12 duration-100 bg-white shadow rounded-md p-1 bottom-5 right-5 select-none z-10`}
            draggable="false"
            onError={(e) => {
              const target = e.target as HTMLElement;
@@ -92,7 +92,7 @@ export default function PreservedFormats() {
      {link?.screenshotPath && link?.screenshotPath !== "pending" ? (
        <div className="flex justify-between items-center pr-1 border border-neutral-content rounded-md">
          <div className="flex gap-2 items-center">
-            <div className="text-white bg-primary p-2 rounded-l-md">
+            <div className="bg-primary text-primary-content p-2 rounded-l-md">
              <FontAwesomeIcon icon={faFileImage} className="w-6 h-6" />
            </div>

@@ -131,7 +131,7 @@ export default function PreservedFormats() {
      {link?.pdfPath && link.pdfPath !== "pending" ? (
        <div className="flex justify-between items-center pr-1 border border-neutral-content rounded-md">
          <div className="flex gap-2 items-center">
-            <div className="text-white bg-primary p-2 rounded-l-md">
+            <div className="bg-primary text-primary-content p-2 rounded-l-md">
              <FontAwesomeIcon icon={faFilePdf} className="w-6 h-6" />
            </div>

@@ -166,7 +166,7 @@ export default function PreservedFormats() {
      <div className="flex flex-col-reverse sm:flex-row gap-5 items-center justify-center">
        {link?.collection.ownerId === session.data?.user.id ? (
          <div
-            className={`w-full text-center bg-sky-700 p-1 rounded-md cursor-pointer select-none hover:bg-sky-600 duration-100 ${
+            className={`btn btn-accent text-white ${
              link?.pdfPath &&
              link?.screenshotPath &&
              link?.pdfPath !== "pending" &&
@@ -176,12 +176,14 @@ export default function PreservedFormats() {
            }`}
            onClick={() => updateArchive()}
          >
-            <p>Update Preserved Formats</p>
-            <p className="text-xs">(Refresh Link)</p>
+            <div>
+              <p>Update Preserved Formats</p>
+              <p className="text-xs">(Refresh Link)</p>
+            </div>
          </div>
        ) : undefined}
        <Link
-          href={`https://web.archive.org/web/${link?.url.replace(
+          href={`https://web.archive.org/web/${link?.url?.replace(
            /(^\w+:|^)\/\//,
            ""
          )}`}
@@ -110,7 +110,10 @@ export default function EditCollectionModal({
          </div>
        </div>

-        <button className="btn btn-accent w-fit ml-auto" onClick={submit}>
+        <button
+          className="btn btn-accent text-white w-fit ml-auto"
+          onClick={submit}
+        >
          Save
        </button>
      </div>
@@ -180,7 +180,7 @@ export default function EditCollectionSharingModal({
                    setMemberState
                  )
                }
-                className="btn btn-primary btn-square btn-sm h-10 w-10"
+                className="btn btn-accent text-white btn-square btn-sm h-10 w-10"
              >
                <FontAwesomeIcon icon={faUserPlus} className="w-5 h-5" />
              </div>
@@ -436,7 +436,7 @@ export default function EditCollectionSharingModal({

        {permissions === true && (
          <button
-            className="btn btn-accent w-fit ml-auto mt-3"
+            className="btn btn-accent text-white w-fit ml-auto mt-3"
            onClick={submit}
          >
            Save
@@ -159,7 +159,7 @@ export default function EditLinkModal({ onClose, activeLink }: Props) {
      </div>

      <div className="flex justify-end items-center mt-5">
-        <button className="btn btn-accent" onClick={submit}>
+        <button className="btn btn-accent text-white" onClick={submit}>
          Save
        </button>
      </div>
@@ -115,7 +115,10 @@ export default function NewCollectionModal({ onClose }: Props) {
          </div>
        </div>

-        <button className="btn btn-accent w-fit ml-auto" onClick={submit}>
+        <button
+          className="btn btn-accent text-white w-fit ml-auto"
+          onClick={submit}
+        >
          Create Collection
        </button>
      </div>
@@ -193,7 +193,7 @@ export default function NewLinkModal({ onClose }: Props) {
          <p>{optionsExpanded ? "Hide" : "More"} Options</p>
        </div>

-        <button className="btn btn-accent" onClick={submit}>
+        <button className="btn btn-accent text-white" onClick={submit}>
          Create Link
        </button>
      </div>
@@ -110,7 +110,6 @@ export default function UploadFileModal({ onClose }: Props) {
      else if (file.type === "image/png") fileType = ArchivedFormat.png;
      else if (file.type === "application/pdf") fileType = ArchivedFormat.pdf;

-      console.log(fileType);
      if (fileType !== null) {
        setSubmitLoader(true);

@@ -227,7 +226,7 @@ export default function UploadFileModal({ onClose }: Props) {
          <p>{optionsExpanded ? "Hide" : "More"} Options</p>
        </div>

-        <button className="btn btn-accent" onClick={submit}>
+        <button className="btn btn-accent text-white" onClick={submit}>
          Create Link
        </button>
      </div>
@@ -21,7 +21,7 @@ export default function SubmitButton({
  return (
    <button
      type={type ? type : undefined}
-      className={`btn btn-primary text-white tracking-wider w-fit flex items-center gap-2 ${
+      className={`btn btn-accent text-white tracking-wider w-fit flex items-center gap-2 ${
        className || ""
      }`}
      onClick={() => {