From befcd4d3c3cddbe2bfb1200a69d4625370b85be4 Mon Sep 17 00:00:00 2001 From: yoBoyio Date: Sat, 15 May 2021 23:57:37 +0300 Subject: [PATCH] Last commit --- Back/moviesProject/.vs/slnx.sqlite | Bin 270336 -> 270336 bytes frontend/src/components/StickyFooter.js | 19 +- frontend/src/components/genres/genres.js | 4 +- frontend/src/components/layout/Spinner.js | 16 -- frontend/src/components/layout/spinner.gif | Bin 8942 -> 0 bytes .../src/components/likeDislike/MakeComment.js | 1 - .../components/likeDislike/ShowComments.js | 7 +- frontend/src/components/movies/Credits.js | 234 +++++++++--------- frontend/src/components/movies/Movie.js | 8 - frontend/src/components/movies/Row.js | 2 - .../src/components/movies/SkeletonMovie.js | 5 +- frontend/src/components/movies/Trailer.js | 84 +++---- frontend/src/components/navbar/AppNavbar.js | 2 - frontend/src/components/navbar/SearchBox.js | 7 +- frontend/src/components/person/PersonInfo.js | 4 +- .../components/watchlist/AddToWatchlist.js | 12 - frontend/src/layout/Spinner.js | 16 -- frontend/src/layout/spinner.gif | Bin 8942 -> 0 bytes frontend/src/pages/ChangePassword.js | 21 +- frontend/src/pages/GenresPage.js | 19 +- frontend/src/pages/HomePage.js | 11 +- frontend/src/pages/LanguagePage.js | 10 +- frontend/src/pages/MoviePage.js | 7 +- frontend/src/pages/MoviesType.js | 13 +- frontend/src/pages/MyAccountPage.js | 22 +- frontend/src/pages/MyaccountMenu.js | 19 +- frontend/src/pages/NotFound.js | 29 ++- frontend/src/pages/PersonDetailsPage.js | 6 +- frontend/src/pages/PopularPeoplePage.js | 4 +- frontend/src/pages/SearchPage.js | 19 +- frontend/src/pages/WatchlistPage.js | 4 +- frontend/src/redux/actions/authActions.js | 2 - frontend/src/redux/actions/movieActions.js | 4 - frontend/src/redux/reducers/authReducer.js | 1 - frontend/src/util/MyTextfield.js | 2 - frontend/src/util/config.js | 1 - 36 files changed, 221 insertions(+), 394 deletions(-) delete mode 100644 frontend/src/components/layout/Spinner.js delete mode 100644 frontend/src/components/layout/spinner.gif delete mode 100644 frontend/src/layout/Spinner.js delete mode 100644 frontend/src/layout/spinner.gif diff --git a/Back/moviesProject/.vs/slnx.sqlite b/Back/moviesProject/.vs/slnx.sqlite index 29b16b9bbdb228b160ef528a7889d6972237c3da..cdece64f5ae3ab3fb599c099592dea39d08b1e48 100644 GIT binary patch delta 8078 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 F{69!Pr|19x delta 7931 zcmZuW33L=yw(r%guI{SpuFBe3JDmj*Ldec0dxWsa5>`P3l1^x$V>Z&A5EPQsj|z^C z1Z#%(=g0_*<2VP9#i&tmkoXxlkN}FZ44^0=OIXyeXTAdeRaaMc;z&5%@7?{r<=%I1 zw;l*oWrw^^{!%_Ie`b4CzSJ?WY!Xg6VjE&hv*p?{Z4O(E&0<6RFZ>Vub^aUv zU;JnMVg6vp^R5C5YX*kt_|S9RwD3b@VMMvd1Q;_S2bd{FKgd0ZV?+()D)%EK|EJCW zY1N1r^dz-7(p64BZTf^`Obnf2xto5XQF3>ORCiFuBgy_fki`^Fd95`f$CUAEm*h}m zcD_kR@2+)s9N(FnlFO|_yO?JOSf^TV@%Pz&v>g<;z-B8aektCR-r%-!!^Qr>1aYxA zj2~!P$o{D29gUSt>6S(ECGM28)wGV=r#^TzoiRyj^U;Bfa8})RG@j$Ww}e|Zs~;a7 ziw~&6v3{&I-5S?XaBLvnuqChK+2fT=UJT?jOWjp&pL@2;=c!rdE%L6asbCll?y2#* z>wSITSUvE097gK66Rq}W$Yylp_}Us@eQi~hyB^-I7RJb~d* z1|{vY;0AJZA%{Ge=g6!&#;KOfmS-0jC`SQ@GO4^8x6kWy)hu<@FD=N)%Qw&w`P2f6 zuJV-U1z~wQY^A3r(|{#LsLK73g<-}#DvU!hly8E&ykQwV}edF<_7!kNT-) z55!Re{Y>hj2OMPFA#7G#ABZKT+FiA7D#PBU=ySD5-8~c~ER}svl-` zH@Sl_viWduMY;~-G{NtBzLP_0}g#82?p!19%Sg7b~#o0e@2s2!fb zp;A91c`=m<=Yx9Gozq4dM7gmXnohPJ!Lj7r2UyluJ3X31Bei2Qt{BIJ_(;zYoET6k zb>jge{r1I497>_YfeV^b5jvZ3HVtLrXc(xY!H5Qg;GU2b-Pj(m`Rt4|!<;mpLqo`h zZXA;tB#pOlD2+-91*(u38mPO-`EH!J(7z$t^gnGeP=EVRTMX1Q8W%NlS-q<|;DLdv zQ@@(wr1lx}iMo9z&Atrv*0iLx|L(?}|L$fiTf+GX=pl?P^6Tu<1q{*YM=COh+@!W1Qi!u2B6Mh; zLf5^-58ZeJ%oe}sVTz4(t$=={y&fc;ZnR>hF+k_eW0|ms;4v7k(92V*ZFB3#klD+M zBrl`~teE13guu|_g#l%LEr|+^MH!TFaznMN#`BoFK4)oFRZy-|p|?GoZkRt^%=P%H z+}>r|2tmn<4KN_! z?4bsTOVby+L0{)d^>r0F<7?~Peb$+n8^IAE^!6ewYVa-ZOE{?!QUk(k8X+?<+|&r^ z*?v7qwH(T#eod;aT~_7JDXQ~$`v^#@p|_Ia)jDr{vqIw^M z^hX0>WW^!q9Y)r#gd}}I2YNU(UR%(e#gNeJ1fE+7xdG3X>7GsW)Vt>_ch%SRF^uFj zL43fSk|uE8=Xb}l-R{zpYEZ4GFip!YWC-mVD(vdSw zke=jM60<}*!n}USX~-}eykzt$NT#o6n#OHcP?FkS6o*f#&lWk1w5IMZ>Sv6}o>fp_ z_7e|!NUbSO!vlMBcr|1PhIdy(x-MkM6b?P4t|)e>cZ#fh$e6M+yz@;D8%FCh6vVrhkGoe#FsC`e0` z&Nb^G#SEoSFyy~}fYOcaz}oZBDkSfhTje~NmA;U+N~Kb??F^CHVSI8K6ODJ_B6Nn* z^#0S7mp*|-vZfuDuoX`rk(_Uba(J|@h3xoWsDid;k#xIonJISQrMHr`J(kC z?vmdX=CDiIRl=vZ2+v}|P4&_Z>7?|Yv;)_uId!ou^2^M5<^!e!Z^eq-&a?}8g2evG zyr2EiWM|j2XXI>gs#qu{h#*{(o8&TiGQPo##)lXOQ)hY8@)EyKP=rT?17d~r0?sl& zWy&+pGdsDP-22?~TsfC*y33EU{A~GvZ{v>$f3)tlK53n2%@Xg4{}eZwz7l1h%(9oI zHmQnzi&<>R?7XlAOf0$nSIA;#Arn@^8xqN=m%+)Jno)}CTHvsYYz)T!hq5@v{0kDW z{|!&_{|>3@3k}0Mzj_&1M%~pC!&(T+rYsq1MpL!SuSE2})!-z%{thRkH$#A2b}_+! zqbV|1W(3myCBvsgppC+KBmgoo5o{V}{K+TVRbTC{%0#aZW|!#@#@2KJapw!a~<+EeEpIye)(k-<(6inNf`fGH3@>gom+CLtxYJp_%Bd&h&LLP zN*~3P=H*m8(uAHu--o7NI{i+YlDeH>A2^Efzd^L*p*=IS`-v|5sjC_)+%-DjlAnI} zPKX{qigA~ES5$d??m{ikpbO}0KXqT|m*}hCfSyC={esqShyH#8N&YT~TS5(`Z;y}w zZ!P)+9r5%38h!{J{!h5X#xcEI4Nd*7c7DGN`r+s(HUl$#Ut?&kI=6W^$=V5N0|b5q zdJOM3;r;j;W3?QYPs%UL4RSUO6{m!^q*o-5wON`arI10pAx=!SdMr;{$BA35Gsw){ zkkK;88Y|uw|0TX>S!tQbd&C*0KZ;mfD^`mOnAgO?5G^K)5kik}j%i}tmK55YIcMG_ zydrEcKWScI9%N>@FN6oVzjJHZ$*^7+B=Fo4I8U27o4H|}z*fQ@(?!!qroV!R|2^+D zJQ*$*YI?J@bv_ee&aO2jl)df*@;@MbcXfWsx{V)NFt5zz%W+255Ef2Y_v<#4`c*@)wvvEWl4p0&L^E_~rZ# zehyy14}+)pe*B;Kr&*ajfm`wOreu?i{Xh0Hdyqc8uF?)gtGJZL$Q0`c%jebv>t^|) zb*(7N-SR(}5vD?`&pL;FiER__il@W_@H{i0DP@*39KH=JU@G)uerB>RG4C;3@m{7C zZ^9>W8LovgxDUec1?CIZC;UvCAAb{83gd-nc_Z0*0RGD0-;udpFf6JNS+wBCLyR8Q z#yDUsN%;%JlefFT8^J*&PkSNIgUrk7>k?rkquyQ--C6n`6k@9g2}W?D_4mWE;9!gb1U)HsBB#G)X)24N?Y_=&2Vo;iu6+oftAk31 zuxtT%)U6GVnRytTdRro|h1YZv0D4zBg)kOPN6B|jgbr>&?PV%40* zshwSiA(Bx)TN0@ShdA}xl71<44{y_!2p0v}m_B2?ZlAx4ms9Djt%;(@&(yrq0&S;X zR9!zM#%iNAlx}&g*Ox<2&m_7m=}^KDTn|YmEnYpRb}bsf#>0J>lr(~UYQ4Y%YGx`K zTO<8=Rz6{yDnBDvS@y~k)Pb<9p%o-N*b)!Jp< zWa*(vE*A##W-{$43~AXUJ}s`Wcq}9M$)ad_Rd`<?eyRPrg7Pl1D3me))hO>4tUkD011n?iqkHY~!OmB(Q+N8UUMvmFk^ zYMsqrSDrLLJVY;e$|;znCeFTX7PcZY?Ru%UIcenS(~!goUm@E1A+MZ<+;DoF0(FB+ z+=;l^ZgTlFyrIsV8^PEnk{8c_z4QGuH0r7^&Rb-XOvqHNE?JO8{%{u7v(gciL{e5m zJmf-!|9WZ<s_E0LaC0tcMhu6@P`URgn#E|kOTURLd{@p(%NLP#>}La<({3k}y_ zfarmKeQ`=Phn$pK?+w$0iJmkhXDGDH8%c3$-ltKvJ}7eY0wlNiB{-Byt+B{+^JxEh zy4$zBcB!}byV$AFnlGE;bq&8kk)$lw%TfO>{sw_lp+%u4qHl61&wUM?ULwRQk5D%# zMJUZ1UN{stx%D+frG8^T?8;JYDUJRC+HW98&)1NU64;0GJ~aO@XdH@57x$$Bu`6YL zNZ&CKr1Tp|=pPVAtH)j{_Zc+V%3=;pVo1?daE7Ck1~^k$L^}@*DZ2&)P2jRP~SIEng45aK~8?KEliGG z3?86c7a=21oF!g@!iNLfKZo*bi`lC>%R|QuOB~AVU*oC#5I$0wMSCWcpFWPzUW1El zy9CL`PL%Xny0;A)r!s@ME`z=QCkDi>Oz%VbmVt08)BL2VhYW~anc9c6(?F0Vm+5Q4 z?;2^n3{iR)%Bf7&b$wva*_BCs1iWD&oXSL9*FO!2T`BHE`nrK2^0z@<`QL_g-LLEF zGU)6|Q6B-X83?B`PS^FW0kJEzp6zwe_816qfGW^$tX&zccROfbKf8%O(+!$fg;u&w zdQ>z7Ef#vA?8?Xx4@CueB9##wil#gbHJ(s=%dXs~lh=BidZ};>oe-_cw90&xrd8xpS!);q(!%Nc_^UZKBzXl>&lvX}X>3jOsXq_wvL zB6SIg-j#~yAI(xZ=sUTp?Ml2zmxU@41dX@ z>jrDS(vLPc0u)KMz8$j_An57|F3Q;uf%QhP ztuy8Z4M6^tC{W@#G)Hf5?|L63YtXw~C6098fCSQ=%!s|5J{%Hr_eQV*KKf>;0ZxC9 za0eRZG7}ZiyU93NiQ-U85ZNz0sLp148YP&mh*)mH(2kU_BV4ETCurdqltaRPf`Of# JcVJ5D{{z(DNGkvU diff --git a/frontend/src/components/StickyFooter.js b/frontend/src/components/StickyFooter.js index d2ba97ab..cff5cd02 100644 --- a/frontend/src/components/StickyFooter.js +++ b/frontend/src/components/StickyFooter.js @@ -1,17 +1,18 @@ import React from 'react'; -import CssBaseline from '@material-ui/core/CssBaseline'; import Typography from '@material-ui/core/Typography'; import { makeStyles } from '@material-ui/core/styles'; import Container from '@material-ui/core/Container'; import Link from '@material-ui/core/Link'; function Copyright() { + const classes = useStyles(); + return ( - + {'Copyright © '} - Imdb-Clone - {''} + IeeMDB + {' '} {new Date().getFullYear()} {'.'} @@ -29,11 +30,14 @@ const useStyles = makeStyles((theme) => ({ marginBottom: theme.spacing(2), }, footer: { - padding: theme.spacing(3, 2), + padding: theme.spacing(1, 2), marginTop: 'auto', backgroundColor: '#2b2b2a', - }, + text: { + color: '#fff' + + } })); export default function StickyFooter() { @@ -42,8 +46,7 @@ export default function StickyFooter() { return (
- - My sticky footer can be found here. +
diff --git a/frontend/src/components/genres/genres.js b/frontend/src/components/genres/genres.js index f6b0221f..87e7d892 100644 --- a/frontend/src/components/genres/genres.js +++ b/frontend/src/components/genres/genres.js @@ -1,9 +1,8 @@ import { Chip } from "@material-ui/core"; -import axios from "axios"; import { useEffect } from "react"; import { makeStyles } from "@material-ui/core/styles"; -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles(() => ({ root: { color: "white", background: "#9d50bb", @@ -35,7 +34,6 @@ const Genres = ({ return () => { setGenres({}); // unmounting }; - // eslint-disable-next-line }, []); return ( diff --git a/frontend/src/components/layout/Spinner.js b/frontend/src/components/layout/Spinner.js deleted file mode 100644 index c2957839..00000000 --- a/frontend/src/components/layout/Spinner.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react' -import spinner from './spinner.gif' - -function Spinner() { - return ( -
- Loading... -
- ) -} - -export default Spinner diff --git a/frontend/src/components/layout/spinner.gif b/frontend/src/components/layout/spinner.gif deleted file mode 100644 index 0424aa4ffda24a189ed8487dddd63626bceff0f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8942 zcmcJU=T{T$+V*EAnG^_^KnMXTp{SsU*pVA0q>#`f(nSqQQ&B(>5D+I2AoMClTIfaT zD5$6bK>>vuMJb91h!iXKjt~1@?}z>D^{oBvo%sXinzfGWIDW@@a?H&Pcen!}0G6u* zfByXW`t|F(ckgCrXD22mhKGj-1_rvjyRTore(BPs+S=Ok^78!r{LIYE#Kc6QP#6{# zcJk!OqeqV(I&{d@)z!|<&ceci!C)8}8ExFSQCC-2LqkJJNr^}#;&3?N|No=$N7{yM zzlUkcV{g(oK!M9&)L0@hPk6cqdV0`;4+r|tIOf(oK;t_a#sV}z@1G+r|2u$Lq9guX zJ>`_1vJ<_&Mn!{Ffflu{^`jSq?!F1VIoS|mrJwird`oEm@oUc(+rn+?pS=6l9`X0P zpMMZRWRx&ECRP*|pOBc8oRXTBo{@PjD?2Cmd|rM*VUf7Fq_nKOqOz*G=EB9=y84F3 zrskGQms{JeT)ozQ{l-m6N9V1s?%Q{Idi(C)>mT@g@cx6LhmVFwM#mmM8GkzQY;tP) z`OJ&ix%q{cuU@}-`)=|5hmW5=fBE|D`;VW$elPt2P*N(~260CePJXRhPebvoSfZ9i zKDV)?JAu0S$aqg<>75i>0h($+qjT4TvN}9}$xQD$m}0r! zd5=_Dub@-|OLn#Z;&=t@6deSZ>Ht$=g3ngkWY19U?gVlw{qox3T8yvqcZ*Lrbd!fV zqJj(qgPOj#WX;eeHJ3~Z}Mh7vU?gy(gLEml82utr#ksNGHQ}mHrG8h#{QQEUo0XbQ(e8e(Q zTL{RwExJchd3=D?FOxMK%|nanuv&yj085M82D#fRJYjglgJ1#5kU>TwT=5HCfPSZr zz=N7LuR%VghVsm+bS3$L!#ma}O3zf!6`o!#IcK_+ zQhiS3ELt5}g;{a2*H#>crq7`&2VY4?UHg~54h*G7YObNn(ewfZ-F9WSaQDHfm1k9U#!<2y z<~bT>e|o*553hF3e94E!SA@0CcbrdcSz_UeLh3Xt}3=UmxkJ zo6vQ(;LP6aoAA@4*`yz&*XlP=kGbm^yqdf3B9?x$(utR)dXBrUP-ndoGamoQxwNh@ z2HgyEji(E^{?`<;w57rFQt;u$`=^;*1jNthGrAsp_>w^H+VH;Jfy6)|C%K!o`WK1% zC~Ersbh)%GfKn8?9C6z7w9#x;#F@{7@4D}^`N40$&xvF8 zf6SLe|`J&odmn#*J78V->>&Q zYwCY}xVQb?uaASA4ZlA}&uV#7LJ)=jB4>jHa+6 zHY&3epIi~fs$$io#bZmeT61r9bX{Sh+t1Lmgmlu{}D|=!4+SMc|w(eiFHW#!X4=$+xww!DKmpmVI89VE?A69twKm4Ev#_ON zf+TrJ`8!fpNs|`xTWGVs(Ro|=;vg6m1r6neTv7Vd8@1xw$jK@RzfIGd6Zkb6R0)|h zjldi+FootxySuGT$b&R8sLeOUVl{F5(F0u?8;e$YhwMH;^2SN%80u{6ek{d+HthPs zbiPkH?Qub>rvgZ!+>3*aUx1<3Wo2o2HDgY%z^{6A%V3;0(?CPbm8 zrI<%c9UE&kIIcn_VBp{or%;n{7IYSg6fzH3#fVanMDOG?X6f0C_;VPvV~%Ye8(ox9 zn#RmP6=6^%HP+=9i_rNsF^ud>U|ms^D}+K>)v z-K9~J54Ojy=&pXX{T0_ZkwDSLMRN{j#ZVQ>UP9G(fmot-Q10bbre@JX*O=2g(zTY< z&bv7Vsl>Ca8%wzfN$FQSWW|Sa(5xJbOE2wl1X*B}5i4?}o_~|Um1Mq3Y4Ew8yngS@ z#NRDG>a=#JdjLQjrPy6U>IUql3@(mn@bSLEk(0Wc-}_C8HI z+#sVB{E&gbn9f)b;t~+L?aPMZOqQ^mN>f0b*Jp!8pIjYUsQn%6qY zU@j~p-7a{bbL2_llGIRX8-De*0+8{=x_<9aQ1kC3ldrGNx*lbOhM7d~hmXZDqV@~I zM7Gh%DG6-ooGS|8fGBac#Yqm38jFU{^UTdq)fgCEYg_3SZw56uW11~5n6$8NSXBt? z;P&<|PPIigy2L6Vp{Tdd*{72Q4BHgAPF@`yyFY0OK&bO&`vOM#nxH2`SI>WP02bRH z&p8xD`|c(Y{pi5isrKLW9(J;EjN1be@!JOFU7N74JUqJI+i+H48SyHoX^zT=)nf^K zNmIFHmb4sTxnri>ItQcw;8(!V>{4WYQjna>ShJ_q#)XFh*S;;8s-Sl1?M-W1Y6fb2 zwND@R2i7U#iPS-tkpXKE@3YF7H)+Fl*$%3du~&948m?tcEY%jX`PV8?GUQ=c&v>6rXg-L zLCL_LZ>hb^UJ(m7WH;ya(xfY_6Euh*>Nr6zk$N1^U^tJOWJ%H7gc(GF+OF`?hSjF< zoRa<)ovo8}2#wK1<^1u(g}k3BH*Q|0`)6;UkVF`4nNTWEa5xbhj#s;46#EGMV?`yZH4UcXfsT5a;(4_9U79z%uK=f zGU6CeVYUk^p%6?f@v4ccwob@0DNH~(V2f2+E9*Q4jl`jfSs`e2KD){U4PEWC_NYn- zOEGDP9~m~eI>zcZL%FiY8M*E79VQB}J!N({({0KuwgsNB1oENYX`5d$&)bkgC;ax8 zoIE!3My_eVVpnwH(&x0{3jWHtgQL#AkIJW3rKm9De`)dQjTt(&CGscNmfr>MHQ|oJ zNVYWxw=p^K)R5a!=DEL4e+d^F_|z7&vbPFn%DVf-5r;BCVsL z*I{Lk%pr`l92w{1sot~$MeSiH(6rc>9Vqt-E=(fZ*4;E*J$TLOcw}zTZF*IjrVNzkccQQ`52)I5T*@$f^eNc+ z{5Zq4H93_(F?sz`H?a-*5fw}5j`qko?tT}+cCPXX@}_r0zQZ9me!dzojeV*fy0^(- zC-W2l5Is^Fl;c43^}cO=gX6d0zfBrAPn96U)Tby>G>ML$dvn_q)q#T?uTr>;lxj0C!1D`**LdWaG|YAP(>9PRFQ*41%IPm$6>kWe8sp&wWIqDMs0O zaGJzb?odL@>J550Vz)>DXaCDif;F)!4T%m+K3@kG9(3=3DfHAT1+4QodSFUP002ep zm-}B7duW+q|N1wI?fNI~}ARBZZGo5?oNW~>q;LVUb@rb*ilnHeE7FqT(yGKecp$0iux!{lh zd}@Y)6CZO61J76k&~x(|&MWhapKTV7yqFN>Nf808?ZnNkfGj56$@bp$4KM7+9&mQ| zh~uf7PgppMOF1dN`M-0%+Gu6OuFhj=WR5Xl?SC5U=HafL&AcG!W z_6aOOR?1@|&lIvSmL_<_DGoK$yG_;x8is9W3Q@5%eviMP<0^=!8t{19i1CxFb)h+R z?u7>7 za8nT)=f6e)Qa}#f4C^e>KzAcL(;_&>IcXQk-&qj7!6JusVrC;J4U&o;}J5xUmjq6hj=mrL37iTN{*x6F`{Nfqh4-I8<}j{GCu z*LwXf>9HWrDcIYB6>b9UIV%#x+lGolg@VILtTc8?;yDhOzz8+Tbtx&}M0n)HGOH_X zPFR;|sU9jO=eB9lnra@^>~201Z5Oysek)$n9{2_qr^fsw^2d87$tr$9ge}~7 z4Q7n=$H&(-8|aZ{*OUzC>_ab=$qgjEhj3zXCkj3H?LEtqB@tj1C{Mci8j+E^{_fk> zg;mTG;LdJ8ARf$;LSgq+lLt2wCq~e@+qVZ1Ikjj!Z-y#z>hbkGfS*4R1Grd4J-fLw zgv9egC{wp&&>6qb5&@39mditQ=+5)R7!|&x5L~$xZVFCwc#r(9ht=pQ4fHc%U%fjr z_ko#DH6;*<{uLm-y40GW`9X%C#RRD0XMQAY$>iB<>IJkUD*Yu z(DyHUL)lw;CiHI*7ByUiJLm_Gt{I@lBDWfyDG>ffh%gbD0H^$EK@bA5KLl&Xn(?>0 z?e|;-n4(EJKIrr7UF;ell$=BL$wF`rTp@)Cjo7{i< zA?>J6Vw|tLo0>jO2JH~S3Jc#GvHP@1v`J))t+z1QLdXWhn4I`Twjj5dmB%RB z9aPGO@(QAk@#-&BAF66$cw?LQlw>w~1e?Kf$}1_-ohIhCtr<5saD^FexeltS$YV3o z?DpSd^>K2TII61pOEqN@CL?cfHzvvX1p`YNd8w|ZswBhf%_y0h#zFF05=Fcu= z06of}Mmu`J> zsd;Wqwqt;-7SMshUoiB79@8Sx4^!s9Dak}jAYA>)TfZO)nO4iKC>$tw0>1IOe?$8e z-8dMH!6LC!y08vvq+iRB%U|^>!{~F*K0o~_0i>y}NHj~?{Or_TUr?K&_xRJSAOU&!2?e=@e(J>^$GHz3X^ZG1wyy zY4d3j`+RZHfu3l-B+j}#$1x05y9t5Ts3EcO&uT}e!8L`g&lAhS+Z2E=Pg{{>W{CrL z9dq&Exj4-1$c*UHxMy*?fsCY7Z&$=_Nfsg8Q<%+iJ#km(&_pGm<70FC<0l5gb!Jvaz#ZZVK~?F zxGjdH&zJavk)Rg5R(K7WzbihlPy>*2G*B^8GWsyTK}s$rinj?QN>a>09C@8Aiz$={ zWmkqI1vL9|yVM~$bQf>;izOJ3%S7`4)4e7dTaNC~9Yh!w=O}7{?ws!Ppq_n_N(j%L z|MxkXKuO2H*&M=ALcU}IugL;fUT43~wer2gx*%c8bqO-u0R}hYMlD(`rY?)**U6gE zm#+^|)3T6IJd*>$n~qMnY0shXVrGJ@s^MLCXGoO1UnX>;Qhtp~O3*R6M<8Z}=KMte z-qzhim`G{$h=z((R8Ph_lf`TC$lPEllf%Adls+_^0#FfJ(q6vS3O&AruU7iNeprD= zzp*oDbyl;R`QVLRTMhe*eBbTAc|EdWOkra>`26!7WV!4p0)T&JG#nKo@}7ingro#>IT$WiKWKlA5z(^G$uNCO@9q(2ZHEUkyoP8G!IsO$*Y z86dxEjV2pNEcN-ipB&b1sIp1dOL5vidxn#j(UJDZ65)O`Jm~FqB)H6GpL<6V7tF_qFftblDX9W@lDo${Vdf$4o=N^HB=Be*5N27WoF&&UMDt)-l>;`vb5815 zmpN5NsQyfumag#g9vnZdIs7H7>VRM6sXJd6pS^oK@q2b#W^I6%%;l>-2G?NGRw)ZA zj2zgd0#{9hyL#C3cl~Jeri0il!Pp8f2OMl;(Zv0BH`+rxGUu!GO-bbffPXqg51&{q~7VtOS$S52XXrSa#EF zOMaUY2j%N%yDg9SHD6wHVw9DgG1z@?$H7g^qGZ18{n=o@32qXy+YYtr%+{@2=L$zW z18qrXhpYFb8!hOAiftzdJyIj^PtF zOpui&*x~|%Ld+l;3RRJWMc9}XBsr2SWF|Tl%vlckGUb>|CWa_?k%R*p8VlpiP$X3~ zbu|^KDkfU?;>8swSj}Pr9tKEQ z*{?>)pJw7NbP~>*jIl73cPjW<1$UZW1{k`~f)9~&Z#E;UOhBi19okh$xroO8trMVKee7QD>7;p9~93P*ap&uAPc4c2b zg6W8CiSKu&tP#_nBbjS2RCGD1xb*rW*?5{;$$PCXnBY9n{{6$WN4}+^!Q*vY)M)e3 zJF-u|^@H%`ggX&#mcZik?(FOnvS&iy2u7IIJNR+Ge|~|7@1&ePed;?Wa`iJT*nWyYc?PnB%^!194{KJu!gA)#4E$i(ajI&g#V> z&!9ba3-^h8(>Yzhla1za(L2qqjKtarzpu*L-8QBTK2g0=n4jpJL!()D2cQe>H+fec z@f+TR6a;sU#eh53KGxn6X5@-K)zvTmPsakW!2h`+00kfZ)v^ALVhCvT`q9_*pum{& zxFH9ZmZSdslfQ%l58Hgv6NCd}l7A(EI^}>a*1H7Wy z7&%2n3K^fAl9n!=lr1!aWEH9P6kI7wDm@(!n&q5i12{5ONr_5sX5lWUW3JY)P{fW- zMgDE(rOQ%KbuJsPaGxsoh=nar$7Y#aJ8uG$CL5o#@V(NJ%vVg1K$(2~93bpYb{RKz&)E|(kYO$|-odL?}sQ`xoMoeqK^U$6_NiWcTK$@s? z-phXoLot+CzZNi~eR(#s@J~A{q{d19PWfHQJNb;%=o8%#xY1iiRw{GggJJ!)ttpOPNN;R5Z=N)$2M$I;=SgY6NCP#H}ef_np?Xv3eXAS@A|Mt-;$v$wI_fLIB zci#9q;Jxe2#=3Va8*M$t{sw=^+%GgvB2*OxW7KfbYPVdYeRJB9MEPPGns+sp`?c; z+Jm3UPPS?nmdVq%O*x5Jayt}2I)?v(YFl@obJ{61dlh%2wo06qQnht9((~oXr%8wP zTxN)NeYm-}BizGX*#m7ZGI=4}I`&0{&f+U$R=tUv6~}DZkr0cT_nABU_0;JK;}bSU O7>g_~XKNzx*Z%+t`<_t% diff --git a/frontend/src/components/likeDislike/MakeComment.js b/frontend/src/components/likeDislike/MakeComment.js index 76ab9ae6..2ad13af0 100644 --- a/frontend/src/components/likeDislike/MakeComment.js +++ b/frontend/src/components/likeDislike/MakeComment.js @@ -88,7 +88,6 @@ function MakeComment(props) { return ( <> - {console.log(comment)}
diff --git a/frontend/src/components/likeDislike/ShowComments.js b/frontend/src/components/likeDislike/ShowComments.js index 748169cb..03748c9a 100644 --- a/frontend/src/components/likeDislike/ShowComments.js +++ b/frontend/src/components/likeDislike/ShowComments.js @@ -1,17 +1,14 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; -import { Link } from 'react-router-dom'; -import Spinner from '../../layout/Spinner'; import { FetchComments, CommentLoading } from '../../redux/actions/authActions'; //material UI -import { withStyles,makeStyles } from '@material-ui/core/styles'; +import { withStyles } from '@material-ui/core/styles'; import List from '@material-ui/core/List'; import ListItem from '@material-ui/core/ListItem'; import Divider from '@material-ui/core/Divider'; import ListItemText from '@material-ui/core/ListItemText'; import ListItemAvatar from '@material-ui/core/ListItemAvatar'; -import Avatar from '@material-ui/core/Avatar'; import Typography from '@material-ui/core/Typography'; import Card from '@material-ui/core/Card'; import LinearProgress from "@material-ui/core/LinearProgress"; @@ -81,7 +78,6 @@ barCover: { borderRadius: 5, width: 80, background: "linear-gradient(45deg, #9d50bb 30%, #6e48aa 90%)", - // boxShadow: '0 3px 5px 2px rgba(255 , 175, 189, .2)' }, }); export class ShowComments extends Component { @@ -140,7 +136,6 @@ export class ShowComments extends Component { className={classes.inline} > {comment.CommentContent} - {/* Testing Comments - Real Comments Unavailable for now! */} } /> diff --git a/frontend/src/components/movies/Credits.js b/frontend/src/components/movies/Credits.js index 2c360804..1c7272a4 100644 --- a/frontend/src/components/movies/Credits.js +++ b/frontend/src/components/movies/Credits.js @@ -1,7 +1,6 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; import { fetchCredits, setLoading } from '../../redux/actions/movieActions'; -import Spinner from '../../layout/Spinner'; import png from '../../images/castMissing.png'; import Carousel from "react-elastic-carousel"; import CircularProgress from "@material-ui/core/CircularProgress"; @@ -17,42 +16,42 @@ import { Grid } from '@material-ui/core/' import LinearProgress from "@material-ui/core/LinearProgress"; import { Link } from 'react-router-dom'; -const useStyles = theme =>({ +const useStyles = theme => ({ container: { background: '#141414', - color:'#fff', + color: '#fff', display: 'flex', margin: '0 100px 0px 100px', - border: "none", + border: "none", boxShadow: "none" }, item: { background: '#141414', - color:'#fff', - textAlign : "center", - border: "none", + color: '#fff', + textAlign: "center", + border: "none", boxShadow: "none", - height:380, - width:200 + height: 380, + width: 200 }, castCharacter: { background: '#141414', - color:'#fff', + color: '#fff', fontSize: "18px" - }, - image: { + }, + image: { borderRadius: '10%', border: '3px solid #141414', height: 250 }, cast: { - fontWeight:'Bold', + fontWeight: 'Bold', fontSize: "32px", marginTop: "10px", marginBottom: "10px", - textAlign : "left", - marginLeft:125 + textAlign: "left", + marginLeft: 125 }, noimage: { borderRadius: '50%', @@ -64,17 +63,16 @@ const useStyles = theme =>({ height: '125px', width: '125px' }, - barCover:{ + barCover: { height: 10, borderRadius: 5, - width:50, - marginLeft:125, + width: 50, + marginLeft: 125, marginBottom: "20px", - background:'linear-gradient(45deg, #9d50bb 30%, #6e48aa 90%)' + background: 'linear-gradient(45deg, #9d50bb 30%, #6e48aa 90%)' }, gridList: { flexWrap: 'nowrap', - // Promote the list into his own layer on Chrome. This cost memory but helps keeping high FPS. transform: 'translateZ(0)', }, overview: { @@ -86,107 +84,105 @@ const useStyles = theme =>({ const getImage = (path) => `https://image.tmdb.org/t/p/w300/${path}`; export class Credits extends Component { - // componentDidMount() { - // this.props.fetchCredits(this.props.id); - // this.props.setLoading(); - // } - render() { - const { loading, credits } = this.props; - //material UI - const {classes} = this.props; - const breakPoints = [ - { width: 1, itemsToShow: 1 }, - { width: 550, itemsToShow: 3 }, - { width: 768, itemsToShow: 5 }, - { width: 1200, itemsToShow: 8 }, - { width: 1400, itemsToShow: 10 }, - ]; - - - let castList = - credits!= "" && - + + render() { + const { loading, credits } = this.props; + //material UI + const { classes } = this.props; + const breakPoints = [ + { width: 1, itemsToShow: 1 }, + { width: 550, itemsToShow: 3 }, + { width: 768, itemsToShow: 5 }, + { width: 1200, itemsToShow: 8 }, + { width: 1400, itemsToShow: 10 }, + ]; + + + let castList = + credits != "" && + {credits.map(castMember => ( - - - - {castMember.profile_path ? ( - - - - - - - {castMember.name} - {castMember.character} - - - ) : ( - - - - - {castMember.name} - {castMember.character} - - )} - - - - - ))} - - let contents = loading ?
: castList; - return credits!= "" ? ( -
- Cast - -
- {/* {contents} */} - {contents} -
-
- ):( -
- Cast - + + + + {castMember.profile_path ? ( + + + + + + + {castMember.name} + {castMember.character} + + + ) : ( + + + + + {castMember.name} + {castMember.character} + + )} + + + + + ))} + + let contents = loading ?
: castList; + return credits != "" ? ( +
+ Cast + +
+ {contents} +
+
+ ) : ( +
+ Cast + -
- Cast is currently unavailable -
-
- ) ; }; } - - +
+ Cast is currently unavailable +
+
+ ); + }; +} + + const mapStateToProps = state => ({ - loading: state.movie.loading, - credits: state.movie.credits - }); - - export default connect( - mapStateToProps, - { fetchCredits, setLoading } - )(withStyles(useStyles)(Credits)); \ No newline at end of file + loading: state.movie.loading, + credits: state.movie.credits +}); + +export default connect( + mapStateToProps, + { fetchCredits, setLoading } +)(withStyles(useStyles)(Credits)); \ No newline at end of file diff --git a/frontend/src/components/movies/Movie.js b/frontend/src/components/movies/Movie.js index 8326447a..186aecf6 100644 --- a/frontend/src/components/movies/Movie.js +++ b/frontend/src/components/movies/Movie.js @@ -1,15 +1,12 @@ import React, { useState } from "react"; import { fetchMovie, setLoading } from "../../redux/actions/movieActions"; import { connect } from "react-redux"; -import Spinner from "../../layout/Spinner"; import Genres from "../genres/genres"; import AuthModal from "../auth/isAuth"; import WatchlistBtn from "../watchlist/AddToWatchlist"; import Like from "../likeDislike/Like"; import { - img_500, unavailable, - unavailableLandscape, } from '../../util/config'; //material UI @@ -59,8 +56,6 @@ const useStyles = makeStyles((theme) => ({ display: "inline-block", marginLeft: 100, marginRight: 100, - // border: "none", - // boxShadow: "none", alignItems: "center", justifyContent: "center", }, @@ -100,7 +95,6 @@ const useStyles = makeStyles((theme) => ({ borderRadius: 5, width: 120, background: "linear-gradient(45deg, #9d50bb 30%, #6e48aa 90%)", - // boxShadow: '0 3px 5px 2px rgba(255 , 175, 189, .2)' }, heart: { display: "flex", @@ -110,11 +104,9 @@ const useStyles = makeStyles((theme) => ({ })); function Movie({ loading, movie, auth }) { - // const { loading, movie, auth, selectedGenres,setSelectedGenres,setGenres,genres,movieIds } = this.props; const classes = useStyles(); const [selectedGenres, setSelectedGenres] = useState([]); const [genres, setGenres] = useState([]); - console.log(movie.genres); let movieInfo = (
diff --git a/frontend/src/components/movies/Row.js b/frontend/src/components/movies/Row.js index f85b72f9..290e933e 100644 --- a/frontend/src/components/movies/Row.js +++ b/frontend/src/components/movies/Row.js @@ -2,8 +2,6 @@ import React, { useState, useEffect } from "react"; import Carousel from "react-elastic-carousel"; import axios from "axios"; import "../styles/Row.css"; -import { Link } from "react-router-dom"; -import { connect } from "react-redux"; import MovieCard from "./MovieCard"; function Row({ title, url, isLargeRow }) { diff --git a/frontend/src/components/movies/SkeletonMovie.js b/frontend/src/components/movies/SkeletonMovie.js index 6cc25718..8081f2fa 100644 --- a/frontend/src/components/movies/SkeletonMovie.js +++ b/frontend/src/components/movies/SkeletonMovie.js @@ -1,11 +1,8 @@ import React, { Component, } from 'react'; import "../styles/Row.css"; - import { Skeleton } from '@material-ui/lab'; -import { Box } from '@material-ui/core' - -const SkeletonCard = ({ isLargeRow }) => { +const SkeletonCard = () => { return ( diff --git a/frontend/src/components/movies/Trailer.js b/frontend/src/components/movies/Trailer.js index 4d16cacd..cd8d43bb 100644 --- a/frontend/src/components/movies/Trailer.js +++ b/frontend/src/components/movies/Trailer.js @@ -1,7 +1,5 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; -import { Link } from 'react-router-dom'; -import Spinner from '../../layout/Spinner'; import { fetchTrailer, setLoading } from '../../redux/actions/movieActions'; import ReactPlayer from "react-player"; import LinearProgress from "@material-ui/core/LinearProgress"; @@ -11,76 +9,72 @@ import CircularProgress from "@material-ui/core/CircularProgress"; import Grid from '@material-ui/core/Grid'; -const useStyles = theme =>({ +const useStyles = theme => ({ trailer: { - fontWeight:'Bold', + fontWeight: 'Bold', fontSize: "32px", marginTop: "30px", marginBottom: "10px", - textAlign : "left", + textAlign: "left", marginLeft: 120 }, - barCover:{ + barCover: { height: 10, borderRadius: 5, - width:50, - marginLeft:125, + width: 50, + marginLeft: 125, marginBottom: "20px", - background:'linear-gradient(45deg, #9d50bb 30%, #6e48aa 90%)' + background: 'linear-gradient(45deg, #9d50bb 30%, #6e48aa 90%)' }, videoContainer: { display: 'flex', - border: "none", + border: "none", boxShadow: "none", alignItems: 'center', justifyContent: 'center', justify: "center", - marginLeft:160, - marginBottom:30, + marginLeft: 160, + marginBottom: 30, width: 1200 }, }); export class Trailer extends Component { - // componentDidMount() { - // this.props.fetchTrailer(this.props.match.params.id); - // this.props.setLoading(); - // console.log(this.props.match.params.id); - // } + render() { const { loading, trailer } = this.props; - const {classes} = this.props; + const { classes } = this.props; let movieInfo = -
- {trailer.slice(0,1).map(video => ( - //epeidh emfanizw mono ena trailer mporw na topothetisw mesa sto map - // ta typography kai linearProgress -
- Trailer - -
- -
- -
- -
-
- ))} -
+
+ {trailer.slice(0, 1).map(video => ( + //epeidh emfanizw mono ena trailer mporw na topothetisw mesa sto map + // ta typography kai linearProgress +
+ Trailer + +
+ +
+ +
+ +
+
+ ))} +
- let content = loading ?
: movieInfo; + let content = loading ?
: movieInfo; return
{content}
- + } } @@ -92,4 +86,4 @@ const mapStateToProps = state => ({ export default connect( mapStateToProps, { fetchTrailer, setLoading } -)(withStyles(useStyles) (Trailer)); +)(withStyles(useStyles)(Trailer)); diff --git a/frontend/src/components/navbar/AppNavbar.js b/frontend/src/components/navbar/AppNavbar.js index b98c8d3b..2bc8050d 100644 --- a/frontend/src/components/navbar/AppNavbar.js +++ b/frontend/src/components/navbar/AppNavbar.js @@ -18,8 +18,6 @@ import IconButton from "@material-ui/core/IconButton"; //Actions import Logout from "../auth/Logout"; //Components and pages -import Watchlist from "../../pages/WatchlistPage"; -import NavMovies from "./NavMovie"; import DropdownMenu from "./Dropdown"; const styles = { diff --git a/frontend/src/components/navbar/SearchBox.js b/frontend/src/components/navbar/SearchBox.js index 5e62f8bd..96ad96e7 100644 --- a/frontend/src/components/navbar/SearchBox.js +++ b/frontend/src/components/navbar/SearchBox.js @@ -49,7 +49,6 @@ const styles = { }, inputInput: { padding: "1px 1px 1px 0px", - // vertical padding + font size from searchIcon paddingLeft: "30px", transition: "width", width: "100%", @@ -60,7 +59,6 @@ class SearchBox extends Component { constructor(props) { super(props); this.state = { - // movies: props.movies, listening: false, query: "", submit: false, @@ -79,8 +77,6 @@ class SearchBox extends Component { if (!recognition.listening) { recognition.start(); recognition.onresult = (event) => { - let interimTranscript = ""; - var finalTranscript = ""; for (let i = event.resultIndex; i < event.results.length; i++) { const transcript = event.results[i][0].transcript; if (event.results[i].isFinal) finalTranscript += transcript + " "; @@ -105,8 +101,7 @@ class SearchBox extends Component { resetSubmit() { this.setState({ submit: false }); - console.log("reset"); - console.log(this.state.submit); + } render() { diff --git a/frontend/src/components/person/PersonInfo.js b/frontend/src/components/person/PersonInfo.js index 6044d818..eca9aab9 100644 --- a/frontend/src/components/person/PersonInfo.js +++ b/frontend/src/components/person/PersonInfo.js @@ -1,8 +1,7 @@ -import React, { useEffect, Component, useState } from "react"; +import React from "react"; import ModalImg from "./ModalImg"; import "../styles/PersonInfo.css"; import { unavailable } from "./Config.js"; -import PersonDetailsPage from "../../pages/PersonDetailsPage"; import { makeStyles, withStyles } from "@material-ui/core/styles"; import Table from "@material-ui/core/Table"; import TableBody from "@material-ui/core/TableBody"; @@ -48,7 +47,6 @@ const PersonInfo = (props) => { return (
- {console.log(props.credits)}
{" "} diff --git a/frontend/src/components/watchlist/AddToWatchlist.js b/frontend/src/components/watchlist/AddToWatchlist.js index 2b2b89be..735f710a 100644 --- a/frontend/src/components/watchlist/AddToWatchlist.js +++ b/frontend/src/components/watchlist/AddToWatchlist.js @@ -6,7 +6,6 @@ import "../styles/watchlist.css"; import { connect } from "react-redux"; import AuthModal from "../auth/isAuth"; import { addWatchlist, deleteWatchlist } from "../../redux/actions/authActions"; -import Axios from "axios"; export function AddToList({ auth, @@ -14,10 +13,8 @@ export function AddToList({ watchlist, addWatchlist, deleteWatchlist, - succes, }) { const [added, setAdded] = useState(false); - const [watchlistAction, setWatchlistAction] = useState(null); const [watchAction, setWactchAction] = useState(false); useEffect(() => { @@ -29,16 +26,7 @@ export function AddToList({ } }); } - // //if watchlist req status=200 and - // if(succes){ - // //if movie was in watchlist delete it - // if(added){ - // setAdded(false); - // }else{ - // setAdded(false); - // } - // } }); const onClick = () => { diff --git a/frontend/src/layout/Spinner.js b/frontend/src/layout/Spinner.js deleted file mode 100644 index c2957839..00000000 --- a/frontend/src/layout/Spinner.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react' -import spinner from './spinner.gif' - -function Spinner() { - return ( -
- Loading... -
- ) -} - -export default Spinner diff --git a/frontend/src/layout/spinner.gif b/frontend/src/layout/spinner.gif deleted file mode 100644 index 0424aa4ffda24a189ed8487dddd63626bceff0f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8942 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 O7>g_~XKNzx*Z%+t`<_t% diff --git a/frontend/src/pages/ChangePassword.js b/frontend/src/pages/ChangePassword.js index 55019402..65b2fba1 100644 --- a/frontend/src/pages/ChangePassword.js +++ b/frontend/src/pages/ChangePassword.js @@ -14,14 +14,8 @@ const useStyles = makeStyles((theme) => ({ }, form2: { - // position: "", width: "30%", - // height: "100%", margin: " auto", - // marginTop: theme.spacing(-10), - // marginLeft: "0px", - // // marginBottom: "5000px", - // marginRight: "800px", }, submit: { margin: theme.spacing(3, 0, 2), @@ -79,16 +73,15 @@ function ChangePassword({
{msg || newpassword !== confirmnewpassword ? ( {wrongmsg} - ) : // {changePassword} - null} + ) : + null} {change_password !== null && - msg && - newpassword == confirmnewpassword && - newpassword !== password ? ( + msg && + newpassword == confirmnewpassword && + newpassword !== password ? ( {msg} - ) : // {changePassword} - null} - {console.log(change_password)} + ) : + null} ({ })); function GenresPage() { - const [selectedGenres, setSelectedGenres] = useState([]); const [genres, setGenres] = useState([]); const [content, setContent] = useState(); const [pageText, setPageText] = useState(); @@ -83,7 +80,6 @@ function GenresPage() { setMovies(response.data.results); setTotalResults(response.data.total_results); settotalPages(response.data.total_pages); - console.log(response.data.results); }) .catch((error) => { setLoading(false); @@ -111,8 +107,8 @@ function GenresPage() { let mapping = movies ? movies.map((movie) => ( - - )) + + )) : null; let displayInfo = !loading ? ( @@ -154,11 +150,7 @@ function GenresPage() {
{displayInfo}
{totalresults > 20 && currentMovie == null ? ( - // + ({ - // genres: state.movie.fetchGenre, }); export default withRouter(connect(mapStateToProps, { fetchGenre })(GenresPage)); diff --git a/frontend/src/pages/HomePage.js b/frontend/src/pages/HomePage.js index bbfb18e5..0fae8f57 100644 --- a/frontend/src/pages/HomePage.js +++ b/frontend/src/pages/HomePage.js @@ -1,6 +1,5 @@ -import React, { useEffect } from 'react'; +import React from 'react'; import { connect } from 'react-redux'; -import MovieCard from '../components/movies/MovieCard'; import '../components/styles/HomePage.css'; import Row from '../components/movies/Row' @@ -10,15 +9,7 @@ const MovieList = ({ isAuthenticated, deleteMovies }) => { - // useEffect(() => { - // getMovies('latest?page=1'); - // }, [getMovies]); - // const handleDelete = (id) => { - // addWatchlist(id); - // }; - - const { movies } = movie; return (
diff --git a/frontend/src/pages/LanguagePage.js b/frontend/src/pages/LanguagePage.js index 844d1f8f..04e0ffc5 100644 --- a/frontend/src/pages/LanguagePage.js +++ b/frontend/src/pages/LanguagePage.js @@ -1,12 +1,8 @@ import React, { useState, useEffect } from "react"; -import Button from "@material-ui/core/Button"; import { makeStyles } from "@material-ui/core/styles"; -import withStyles from "@material-ui/core/styles/withStyles"; import CircularProgress from "@material-ui/core/CircularProgress"; import SentimentDissatisfiedSharpIcon from "@material-ui/icons/SentimentDissatisfiedSharp"; -import Menu from "@material-ui/core/Menu"; -import MenuItem from "@material-ui/core/MenuItem"; import MovieCard from "../components/movies/MovieCard"; import { StyledButton } from "../util/MyTextfield"; @@ -105,8 +101,7 @@ function LanguagePage() { setLoading(false); setCurrentMovie(response.data); - if (response.data.length == 20) { - console.log("20 it is "); + if (response.data.length === 20) { setPage(true); } else { setPage(false); @@ -121,7 +116,6 @@ function LanguagePage() { const nextPage = () => { setLoading(true); setCurrentPage(currentPage + 1); - const newmovies = currentMovie; axios .get( `https://localhost:44324/api/MovieShowcase/Search/lang?lang=${iso}&page=${currentPage}` @@ -134,7 +128,6 @@ function LanguagePage() { } setCurrentMovie([...currentMovie, ...response.data]); - console.log(currentMovie); }); }; @@ -183,7 +176,6 @@ function LanguagePage() { ) : null}
- {console.log(englishname)}
{page && currentMovie.length !== 0 ? ( diff --git a/frontend/src/pages/MoviePage.js b/frontend/src/pages/MoviePage.js index b658b719..4613de41 100644 --- a/frontend/src/pages/MoviePage.js +++ b/frontend/src/pages/MoviePage.js @@ -2,7 +2,6 @@ import React, { Component } from 'react' import { fetchMovie, fetchCredits, setLoading, fetchTrailer } from '../redux/actions/movieActions'; import { FetchComments, CommentLoading } from '../redux/actions/authActions' import { connect } from 'react-redux'; -import Spinner from '../layout/Spinner'; import Movie from '../components/movies/Movie'; import Credits from '../components/movies/Credits'; import Trailer from '../components/movies/Trailer'; @@ -65,16 +64,16 @@ const useStyles = theme => ({ }); class MoviePage extends Component { componentDidMount() { - // setTimeout(() => { + this.props.fetchMovie(this.props.match.params.id); this.props.fetchCredits(this.props.match.params.id); this.props.fetchTrailer(this.props.match.params.id); this.props.FetchComments(this.props.match.params.id); this.props.setLoading(); - // },1000) + } render() { - const { loading, movie, credits, auth, isAuthenticated } = this.props; + const { loading, movie, auth } = this.props; const { id } = this.props.match.params; const { classes } = this.props; let movieInfo = diff --git a/frontend/src/pages/MoviesType.js b/frontend/src/pages/MoviesType.js index db6c6020..2688760f 100644 --- a/frontend/src/pages/MoviesType.js +++ b/frontend/src/pages/MoviesType.js @@ -1,9 +1,8 @@ -import React, { useContext, useEffect, useState } from "react"; +import React, { useEffect, useState } from "react"; import MovieCard from "../components/movies/MovieCard"; import { connect } from "react-redux"; import "../components/styles/watchlist.css"; import { getMovies } from "../redux/actions/movieActions"; -import { StyledButton } from "../util/MyTextfield"; import { makeStyles } from "@material-ui/core/styles"; import ArrowBackIcon from "@material-ui/icons/ArrowBack"; import ArrowForwardIcon from "@material-ui/icons/ArrowForward"; @@ -57,16 +56,13 @@ function usePrevious(value) { export const MoviesType = ({ getMovies, movies, loading, location }) => { const classes = useStyles(); const [currentPage, setCurrentPage] = useState(1); - const [newmovies, setNewmovies] = useState([]); const movieurl = location.pathname; const prevPathName = usePrevious(movieurl); const title = movieurl.slice(1, movieurl.length); //axios request with url param pathname useEffect(() => { - if (prevPathName != movieurl) { - // setNewmovies(null); + if (prevPathName !== movieurl) { setCurrentPage(1); - // console.log("URL CHANGED"); } getMovies(movieurl, currentPage); window.history.replaceState( @@ -74,10 +70,7 @@ export const MoviesType = ({ getMovies, movies, loading, location }) => { "new page title", `${movieurl}?page=${currentPage}` ); - // if (currentPage > 1) { - // setNewmovies([...newmovies, ...movies]); - // } - // setNewmovies(movies); + }, [movieurl, currentPage]); //Load More const nextPage = () => { diff --git a/frontend/src/pages/MyAccountPage.js b/frontend/src/pages/MyAccountPage.js index 221c5a7c..6edc7421 100644 --- a/frontend/src/pages/MyAccountPage.js +++ b/frontend/src/pages/MyAccountPage.js @@ -1,10 +1,7 @@ -import React, { Component, useState, useEffect } from "react"; +import React, { useState, useEffect } from "react"; import { makeStyles } from "@material-ui/core/styles"; import MyaccountMenu from "./MyaccountMenu"; import ChangePassword from "./ChangePassword"; -import Grid from "@material-ui/core/Grid"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import { MyTextField, StyledButton, StyledLink } from "../util/MyTextfield"; import { connect } from "react-redux"; const useStyles = makeStyles((theme) => ({ @@ -18,11 +15,8 @@ const useStyles = makeStyles((theme) => ({ boxSizing: "border-box", textAlign: "center", justifyContent: "center", - // height: "30px", width: "400px", - // left: "0px", display: "flex", - // marginTop: "-150px", }, heading: { display: "flex", @@ -31,7 +25,6 @@ const useStyles = makeStyles((theme) => ({ marginBottom: "1.25rem", }, body: { - // display: "grid", marginLeft: "0px", paddingLeft: "0px", width: "100%", @@ -45,11 +38,7 @@ const useStyles = makeStyles((theme) => ({ }, form2: { width: "30%", - // height: "10%", - // marginTop: theme.spacing(3), - // marginLeft: "0px", - // // marginBottom: "5000px", - // marginRight: "800px", + }, submit: { margin: theme.spacing(3, 0, 2), @@ -72,16 +61,15 @@ const useStyles = makeStyles((theme) => ({ function MyAccountPage({ user }) { const [page, setPage] = useState(1); - useEffect(() => {}, []); + useEffect(() => { }, []); const classes = useStyles(); return ( <>

{user ? user.UserName : null}

- {console.log(page)} - {page == 1 ? ( + {page === 1 ? (
@@ -98,7 +86,7 @@ function MyAccountPage({ user }) {
- ) : page == 2 ? ( + ) : page === 2 ? (
diff --git a/frontend/src/pages/MyaccountMenu.js b/frontend/src/pages/MyaccountMenu.js index 507f6a32..1b976bbb 100644 --- a/frontend/src/pages/MyaccountMenu.js +++ b/frontend/src/pages/MyaccountMenu.js @@ -1,8 +1,7 @@ -import React, { useContext, useEffect, useState } from "react"; +import React, { useEffect, useState } from "react"; import { makeStyles } from "@material-ui/core/styles"; import AccountBoxIcon from "@material-ui/icons/AccountBox"; import VpnKeyIcon from "@material-ui/icons/VpnKey"; -import MyAccountPage from "./MyAccountPage"; import { connect } from "react-redux"; import { Link } from "react-router-dom"; import ExitToAppIcon from "@material-ui/icons/ExitToApp"; @@ -11,9 +10,7 @@ import { Redirect } from "react-router-dom"; const useStyles = makeStyles((theme) => ({ mainDiv: { - // position: "relative", - // left: "250px", - // marginLeft: "-250px", + width: "10%", top: "91px", borderWidth: "0px", @@ -58,9 +55,7 @@ const useStyles = makeStyles((theme) => ({ alignItems: "center", }, icons: { - // viewBox: "0 0 20 20", - // widht: "1.5rem", - // height: "1.5rem", + width: "40px", height: "40px", display: "inline-block", @@ -96,7 +91,6 @@ const useStyles = makeStyles((theme) => ({ }, flexRight: { flex: "90%", - // backgroundColor: "#FFF", }, link: { textDecoration: "none", @@ -118,7 +112,6 @@ function MyaccountMenu(props) { if (!props.isAuthenticated) { setRedirect(true); } - console.log(props); }, [props.error, props.isAuthenticated]); const handlePage = () => { @@ -135,11 +128,6 @@ function MyaccountMenu(props) {
-
- {/*

- {props.user ? props.user.UserName : null} -

*/} -

@@ -208,7 +196,6 @@ function MyaccountMenu(props) {
- {/*
*/}
diff --git a/frontend/src/pages/NotFound.js b/frontend/src/pages/NotFound.js index 4328c513..de99f690 100644 --- a/frontend/src/pages/NotFound.js +++ b/frontend/src/pages/NotFound.js @@ -3,7 +3,6 @@ import { Link } from "react-router-dom" import { makeStyles } from '@material-ui/core/styles'; import Typography from "@material-ui/core/Typography"; import HelpOutlineIcon from '@material-ui/icons/HelpOutline'; -import Spinner from "../layout/Spinner"; import CircularProgress from "@material-ui/core/CircularProgress"; const useStyles = makeStyles({ @@ -50,40 +49,40 @@ const useStyles = makeStyles({ }, circular: { display: "grid", - justifyContent:"center", + justifyContent: "center", alignItems: "center", marginLeft: "30px", marginRight: "30px", marginTop: "30px", padding: "100px", width: "100", - + } }); export default function NotFound(loading) { const classes = useStyles(); const [data, setData] = useState(null); - const [wait,setWait] = useState(false); + const [wait, setWait] = useState(false); useEffect(() => { setTimeout(() => { setWait(true); setData( -
- 4 +
+ 4 4 - - Maybe this page moved? Got deleted? - Is hiding out in quarantine? Never existed in the first place? - Let's go + + Maybe this page moved? Got deleted? + Is hiding out in quarantine? Never existed in the first place? + Let's go Back to the Homepage and try from there. + component="button" + to="/">Back to the Homepage and try from there. -
) +
) }, 3000); - }, []) - return ( !wait ?
:
{data}
); + }, []) + return (!wait ?
:
{data}
); } \ No newline at end of file diff --git a/frontend/src/pages/PersonDetailsPage.js b/frontend/src/pages/PersonDetailsPage.js index 2ffb8565..27e4116f 100644 --- a/frontend/src/pages/PersonDetailsPage.js +++ b/frontend/src/pages/PersonDetailsPage.js @@ -1,11 +1,10 @@ -import React, { Component, useEffect, useState } from "react"; +import React, { useEffect, useState } from "react"; import PersonInfo from "../components/person/PersonInfo"; import "../components/styles/PersonInfo.css"; const PersonDetailsPage = (props) => { const [Person, setPerson] = useState([]); const [Credits, setCredits] = useState([]); - // const classes = useStyles(); useEffect(() => { const personId = props.match.params.personId; @@ -15,7 +14,6 @@ const PersonDetailsPage = (props) => { ) .then((response) => response.json()) .then((response) => { - //console.log(response); setPerson(response); }); @@ -24,7 +22,6 @@ const PersonDetailsPage = (props) => { ) .then((response) => response.json()) .then((response) => { - console.log(response); setCredits(response.cast); }); @@ -32,7 +29,6 @@ const PersonDetailsPage = (props) => { return (
- {console.log(Credits.title)} { ) .then((response) => response.json()) .then((response) => { - //console.log(response); setPersons(response.results); }); }, []); diff --git a/frontend/src/pages/SearchPage.js b/frontend/src/pages/SearchPage.js index 14c44c05..202417b1 100644 --- a/frontend/src/pages/SearchPage.js +++ b/frontend/src/pages/SearchPage.js @@ -1,24 +1,19 @@ -import React, { Component } from "react"; +import React from "react"; import { connect } from "react-redux"; import MovieCard from "../components/movies/MovieCard"; import { makeStyles } from "@material-ui/core/styles"; import { searchMovies } from "../redux/actions/movieActions"; import MicIcon from "@material-ui/icons/Mic"; import { IconButton } from "@material-ui/core"; -import { InputBase } from "@material-ui/core"; import SentimentDissatisfiedSharpIcon from "@material-ui/icons/SentimentDissatisfiedSharp"; import { Button, createMuiTheme, - Tab, - Tabs, TextField, ThemeProvider, } from "@material-ui/core"; import SearchIcon from "@material-ui/icons/Search"; import { useEffect, useState } from "react"; -import axios from "axios"; -import { NavItem } from "reactstrap"; import CircularProgress from "@material-ui/core/CircularProgress"; const useStyles = makeStyles((theme) => ({ @@ -68,8 +63,6 @@ function SearchPage(props) { }); const classes = useStyles(); const [searchText, setSearchText] = useState(""); - const [results, setResults] = useState(1); - const [listening, setListening] = useState(false); const [submit, setSubmit] = useState(false); const [submittedtext, setSubmittedtext] = useState(null); const movies = props.movies; @@ -79,14 +72,12 @@ function SearchPage(props) { if (!recognition.listening) { recognition.start(); recognition.onresult = (event) => { - let interimTranscript = ""; var finalTranscript = ""; for (let i = event.resultIndex; i < event.results.length; i++) { const transcript = event.results[i][0].transcript; if (event.results[i].isFinal) finalTranscript += transcript + " "; - else interimTranscript += transcript; + } - console.log(finalTranscript); setSearchText(finalTranscript); }; } else { @@ -116,8 +107,8 @@ function SearchPage(props) { let mapping = movies.length > 0 ? movies.map((movie) => ( - - )) + + )) : null; let displayInfo = !loading ? ( @@ -161,7 +152,7 @@ function SearchPage(props) {
{displayInfo}
- {searchText && movies.length == 0 && submittedtext && !loading ? ( + {searchText && movies.length === 0 && submittedtext && !loading ? (
No Movie with the name — {submittedtext} was found. diff --git a/frontend/src/pages/WatchlistPage.js b/frontend/src/pages/WatchlistPage.js index d416f48e..21d35d5c 100644 --- a/frontend/src/pages/WatchlistPage.js +++ b/frontend/src/pages/WatchlistPage.js @@ -1,4 +1,4 @@ -import React, { useContext, useEffect } from "react"; +import React from "react"; import MovieCard from "../components/movies/MovieCard"; import { connect } from "react-redux"; import "../components/styles/watchlist.css"; @@ -27,7 +27,7 @@ export const Watchlist = ({ watchlist, isAuthenticated }) => {
) : null} - {isAuthenticated && watchlist == 0 ? ( + {isAuthenticated && watchlist === 0 ? (



No movies in your list! Add some!

diff --git a/frontend/src/redux/actions/authActions.js b/frontend/src/redux/actions/authActions.js index 6eb45ce7..bb4425a7 100644 --- a/frontend/src/redux/actions/authActions.js +++ b/frontend/src/redux/actions/authActions.js @@ -1,5 +1,4 @@ import axios from "axios"; -import { api } from "../../util/config"; import { returnErrors } from "./errorActions"; import { USER_LOADED, @@ -57,7 +56,6 @@ export const addWatchlist = (token, movieId) => (dispatch, getState) => { }; //delete watclist export const deleteWatchlist = (movieId) => (dispatch, getState) => { - const body = JSON.stringify({ movieId: movieId }); axios .delete("/api/users/watchlist/Remove", conf(movieId)) .then((res) => diff --git a/frontend/src/redux/actions/movieActions.js b/frontend/src/redux/actions/movieActions.js index 5e85722f..977ac03a 100644 --- a/frontend/src/redux/actions/movieActions.js +++ b/frontend/src/redux/actions/movieActions.js @@ -1,12 +1,9 @@ import axios from "axios"; import { - GET_WATCHLIST, GENRES_MAP, SEARCH_MOVIES_LOADING, SEARCH_MOVIES, GET_MOVIES, - DELETE_WATCHLIST, - ADD_WATCHLIST, MOVIES_LOADING, FETCH_MOVIE, LOADING, @@ -14,7 +11,6 @@ import { FETCH_TRAILER, SEARCH_NOTFOUND, } from "./types"; -import { tokenConfig } from "./authActions"; import { returnErrors } from "./errorActions"; export const getMovies = (url, page) => (dispatch) => { diff --git a/frontend/src/redux/reducers/authReducer.js b/frontend/src/redux/reducers/authReducer.js index 5aadcd5b..6939533d 100644 --- a/frontend/src/redux/reducers/authReducer.js +++ b/frontend/src/redux/reducers/authReducer.js @@ -15,7 +15,6 @@ import { PASSWORD_FAILED, FETCH_COMMENTSTATS, FAILED_COMMENTS, - ADD_COMMENTS } from '../actions/types'; const initialState = { diff --git a/frontend/src/util/MyTextfield.js b/frontend/src/util/MyTextfield.js index a1a53e7e..eeba145a 100644 --- a/frontend/src/util/MyTextfield.js +++ b/frontend/src/util/MyTextfield.js @@ -6,8 +6,6 @@ import { Link } from 'react-router-dom'; export const MyTextField = withStyles({ root: { - // backgroundColor: '#fff', - "& .MuiFormLabel-root": { color: 'white' }, diff --git a/frontend/src/util/config.js b/frontend/src/util/config.js index 9e24491a..ede97133 100644 --- a/frontend/src/util/config.js +++ b/frontend/src/util/config.js @@ -1,4 +1,3 @@ -import axios from 'axios'; export const img_300 = "https://image.tmdb.org/t/p/w300"; export const img_500 = "https://image.tmdb.org/t/p/w500";