From e8a7c22d8771ec21fbf1675f6d09d948e446bda5 Mon Sep 17 00:00:00 2001 From: KJohn Date: Fri, 24 Mar 2017 20:49:47 +0800 Subject: [PATCH 01/17] Create CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 0000000..873c940 --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +internlens.com From 76c9a72e3b144591fdab7805988960427ae79b74 Mon Sep 17 00:00:00 2001 From: KJOHN Date: Thu, 13 Apr 2017 00:25:22 +0800 Subject: [PATCH 02/17] replace smaller cover photo --- package.json | 2 +- src/js/components/pages/dashboard/Base.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 452b1f3..1dd40f6 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "html-webpack-plugin": "^2.24.0", "http-proxy-middleware": "^0.17.2", "node-sass": "^3.10.1", - "react-redux": "^5.0.2", + "react-redux": "^5.0.4", "react-transform-catch-errors": "^1.0.2", "redbox-react": "^1.3.2", "redux": "^3.6.0", diff --git a/src/js/components/pages/dashboard/Base.jsx b/src/js/components/pages/dashboard/Base.jsx index 4b2fe9b..5698df8 100644 --- a/src/js/components/pages/dashboard/Base.jsx +++ b/src/js/components/pages/dashboard/Base.jsx @@ -160,7 +160,7 @@ export default CSSModules(class extends Component { top: '0', left: '0', opacity: '0.35', - backgroundImage: 'url("http://i.imgur.com/8wSPTs8.png")', + backgroundImage: 'url("http://imgur.com/LnL7Cgr")', backgroundSize: 'cover', backgroundPosition: 'center' }}> From b049d6735cc0582a831139e80d169fc17d3bb0a6 Mon Sep 17 00:00:00 2001 From: Jim Date: Thu, 13 Apr 2017 08:20:18 +0800 Subject: [PATCH 03/17] add bg --- package.json | 1 + src/js/components/pages/dashboard/Base.jsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 452b1f3..557b0b7 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "react-loading": "0.0.9", "react-rater": "^0.3.5", "react-redux": "^5.0.3", + "react-redux-firebase": "^1.4.0-rc.1", "react-router": "^3.0.0", "react-router-bootstrap": "^0.23.1", "react-router-redux": "^4.0.6", diff --git a/src/js/components/pages/dashboard/Base.jsx b/src/js/components/pages/dashboard/Base.jsx index 4b2fe9b..595aab1 100644 --- a/src/js/components/pages/dashboard/Base.jsx +++ b/src/js/components/pages/dashboard/Base.jsx @@ -160,7 +160,7 @@ export default CSSModules(class extends Component { top: '0', left: '0', opacity: '0.35', - backgroundImage: 'url("http://i.imgur.com/8wSPTs8.png")', + backgroundImage: 'url("http://i.imgur.com/LnL7Cgr.png")', backgroundSize: 'cover', backgroundPosition: 'center' }}> From 0a4ad08dc9f5a2e0f88b6715f3e3378c1ddce71f Mon Sep 17 00:00:00 2001 From: KJOHN Date: Tue, 18 Apr 2017 23:56:12 +0800 Subject: [PATCH 04/17] go global --- src/js/components/pages/dashboard/Base.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/components/pages/dashboard/Base.jsx b/src/js/components/pages/dashboard/Base.jsx index 0031165..ab3822f 100644 --- a/src/js/components/pages/dashboard/Base.jsx +++ b/src/js/components/pages/dashboard/Base.jsx @@ -198,7 +198,7 @@ export default CSSModules(class extends Component { marginBottom: '10px', zIndex: '1' }}> - 全台灣最透明的實習經驗分享平台。 + 最透明的實習經驗分享平台。
From a1ee4e779c472fc616f880db1326bc09b0d17a5d Mon Sep 17 00:00:00 2001 From: KJOHN Date: Tue, 25 Apr 2017 20:03:02 +0800 Subject: [PATCH 05/17] update read me --- README.md | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/README.md b/README.md index 2dc0b03..eb126f7 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,43 @@ Inspired by https://github.com/allenwhale/react-redux-boilerplate --- - npm install - npm run build + +### Contribution +--- + - for latest release please checkout master branch + - for contributing developpemnt please checkout dev branch + + ## Note + --- + - Our work flow is based on git flow but less complicated, more like git flow + github flow. + - That is to say, even the PRs are accepted, they won't be released immediately. Your changes will be merged into dev not master, waiting for the next version upgrade to be released. + - Good to know: + - git flow + https://datasift.github.io/gitflow/IntroducingGitFlow.html + - github flow + https://guides.github.com/introduction/flow/ + +### Issue tracking +--- + - Strongly suggested using zenhub + https://www.zenhub.com/ + - Feel free to open new issue or take on existing issues in the backlog. + - New issues will be sorted into backlog or ice box(to be done later). + - Beginners may want to solve the issues with "newbies" tags, which is easier and will help you understand the framework. + +### Newbie guidelines +--- + - Install zenhub + - Go to "Board" and pick a newbies issue + - Fork repo + - Pull from dev branch + - Make your changes(solve the issue) + - Send pull request + +Feel free to contact us via all sorts of methods. + - fb group: https://www.facebook.com/groups/internlens + - email: internlens.tw@gmail.com + - website: https://internlens.com/ + + + From 7c0d4015177615ded38a207087dcca8f096042f9 Mon Sep 17 00:00:00 2001 From: KJohn Date: Tue, 25 Apr 2017 20:07:32 +0800 Subject: [PATCH 06/17] Update README.md modify readme --- README.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index eb126f7..d25194b 100644 --- a/README.md +++ b/README.md @@ -24,16 +24,6 @@ Inspired by https://github.com/allenwhale/react-redux-boilerplate - for latest release please checkout master branch - for contributing developpemnt please checkout dev branch - ## Note - --- - - Our work flow is based on git flow but less complicated, more like git flow + github flow. - - That is to say, even the PRs are accepted, they won't be released immediately. Your changes will be merged into dev not master, waiting for the next version upgrade to be released. - - Good to know: - - git flow - https://datasift.github.io/gitflow/IntroducingGitFlow.html - - github flow - https://guides.github.com/introduction/flow/ - ### Issue tracking --- - Strongly suggested using zenhub @@ -50,8 +40,19 @@ Inspired by https://github.com/allenwhale/react-redux-boilerplate - Pull from dev branch - Make your changes(solve the issue) - Send pull request + +### Note + --- + - Our work flow is based on git flow but less complicated, more like git flow + github flow. + - That is to say, even the PRs are accepted, they won't be released immediately. Your changes will be merged into dev not master, waiting for the next version upgrade to be released. + - Good to know: + - git flow + https://datasift.github.io/gitflow/IntroducingGitFlow.html + - github flow + https://guides.github.com/introduction/flow/ -Feel free to contact us via all sorts of methods. +### Contact + --- - fb group: https://www.facebook.com/groups/internlens - email: internlens.tw@gmail.com - website: https://internlens.com/ From f93ab03cf665e5506ce4e8499a82b270afb1be79 Mon Sep 17 00:00:00 2001 From: Jim Date: Thu, 27 Apr 2017 01:31:28 +0800 Subject: [PATCH 07/17] fix(loading): Gromment package's issue --- src/js/components/App.jsx | 18 +++++++++++++----- src/js/components/pages/dashboard/Base.jsx | 1 + src/js/components/pages/dashboard/Base.styl | 1 + .../components/pages/dashboard/InternBox.styl | 3 +++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/js/components/App.jsx b/src/js/components/App.jsx index 45945f3..1afefa7 100644 --- a/src/js/components/App.jsx +++ b/src/js/components/App.jsx @@ -14,7 +14,8 @@ export default CSSModules(class extends Component { {this.props.children} - + Date: Thu, 27 Apr 2017 19:57:19 +0800 Subject: [PATCH 08/17] add(filter): show catagory text when choose a catagory --- src/js/components/pages/dashboard/Base.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/components/pages/dashboard/Base.jsx b/src/js/components/pages/dashboard/Base.jsx index 3ed85c1..75ba0fa 100644 --- a/src/js/components/pages/dashboard/Base.jsx +++ b/src/js/components/pages/dashboard/Base.jsx @@ -320,7 +320,7 @@ export default CSSModules(class extends Component {
-
目前有 {_.size(this.state.copyInternList)} 筆搜尋
+
{this.state.targetCatagory ? {this.state.targetCatagory}類別 : null }有 {_.size(this.state.copyInternList)} 筆搜尋
Date: Thu, 27 Apr 2017 20:00:39 +0800 Subject: [PATCH 09/17] add(serach not found): text size when showing not found --- src/js/components/pages/dashboard/Base.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/components/pages/dashboard/Base.jsx b/src/js/components/pages/dashboard/Base.jsx index 75ba0fa..c9a2d47 100644 --- a/src/js/components/pages/dashboard/Base.jsx +++ b/src/js/components/pages/dashboard/Base.jsx @@ -84,6 +84,7 @@ export default CSSModules(class extends Component { this.setState({currentIndex: 0}) this.setState({isListEnd: false}) this.setState({SearchVisible: false}) + this.setState({targetCatagory: ''}) let rowData = _.reverse(_.values(this.props.Intern.list)) console.log('row', this.state.filterInput) let filterData = {} @@ -357,7 +358,8 @@ export default CSSModules(class extends Component { display: 'flex', alignItems: 'center', justifyContent: 'center', - margin: '10vh 0' + margin: '10vh 0', + fontSize: '1.5em' }}>搜尋無相關結果，試著換換關鍵字吧 : _.map(this.state.renderInternList, (intern, id) => intern === undefined From 68876caebb49a0312afe71b220f2863bc1fe30b1 Mon Sep 17 00:00:00 2001 From: Charlie Date: Sat, 6 May 2017 22:04:22 +0800 Subject: [PATCH 10/17] [Feature] Redesign Filters Redesign keyword search and category filter with PC and mobile component issue No #51 --- src/js/components/pages/dashboard/Base.jsx | 128 ++++++++++++++++++-- src/js/components/pages/dashboard/Base.styl | 15 ++- 2 files changed, 128 insertions(+), 15 deletions(-) diff --git a/src/js/components/pages/dashboard/Base.jsx b/src/js/components/pages/dashboard/Base.jsx index c9a2d47..4b3794d 100644 --- a/src/js/components/pages/dashboard/Base.jsx +++ b/src/js/components/pages/dashboard/Base.jsx @@ -33,6 +33,7 @@ export default CSSModules(class extends Component { this.showSearchModal = this.showSearchModal.bind(this) this.handleOk = this.handleOk.bind(this) this.handleCancel = this.handleCancel.bind(this) + this.toggleFilter = this.toggleFilter.bind(this) this.state = { copyInternList: {}, renderInternList: {}, @@ -45,7 +46,9 @@ export default CSSModules(class extends Component { isListEnd: false, catagoryVisible: false, SearchVisible: false, - targetCatagory: '' + targetCatagory: '', + filterBtnSelect: 'keyWordSearch', // should be : 'keyWordSearch' or 'catagory' + ifMobile: false } } showCatagoryModal () { @@ -70,6 +73,31 @@ export default CSSModules(class extends Component { SearchVisible: false }) } + toggleFilter (action) { + if (this.state.ifMobile) { + switch (action) { + case 'keyWordSearch': + console.log('!!!') + this.setState({ + filterBtnSelect: '', + SearchVisible: true + }) + break + case 'catagory': + this.setState({ + filterBtnSelect: '', + catagoryVisible: true + }) + break + } + } else { + this.setState({ + filterBtnSelect: action, + SearchVisible: false, + catagoryVisible: false + }) + } + } changeFilterInput (event) { console.log(event.target) this.setState({filterInput: event.target.value}) @@ -85,6 +113,7 @@ export default CSSModules(class extends Component { this.setState({isListEnd: false}) this.setState({SearchVisible: false}) this.setState({targetCatagory: ''}) + this.setState({filterBtnSelect: 'keyWordSearch'}) let rowData = _.reverse(_.values(this.props.Intern.list)) console.log('row', this.state.filterInput) let filterData = {} @@ -181,6 +210,13 @@ export default CSSModules(class extends Component { .then(() => { return this.props.getInternList(0, 500) }) + .then(() => { + if (window.innerWidth) { + if (window.innerWidth <= 768) { + this.setState({ifMobile: true}) + } + } + }) .then(() => { return this.props.getAllFavorite() }) @@ -215,6 +251,62 @@ export default CSSModules(class extends Component { }) } render () { + var filterTab = '' + var keyWordClass = 'searchBtn ' + var catagoryClass = 'searchBtn ' + + switch (this.state.filterBtnSelect) { + case 'keyWordSearch': + if (!this.state.ifMobile) { + keyWordClass += 'searchBtn-select' + } + filterTab = ( +
+
+
+ +
搜尋 +
+
+
) + break + case 'catagory': + if (!this.state.ifMobile) { + catagoryClass += 'searchBtn-select' + } + filterTab = ( +
+
+
+
    + { + catagoryList.map((el, id) => +
  • { this.startCatagoryFilter(el) }}> + {el} +
    • + ) + } +
+
+
) + break + } return (
- @@ -262,7 +353,11 @@ export default CSSModules(class extends Component { + footer={ +
搜尋 +
+ }>
-
搜尋 -
-
關鍵字搜尋 +
關鍵字搜尋
-
類別搜尋 +
類別搜尋
+ + {filterTab} + Date: Sat, 6 May 2017 23:41:17 +0800 Subject: [PATCH 11/17] minor ui change: adjust cover photo opacity, title style, submitNewPost btn hover effect. --- src/js/components/pages/dashboard/Base.jsx | 8 +++++-- src/js/components/pages/dashboard/Base.styl | 23 ++++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/js/components/pages/dashboard/Base.jsx b/src/js/components/pages/dashboard/Base.jsx index c9a2d47..4386bc4 100644 --- a/src/js/components/pages/dashboard/Base.jsx +++ b/src/js/components/pages/dashboard/Base.jsx @@ -288,7 +288,7 @@ export default CSSModules(class extends Component { height: '100%', top: '0', left: '0', - opacity: '0.35', + opacity: '0.2', backgroundImage: 'url("http://i.imgur.com/LnL7Cgr.png")', backgroundSize: 'cover', backgroundPosition: 'center' @@ -308,10 +308,14 @@ export default CSSModules(class extends Component { tag='h4' margin='none' style={{ + fontSize: '24px', + fontWeight: 'initial', + letterSpacing: '0.2em', + lineHeight: 'normal', marginBottom: '10px', zIndex: '1' }}> - 最透明的實習經驗分享平台。 + 最透明的實習經驗分享平台
diff --git a/src/js/components/pages/dashboard/Base.styl b/src/js/components/pages/dashboard/Base.styl index 27a3247..6c89e25 100644 --- a/src/js/components/pages/dashboard/Base.styl +++ b/src/js/components/pages/dashboard/Base.styl @@ -12,14 +12,21 @@ $brand_blue = darken(#58A0FC, 5%) z-index: 99 padding: 0px cursor: pointer - button - color: #EEE !important - width: 250px - margin: 0 !important - padding: 10px !important - border-radius: 5px !important - border-color: $brand_blue !important - background: $brand_blue !important + color: #FFF + .submitNewPost:hover + text-decoration: none !important + button + color: #EEE !important + width: 250px + margin: 0 !important + padding: 10px !important + border-radius: 5px !important + border-color: $brand_blue !important + background: $brand_blue !important + button:hover + border-color: #00BFFF !important + background: #00BFFF !important + text-decoration: none !important .searchBtn min-width: 80px From 3f8ec04dd527305f2460b68591e91538c09bf57d Mon Sep 17 00:00:00 2001 From: KJOHN Date: Sun, 7 May 2017 00:19:36 +0800 Subject: [PATCH 12/17] update Readme, explaining config issue. --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d25194b..d431658 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,11 @@ Inspired by https://github.com/allenwhale/react-redux-boilerplate ### Contribution --- - - for latest release please checkout master branch - - for contributing developpemnt please checkout dev branch + - For latest release please checkout master branch + - For contributing developpemnt please checkout dev branch + +# Important + - After cloning or forking the repo, go to ```src/js/utils``` and change the ```confing.js.sample``` file into ```config.js``` to prevent critical building error. ### Issue tracking --- @@ -38,6 +41,7 @@ Inspired by https://github.com/allenwhale/react-redux-boilerplate - Go to "Board" and pick a newbies issue - Fork repo - Pull from dev branch + - Fix the config problem mentioned above - Make your changes(solve the issue) - Send pull request @@ -55,7 +59,4 @@ Inspired by https://github.com/allenwhale/react-redux-boilerplate --- - fb group: https://www.facebook.com/groups/internlens - email: internlens.tw@gmail.com - - website: https://internlens.com/ - - - + - website: https://internlens.com/ \ No newline at end of file From 2453b14cdff16b91a9baec52e79479d9a7fdc836 Mon Sep 17 00:00:00 2001 From: KJOHN Date: Sun, 7 May 2017 00:19:36 +0800 Subject: [PATCH 13/17] update Readme, explaining config issue. --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d25194b..d431658 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,11 @@ Inspired by https://github.com/allenwhale/react-redux-boilerplate ### Contribution --- - - for latest release please checkout master branch - - for contributing developpemnt please checkout dev branch + - For latest release please checkout master branch + - For contributing developpemnt please checkout dev branch + +# Important + - After cloning or forking the repo, go to ```src/js/utils``` and change the ```confing.js.sample``` file into ```config.js``` to prevent critical building error. ### Issue tracking --- @@ -38,6 +41,7 @@ Inspired by https://github.com/allenwhale/react-redux-boilerplate - Go to "Board" and pick a newbies issue - Fork repo - Pull from dev branch + - Fix the config problem mentioned above - Make your changes(solve the issue) - Send pull request @@ -55,7 +59,4 @@ Inspired by https://github.com/allenwhale/react-redux-boilerplate --- - fb group: https://www.facebook.com/groups/internlens - email: internlens.tw@gmail.com - - website: https://internlens.com/ - - - + - website: https://internlens.com/ \ No newline at end of file From 3136fc8a986850429db8c616c3cc20d77c2630c1 Mon Sep 17 00:00:00 2001 From: Pojen Chen Date: Mon, 8 May 2017 22:19:12 +0900 Subject: [PATCH 14/17] Add typekit cdn --- src/index.ejs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/index.ejs b/src/index.ejs index 22ae1e3..a886350 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -30,6 +30,8 @@ + + From f84cd43b5eafeaba6c7463cfeb9830eb0bbe7072 Mon Sep 17 00:00:00 2001 From: Pojen Chen Date: Tue, 9 May 2017 23:25:55 +0900 Subject: [PATCH 15/17] Override font-family as source-han-sans-tc --- src/scss/index.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/scss/index.scss b/src/scss/index.scss index a7f1c0d..f3ee481 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -1 +1,5 @@ @import '~grommet/scss/hpinc/index'; + +.grommet, .brand-font { + font-family: "source-han-sans-traditional", Arial, sans-serif; +} \ No newline at end of file From 0532ee22e052400e6d0ed44611f52d40754370d8 Mon Sep 17 00:00:00 2001 From: Pojen Chen Date: Tue, 9 May 2017 23:26:38 +0900 Subject: [PATCH 16/17] Override font-family of heading as source-han-serif-tc --- src/scss/index.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/scss/index.scss b/src/scss/index.scss index f3ee481..7a769a2 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -2,4 +2,8 @@ .grommet, .brand-font { font-family: "source-han-sans-traditional", Arial, sans-serif; +} + +.grommetux-heading--strong { + font-family: "source-han-serif-tc",serif; } \ No newline at end of file From 913546d8d5a42440833a628970d479697b38a70e Mon Sep 17 00:00:00 2001 From: Pojen Chen Date: Tue, 9 May 2017 23:39:58 +0900 Subject: [PATCH 17/17] Adjust font weight, size, and line-height to fit chinese character --- src/scss/index.scss | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/scss/index.scss b/src/scss/index.scss index 7a769a2..b0136ee 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -6,4 +6,27 @@ .grommetux-heading--strong { font-family: "source-han-serif-tc",serif; -} \ No newline at end of file +} + +h1.grommetux-heading{ + font-weight: 800; +} + +h2.grommetux-heading{ + font-weight: 600; +} + + +h3.grommetux-heading--strong { + font-size: 26px; + font-weight: 700; +} + +h4.grommetux-heading{ + line-height: 1.7em; +} + +h4.grommetux-heading--strong { + font-size: 22px; + font-weight: 700; +}