Commit d4abc5cf authored by Paul R Otto's avatar Paul R Otto
Browse files

Merge branch 'gothree-frontend' into 178-about-page-3.0

merging in front end changes to modify for about page
parents 38417e23 09d53efc
import React from 'react';
export default class HomePage extends React.Component {
state = {};
render() {
return (
<div>
<p>Hello World! 1</p>
</div>
);
}
}
import HomePage from './HomePage';
export { HomePage };
import { HomePage } from './Pages';
export { HomePage };
import React from 'react';
import ReactDOM from 'react-dom';
import { HashRouter, Route, Link } from 'react-router-dom';
import { HomePage } from './Components';
const Dhaynes = () => <p>dhaynes</p>;
const App = () => (
<div>
<ul>
<li>
<Link to="/">Home</Link>
</li>
<li>
<Link to="/dhaynes">dhaynes</Link>
</li>
</ul>
<Route path="/" exact component={HomePage} />
<Route path="/dhaynes" component={Dhaynes} />
</div>
);
ReactDOM.render(
<HashRouter>
<App />
</HashRouter>,
document.getElementById('root')
);
import React from "react";
import ReactDOM from "react-dom";
ReactDOM.render(
<div>
<p>Hello Go 3 with React!</p>
</div>,
document.getElementById("root")
);
{ {
"name": "go", "name": "go",
"version": "3.0", "version": "3.0",
"description": "University-branded URL shortening", "description": "University-branded URL shortening",
"main": "index.js", "main": "index.js",
"repository": "git@git.gmu.edu:srct/go.git", "repository": "git@git.gmu.edu:srct/go.git",
"author": "Mason SRCT", "author": "Mason SRCT",
"license": "Apache-2.0", "license": "Apache-2.0",
"private": false, "private": false,
"scripts": { "scripts": {
"dev": "webpack --mode development ./go/go_ahead/src/index.jsx --output ./go/static/main.js --watch", "start": "yarn dev",
"build": "webpack --mode production ./project/frontend/src/index.js --output ./go/static/main.js" "dev": "webpack --mode development ./go/go_ahead/src/index.js --output ./go/static/main.js --watch",
}, "build": "webpack --mode production ./project/frontend/src/index.js --output ./go/static/main.js"
"babel": { },
"presets": [ "babel": {
"es2015", "presets": [
"react" "@babel/preset-env",
] "@babel/preset-react"
}, ],
"dependencies": { "plugins": [
"babel-core": "^6.26.3", "@babel/plugin-proposal-class-properties"
"babel-loader": "^7.1.5", ]
"babel-plugin-transform-class-properties": "^6.24.1", },
"babel-preset-env": "^1.7.0", "dependencies": {
"babel-preset-es2015": "^6.24.1", "@babel/core": "^7.1.2",
"babel-preset-react": "^6.24.1", "@babel/plugin-proposal-class-properties": "^7.1.0",
"babel-preset-stage-2": "^6.24.1", "@babel/preset-env": "^7.1.0",
"react": "^16.4.2", "@babel/preset-react": "^7.0.0",
"react-dom": "^16.4.2", "babel-core": "^6.26.3",
"webpack": "^4.16.4", "babel-loader": "^8.0.4",
"webpack-cli": "^3.1.0" "babel-plugin-transform-class-properties": "^6.24.1",
} "babel-preset-env": "^1.7.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"react": "^16.4.2",
"react-dom": "^16.4.2",
"react-router-dom": "^4.3.1",
"webpack": "^4.16.4",
"webpack-cli": "^3.1.0"
}
} }
module.exports = { module.exports = {
module: { module: {
rules: [{ rules: [
test: /\.jsx$/, {
exclude: /node_modules/, test: /\.(js|jsx)$/,
use: { exclude: /node_modules/,
loader: "babel-loader" use: ['babel-loader'],
} },
}] ],
} },
resolve: {
extensions: ['*', '.js', '.jsx'],
},
}; };
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment