Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dlubawy committed Dec 20, 2021
2 parents 0202c25 + ffb56c1 commit e7459f4
Show file tree
Hide file tree
Showing 21 changed files with 2,283 additions and 258 deletions.
2 changes: 1 addition & 1 deletion firebase.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"hosting": {
"public": "public",
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
Expand Down
2,042 changes: 1,872 additions & 170 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
{
"name": "mysite",
"version": "0.1.0",
"version": "2.0.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"serve": "firebase emulators:start",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
"lint": "vue-cli-service lint",
"deploy": "firebase deploy"
},
"dependencies": {
"bootstrap": "^5.1.3",
"bootswatch": "^5.1.3",
"core-js": "^3.6.5",
"firebase": "^9.6.1",
"vue": "^2.6.11"
},
"devDependencies": {
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
21 changes: 13 additions & 8 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
<!DOCTYPE html>
<html lang="">
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
<title>Andrew's Site</title>
<meta name="description" content="Andrew Lubawy's homepage" />
</head>
<body>
<body data-bs-spy="scroll" data-bs-target=".navbar" data-bs-offset="56">
<noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
<strong
>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
properly without JavaScript enabled. Please enable it to
continue.</strong
>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
Expand Down
234 changes: 221 additions & 13 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,28 +1,236 @@
<template>
<div id="app">
<img alt="Vue logo" src="./assets/logo.png">
<HelloWorld msg="Welcome to Your Vue.js App"/>
<Navbar />
<div class="d-flex flex-column text-white">
<div id="home">
<div id="background-image" class="bg-image">
<br />
<div
id="home-text"
class="row align-items-center mx-auto text-center h-100 text-white"
>
<div class="col">
<h1>Andrew Lubawy</h1>
<p class="lead">B.S. Electrical Engineering</p>
</div>
<div>
<a href="#about" class="btn btn-link hvr-grow">
<img src="./assets/down_arrow.png" alt="Down arrow icon" />
</a>
</div>
</div>
</div>
</div>
<div id="about">
<br />
<div class="container">
<div class="row gap-2">
<div class="col-md-4 m-auto">
<div class="container">
<img
src="./assets/profile.webp"
class="img-fluid rounded-circle"
alt="Profile picture of Andrew"
/>
</div>
</div>
<div class="col text-center m-auto">
<h2>Hello! I'm Andrew Lubawy.</h2>
<p class="lead">
Software Devloper for Analytical Mechanics Associates and
contractor for NASA Langley Research Center. Hacker in the
traditional sense through and through. I enjoy taking things
apart and learning what makes them tick. I also enjoy creating
things, so if you need something, I'll happily try and build it
for you.
</p>
</div>
</div>
</div>
<br />
</div>
<div id="skills">
<br />
<div class="container text-center">
<div class="row">
<h2>Skills</h2>
</div>
<br />
<div class="row gap-4">
<div class="col">
<img
src="./assets/embedded.webp"
class="rounded"
width="200"
height="200"
alt="Picture of microcontrollers"
/>
<p class="lead">
Embedded systems design with hardware programming knowledge in C
and Verilog HDL.
</p>
</div>
<div class="col">
<img
src="./assets/full_stack.webp"
class="rounded"
width="200"
height="200"
alt="Stack of pancakes"
/>
<p class="lead">
Full stack development. Backend programming with Django, Rails,
and Flask. Frontend programming with JavaScript, HTML, and CSS.
</p>
</div>
<div class="col">
<img
src="./assets/circuit.webp"
class="rounded"
width="200"
height="200"
alt="Printed circuit board"
/>
<p class="lead">
Circuit design and debugging. Experience with soldering,
oscilloscopes, multimeters, and Altium Designer for PCB design.
</p>
</div>
<div class="col">
<img
src="./assets/code.webp"
class="rounded"
width="200"
height="200"
alt="Lines of code"
/>
<p class="lead">
Software development and object oriented language proficiency
with Python, Java, C++, and Ruby.
</p>
</div>
</div>
</div>
<br />
</div>
<div id="contact">
<br />
<div class="container text-center gap-4">
<div class="row">
<h2>Contact Me</h2>
</div>
<div class="row">
<ContactForm :user="user" />
</div>
</div>
<br />
</div>
<footer class="footer bg-primary">
<br />
<div class="container text-center">
<div class="row-2 justify-content-center">
<div class="btn-group">
<a
type="button"
class="btn btn-link"
href="https://github.com/dlubawy"
target="_blank"
rel="noreferrer"
v-on:click="logClick('GitHub')"
>
<img
src="./assets/github_icon.png"
class="img-fluid"
alt="GitHub icon"
/>
</a>
<a
type="button"
class="btn btn-link"
href="https://www.linkedin.com/in/andrewlubawy"
target="_blank"
rel="noreferrer"
v-on:click="logClick('LinkedIn')"
>
<img
src="./assets/linkedin_icon.png"
class="img-fluid"
alt="LinkedIn icon"
/>
</a>
</div>
</div>
<div class="row">
<p class="small text-muted">Site built by myself.</p>
</div>
</div>
</footer>
</div>
</div>
</template>

<script>
import HelloWorld from './components/HelloWorld.vue'
import Navbar from "./components/Navbar.vue";
import ContactForm from "./components/ContactForm.vue";
import { auth, analytics } from "./firebaseConfig.js";
import { logEvent } from "firebase/analytics";
var tag = document.URL.split("#")[1];
if (tag == null) {
tag = "home";
}
export default {
name: 'App',
name: "App",
data() {
return {
user: "",
};
},
components: {
HelloWorld
}
}
Navbar,
ContactForm,
},
methods: {
logClick(id) {
logEvent(analytics, "select_content", {
content_type: "link",
item_id: id,
});
},
},
created() {
auth.onAuthStateChanged((user) => {
if (user) {
this.user = user;
}
});
},
};
</script>

<style>
#app {
font-family: Avenir, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-align: center;
color: #2c3e50;
margin-top: 60px;
height: 100vh;
position: relative;
}
#background-image {
background-image: url("./assets/background.webp");
height: 100vh;
background-size: cover;
}
#home-text {
max-width: 42em;
text-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
}
#about {
background-color: #81633e;
}
#skills {
background-color: #2b5b43;
}
#contact {
background-color: #2a4352;
}
</style>
Binary file added src/assets/background.webp
Binary file not shown.
Binary file added src/assets/circuit.webp
Binary file not shown.
Binary file added src/assets/code.webp
Binary file not shown.
Binary file added src/assets/down_arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/embedded.webp
Binary file not shown.
Binary file added src/assets/full_stack.webp
Binary file not shown.
Binary file added src/assets/github_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/linkedin_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/logo.png
Binary file not shown.
Binary file added src/assets/profile.webp
Binary file not shown.
Loading

0 comments on commit e7459f4

Please sign in to comment.