Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/release-checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ assignees: digi-monkey

## Version Tag

- [ ] Release call
- [ ] Commit changes
- [ ] Bump version
- [ ] Release notes
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ Open social network built on [Nostr protocol](https://github.com/nostr-protocol/

Flycat v0.2.x release 🎉🎉🎉

Curious what will be next? Checkout our [Real Time Roadmap](https://github.com/users/digi-monkey/projects/1/views/1?sortedBy%5Bdirection%5D=asc&sortedBy%5BcolumnId%5D=53966968)!

We also host a regular [design-call meeting](docs/develop.md#design-call) discussing the next things to ship on flycat, it is fully open and anyone can participate. Recommend it as a good way to get involved!
Curious what will be next? Checkout our [Real Time Roadmap](https://github.com/users/digi-monkey/projects/1/views/4?sliceBy%5BcolumnId%5D=53966968)!

## Install

Expand Down
12 changes: 0 additions & 12 deletions docs/develop.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,3 @@ We use [project kanban](https://github.com/users/digi-monkey/projects/1) to mana
## Contributing

A good way to start contributing is to check the [github issues](https://github.com/digi-monkey/flycat-web/issues) labeling with `good first issue`.

## Design Call

Every week, right before a regular release iteration start, we host a regular design call meeting, the meeting is fully open. anyone can join and discuss if they want.

The meeting is mainly focus on:

- things planning to ship in that week
- new contributors self-introduce, asking question about the project or development
- users feedback

The meeting is tentatively scheduled for 1:00 PM UTC+8 hosted on [meet.jit.si](https://meet.jit.si/). Check out [flycat official account](https://flycat.club/user/f60140bb15e3f8e6a6032a557dcde4b900d52f315799b35052e625333a5cd904) for meeting link.
3 changes: 2 additions & 1 deletion public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"relays": "Relays",
"bookmarks": "Bookmarks",
"notifications": "Notifications",
"search": "Search"
"search": "Search",
"about": "About"
}
},
"home": {
Expand Down
3 changes: 2 additions & 1 deletion public/locales/zh/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"relays": "中继",
"bookmarks": "收藏",
"notifications": "通知",
"search": "搜索"
"search": "搜索",
"about": "关于"
}
},
"home": {
Expand Down
16 changes: 15 additions & 1 deletion src/components/BaseLayout/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export enum MenuId {
signOut = 'signOut',
add = 'add',
search = 'search',
about = 'about',
}

export const NavMenus = [{
Expand Down Expand Up @@ -62,6 +63,12 @@ export const NavMenus = [{
icon: <Icon type="icon-user" />,
title: 'nav.menu.profile',
link: Paths.user
},
{
id: MenuId.about,
icon: <Icon type="icon-emoji" />,
title: 'nav.menu.about',
link: Paths.about
}
];

Expand All @@ -88,7 +95,14 @@ NavMenus[3],
icon: <Icon type="icon-Gear" />,
title: 'nav.menu.setting',
link: Paths.setting
}, {
},
{
id: MenuId.about,
icon: <Icon type="icon-emoji" />,
title: 'nav.menu.about',
link: Paths.about
},
{
id: MenuId.signOut,
icon: <Icon type="icon-Move-out" />,
title: 'nav.menu.signOut',
Expand Down
8 changes: 8 additions & 0 deletions src/components/PubNoteTextarea/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ interface Props {
signEvent?: SignEvent;
pubSuccessCallback?: (eventId: string, relayUrl: string[]) => any;
activeCommunity?: Naddr;
initText?: string;
}

export const SubmitButton = ({ disabled }: { disabled: boolean }) => {
Expand All @@ -48,6 +49,7 @@ const PubNoteTextarea: React.FC<Props> = ({
signEvent,
pubSuccessCallback,
activeCommunity,
initText
}) => {
const router = useRouter();
const myPublicKey = useReadonlyMyPublicKey();
Expand All @@ -73,6 +75,12 @@ const PubNoteTextarea: React.FC<Props> = ({
}
}, [activeCommunity])

useEffect(()=>{
if(initText){
setText(initText);
}
}, [])

return (
<div
className={classNames(styles.pubNoteTextarea, {
Expand Down
4 changes: 4 additions & 0 deletions src/constants/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ const Pages = {
landing: {
name: 'landing',
path: '/landing'
},
about: {
name: 'about',
path: '/about'
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/pages/about/index.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.about{
padding: var(--basePadding2) var(--basePadding5);
}
93 changes: 93 additions & 0 deletions src/pages/about/index.page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
import { useVersion } from 'hooks/useVersion';
import { useTranslation } from 'react-i18next';
import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
import { BaseLayout, Left, Right } from 'components/BaseLayout';

import styles from './index.module.scss';
import PubNoteTextarea from 'components/PubNoteTextarea';
import dynamic from 'next/dynamic';

function About({ commitId }) {
const version = useVersion();
const { t } = useTranslation();
return (
<BaseLayout>
<Left>
<div className={styles.about}>
<h2>Flycat</h2>
<p>
Flycat is a new way to exit toxic internet. It represents a
healthier social model built on Nostr protocol. There is no follower
count, like button, private recommendation algorithm and all the
other bullshit components found in modern social networks.
</p>

<h2>{t('setting.version')}</h2>
<div>
<a
href={
'https://github.com/digi-monkey/flycat-web/commit/' + commitId
}
>
v{version}-{commitId}
</a>
</div>

<h2>Open Source</h2>
<a
href="https://github.com/digi-monkey/flycat-web"
target="_blank"
rel="noreferrer"
>
GitHub
</a>

<h2>Author</h2>
<p>
<a href="/user/45c41f21e1cf715fa6d9ca20b8e002a574db7bb49e96ee89834c66dac5446b7a">
ElectronicMonkey
</a>
</p>

<h2>Join</h2>
<p>
We cherish open source and collaborative building. The only
requirement to join building flycat is passion. There is plenty of{' '}
<a href="https://github.com/digi-monkey/flycat-web/issues">
issues
</a>{' '}
on the project, comment it if you are interested to help.{' '}
</p>

<h2>Looking for help?</h2>
<p>
Click the below input box to post your feedbacks with flycat hashtag
on public, the author will see it and response.
</p>
<PubNoteTextarea initText="#flycat-feedback " />

<br />
<br />
<br />
<br />
</div>
</Left>
<Right></Right>
</BaseLayout>
);
}

export default dynamic(() => Promise.resolve(About), {
ssr: false,
});

export const getStaticProps = async ({ locale }: { locale: string }) => {
const commitId = process.env.REACT_APP_COMMIT_HASH;

return {
props: {
commitId,
...(await serverSideTranslations(locale, ['common'])),
},
};
};
35 changes: 0 additions & 35 deletions src/pages/setting/about.tsx

This file was deleted.

14 changes: 4 additions & 10 deletions src/pages/setting/index.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ import { useReadonlyMyPublicKey } from 'hooks/useMyPublicKey';
import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
import { Avatar, Button, Form, Input, Tabs } from 'antd';
import { noticePubEventResult } from 'components/PubEventNotice';
import { useRouter } from 'next/router';

import PageTitle from 'components/PageTitle';
import styles from './index.module.scss';
import Preference from './preference';
import About from './about';
import { useRouter } from 'next/router';
import Key from './key';

const { TextArea } = Input;
Expand Down Expand Up @@ -228,11 +227,6 @@ export const EditProfilePage = ({ commitId }) => {
</div>
),
},
{
label: 'Keys',
key: 'keys',
children: <Key />,
},
{
label: `Preference`,
key: 'preference',
Expand All @@ -243,9 +237,9 @@ export const EditProfilePage = ({ commitId }) => {
),
},
{
label: 'About',
key: 'about',
children: <About commitId={commitId} />,
label: 'Keys',
key: 'keys',
children: <Key />,
},
];

Expand Down