Feature/en locale fix (#278)

* en locale fix

* lint

---------

Co-authored-by: Igor Lobanov <igor.lobanov@onetwotrip.com>

src/components/Article/Comment.tsx

@@ -3,7 +3,6 @@ import { clsx } from 'clsx'
 import { getPagePath } from '@nanostores/router'
 
 import MD from './MD'
-import { AuthorCard } from '../Author/AuthorCard'
 import { Userpic } from '../Author/Userpic'
 import { CommentRatingControl } from './CommentRatingControl'
 import { CommentDate } from './CommentDate'

src/components/Article/FullArticle.tsx

@@ -11,7 +11,6 @@ import { MediaItem } from '../../pages/types'
 import { DEFAULT_HEADER_OFFSET, router, useRouter } from '../../stores/router'
 import { getDescription } from '../../utils/meta'
 import { imageProxy } from '../../utils/imageProxy'
-import { AuthorCard } from '../Author/AuthorCard'
 import { TableOfContents } from '../TableOfContents'
 import { AudioPlayer } from './AudioPlayer'
 import { SharePopup } from './SharePopup'

src/components/Author/AuthorCard/AuthorCard.module.scss

@@ -11,19 +11,22 @@
   @include media-breakpoint-down(md) {
     justify-content: center;
   }
+
   @include media-breakpoint-up(md) {
     margin-bottom: 2.4rem;
   }
 
   .authorName {
     @include font-size(4rem);
+
     font-weight: 700;
     margin-bottom: 0.2em;
   }
 
   .authorAbout {
-    color: #696969;
     @include font-size(2rem);
+
+    color: #696969;
     font-weight: 500;
     margin-top: 1.5rem;
   }
@@ -119,6 +122,7 @@
 
 .authorName {
   @include font-size(4rem);
+
   line-height: 1.1;
 }
 
@@ -172,9 +176,10 @@
       }
 
       .authorSubscribeSocialLabel {
+        @include font-size(1.6rem);
+
         color: #000;
         display: block;
-        @include font-size(1.6rem);
         left: 100%;
         padding-left: 0.4rem;
         position: absolute;
@@ -429,9 +434,11 @@
     &:nth-child(1) {
       z-index: 2;
     }
+
     &:nth-child(2) {
       z-index: 1;
     }
+
     &:not(:last-child) {
       margin-right: -4px;
       box-shadow: 0 0 0 1px var(--background-color);

src/components/Feed/Sidebar/Sidebar.tsx

@@ -1,8 +1,5 @@
 import { createSignal, For, Show } from 'solid-js'
-import type { Author } from '../../../graphql/types.gen'
-import { useAuthorsStore } from '../../../stores/zine/authors'
 import { Icon } from '../../_shared/Icon'
-import { useTopicsStore } from '../../../stores/zine/topics'
 import { useArticlesStore } from '../../../stores/zine/articles'
 import { useSeenStore } from '../../../stores/zine/seen'
 import { useSession } from '../../../context/session'
@@ -13,18 +10,12 @@ import { Userpic } from '../../Author/Userpic'
 import { getPagePath } from '@nanostores/router'
 import { router, useRouter } from '../../../stores/router'
 
-type FeedSidebarProps = {
+export const Sidebar = () => {
-  authors: Author[]
-}
-
-export const Sidebar = (props: FeedSidebarProps) => {
   const { t } = useLocalize()
   const { seen } = useSeenStore()
   const { subscriptions } = useSession()
   const { page } = useRouter()
-  const { authorEntities } = useAuthorsStore({ authors: props.authors })
   const { articlesByTopic } = useArticlesStore()
-  const { topicEntities } = useTopicsStore()
   const [isSubscriptionsVisible, setSubscriptionsVisible] = createSignal(true)
 
   const checkTopicIsSeen = (topicSlug: string) => {

src/components/NotificationsPanel/NotificationView/NotificationView.tsx

@@ -1,5 +1,5 @@
 import { clsx } from 'clsx'
-import type { Author, Notification } from '../../../graphql/types.gen'
+import type { Notification } from '../../../graphql/types.gen'
 import { createMemo, createSignal, onMount, Show } from 'solid-js'
 import { NotificationType } from '../../../graphql/types.gen'
 import { getPagePath, openPage } from '@nanostores/router'

src/components/Views/AllTopics.tsx

@@ -34,7 +34,7 @@ export const AllTopicsView = (props: AllTopicsViewProps) => {
     sortBy: searchParams().by || 'shouts'
   })
 
-  const { session, subscriptions } = useSession()
+  const { subscriptions } = useSession()
 
   onMount(() => {
     if (!searchParams().by) {

src/components/Views/Author/Author.tsx

@@ -35,7 +35,6 @@ export const AuthorView = (props: Props) => {
   const { authorEntities } = useAuthorsStore({ authors: [props.author] })
 
   const { page: getPage } = useRouter()
-  const { user } = useSession()
   const author = createMemo(() => authorEntities()[props.authorSlug])
   const [isLoadMoreButtonVisible, setIsLoadMoreButtonVisible] = createSignal(false)
   const [isBioExpanded, setIsBioExpanded] = createSignal(false)

src/components/Views/Feed.tsx

@@ -1,10 +1,8 @@
 import { createEffect, createSignal, For, on, onMount, Show } from 'solid-js'
 import { Icon } from '../_shared/Icon'
 import { ArticleCard } from '../Feed/ArticleCard'
-import { AuthorCard } from '../Author/AuthorCard'
 import { Sidebar } from '../Feed/Sidebar'
 import { useArticlesStore, resetSortedArticles } from '../../stores/zine/articles'
-import { useAuthorsStore } from '../../stores/zine/authors'
 import { useTopicsStore } from '../../stores/zine/topics'
 import { useTopAuthorsStore } from '../../stores/zine/topAuthors'
 import { clsx } from 'clsx'
@@ -50,8 +48,6 @@ export const FeedView = (props: Props) => {
 
   // state
   const { sortedArticles } = useArticlesStore()
-
-  const { sortedAuthors } = useAuthorsStore()
   const { topTopics } = useTopicsStore()
   const { topAuthors } = useTopAuthorsStore()
   const [isLoadMoreButtonVisible, setIsLoadMoreButtonVisible] = createSignal(false)
@@ -115,7 +111,7 @@ export const FeedView = (props: Props) => {
     <div class="wide-container feed">
       <div class="row">
         <div class={clsx('col-md-5 col-xl-4', styles.feedNavigation)}>
-          <Sidebar authors={sortedAuthors()} />
+          <Sidebar />
         </div>
 
         <div class="col-md-12 offset-xl-1">

src/components/Views/PublishSettings/PublishSettings.module.scss

@@ -119,7 +119,10 @@
           font-weight: 400;
           line-height: 1.3;
           margin-bottom: 0.8rem;
-          transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+          transition:
+            color 0.2s,
+            background-color 0.2s,
+            box-shadow 0.2s;
         }
 
         .shoutAuthor {
@@ -154,6 +157,7 @@
       padding: 1rem 0;
       gap: 1rem;
     }
+
     .cancel {
       margin-right: auto;
     }

src/components/_shared/GroupAvatar/GroupAvatar.module.scss

@@ -18,6 +18,7 @@
         left: 0;
         top: 0;
       }
+
       &:nth-child(2) {
         right: 0;
         bottom: 0;
@@ -32,10 +33,12 @@
         left: 14px;
         top: 0;
       }
+
       &:nth-child(2) {
         left: 0;
         top: 17px;
       }
+
       &:nth-child(3) {
         right: 0;
         top: 21px;
@@ -53,10 +56,12 @@
         left: 0;
         top: 0;
       }
+
       &:nth-child(2) {
         right: 0;
         top: 0;
       }
+
       &:nth-child(3) {
         left: 0;
         bottom: 0;

src/components/_shared/Subscribe/Subscribe.module.scss

@@ -17,6 +17,7 @@
 
   .input {
     @include font-size(2rem);
+
     background: none;
     color: #fff;
     font-family: inherit;