From d491f1b3819bd028fc06775542b503ace3c9e152 Mon Sep 17 00:00:00 2001 From: Charalampos Karypidis Date: Tue, 7 Jun 2016 22:03:20 +0200 Subject: [PATCH] Add React Redux template in ES6 syntax #117 --- JavaScriptServices.sln | 9 +- templates/ReactReduxSpaES6/.babelrc | 3 + templates/ReactReduxSpaES6/.gitignore | 237 ++++++++++++++++++ .../ReactReduxSpaES6/ClientApp/.editorconfig | 17 ++ .../ReactReduxSpaES6/ClientApp/boot-client.js | 23 ++ .../ReactReduxSpaES6/ClientApp/boot-server.js | 37 +++ .../ClientApp/components/Counter.jsx | 36 +++ .../ClientApp/components/FetchData.jsx | 85 +++++++ .../ClientApp/components/Home.jsx | 28 +++ .../ClientApp/components/Layout.jsx | 25 ++ .../ClientApp/components/NavMenu.jsx | 44 ++++ .../ClientApp/configureStore.js | 22 ++ .../ReactReduxSpaES6/ClientApp/css/site.css | 66 +++++ .../ClientApp/reducers/counter.js | 18 ++ .../ClientApp/reducers/index.js | 11 + .../ClientApp/reducers/weatherForecasts.js | 46 ++++ .../ReactReduxSpaES6/ClientApp/routes.js | 15 ++ .../Controllers/HomeController.cs | 21 ++ .../Controllers/SampleDataController.cs | 44 ++++ templates/ReactReduxSpaES6/Dockerfile | 11 + templates/ReactReduxSpaES6/README.md | 40 +++ .../ReactReduxSpaES6/ReactReduxSpaES6.xproj | 21 ++ templates/ReactReduxSpaES6/Startup.cs | 63 +++++ .../ReactReduxSpaES6/Views/Home/Index.cshtml | 10 + .../Views/Shared/Error.cshtml | 6 + .../Views/Shared/_Layout.cshtml | 17 ++ .../Views/_ViewImports.cshtml | 3 + .../ReactReduxSpaES6/Views/_ViewStart.cshtml | 3 + templates/ReactReduxSpaES6/appsettings.json | 10 + templates/ReactReduxSpaES6/jsconfig.json | 16 ++ templates/ReactReduxSpaES6/package.json | 34 +++ templates/ReactReduxSpaES6/project.json | 53 ++++ .../ReactReduxSpaES6/webpack.config.dev.js | 3 + templates/ReactReduxSpaES6/webpack.config.js | 35 +++ .../ReactReduxSpaES6/webpack.config.prod.js | 9 + .../ReactReduxSpaES6/webpack.config.vendor.js | 37 +++ .../ReactReduxSpaES6/wwwroot/favicon.ico | Bin 0 -> 32038 bytes 37 files changed, 1157 insertions(+), 1 deletion(-) create mode 100644 templates/ReactReduxSpaES6/.babelrc create mode 100644 templates/ReactReduxSpaES6/.gitignore create mode 100644 templates/ReactReduxSpaES6/ClientApp/.editorconfig create mode 100644 templates/ReactReduxSpaES6/ClientApp/boot-client.js create mode 100644 templates/ReactReduxSpaES6/ClientApp/boot-server.js create mode 100644 templates/ReactReduxSpaES6/ClientApp/components/Counter.jsx create mode 100644 templates/ReactReduxSpaES6/ClientApp/components/FetchData.jsx create mode 100644 templates/ReactReduxSpaES6/ClientApp/components/Home.jsx create mode 100644 templates/ReactReduxSpaES6/ClientApp/components/Layout.jsx create mode 100644 templates/ReactReduxSpaES6/ClientApp/components/NavMenu.jsx create mode 100644 templates/ReactReduxSpaES6/ClientApp/configureStore.js create mode 100644 templates/ReactReduxSpaES6/ClientApp/css/site.css create mode 100644 templates/ReactReduxSpaES6/ClientApp/reducers/counter.js create mode 100644 templates/ReactReduxSpaES6/ClientApp/reducers/index.js create mode 100644 templates/ReactReduxSpaES6/ClientApp/reducers/weatherForecasts.js create mode 100644 templates/ReactReduxSpaES6/ClientApp/routes.js create mode 100644 templates/ReactReduxSpaES6/Controllers/HomeController.cs create mode 100644 templates/ReactReduxSpaES6/Controllers/SampleDataController.cs create mode 100644 templates/ReactReduxSpaES6/Dockerfile create mode 100644 templates/ReactReduxSpaES6/README.md create mode 100644 templates/ReactReduxSpaES6/ReactReduxSpaES6.xproj create mode 100644 templates/ReactReduxSpaES6/Startup.cs create mode 100644 templates/ReactReduxSpaES6/Views/Home/Index.cshtml create mode 100644 templates/ReactReduxSpaES6/Views/Shared/Error.cshtml create mode 100644 templates/ReactReduxSpaES6/Views/Shared/_Layout.cshtml create mode 100644 templates/ReactReduxSpaES6/Views/_ViewImports.cshtml create mode 100644 templates/ReactReduxSpaES6/Views/_ViewStart.cshtml create mode 100644 templates/ReactReduxSpaES6/appsettings.json create mode 100644 templates/ReactReduxSpaES6/jsconfig.json create mode 100644 templates/ReactReduxSpaES6/package.json create mode 100644 templates/ReactReduxSpaES6/project.json create mode 100644 templates/ReactReduxSpaES6/webpack.config.dev.js create mode 100644 templates/ReactReduxSpaES6/webpack.config.js create mode 100644 templates/ReactReduxSpaES6/webpack.config.prod.js create mode 100644 templates/ReactReduxSpaES6/webpack.config.vendor.js create mode 100644 templates/ReactReduxSpaES6/wwwroot/favicon.ico diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index 9b150601..a0bc41dd 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E6E88944-4800-40BA-8AF5-069EA3ADFEB8}" EndProject @@ -34,6 +34,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ReactSpa", "templates\React EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApplicationBasic", "templates\WebApplicationBasic\WebApplicationBasic.xproj", "{CB4398D6-B7F1-449A-AE02-828769679232}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ReactReduxSpaES6", "templates\ReactReduxSpaES6\ReactReduxSpaES6.xproj", "{26BFA8EE-1E46-4870-90A3-9E946C569284}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -84,6 +86,10 @@ Global {CB4398D6-B7F1-449A-AE02-828769679232}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB4398D6-B7F1-449A-AE02-828769679232}.Release|Any CPU.ActiveCfg = Release|Any CPU {CB4398D6-B7F1-449A-AE02-828769679232}.Release|Any CPU.Build.0 = Release|Any CPU + {26BFA8EE-1E46-4870-90A3-9E946C569284}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26BFA8EE-1E46-4870-90A3-9E946C569284}.Debug|Any CPU.Build.0 = Debug|Any CPU + {26BFA8EE-1E46-4870-90A3-9E946C569284}.Release|Any CPU.ActiveCfg = Release|Any CPU + {26BFA8EE-1E46-4870-90A3-9E946C569284}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -96,5 +102,6 @@ Global {DBFC6DB0-A6D1-4694-A108-1C604B988DA3} = {727E6D58-6830-4792-96C6-E138A33959FB} {E9D1A695-F0E6-46F2-B5E3-72F4AF805387} = {727E6D58-6830-4792-96C6-E138A33959FB} {CB4398D6-B7F1-449A-AE02-828769679232} = {727E6D58-6830-4792-96C6-E138A33959FB} + {26BFA8EE-1E46-4870-90A3-9E946C569284} = {727E6D58-6830-4792-96C6-E138A33959FB} EndGlobalSection EndGlobal diff --git a/templates/ReactReduxSpaES6/.babelrc b/templates/ReactReduxSpaES6/.babelrc new file mode 100644 index 00000000..86c445f5 --- /dev/null +++ b/templates/ReactReduxSpaES6/.babelrc @@ -0,0 +1,3 @@ +{ + "presets": ["es2015", "react"] +} diff --git a/templates/ReactReduxSpaES6/.gitignore b/templates/ReactReduxSpaES6/.gitignore new file mode 100644 index 00000000..d410b8bb --- /dev/null +++ b/templates/ReactReduxSpaES6/.gitignore @@ -0,0 +1,237 @@ +/Properties/launchSettings.json + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +build/ +bld/ +bin/ +Bin/ +obj/ +Obj/ + +# Visual Studio 2015 cache/options directory +.vs/ +/wwwroot/dist/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Microsoft Azure ApplicationInsights config file +ApplicationInsights.config + +# Windows Store app package directory +AppPackages/ +BundleArtifacts/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe + +# FAKE - F# Make +.fake/ diff --git a/templates/ReactReduxSpaES6/ClientApp/.editorconfig b/templates/ReactReduxSpaES6/ClientApp/.editorconfig new file mode 100644 index 00000000..a082ad7a --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/.editorconfig @@ -0,0 +1,17 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# http://editorconfig.org + +root = true + +[*] + +# Change these settings to your own preference +indent_style = space +indent_size = 2 + +# We recommend you to keep these unchanged +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/templates/ReactReduxSpaES6/ClientApp/boot-client.js b/templates/ReactReduxSpaES6/ClientApp/boot-client.js new file mode 100644 index 00000000..3a4d49cb --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/boot-client.js @@ -0,0 +1,23 @@ +import './css/site.css'; +import 'bootstrap'; +import * as React from 'react'; +import * as ReactDOM from 'react-dom'; +import { Provider } from 'react-redux'; +import { browserHistory, Router } from 'react-router'; +import { syncHistoryWithStore } from 'react-router-redux'; +import configureStore from './configureStore'; +import routes from './routes'; + +// Get the application-wide store instance, prepopulating with state from the server where available. +const initialState = window.initialReduxState; +const store = configureStore(initialState); +const history = syncHistoryWithStore(browserHistory, store); + +// This code starts up the React app when it runs in a browser. It sets up the routing configuration +// and injects the app into a DOM element. +ReactDOM.render( + + + , + document.getElementById('react-app') +); diff --git a/templates/ReactReduxSpaES6/ClientApp/boot-server.js b/templates/ReactReduxSpaES6/ClientApp/boot-server.js new file mode 100644 index 00000000..86397979 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/boot-server.js @@ -0,0 +1,37 @@ +import * as React from 'react'; +import { renderToString } from 'react-dom/server'; +import { Provider } from 'react-redux'; +import { match, RouterContext } from 'react-router'; + +import routes from './routes'; +import configureStore from './configureStore'; + +export default (params) => { + return new Promise((resolve, reject) => { + match({routes, location: params.location}, (error, redirectLocation, renderProps) => { + if (error) { + throw error; + } + // At this point if we want to initialize the store we need to pass an object with shape + // {counter: {count: 10}} + const store = configureStore(); + const app = ( + + + + ); + + // Perform an initial render that will cause any async tasks (e.g., data access) to begin + renderToString(app); + + // Once the tasks are done, we can perform the final render + // We also send the redux store state, so the client can continue execution where the server left off + params.domainTasks.then(() => { + resolve({ + html: renderToString(app), + globals: { initialReduxState: store.getState() } + }); + }, reject); // Also propagate any errors back into the host application + }); + }); +}; diff --git a/templates/ReactReduxSpaES6/ClientApp/components/Counter.jsx b/templates/ReactReduxSpaES6/ClientApp/components/Counter.jsx new file mode 100644 index 00000000..bf7928c2 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/components/Counter.jsx @@ -0,0 +1,36 @@ +import React, {Component, PropTypes} from 'react'; +import { connect } from 'react-redux'; +import { incrementCount } from '../reducers/counter'; + +class Counter extends Component { + render() { + return ( +
+

Counter

+

This is a simple example of a React component.

+

Current count: { this.props.count }

+ +
+ ); + } +} + +Counter.propTypes = { + count: PropTypes.number.isRequired, + increment: PropTypes.func.isRequired, +}; + +const mapStateToProps = (state) => ({ + count: state.counter.count +}); + +const mapDispatchToProps = (dispatch) => ({ + increment: () => { + dispatch(incrementCount()); + } +}); + +export default connect( + mapStateToProps, + mapDispatchToProps +)(Counter); diff --git a/templates/ReactReduxSpaES6/ClientApp/components/FetchData.jsx b/templates/ReactReduxSpaES6/ClientApp/components/FetchData.jsx new file mode 100644 index 00000000..c8977d48 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/components/FetchData.jsx @@ -0,0 +1,85 @@ +import React, {Component, PropTypes} from 'react'; +import { connect } from 'react-redux'; +import { Link } from 'react-router'; +import { requestWeatherForecasts } from '../reducers/weatherForecasts' + +class FetchData extends Component { + componentWillMount() { + // This method runs when the component is first added to the page + let startDateIndex = parseInt(this.props.params.startDateIndex) || 0; + this.props.requestWeatherForecasts(startDateIndex); + } + + componentWillReceiveProps(nextProps) { + // This method runs when incoming props (e.g., route params) change + let startDateIndex = parseInt(nextProps.params.startDateIndex) || 0; + this.props.requestWeatherForecasts(startDateIndex); + } + + render() { + const table = ( + + + + + + + + + + + {this.props.forecasts.map(forecast => + + + + + + + )} + +
DateTemp. (C)Temp. (F)Summary
{ forecast.dateFormatted }{ forecast.temperatureC }{ forecast.temperatureF }{ forecast.summary }
+ ); + + let prevStartDateIndex = this.props.startDateIndex - 5; + let nextStartDateIndex = this.props.startDateIndex + 5; + const pagination = ( +

+ Previous + Next + { this.props.isLoading ? Loading... : [] } +

+ ); + + return ( +
+

Weather forecast

+

This component demonstrates fetching data from the server and working with URL parameters.

+ { table } + { pagination } +
+ ); + } +} + +FetchData.propTypes = { + startDateIndex: PropTypes.number, + isLoading: PropTypes.bool, + requestWeatherForecasts: PropTypes.func.isRequired +}; + +const mapStateToProps = (state) => ({ + startDateIndex: state.weatherForecasts.startDateIndex, + forecasts: state.weatherForecasts.forecasts, + isLoading: state.weatherForecasts.isLoading +}); + +const mapDispatchToProps = (dispatch) => ({ + requestWeatherForecasts: (startDateIndex) => { + dispatch(requestWeatherForecasts(startDateIndex)); + } +}); + +export default connect( + mapStateToProps, + mapDispatchToProps +)(FetchData); diff --git a/templates/ReactReduxSpaES6/ClientApp/components/Home.jsx b/templates/ReactReduxSpaES6/ClientApp/components/Home.jsx new file mode 100644 index 00000000..71bb2656 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/components/Home.jsx @@ -0,0 +1,28 @@ +import React, {Component} from 'react'; + +class Home extends Component { + render() { + return ( +
+

Hello, world!

+

Welcome to your new single-page application, built with:

+ +

To help you get started, we've also set up:

+ +
+ ); + } +} + +export default Home; diff --git a/templates/ReactReduxSpaES6/ClientApp/components/Layout.jsx b/templates/ReactReduxSpaES6/ClientApp/components/Layout.jsx new file mode 100644 index 00000000..94ba4dc6 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/components/Layout.jsx @@ -0,0 +1,25 @@ +import React, {Component, PropTypes} from 'react'; +import NavMenu from './NavMenu'; + +class Layout extends Component { + render() { + return ( +
+
+
+ +
+
+ {this.props.body} +
+
+
+ ); + } +} + +Layout.propTypes = { + body: PropTypes.element, +}; + +export default Layout; diff --git a/templates/ReactReduxSpaES6/ClientApp/components/NavMenu.jsx b/templates/ReactReduxSpaES6/ClientApp/components/NavMenu.jsx new file mode 100644 index 00000000..c0aac791 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/components/NavMenu.jsx @@ -0,0 +1,44 @@ +import React, {Component} from 'react'; +import { Link } from 'react-router'; + +class NavMenu extends Component { + render() { + return ( +
+
+
+ + WebApplicationBasic +
+
+
+
    +
  • + + Home + +
    • +
  • + + Counter + +
    • +
  • + + Fetch data + +
    • +
+
+
+
+ ); + } +} + +export default NavMenu; diff --git a/templates/ReactReduxSpaES6/ClientApp/configureStore.js b/templates/ReactReduxSpaES6/ClientApp/configureStore.js new file mode 100644 index 00000000..62978659 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/configureStore.js @@ -0,0 +1,22 @@ +import { createStore, compose, applyMiddleware } from 'redux'; +import thunkMiddleware from 'redux-thunk'; +import rootReducer from './reducers' + +export default (initialState) => { + const windowIfDefined = typeof window === 'undefined' ? null : window; + const devToolsExtension = windowIfDefined && windowIfDefined.devToolsExtension; // If devTools is installed, connect to it + const createStoreWithMiddleware = compose( + applyMiddleware(thunkMiddleware), + devToolsExtension ? devToolsExtension() : f => f + )(createStore); + + const store = createStoreWithMiddleware(rootReducer, initialState); + // Enable Webpack hot module replacement for reducers + if (module.hot) { + module.hot.accept('./reducers', () => { + store.replaceReducer(require('./reducers')); + }); + } + + return store; +}; diff --git a/templates/ReactReduxSpaES6/ClientApp/css/site.css b/templates/ReactReduxSpaES6/ClientApp/css/site.css new file mode 100644 index 00000000..3058af68 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/css/site.css @@ -0,0 +1,66 @@ +.main-nav li .glyphicon { + margin-right: 10px; +} + +/* Highlighting rules for nav menu items */ +.main-nav li a.active, +.main-nav li a.active:hover, +.main-nav li a.active:focus { + background-color: #4189C7; + color: white; +} + +/* Keep the nav menu independent of scrolling and on top of other items */ +.main-nav { + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 1; +} + +@media (max-width: 767px) { + /* On small screens, the nav menu spans the full width of the screen. Leave a space for it. */ + body { + padding-top: 50px; + } +} + +@media (min-width: 768px) { + /* On small screens, convert the nav menu to a vertical sidebar */ + .main-nav { + height: 100%; + width: calc(25% - 20px); + } + .main-nav .navbar { + border-radius: 0px; + border-width: 0px; + height: 100%; + } + .main-nav .navbar-header { + float: none; + } + .main-nav .navbar-collapse { + border-top: 1px solid #444; + padding: 0px; + } + .main-nav .navbar ul { + float: none; + } + .main-nav .navbar li { + float: none; + font-size: 15px; + margin: 6px; + } + .main-nav .navbar li a { + padding: 10px 16px; + border-radius: 4px; + } + .main-nav .navbar a { + /* If a menu item's text is too long, truncate it */ + width: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } +} diff --git a/templates/ReactReduxSpaES6/ClientApp/reducers/counter.js b/templates/ReactReduxSpaES6/ClientApp/reducers/counter.js new file mode 100644 index 00000000..bea24bd1 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/reducers/counter.js @@ -0,0 +1,18 @@ +// Constant defining the action type +const INCREMENT_COUNT = 'INCREMENT_COUNT'; + +// Action creator +export const incrementCount = () => ({type: INCREMENT_COUNT}); + +const initialState = { + count: 0 +}; + +// The reducer that changes the state based on the action type +export default (state = initialState, action) => { + if (action.type === INCREMENT_COUNT) { + return { count: state.count +1 }; + } + + return state; +} diff --git a/templates/ReactReduxSpaES6/ClientApp/reducers/index.js b/templates/ReactReduxSpaES6/ClientApp/reducers/index.js new file mode 100644 index 00000000..92da6c9f --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/reducers/index.js @@ -0,0 +1,11 @@ +import { combineReducers } from 'redux'; +import { routerReducer } from 'react-router-redux' + +import counter from './counter'; +import weatherForecasts from './weatherForecasts'; + +export default combineReducers({ + routing: routerReducer, + counter, + weatherForecasts +}); diff --git a/templates/ReactReduxSpaES6/ClientApp/reducers/weatherForecasts.js b/templates/ReactReduxSpaES6/ClientApp/reducers/weatherForecasts.js new file mode 100644 index 00000000..f4156bb1 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/reducers/weatherForecasts.js @@ -0,0 +1,46 @@ +import { fetch } from 'domain-task/fetch'; + +// Constant defining the action type +const REQUEST_WEATHER_FORECASTS = 'REQUEST_WEATHER_FORECASTS'; +const RECEIVE_WEATHER_FORECASTS = 'RECEIVE_WEATHER_FORECASTS'; + +// Action creators +export const requestWeatherForecasts = (startDateIndex) => { + return (dispatch, getState) => { + if (startDateIndex !== getState().weatherForecasts.startDateIndex) { + dispatch({type: REQUEST_WEATHER_FORECASTS, payload: startDateIndex}); + return fetch(`/api/SampleData/WeatherForecasts?startDateIndex=${ startDateIndex }`) + .then(response => response.json()) + .then((data) => { + dispatch(receiveWeatherForecasts(startDateIndex, data)); + }); + } + }; +}; + +export const receiveWeatherForecasts = (startDateIndex, forecasts) => ({ + type: RECEIVE_WEATHER_FORECASTS, + payload: {startDateIndex, forecasts}, +}); + +const initialState = { + startDateIndex: null, + forecasts: [], + isLoading: false +}; + +// The reducer that changes the state based on the action type +export default (state = initialState, action) => { + + if (action.type === REQUEST_WEATHER_FORECASTS) { + return { startDateIndex: action.payload, isLoading: true, forecasts: state.forecasts }; + } else if (action.type === RECEIVE_WEATHER_FORECASTS) { + // Only accept the incoming data if it matches the most recent request. This ensures we correctly + // handle out-of-order responses. + if (action.payload.startDateIndex === state.startDateIndex) { + return { startDateIndex: action.payload.startDateIndex, forecasts: action.payload.forecasts, isLoading: false }; + } + } + + return state; +} diff --git a/templates/ReactReduxSpaES6/ClientApp/routes.js b/templates/ReactReduxSpaES6/ClientApp/routes.js new file mode 100644 index 00000000..38a16423 --- /dev/null +++ b/templates/ReactReduxSpaES6/ClientApp/routes.js @@ -0,0 +1,15 @@ +import React from 'React'; +import {Router, Route, HistoryBase} from 'react-router'; +import Layout from './components/layout'; +import Home from './components/home'; +import FetchData from './components/fetchData'; +import Counter from './components/counter'; + +export default + + + + + { /* Optional route segment that does not affect NavMenu highlighting */ } + + ; diff --git a/templates/ReactReduxSpaES6/Controllers/HomeController.cs b/templates/ReactReduxSpaES6/Controllers/HomeController.cs new file mode 100644 index 00000000..51f01f45 --- /dev/null +++ b/templates/ReactReduxSpaES6/Controllers/HomeController.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +namespace ReactReduxSpaES6.Controllers +{ + public class HomeController : Controller + { + public IActionResult Index() + { + return View(); + } + + public IActionResult Error() + { + return View(); + } + } +} diff --git a/templates/ReactReduxSpaES6/Controllers/SampleDataController.cs b/templates/ReactReduxSpaES6/Controllers/SampleDataController.cs new file mode 100644 index 00000000..9f240570 --- /dev/null +++ b/templates/ReactReduxSpaES6/Controllers/SampleDataController.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +namespace WebApplicationBasic.Controllers +{ + [Route("api/[controller]")] + public class SampleDataController : Controller + { + private static string[] Summaries = new[] + { + "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" + }; + + [HttpGet("[action]")] + public IEnumerable WeatherForecasts(int startDateIndex) + { + var rng = new Random(); + return Enumerable.Range(1, 5).Select(index => new WeatherForecast + { + DateFormatted = DateTime.Now.AddDays(index + startDateIndex).ToString("d"), + TemperatureC = rng.Next(-20, 55), + Summary = Summaries[rng.Next(Summaries.Length)] + }); + } + + public class WeatherForecast + { + public string DateFormatted { get; set; } + public int TemperatureC { get; set; } + public string Summary { get; set; } + + public int TemperatureF + { + get + { + return 32 + (int)(this.TemperatureC / 0.5556); + } + } + } + } +} diff --git a/templates/ReactReduxSpaES6/Dockerfile b/templates/ReactReduxSpaES6/Dockerfile new file mode 100644 index 00000000..63d7c456 --- /dev/null +++ b/templates/ReactReduxSpaES6/Dockerfile @@ -0,0 +1,11 @@ +FROM microsoft/aspnet:1.0.0-rc1-update1 + +RUN printf "deb http://ftp.us.debian.org/debian jessie main\n" >> /etc/apt/sources.list +RUN apt-get -qq update && apt-get install -qqy sqlite3 libsqlite3-dev && rm -rf /var/lib/apt/lists/* + +COPY . /app +WORKDIR /app +RUN ["dnu", "restore"] + +EXPOSE 5000/tcp +ENTRYPOINT ["dnx", "-p", "project.json", "web"] diff --git a/templates/ReactReduxSpaES6/README.md b/templates/ReactReduxSpaES6/README.md new file mode 100644 index 00000000..4e494c9a --- /dev/null +++ b/templates/ReactReduxSpaES6/README.md @@ -0,0 +1,40 @@ +# Welcome to ASP.NET 5 + +We've made some big updates in this release, so it’s **important** that you spend a few minutes to learn what’s new. + +You've created a new ASP.NET 5 project. [Learn what's new](http://go.microsoft.com/fwlink/?LinkId=518016) + +## This application consists of: + +* Sample pages using ASP.NET MVC 6 +* [Gulp](http://go.microsoft.com/fwlink/?LinkId=518007) and [Bower](http://go.microsoft.com/fwlink/?LinkId=518004) for managing client-side libraries +* Theming using [Bootstrap](http://go.microsoft.com/fwlink/?LinkID=398939) + +## How to + +* [Add a Controller and View](http://go.microsoft.com/fwlink/?LinkID=398600) +* [Add an appsetting in config and access it in app.](http://go.microsoft.com/fwlink/?LinkID=699562) +* [Manage User Secrets using Secret Manager.](http://go.microsoft.com/fwlink/?LinkId=699315) +* [Use logging to log a message.](http://go.microsoft.com/fwlink/?LinkId=699316) +* [Add packages using NuGet.](http://go.microsoft.com/fwlink/?LinkId=699317) +* [Add client packages using Bower.](http://go.microsoft.com/fwlink/?LinkId=699318) +* [Target development, staging or production environment.](http://go.microsoft.com/fwlink/?LinkId=699319) + +## Overview + +* [Conceptual overview of what is ASP.NET 5](http://go.microsoft.com/fwlink/?LinkId=518008) +* [Fundamentals of ASP.NET 5 such as Startup and middleware.](http://go.microsoft.com/fwlink/?LinkId=699320) +* [Working with Data](http://go.microsoft.com/fwlink/?LinkId=398602) +* [Security](http://go.microsoft.com/fwlink/?LinkId=398603) +* [Client side development](http://go.microsoft.com/fwlink/?LinkID=699321) +* [Develop on different platforms](http://go.microsoft.com/fwlink/?LinkID=699322) +* [Read more on the documentation site](http://go.microsoft.com/fwlink/?LinkID=699323) + +## Run & Deploy + +* [Run your app](http://go.microsoft.com/fwlink/?LinkID=517851) +* [Run your app on .NET Core](http://go.microsoft.com/fwlink/?LinkID=517852) +* [Run commands in your project.json](http://go.microsoft.com/fwlink/?LinkID=517853) +* [Publish to Microsoft Azure Web Apps](http://go.microsoft.com/fwlink/?LinkID=398609) + +We would love to hear your [feedback](http://go.microsoft.com/fwlink/?LinkId=518015) diff --git a/templates/ReactReduxSpaES6/ReactReduxSpaES6.xproj b/templates/ReactReduxSpaES6/ReactReduxSpaES6.xproj new file mode 100644 index 00000000..af9d5a0a --- /dev/null +++ b/templates/ReactReduxSpaES6/ReactReduxSpaES6.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 26bfa8ee-1e46-4870-90a3-9e946c569284 + ReactReduxSpaES6 + .\obj + .\bin\ + v4.6.1 + + + 2.0 + + + + + diff --git a/templates/ReactReduxSpaES6/Startup.cs b/templates/ReactReduxSpaES6/Startup.cs new file mode 100644 index 00000000..f7f2e471 --- /dev/null +++ b/templates/ReactReduxSpaES6/Startup.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json.Serialization; +using System.IO; +using Microsoft.AspNetCore.SpaServices.Webpack; + +namespace ReactReduxSpaES6 +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + // Add framework services. + services.AddMvc().AddJsonOptions(options => { + options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); + }); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + { + app.UseDeveloperExceptionPage(); + if (env.IsDevelopment()) + { + app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { + HotModuleReplacement = true, + ReactHotModuleReplacement = true + }); + } + + app.UseStaticFiles(); + loggerFactory.AddConsole(); + app.UseMvc(routes => + { + routes.MapRoute( + name: "default", + template: "{controller=Home}/{action=Index}/{id?}"); + routes.MapSpaFallbackRoute( + name: "spa-fallback", + defaults: new { controller = "Home", action = "Index" }); + }); + } + + public static void Main(string[] args) { + var host = new WebHostBuilder() + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseKestrel() + .UseStartup() + .Build(); + + host.Run(); + } + } +} diff --git a/templates/ReactReduxSpaES6/Views/Home/Index.cshtml b/templates/ReactReduxSpaES6/Views/Home/Index.cshtml new file mode 100644 index 00000000..72bc9587 --- /dev/null +++ b/templates/ReactReduxSpaES6/Views/Home/Index.cshtml @@ -0,0 +1,10 @@ +@{ + ViewData["Title"] = "Home Page"; +} + +
Loading...
+ +@section scripts { + +} \ No newline at end of file diff --git a/templates/ReactReduxSpaES6/Views/Shared/Error.cshtml b/templates/ReactReduxSpaES6/Views/Shared/Error.cshtml new file mode 100644 index 00000000..48524426 --- /dev/null +++ b/templates/ReactReduxSpaES6/Views/Shared/Error.cshtml @@ -0,0 +1,6 @@ +@{ + ViewData["Title"] = "Error"; +} + +

Error.

+

An error occurred while processing your request.

diff --git a/templates/ReactReduxSpaES6/Views/Shared/_Layout.cshtml b/templates/ReactReduxSpaES6/Views/Shared/_Layout.cshtml new file mode 100644 index 00000000..556285c9 --- /dev/null +++ b/templates/ReactReduxSpaES6/Views/Shared/_Layout.cshtml @@ -0,0 +1,17 @@ + + + + + + @ViewData["Title"] - WebApplicationBasic + + + + + + @RenderBody() + + + @RenderSection("scripts", required: false) + + diff --git a/templates/ReactReduxSpaES6/Views/_ViewImports.cshtml b/templates/ReactReduxSpaES6/Views/_ViewImports.cshtml new file mode 100644 index 00000000..4fac71f2 --- /dev/null +++ b/templates/ReactReduxSpaES6/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using ReactReduxSpaES6 +@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" +@addTagHelper "*, Microsoft.AspNetCore.SpaServices" diff --git a/templates/ReactReduxSpaES6/Views/_ViewStart.cshtml b/templates/ReactReduxSpaES6/Views/_ViewStart.cshtml new file mode 100644 index 00000000..a5f10045 --- /dev/null +++ b/templates/ReactReduxSpaES6/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +} diff --git a/templates/ReactReduxSpaES6/appsettings.json b/templates/ReactReduxSpaES6/appsettings.json new file mode 100644 index 00000000..fa8ce71a --- /dev/null +++ b/templates/ReactReduxSpaES6/appsettings.json @@ -0,0 +1,10 @@ +{ + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/templates/ReactReduxSpaES6/jsconfig.json b/templates/ReactReduxSpaES6/jsconfig.json new file mode 100644 index 00000000..efe87af8 --- /dev/null +++ b/templates/ReactReduxSpaES6/jsconfig.json @@ -0,0 +1,16 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=759670 + // for the documentation about the jsconfig.json format + "compilerOptions": { + "target": "es6", + "module": "es6", + "allowSyntheticDefaultImports": true + }, + "exclude": [ + "node_modules", + "bower_components", + "jspm_packages", + "tmp", + "temp" + ] +} diff --git a/templates/ReactReduxSpaES6/package.json b/templates/ReactReduxSpaES6/package.json new file mode 100644 index 00000000..92f87c3a --- /dev/null +++ b/templates/ReactReduxSpaES6/package.json @@ -0,0 +1,34 @@ +{ + "name": "asp.net", + "version": "0.0.0", + "dependencies": { + "aspnet-prerendering": "^1.0.0", + "aspnet-webpack": "^1.0.2", + "babel-core": "^6.5.2", + "domain-task": "^1.0.0", + "react": "^15.0.1", + "react-dom": "^15.0.1", + "react-redux": "^4.4.4", + "react-router": "^2.1.1", + "react-router-redux": "^4.0.2", + "redux": "^3.4.0", + "redux-thunk": "^2.0.1", + "webpack-externals-plugin": "^1.0.0" + }, + "devDependencies": { + "aspnet-webpack-react": "^1.0.1", + "babel-loader": "^6.2.3", + "babel-preset-es2015": "^6.5.0", + "babel-preset-react": "^6.5.0", + "bootstrap": "^3.3.6", + "css-loader": "^0.23.1", + "extendify": "^1.0.0", + "extract-text-webpack-plugin": "^1.0.1", + "file-loader": "^0.8.5", + "jquery": "^2.2.1", + "style-loader": "^0.13.0", + "url-loader": "^0.5.7", + "webpack": "^1.12.14", + "webpack-hot-middleware": "^2.10.0" + } +} diff --git a/templates/ReactReduxSpaES6/project.json b/templates/ReactReduxSpaES6/project.json new file mode 100644 index 00000000..ac703192 --- /dev/null +++ b/templates/ReactReduxSpaES6/project.json @@ -0,0 +1,53 @@ +{ + "version": "1.0.0-*", + "buildOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true + }, + "runtimeOptions": { + "gcServer": true + }, + + "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-*", + "type": "platform" + }, + "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final", + "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final", + "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final", + "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final", + "Microsoft.NETCore.Platforms": "1.0.1-*", + "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final", + "Microsoft.AspNetCore.ReactServices": "1.0.0-*" + }, + "frameworks": { + "netcoreapp1.0": { + "imports": [ + "dotnet5.6", + "dnxcore50", + "portable-net45+win8" + ] + } + }, + "publishOptions": { + "exclude": [ + "node_modules", + "**.xproj", + "**.user", + "**.vspscc" + ] + }, + + "scripts": { + "prepare": [ + "npm install", + "webpack --config webpack.config.vendor.js" + ], + "prepublish": [ "webpack" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] + } +} diff --git a/templates/ReactReduxSpaES6/webpack.config.dev.js b/templates/ReactReduxSpaES6/webpack.config.dev.js new file mode 100644 index 00000000..88f6a54d --- /dev/null +++ b/templates/ReactReduxSpaES6/webpack.config.dev.js @@ -0,0 +1,3 @@ +module.exports = { + devtool: 'inline-source-map' +}; diff --git a/templates/ReactReduxSpaES6/webpack.config.js b/templates/ReactReduxSpaES6/webpack.config.js new file mode 100644 index 00000000..0cc94052 --- /dev/null +++ b/templates/ReactReduxSpaES6/webpack.config.js @@ -0,0 +1,35 @@ +var path = require('path'); +var webpack = require('webpack'); +var ExtractTextPlugin = require('extract-text-webpack-plugin'); +var merge = require('extendify')({ isDeep: true, arrays: 'concat' }); +var devConfig = require('./webpack.config.dev'); +var prodConfig = require('./webpack.config.prod'); +var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development'; +var extractCSS = new ExtractTextPlugin('site.css'); + +module.exports = merge({ + resolve: { + extensions: [ '', '.js', '.jsx' ] + }, + module: { + loaders: [ + { test: /\.jsx?$/, include: /ClientApp/, loader: 'babel-loader' }, + { test: /\.css/, loader: extractCSS.extract(['css']) } + ] + }, + entry: { + main: ['./ClientApp/boot-client.js'], + }, + output: { + path: path.join(__dirname, 'wwwroot', 'dist'), + filename: '[name].js', + publicPath: '/dist/' + }, + plugins: [ + extractCSS, + new webpack.DllReferencePlugin({ + context: __dirname, + manifest: require('./wwwroot/dist/vendor-manifest.json') + }) + ] +}, isDevelopment ? devConfig : prodConfig); diff --git a/templates/ReactReduxSpaES6/webpack.config.prod.js b/templates/ReactReduxSpaES6/webpack.config.prod.js new file mode 100644 index 00000000..46f9225f --- /dev/null +++ b/templates/ReactReduxSpaES6/webpack.config.prod.js @@ -0,0 +1,9 @@ +var webpack = require('webpack'); + +module.exports = { + plugins: [ + new webpack.optimize.OccurenceOrderPlugin(), + new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }), + new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"production"' }) + ] +}; diff --git a/templates/ReactReduxSpaES6/webpack.config.vendor.js b/templates/ReactReduxSpaES6/webpack.config.vendor.js new file mode 100644 index 00000000..8e04124c --- /dev/null +++ b/templates/ReactReduxSpaES6/webpack.config.vendor.js @@ -0,0 +1,37 @@ +var path = require('path'); +var webpack = require('webpack'); +var ExtractTextPlugin = require('extract-text-webpack-plugin'); +var extractCSS = new ExtractTextPlugin('vendor.css'); +var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development'; + +module.exports = { + resolve: { + extensions: [ '', '.js' ] + }, + module: { + loaders: [ + { test: /\.(png|woff|woff2|eot|ttf|svg)$/, loader: 'url-loader?limit=100000' }, + { test: /\.css/, loader: extractCSS.extract(['css']) } + ] + }, + entry: { + vendor: ['bootstrap', 'bootstrap/dist/css/bootstrap.css', 'react', 'react-dom', 'react-router', 'style-loader', 'jquery'], + }, + output: { + path: path.join(__dirname, 'wwwroot', 'dist'), + filename: '[name].js', + library: '[name]_[hash]', + }, + plugins: [ + extractCSS, + new webpack.ProvidePlugin({ $: 'jquery', jQuery: 'jquery' }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) + new webpack.optimize.OccurenceOrderPlugin(), + new webpack.DllPlugin({ + path: path.join(__dirname, 'wwwroot', 'dist', '[name]-manifest.json'), + name: '[name]_[hash]' + }) + ].concat(isDevelopment ? [] : [ + new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }), + new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"production"' }) + ]) +}; diff --git a/templates/ReactReduxSpaES6/wwwroot/favicon.ico b/templates/ReactReduxSpaES6/wwwroot/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a3a799985c43bc7309d701b2cad129023377dc71 GIT binary patch literal 32038 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