From 51040fd4556e41d47565d5baf2abc540cf37e4d4 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 11 Dec 2019 15:29:04 -0800 Subject: [PATCH] Removed a few container pages as we will be using hooks instead. Cleaned up a few debug statements. --- client/src/App/App.js | 4 +- client/src/App/App.js.bak | 71 --------------- client/src/assets/ImEX Logo.png | Bin 0 -> 24647 bytes client/src/assets/logo1024.png | Bin 0 -> 18480 bytes client/src/assets/logo192.png | Bin 0 -> 8581 bytes client/src/assets/logo240.png | Bin 0 -> 2390 bytes .../components/footer/footer.component.jsx | 15 ++-- .../sign-in-form/sign-in-form.container.jsx | 35 +++++++- client/src/graphql/client.js | 72 +++++++-------- client/src/graphql/jobs.queries.js | 31 ++++--- client/src/pages/jobs/jobs.page.container.jsx | 6 -- client/src/pages/jobs/jobs.page.jsx | 82 ++++++++++++++++++ client/src/pages/jobs/jobs.pages.jsx | 25 ------ client/src/pages/manage/manage.page.jsx | 16 +--- .../white-board.page.container.jsx | 7 -- .../pages/white-board/white-board.page.jsx | 1 + client/yarn.lock | 6 +- package.json | 1 + 18 files changed, 190 insertions(+), 182 deletions(-) delete mode 100644 client/src/App/App.js.bak create mode 100644 client/src/assets/ImEX Logo.png create mode 100644 client/src/assets/logo1024.png create mode 100644 client/src/assets/logo192.png create mode 100644 client/src/assets/logo240.png delete mode 100644 client/src/pages/jobs/jobs.page.container.jsx create mode 100644 client/src/pages/jobs/jobs.page.jsx delete mode 100644 client/src/pages/jobs/jobs.pages.jsx delete mode 100644 client/src/pages/white-board/white-board.page.container.jsx diff --git a/client/src/App/App.js b/client/src/App/App.js index ab5968bb8..e901802b9 100644 --- a/client/src/App/App.js +++ b/client/src/App/App.js @@ -48,7 +48,7 @@ class App extends React.Component { }); }); } - +console.log('###Debug (app.js)| Token', token) //add the bearer token to the headers. localStorage.setItem("token", token); } else { @@ -67,7 +67,7 @@ class App extends React.Component { } render() { - console.log("this.props.currentUser", this.props.currentUser.email); + console.log("###Debug (App.js) | Props Current User: ", this.props.currentUser.email); return (
diff --git a/client/src/App/App.js.bak b/client/src/App/App.js.bak deleted file mode 100644 index 0d808c328..000000000 --- a/client/src/App/App.js.bak +++ /dev/null @@ -1,71 +0,0 @@ -import React from "react"; -import { Switch, Route, Redirect } from "react-router"; -import { ApolloProvider } from "react-apollo"; -import { HttpLink } from "apollo-link-http"; -import ApolloClient from "apollo-client"; -import { InMemoryCache } from "apollo-cache-inmemory"; -import { resolvers, typeDefs } from "../graphql/resolvers"; -import initialState from "../graphql/initial-state"; -import { gql } from "apollo-boost"; -//Styling imports -import "./App.css"; - -//Component Imports -import LandingPage from "../pages/landing/landing.page"; -import Manage from "../pages/manage/manage.page"; - -import PrivateRoute from "../utils/private-route"; -import SignInContainer from "../pages/sign-in/sign-in.container"; -import Unauthorized from "../pages/unauthorized/unauthorized.component"; - -const graphqlEndpoint = process.env.REACT_APP_GRAPHQL_ENDPOINT; - -export default function App({ authState }) { - const isIn = authState.status === "in"; - const headers = isIn ? { Authorization: `Bearer ${authState.token}` } : {}; - const httpLink = new HttpLink({ - uri: graphqlEndpoint, - headers - }); - const client = new ApolloClient({ - link: httpLink, - cache: new InMemoryCache(), - resolvers, - typeDefs - }); - - //Init local state. - client.writeData({ - data: { - ...initialState, - currentUser: { - __typename: null, - email: authState.user ? authState.user.email : null, - displayName: authState.user ? authState.user.displayName : null - } - } - }); - - return ( - -
{authState.status}
- - - - - authState.status == "in" ? ( - - ) : ( - - ) - } - /> - {/* */} - - - - ); -} diff --git a/client/src/assets/ImEX Logo.png b/client/src/assets/ImEX Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..737ab8baf7df2347e756c2de2f9b0c255972c57d GIT binary patch literal 24647 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 Z)KP2bd1QbVIP(w)eH|0+eDrm~{{VeLS)~8~ literal 0 HcmV?d00001 diff --git a/client/src/assets/logo1024.png b/client/src/assets/logo1024.png new file mode 100644 index 0000000000000000000000000000000000000000..ad76341692b6c0c7e3813b828aa7c5f807155a0b GIT binary patch literal 18480 zcmch9i(gb#*Z-bjp1?8@Ol6E11#fxdmWhUdicon0-@ITdj2dDhLZOLrnd4Il>IkVJ zrYO_vTaX}7WZqED69y>=_NYK=Ffl0vsEmq?Fmirtuf1pJFZg}x^J(@z>+)Tfz4ki$ zY}ysNF!<#cN4!V~dHJ2U1OJB*1^iSHyBFX;n%5?N3jcXw&Ai}1BGG?z7jh2}GLpO# zIBRi2cE=yLPi(rqt)->@w;!_pvu!`Ztkt>^{{#!n9LP6pGxxP1a$;i|#!)K|3f4DL=-Xr>h2Nm~jKWV&u`&O^-wVJU_ z8=w5=&=V=cQ|UkgrZx3!wFMwyi-RuZYqoyex&Q{koDWKsk}Lcolg1m$jqY;zCC>Ib z=E5gO8t(GROI}k{Y;yj1Ll2(}^x9;Z9BJrdlL4!hy?ZqdROX9U8Z_oT^jGNH6(1QQ zs9OZNS32hz_~l29rr|P}R14b2m1TC6a@-ZCX?=6)FP~WzCa!0PS4Bn&iX8N%XG#Z( zjMHh2ZcL<2q*m39RydDeYtBQF`T(V&vJ^$yUUBkoW+FpD!J_gx~#ZNr(%K7Vh^%vydT26= z{{b8C4zJD4N$F`z^*8^SuQKaxi~OGbb>PqLvz>n}iJ%C5-mWn1OEQ`?BhfE+fya=~ zgOOF`a&J+tKUr6OCa9E3}Ak+ZGo$D1C zE>H9r>rr3XDzE*<3QIT2zQUd4n8nV{ihBvU88 z2$F9;V#3txl!oB8Hw@Aa8YOW)Ji7jOg=9nHEGU8No9pS4ErvA{{C)g-1|JQD(brX4 z%QK+NsoHCK2BV`@7CtwiJW^%hbAxAJ#aJ|W!?UdW))73*jH%?>Dc^zn))740S0N<^ z0xRrH7|7+BYLIYL+)2<3B6PXJ4d8Rmzkfu3O zrZa&RrbX+`P46JnbYRjM%Z4CRB{1!%kZO>r5nO6kO12J^Db1sA1*+T*QGTkG4y3^( znF%%8rVj&;eQB)CUsi;K#{t5k3jc>F;%O#CM=ANfONBQCgQgG6 zk0&9UAF%B=*3Lzy+racrh5s`2Lg4|3j#9c4NSV&ehv0 zD*Vr56dOU4*-3JqO_>rVLmBbxn~nx<&Vs7vBxU21bFdUX)@l}xk(1)XIm%=ixl)y8 zTJvN~_@lpbb1Jr$_5NXMTUIusXTqev+@(kEhHj12Z3y=7`K>j7W%KP(3eq`HMue6R zoTN9#fs7YnkPCys)XUL>LG}EdMtf@fp`+laUN5aC0Z@q50ITufYIAuBKwme8kj|0i zrqn%hwnn=2Fv7Tuw_^@;s^M@7$skQ@QHmnuv%b<1dn=Ei*Om`K^9=jeSbzr^|AZ z9$oHynDbIdxbY!uv>snUdX}41f894qae=~fnt$SY@bylk|F3He(w}LhcL=1tum}P_ z(4hIEr9vuqkUa$t5E2C|V2W0nHAN}e2P+zK>|ic?3~VJHeYR)Unf;v|)Eb&KaZvTv z{tQYE{zC~BXa@ol{~<6D1iFC0r%wF>J3!!i5cqriKLi$m!2f{2w0{UZ2?7-$(5bK~R7{5Iq2*bPG{p&z07fNN0gI%{?fhc?@h! zA0~C5Z`xaw(v^R_=!Y+>wXvGs+ug|(Dk&++7_2HYwfIS08LqC)z0#xD*uL`@rRNXJ z`U-0O%bs~B)Vn|bulp}8IU1LUlxLCVzsC71laFR4xj6U_ak$+OO*&tZ5nbUxL)l4h zT6lG19f)uNVmmd`Ns8GEo(vQYgM*%qB;>|{)#lSvKQ{XhmTiE=cqR*~%DkP%rlp@7 zr2s`96jr^9oCLh4tkA5;q!k{8t$+=5DlDCtCC(OMn?@0$%>rRdwpoQ8g!Ehr!s-Un zohkGHET*XnB7Eefm3~?`!ooQPmXvlMg<+tZ@eS~D+yEKTCsCc=bjJx;0Dg9dDpHdP zWT$?%kaao(nJ*=qNH;Ac3!!9G+NowMnG=vDAemL#!y$yEqqIts)STg$ZZ_mJ{T)>4 zfNn@Q0y&>e9k|en+y;a=Q6aBceQF0&c692fWs1m%I)ctrNUtKEfLJ*ZQ>ejO$$l4^ z3d=JYoY(uSN8fF)zMQdW?vv4k+;NAhP-W75g?_r00RVCUz+{8;F%twms(7CXYUhF= zq^B>VpxALt5JYq(6I7Oif{OhB;|zu<1;Z|!0{vN4$kxr+3g*#b4S_mn)Hq{=)eAsd z71L&5+SocK*mfCLu_1286egW|>klq@lI6u=;(8Y#B^jbqJK& zWvDG86+wDT1CV=BP?-zU9}fDX5w>Pkj?@!uY+G`vTMBW|IXV#aLOBtPO^1yUO|g5( z7;x!hNbm;??KY-19%gFT%riFgcrXzPISsQY9%j-x4V&p2051&8Su>ckZYhZF03y@O zWN}y}C)eg8`m!mARX0{fTA}nq^dgwkLm_$vQ*h?t9CTG4wBbu(4*}G#o#H8B*aE3D9F~o)eMBIS*G%jprEzG>jW*V6@wQeAWCDXRu%$YkuIfK(OhDGI> zf~Y@1v;4D|t{PZ#-Yf^s9z?b{7ufffpk1{mneFkgUbR#kRCDRRrt_nuUjH}xV9%zN zB7GboB`o=V-@_zK0txRh35`sG0VGUfc+*|cZ09+!hkk*Mh<}5HS|cZ+s~FpI#s(`S zAd=yY8iLxMf|*O0Z?sHM2MC(L{HI)iK0cE}$YNT~BF*o8&Jd|&ByTjvA$J5S(|-cW zSoA`cFz3WTg#V2Z&S_)n+ri80nfek|77IbW8&h8$#FS-2(b|v7yeBfzUUK3wo7vI9 z1Z9Ds-U!nIKpJr@0_MCTItgFD@t<1&M920gYg>=$MDTSUMKU z7YqEKPRLd~0XD8cW=JJwr!W*?&tuwrSdA$Ng7U?(qx>wIuZBjl^GgP@0^=+!0g!7M zn-kXt74;!oC||#To~O-WDT_tw`%KU}5JXp8bcRuCG9S+{2)DEaG-@Qq8t7+bL|(L=7S8O-yv$%LvE^4w4?T9N4jfu`O4SL+>%;@35L% zGm?l&Oq<#sR)Ol5rrqRj8WDd3QtqdYzqbYo`vZyoZP3a*Wt+~t84MfEAg*;Z)B0~h zx|kb8C5t@l?l)Ljw~1nzH*)|9Wt*G5mI+FPV1CPj>BLe38m|EEt5DV#-I+&(_Ze2$ z;b@O_CY6vatO&sBrL9feL>bw@eRT!Z>xao%&lPF5@n#tuJ%F`bkOS3$n16*3Dj#Nt zhZ__9B_V5>XtA0Ja+H&7?)0S$HMCp$m5i;JAxcOmq=i-d9YZmj#P<}$Czv_CU_NSd zaU-IU8^W5!1SrduJXQ;twir2a9>>>9hV)ydu}LY3f$SNSfJ$y;4bF_5O$0ZFmbeBi zaU~Gei%f$s4JqJAPk7ELR2T)FyNo=gO&~bN7xPm%rXXi{vFr3gH}rsoe#}DgE)z7D z2)9{)Nj+{nI(r$}#HxnP9jwKI3kV8lHpls+pt^BH+`FLo(&+K^aTLwuWk^6yf>DJuQEXatdpsRoU7-s&!x0X^V_X?eA+?kwVx}z z8%Pep62qz$kc?=ngNg1ulc;uKGjoZqgwL@0T|I~B^7%|SqnSl?$N5YO&fFMBt}S5h zD`vD-I+zUOJ`nq82CP$$yeh{qm|_c$hB+&~$e`C>??i(hk*j^^=<`x8Dg6dP`l!*tRNFu zQIO?fYb4wTWjuPJndqF;4kV9tq_(;lsJ?I<@pzxBpM>hqfS2Fq>Ps-K^&i6?!j)CO zi;Jkrj%eBLW#jP{3JM=f;(p@hFG2G=!GYd94+GlM+9ChXb{BA()c8n7**{Z%0kmdMr!^jC4;asBBS zW9YAhc{~ttlc?Kie^tuYtPqddpuf^j=N`?*MN9ju5S|+9fyf5^mG4*%@_P*X(vhU| zBG^0;%yExZ!Qgl8u}}H%M9+I>ZNk*sS>r4)TT;umY!?Ym~BJ{6uE9R;W;8Y zvk5oygm2Q~N;cyPr#5UMirH*t6nVn>avSjun;A)-@X9Zaz?l<6$aaf8lhNs!14uG= zOz~K>@PtBe;ZVb{=?R!C7kl_j>nv)HZiGx7!#(u`>q+P?Qp~G0*^V1n-fR-ayBTr; z(_-;RQb6}iNJiosD4Yl+K|@F#PeKxlIqdWf3FF%_@x|0vzamq=%yo6*tG(c$5T5a@ z6vv=lHDgINYiMmrAx1oItV|uw+2ZhpLnyH$@jP{fM2vX$EOID>tzpuEmg(2a#g*Jv zbx2w7@4?1t{(DU=60F`p1@u^=FMq1HL;pdKb&to21f$_T|0bb)n6nKd4fI$do*h;A6A$cY1n9BWT0A%(l|hfC<+%dwJ$++6^Cj^J;?AjNf*j@IGmCTn zh2}$#g(q4R<3vORJyzT?u0L!aUFy(d3GqC~MAr5}kLAp}1Tq8H4D?uW1)QxF+dh4a zT*PxW`tE+WN%HCYTeAVwJZAJGi8JqZ$qY=Lw813Z5{WbdFQRs&mpha+BG2|AQ!{Iik`@G6H;VYO6C7LOgvVWBpOVh6Ih)#-E_QW_Ts&{lHUmMP z9YA6&)^=gmJqG=JTOn=VY=Wcg z-hZbPi@e8}A@_cp+CRhOUGwapLGW$u!-xgf7DRDs%ZtR~&h3cw+&Kk*3ngmYiUJnA zCJ(T9(~sJxJ9g8?GII^Li_oeoGQN?MR`g2V+M8C?Pq53mQM`umt%+dbRIHe6#plar z-aoc4{yX?yf_DL4w>~Y!_&7ynT19rgf{xY>wL%l;A^gWzT`VS&DX2F)`ks|7ZZc)l z`5ly1+?h)n-83v81R;z*IL{zi(>MK??Pw~CmIqG1) z8bqge^0vBCIF4$1^ZU`&V2SU@|JdpkAKVy>eI#8LadD4Y*l{<569w;?(0|oCMvrd)URwg+K~k} zD0m`~bttH`qr+-`@r&r?ZBhMRW{5)GnrPKufSp^y9c90^EvPLueUK$3349uZ!-Kb9A!|!!{2i4r$=-hDl6Os=zPCRR5W;7Njl-U z_S+fp!b8D|v~_ZkRV=%BCb7ZgJU z1qv(r1$Dz}Z5u2r>=)Dl#}XfQ*~Klenxu{ZPfQFJ=2^o|Dq(@VKUKc6KcqfzK6`z) zgZ`U-ZPP*9(mkZs8ZJ@;OW?=M z+<3{?cR9sfgZFzb#vS#l;}4pf4#I(pjTD zA;AFuu&3Od=-~Ow$GumUU3B#CE%AS=XGGOAV}>TFJIY*L+Ytv}67->orM-^}b9&F_ z>?umR`&~rgvYJ}W7}vh#rF|a>wUv!`xB2%OGYqwT9ktD;Q`%2AXK9{g1xG|FBcz^s zx8?;7rN8(~%QUY_wHdB`56Yx{PK1!Rws%cvR^5|cm99&Vrfp5G86J`3pm{V-^TYL% zX$cp;PI=g!;-2#4xN7gkD`PIc<{+6yE!pTfOJVvuL^A@urF~;pT#~A?IX6yj-XpD0 zz*p0mGoi(Nrn#UoN8R(wa&--l&Gk2Z>YrBDlV3I>IdfjpTj5f@v^C`=ahPks3i>(l z#%go@)OJ%w!ZZ??Mo#X6DUV~ui27=Se{(s3v#}rPCqmJuLbIwQLrSZ(3HZ$J+F?5& zYw_-De}A<(*!MNs;nfAglurh5P5{nl{hUUvbZ+Sg$-&)LuyfE&1!t1xtFj|Jye zNOyx?u-c$R#P!O4K@-5+UVTN&Mp-?(_ya1s>Dza$qVq19imFUytG=++`<(DLrH^x{oM0?Wk zwzs`v#V{4Ua%zipL5Oz{RnH772K7R8iu1YtnJGBqJHuKB)PrzlXEh)Xk$FzQJ8ABUUZXp%m?3|!wiIDy6?Fani$~##%QrCAKkwV zUMnwh;c8mmEBxWzv%-=9>kw1?0GT@5Li8pQWjT@xO9HHe5*=xde_5t3wZNQ#FyVE0 zs>MS~Flu*Zlf1PYQy#N!sXSmZ2OcmKWp@uIZNKxp2|_QO%_5=Kx%WMGqbU%_b3E8W z3Cix6OY&m4Y@a~~LcZyU})M%M{CWk4Yy>QBMn2XlAqj4{S91b$T9}&Sx zTQtud!4GYl;6Un5bByh%>$@P*x|+MP4pZR0edL-Y{|j*0){$)t0ivtFqOQA$OJAq4_9B*n{cYf`jQ(6 z$JN9a7?7wS0B(bEqBuVUP0u1N zv97^7QsO8RvUoT|+GS}qOWjD^E)LQMcbwYY3Nqys_hT>mad{@(YqHo+-QU#P*xh`j z$^5Occ0Zi2TBy5$x~H-G;_xO@#kA%ksi!D7;;tiHog6~W{K8{?2f8Zw$ZsPPR`7s| zU5Mn|U~hF;$hm4$?prd!jdNYYX31VoD*0;Fxl#YA!iNx_|8mr<>FV4G-&VPpR?OX0I6}|n zDJH95?!bb!P5jIGvRX}8sG>{RclYoD5qQzJV%DWWg1TPLchG~-<3BAm%%fu9l z1D|Z**5xtldhN*KA31=xG4Jn$5ZwuGN)VRb)hap3jPYEgFm;sFHZRk3Eu$|n(0WH< zFoUsQ0qwzY**|CcbB|TXR$kc%Hht6!)8wP6uzA7;TqDhQ7iX^k3tqd z977X*;A6^0jW3lx>^Vfej=N?h?#Zc-?MU?| zRwRUZ%n?&$!cY#X(-|XJ1E0}$b5Jh0mdc&r6B$n!eGCeRt4hU(IgzVYx}w!M&4bTz zT-^oC4iAX(2@ZTaI_T>c;Ikgj@+a7m&v^|#{qfq?`X9`M_u=y(k6+jkG`Gu+Z01{T z@mR#T!I89nzzk7OMnKS#UE_U&hz*Y>ZvlL+WDte32q-j%1T5na<5|Q8$;nX;s2V$` z)NP=QmsSsKc~$pZiGXi)p$raOP}85{f)8Ve==arF?!_BuS9z&|B-FDI1-y(1tKrMG zJ=dkhl2~pAqC1R8bV8znS#Xb;6J=wElDfqXjySoxc$P`SWF(xggSbiPkUIEOAIW{4 zj&-0MKC_;&2)~Fh!?Fme=W%Sn`fndSgy^?(mvmz*yE<7;?yO_J)w9mw34Eo$&xIFa zM$CbQaEBLMy%!>X0=JT$bE0F|;LL&L(7{^={YQ)lE{&vcqDJ(=oCqL_=IW-REpRxk z)-X%~TagX)donJe5G}!b1l&!3pie}&(wWYS^Ja8_O)S`!z~qQ+$fgI|vN@u#Ow29c zAR;{Gq02`H?8vnvalCm}v-XDGO|9WcQH}N5HXO`#;=&77)A0WWjAm!REoFUd$7UkfJ~IJm7F%6p2?&(VTA zbBM5=%l?fafeV*6crDXnI@%<{1tV^gej~~*hCc_|z*k-kCvqe@-dXC`Ga|Umd9RpN zMQ2Gyx|f|8B2ft80HnYkWt4$`7%&JaAD~+F1#0o!^bjG#|x=1mdG9Z z6eNtlHDIl^p_iKYUe$_g&6Zw#TE*mC!yd(cG2FPh#mv>=JBun0E>LwbjA9S!f{%b? zI}4KlyCVDx9}3Bn?|%t&(3jNu4Uv5UUzE2qQn=o>{r5Hd?K+P>OoChbU)hm%hVBYn z@8T=!9xfl7n{Wk;@9otL-a5Ez6v5zmsBokB98RRTbGi_VxKTmasgZDw zQ3SyiH#JMWHkMV(;fmdDZsi~*_$#;>$MdrSJEI-H1JPPWq-I-1*bYK`BblTc209-u zzP7OSByMBs;H9v0KZ~Fb_H_2}eVI(*6}^%nfRE7PH(a=eH!e%Z8o#DS2_v~T$vc14Qkh~f_s-cnctRTYh#lHfNB_^PU%#1_k@E>mpi9s4V?ep zH~N`R7BuYGp>8w=9=QD3kP%NucpTc}>FAdKS+cSwbNu*Y0~U8|YBwa6wybJT?tUz$ zN0;Oe%5KV8lW|EC(X7(1eu1bLxM|6CFM08}<}!DqeW#BNDgMbJNcd1GYp^jkWtnUf z4#OQ>kDu*4CcBXpWBYm?B~t4RmwAJnWZyZ*YQWX%TbE5sIZeEb1S zar;0b*6sC>&#$r*JsJ2_5F2}Dq5gG@O|c)uW;hF1=U`(~eRq>aRTNP+Od=COOCpCC zI|SW01NdVZ|H#?qtz-LS8^ElYBhXUyCX^ToA?movq887rasedA7!r@+=>67mAo_z7 zF$=MUeAvYkPS0biQAQ%*5ay&%e-0nqKlMC$ky{@~#w7K?&;DC#Nrsq;rBs%{jn zlioG(hZ2ptPGVK4ZrE>_yPkfH3YWhA`a?;lx7{uiV7Eox2Nj zF$ttrvFz8cW}?P{sE?Vbge)cs{8n7RM5S<1;I~P!R8&a@K|X>0-dRP1a;u6f^!){JUZgl_Z+T6IAra!iz#i(nr4~>=SwNJ9L`qIHj}p<$ zT-wE9uDn8E+o$SIa3`n-fW;RP(^F1FJTkOtbGqXb6BEyrmH8JJOp9$?X+Hm~+dslN z<@uk6@;^29IT0F@sk2C9e%_q(_}stXRf zU#D{C5@B294bA0g@>kAQP*vy7pC1Bu8$8Zxd)#}21lM`gO-1L=pD(|9b-}Y16O*za z=y_I(Tfn|CLBjaob1xHOdzJow0o=JG}vK$)YP_)W0cJp^vB zkc`WD83b6bfFIdREzHPZX18^w@=9KY9A+rUGG8hxd%|(QL0U4m&PjGjdUVMja=B33 z^R@@Tz6Y?g#`VFUgU*Y*QTcCb8@Q3NO&W9DZv?O%bhfY+|ETRr0Ji08AS0@%sp6>* zZUlb@Y-1p~B96fYEmAo7xZhY{tAU^~ZN&$*J$b-3J<`f{%d5@svt8(4hpe!dc(u8e z!_0TqnVVj1Yw66_)|pkHEESa9=E`&>WlJK6aC2{(X{4)P{)LL`DShDPp7tU`|GKV- z%1IvP|NO~&^sh^eH(zht&0Vrh^G&fE{da3bV>JfyWyvP(mLx&+R!g9GXL zW}D)vFA(CYC2@{MdvO?4A5%Fz@r9kecnLgdeDh~Jk^#-Y#;?Hd-LPed5osU+wqbEj z(8l!&(_aTdv}9!_=&%PJzEI8xMD6@)_<-=b+nXM8GaQ%%k;2&^a2yCc279Ua8Bip` z0@XXgGM*nuv!$de&1bX!v}w~)Aq8!+4G$hXh>MSZuWxJ8UzZQ~{RcjXjQce&15VMG zje-myjhTy7{y}6I6n8>g4lYv7f&o4`27@_4WQr?&l73*3YHkpz!NEcp1P76YIH-Za zJ3%BJ2UB1$FNho)O?eLPTclbLL|oVa^n?VFMigD>cHHlOwZwUlEzQ)p7-g4dq~cIE zO{B2kpyb6$*;vF=2TaR?gv;P4_(Y@Z+6PphQK~$6up&q}O0$v7gapZQQ0LMd4{%p@ z86y=9N-Fr;dqK&cDP^C4%iyn8!JM^0!d_&#{ly|xBn%)Pgxuc0NEHPG2ONC4NcABM z2IByDqJxBcRI=y?YK}PQUZ;|ashV|)^+8l}2dKHElpRKvUSNq264o@U;Qw|pNZGY0 zN--W?a}Ts^4H7aTZHO>E@<#A62lW`F+NA9IK1y-MiwX{aVqZ_yk=Uxd41YKAXB^nW zf)8*LXX79Q2D9A6&v8%*!JO?TeuaZv7|d}Kcj2G~27zwkJ{)AhV6L0!je~hG2yzqM z*Z?X=u$!2OgL?4Gz96BAf+U5n!bRd* zE-ZTrIullJd^apqh>`A7ZBOf+`%r5j7g|Rj_w(C2O->_8W`N3Te`rZla`#cBJgMz* z`onD3dH-~iOL%F*qP~T}$9(^GhtEmEAE5WYSD~b;U@#dhzkU_ALL7jU8&|b_0N%R! zlqpu*d$k=u#T7Rkfa(>)6+az++;7co&N35Net*P_@BplNlV4>c?)ds7QH=8=k?W-Ps1j{xBl*283ZO{6~s>=t$U0}2n@~n1+|F-5M z@GM}LwkNHz?ec+$SK-l%0O(2G!ed6LEhKcxalaF%KYmm&9BPIz76Ny!_p*1>FnIJn z*x6Ayt~O-}4Az5demZ}&R6i433*RKk5y+4~ssG7R z_+_yEx@-N_V*T~E^;f&~*L~}+ht^+4>#xVwUtQK;-PT{vtiO7#zn=47SXb09DslMj m7yrM8olQ;l#ABaiGj!2~KRdIN-vq~ycjhh(ES#x@9*BR`^U^P=X{puv!8Q5XVM+)t$4T&asdFqgGQM|Oj~&iEny;YNmB`sZ{(26#+_59}O1I3!&6 zoB{j~UtRF`?z9>l_6H^6i~-!;&H-jdAYx!gRF9~t!wtD$`b7T#T_r>z`wlWAK-r@1kLxKNzVC%{wHKRyZ<*j9{(?DghyDM1r71HQU67z|9L^U zOLQnk%?T4uh$Q-9EY4y=BBcIUV%ILZ4!CoeV0UvI9upD{TGs%sfzu>U#ftP(*?cJuFlgw$92H#PMCApEa{1?m2p0}BCIQPloXQozAKiV`LStVBex zKzZ?yVb0=q95+@1O6epKJWbED;n?{l$x9(CKT3H^-)LqZKB zDON(RN?gY{j@1jh<~OJ471+k2S6xPK^z2C?*cmu7Me^UcZfkmES|)kpMb6eFgnbfG z5>=5?R;!UK_H>N@;n(rBv~O?#H7ESjRL(RF2$2<)ORIob`Y(UR|VV65ilX0O1pBw~-cAurF3 zSk@-1mKVdn_Oh#Qs>a;Dxin`s&PMWlM}4}FL@=GccyRcWP>*bgT{UBg^@Jbe;iaOK zpuzZMWJl`E!`Qb%b3aTfNQ9G{Y@2(q4=i5FM}eycXDG@e902w`-TgocmG+4Nz`+k_ za}$?yr0?ZX6Xh0#-3e$^s5zSBNP+wvR4&AkkM9)jpu6#CB*4ci=wRX*>M>g@80ERg zf*T>|p5f%*z&0cl+GXk?6t-VTD7RM0BI6LN#zuGf3Ug}e!^$-+X7p6F*5u&y7P+5< zY>gTi(wYVet*f1GyD0w0$D2!{c%_`Z%(-Ad4;bO4bpUSAP@Y63NGv-o3SDM3_NIZm zfT9ICl>A|uDv(&XvAq@#hyX_=Xm82=r^|-b)!y_11r!47d}(6sF!bCJTzI%|VTKt} zZ!hgOaD_uK431kINLGAcJsv@k?1ntgmN?v8ZzZ9HE~~~XUMIb0rKyb# z`6LeKBCrqYS&Ih_Bofa$14e|C*^-CM$4KLrPkKkoAi)!s<9;PJWBMaa{D&U;1NB#^ z+}BLUHmlPw6;Q?@t0n^Y6nf#7v0Q=6fEN$L0^%x?hiK+~F?NXN2zwSyC^fpH_3Sz+ zZcpMpS-~|7u#t<%)*3$zFjUb{&yqbE#~qLxF#tC7Wq0gM?`S_TA$TGo@d>)@jWdVS zzy}uZC#+RJAPwR;frt|~NaYX)AxUvi8Xqr0cXN*D0!D5m)bd#&+c;=C0%_~IxWx>V zr;|#wn+#q&L#T@6dDy_r*Ku9hflBNhO#xb@UQFgAChaD+eE~vNp#Yt8lRo!xqzMv8 zpL)(plyw{sXJ@zvEO?N!{NDu@(0Q&eyiQ0K&juWFeFMVZr*BzqVROG@46X^q>Qun+ zRqVN^A{J!N9XLNFXg{VeL_3k|D}H<+ME!0Karr^o?B;Y1LhE2l*(!oEaq@l;Uk|ke za`hBe5gP>w^+--LK$qEAzA)saZS&oq4m}p>Bu18T1MAIn> zIDuL#<>pW>1uSo0JxczWy`5*NS0QB<+7cJs#Vt6WFuC7WD)8j6V}U+2f`vYHMYv;v zVl(4F?k9}DlPn4X(&rEVs%5)6*8EInkb2{wu_>yonB|<^b6Er&ui7i0kOI#6qRJK_ zcgjqDlfE{5kRReP`l#f#(=K@mQr18F6*;f;1n;IkCR9F<=0tie|8@x^!$I(&#ou=gg zxIb1t{%M@)%agctHG_)&s7lHbJlq1coEHdag`3%dA}4$ibQ&1w0oCpGc)i%Aao>8M z!He?xItYiiD3CZE@D{$GIX4X`qvVNE%;4J^*3I5Uex2|$c}_fu8$Rvob;1yN>}hsJ z19z3toM)rWXJj8Sl5Ib&9Fn04Fy|HlQfXuQ%L2;a3wa~fcl>G8weS!N(_3sg96Rot zRy^8~b;PE<-8agwyFeM2mOn_>3ERfL6IwVpe43aN%dQj~RO3<*1n5xf6LWGVJSY$v z`>?0kiB{+?2@1-vj8uX!gHfnoDO-H-Slyf7S;p)SvISU>QP3GK!=U$LkAu$hJXhKS z(5DUp-5i+jVB(v(*U+twBpSyagr9w3Ip|9dAkPB0aLq5-K}D;u6NNx6Bw4DzD^da% zKGb5m?U+?immbmrmkfGUC19bkT80C=8Q@hUv!NA03r$le9g@hsZiv*6kdSQBzk<6!# z%ViAiP90o^R4G%nuhxQ9MvRuA@$$%8g7-7pSHF{V*`tnNA!bi}pYrxPN4gShc+YK`~gW@(954+66+E&0wx)Y6Y;ghQ9SuoZ>Q%|e&EA&>alzla?J-uP|t z3Wfm2OEGi0)ndjy-Pa4P&(=a*i2P+UYI+v-$9hMjfxBjvT?LB1hMbK0?S*5Gf_^~n zXbp7LFwr-=PZ7P!kr-9r%Z;xYDTOku0kt6KY>xOnjD5eIq~BlokpA}j_V9VggqT44 zKt)hLdxLD^5=8mXf^%?UgT^7Nu|tzLS?YJ!0Ht}eZ-u>H&ITbke&*Z)@L{q^Jhu-l zj=>LKTk3T6j(*;33{WWFu>>+ruY9xqx(OJM9TIc+jsxsb^){@$^4MZUY-{C0e$JNc zNOwc47;Rz#pY>5|#;!Htz$QEM&TqS}UYv_{??XU(0oA;6iE?>C9xDPlDoUH;jLZ*B z=`1xYry}*E{6>q6dq+oSqK_c@J!cG5J9FAz^LsVLl~ALP=LD2G4tVV~X;A;sS3~jy z7|@wDyCeO>sIucz{MVj=E4U6YqL~`Z_EQEwlI>PN;RW0aPj>t+v#ZoNZ8|nrias0k z;n-L#?7=JYc`#3L+h##^i_loPdd_Tzv(r{TpH@d~dpVrtWzIQMaCt=no8liUoVe_K zL5p9E>mFpTt(@n$Cd~EA@xAP;k2if5Vy!PybJr*oV;~0IkR0d^vV5W z=mM}r$Z1MmD>N;Y47MKYgW-iaDum;4r@**0vJsTTxA@R(jK6T!k>Zdy4y^cWK*{~7 zn@(XeUtWHmDxgee3h@Vn?=6SeGS$R;#XH^%!tn9PdBV6lCKO>OAu>ZnIW$E+lGu5j zq&R6kvgzLvL7(EJ2SgFL&p@sxe+OvG@d%E1qzJXrdEf&y@$mGet~OK|uh#ff$kVA@ z1n=dX1@_+^`-Q6su~w23R4?1H5S z1A@)QHXUw3S8UodsU8H>mMbiij7X(&4*VXG?Hzsl>b%P!=3T>a@1(&^UUF8Tw%fq= ze%hi;aKAE0U0m_BA5{*Nj`1pJg68?i!58d$G z*z<3jX&VXlrendgJYTP(9HWR=tZTHvU}|Jo1&Tcn==i*YFnzAx(u$Mg)AcZTE^2Ty zaFz%paMl~yN-%@xSB%HfNW6uVvW?R+7gA*`5yJEUJp#wDRa)3Kl_)I*?h7|ee?QJj zoi zYKxUq@i8H_$Xk$AGGUkv(V~MB(8JVxabnJ$WMw9dR&=0D1v)e<@t1Y^uT_;FzaTNH z`qEejf(!TivhC~tXvk5^*nu5TFQcvnd3!2|arRzQly56_;k)i()tJ^K9Wrq?HW%Gg zsK}qBlVoQ4?aF#zkrt@@ah5L$uhgPVd8}+N#q9x33IB3)MT)ig2;3kQPWVFsR9QD| zuuD02e8fhTJ{8P;=q*vSiN6Ht;2k+X!LdGCK>a9djp|1$q~s#h^4~3FuZf95*!Qn# zE=k&b)43wW|59u(&MY3$V(z{))FtqsOVs#acbs3(CG8{Rem(vSJ*@_>&p+MeIBefi z1�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 literal 0 HcmV?d00001 diff --git a/client/src/components/footer/footer.component.jsx b/client/src/components/footer/footer.component.jsx index df609eec5..36532e88d 100644 --- a/client/src/components/footer/footer.component.jsx +++ b/client/src/components/footer/footer.component.jsx @@ -1,9 +1,12 @@ -import React from 'react' +import React from "react"; +import { Row, Col } from "antd"; export default function FooterComponent() { - return ( -
- Copyright Snapt Software 2019. All rights reserved. -
- ) + return ( + + + Copyright Snapt Software 2019. All rights reserved. + + + ); } diff --git a/client/src/components/sign-in-form/sign-in-form.container.jsx b/client/src/components/sign-in-form/sign-in-form.container.jsx index a177606e3..87a6a21be 100644 --- a/client/src/components/sign-in-form/sign-in-form.container.jsx +++ b/client/src/components/sign-in-form/sign-in-form.container.jsx @@ -1,12 +1,45 @@ import React from "react"; import { ApolloConsumer } from "react-apollo"; import SignInFormComponent from "./sign-in-form.component"; +import { Row, Col, Layout, Typography } from "antd"; +import FooterComponent from "../footer/footer.component"; +import Logo from "../../assets/logo240.png"; + +const { Content, Footer } = Layout; export default function SignInFormContainer() { return ( {client => { - return ; + return ( + + + + +
+ Bodyshop.app +
+ + + Bodyshop.app + + + + + + + + +
+ +
+ + ); }} ); diff --git a/client/src/graphql/client.js b/client/src/graphql/client.js index f95d7b645..1a2761d52 100644 --- a/client/src/graphql/client.js +++ b/client/src/graphql/client.js @@ -1,40 +1,40 @@ -import ApolloClient from "apollo-client"; -import { InMemoryCache } from "apollo-cache-inmemory"; -import { HttpLink } from "apollo-link-http"; -import { setContext } from "apollo-link-context"; -import { resolvers, typeDefs } from "./resolvers"; -import apolloLogger from "apollo-link-logger"; -import { ApolloLink } from "apollo-boost"; +// import ApolloClient from "apollo-client"; +// import { InMemoryCache } from "apollo-cache-inmemory"; +// import { HttpLink } from "apollo-link-http"; +// import { setContext } from "apollo-link-context"; +// import { resolvers, typeDefs } from "./resolvers"; +// import apolloLogger from "apollo-link-logger"; +// import { ApolloLink } from "apollo-boost"; -const httpLink = new HttpLink({ - uri: process.env.REACT_APP_GRAPHQL_ENDPOINT -}); +// const httpLink = new HttpLink({ +// uri: process.env.REACT_APP_GRAPHQL_ENDPOINT +// }); -const authLink = setContext((_, { headers }) => { - // get the authentication token from local storage if it exists - const token = localStorage.getItem("token"); - // return the headers to the context so httpLink can read them - if (token) { - return { - headers: { - ...headers, - authorization: token ? `Bearer ${token}` : "" - } - }; - } else { - return { headers }; - } -}); +// const authLink = setContext((_, { headers }) => { +// // get the authentication token from local storage if it exists +// const token = localStorage.getItem("token"); +// // return the headers to the context so httpLink can read them +// if (token) { +// return { +// headers: { +// ...headers, +// authorization: token ? `Bearer ${token}` : "" +// } +// }; +// } else { +// return { headers }; +// } +// }); -const middlewares = []; -if (process.env.NODE_ENV === "development") { - middlewares.push(apolloLogger); -} -middlewares.push(authLink.concat(httpLink)); +// const middlewares = []; +// if (process.env.NODE_ENV === "development") { +// middlewares.push(apolloLogger); +// } +// middlewares.push(authLink.concat(httpLink)); -export const client = new ApolloClient({ - link: ApolloLink.from(middlewares), - cache: new InMemoryCache({ addTypename: false }), - typeDefs, - resolvers -}); +// export const client = new ApolloClient({ +// link: ApolloLink.from(middlewares), +// cache: new InMemoryCache({ addTypename: false }), +// typeDefs, +// resolvers +// }); diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 7e8497588..bac31d898 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -1,19 +1,24 @@ import gql from "graphql-tag"; export const GET_ALL_OPEN_JOBS = gql` -{ - jobs { - id - ro_number - status - scheduled_completion - scheduled_delivery - vehicle { - v_model_yr - v_model_desc - v_make_desc - plate_no + { + jobs { + id + est_number + ro_number + status + scheduled_completion + scheduled_delivery + vehicle { + v_model_yr + v_make_desc + v_model_desc + plate_no + } + owner { + first_name + last_name + } } } -} `; diff --git a/client/src/pages/jobs/jobs.page.container.jsx b/client/src/pages/jobs/jobs.page.container.jsx deleted file mode 100644 index 0a614b5ab..000000000 --- a/client/src/pages/jobs/jobs.page.container.jsx +++ /dev/null @@ -1,6 +0,0 @@ -import React from "react"; -import JobsPage from "./jobs.pages"; - -export default function JobsPageContainer() { - return ; -} diff --git a/client/src/pages/jobs/jobs.page.jsx b/client/src/pages/jobs/jobs.page.jsx new file mode 100644 index 000000000..7a9e53005 --- /dev/null +++ b/client/src/pages/jobs/jobs.page.jsx @@ -0,0 +1,82 @@ +import React from "react"; +import { useQuery } from "@apollo/react-hooks"; +//import { GET_ALL_OPEN_JOBS } from "../../graphql/jobs.queries"; +import { Table, Divider, Icon } from "antd"; + +import { GET_ALL_OPEN_JOBS } from "../../graphql/jobs.queries"; + +export default function JobsPage() { + const { + loading, + error, + data: { jobs } + } = useQuery(GET_ALL_OPEN_JOBS); + + const columns = [ + { + title: "RO #", + dataIndex: "ro_number", + key: "ro_number" + }, + { + title: "Est. #", + dataIndex: "est_number", + key: "est_number" + }, + { + title: "Status", + dataIndex: "status", + key: "status" + }, + { + title: "Customer", + dataIndex: "customer", + key: "customer", + render: (text, record) => { + return record.owner ? ( +
{record.owner.first_name + " " + record.owner.last_name}
+ ) : ( + "No Customer" + ); + } + }, + { + title: "Vehicle", + dataIndex: "vehicle", + key: "vehicle", + render: (text, record) => { + return record.vehicle ? record.vehicle.v_make_desc : "No Vehicle"; + } + }, + { + title: "Action", + key: "action", + render: (text, record) => ( + + Action δΈ€ {record.ro_number} + + Delete + + + More actions + + + ) + } + ]; + + // if (loading) return ; + if (error) return `Error! ${error.message}`; + console.log("$$$Develop (jobs.page.jsx) | jobs", jobs); + return ( +
+ ({ ...item }))} + rowKey="id" + dataSource={jobs ? jobs : null} + /> + + ); +} diff --git a/client/src/pages/jobs/jobs.pages.jsx b/client/src/pages/jobs/jobs.pages.jsx deleted file mode 100644 index 34bbff3b7..000000000 --- a/client/src/pages/jobs/jobs.pages.jsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from "react"; -import { useQuery } from "@apollo/react-hooks"; -//import { GET_ALL_OPEN_JOBS } from "../../graphql/jobs.queries"; -import { gql } from "apollo-boost"; -import Spin from "../../components/loading-spinner/loading-spinner.component"; - -const g = gql` - { - associations { - id - shopid - useremail - active - } - } -`; - -export default function JobsPage() { - const { loading, error, data } = useQuery(g); - - if (loading) return ; - if (error) return `Error! ${error.message}`; - console.log(data); - return
Hi
; -} diff --git a/client/src/pages/manage/manage.page.jsx b/client/src/pages/manage/manage.page.jsx index 370013eea..7b7a90ad3 100644 --- a/client/src/pages/manage/manage.page.jsx +++ b/client/src/pages/manage/manage.page.jsx @@ -2,8 +2,8 @@ import React from "react"; import { Route } from "react-router"; //Component Imports -import WhiteBoardPageContainer from "../white-board/white-board.page.container"; -import JobsPageContainer from "../jobs/jobs.page.container"; +import WhiteBoardPage from "../white-board/white-board.page"; +import JobsPage from "../jobs/jobs.page"; import JobsDetailPageContainer from "../jobs-detail/jobs-detail.page.container"; import HeaderComponentContainer from "../../components/header/header.container"; import FooterComponent from "../../components/footer/footer.component"; @@ -20,17 +20,9 @@ export default function Manage({ match }) { - + - + ; -} diff --git a/client/src/pages/white-board/white-board.page.jsx b/client/src/pages/white-board/white-board.page.jsx index aef48c235..d9f74df5a 100644 --- a/client/src/pages/white-board/white-board.page.jsx +++ b/client/src/pages/white-board/white-board.page.jsx @@ -40,6 +40,7 @@ export default function WhiteBoardPage({ whiteBoardLeftSiderVisible }) { return ( { diff --git a/client/yarn.lock b/client/yarn.lock index e283ef6f5..68064a1a4 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -9962,7 +9962,7 @@ react-app-polyfill@^1.0.4: regenerator-runtime "^0.13.3" whatwg-fetch "^3.0.0" -"react-click-outside@github:tj/react-click-outside": +react-click-outside@tj/react-click-outside: version "1.1.1" resolved "https://codeload.github.com/tj/react-click-outside/tar.gz/a833ddc5be47490307f9fcc6ed09d8c353108510" @@ -10980,9 +10980,9 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -"smooth-dnd@git+https://github.com/rcdexta/smooth-dnd.git": +"smooth-dnd@https://github.com/rcdexta/smooth-dnd": version "0.6.3" - resolved "git+https://github.com/rcdexta/smooth-dnd.git#f13924c67bf6ffe4613d97bb1ee83f11d364eb1e" + resolved "https://github.com/rcdexta/smooth-dnd#f13924c67bf6ffe4613d97bb1ee83f11d364eb1e" snapdragon-node@^2.0.1: version "2.1.1" diff --git a/package.json b/package.json index 36cff93ff..e75888b1c 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "npm": "6.11.3" }, "scripts": { + "setup": "yarn && cd firebase && yarn && cd .. && cd client && yarn ", "client": "cd client && yarn start", "server": "nodemon server.js", "build": "cd client && npm run build",