diff --git a/src/assets/logos/dixie-tech-logo.png b/src/assets/logos/dixie-tech-logo.png new file mode 100644 index 0000000..63aa57b Binary files /dev/null and b/src/assets/logos/dixie-tech-logo.png differ diff --git a/src/assets/logos/lifetime-logo.webp b/src/assets/logos/lifetime-logo.webp new file mode 100644 index 0000000..4367bbd Binary files /dev/null and b/src/assets/logos/lifetime-logo.webp differ diff --git a/src/components/App.jsx b/src/components/App.jsx index 1bb291a..a077947 100644 --- a/src/components/App.jsx +++ b/src/components/App.jsx @@ -16,6 +16,8 @@ import logo from '../assets/logos/fd..svg'; import ultradentLogo from '../assets/logos/ultradent-white.svg'; import monumetricLogo from '../assets/logos/monumetric-stacked-white.svg'; import linkedInLogo from '../assets/logos/linkedin-logo.png'; +import lifetimeLogo from '../assets/logos/lifetime-logo.webp'; +import dixieTechLogo from '../assets/logos/dixie-tech-logo.png'; import git from '../assets/logos/git-logo.png'; import { toTitleCase } from '../scripts/utils'; @@ -60,7 +62,7 @@ const SocialSphere = ({texture, position, rotation, scale, url}) => { Click to view my {platformTitle()} -
+
); @@ -140,6 +142,15 @@ const App = () => { + {!screenClicked ? + + + + Scroll + + + : null} + { I have experience with testing libraries such as Jest, Enzyme, and React testing library.

Automation tools, and task runners such as Webpack, Grunt, and NPM.

- I also work as a UX/UI designer using tools such as the Adobe Suite(Adobe XD, Adobe Illustrator, etc.), Sketch, and Figma. + For UX/UI Design I'm using tools such as the Adobe Suite(Adobe XD, Adobe Illustrator, etc.), Sketch, and Figma.

@@ -227,9 +238,10 @@ const App = () => {
- Monumetric Logo - Graphic of the Pale Blue Dot from Caral Sagan with Monumetric below + Monumetric Logo - Graphic of the Pale Blue Dot from Caral Sagan with Monumetric below

+ Monumetric
Frontend Developer and UX/UI Designer
 Oct 2021 - Present
Technologies Used:
@@ -238,14 +250,42 @@ const App = () => {

- - Ultradent Logo - UPI in white for Ultradent Products Inc. + + Lifetime Products Logo - The word Lifetime in a shield

- Front End Developer
 + Lifetime Products Inc.
+ UX & UI Designer and Developer
 + Dec 2020 - Oct 2021
+ Technologies Used:
+ C# environment - UX/UI Design, React, Razor Views, Javascript, jQuery, Webpack, SCSS(Sass), Adobe XD, implementation of React Testing Library. +

+
+ +
+ + Ultradent Logo - Letters UPI in white for Ultradent Products Inc. + +

+ Ultradent Products Inc.
+ Front End Web Developer
 May 2018 - Apr 2020
Technologies Used:
- React/Preact, Javascript, jQuery, Webpack, Storybook, React Testing Library, SCSS(Sass), Razor Views, Figma, Sketch

+ React/Preact, Javascript, jQuery, Webpack, Storybook, React Testing Library, SCSS(Sass), Razor Views, Figma, Sketch +

+
+ +
+ + Ultradent Logo - Letters UPI in white for Ultradent Products Inc. + +

+ Dixie Technical College
+ Front End Web Developer
 + May 2017 - Oct 2017
+ Technologies Used:
+ Javascript, jQuery, HTML, CSS, Adobe Illustrator +

diff --git a/src/styles/styles.scss b/src/styles/styles.scss index 0885cf4..ca14ada 100644 --- a/src/styles/styles.scss +++ b/src/styles/styles.scss @@ -39,6 +39,16 @@ body { } } +.scroll-indicator { + display: flex; + flex-direction: column; + align-items: center; + color: white; + background-color: rgba(0, 0, 0, 0.5); + border-radius: 8px; + padding: 0.5rem; +} + .tooltip { background-color: #1a1a1d; color: white; @@ -55,7 +65,7 @@ body { border-right: 1vh solid transparent; border-top: 2vh solid #1a1a1d; position: absolute; - top: 65%; + top: 70%; left: -4%; transform: rotate(50deg); } diff --git a/src/views/index.html b/src/views/index.html index 6999673..85edb16 100644 --- a/src/views/index.html +++ b/src/views/index.html @@ -7,6 +7,16 @@ Font End Web Developer and Designer + + + + diff --git a/webpack.common.js b/webpack.common.js index 3f3948e..138e2ba 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -62,7 +62,7 @@ module.exports = { }, { - test: /\.(png|jpe?g|gif|svg)$/i, + test: /\.(png|jpe?g|gif|svg|webp)$/i, loader: 'file-loader', options: { name: '[name].[ext]',