MacOS MVP Requirements

LICENSE.txt

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,7 +1,19 @@
-# Tauri + React + Typescript
+# Drone Input Tool
 
-This template should help get you started developing with Tauri, React and Typescript in Vite.
+Allen Wrench is a desktop tool to aid [Hexcorp](https://hexcorp.net) Drones in their digital interactions.
 
-## Recommended IDE Setup
+## WIP Features
 
-- [VS Code](https://code.visualstudio.com/) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer)
+* [ ] Customize shortcut keys used on linux platforms
+* [ ] Add support for BSD
+* [ ] Keyboard control of the program
+* [ ] Improve UI design (Input Requested)
+* [ ] Better sorting of subjects
+* [ ] Built-in system shortcut
+* [ ] Auto-send `return` on paste completion for pre-determined phrases
+* [ ] Ability to add custom types / phrases
+* [ ] [Unicode "font" options](https://lingojam.com/DiscordFonts)
+
+### Misc notes
+
+[Use this as a guide for building for MacOS](https://thinkgo.io/post/2023/02/publish_tauri_to_apples_app_store/)

entitlements.plist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+
+    <key>com.apple.security.app-sandbox</key><true/>
+    <key>com.apple.security.network.client</key><true/>
+
+    <key>com.apple.application-identifier</key>
+    <string>W9ASV855X5.lgbt.cray.allenwrench</string>
+    
+    <key>com.apple.developer.team-identifier</key>
+    <string>W9ASV855X5</string>
+    
+    <key>com.apple.security.files.user-selected.read-only</key>
+    <true/>
+  </dict>
+</plist>
+ 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "allenwrench-app",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.1.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
-name = "allenwrench-app"
+name = "allenwrench"
-version = "0.0.0"
+version = "0.1.1"
-description = "A Tauri App"
+description = "Hexcorp Drone Input Tool"
-authors = ["you"]
+authors = ["Liz Cray", "4661"]
-license = ""
+license = "Apache-2.0"
-repository = ""
+repository = "git@git.corrupt.link:liz/AllenWrench.git"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -13,11 +13,12 @@ edition = "2021"
 tauri-build = { version = "1.4", features = [] }
 
 [dependencies]
-tauri = { version = "1.4", features = [ "shell-sidecar", "shell-execute", "shell-open", "fs-all", "path-all"] }
+tauri = { version = "1.4", features = [ "os-all", "shell-sidecar", "shell-execute", "shell-open", "fs-all", "path-all"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 enigo = "0.1.2"
 arboard = "3.2.0"
+tauri-plugin-positioner = "1.0.4"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem

src-tauri/src/main.rs

@@ -1,11 +1,19 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-use enigo::{Enigo, Key, KeyboardControllable};
+use tauri::{Manager, Size, LogicalSize};
+use enigo::{Enigo, Key, KeyboardControllable, MouseControllable};
 use std::thread;
 use std::time::Duration;
 use arboard::Clipboard;
 
+#[tauri::command]
+fn get_mouse_pos() -> String {
+    let enigo = Enigo::new();
+    let (x, y) = enigo.mouse_location();
+    format!("{{ \"x\": {}, \"y\": {} }}", x, y).into()
+}
+
 #[tauri::command]
 fn type_str(input: String) {
     #[cfg(dev)]
@@ -17,15 +25,40 @@ fn type_str(input: String) {
     // Load input into clipboard
     clipboard.set_text(input).unwrap();
 
-    // TODO: Multi-platform window switch
+    // TODO: Set the Command/Alt key configured by user
-    enigo.key_down(Key::Alt);
+    #[cfg(target_os = "macos")] {
-    enigo.key_click(Key::Tab);
+        enigo.key_down(Key::Meta);
-    enigo.key_up(Key::Alt);
+        enigo.key_click(Key::Tab);
+        enigo.key_up(Key::Meta);
+    }
+
+    #[cfg(target_os = "windows")] {
+        enigo.key_down(Key::Alt);
+        enigo.key_click(Key::Tab);
+        enigo.key_up(Key::Alt);
+    }
+
+    #[cfg(target_os = "linux")] {
+        enigo.key_down(Key::Alt);
+        enigo.key_click(Key::Tab);
+        enigo.key_up(Key::Alt);
+    }
 
     thread::sleep(Duration::from_millis(200));
 
-    // TODO: Multi-platform paste
+    #[cfg(target_os = "windows")]{
-    #[cfg(not(dev))]{
+        enigo.key_down(Key::Control);
+        enigo.key_click(Key::Layout('v'));
+        enigo.key_up(Key::Control);
+    }
+
+    #[cfg(target_os = "macos")]{
+        enigo.key_down(Key::Meta);
+        enigo.key_click(Key::Layout('v'));
+        enigo.key_up(Key::Meta);
+    }
+
+    #[cfg(target_os = "linux")]{
         enigo.key_down(Key::Control);
         enigo.key_click(Key::Layout('v'));
         enigo.key_up(Key::Control);
@@ -40,9 +73,19 @@ fn type_str(input: String) {
 }
 
 fn main() {
-    // TODO: Set Window location on launch
     tauri::Builder::default()
-        .invoke_handler(tauri::generate_handler![type_str])
+        .setup(|app| {
+            let main_window = app.get_window("main").unwrap();
+
+            #[cfg(target_os = "macos")] {
+                let _ = main_window.set_size(Size::Logical(LogicalSize {width: 400.0, height: 352.0}));
+            }
+            
+            Ok(())
+        })
+        .plugin(tauri_plugin_positioner::init())
+        .invoke_handler(tauri::generate_handler![type_str, get_mouse_pos])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
+    
 }

src-tauri/tauri.conf.json

@@ -7,8 +7,8 @@
     "withGlobalTauri": false
   },
   "package": {
-    "productName": "allenwrench-app",
+    "productName": "allenwrench",
-    "version": "0.1.0"
+    "version": "0.1.1"
   },
   "tauri": {
     "allowlist": {
@@ -18,11 +18,23 @@
         "sidecar": true,
         "execute": true,
         "open": true,
-        "scope": [{
+        "scope": [
-          "name" : "open-link",
+          {
-          "cmd": "powershell.exe",
+            "name" : "open-link-win",
-          "args": ["-Command", "Start-Process", {"validator": "\\S+"}]
+            "cmd": "powershell.exe",
-        }]
+            "args": ["-Command", "Start-Process", {"validator": "\\S+"}]
+          },
+          {
+            "name" : "open-link-linux",
+            "cmd": "/bin/sh",
+            "args": ["-c", "xdg-open", {"validator": "\\S+"}]
+          },
+          {
+            "name" : "open-link-macos",
+            "cmd": "/bin/bash",
+            "args": ["-c", "open", {"validator": "\\S+"}]
+          }
+        ]
       },
       "fs": {
         "all": true,
@@ -30,10 +42,15 @@
       },
       "path": {
         "all": true
+      },
+      "os": {
+        "all": true
       }
     },
     "bundle": {
+      "category": "Utility",
       "active": true,
+      "copyright": "Copyright 2023 Elizabeth Cray",
       "targets": "all",
       "identifier": "lgbt.cray.allenwrench",
       "icon": [
@@ -44,7 +61,12 @@
       ],
       "resources": [
         "resources/*"
-      ]
+      ],
+      "macOS": {
+        "minimumSystemVersion": "10.11",
+        "license": "../LICENSE.txt",
+        "entitlements": "../entitlements.plist"
+      }
     },
     "security": {
       "csp": null
@@ -53,6 +75,10 @@
       {
         "fullscreen": false,
         "resizable": true,
+        "maximizable": false,
+        "minimizable": false,
+        "alwaysOnTop": true,
+        "decorations": true,
         "title": "Drone Input",
         "width": 400,
         "height": 320

src/App.tsx

@@ -3,25 +3,41 @@ import { resolveResource } from "@tauri-apps/api/path";
 import { readTextFile } from "@tauri-apps/api/fs";
 import { invoke } from '@tauri-apps/api/tauri'
 import Modal from "react-modal";
+import { platform } from '@tauri-apps/api/os';
 import "./App.css";
 import { Command } from '@tauri-apps/api/shell'
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faGitAlt } from "@fortawesome/free-brands-svg-icons/faGitAlt";
-
+import { PhysicalPosition, appWindow } from "@tauri-apps/api/window";
 
 // TODO: Keyboard usage
 
-const codes = JSON.parse(await readTextFile(await resolveResource("resources/codes.json")));
+// const codes = JSON.parse(await readTextFile(await resolveResource("resources/codes.json")));
+
+
+
 type Code = {
   code: number;
   type: string;
   text: string;
 };
 
+// Set window to above the mouse cursor
+// TODO: Fix for MacOS
+invoke('get_mouse_pos', {}).then((posJson: any) => {
+  let pos = JSON.parse(posJson);
+  appWindow.innerSize().then((size: any) => {
+    pos.y -= size.height + 32 /*Standard windows titlebar height*/;
+    console.log(JSON.stringify(pos));
+    appWindow.setPosition(new PhysicalPosition(pos.x, pos.y));
+  });
+
+});
+
 Modal.setAppElement("#root");
 
 function App() {
-
+  const [codes, setCodes] = useState<Array<Code>>();
   const [subTopic, setSubTopic] = useState<string>("");
   const [configModalOpen, setConfigModalOpen] = useState<boolean>(false);
   const [droneId, setDroneId] = useState<string>(() => {
@@ -29,6 +45,14 @@ function App() {
     return (storedId ? storedId : "0000");
   });
 
+  if (!codes){
+    resolveResource("resources/codes.json").then((path: string) => {
+      readTextFile(path).then((codesJson: string) => {
+        setCodes(JSON.parse(codesJson));
+      });
+    });
+  }
+
   const getSubjects = (input: Array<Code>) => {
     // TODO: Put all single-level elements at bottom
     let subjects: Array<string> = [];
@@ -42,13 +66,15 @@ function App() {
 
   const getTopicChildren = (topic: string) => {
     let topicChildren: Array<string> = [];
-    codes.forEach((code: Code) => {
+    if (codes){
-      if (code.type == topic) {
+      codes.forEach((code: Code) => {
-        if (!topicChildren.includes(code.text)) {
+        if (code.type == topic) {
-          topicChildren.push(code.text)
+          if (!topicChildren.includes(code.text)) {
+            topicChildren.push(code.text)
+          }
         }
-      }
+      });
-    });
+    }
     return topicChildren;
   };
 
@@ -70,12 +96,14 @@ function App() {
   };
 
   const handleSubClick = (topic: string, index: number) => {
-    let text = getTopicChildren(topic)[index];
+    if (codes){
-    let filtered = codes.filter((code: Code) => code.type === topic && code.text === text);
+      let text = getTopicChildren(topic)[index];
-    if (filtered.length == 1) {
+      let filtered = codes.filter((code: Code) => code.type === topic && code.text === text);
-      let payload: string = generatePayload(filtered[0]);
+      if (filtered.length == 1) {
-      setSubTopic("");
+        let payload: string = generatePayload(filtered[0]);
-      invoke('type_str', {input: payload});
+        setSubTopic("");
+        invoke('type_str', {input: payload});
+      }
     }
   };
 
@@ -109,14 +137,45 @@ function App() {
   }
 
   const handleTopicClick = (type: string) => {
-    let filtered = codes.filter((code: Code) => code.type === type);
+    if (codes) {
-    if (filtered.length == 1) {
+      let filtered = codes.filter((code: Code) => code.type === type);
-      let assembledStr: string = generatePayload(filtered[0]);
+      if (filtered.length == 1) {
-      setSubTopic("");
+        let assembledStr: string = generatePayload(filtered[0]);
-      invoke('type_str', {input: assembledStr});
+        setSubTopic("");
+        invoke('type_str', {input: assembledStr});
+      }else{
+        // Open Submenu for type
+        setSubTopic(type);
+      }
+    }
+  };
+
+  const buildMenu = () => {
+    if (codes) {
+      return (
+        <div>
+          {getSubjects(codes).map((type: string, index: number) => {
+            let dispType: string = type;
+            let filtered = codes.filter((code: Code) => code.type === type);
+            if (filtered.length == 1) {
+              dispType += ((filtered[0].text == "")?" :: ...":((filtered[0].text == ".")?"":(" :: "+filtered[0].text)));
+            }
+            return (
+              <input
+                className={`item ${(filtered.length == 1)?"individual":""}`}
+                key={index}
+                type="button"
+                onClick={() =>  {
+                  handleTopicClick(type)
+                }}
+                value={dispType}
+                />
+            );
+          })}
+        </div>
+      );
     }else{
-      // Open Submenu for type
+      return (<div></div>);
-      setSubTopic(type);
     }
   };
 
@@ -130,7 +189,7 @@ function App() {
       >
         <div className="row">
           <h1 className="col-12">
-            <a href="">Allen Wrench</a>
+            <a href="">Drone Input Tool</a>
           </h1>
         </div>
         <div className="row">
@@ -152,12 +211,29 @@ function App() {
               }}
             />
           </div>
+          {/* TODO: Optional auto-send on pre-made messages */}
         </div>
         <div className="row modal-footer">
           <div className="col-4" onClick={() => {
             let url = "https://git.corrupt.link/liz/AllenWrench";
-            // TODO: Make multi-platform
+            platform().then((os: string) => {
-            new Command("open-link", ["-Command", "Start-Process", `${url}`]).spawn();
+              switch(os) {
+                case "win32":
+                  new Command("open-link-win", ["-Command", "Start-Process", `${url}`]).spawn();
+                  break;
+                case "linux":
+                  new Command("open-link-linux", ["-c", "xdg-open", `${url}`]).spawn();
+                  break;
+                case "macos":
+                  new Command("open-link-macos", ["-c", "open", `${url}`]).spawn();
+                  break;
+                default:
+                  console.log(`Unknown OS: ${os}`);
+                  break;
+              }
+              setConfigModalOpen(false);
+            });
+
           }}>
             <FontAwesomeIcon className="icon" icon={faGitAlt} size="2x" />
           </div>
@@ -170,24 +246,7 @@ function App() {
       </Modal>
       <div className="row">
         <div className="col-4">
-          {getSubjects(codes).map((type: string, index: number) => {
+          {buildMenu()}
-            let dispType: string = type;
-            let filtered = codes.filter((code: Code) => code.type === type);
-            if (filtered.length == 1) {
-              dispType += ((filtered[0].text == "")?" :: ...":((filtered[0].text == ".")?"":(" :: "+filtered[0].text)));
-            }
-            return (
-              <input
-                className={`item ${(filtered.length == 1)?"individual":""}`}
-                key={index}
-                type="button"
-                onClick={() =>  {
-                  handleTopicClick(type)
-                }}
-                value={dispType}
-                />
-            );
-          })}
         </div>
         <SubMenu/>
       </div>