Commit 0503e0e5 authored by Zac Wood's avatar Zac Wood

Before revert

parent db741bce
This diff is collapsed.
......@@ -3,14 +3,21 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"react": "^16.3.1",
"react-dom": "^16.3.1",
"react-scripts": "1.1.4"
"react": "^16.3.2",
"react-dom": "^16.3.2",
"react-scripts-ts": "2.15.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
"start": "react-scripts-ts start",
"build": "react-scripts-ts build",
"test": "react-scripts-ts test --env=jsdom",
"eject": "react-scripts-ts eject"
},
"devDependencies": {
"@types/jest": "^22.2.3",
"@types/node": "^9.6.5",
"@types/react": "^16.3.11",
"@types/react-dom": "^16.0.5",
"typescript": "^2.8.1"
}
}
\ No newline at end of file
}
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';
it('renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<App />, div);
ReactDOM.unmountComponentAtNode(div);
});
import React, { Component } from 'react';
import Search from './Search.js';
import Schedule from './Schedule.js';
class App extends Component {
constructor(props) {
super(props);
this.state = {
sections: [],
};
this.addSectionToScheduleIfUnique = this.addSectionToScheduleIfUnique.bind(this);
this.isSectionInSchedule = this.isSectionInSchedule.bind(this);
}
addSectionToScheduleIfUnique(section) {
if (!this.isSectionInSchedule(section)) {
this.setState({ sections: [...this.state.sections, section] });
}
}
isSectionInSchedule(section) {
return this.state.sections !== undefined && this.state.sections.includes(section);
}
render() {
return (
<div className="App">
<h1>Schedules</h1>
<Search addToSchedule={this.addSectionToScheduleIfUnique} />
<Schedule sections={this.state.sections} />
</div>
);
}
}
export default App;
import React, { Component } from 'react';
import SectionsList from './SectionsList.js';
export default class Schedule extends Component {
render() {
return (
<div>
<SectionsList
title="Your schedule"
sections={this.props.sections}
/>
</div>
);
}
}
import React, { Component } from 'react';
import SectionsList from './SectionsList.js';
export default class Search extends Component {
constructor(props) {
super(props);
this.state = {
searchTerm: '',
sections: [],
};
this.handleChange = this.handleChange.bind(this);
this.handleSubmit = this.handleSubmit.bind(this);
}
handleChange(event) {
this.setState({
searchTerm: event.target.value,
});
}
handleSubmit(event) {
fetch(`http://localhost:3001/api/search?crn=${this.state.searchTerm}`)
.then(response => response.json())
.then(section => {
if (section !== null) {
this.setState({ sections: [section] });
}
});
event.preventDefault();
}
render() {
return (
<div>
<form onSubmit={this.handleSubmit}>
<input
type="text"
placeholder="Enter CRN..."
value={this.state.value}
onChange={this.handleChange}
/>
<input type="submit" value="Search" />
</form>
<SectionsList
title="Search results"
sections={this.state.sections}
addToSchedule={this.props.addToSchedule}
/>
</div>
);
}
}
import React, { Component } from 'react';
export default class SectionsList extends Component {
constructor(props) {
super(props);
this.getRowsForSections = this.getRowsForSections.bind(this);
this.getRowForSection = this.getRowForSection.bind(this);
this.getLastColumn = this.getLastColumn.bind(this);
}
getRowsForSections() {
return this.props.sections.map(section => {
return this.getRowForSection(section);
});
}
getRowForSection(section) {
return (
<tr key={section.id}>
<td>{section.name}</td>
<td>{section.title}</td>
<td>{section.crn}</td>
<td>{section.instructor}</td>
<td>{section.location}</td>
<td>{section.days}</td>
<td>{[section.start_time, section.end_time].join(' - ')}</td>
{this.getLastColumn(section)}
</tr>
);
}
getLastColumn(section) {
if (this.props.addToSchedule) {
return (
<td>
<button onClick={e => this.props.addToSchedule(section)}>Add to schedule</button>
</td>
);
} else {
return <td />;
}
}
render() {
return (
<div>
<h2>{this.props.title}</h2>
<table>
<tbody>
<tr>
<th>Name</th>
<th>Title</th>
<th>CRN</th>
<th>Professor</th>
<th>Location</th>
<th>Days</th>
<th>Times</th>
<th />
</tr>
{this.getRowsForSections()}
</tbody>
</table>
</div>
);
}
}
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './Components/App';
import registerServiceWorker from './registerServiceWorker';
ReactDOM.render(<App />, document.getElementById('root'));
registerServiceWorker();
// In production, we register a service worker to serve assets from local cache.
// This lets the app load faster on subsequent visits in production, and gives
// it offline capabilities. However, it also means that developers (and users)
// will only see deployed updates on the "N+1" visit to a page, since previously
// cached resources are updated in the background.
// To learn more about the benefits of this model, read https://goo.gl/KwvDNy.
// This link also includes instructions on opting out of this behavior.
const isLocalhost = Boolean(
window.location.hostname === 'localhost' ||
// [::1] is the IPv6 localhost address.
window.location.hostname === '[::1]' ||
// 127.0.0.1/8 is considered localhost for IPv4.
window.location.hostname.match(
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
)
);
export default function register() {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location);
if (publicUrl.origin !== window.location.origin) {
// Our service worker won't work if PUBLIC_URL is on a different origin
// from what our page is served on. This might happen if a CDN is used to
// serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374
return;
}
window.addEventListener('load', () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
if (isLocalhost) {
// This is running on localhost. Lets check if a service worker still exists or not.
checkValidServiceWorker(swUrl);
// Add some additional logging to localhost, pointing developers to the
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log(
'This web app is being served cache-first by a service ' +
'worker. To learn more, visit https://goo.gl/SC7cgQ'
);
});
} else {
// Is not local host. Just register service worker
registerValidSW(swUrl);
}
});
}
}
function registerValidSW(swUrl) {
navigator.serviceWorker
.register(swUrl)
.then(registration => {
registration.onupdatefound = () => {
const installingWorker = registration.installing;
installingWorker.onstatechange = () => {
if (installingWorker.state === 'installed') {
if (navigator.serviceWorker.controller) {
// At this point, the old content will have been purged and
// the fresh content will have been added to the cache.
// It's the perfect time to display a "New content is
// available; please refresh." message in your web app.
console.log('New content is available; please refresh.');
} else {
// At this point, everything has been precached.
// It's the perfect time to display a
// "Content is cached for offline use." message.
console.log('Content is cached for offline use.');
}
}
};
};
})
.catch(error => {
console.error('Error during service worker registration:', error);
});
}
function checkValidServiceWorker(swUrl) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl)
.then(response => {
// Ensure service worker exists, and that we really are getting a JS file.
if (
response.status === 404 ||
response.headers.get('content-type').indexOf('javascript') === -1
) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then(registration => {
registration.unregister().then(() => {
window.location.reload();
});
});
} else {
// Service worker found. Proceed as normal.
registerValidSW(swUrl);
}
})
.catch(() => {
console.log(
'No internet connection found. App is running in offline mode.'
);
});
}
export function unregister() {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.ready.then(registration => {
registration.unregister();
});
}
}
This source diff could not be displayed because it is too large. You can view the blob instead.
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