Merge branch 'resolve_confl' into 'master'

resolve conflicts and add readme and correct pathnames

See merge request saburly/kitabcitab/kitabcitab-frontend!13

kitabcitab/.next/build-manifest.json

@@ -20,6 +20,11 @@
       "static/chunks/main.js",
       "static/chunks/pages/index.js"
     ],
+    "/[book]/[type]/[id]": [
+      "static/chunks/webpack.js",
+      "static/chunks/main.js",
+      "static/chunks/pages/[book]/[type]/[id].js"
+    ],
     "/_app": [
       "static/chunks/webpack.js",
       "static/chunks/main.js",

kitabcitab/.next/server/middleware-build-manifest.js

@@ -1 +1 @@
-self.__BUILD_MANIFEST={"polyfillFiles":["static/chunks/polyfills.js"],"devFiles":["static/chunks/react-refresh.js"],"ampDevFiles":["static/chunks/webpack.js","static/chunks/amp.js"],"lowPriorityFiles":["static/development/_buildManifest.js","static/development/_ssgManifest.js"],"rootMainFiles":[],"pages":{"/":["static/chunks/webpack.js","static/chunks/main.js","static/chunks/pages/index.js"],"/_app":["static/chunks/webpack.js","static/chunks/main.js","static/chunks/pages/_app.js"],"/_error":["static/chunks/webpack.js","static/chunks/main.js","static/chunks/pages/_error.js"],"/search":["static/chunks/webpack.js","static/chunks/main.js","static/chunks/pages/search.js"]},"ampFirstPages":[]}
+self.__BUILD_MANIFEST={"polyfillFiles":["static/chunks/polyfills.js"],"devFiles":["static/chunks/react-refresh.js"],"ampDevFiles":["static/chunks/webpack.js","static/chunks/amp.js"],"lowPriorityFiles":["static/development/_buildManifest.js","static/development/_ssgManifest.js"],"rootMainFiles":[],"pages":{"/":["static/chunks/webpack.js","static/chunks/main.js","static/chunks/pages/index.js"],"/[book]/[type]/[id]":["static/chunks/webpack.js","static/chunks/main.js","static/chunks/pages/[book]/[type]/[id].js"],"/_app":["static/chunks/webpack.js","static/chunks/main.js","static/chunks/pages/_app.js"],"/_error":["static/chunks/webpack.js","static/chunks/main.js","static/chunks/pages/_error.js"],"/search":["static/chunks/webpack.js","static/chunks/main.js","static/chunks/pages/search.js"]},"ampFirstPages":[]}

kitabcitab/.next/server/pages-manifest.json

@@ -1,7 +1,8 @@
 {
   "/_app": "pages/_app.js",
-  "/_document": "pages/_document.js",
   "/_error": "pages/_error.js",
-  "/": "pages/index.js",
-  "/search": "pages/search.js"
+  "/_document": "pages/_document.js",
+  "/search": "pages/search.js",
+  "/[book]/[type]/[id]": "pages/[book]/[type]/[id].js",
+  "/": "pages/index.js"
 }

kitabcitab/.next/static/chunks/webpack.js

@@ -131,7 +131,7 @@
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "6b525e2862ea73db"; }
+/******/ 		__webpack_require__.h = function() { return "ef0f344f355fd93b"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/global */

kitabcitab/.next/static/development/_buildManifest.js

@@ -1 +1 @@
-self.__BUILD_MANIFEST = {__rewrites:{beforeFiles:[],afterFiles:[],fallback:[]},"/":["static\u002Fchunks\u002Fpages\u002Findex.js"],"/_error":["static\u002Fchunks\u002Fpages\u002F_error.js"],"/search":["static\u002Fchunks\u002Fpages\u002Fsearch.js"],sortedPages:["\u002F","\u002F_app","\u002F_error","\u002Fsearch"]};self.__BUILD_MANIFEST_CB && self.__BUILD_MANIFEST_CB()
+self.__BUILD_MANIFEST = {__rewrites:{beforeFiles:[],afterFiles:[],fallback:[]},"/":["static\u002Fchunks\u002Fpages\u002Findex.js"],"/_error":["static\u002Fchunks\u002Fpages\u002F_error.js"],"/search":["static\u002Fchunks\u002Fpages\u002Fsearch.js"],"/[book]/[type]/[id]":["static\u002Fchunks\u002Fpages\u002F[book]\u002F[type]\u002F[id].js"],sortedPages:["\u002F","\u002F_app","\u002F_error","\u002Fsearch","\u002F[book]\u002F[type]\u002F[id]"]};self.__BUILD_MANIFEST_CB && self.__BUILD_MANIFEST_CB()

kitabcitab/components/Result.js

@@ -33,7 +33,7 @@ const Result = ({result, term}) => {
 
 
   return (
-    <div onClick={() => (router.push({pathname: `/${result._type}/${result._id}`}))} className='
+    <div onClick={() => (router.push({pathname: `${result._index}/${result._type}/${result._id}`}))} className='
     self-end
     bg-[#202124] 
     w-[100%]

kitabcitab/envconfig.js

@@ -1 +1 @@
-export const ENV_VAR = "http://localhost:9200/"
+export const ENV_VAR = "http://localhost:9200"

kitabcitab/pages/[book]/[type]/[id]/index.js

@@ -1,24 +1,23 @@
 import { AiOutlineLeft, AiOutlineRight } from 'react-icons/ai'
 import Link from "next/link"
 import { useRouter } from 'next/router'
-import { ENV_VAR } from '../../../envconfig'
+import { ENV_VAR } from '../../../../envconfig'
 
 
 const result = ({data}) => {
 
     const router = useRouter()
-    console.log(data)
     const {book, writer, text} = data._source
     const nextPageHandler = () => {
-        if(Number(data._id) + 1 === Number(data._source.numOfPages) + 1) return
+        if(Number(data._id) + 1 === Number(data._source.pages) + 1) return
 
-        router.push(`/${book.toLowerCase()}/${Number(data._id) + 1}`)
+        router.push(`/${data._index}/${data._type}/${Number(data._id) + 1}`)
     }
 
     const prevPageHandler = () => {
         if(data._id - 1 === 0) return
 
-        router.push(`/${book.toLowerCase()}/${Number(data._id) - 1}`)
+        router.push(`/${data._index}/${data._type}/${Number(data._id) - 1}`)
     } 
 
   return (
@@ -47,7 +46,7 @@ const result = ({data}) => {
                 "
             >
                 <i className='rounded-3xl text-[#fff] px-3 py-auto' onClick={() => prevPageHandler()}><AiOutlineLeft size={25} /></i>
-                <p className="text-base tablet:text-2xl laptop:text-2xl text-[#fff] font-serif text-center">"{book}", {writer}, str.{data._id}</p>
+                <p className="text-base tablet:text-2xl laptop:text-2xl text-[#fff] font-serif text-center">"{book}", {writer}, str. {data._id}</p>
                 <i className='rounded-3xl text-[#fff] px-3 py-auto' onClick={() => nextPageHandler()}><AiOutlineRight size={25} /></i>
             </div>
             <div className='page flex laptop:justify-center laptop:min-w-[100%]'>
@@ -82,9 +81,8 @@ export default result
 export async function getServerSideProps (context) {
     
     try{
-    const res = await fetch(`${ENV_VAR}library${context.resolvedUrl}`)
+    const res = await fetch(`${ENV_VAR}${context.resolvedUrl}`)
     const data = await res.json()
-
     return { props: {data} }
     }
     catch{err => console.log(err)}

kitabcitab/pages/search.js

@@ -57,7 +57,7 @@ const SearchPage = ({data}) => {
 
 export async function getServerSideProps(context) {
     // Fetch data from external API
-    const res = await fetch(`${ENV_VAR}_search?q=${context.query.term}`)
+    const res = await fetch(`${ENV_VAR}/_search?q=${context.query.term}`)
     const data = await res.json()
   
     // Pass data to the page via props