roleypoly/v1
1
0
Fork 0
mirror of https://github.com/roleypoly/roleypoly-v1.git synced 2025-04-25 12:19:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: redo some debug oauth waiting strings, dockerfile

Browse source
This commit is contained in:
Katie Thornhill 2019-11-20 00:28:35 -05:00
parent 86c31126e8
commit f6b54eb196
No known key found for this signature in database
GPG key ID: F76EDC6541A99644
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -1,15 +1,15 @@
FROM node:10 AS builder FROM node:12-alpine AS builder
# ENV NODE_ENV production # ENV NODE_ENV production
COPY ./UI /src/UI COPY ./UI /src/UI
RUN cd /src/UI && yarn && yarn build RUN cd /src/UI && npm ci && npm run build
COPY ./Server /src/Server COPY ./Server /src/Server
RUN cd /src/Server && yarn RUN cd /src/Server && npm ci
RUN cp -r /src/UI/build /src/Server/public RUN cp -r /src/UI/build /src/Server/public
FROM mhart/alpine-node:10 FROM node:12-alpine
ENV NODE_ENV production ENV NODE_ENV production
WORKDIR /dist WORKDIR /dist
EXPOSE 6769 EXPOSE 6769

2
UI/src/actions/index.js
View file

@ -1,5 +1,5 @@
import superagent from 'superagent' import superagent from 'superagent'
import { history } from './router/history' import { history } from '../router/history'
export const fetchServers = async dispatch => { export const fetchServers = async dispatch => {
const rsp = await superagent.get('/api/servers') const rsp = await superagent.get('/api/servers')

4
UI/src/components/oauth-bot-flow/index.js
View file

@ -5,7 +5,7 @@ import superagent from 'superagent'
class OauthCallback extends Component { class OauthCallback extends Component {
state = { state = {
notReady: true, notReady: true,
message: 'chotto matte kudasai...', message: 'giving discord the good news...',
url: null, url: null,
} }
@ -28,4 +28,4 @@ class OauthCallback extends Component {
} }
} }
export default connect(OauthCallback) export default connect()(OauthCallback)

4
UI/src/components/oauth-callback/index.js
View file

@ -7,7 +7,7 @@ import { fetchServers } from '../../actions'
class OauthCallback extends Component { class OauthCallback extends Component {
state = { state = {
notReady: true, notReady: true,
message: 'chotto matte kudasai...', message: 'shaking hands with discord...',
redirect: '/s', redirect: '/s',
} }
@ -83,4 +83,4 @@ class OauthCallback extends Component {
} }
} }
export default connect(OauthCallback) export default connect()(OauthCallback)

4
UI/src/components/oauth-flow/index.js
View file

@ -8,7 +8,7 @@ import { fetchServers } from '../../actions'
class OauthCallback extends Component { class OauthCallback extends Component {
state = { state = {
notReady: true, notReady: true,
message: 'chotto matte kudasai...', message: 'sending you to discord...',
redirect: '/s', redirect: '/s',
url: null, url: null,
} }
@ -82,4 +82,4 @@ class OauthCallback extends Component {
} }
} }
export default connect(OauthCallback) export default connect()(OauthCallback)