From 0a283039db2c8b3a97fe7f25827592a0da6b4de0 Mon Sep 17 00:00:00 2001
From: Audrey Hamelers <hamelers@ebi.ac.uk>
Date: Mon, 14 Jun 2021 13:56:05 +0100
Subject: [PATCH] move props
---
app/components/login/Login.jsx | 2 +-
app/components/login/LoginContainer.js | 2 +-
app/components/login/operations.js | 22 ----------------------
app/components/operations.js | 21 +++++++++++++++++++++
app/components/signup/SignupContainer.js | 5 +++--
app/components/signup/operations.js | 12 ------------
6 files changed, 26 insertions(+), 38 deletions(-)
delete mode 100644 app/components/login/operations.js
diff --git a/app/components/login/Login.jsx b/app/components/login/Login.jsx
index 2e99a3067..529238cf8 100644
--- a/app/components/login/Login.jsx
+++ b/app/components/login/Login.jsx
@@ -9,7 +9,7 @@ import styled from 'styled-components'
import { Page, Notification, A } from '../ui'
import SignInFooter from '../SignInFooter'
import Holiday from '../Holiday'
-import { GET_PROP } from './operations'
+import { GET_PROP } from '../operations'
const Flex = styled.div`
display: flex;
diff --git a/app/components/login/LoginContainer.js b/app/components/login/LoginContainer.js
index bd94b98c0..74455c402 100644
--- a/app/components/login/LoginContainer.js
+++ b/app/components/login/LoginContainer.js
@@ -4,7 +4,7 @@ import { withFormik } from 'formik'
import { graphql } from 'react-apollo'
import { createBrowserHistory } from 'history'
import Login from './Login'
-import { LOGIN_USER } from './operations'
+import { LOGIN_USER } from '../operations'
import redirectPath from './redirect'
import userHelper from '../helpers/userHelper'
diff --git a/app/components/login/operations.js b/app/components/login/operations.js
deleted file mode 100644
index 766b075b4..000000000
--- a/app/components/login/operations.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import gql from 'graphql-tag'
-
-export const GET_PROP = gql`
- query FindProp($name: String!) {
- findProp(name: $name) {
- value
- }
- }
-`
-
-export const LOGIN_USER = gql`
- mutation($input: SigninUserInput) {
- epmc_signinUser(input: $input) {
- user {
- id
- admin
- email
- }
- token
- }
- }
-`
diff --git a/app/components/operations.js b/app/components/operations.js
index 26be0a298..c0da2c4e7 100644
--- a/app/components/operations.js
+++ b/app/components/operations.js
@@ -1,5 +1,26 @@
import gql from 'graphql-tag'
+export const GET_PROP = gql`
+ query FindProp($name: String!) {
+ findProp(name: $name) {
+ value
+ }
+ }
+`
+
+export const LOGIN_USER = gql`
+ mutation($input: SigninUserInput) {
+ epmc_signinUser(input: $input) {
+ user {
+ id
+ admin
+ email
+ }
+ token
+ }
+ }
+`
+
export const GET_USER = gql`
query($email: String!) {
userByEmail(email: $email) {
diff --git a/app/components/signup/SignupContainer.js b/app/components/signup/SignupContainer.js
index 057e05fc4..a964c4df1 100644
--- a/app/components/signup/SignupContainer.js
+++ b/app/components/signup/SignupContainer.js
@@ -3,11 +3,12 @@ import { withFormik } from 'formik'
import { graphql } from 'react-apollo'
import { createBrowserHistory } from 'history'
import * as yup from 'yup' // for everything
-import Signup from './Signup'
-import { SIGNUP_USER, LOGIN_USER } from './operations'
+import { LOGIN_USER } from '../operations'
import { handleSSO } from '../login/LoginContainer'
import redirectPath from '../login/redirect'
import userHelper from '../helpers/userHelper'
+import Signup from './Signup'
+import { SIGNUP_USER } from './operations'
const handleSubmit = (
values,
diff --git a/app/components/signup/operations.js b/app/components/signup/operations.js
index 5392a4ca3..51cb11c3d 100644
--- a/app/components/signup/operations.js
+++ b/app/components/signup/operations.js
@@ -18,15 +18,3 @@ export const SIGNUP_USER = gql`
}
}
`
-export const LOGIN_USER = gql`
- mutation($input: SigninUserInput) {
- epmc_signinUser(input: $input) {
- user {
- id
- admin
- email
- }
- token
- }
- }
-`
--
GitLab