Merge pull request #7 from Styro457/dev

Version 0.3.0
Styro457 · Nov 13, 2023 · 08b2807 · 08b2807
2 parents 928249a + a256551
commit 08b2807
Show file tree

Hide file tree

Showing 29 changed files with 122 additions and 368 deletions.
diff --git a/assets/fonts/BAUHS93.TTF b/assets/fonts/BAUHS93.TTF
diff --git a/assets/fonts/BAUHS93.woff2 b/assets/fonts/BAUHS93.woff2
diff --git a/assets/fonts/GameOver.TTF b/assets/fonts/GameOver.TTF
diff --git a/assets/fonts/GameOver.woff2 b/assets/fonts/GameOver.woff2
diff --git a/assets/fonts/OCR-A-Regular.ttf b/assets/fonts/OCR-A-Regular.ttf
diff --git a/assets/fonts/OCR-A-Regular.woff2 b/assets/fonts/OCR-A-Regular.woff2
diff --git a/assets/fonts/upheavtt.ttf b/assets/fonts/upheavtt.ttf
diff --git a/assets/fonts/upheavtt.woff2 b/assets/fonts/upheavtt.woff2
diff --git a/assets/images/button.png b/assets/images/button.png
diff --git a/assets/images/buttonBase.png b/assets/images/buttonBase.png
diff --git a/assets/images/full-background.png b/assets/images/full-background.png
diff --git a/assets/images/machineBody.png b/assets/images/machineBody.png
diff --git a/assets/images/machineBody.webp b/assets/images/machineBody.webp
diff --git a/assets/images/title.png b/assets/images/title.png
diff --git a/index.html b/index.html
@@ -1,39 +1,51 @@
 <!DOCTYPE html>
 <html lang="en">
+<!-- wordish.name by Styro457 -->
+<!-- version 0.3.0 -->
+<!-- https://github.com/Styro457/wordish.name -->
 <head>
     <meta charset="UTF-8">
-    <title>Wordish.Name</title>
+    <title>Product Name Generator - Wordish.Name</title>
+
     <link rel="icon" type="image/x-icon" href="assets/icons/favicon.ico">
-    <!--Icon created by Vector Squad - Flaticon-->
 
     <link rel="stylesheet" href="style/fonts.css">
     <link rel="stylesheet" href="style/style.css">
     <link rel="stylesheet" href="style/machine.css">
     <link rel="stylesheet" href="style/results.css">
     <link rel="stylesheet" href="style/animations.css">
+
+    <meta name="description" content="Generate memorable and meaningful names for a project, product or anything else using uncommon dictionary words.">
+    <meta name="keywords" content="name generator,namegen,name,title,product name,idea generator,generator,dictionary,words,uncommon words">
+
+    <meta name="author" content="Styro457">
+    <link rel="author" href="https://github.com/Styro457"/>
+
+    <meta property="og:title" content="Product Name Generator - Wordish.Name"/>
+    <meta property="og:description" content="Generate memorable and meaningful names for a project, product or anything else using uncommon dictionary words."/>
+    <meta property="og:url" content="https://wordish.name" />
+    <meta property="og:image"content="https://raw.githubusercontent.com/Styro457/wordish.name/resources/preview.png" />
+    <meta name="theme-color" content="#c97584" data-react-helmet="true" />
+
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
 </head>
 <body>
     <div class="cover" id="cover"></div>
     <div class="machineHolder">
-        <img class="title unselectable" src="assets/images/title.webp" width="1334" height="173" ondragstart="return false;" alt="Wordish.Name">
+        <img class="title unselectable" src="assets/images/title.webp" width="1334" height="173" ondragstart="return false;" alt="wordish.name | use words as names">
         <div class="machine">
             <div class="results" id="results"><p class="resultsSummary" id="resultsSummary"></p></div>
             <img class="machineBody unselectable" src="assets/images/machineBody.webp" width="1157" height="984" ondragstart="return false;" alt="Machine"
                  onload="document.getElementById('cover').classList.add('fadeOut');">
             <div class="machineUI">
                 <form class="machineForm" action="javascript:onFormSubmit(wordsInput.value, generateButton)">
                     <div class="machineInput">
-                     <input type="text" id="wordsInput" name="wordsInput" class="PixelatedInput" required
-                            onfocus="startCaret(this);"
-                            onfocusout="stopCaret(this);"
-                            oninput="caretInput(this);"
-                            ondragenter="stopCaret(this);"
-                            ondragover="stopCaret(this);"
-                            ondragend="startCaret(this);"
-                            ondragstart="stopCaret(this);"
-                            onkeydown="caretMove(this)"
-                            onkeyup="caretMove(this)"
+                        <label for="wordsInput" class="inputLabel lightText">Enter a few related words separated by commas</label>
+                        <input type="text" id="wordsInput" name="wordsInput" class="PixelatedInput" required
+                               onfocus="startCaret(this);" onfocusout="stopCaret(this);" oninput="caretInput(this);"
+                               ondragenter="stopCaret(this);" ondragover="stopCaret(this);" ondragend="startCaret(this);"
+                               ondragstart="stopCaret(this);" onkeydown="caretInput(this)" onkeyup="caretInput(this)"
                      >
                     </div>
                     <div class="generateButtonBackground">
@@ -43,11 +55,11 @@
                 <div class="machineScreen machineScreenOn" id="machineScreenOn"></div>
                 <div class="machineScreen">
                     <p class="screenWords scrollBar" id="screenWords"></p>
-                    <p class="checkedWordsCount count" id="checkedWordsCount"></p>
-                    <p class="foundWordsCount count" id="foundWordsCount"></p>
+                    <p class="checkedWords lightText">Checked Words:</p>
+                    <p class="checkedWordsCount lightText" id="checkedWordsCount"></p>
                 </div>
                 <div class="machineLinks unselectable">
-                    <a href="https://github.com/Styro457" target=”_blank”><button class="githubAuthorButton"></button></a>
+                    <a href="https://github.com/Styro457" target=”_blank” rel="author"><button class="githubAuthorButton"></button></a>
                     <a href="https://github.com/Styro457/Wordish.Name" target=”_blank”><button class="githubPageButton"></button></a>
                 </div>
             </div>

diff --git a/index2.html b/index2.html
diff --git a/old_style/style.css b/old_style/style.css
diff --git a/scripts/apis/datamuse.js b/scripts/apis/datamuse.js
@@ -1,31 +1,25 @@
 function getRelatedWords(word, searchType, topics, firstLetter, lastLetter, limit, frequencyLimit, minLength) {
     return new Promise((resolve) => {
+        //Create the api input
         let url = "https://api.datamuse.com/words?" + searchType + "=" + word + "&max=" + limit + "&md=df";
+
         //Add topics to the api input if they are specified
         if(topics !== null && topics.length > 0) {
             let topicsString = topics[0];
-            for (let i = 1; i < Math.max(topics.length, 5); i++) {
+            for (let i = 1; i < Math.max(topics.length, 5); i++)
                 topicsString = topicsString + "," + topics[i];
-            }
             url = url + "&topics=" + topicsString;
         }
 
         //Get the api response
-        fetch(url).then(response => {
-            return response.json()
-        }).then(data => {
+        fetch(url).then(response => {return response.json()}).then(data => {
             const words = []
             let frequency, word;
             for(let i in data) {
                 frequency = data[i]["tags"][data[i]["tags"].length-1]
                 word = data[i]["word"];
                 if(frequency.startsWith(frequencyLimit) && !word.includes(" ") && !word.includes("-") && word.length >= minLength) {
-                    words.push(
-                        {
-                            word: word,
-                            definitions: data[i]["defs"],
-                            frequency: frequency
-                        });
+                    words.push({word: word, definitions: data[i]["defs"], frequency: frequency});
                 }
             }
             resolve(words)

diff --git a/scripts/apis/google-ngram.js b/scripts/apis/google-ngram.js
diff --git a/scripts/apis/wikictionary.js b/scripts/apis/wikictionary.js