Release Ver.

ForFansubs · Sep 20, 2019 · 8b48cbe · 8b48cbe
1 parent c0f3467
commit 8b48cbe
Show file tree

Hide file tree

Showing 19 changed files with 2,114 additions and 1,541 deletions.
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/puzzlefront.iml b/.idea/puzzlefront.iml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,20 +17,20 @@
     "lodash": "^4.17.15",
     "lodash-es": "^4.17.15",
     "node-sass": "^4.12.0",
-    "notistack": "^0.8.6",
-    "react": "^16.8.6",
+    "notistack": "^0.9.0",
+    "react": "^16.9.0",
     "react-adsense": "^0.1.0",
     "react-async-hook": "^3.1.0",
-    "react-dom": "^16.8.6",
+    "react-dom": "^16.9.0",
     "react-dotdotdot": "^1.3.0",
     "react-ga": "^2.6.0",
     "react-helmet": "^5.2.1",
     "react-infinite-scroll-component": "^4.5.2",
     "react-lazyload": "^2.6.2",
     "react-parallax": "^2.2.0",
     "react-router-dom": "^5.0.1",
-    "react-scripts": "3.0.1",
-    "react-slick": "^0.24.0",
+    "react-scripts": "3.1.1",
+    "react-slick": "^0.25.2",
     "react-table": "^6.10.0",
     "react-toastify": "^5.3.2",
     "reactn": "^2.1.4",

diff --git a/src/components/ara/components.js b/src/components/ara/components.js
@@ -133,7 +133,7 @@ function AnimeContainer(props) {
                         <ContentPremieredText variant="h6">{d.premiered ? d.premiered : "Bilgi bulunamadı"}</ContentPremieredText>
                     </ContentPremieredContainer>
                     <ContentInPlacer>
-                        <ContentCover bgimage={d.cover_art} />
+                        <ContentCover bgimage={d.cover_art} title={d.name + " Cover Art"} />
                         <ContentTextInfo>
                             <Dotdotdot clamp={2}>
                                 <ContentTitle variant="h5">{d.name}</ContentTitle>
@@ -167,8 +167,8 @@ function AnimeContainerPlaceholder(props) {
 
     return (
         <ContentPlacer item xs={12} md={6} lg={4} xl={3}>
-            <ContentContainer {...defaultBoxProps} mb={0} height="383px">
-            </ContentContainer>
+            <div height="225px">
+            </div>
         </ContentPlacer>
     )
 }
@@ -181,7 +181,7 @@ function MangaContainer(props) {
             <Link to={mangaPage(d.slug)}>
                 <ContentContainer {...defaultBoxProps} mb={0}>
                     <ContentInPlacer>
-                        <ContentCover bgimage={d.cover_art} />
+                        <ContentCover bgimage={d.cover_art} title={d.name + " Cover Art"} />
                         <ContentTextInfo>
                             <Dotdotdot clamp={2}>
                                 <ContentTitle variant="h5">{d.name}</ContentTitle>
@@ -214,7 +214,7 @@ function MangaContainer(props) {
 function MangaContainerPlaceholder(props) {
     return (
         <ContentPlacer item xs={12} md={6} lg={4} xl={3}>
-            <ContentContainer {...defaultBoxProps} mb={0} height="383px">
+            <ContentContainer {...defaultBoxProps} mb={0} height="187px">
 
             </ContentContainer>
         </ContentPlacer>

diff --git a/src/components/header/header.js b/src/components/header/header.js
@@ -70,9 +70,6 @@ const useStyles = makeStyles(theme => ({
     logo: {
         height: "40px"
     },
-    active: {
-        backgroundColor: theme.palette.background.level2
-    },
     ListItemText: {
         fontSize: ".8rem!important"
     },
@@ -172,7 +169,7 @@ export default function MiniDrawer() {
                 <List>
                     {menuItems.map((item, index) => item.show ?
                         (
-                            <NavLink exact to={item.link} onClick={handleDrawerClose} activeClassName={classes.active} key={item.text}>
+                            <NavLink exact to={item.link} onClick={handleDrawerClose} activeStyle={{ backgroundColor: theme.palette.background.level2 }} key={item.text}>
                                 <ListItem button style={{ backgroundColor: "inherit" }}>
                                     <ListItemIcon style={{ color: theme.palette.text.primary }}>{item.icon}</ListItemIcon>
                                     <ListItemText className={classes.ListItemText}><Typography variant="body2">{item.text}</Typography></ListItemText>
@@ -217,7 +214,7 @@ export default function MiniDrawer() {
                         <MenuIcon />
                     </IconButton>
                     <Link to={indexPage} className={classes.logoContainer}>
-                        <img className={classes.logo} src={usertheme === "dark" ? fullLogo : fullLogoDark} alt="Site Logo" />
+                        <img title="Site logo" loading="lazy" className={classes.logo} src={usertheme === "dark" ? fullLogo : fullLogoDark} alt="Site Logo" />
                     </Link>
                     <div>
                         {userInfo.success ?
@@ -228,7 +225,10 @@ export default function MiniDrawer() {
                                 onClick={handleMenu}
                                 color="default"
                             >
-                                <img src={userInfo.avatar} style={{ height: "25px" }} alt={`${userInfo.username} avatar`} aria-labelledby={`${userInfo.username} avatar`} />
+                                {userInfo.avatar ?
+                                    <img title={`${userInfo.username} avatar`} loading="lazy" src={userInfo.avatar} style={{ height: "25px" }} alt={`${userInfo.username} avatar`} aria-labelledby={`${userInfo.username} avatar`} />
+                                    :
+                                    <AccountCircle title={`${userInfo.username} avatar`} alt={`${userInfo.username} avatar`} aria-labelledby={`${userInfo.username} avatar`} />}
                             </IconButton>
                             :
                             <IconButton
@@ -271,16 +271,16 @@ export default function MiniDrawer() {
                                     :
                                     <>
                                         <MenuItem onClick={() => handleLoginRegisterButtons("login")}>Giriş yap</MenuItem>
-                                        <MenuItem onClick={() => handleLoginRegisterButtons("register")}>Kayıt ol</MenuItem>
+                                        {/*<MenuItem onClick={() => handleLoginRegisterButtons("register")}>Kayıt ol</MenuItem>*/}
                                     </>
                                 }
                                 <Divider />
                                 {
                                     usertheme === "dark"
                                         ?
-                                        <MenuItem onClick={() => setUserTheme("light")}><span role="img" aria-labelledby="güneş">🌞</span> Gündüz Modu</MenuItem>
+                                        <MenuItem onClick={() => setUserTheme("light")}><span role="img" title="güneş" aria-labelledby="güneş">🌞</span> Gündüz Modu</MenuItem>
                                         :
-                                        <MenuItem onClick={() => setUserTheme("dark")}><span role="img" aria-labelledby="ay">🌙</span> Gece Modu</MenuItem>
+                                        <MenuItem onClick={() => setUserTheme("dark")}><span role="img" title="ay" aria-labelledby="ay">🌙</span> Gece Modu</MenuItem>
                                 }
                             </div>
                         </Menu>

diff --git a/src/components/hoc/wrapper.js b/src/components/hoc/wrapper.js
@@ -25,7 +25,7 @@ export default function (props) {
         <>
             <Header />
             <Login />
-            <Register />
+            {/*<Register />*/}
             <PaddingDiv>
                 {props.children}
                 <Footer />

diff --git a/src/components/user/login.js b/src/components/user/login.js
@@ -13,6 +13,7 @@ import styled from 'styled-components'
 import ToastNotification from '../toastify/toast'
 
 import axios from '../../config/axios/axios'
+import { loginRoute } from '../../config/api-routes';
 
 const ModalContainer = styled(Box)`
     position: absolute;
@@ -72,7 +73,7 @@ export default function LoginModal() {
             password: userInfo.password
         }
 
-        axios.post('/user/login', userData)
+        axios.post(loginRoute, userData)
             .then(res => {
                 setUser(res.data)
                 setShowModal("")
@@ -82,7 +83,7 @@ export default function LoginModal() {
             .catch(err => {
                 const errors = err.response ? err.response.data : ""
                 const payload = {
-                    container: "register-error",
+                    container: "login-error",
                     type: "error",
                     message: ""
                 }
@@ -137,7 +138,7 @@ export default function LoginModal() {
                             fullWidth />
                         <ButtonContainer mt={2}>
                             <FormButton variant="outlined" type="submit">Giriş yap</FormButton>
-                            <FormButton variant="outlined" onClick={() => setShowModal("register")}>Hesabın yok mu?</FormButton>
+                            {/*<FormButton variant="outlined" onClick={() => setShowModal("register")}>Hesabın yok mu?</FormButton>*/}
                         </ButtonContainer>
                     </FormContainer>
                 </ModalContainer>

diff --git a/src/components/user/register.js b/src/components/user/register.js
@@ -13,6 +13,7 @@ import styled from 'styled-components'
 import ToastNotification from '../toastify/toast'
 
 import axios from '../../config/axios/axios'
+import { registerRoute } from '../../config/api-routes';
 
 const ModalContainer = styled(Box)`
     position: absolute;
@@ -75,7 +76,7 @@ export default function RegisterModal() {
             email: userInfo.email
         }
 
-        axios.post('/user/register', userData)
+        axios.post(registerRoute, userData)
             .then(res => {
                 const payload = {
                     container: "register-success",

diff --git a/src/config/api-routes.js b/src/config/api-routes.js
@@ -1,19 +1,22 @@
 //API uzantısına gerek yok, default axios importunda zaten ekleniyor
 const indexURL = "/"
-const isAdmin = "/user/adminpage"
+const isAdmin = "/kullanici/adminpage"
 const getIndexEpisodes = "/latest-works"
 const getIndexFeaturedAnime = "/featured-anime"
 const getIndexBatchEpisodes = "/latest-batch-episodes"
 const getAnimeIndex = (slug) => `/anime/${slug}`
 const getMangaIndex = (slug) => `/manga/${slug}`
-const getEpisodeDownloadLinks = (animeslug) => `/episode/download-links/${animeslug}`
+const getEpisodeDownloadLinks = (animeslug) => `/bolum/download-links/${animeslug}`
 const getSearchIndex = (type, page) => `${type}/arama-liste/${page}`
 const getGenresList = "/genre-list"
 const getFullSearchList = (type) => `/${type}/liste`
-const getEpisodePageInfo = (slug) => `/episode/${slug}/watch`
-const getEpisodeInfo = "/episode/izleme-linkleri"
+const getEpisodePageInfo = (slug) => `/bolum/${slug}/watch`
+const getEpisodeInfo = "/bolum/izleme-linkleri"
 
-const contentHeader = (type, slug) => `/api/images/${type}/${slug}-header.jpeg`
+const loginRoute = "/kullanici/giris"
+const registerRoute = "/kullanici/kayit"
+
+const contentHeader = (type, slug) => `/api/resimler/${type}/${slug}-header.jpeg`
 
 export {
     indexURL,
@@ -29,5 +32,7 @@ export {
     getFullSearchList,
     getEpisodePageInfo,
     getEpisodeInfo,
+    loginRoute,
+    registerRoute,
     contentHeader
 }
diff --git a/src/index.js b/src/index.js
@@ -52,7 +52,7 @@ setGlobal({
     settings,
     showModal: "",
     isAdmin: false,
-    theme: settings.theme ? settings.theme : "light",
+    theme: settings.theme ? settings.theme : window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light",
     mobile: false
 })
 
@@ -150,7 +150,7 @@ addReducer('setTheme', (global, dispatch, type) => {
 
 //If there's any changes for existing localstorage, update it here
 if (!settings.theme) {
-    settings.theme = "light"
+    settings.theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light"
 }
 
 localStorage.setItem("app-settings", JSON.stringify(settings))

diff --git a/src/pages/ara/index.js b/src/pages/ara/index.js
@@ -114,6 +114,11 @@ export default function SearchPage(props) {
 
         setData(newData)
         setOffset(page)
+
+        if (fullList.length / 24 < page) {
+            console.log("Data bitti")
+            return setHasData(false)
+        }
     }
 
     function handleTypeChange(newType) {
@@ -202,7 +207,7 @@ export default function SearchPage(props) {
         if (data.length !== 0 && type === "anime") {
             mappedData = data.map(d =>
                 <LazyLoad
-                    height={383}
+                    height={225}
                     key={d.slug + "anime"}
                     placeholder={
                         <AnimeContainerPlaceholder genresbg={theme.palette.secondary.main} />
@@ -215,7 +220,7 @@ export default function SearchPage(props) {
         else if (data.length !== 0 && type === "manga") {
             mappedData = data.map(d =>
                 <LazyLoad
-                    height={383}
+                    height={187}
                     key={d.slug + d.name + "manga"}
                     placeholder={
                         <MangaContainerPlaceholder genresbg={theme.palette.secondary.main} />
@@ -358,6 +363,7 @@ export default function SearchPage(props) {
                             next={handleGetMore}
                             hasMore={hasData}
                             scrollThreshold={1}
+                            endMessage={<Typography variant="h6" style={{ padding: "8px", textAlign: "center" }}>Liste sonu.</Typography>}
                             loader={<ContentContainer
                                 mt={1}
                                 p={1}

diff --git a/src/pages/ceviriler/anime/desktop.js b/src/pages/ceviriler/anime/desktop.js
@@ -46,6 +46,8 @@ export default function AnimeIndexDesktop(props) {
                     >
                         <Background>
                             <img
+                                title={anime.name + " headerimage"}
+                                loading="lazy"
                                 alt={anime.name + " headerimage"}
                                 src={contentHeader("anime", anime.slug)}
                                 onError={() => {
@@ -58,7 +60,9 @@ export default function AnimeIndexDesktop(props) {
             <ContentLeft item>
                 <ContentImage
                     component="img"
-                    alt={anime.name + " coverart"}
+                    title={anime.name + " Cover Art"}
+                    loading="lazy"
+                    alt={anime.name + " Cover Art"}
                     boxShadow={2}
                     spacingvalue={theme.spacing(2)}
                     src={anime.cover_art}
@@ -123,7 +127,7 @@ export default function AnimeIndexDesktop(props) {
                     {anime.version === "bd"
                         ?
                         <ContentTitleBadge>
-                            <img src={bluray} alt="bd-logo" style={{ height: "2rem" }} />
+                            <img title="bd-logo" loading="lazy" src={bluray} alt="bd-logo" style={{ height: "2rem" }} />
                         </ContentTitleBadge>
                         :
                         null}

diff --git a/src/pages/ceviriler/anime/mobile.js b/src/pages/ceviriler/anime/mobile.js
@@ -45,7 +45,7 @@ export default function AnimeIndexMobile(props) {
                         {anime.version === "bd"
                             ?
                             <ContentTitleBadge>
-                                <img src={bluray} alt="bd-logo" style={{ height: "2rem" }} />
+                                <img title="bd-logo" loading="lazy" src={bluray} alt="bd-logo" style={{ height: "2rem" }} />
                             </ContentTitleBadge>
                             :
                             null}
@@ -72,8 +72,10 @@ export default function AnimeIndexMobile(props) {
                         justifyContent="center"
                     >
                         <ContentImage
+                            loading="lazy"
+                            title={anime.name + " Cover Art"}
                             component="img"
-                            alt={anime.name + " coverart"}
+                            alt={anime.name + " Cover Art"}
                             boxShadow={2}
                             spacingvalue={theme.spacing(2)}
                             src={anime.cover_art}