From c195bfffceb715342a1b20d5fb299d01c31c864e Mon Sep 17 00:00:00 2001 From: Olha Kurkaeidova Date: Sun, 18 Aug 2019 22:35:42 +0300 Subject: [PATCH] Add bemi to all components --- src/components/Header.jsx | 19 +++++++++----- src/components/NewSnippet.jsx | 19 ++++++++------ src/components/RecentSnippetItem.jsx | 25 ++++++++++-------- src/components/RecentSnippets.jsx | 12 ++++++--- src/components/Sidebar.jsx | 13 ++++++---- src/components/Snippet.jsx | 39 +++++++++++++++------------- src/styles/Header.styl | 12 ++++++--- src/styles/NewSnippet.styl | 18 +++++++------ src/styles/RecentSnippets.styl | 29 +++++++++++---------- src/styles/Sidebar.styl | 9 ++++--- src/styles/Snippet.styl | 27 ++++++++++--------- tests/components/Sidebar.test.jsx | 2 +- 12 files changed, 130 insertions(+), 94 deletions(-) diff --git a/src/components/Header.jsx b/src/components/Header.jsx index eed05be..cc4e761 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -1,21 +1,26 @@ import React from 'react' import { NavLink } from 'react-router-dom' -import '../styles/Header.styl' +import bemi from 'bemi' + import Logo from '../assets/icons/xsnippet.svg' +import '../styles/Header.styl' + +const header = bemi('header') + const Header = () => ( -
-
+
+
XSnippet
-
-
- XSNIPPET +
+
+ XSNIPPET
-
+
Sign in diff --git a/src/components/NewSnippet.jsx b/src/components/NewSnippet.jsx index 5f29b2e..d93e231 100644 --- a/src/components/NewSnippet.jsx +++ b/src/components/NewSnippet.jsx @@ -2,6 +2,7 @@ import React, { useEffect, useRef, useMemo } from 'react' import { connect } from 'react-redux' import AceEditor from 'react-ace' import { WithContext as Tags } from 'react-tag-input' +import bemi from 'bemi' import 'brace/theme/textmate' @@ -24,6 +25,8 @@ import '../styles/NewSnippet.styl' const ListBoxWithSearch = withSearch(ListBox) +const newSnippet = bemi('new-snippet') + const NewSnippet = ({ dispatch, history, syntaxes }) => { const snippetHeader = useRef() const { @@ -54,7 +57,7 @@ const NewSnippet = ({ dispatch, history, syntaxes }) => { const recalcLangHeaderHeight = () => { const height = snippetHeader.current.offsetHeight - document.getElementsByClassName('new-snippet-lang-header')[0] + document.getElementsByClassName(newSnippet.e('lang-header'))[0] .setAttribute('style', `height:${height}px`) } @@ -86,13 +89,13 @@ const NewSnippet = ({ dispatch, history, syntaxes }) => { return (
-
-
+
+
{ delimiters={delimeterKeys} />
-
+
{ value={content} onChange={(value) => handleChange(value, handleContent)} /> -
+
{renderValidationError()}
-
+
handleChange(syntax, handleSyntax)} /> diff --git a/src/components/RecentSnippetItem.jsx b/src/components/RecentSnippetItem.jsx index 3ec5247..4aa4ed6 100644 --- a/src/components/RecentSnippetItem.jsx +++ b/src/components/RecentSnippetItem.jsx @@ -1,11 +1,14 @@ import React from 'react' import { Link } from 'react-router-dom' +import bemi from 'bemi' import { downloadSnippet } from '../misc/download' import { getCurrentModeCaption } from '../misc/modes' import { getSnippetTitle, formatDate } from '../misc/snippet' import { getRawUrl } from '../misc/url' +const rsi = bemi('recent-snippet') + const RecentSnippetItem = ({ snippet }) => { const syntax = getCurrentModeCaption(snippet.get('syntax')) const title = getSnippetTitle(snippet) @@ -14,22 +17,22 @@ const RecentSnippetItem = ({ snippet }) => { const download = () => downloadSnippet(snippet) return ( -
  • -
    +
  • +
    - {title} -
    - {snippet.get('tags').map(item => {item})} + {title} +
    + {snippet.get('tags').map(item => {item})}
    - {formatDate(snippet.get('created_at'))}, by Guest + {formatDate(snippet.get('created_at'))}, by Guest
    -
    - {syntax} +
    + {syntax}
    - Raw - - Show + Raw + + Show
  • diff --git a/src/components/RecentSnippets.jsx b/src/components/RecentSnippets.jsx index 48ef9f6..8871878 100644 --- a/src/components/RecentSnippets.jsx +++ b/src/components/RecentSnippets.jsx @@ -1,5 +1,6 @@ import React, { Fragment, useEffect } from 'react' import { connect } from 'react-redux' +import bemi from 'bemi' import RecentSnippetItem from './RecentSnippetItem' @@ -11,6 +12,9 @@ const scrollTop = () => { window.scroll({ top: 0, behavior: 'smooth' }) } +const rsi = bemi('recent-snippet') +const pag = bemi('pagination') + const RecentSnippets = ({ dispatch, pagination, snippets, recent }) => { const older = pagination.get('next') const newer = pagination.get('prev') @@ -46,7 +50,7 @@ const RecentSnippets = ({ dispatch, pagination, snippets, recent }) => { } const renderRecentSnippets = () => ( -
      +
        {recent.map(id => )}
      ) @@ -54,16 +58,16 @@ const RecentSnippets = ({ dispatch, pagination, snippets, recent }) => { return ( {renderRecentSnippets()} -
      +
      ‹ Newer diff --git a/src/components/Sidebar.jsx b/src/components/Sidebar.jsx index 6e302dc..d269711 100644 --- a/src/components/Sidebar.jsx +++ b/src/components/Sidebar.jsx @@ -1,22 +1,25 @@ import React from 'react' import { NavLink } from 'react-router-dom' +import bemi from 'bemi' import '../styles/Sidebar.styl' +const sidebar = bemi('sidebar') + const Sidebar = () => ( -