WHAT: Refactor

WHY: * XXXXX HOW: * NOTHING TO SAY
ecmadao · Jul 24, 2018 · 24881f0 · 24881f0
1 parent 6847d89
commit 24881f0
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# [Hacknical](https://hacknical.com?locale=en)
+# [Hacknical](https://hacknical.com)
 
 **hacknical, hacker & technical**
 

diff --git a/app/middlewares/locale.js b/app/middlewares/locale.js
@@ -3,20 +3,15 @@ import logger from '../utils/logger';
 const validateQueryLocale = (locale) => {
   const language = locale;
   if (!language) return null;
-  if (/^en/.test(language)) {
-    return 'en';
-  }
-  if (/^fr/.test(language)) {
-    return 'fr';
-  }
-  if (/^zh/.test(language)) {
-    return 'zh';
-  }
+  if (/^en/.test(language)) return 'en';
+  // if (/^fr/.test(language)) return 'fr';
+  if (/^zh/.test(language)) return 'zh';
   return null;
 };
+
 const formatLocale = locale => locale.split(/-|_/)[0];
 
-const checkLocale = () => async (ctx, next) => {
+const localeMiddleware = () => async (ctx, next) => {
   const queryLocale = validateQueryLocale(ctx.query.locale);
   if (queryLocale) {
     ctx.session.locale = queryLocale;
@@ -34,4 +29,4 @@ const checkLocale = () => async (ctx, next) => {
   logger.info(`[LOCALE][${ctx.state.locale}]`);
 };
 
-export default checkLocale;
+export default localeMiddleware;
diff --git a/config/localdev.json b/config/localdev.json
@@ -5,6 +5,9 @@
   "database": {
     "redis": "redis://localhost:6379/3"
   },
+  "qiniu": {
+    "BucketName": "hacknical"
+  },
   "services": {
     "github": {
       "url": "http://127.0.0.1:5002",

diff --git a/frontend/components/GitHub/CodeCourse/index.jsx b/frontend/components/GitHub/CodeCourse/index.jsx
@@ -21,16 +21,15 @@ const getDateBySeconds = seconds =>
   dateHelper.validator.fullDateBySeconds(seconds).split('T')[0];
 const formatCommitsTimeline = githubHelper.formatCommitsTimeline();
 
+const yearAgo = dateHelper.date.beforeYears(1);
+const maxDateSeconds = getSecondsByDate(getValidateDate());
+const minDateSeconds = getSecondsByDate(dateHelper.date.beforeMonths(1, yearAgo));
+
 class CodeCourse extends React.Component {
   constructor(props) {
     super(props);
-    const yearAgo = dateHelper.date.beforeYears(1);
-    const dayOfWeek = dateHelper.date.dayOfWeek(yearAgo);
     this.state = {
       showedCount: 10,
-      yearAgoSeconds: getSecondsByDate(yearAgo) - dayOfWeek * SECONDS_PER_DAY,
-      maxDateSeconds: getSecondsByDate(getValidateDate()),
-      minDateSeconds: getSecondsByDate(dateHelper.date.beforeMonths(1, yearAgo)),
     };
   }
 
@@ -74,7 +73,6 @@ class CodeCourse extends React.Component {
   }
 
   formatRepositories() {
-    const { minDateSeconds } = this.state;
     const { commitDatas } = this.props;
     const repositoriesDict = this.repositoriesDict;
     const showedCount = Math.min(this.state.showedCount, commitDatas.length);
@@ -87,7 +85,6 @@ class CodeCourse extends React.Component {
   }
 
   renderChosedRepos() {
-    const { maxDateSeconds, minDateSeconds } = this.state;
     const formatRepositories = this.formatRepositories();
 
     return (
@@ -111,10 +108,6 @@ class CodeCourse extends React.Component {
   }
 
   renderTimeLines(repos) {
-    const {
-      maxDateSeconds,
-      minDateSeconds,
-    } = this.state;
     const totalSeconds = maxDateSeconds - minDateSeconds;
 
     return repos.map((repository, index) => {
@@ -150,9 +143,6 @@ class CodeCourse extends React.Component {
       totalSeconds,
     } = options;
     const timelineDOMs = [<div key={'placeholder'} />];
-    const {
-      minDateSeconds,
-    } = this.state;
     let preToSecond = minDateSeconds;
     let preCommit = null;
 

diff --git a/frontend/components/Github/CodeCourse/index.jsx b/frontend/components/Github/CodeCourse/index.jsx
@@ -21,16 +21,15 @@ const getDateBySeconds = seconds =>
   dateHelper.validator.fullDateBySeconds(seconds).split('T')[0];
 const formatCommitsTimeline = githubHelper.formatCommitsTimeline();
 
+const yearAgo = dateHelper.date.beforeYears(1);
+const maxDateSeconds = getSecondsByDate(getValidateDate());
+const minDateSeconds = getSecondsByDate(dateHelper.date.beforeMonths(1, yearAgo));
+
 class CodeCourse extends React.Component {
   constructor(props) {
     super(props);
-    const yearAgo = dateHelper.date.beforeYears(1);
-    const dayOfWeek = dateHelper.date.dayOfWeek(yearAgo);
     this.state = {
       showedCount: 10,
-      yearAgoSeconds: getSecondsByDate(yearAgo) - dayOfWeek * SECONDS_PER_DAY,
-      maxDateSeconds: getSecondsByDate(getValidateDate()),
-      minDateSeconds: getSecondsByDate(dateHelper.date.beforeMonths(1, yearAgo)),
     };
   }
 
@@ -74,7 +73,6 @@ class CodeCourse extends React.Component {
   }
 
   formatRepositories() {
-    const { minDateSeconds } = this.state;
     const { commitDatas } = this.props;
     const repositoriesDict = this.repositoriesDict;
     const showedCount = Math.min(this.state.showedCount, commitDatas.length);
@@ -87,7 +85,6 @@ class CodeCourse extends React.Component {
   }
 
   renderChosedRepos() {
-    const { maxDateSeconds, minDateSeconds } = this.state;
     const formatRepositories = this.formatRepositories();
 
     return (
@@ -111,10 +108,6 @@ class CodeCourse extends React.Component {
   }
 
   renderTimeLines(repos) {
-    const {
-      maxDateSeconds,
-      minDateSeconds,
-    } = this.state;
     const totalSeconds = maxDateSeconds - minDateSeconds;
 
     return repos.map((repository, index) => {
@@ -150,9 +143,6 @@ class CodeCourse extends React.Component {
       totalSeconds,
     } = options;
     const timelineDOMs = [<div key={'placeholder'} />];
-    const {
-      minDateSeconds,
-    } = this.state;
     let preToSecond = minDateSeconds;
     let preCommit = null;
 

diff --git a/package.json b/package.json
@@ -149,7 +149,6 @@
     "cache-manager": "^2.9.0",
     "co-redis": "^2.1.1",
     "config": "^1.21.0",
-    "eventemitter3": "^3.0.1",
     "font-awesome": "^4.7.0",
     "fs-extra": "^2.0.0",
     "hiredis": "^0.5.0",
@@ -172,8 +171,7 @@
     "phantom": "^4.0.1",
     "redis": "^2.6.3",
     "request": "^2.75.0",
-    "rsmq": "^0.8.2",
-    "shortid": "^2.2.8"
+    "rsmq": "^0.8.2"
   },
   "repository": {
     "url": "git@github.com:ecmadao/hacknical.git",

diff --git a/scripts/deploy/cdn/index.js b/scripts/deploy/cdn/index.js
@@ -8,8 +8,8 @@ const BucketName = config.get('qiniu.BucketName');
 const AccessKey = config.get('qiniu.AccessKey');
 const SecretKey = config.get('qiniu.SecretKey');
 
-qiniu.conf.ACCESS_KEY = AccessKey;
-qiniu.conf.SECRET_KEY = SecretKey;
+qiniu.conf.ACCESS_KEY = AccessKey || process.env.QINIU_ACCESS_KEY;
+qiniu.conf.SECRET_KEY = SecretKey || process.env.QINIU_SECRET_KEY;
 
 const getFiles = () => {
   const files = klawSync(PATH.PUBLIC_PATH, { nodir: true })