Skip to content

Commit c4a4279

Browse files
committed
Merge branch 'preview'
2 parents bd6c77c + 0ada525 commit c4a4279

File tree

10 files changed

+8
-39
lines changed

10 files changed

+8
-39
lines changed

public/images/confetti.png

-3.67 KB
Binary file not shown.

public/images/screenshot.png

-69.2 KB
Loading

src/app/(site)/about/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ export default function Page() {
169169
</p>
170170
</section>
171171
<footer className="text-skin-tertiary mt-16 text-center text-sm font-medium">
172-
OURANOS · EARLY ACCESS · {new Date().getFullYear()}
172+
OURANOS · {new Date().getFullYear()}
173173
</footer>
174174
</main>
175175
);

src/app/opengraph-image.png

-59.5 KB
Loading

src/app/page.tsx

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,10 @@ export default function Home() {
2828
</Link>
2929
</header>
3030
<section className="animate-fade-up animate-delay-150 mx-auto mt-16 max-w-xl">
31-
<small className="bg-primary/20 text-primary animate-fade-up animate-delay-[1000ms] mb-1 inline-flex items-center gap-1 rounded-full px-3 py-2 text-[0.6rem] font-bold">
32-
In Early Access
33-
<Image
34-
src="/images/confetti.png"
35-
alt="Confetti emoji"
36-
width={14}
37-
height={14}
38-
/>
39-
</small>
40-
4131
<h1 className="text-skin-base max-w-lg text-4xl font-medium">
4232
Your friendly Bluesky client for the web
4333
</h1>
44-
34+
4535
<ul className="text-skin-secondary mt-5 text-lg font-medium">
4636
<li>Designed for simplicity</li>
4737
<li>Enhanced features</li>
@@ -74,7 +64,7 @@ export default function Home() {
7464
/>
7565
</div>
7666
<footer className="animate-fade-up animate-delay-500 text-skin-tertiary mt-16 text-center text-sm font-medium">
77-
OURANOS · EARLY ACCESS · {new Date().getFullYear()}
67+
OURANOS · {new Date().getFullYear()}
7868
</footer>
7969
</main>
8070
);

src/components/dataDisplay/postText/postText.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { Fragment } from "react";
88
import * as Tooltip from "@radix-ui/react-tooltip";
99
import { BiLinkExternal } from "react-icons/bi";
1010
import PostTag from "../postTag/PostTag";
11-
import ProfileHoverCard from "@/components/contentDisplay/profileHoverCard/ProfileHoverCard";
1211

1312
interface Props {
1413
record: PostView["record"];
@@ -42,9 +41,7 @@ export default function PostText(props: Props) {
4241
key={segment.mention?.did}
4342
onClick={(e) => e.stopPropagation()}
4443
>
45-
<ProfileHoverCard handle={segment.mention.did}>
46-
{segment.text}
47-
</ProfileHoverCard>
44+
{segment.text}
4845
</Link>
4946
)}
5047
</>

src/components/forms/loginForm/LoginForm.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ export default function LoginForm() {
101101
</Link>{" "}
102102
to log in.
103103
</p>
104-
<p className="text-skin-secondary text-sm font-medium">
105-
Ouranos is in early access, some features may not be available yet.
106-
</p>
107104
<form
108105
className="mt-5 text-sm font-medium"
109106
onSubmit={(e) => {

src/components/inputs/editor/AdultContentPicker.tsx

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import Dropdown from "@/components/actions/dropdown/Dropdown";
33
import React from "react";
44
import { BiCheck, BiTrash } from "react-icons/bi";
55
import { HiOutlineShieldExclamation } from "react-icons/hi";
6-
import toast from "react-hot-toast";
76

87
const options = [
98
{ label: "Suggestive", value: "sexual" },
@@ -23,21 +22,7 @@ export default function AdultContentPicker(props: Props) {
2322
return (
2423
<Dropdown>
2524
<Dropdown.Trigger disabled={disabled}>
26-
<Button
27-
onClick={(e) => {
28-
e.stopPropagation();
29-
if (disabled) {
30-
toast.error(
31-
"Content warning is only available for posts with media attachments",
32-
{
33-
id: "CW",
34-
},
35-
);
36-
}
37-
}}
38-
disabled={false} // this should be false to trigger toast
39-
className="p-0"
40-
>
25+
<Button className="p-0">
4126
<HiOutlineShieldExclamation className="text-primary hover:text-primary-dark text-2xl" />
4227
</Button>
4328
</Dropdown.Trigger>

src/components/inputs/editor/BottomEditorBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export default function BottomEditorBar(props: Props) {
5959
...files.slice(0, 4).map((file) =>
6060
Object.assign(file, {
6161
url: URL.createObjectURL(file),
62-
}),
62+
})
6363
),
6464
];
6565
onUpdateImages(updatedImages);
@@ -76,12 +76,12 @@ export default function BottomEditorBar(props: Props) {
7676
<div className="flex flex-wrap justify-between gap-5 mt-3">
7777
<div className="flex gap-4">
7878
<EmojiPicker onEmojiSelect={editor.commands.insertContent} />
79+
<ImagePicker onShow={setShowDropzone} />
7980
<AdultContentPicker
8081
onSelectLabel={onSelectLabel}
8182
selectedLabel={label}
8283
disabled={!images || images.length === 0}
8384
/>
84-
<ImagePicker onShow={setShowDropzone} />
8585
<LinkPicker editor={editor} />
8686
</div>
8787
<div className="just flex flex-wrap gap-x-5 gap-y-2">

src/lib/utils/text.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export function getComposerPlaceholder(type: string, name?: string) {
5353
case "quote":
5454
return `Quoting ${name}`;
5555
default:
56-
return "What's up?";
56+
return "What's on your mind?";
5757
}
5858
}
5959

0 commit comments

Comments
 (0)