code legibility

2022-07-10 17:36:24 -05:00
parent 27f6b87441
commit e01b72f104
11 changed files with 113 additions and 70 deletions
--- a/src/components/Navbar.jsx
+++ b/src/components/Navbar.jsx
@@ -55,7 +55,7 @@ export default function Navbar() {
        <header className="app-navbar">
            <div className="navbar-left">
                <a href="/" className="my-name">Mikayla Dobson</a>
-                <h2>Web Design Contractor</h2>
+                <h2>Web Engineer</h2>
            </div>

            <div className="navbar-right">
--- a/src/components/Technologies/MainTopic.jsx
+++ b/src/components/Technologies/MainTopic.jsx
@@ -1,15 +1,25 @@
 import { useState } from "react";
 import { SubTopic } from "./SubTopic";
-import { Card } from "@mui/material";
+import { Card, Chip } from "@mui/material";
 import { v4 } from "uuid";

 export function MainTopic({ name, subtopics }) {
    const [collapsed, setCollapsed] = useState(true);

    return (
-        <Card className="main-topic">
+        <Card className="main-topic" elevation={2}>
            <h1>{name}</h1>
-            { collapsed ? null : subtopics.map(data => <SubTopic key={v4()} data={data} />) }
+            <div className="subtopic-container">
+                {
+                    collapsed || subtopics.map(inner => {
+                        return (
+                            inner.subtopics ?
+                            <SubTopic key={v4()} data={inner} />
+                            : <Chip key={v4()} label={inner} />
+                        )
+                    })
+                }
+            </div>
            <button onClick={() => setCollapsed(!collapsed)}>{collapsed ? "Show" : "Hide"}</button>
        </Card>
    )
--- a/src/components/Technologies/SubTopic.jsx
+++ b/src/components/Technologies/SubTopic.jsx
@@ -1,17 +1,25 @@
 import { Card, Chip } from "@mui/material";
+import { useEffect, useState } from "react";
 import { v4 } from "uuid";

 export function SubTopic({ data }) {
+    const [contents, setContents] = useState();
+
+    useEffect(() => {
+        setContents(() => {
+            if (data.subtopics.length) {
+                return data.subtopics.map(each => <Chip key={v4()} label={each} />);
+            } else {
+                return <p>In progress!</p>
+            }
+        })
+    }, []);
+
    return (
-        <Card className="subtopic-card">
-            <strong>{data.topic || data}</strong>
+        <Card className="subtopic-card" elevation={5}>
+            <strong>{data.topic}</strong>
            <div className="subtopics">
-                { data.subtopics ?
-                    data.subtopics.map(each => {
-                        return <Chip key={v4()} label={each} />
-                    })
-                    : null
-                }
+                {contents}
            </div>
        </Card>
    )
--- a/src/logo.svg
+++ b/src/logo.svg
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>
--- a/src/pages/Projects.jsx
+++ b/src/pages/Projects.jsx
@@ -14,7 +14,7 @@ const defaultFilter = {

 export default function Projects() {
    const [results, setResults] = useState();
-    const [filter, setFilter] = useState(defaultFilter);
+    const [search, setSearch] = useState('');
    const [text, setText] = useState();

    const searchInput = useRef();
@@ -23,13 +23,13 @@ export default function Projects() {
    useEffect(() => {
        let result = [];

-        if (filter === defaultFilter) {
+        if (!search) {
            setResults(projectsArray.map(each => each.jsx));
            return;
        }

-        if (filter.searchTerm) {
-            let termLower = filter.searchTerm.toLowerCase();
+        if (search) {
+            let termLower = search.toLowerCase();

            let i = 0;
            while (i < text.length) {
@@ -43,12 +43,10 @@ export default function Projects() {
                }
                i++;
            }
-        } else if (filter.inProgress) {
-            result = result.filter(obj => !obj.inProgress);
        }

        setResults(result.map(each => each.jsx));
-    }, [filter]);
+    }, [search]);

    useEffect(() => {
        let projectText = [];
@@ -82,14 +80,6 @@ export default function Projects() {
        setText(projectText);
    }, [])

-    const handleChange = (e) => {
-        e.preventDefault();
-        setFilter({
-            ...filter,
-            language: e.target.value
-        })
-    }
-
    const handleReset = () => {
        setFilter(defaultFilter);
        searchInput.current.value = '';
@@ -105,27 +95,9 @@ export default function Projects() {
                <div className="filter-controls">
                    <input
                        ref={searchInput} type="text"
-                        onChange={(e) => setFilter({...filter, searchTerm: e.target.value})}
+                        onChange={(e) => setSearch(e.target.value)}
                        placeholder="Enter a search term">
                    </input>
-                    <select ref={languageFilter} onChange={handleChange} name="language" id="language">
-                        <option value="">- Language -</option>
-                        <option value="Express">Express</option>
-                        <option value="JavaScript">JavaScript</option>
-                        <option value="MaterialUI">Material UI</option>
-                        <option value="MongoDB">MongoDB</option>
-                        <option value="PostgreSQL">PostgreSQL</option>
-                        <option value="Python">Python</option>
-                        <option value="React">React</option>
-                        <option value="Redux">Redux</option>
-                        <option value="REST_API">REST API</option>
-                        <option value="Sass">Sass</option>
-                        <option value="SQLite">SQLite</option>
-                        <option value="TypeScript">TypeScript</option>
-                    </select>
-                    <button onClick={() => setFilter({...filter, inProgress: !filter.inProgress})}>
-                            {filter.inProgress ? "Show" : "Hide"} in-progress
-                        </button>
                    <button onClick={handleReset}>Reset</button>
                </div>
            </section>
--- a/src/pages/Technologies.jsx
+++ b/src/pages/Technologies.jsx
@@ -10,7 +10,13 @@ export default function Technologies() {
    return (
        <div className="technologies-page" style={htmlTheme}>
            {techList.map(item => {
-                return <MainTopic key={v4()} name={item.topic} subtopics={item.subtopics} />
+                return (
+                    <MainTopic
+                        key={v4()}
+                        name={item.topic}
+                        subtopics={item.subtopics}
+                    />
+                );
            })}
        </div>
    )
--- a/src/sass/App.scss
+++ b/src/sass/App.scss
@@ -39,9 +39,16 @@

    .projects-page {
      .filter-panel {
+        margin-bottom: 2rem;
        width: 65%;
      }
    }
+
+    .technologies-page {
+      .main-topic {
+        width: 70vw;
+      }
+    }
  }
  
  // mobile queries
--- a/src/sass/Navbar.scss
+++ b/src/sass/Navbar.scss
@@ -1,4 +1,5 @@
@import "helper/variables";
+@import "components/Button";

 .app-navbar {
  background-color: $purple200;
@@ -11,6 +12,18 @@
  width: 100vw;
  z-index: 9;

+  button {
+    @extend %button-style;
+    border-color: transparent;
+    border-radius: 0;
+    position: absolute;
+    right: 0;
+    height: 100%;
+    &:hover {
+      background-color: purple;
+    }
+  }
+
  .navbar-left {
    display: flex;
    flex-direction: row;
@@ -50,9 +63,4 @@
    position: relative;
    padding-left: 1rem;
  }
-
-  // drawer component
-  .side-drawer {
-    background-color: red;
-  }
 }
--- a/src/sass/components/_Button.scss
+++ b/src/sass/components/_Button.scss
@@ -0,0 +1,15 @@
+@import "../helper/variables";
+
+%button-style {
+    border-radius: 12px;
+    border: 1px solid white;
+    background-color: $purple100;
+    color: darkslateblue;
+    padding: 8px;
+    &:hover {
+        background-color: $purple200;
+    }
+    &:active {
+        background-color: $purple100;
+    }
+}
--- a/src/sass/pages/Projects.scss
+++ b/src/sass/pages/Projects.scss
@@ -15,8 +15,11 @@
  
      .filter-controls {
        display: flex;
-        justify-content: space-between;
+        justify-content: center;
        width: 80%;
+        > * {
+          margin: 1rem;
+        }
      }
    }
  
--- a/src/sass/pages/Technologies.scss
+++ b/src/sass/pages/Technologies.scss
@@ -1,27 +1,48 @@
@import "../helper/variables";
@import "../helper/animations";

+@import "../components/Button";
+
 .technologies-page {
    .main-topic {
        display: flex;
        flex-direction: column;
        align-items: center;
-        width: 70vw;
+        border-radius: 16px;
+        width: 50vw;
        margin: 1rem 0;
        padding: 1rem;
+        button {
+            @extend %button-style;
+        }
    }

-    .subtopic-card {
-        width: 58vw;
-        .subtopics {
-            display: flex;
-            flex-flow: row wrap;
-            justify-content: center;
+    .subtopic-container {
+        display: flex;
+        flex-flow: row wrap;
+        justify-content: center;
+
+        .subtopic-card {
+            width: 58vw;
+            margin: 1rem;
            padding: 1rem;
-            & > * {
-                padding: 0.5rem;
-                margin: 0.5rem;
+            .subtopics {
+                display: flex;
+                flex-flow: row wrap;
+                justify-content: center;
+                padding: 1rem;
+                & > * {
+                    padding: 0.5rem;
+                    margin: 0.5rem;
+                }
            }
+            &:last-child {
+                margin-bottom: 2rem;
+            }
+        }
+
+        .MuiChip-root {
+            margin: 5px 0 1rem;
        }
    }
 }