sipp11 6 years ago
parent
commit
30288f60e3
  1. 2
      package.json
  2. 1
      src/components/FareAttributesForm.js
  3. 2
      src/components/FareList.js
  4. 6
      src/components/Footer.js
  5. 1
      src/components/StopForm.js
  6. 4
      src/constants/Api.js

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "grunt-front", "name": "grunt-front",
"version": "0.2.0", "version": "0.3.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"ajv": "^6.5.1", "ajv": "^6.5.1",

1
src/components/FareAttributesForm.js

@ -12,7 +12,6 @@ import store from '../store'
import Input from './parts/Input' import Input from './parts/Input'
import OurSelect from './parts/Select' import OurSelect from './parts/Select'
import AsyncSelect from 'react-select/lib/Async' import AsyncSelect from 'react-select/lib/Async'
import { components } from 'react-select'
import { import {
PaymentMethodChoices, TransferChoices PaymentMethodChoices, TransferChoices
} from '../constants/choices' } from '../constants/choices'

2
src/components/FareList.js

@ -121,7 +121,7 @@ class FareList extends Component {
<div> <div>
<p className="heading">Route ID</p> <p className="heading">Route ID</p>
<p> <p>
{farerule.results[i].route && farerule.results[i].route.route_id || '-'} {farerule.results[i].route && (farerule.results[i].route.route_id || '-')}
</p> </p>
</div> </div>
</div> </div>

6
src/components/Footer.js

@ -1,13 +1,15 @@
import React from 'react' import React from 'react'
import { version } from '../../package.json'
const Footer = () => const Footer = () =>
<footer className="footer"> <footer className="footer">
<div className="content has-text-centered"> <div className="content has-text-centered">
<img src="https://static.10ninox.com/goth-rect-640x160.svg" alt="GoTH" width="168" height="42" /> <img src="https://static.10ninox.com/goth-rect-640x160.svg" alt="GoTH" width="168" height="42" />
<br/> <br />
<small>{ version }</small>
<br />
<a href="javascript:location.reload(true)"><i className="fas fa-sync"></i> reload</a> <a href="javascript:location.reload(true)"><i className="fas fa-sync"></i> reload</a>
</div> </div>
</footer> </footer>
export default Footer export default Footer

1
src/components/StopForm.js

@ -3,7 +3,6 @@ import styled from 'styled-components'
import { connect } from 'react-redux' import { connect } from 'react-redux'
import { Redirect, Link } from 'react-router-dom' import { Redirect, Link } from 'react-router-dom'
import AsyncSelect from 'react-select/lib/Async' import AsyncSelect from 'react-select/lib/Async'
import { components } from 'react-select'
import Input from './parts/Input' import Input from './parts/Input'
import Select from './parts/Select' import Select from './parts/Select'

4
src/constants/Api.js

@ -1,6 +1,6 @@
export const URL = process.env.API_URL || '//localhost:8000' // export const URL = process.env.API_URL || '//localhost:8000'
// export const URL = process.env.API_URL || 'https://api.goth.app' export const URL = process.env.API_URL || 'https://api.goth.app'
export const API_PREFIX = process.env.API_PREFIX || '/v1' export const API_PREFIX = process.env.API_PREFIX || '/v1'
export const API_URL = `${URL}${API_PREFIX}` export const API_URL = `${URL}${API_PREFIX}`
export const LOGIN = '/api-token-auth/' export const LOGIN = '/api-token-auth/'

Loading…
Cancel
Save