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.

Sign up for GitHub

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

Change pull request button to publishing button #119

Merged
merged 1 commit into from
Jul 28, 2024
Merged

Change pull request button to publishing button #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 webapp/src/app/projects/[projectName]/[languageName]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ const MessagesPage: NextPage<{
<Header />
<Sidebar>
<TitleBar languageName={languageName} projectName={projectName} />
<PullRequestButton projectName={projectName} />
<MessageTree
languageName={languageName}
messageId={messageId}
messages={messages}
projectName={projectName}
/>
<PullRequestButton projectName={projectName} />
</Sidebar>
</SidebarContextProvider>
<Main>
Expand Down
1 change: 1 addition & 0 deletions webapp/src/components/MessageTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ const MessageTree: FC<MessageTreeProps> = ({
items={tree}
onItemSelectionToggle={onItemSelectionToggle}
slots={{ item: TreeItem2 }}
sx={{ overflowY: 'auto' }}
/>
);
};
Expand Down
6 changes: 4 additions & 2 deletions webapp/src/components/PullRequestButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ const PullRequestButton: FC<PullRequestButtonProps> = ({ projectName }) => {
return (
<>
<Box
p={2}
style={{
alignContent: 'center',
borderTop: '1px solid #c3c7cc',
display: 'flex',
height: 40,
height: 64,
justifyContent: 'center',
}}
>
Expand All @@ -52,7 +54,7 @@ const PullRequestButton: FC<PullRequestButtonProps> = ({ projectName }) => {
type="submit"
variant="contained"
>
Pull Request
Publish changes
</Button>
)}
{state.pullRequestStatus === 'sending' && (
Expand Down
4 changes: 1 addition & 3 deletions webapp/src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ const Sidebar: FC<SidebarProps> = ({ children }) => {
sx={{
display: 'flex',
flexDirection: 'column',
overflowY: 'auto',
p: 2,
rowGap: theme.spacing(2),
overflow: 'hidden',
}}
>
{children}
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/components/TitleBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ const TitleBar: FC<TitleBarProps> = ({ languageName, projectName }) => {
const theme = useTheme();
return (
<Box
px={2}
py={2}
sx={{
alignItems: 'center',
borderBottom: '1px solid #c3c7cc',
columnGap: theme.spacing(1),
display: 'flex',
paddingBottom: theme.spacing(2),
paddingTop: theme.spacing(1),
}}
>
<Link
Expand Down