From e175a1edfa866225a09871e44d06813b6bc4b191 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Tue, 3 Dec 2019 11:01:58 +0000 Subject: [PATCH] cleanup --- LICENSE | 43 ++++++++++++++++------------------- README.md | 2 +- package.json | 2 +- src/components/Background.jsx | 28 +++++++++++------------ 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/LICENSE b/LICENSE index 7523acc7..34bcd0bd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,32 +1,29 @@ -The Clear BSD License +BSD 3-Clause License Copyright (c) 2018-2019 David Ralph (ohlookitsderpy) All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted (subject to the limitations in the disclaimer -below) provided that the following conditions are met: +modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. - * 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. +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. - * Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY -THIS LICENSE. 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. \ No newline at end of file +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. \ No newline at end of file diff --git a/README.md b/README.md index 5de5f00e..4e18222e 100644 --- a/README.md +++ b/README.md @@ -136,6 +136,6 @@ Candystick - Portuguese (Some Quotes) and all the contributors <3 # License -Code, Documentation - [BSD-3-Clause-Clear](LICENSE) +Code, Documentation - [BSD-3-Clause](LICENSE) Logos - [CC-BY-4.0](assets/logo/LICENSE) diff --git a/package.json b/package.json index 2676b9ef..6cbbf278 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "Alex \"TurboMarshmello\" Sparkes (https://github.com/TurboMarshmello)" ], "description": "Fast, open and free-to-use new tab page for most modern browsers.", - "license": "BSD-3-Clause-Clear", + "license": "BSD-3-Clause", "version": "2.0.1", "dependencies": { "@material-ui/core": "^4.7.0", diff --git a/src/components/Background.jsx b/src/components/Background.jsx index aa7f8416..1ee23a1c 100644 --- a/src/components/Background.jsx +++ b/src/components/Background.jsx @@ -16,59 +16,59 @@ export default class Background extends React.Component { let photographer; // Photographer credit switch (photo) { // Select photographer based on image file number default: { - photographer = 'Unknown (Pexels)'; + photographer = 'Unknown'; break; } case 1: { - photographer = 'Tirachard Kumtanom (Pexels)'; + photographer = 'Tirachard Kumtanom'; break; } case 2: { - photographer = 'Pixabay (Pexels)'; + photographer = 'Pixabay'; break; } case 3: { - photographer = 'Pixabay (Pexels)'; + photographer = 'Pixabay'; break; } case 4: { - photographer = 'Sohail Na (Pexels)'; + photographer = 'Sohail Na'; break; } case 7: { - photographer = 'Miriam Espacio (Pexels)'; + photographer = 'Miriam Espacio'; break; } case 9: { - photographer = 'Pixabay (Pexels)'; + photographer = 'Pixabay'; break; } case 10: { - photographer = 'NO NAME (Pexels)'; + photographer = 'NO NAME'; break; } case 11: { - photographer = 'Pixabay (Pexels)'; + photographer = 'Pixabay'; break; } case 13: { - photographer = 'Pixabay (Pexels)'; + photographer = 'Pixabay'; break; } case 14: { - photographer = 'Pixabay (Pexels)'; + photographer = 'Pixabay'; break; } case 15: { - photographer = 'Pixabay (Pexels)'; + photographer = 'Pixabay'; break; } case 20: { - photographer = 'Fabian Wiktor (Pexels)'; + photographer = 'Fabian Wiktor'; break; } } - document.getElementById('photographer').innerText = `Photo by ${photographer}`; // Set the credit + document.getElementById('photographer').innerText = `Photo by ${photographer} (Pexels)`; // Set the credit document.getElementById('root').style.backgroundImage = `url(../offline-images/${photo}.jpeg)`; // Set the background } }