Merge pull request #23 from zhuowenli/b_fixed_language

🐛 fixed #22, languages search issues.
zhuowenli · Sep 3, 2018 · cd5c759 · cd5c759
2 parents c27f2f1 + 8d7b387
commit cd5c759
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 42 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "githuber",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "main": "index.js",
   "repository": "[email protected]:zhuowenli/githuber.git",
   "author": "卓文理 <[email protected]>",

diff --git a/src/services/languages.js b/src/services/languages.js
@@ -18,7 +18,7 @@ const languages = [
         color: '#5a6986',
     },
     {
-        name: 'Objective-C++',
+        name: 'Objective C++',
         value: 'Objective-C++',
         color: '#6866fb',
     },
@@ -39,7 +39,7 @@ const languages = [
     },
     {
         name: 'Jupyter Notebook',
-        value: 'Jupyter-Notebook',
+        value: 'Jupyter Notebook',
         color: '#DA5B0B',
     },
     {
@@ -69,7 +69,7 @@ const languages = [
     },
     {
         name: 'Web Ontology Language',
-        value: 'Web-Ontology-Language',
+        value: 'Web Ontology Language',
         color: '#9cc9dd',
     },
     {
@@ -143,15 +143,10 @@ const languages = [
         color: '#776791',
     },
     {
-        name: 'Objective-C',
+        name: 'Objective C',
         value: 'Objective-C',
         color: '#438eff',
     },
-    {
-        name: 'ColdFusion CFC',
-        value: 'ColdFusion-CFC',
-        color: '#ed2cd6',
-    },
     {
         name: 'Oz',
         value: 'Oz',
@@ -163,7 +158,7 @@ const languages = [
         color: '#c7a938',
     },
     {
-        name: 'Objective-J',
+        name: 'Objective J',
         value: 'Objective-J',
         color: '#ff0c5a',
     },
@@ -179,7 +174,7 @@ const languages = [
     },
     {
         name: 'Component Pascal',
-        value: 'Component-Pascal',
+        value: 'Component Pascal',
         color: '#b0ce4e',
     },
     {
@@ -209,7 +204,7 @@ const languages = [
     },
     {
         name: 'Visual Basic',
-        value: 'Visual-Basic',
+        value: 'Visual Basic',
         color: '#945db7',
     },
     {
@@ -289,7 +284,7 @@ const languages = [
     },
     {
         name: 'Pure Data',
-        value: 'Pure-Data',
+        value: 'Pure Data',
         color: '#91de79',
     },
     {
@@ -334,7 +329,7 @@ const languages = [
     },
     {
         name: 'API Blueprint',
-        value: 'API-Blueprint',
+        value: 'API Blueprint',
         color: '#2ACCA8',
     },
     {
@@ -459,7 +454,7 @@ const languages = [
     },
     {
         name: 'Propeller Spin',
-        value: 'Propeller-Spin',
+        value: 'Propeller Spin',
         color: '#7fa2a7',
     },
     {
@@ -482,11 +477,6 @@ const languages = [
         value: 'Ada',
         color: '#02f88c',
     },
-    {
-        name: 'Unity3D Asset',
-        value: 'Unity3D-Asset',
-        color: '#ab69a1',
-    },
     {
         name: 'Nu',
         value: 'Nu',
@@ -562,19 +552,14 @@ const languages = [
         value: 'NetLogo',
         color: '#ff6375',
     },
-    {
-        name: 'C Sharp',
-        value: 'C-Sharp',
-        color: '#178600',
-    },
     {
         name: 'C#',
         value: 'C#',
         color: '#178600',
     },
     {
         name: 'Emacs Lisp',
-        value: 'Emacs-Lisp',
+        value: 'Emacs Lisp',
         color: '#c065db',
     },
     {
@@ -649,7 +634,7 @@ const languages = [
     },
     {
         name: 'Unified Parallel C',
-        value: 'Unified-Parallel-C',
+        value: 'Unified Parallel C',
         color: '#4e3617',
     },
     {
@@ -699,7 +684,7 @@ const languages = [
     },
     {
         name: 'Ragel in Ruby Host',
-        value: 'Ragel-in-Ruby-Host',
+        value: 'Ragel in Ruby Host',
         color: '#9d5200',
     },
     {
@@ -809,7 +794,7 @@ const languages = [
     },
     {
         name: 'Common Lisp',
-        value: 'Common-Lisp',
+        value: 'Common Lisp',
         color: '#3fb68b',
     },
     {
@@ -869,24 +854,19 @@ const languages = [
     },
     {
         name: 'Grammatical Framework',
-        value: 'Grammatical-Framework',
+        value: 'Grammatical Framework',
         color: '#79aa7a',
     },
     {
         name: 'Game Maker Language',
-        value: 'Game-Maker-Language',
+        value: 'Game Maker Language',
         color: '#8fb200',
     },
     {
         name: 'Papyrus',
         value: 'Papyrus',
         color: '#6600cc',
     },
-    {
-        name: 'NetLinx+ERB',
-        value: 'NetLinx+ERB',
-        color: '#747faa',
-    },
     {
         name: 'Clean',
         value: 'Clean',
@@ -914,7 +894,7 @@ const languages = [
     },
     {
         name: 'Standard ML',
-        value: 'Standard-ML',
+        value: 'Standard ML',
         color: '#dc566d',
     },
     {
@@ -959,7 +939,7 @@ const languages = [
     },
     {
         name: 'AGS Script',
-        value: 'AGS-Script',
+        value: 'AGS Script',
         color: '#B9D9FF',
     },
     {
@@ -982,7 +962,7 @@ const languages = [
     const nameB = b.name.toUpperCase();
 
     if (nameA < nameB) {
-        return -1;
+        return 1;
     }
     if (nameA > nameB) {
         return 1;

diff --git a/src/vuex/modules/github.js b/src/vuex/modules/github.js
@@ -49,7 +49,7 @@ export const actions = {
         }
 
         // 访问页面
-        data = await get(`https://github.com/trending/${lang}`, { since });
+        data = await get(`https://github.com/trending/${encodeURIComponent(lang)}`, { since });
 
         const $ = cheerio.load(data);
         const repos = [];

diff --git a/static/manifest.json b/static/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "GITHUBER - 开发者的新标签页",
     "description": "这是一个帮助 GitHub 开发者每日发现优质内容的 Chrome 主页拓展。",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "icons": {
         "16": "assets/icon/icon-16.png",
         "48": "assets/icon/icon-48.png",