Merge branch 'doraemon' into dev

Author: mydearxym

components/ThemeSelector/index.js

@@ -22,7 +22,7 @@ import {
   AuthorName,
 } from './style'
 
-import { makeDebugger, themeKeys, themeDescs, uid } from '../../utils'
+import { makeDebugger, themeKeys, themeMeta, uid } from '../../utils'
 /* eslint-disable no-unused-vars */
 const debug = makeDebugger('c:ThemeSelector:index')
 /* eslint-enable no-unused-vars */
@@ -58,7 +58,7 @@ const DetailStyle = ({ curTheme, changeTheme }) => (
             {name}
           </ThemeTitle>
           <ThemeDesc onClick={changeTheme.bind(this, name)}>
-            {themeDescs[name]}
+            {themeMeta[name].desc}
           </ThemeDesc>
           <AuthorInfo>
             <AuthorIcon src={`${ICON_CMD}/author.svg`} />

containers/Doraemon/helper/defaultSuggestion.js

@@ -6,28 +6,16 @@
    login --
  */
 import { ICON_CMD, ICON_BASE } from '../../../config'
+import { themeMeta } from '../../../utils'
 
 const cmds = {
   theme: {
     title: 'theme',
-    desc: 'theme desc..',
+    desc: 'awesome themes for hackers',
     raw: 'theme',
     logo: `${ICON_CMD}/themes.svg`,
 
-    threads: {
-      cyan: {
-        title: 'cyan theme',
-        desc: `cyan desc`,
-        raw: `cyan`,
-        cmd: 'theme',
-      },
-      solarized: {
-        title: 'solarizedDark theme',
-        desc: `solarizedDark desc`,
-        raw: `solarized`,
-        cmd: 'theme',
-      },
-    },
+    threads: { ...themeMeta },
   },
   user: {
     title: 'user',

containers/Doraemon/index.js

@@ -34,14 +34,14 @@ class DoraemonContainer extends React.Component {
     // debug('suggestion.raw: ', suggestions.toJSON())
 
     return (
-      <div>
+      <React.Fragment>
         <PageOverlay visible={visible} onClick={logic.hidePanel} />
         <PanelContainer visible={visible}>
           <InputEditor value={inputValue} searching={false} prefix={prefix} />
           {logic.repoNotFound(doraemon) && <AlertBar>Repo not found</AlertBar>}
           <ResultsList suggestions={suggestions} activeRaw={activeRaw} />
         </PanelContainer>
-      </div>
+      </React.Fragment>
     )
   }
 }

stores/ThemeStore/index.js

@@ -6,19 +6,22 @@
 import { types as t, getParent } from 'mobx-state-tree'
 import R from 'ramda'
 
-import { makeDebugger, markStates, themeDict } from '../../utils'
+import { makeDebugger, markStates, themeDict, defaultTheme } from '../../utils'
 
 /* eslint-disable no-unused-vars */
 const debug = makeDebugger('S:ThemeStore')
 /* eslint-enable no-unused-vars */
 
 export const ThemeDefaults = {
-  curTheme: 'default',
+  curTheme: defaultTheme,
 }
 
 export const ThemeStore = t
   .model('ThemeStore', {
-    curTheme: t.optional(t.enumeration('theme', R.keys(themeDict)), 'default'),
+    curTheme: t.optional(
+      t.enumeration('theme', R.keys(themeDict)),
+      defaultTheme
+    ),
   })
   .views(self => ({
     get root() {

utils/index.js

@@ -89,8 +89,9 @@ export {
  */
 export {
   theme,
+  defaultTheme,
+  themeMeta,
   themeDict,
-  themeDescs,
   themeKeys,
   themeCoverMap,
   themeCoverIndexMap,

utils/themes/Github.js

@@ -18,7 +18,7 @@ const threadTitle = '#7b7878'
 
 const Github = {
   logoText: descText,
-  cover: primaryColor,
+  cover: 'white',
   coverIndex: '#F9FCFC',
   contrastFg: '#eca014',
   htmlBg: bannerBg,

utils/themes/index.js

@@ -22,9 +22,9 @@ import Yellow from './Yellow'
 import Green from './Green'
 import IronGreen from './IronGreen'
 
+export const defaultTheme = 'cyan'
 export const themeDict = {
-  default: { ...Cyan },
-  /* cyan: { ...Cyan }, */
+  cyan: { ...Cyan },
   solarized: { ...SolarizedDark },
   purple: { ...Purple },
   yellow: { ...Yellow },
@@ -36,21 +36,11 @@ export const themeDict = {
 
 export const themeKeys = R.keys(themeDict)
 
-export const themeDescs = {
-  cyan: 'inspired by the rethinkdb.com admin panel',
-  default: 'inspired by the rethinkdb.com admin panel',
-  solarized: 'inspired by Emacs solarized theme',
-  purple: 'inspired ubuntu OS terminal',
-  yellow: 'inspired by vimawesome.com',
-  github: 'inspired by github.com',
-  blue: 'inspired by myself i think ?',
-  green: 'inspired by Olive theme from Vivaldi project',
-  ironGreen: 'inspired by dribbble: shots/2478998-Forum-Concept',
-}
-
 export const themeCoverMap = R.map(R.path(['cover']), themeDict)
 export const themeCoverIndexMap = R.map(R.path(['coverIndex']), themeDict)
 
 // shorthand for style-components
 export const theme = themepath =>
   R.path(['theme', ...R.split('.', themepath)]) || 'wheat'
+
+export { default as themeMeta } from './theme_meta'

utils/themes/theme_meta.js

@@ -0,0 +1,54 @@
+// cmd is for doraemon usage
+
+const themeMeta = {
+  cyan: {
+    title: 'cyan',
+    desc: 'inspired by rethinkdb admin proj',
+    raw: 'cyan',
+    cmd: 'theme',
+  },
+  solarized: {
+    title: 'solarized',
+    desc: 'a theme inspired by famous solarized proj',
+    raw: 'solarized',
+    cmd: 'theme',
+  },
+  purple: {
+    title: 'purple',
+    desc: 'a theme like ubuntu OS terminal',
+    raw: 'purple',
+    cmd: 'theme',
+  },
+  yellow: {
+    title: 'yellow',
+    desc: 'inspired by vimawesome.com',
+    raw: 'yellow',
+    cmd: 'theme',
+  },
+  github: {
+    title: 'github',
+    desc: 'github-like theme',
+    raw: 'github',
+    cmd: 'theme',
+  },
+  blue: {
+    title: 'blue',
+    desc: 'inspired by a dribble collection',
+    raw: 'blue',
+    cmd: 'theme',
+  },
+  green: {
+    title: 'green',
+    desc: "inspired by Vivaldi's Olive theme",
+    raw: 'green',
+    cmd: 'theme',
+  },
+  ironGreen: {
+    title: 'ironGreen',
+    desc: 'inspired by dribbble: shots/2478998-Forum-Concept',
+    raw: 'ironGreen',
+    cmd: 'theme',
+  },
+}
+
+export default themeMeta