GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-13 17:27:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

mostly seems to be working!

Browse Source
This commit is contained in:
Luke Berndt
2021-01-24 14:08:53 -05:00
parent 2035855a77
commit 11eed81e80
50 changed files with 723 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account/src/App/Navigation.js
View File

@@ -23,7 +23,7 @@ class Navigation extends Component {
{this.props.user.authenticated ? (
<Menu style={navStyle}>
<Menu.Item name="systems" header>
OpenMHz
{process.env.REACT_APP_SITE_NAME}
</Menu.Item>
<Menu.Menu position="right">
{/* <Link to="/update-plans">

18
account/src/User/user-actions.js
View File

@@ -156,7 +156,7 @@ export function manualLogin(
return dispatch => {
dispatch(beginLogin());
return makeUserRequest("post", data, "/login", { withCredentials: true })
return makeUserRequest("post", data, process.env.REACT_APP_ACCOUNT_SERVER + "/login", { withCredentials: true })
.then(response => {
if (response.data.success) {
const user = response.data.user
@@ -252,7 +252,7 @@ export function manualLogout() {
export function confirmEmail(userId, token) {
return dispatch => {
dispatch(beginConfirm());
return makeUserRequest("post", {}, "/users/" + userId + "/confirm/" + token).then(
return makeUserRequest("post", {}, process.env.REACT_APP_ACCOUNT_SERVER + "/users/" + userId + "/confirm/" + token).then(
response => {
if (response.data.success) {
dispatch(confirmSuccess());
@@ -271,7 +271,7 @@ export function confirmEmail(userId, token) {
export function resetPassword(userId, token, password) {
return dispatch => {
dispatch(beginResetPassword());
return makeUserRequest("post", { password: password }, "/users/" + userId + "/reset-password/" + token).then(
return makeUserRequest("post", { password: password }, process.env.REACT_APP_ACCOUNT_SERVER + "/users/" + userId + "/reset-password/" + token).then(
response => {
if (response.data.success) {
dispatch(resetPasswordSuccess());
@@ -289,7 +289,7 @@ export function resetPassword(userId, token, password) {
export function sendResetPassword(data) {
return dispatch => {
dispatch(beginSendResetPassword());
return makeUserRequest("post", data, "/api/send-reset-password").then(
return makeUserRequest("post", data, process.env.REACT_APP_ACCOUNT_SERVER + "/api/send-reset-password").then(
response => {
if (response.data.success) {
dispatch(sendResetPasswordSuccess());
@@ -307,7 +307,7 @@ export function sendResetPassword(data) {
export function sendConfirmEmail(data) {
return dispatch => {
dispatch(beginSendConfirm());
return makeUserRequest("post", data, "/users/" + data + "/send-confirm").then(
return makeUserRequest("post", data, process.env.REACT_APP_ACCOUNT_SERVER + "/users/" + data + "/send-confirm").then(
response => {
if (response.data.success) {
dispatch(sendConfirmSuccess());
@@ -325,7 +325,7 @@ export function sendConfirmEmail(data) {
export function acceptTerms(data) {
return dispatch => {
dispatch(beginAgreeTerms());
return makeUserRequest("post", data, "/users/" + data + "/terms").then(
return makeUserRequest("post", data, process.env.REACT_APP_ACCOUNT_SERVER + "/users/" + data + "/terms").then(
response => {
if (response.data.success) {
dispatch(agreeTermsSuccess());
@@ -343,7 +343,7 @@ export function updateProfile(data) {
return dispatch => {
dispatch(beginUpdateProfile());
return makeUserRequest("post", data, "/users/" + data.userId)
return makeUserRequest("post", data, process.env.REACT_APP_ACCOUNT_SERVER + "/users/" + data.userId)
.then(response => {
if (response.data.success) {
const user = response.data.user
@@ -367,8 +367,8 @@ export function updateProfile(data) {
export function manualRegister(data) {
return dispatch => {
dispatch(beginRegister());
return makeUserRequest("post", data, "/register")
console.log("It is: " + process.env.REACT_APP_ACCOUNT_SERVER );
return makeUserRequest("post", data, process.env.REACT_APP_ACCOUNT_SERVER + "/register")
.then(response => {
if (response.data.success) {
data.userId = response.data.userId;

2
account/src/index.js
View File

@@ -20,6 +20,8 @@ import TermsContainer from "./User/TermsContainer"
const store = configureStore(/* provide initial state if any */)
console.log(process.env);
//This thssi
ReactDOM.render(
<Provider store={store}>
<ConnectedRouter history={history}> { /* place ConnectedRouter under Provider */ }