fixed merge issues

pull/6/head
leo ouyang 2022-01-28 13:52:48 -05:00
commit 0917aa4f4c
6 changed files with 34 additions and 10 deletions

25
LICENSE Normal file
View File

@ -0,0 +1,25 @@
BSD 2-Clause License
Copyright (c) 2022, Free Ebook Foundation
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View File

@ -1,4 +1,4 @@
# Getting Started with Create React App
# Free Programming Books Search
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

View File

@ -1,6 +1,6 @@
{
"homepage": "https://4dylanregan.github.io/myapp",
"name": "my-app",
"homepage": "https://ebookfoundation.github.io/free-programming-books-search/",
"name": "fpb_search_page",
"version": "0.1.0",
"private": true,
"dependencies": {

View File

@ -2,14 +2,12 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@ -24,7 +22,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>FPB Search</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>

View File

@ -1,6 +1,6 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"short_name": "FPB Search",
"name": "Free Programming Books Search",
"icons": [
{
"src": "favicon.ico",

View File

@ -5,7 +5,7 @@ import SearchResult from "./components/SearchResult";
import axios from "axios";
import Fuse from "fuse.js";
const fpb = require("./fpb.json"); //local copy of json becuase online currently can't be accessed
const fpb = null;
// eslint-disable-next-line
function makeBook(author, hLang, cLang, title, url) {
@ -27,7 +27,8 @@ function forEachBook(func, json) {
throw "ERROR in forEachBook: parameter not a fucntion";
}
for (const hLang in json) { //for each human language
for (const hLang in json) {
//for each human language
if (Array.isArray(hLang.sections)) {
//check if sections is an array
hLang.sections.forEach(