Merge branch 'rewrite' of github.com:Sendouc/sendou.ink into calendar

This commit is contained in:
Kalle 2022-07-31 14:41:59 +03:00
commit 8564c990ef
4 changed files with 8 additions and 9 deletions

View File

@ -45,7 +45,7 @@ export const links: LinksFunction = () => {
export const meta: MetaFunction = () => ({
charset: "utf-8",
title: "sendou.ink",
viewport: "width=device-width,initial-scale=1,minimum-scale=1.0",
viewport: "width=device-width,initial-scale=1",
});
export interface RootLoaderData {

View File

@ -221,7 +221,7 @@ export default function PlusSuggestionsPage() {
{canSuggestNewUserFE({ user, suggestions: data.suggestions }) ? (
// TODO: resetScroll={false} https://twitter.com/ryanflorence/status/1527775882797907969
<LinkButton
to="new"
to={`new${tierVisible ? `?tier=${tierVisible}` : ""}`}
data-cy="new-suggest-button"
prefetch="render"
>
@ -366,7 +366,7 @@ function SuggestedUser({
className="plus__comment-button"
tiny
variant="outlined"
to={`comment/${tier}/${suggested.suggestedUser.id}`}
to={`comment/${tier}/${suggested.suggestedUser.id}?tier=${tier}`}
data-cy="comment-button"
prefetch="render"
>

View File

@ -60,7 +60,7 @@ export const action: ActionFunction = async ({ request }) => {
...nextNonCompletedVoting(new Date()),
});
return redirect(plusSuggestionPage());
return redirect(plusSuggestionPage(data.tier));
};
export default function PlusCommentModalPage() {

View File

@ -104,26 +104,25 @@
}
.layout__menu {
position: absolute;
position: fixed;
z-index: 500;
top: 0;
right: 0;
width: max-content;
height: max-content;
margin-top: 10rem;
margin-right: -12rem;
backdrop-filter: blur(10px) brightness(75%);
background-color: var(--bg-lighter);
background-image: url("/svg/background-pattern.svg");
border-end-start-radius: var(--rounded);
border-start-start-radius: var(--rounded);
overflow-y: auto;
transition: margin-right 0.5s;
transform: translateX(100%);
transition: transform 0.5s;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
}
.layout__menu.expanded {
margin-right: 0;
transform: none;
}
.layout__menu__link__icon {