diff --git a/src/components/Nav/AuthModal/ChangePasswordForm.tsx b/src/components/Nav/AuthModal/ChangePasswordForm.tsx index 09ad3907..acc22b60 100644 --- a/src/components/Nav/AuthModal/ChangePasswordForm.tsx +++ b/src/components/Nav/AuthModal/ChangePasswordForm.tsx @@ -67,7 +67,9 @@ export const ChangePasswordForm = () => { 'Now you can enter a new password, it must contain at least 8 characters and not be the same as the previous password', )} - + +
{validationErrors()['password']}
+
setPasswordError(err)} onInput={(value) => handlePasswordInput(value)} diff --git a/src/components/Nav/AuthModal/EmailConfirm.tsx b/src/components/Nav/AuthModal/EmailConfirm.tsx index 94505c5b..0bb6e01d 100644 --- a/src/components/Nav/AuthModal/EmailConfirm.tsx +++ b/src/components/Nav/AuthModal/EmailConfirm.tsx @@ -1,7 +1,5 @@ -import type { ConfirmEmailSearchParams } from './types' - import { clsx } from 'clsx' -import { createEffect, createMemo, createSignal, Show } from 'solid-js' +import { createEffect, createSignal, Show } from 'solid-js' import { useLocalize } from '../../../context/localize' import { useSession } from '../../../context/session' diff --git a/src/components/Nav/SearchModal/SearchModal.module.scss b/src/components/Nav/SearchModal/SearchModal.module.scss index 54c4114b..8fb9acc5 100644 --- a/src/components/Nav/SearchModal/SearchModal.module.scss +++ b/src/components/Nav/SearchModal/SearchModal.module.scss @@ -1,8 +1,10 @@ @mixin searchFilterControl { - background: rgb(64 64 64 / 0.5); + background: rgb(64 64 64 / 50%); border-radius: 10rem; color: #fff; + @include font-size(1.4rem); + font-weight: 500; height: 4rem; padding: 0 2rem; @@ -13,7 +15,7 @@ } &:active { - color: rgb(255 255 255 / 0.4); + color: rgb(255 255 255 / 40%); } } @@ -25,13 +27,15 @@ border: none; border-bottom: 2px solid #fff; color: #fff; + @include font-size(4.8rem); + font-weight: bold; outline: none; padding: 0 0 0.5rem; &::placeholder { - color: rgb(255 255 255 / 0.32); + color: rgb(255 255 255 / 32%); } &:not(:placeholder-shown) + .submitControl { @@ -51,7 +55,8 @@ } .searchDescription { - color: rgb(255 255 255 / 0.64); + color: rgb(255 255 255 / 64%); + @include font-size(1.6rem); } diff --git a/src/components/Nav/SearchModal/SearchModal.tsx b/src/components/Nav/SearchModal/SearchModal.tsx index 55458dfa..61e2e0f7 100644 --- a/src/components/Nav/SearchModal/SearchModal.tsx +++ b/src/components/Nav/SearchModal/SearchModal.tsx @@ -1,11 +1,12 @@ -import { clsx } from 'clsx' -import { useLocalize } from '../../../context/localize' -import { Icon } from '../../_shared/Icon' import { openPage } from '@nanostores/router' +import { clsx } from 'clsx' -import styles from './SearchModal.module.scss' +import { useLocalize } from '../../../context/localize' import { router, useRouter } from '../../../stores/router' import { hideModal } from '../../../stores/ui' +import { Icon } from '../../_shared/Icon' + +import styles from './SearchModal.module.scss' export const SearchModal = () => { const { t } = useLocalize() diff --git a/src/components/Views/Author/Author.tsx b/src/components/Views/Author/Author.tsx index b584fe6f..fea33ac5 100644 --- a/src/components/Views/Author/Author.tsx +++ b/src/components/Views/Author/Author.tsx @@ -24,7 +24,6 @@ import { Row3 } from '../../Feed/Row3' import styles from './Author.module.scss' import stylesArticle from '../../Article/Article.module.scss' -import { useSession } from '../../../context/session' type Props = { shouts: Shout[] diff --git a/src/components/Views/Feed/Feed.tsx b/src/components/Views/Feed/Feed.tsx index 627da755..93577c99 100644 --- a/src/components/Views/Feed/Feed.tsx +++ b/src/components/Views/Feed/Feed.tsx @@ -7,6 +7,7 @@ import { createEffect, createMemo, createSignal, For, on, onMount, Show } from ' import { useLocalize } from '../../../context/localize' import { useReactions } from '../../../context/reactions' +import { useSession } from '../../../context/session' import { apiClient } from '../../../graphql/client/core' import { router, useRouter } from '../../../stores/router' import { useArticlesStore, resetSortedArticles } from '../../../stores/zine/articles' @@ -25,7 +26,6 @@ import { Sidebar } from '../../Feed/Sidebar' import styles from './Feed.module.scss' import stylesBeside from '../../Feed/Beside.module.scss' import stylesTopic from '../../Feed/CardTopic.module.scss' -import { useSession } from '../../../context/session' export const FEED_PAGE_SIZE = 20 const UNRATED_ARTICLES_COUNT = 5 diff --git a/src/components/Views/FourOuFour.tsx b/src/components/Views/FourOuFour.tsx index 218254e2..07343f49 100644 --- a/src/components/Views/FourOuFour.tsx +++ b/src/components/Views/FourOuFour.tsx @@ -1,11 +1,11 @@ +import { openPage } from '@nanostores/router' import { clsx } from 'clsx' import { useLocalize } from '../../context/localize' +import { router } from '../../stores/router' import { Icon } from '../_shared/Icon' import styles from '../../styles/FourOuFour.module.scss' -import { openPage } from '@nanostores/router' -import { router } from '../../stores/router' export const FourOuFourView = (_props) => { let queryInput: HTMLInputElement diff --git a/src/components/Views/Search.tsx b/src/components/Views/Search.tsx index 0884b5d6..656e77e5 100644 --- a/src/components/Views/Search.tsx +++ b/src/components/Views/Search.tsx @@ -1,6 +1,6 @@ import type { SearchResult } from '../../graphql/schema/core.gen' -import { Show, For, createSignal, createEffect, onMount } from 'solid-js' +import { Show, For, createSignal, onMount } from 'solid-js' import '../../styles/Search.scss' import { useLocalize } from '../../context/localize' @@ -8,7 +8,6 @@ import { useRouter } from '../../stores/router' import { loadShoutsSearch, useArticlesStore } from '../../stores/zine/articles' import { restoreScrollPosition, saveScrollPosition } from '../../utils/scroll' import { ArticleCard } from '../Feed/ArticleCard' -import { apiClient } from '../../graphql/client/core' type SearchPageSearchParams = { by: '' | 'relevance' | 'rating' diff --git a/src/components/_shared/Lightbox/Lightbox.module.scss b/src/components/_shared/Lightbox/Lightbox.module.scss index de7910d2..6add1468 100644 --- a/src/components/_shared/Lightbox/Lightbox.module.scss +++ b/src/components/_shared/Lightbox/Lightbox.module.scss @@ -9,7 +9,6 @@ align-items: center; justify-content: center; z-index: 10000; - animation: 300ms fadeIn; animation-fill-mode: forwards; diff --git a/src/components/_shared/UserSearch/UserSearch.module.scss b/src/components/_shared/UserSearch/UserSearch.module.scss index c8239e41..45a6d74d 100644 --- a/src/components/_shared/UserSearch/UserSearch.module.scss +++ b/src/components/_shared/UserSearch/UserSearch.module.scss @@ -1,8 +1,7 @@ .UserSearch { .searchHeader { display: flex; - flex-direction: row; - flex-wrap: nowrap; + flex-flow: row nowrap; width: 100%; gap: 1rem; } @@ -10,8 +9,7 @@ .field { border-bottom: 2px solid var(--background-color-invert); display: flex; - flex-direction: row; - flex-wrap: nowrap; + flex-flow: row nowrap; padding: 4px 0; align-items: center; width: 100%; @@ -28,6 +26,7 @@ &::placeholder { color: #404040; } + &:focus { outline: none; } diff --git a/src/context/profile.tsx b/src/context/profile.tsx index 58b03c29..b8481763 100644 --- a/src/context/profile.tsx +++ b/src/context/profile.tsx @@ -1,10 +1,9 @@ import type { ProfileInput } from '../graphql/schema/core.gen' -import { createContext, createEffect, createMemo, JSX, useContext } from 'solid-js' +import { createContext, createEffect, JSX, useContext } from 'solid-js' import { createStore } from 'solid-js/store' import { apiClient } from '../graphql/client/core' -import { loadAuthor } from '../stores/zine/authors' import { useSession } from './session' diff --git a/src/context/session.tsx b/src/context/session.tsx index 03e1331e..9633ac30 100644 --- a/src/context/session.tsx +++ b/src/context/session.tsx @@ -28,6 +28,7 @@ import { notifierClient } from '../graphql/client/notifier' import { useRouter } from '../stores/router' import { showModal } from '../stores/ui' import { addAuthors } from '../stores/zine/authors' + import { useLocalize } from './localize' import { useSnackbar } from './snackbar' diff --git a/src/graphql/client/chat.ts b/src/graphql/client/chat.ts index ceb6b195..42c5be97 100644 --- a/src/graphql/client/chat.ts +++ b/src/graphql/client/chat.ts @@ -8,7 +8,6 @@ import deleteChatMessage from '../mutation/chat/chat-message-delete' import updateChatMessage from '../mutation/chat/chat-message-update' import updateChat from '../mutation/chat/chat-update' import chatMessagesLoadBy from '../query/chat/chat-messages-load-by' -import loadRecipients from '../query/chat/chat-recipients' import myChats from '../query/chat/chats-load' import { Chat, diff --git a/src/graphql/client/core.ts b/src/graphql/client/core.ts index fea62268..74415527 100644 --- a/src/graphql/client/core.ts +++ b/src/graphql/client/core.ts @@ -35,8 +35,8 @@ import loadShoutsUnrated from '../query/core/articles-load-unrated' import authorBy from '../query/core/author-by' import authorFollowers from '../query/core/author-followers' import authorId from '../query/core/author-id' -import authorFollowed from '../query/core/authors-followed-by' import authorsAll from '../query/core/authors-all' +import authorFollowed from '../query/core/authors-followed-by' import authorsLoadBy from '../query/core/authors-load-by' import mySubscriptions from '../query/core/my-followed' import reactionsLoadBy from '../query/core/reactions-load-by' diff --git a/src/graphql/query/chat/chat-recipients.ts b/src/graphql/query/chat/chat-recipients.ts deleted file mode 100644 index 733f8bc6..00000000 --- a/src/graphql/query/chat/chat-recipients.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { gql } from '@urql/core' - -export default gql` - query GetChatMembersQuery($limit: Int, $offset: Int) { - load_recipients(limit: $limit, offset: $offset) { - members { - id - name - id - slug - pic - online - } - error - } - } -` diff --git a/src/pages/search.page.tsx b/src/pages/search.page.tsx index a14381c3..82858bd4 100644 --- a/src/pages/search.page.tsx +++ b/src/pages/search.page.tsx @@ -1,6 +1,6 @@ import type { PageProps } from './types' -import { createEffect, createMemo, createSignal, onCleanup, onMount, Show } from 'solid-js' +import { createEffect, createMemo, createSignal, onCleanup, Show } from 'solid-js' import { Loading } from '../components/_shared/Loading' import { PageLayout } from '../components/_shared/PageLayout' @@ -13,7 +13,7 @@ import { loadShoutsSearch, resetSortedArticles } from '../stores/zine/articles' export const SearchPage = (props: PageProps) => { const [isLoaded, setIsLoaded] = createSignal(Boolean(props.searchResults)) const { t } = useLocalize() - const { page, searchParams } = useRouter() + const { page } = useRouter() const q = createMemo(() => page().params['q'] as string) createEffect(async () => { diff --git a/src/stores/ui.ts b/src/stores/ui.ts index 441b0b63..fd6e93be 100644 --- a/src/stores/ui.ts +++ b/src/stores/ui.ts @@ -46,7 +46,7 @@ export const MODALS: Record = { const [modal, setModal] = createSignal(null) -const { searchParams, changeSearchParams } = useRouter< +const { changeSearchParams } = useRouter< AuthModalSearchParams & ConfirmEmailSearchParams & RootSearchParams >()