-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36 from combine/release/5.0.0
Release/5.0.0
- Loading branch information
Showing
50 changed files
with
11,949 additions
and
6,810 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,12 @@ | ||
npm-error.log | ||
.env | ||
node_modules | ||
npm-debug.log* | ||
.DS_Store | ||
|
||
# ignore built static files | ||
dist/ | ||
webpack-assets.json | ||
/dist | ||
/webpack-assets.json | ||
|
||
# webpack-built server files | ||
server/renderer/*.built.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// Import fonts here, from google, or whereever. | ||
@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600'); |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
html, body { | ||
height: 100%; | ||
font-family: 'Open Sans', sans-serif; | ||
|
||
p { | ||
font-size: 16px; | ||
line-height: 24px; | ||
} | ||
} | ||
|
||
body { | ||
background-color: $white; | ||
} | ||
|
||
#app { | ||
height: 100%; | ||
width: 100%; | ||
margin: 0 auto; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// Import bootstrap-sass as needed | ||
$bootstrap-sass-asset-helper: true; | ||
@import "~bootstrap-sass/assets/stylesheets/bootstrap/variables"; | ||
|
||
$screen-lg-min: $app-max-width !global; | ||
$container-lg: $app-max-width !global; | ||
|
||
@import "~bootstrap-sass/assets/stylesheets/bootstrap/mixins"; | ||
@import "~bootstrap-sass/assets/stylesheets/bootstrap/grid"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// Vendors and resource files (.e.g. variables, mixins, etc) | ||
@import '../resources/variables'; | ||
@import 'vendors'; | ||
@import '../resources/mixins'; | ||
|
||
// The following are non-vendor, non-resource files. | ||
@import 'fonts'; | ||
@import 'overrides'; | ||
@import 'styles'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
$white: #fff; | ||
$dark-gray: #333; |
Empty file.
Empty file.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import React from 'react'; | ||
import { Route } from 'react-router'; | ||
|
||
const RouteWithSubRoutes = props => { | ||
const { | ||
path, | ||
computedMatch, | ||
component: Component, | ||
routes, | ||
restProps | ||
} = props; | ||
|
||
return ( | ||
<Route | ||
path={path} | ||
render={props => { | ||
// pass the sub-routes down to keep nesting | ||
return ( | ||
<Component | ||
{...props} | ||
{...restProps} | ||
match={computedMatch} | ||
routes={routes} | ||
/> | ||
); | ||
}} | ||
/> | ||
); | ||
}; | ||
|
||
export default RouteWithSubRoutes; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
export { default as ErrorPage } from './ErrorPage'; | ||
export { default as Footer } from './Footer'; | ||
export { default as Header } from './Header'; | ||
export { default as RouteWithSubRoutes } from './RouteWithSubRoutes'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
.home { | ||
h1 { | ||
font-size: 50px; | ||
font-size: 30px; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import axios from 'axios'; | ||
|
||
const headers = { 'Content-Type': 'application/json' }; | ||
const baseURL = process.env.APPLICATION_BASE_URL || ''; | ||
const api = axios.create({ baseURL, headers, timeout: 200000 }); | ||
|
||
api.interceptors.response.use( | ||
(response) => Promise.resolve(response.data) , | ||
(err) => Promise.reject(err.response.data) | ||
); | ||
|
||
module.exports = api; |
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.