mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-10 18:02:51 +00:00
Code Issues Releases Wiki Activity

changes

Browse Source
This commit is contained in:
mgerb42
2016-08-30 02:45:56 +00:00
parent 7c350be5b7
commit 97598ba7e8
8 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/assets/scss/Content.scss
View File

@@ -1,6 +1,7 @@
.Content {
flex: 1;
flex-wrap: wrap;
min-width: 0;
.post + .post {
margin-top: 2em;
}

4
client/js/components/Preview.js
View File

@@ -22,6 +22,8 @@ export default class Preview extends React.Component{
</p>
</div>
);
if(i >= this.props.postLimit) break;
}
return elements;
@@ -32,7 +34,7 @@ export default class Preview extends React.Component{
return (
<div class="Content">
{posts.length > 0 ? this.insertPosts(posts): ""}
{posts.length > 0 ? this.insertPosts(posts): null}
</div>
);
}

2
client/js/pages/Index.js
View File

@@ -43,7 +43,7 @@ export default class Index extends React.Component {
<div>
<Header />
<div class="Main">
{typeof this.page === 'undefined' && !fetching ? <Preview posts={this.props.redux.preview.posts} /> : null}
{typeof this.page === 'undefined' && !fetching ? <Preview posts={this.props.redux.preview.posts} postLimit={this.props.redux.postLimit}/> : null}
{this.page === 'post' && !fetching ? <Post content={this.props.redux.post}/> : null}
{fetching ? loadingElement : null}
<Sidebar />

6
client/js/redux/actions.js
View File

@@ -2,6 +2,12 @@ import * as types from "./constants";
import marked from 'marked';
import 'whatwg-fetch';
export function increasePostLimit(){
return {
type: types.INCREASE_POST_LIMIT
}
}
function initPreview(posts) {
return {
type: types.INIT_PREVIEW,

1
client/js/redux/constants.js
View File

@@ -3,3 +3,4 @@ export const INIT_PREVIEW = 'INIT_PREVIEW';
export const FILTER_PREVIEW = 'FILTER_PREVIEW';
export const LOAD_POST = 'LOAD_POST';
export const FETCHING = 'FETCHING';
export const INCREASE_POST_LIMIT = 'INCREASE_POST_LIMIT';

14
client/js/redux/reducers.js
View File

@@ -14,12 +14,10 @@ const defaultState = {
preview: {
posts: []
},
filteredPreview: {
posts: []
},
post: "",
fetched: false,
fetching: false
fetching: false,
postLimit: 10
};
//default reducer
@@ -32,10 +30,6 @@ function reducer(state = defaultState, action) {
fetched: true,
fetching: false
});
case types.FILTER_PREVIEW:
return Object.assign({}, state, {
filteredPreview: Object.assign({}, state.filteredPreview, action.posts)
});
case types.LOAD_POST:
return Object.assign({}, state, {
post: action.post,
@@ -47,6 +41,10 @@ function reducer(state = defaultState, action) {
fetched : false,
fetching: true
});
case types.INCREASE_POST_LIMIT:
return Object.assign({}, state, {
postLimit : state.postLimit + 10
});
}
//return present state if no actions get called

5
package.json
View File

@@ -7,8 +7,9 @@
"build": "webpack && babel-node metadata.js",
"c9": "webpack-dev-server --port $PORT --host $IP --hot --content-base dist --history-api-fallback",
"dev": "webpack-dev-server --content-base public --inline --hot --history-api-fallback",
"prod": "export NODE_ENV=production && webpack -p && babel-node metadata.js",
"prod-win": "set NODE_ENV=production && webpack -p && babel-node metadata.js"
"prod": "export NODE_ENV=production && webpack -p && babel-node metadata.js && go build",
"prod-win": "set NODE_ENV=production && webpack -p && babel-node metadata.js && go build",
"deploy" : "npm run prod && ./mywebsite"
},
"repository": {
"type": "git",

6
server.go
View File

@@ -4,6 +4,7 @@ import (
"log"
"net/http"
"strconv"
"github.com/NYTimes/gziphandler"
//local import paths relative to app.yaml file
"mywebsite/server/controller/api"
@@ -35,6 +36,9 @@ func main(){
db.Mongo.Connect()
//register middleware
handle := gziphandler.GzipHandler(route.Routes())
log.Println("Starting Server...")
log.Println(http.ListenAndServe(":"+strconv.Itoa(configurations.Port), route.Routes()))
log.Println(http.ListenAndServe(":"+strconv.Itoa(configurations.Port), handle))
}