Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #347

Merged
merged 9 commits into from
May 6, 2024
1 change: 1 addition & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="referrer" content="no-referrer" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="theme-color" content="#000000" />
Expand Down
3 changes: 1 addition & 2 deletions src/components/loading-ellipsis/loading-ellipsis.module.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.ellipsis:after {
overflow: hidden;
display: inline-block;
position: absolute;
vertical-align: bottom;
vertical-align: text-bottom;
-webkit-animation: ellipsis steps(4,end) 1500ms infinite;
animation: ellipsis steps(4,end) 1500ms infinite;
content: "\2026"; /* ascii code for the ellipsis character */
Expand Down
3 changes: 2 additions & 1 deletion src/components/post/embed/embed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,11 @@ const YoutubeEmbed = ({ parsedUrl }: EmbedComponentProps) => {
className={styles.videoEmbed}
height='100%'
width='100%'
referrerPolicy='origin'
allow='accelerometer; encrypted-media; gyroscope; picture-in-picture; web-share'
allowFullScreen
title={parsedUrl.href}
src={`https://www.youtube-nocookie.com/embed/${youtubeId}`}
src={`https://www.youtube.com/embed/${youtubeId}`}
/>
);
}
Expand Down
1 change: 0 additions & 1 deletion src/components/sidebar/sidebar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ a {
}

.onlineLine {
text-transform: lowercase;
padding-bottom: 5px;
}

Expand Down
22 changes: 20 additions & 2 deletions src/components/sidebar/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Markdown from '../markdown';
import SearchBar from '../search-bar';
import SubscribeButton from '../subscribe-button';
import packageJson from '../../../package.json';
import LoadingEllipsis from '../loading-ellipsis';

const { version } = packageJson;
const commitRef = process.env.REACT_APP_COMMIT_REF;
Expand All @@ -20,6 +21,7 @@ interface sidebarProps {
cid?: string;
createdAt?: number;
description?: string;
isSubCreatedButNotYetPublished?: boolean;
downvoteCount?: number;
roles?: Record<string, Role>;
rules?: string[];
Expand Down Expand Up @@ -123,14 +125,30 @@ const downloadAppLink = (() => {
}
})();

const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, roles, rules, timestamp = 0, title, updatedAt, upvoteCount = 0, settings }: sidebarProps) => {
const Sidebar = ({
address,
cid,
createdAt,
description,
downvoteCount = 0,
isSubCreatedButNotYetPublished,
roles,
rules,
timestamp = 0,
title,
updatedAt,
upvoteCount = 0,
settings,
}: sidebarProps) => {
const { t } = useTranslation();
const { allActiveUserCount, hourActiveUserCount } = useSubplebbitStats({ subplebbitAddress: address });
const isOnline = updatedAt && updatedAt > Date.now() / 1000 - 60 * 30;
const onlineNotice = t('users_online', { count: hourActiveUserCount });
const offlineNotice = updatedAt && t('posts_last_synced', { dateAgo: getFormattedTimeAgo(updatedAt) });
const onlineStatus = isOnline ? onlineNotice : offlineNotice;

const subCreatedButNotYetPublishedStatus = <LoadingEllipsis string='Publishing community over IPFS' />;

const location = useLocation();
const params = useParams();
const isInAboutView = isAboutView(location.pathname);
Expand Down Expand Up @@ -208,7 +226,7 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
</div>
<div className={styles.onlineLine}>
<span className={`${styles.onlineIndicator} ${isOnline ? styles.online : styles.offline}`} title={isOnline ? t('online') : t('offline')} />
<span>{onlineStatus}</span>
<span>{isSubCreatedButNotYetPublished ? subCreatedButNotYetPublishedStatus : onlineStatus}</span>
</div>
{description && (
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ const useSubplebbitSettingsStore = create<SubplebbitSettingsState>((set) => ({
if (nextState.rules !== undefined) editOptions.rules = nextState.rules;
if (nextState.roles !== undefined) editOptions.roles = nextState.roles;
if (nextState.settings !== undefined) editOptions.settings = nextState.settings;
if (nextState.subplebbitAddress !== undefined) editOptions.subplebbitAddress = nextState.subplebbitAddress;
nextState.publishSubplebbitEditOptions = editOptions;
return nextState;
}),
Expand Down Expand Up @@ -834,7 +835,7 @@ const SubplebbitSettings = () => {
setShowSaving(true);
await publishSubplebbitEdit();
setShowSaving(false);
alert(t('settings_saved', { subplebbitAddress: shortAddress }));
alert(t('settings_saved', { subplebbitAddress }));
} catch (e) {
if (e instanceof Error) {
console.warn(e);
Expand Down
18 changes: 12 additions & 6 deletions src/views/subplebbit/subplebbit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@ const Subplebbit = () => {
const subplebbitAddress = params.subplebbitAddress;
const subplebbitAddresses = useMemo(() => [subplebbitAddress], [subplebbitAddress]) as string[];
const subplebbit = useSubplebbit({ subplebbitAddress });
const { createdAt, description, roles, rules, shortAddress, state, title, updatedAt, settings } = subplebbit || {};
const { createdAt, description, roles, rules, shortAddress, started, state, title, updatedAt, settings } = subplebbit || {};
const { feed, hasMore, loadMore } = useFeed({ subplebbitAddresses, sortType, filter: timeFilter });
const loadingStateString = useFeedStateString(subplebbitAddresses) || t('loading');

const loadingStateString = useFeedStateString(subplebbitAddresses) || t('loading');
const loadingString = <div className={styles.stateString}>{state === 'failed' ? state : <LoadingEllipsis string={loadingStateString} />}</div>;

let isOnline = updatedAt && updatedAt > Date.now() / 1000 - 60 * 30;
const isSubCreatedButNotYetPublished = typeof createdAt === 'number' && !updatedAt;

const { blocked } = useBlock({ address: subplebbitAddress });

useEffect(() => {
Expand All @@ -36,16 +39,18 @@ const Subplebbit = () => {
const Footer = () => {
let footerContent;

if (feed.length === 0) {
if (feed.length === 0 && isOnline) {
if (blocked) {
footerContent = t('you_blocked_community');
} else {
footerContent = t('no_posts');
}
}

if (hasMore || subplebbitAddresses.length === 0) {
} else if (feed.length === 0 && started && isSubCreatedButNotYetPublished) {
footerContent = t('no_posts');
} else if (hasMore) {
footerContent = loadingString;
} else {
return;
}

return <div className={styles.footer}>{footerContent}</div>;
Expand Down Expand Up @@ -74,6 +79,7 @@ const Subplebbit = () => {
address={subplebbitAddress}
createdAt={createdAt}
description={description}
isSubCreatedButNotYetPublished={started && isSubCreatedButNotYetPublished}
roles={roles}
rules={rules}
title={title}
Expand Down