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

Test mobile user menu #3177

Merged
merged 1 commit into from
Nov 29, 2024
Merged

Test mobile user menu #3177

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 Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN apt-get update \
&& corepack prepare yarn@stable --activate

# bump to update website
ENV WEBSITE_VERSION 0.13.1-next.f600763d
ENV WEBSITE_VERSION 0.13.1-next.b220b868
COPY . /workdir

RUN /usr/bin/yarn --cwd website \
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"repository": "https://github.com/eclipse/open-vsx.org",
"license": "EPL-2.0",
"dependencies": {
"openvsx-webui": "0.13.1-next.f600763d"
"openvsx-webui": "0.13.1-next.b220b868"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
Expand Down
18 changes: 9 additions & 9 deletions website/src/menu-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const itemIcon = {

const MobileMenuItemText: FunctionComponent<PropsWithChildren> = ({ children }) => {
return (
<Typography variant='body2' sx={{ color: 'text.primary', display: 'flex', alignItems: 'center' }}>
<Typography variant='body2' sx={{ color: 'text.primary', display: 'flex', alignItems: 'center', textTransform: 'none' }}>
{children}
</Typography>
);
Expand All @@ -54,18 +54,18 @@ const MobileMenuItemText: FunctionComponent<PropsWithChildren> = ({ children })
export const MobileMenuContent: FunctionComponent = () => {
const {service, user} = useContext(MainContext)
return <>
<MobileMenuItem>
{
user
? <MobileUserAvatar/>
: <RouteLink to={service.getLoginUrl()}>
{
user
? <MobileUserAvatar/>
: <MobileMenuItem>
<Link href={service.getLoginUrl()}>
<MobileMenuItemText>
<AccountBoxIcon sx={itemIcon} />
Log In
</MobileMenuItemText>
</RouteLink>
}
</MobileMenuItem>
</Link>
</MobileMenuItem>
}
{
!location.pathname.startsWith(UserSettingsRoutes.ROOT)
? <MobileMenuItem>
Expand Down
10 changes: 5 additions & 5 deletions website/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2399,7 +2399,7 @@ __metadata:
"@types/react-router-dom": "npm:^5.3.3"
css-loader: "npm:^6.8.1"
express: "npm:^4.21.1"
openvsx-webui: "npm:0.13.1-next.f600763d"
openvsx-webui: "npm:0.13.1-next.b220b868"
source-map-loader: "npm:^4.0.1"
style-loader: "npm:^3.3.3"
typescript: "npm:~5.1.6"
Expand All @@ -2420,9 +2420,9 @@ __metadata:
languageName: node
linkType: hard

"openvsx-webui@npm:0.13.1-next.f600763d":
version: 0.13.1-next.f600763d
resolution: "openvsx-webui@npm:0.13.1-next.f600763d"
"openvsx-webui@npm:0.13.1-next.b220b868":
version: 0.13.1-next.b220b868
resolution: "openvsx-webui@npm:0.13.1-next.b220b868"
dependencies:
"@emotion/react": "npm:^11.11.1"
"@emotion/styled": "npm:^11.11.0"
Expand All @@ -2448,7 +2448,7 @@ __metadata:
react-router-dom: "npm:^6.14.1"
peerDependencies:
"@babel/core": ^7.0.0
checksum: 10/285872702f78f37929a48917f469b1b1591c03923f0bc40a7dd0ede196403c981d21263ae7b64a67030c8241426dbbd33f77ca6da9dfeff1ef725d0451e1525b
checksum: 10/1800fc864702efae62bfd2682600d511f0fe4ccd0443acf5899a8c4e17f2b7b053a6c0a95ed5532e9c3c411d03258ffd5f78adc9106a1ca92b5a25ba92581390
languageName: node
linkType: hard

Expand Down