aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <alee14498@protonmail.com>2020-04-30 15:01:40 -0400
committerAndrew Lee <alee14498@protonmail.com>2020-04-30 15:01:40 -0400
commit848f1ca425e03cdcf7503ab51d80711bbf28c0f2 (patch)
treec008b954d10a7318933138c8ea45804eb33ba825
parent37522c3ce749f6582c47e892c935297220e926dc (diff)
downloadpersonal-website-848f1ca425e03cdcf7503ab51d80711bbf28c0f2.tar.gz
personal-website-848f1ca425e03cdcf7503ab51d80711bbf28c0f2.tar.bz2
personal-website-848f1ca425e03cdcf7503ab51d80711bbf28c0f2.zip
Major changes in home page, added stuff on other pages and favicon
-rwxr-xr-xassets/img/Alee.pngbin0 -> 81539 bytes
-rw-r--r--components/Footer.vue8
-rw-r--r--components/Navbar.vue15
-rw-r--r--layouts/default.vue2
-rw-r--r--nuxt.config.js13
-rw-r--r--package.json10
-rw-r--r--pages/blog/index.vue31
-rw-r--r--pages/index.vue111
-rw-r--r--pages/projects/index.vue24
-rw-r--r--static/admin/config.yml7
-rw-r--r--static/favicon.icobin0 -> 15406 bytes
11 files changed, 189 insertions, 32 deletions
diff --git a/assets/img/Alee.png b/assets/img/Alee.png
new file mode 100755
index 0000000..caf3204
--- /dev/null
+++ b/assets/img/Alee.png
Binary files differ
diff --git a/components/Footer.vue b/components/Footer.vue
index a2b514e..1890e08 100644
--- a/components/Footer.vue
+++ b/components/Footer.vue
@@ -1,9 +1,9 @@
<template>
- <v-footer app class="font-weight-medium" color="green darken-3" dark>
+ <v-footer class="font-weight-medium" color="green darken-3" dark>
<v-col cols="12">
- <p class="text-center">Created using NuxtJS and Vuetify. Hosted on Netlify.</p>
- <p class="text-center"><strong>&copy; Copyright 2018-{{ new Date().getFullYear() }}, Andrew Lee.</strong>
- </p>
+ <p class="text-center">Website is licensed under GPL-3.0.</p>
+ <p class="text-center">Created using Vue.JS + NuxtJS and Vuetify. Hosted on Netlify.</p>
+ <p class="text-center">&copy; Copyright 2018-{{ new Date().getFullYear() }}, Andrew Lee. All rights reserved.</p>
</v-col>
</v-footer>
</template>
diff --git a/components/Navbar.vue b/components/Navbar.vue
index 725a666..6d65501 100644
--- a/components/Navbar.vue
+++ b/components/Navbar.vue
@@ -12,6 +12,19 @@
<v-btn to="/projects" text>
Projects
</v-btn>
+ <v-spacer/>
+ <v-btn href="https://github.com/Alee14" icon>
+ <v-icon>mdi-github</v-icon>
+ </v-btn>
+ <v-btn href="https://twitter.com/Alee14498" icon>
+ <v-icon>mdi-twitter</v-icon>
+ </v-btn>
+ <v-btn href="https://www.youtube.com/channel/UCNRn4YDPCCWSEl3CT7eWorA" icon>
+ <v-icon>mdi-youtube</v-icon>
+ </v-btn>
+ <v-btn href="https://discord.gg/EFhRDqG" icon>
+ <v-icon>mdi-discord</v-icon>
+ </v-btn>
</v-toolbar>
</v-card>
</template>
@@ -20,9 +33,7 @@
export default {
name: 'Navbar'
}
-
</script>
<style scoped>
-
</style>
diff --git a/layouts/default.vue b/layouts/default.vue
index 9640fce..abe0489 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,5 +1,5 @@
<template>
- <v-app dark>
+ <v-app>
<Navbar/>
<nuxt/>
<Footer/>
diff --git a/nuxt.config.js b/nuxt.config.js
index 2b4a6a4..7f24d0d 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -6,8 +6,16 @@ module.exports = {
titleTemplate: '%s - Andrew Lee',
meta: [
{ charset: 'utf-8' },
- { name: 'viewport', content: 'width=device-width, initial-scale=1' }
- ]
+ { name: 'viewport', content: 'width=device-width, initial-scale=1' },
+ { hid: 'description', name: 'description', content: 'Andrew\'s Personal Website' }
+ ],
+ link: [
+ {
+ rel: 'icon',
+ type: 'image/x-icon',
+ href: 'favicon.ico',
+ }
+ ]
},
/*
** Customize the progress-bar color
@@ -54,6 +62,7 @@ module.exports = {
}
}
},
+
/*
** Build configuration
*/
diff --git a/package.json b/package.json
index 7500fcf..27644d4 100644
--- a/package.json
+++ b/package.json
@@ -13,26 +13,26 @@
"lint": "eslint --ext .js,.vue --ignore-path .gitignore ."
},
"dependencies": {
+ "@nuxtjs/pwa": "^3.0.0-0",
"node-sass": "^4.13.1",
"nuxt": "^2.12.2",
- "@nuxtjs/pwa": "^3.0.0-0",
"nuxt-mobile": "^1.0.1",
"prettier": "^2.0.5",
"vuetify": "^2.2.23"
},
"devDependencies": {
- "@nuxtjs/vuetify": "^1.11.0",
"@nuxtjs/eslint-config": "^2.0.0",
"@nuxtjs/eslint-module": "^1.0.0",
- "eslint": "^6.8.0",
+ "@nuxtjs/vuetify": "^1.11.0",
"babel-eslint": "^10.0.1",
+ "eslint": "^6.8.0",
+ "eslint-config-prettier": "^6.10.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
+ "eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
- "eslint-config-prettier": "^6.10.0",
- "eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-vue": "^6.2.2"
}
}
diff --git a/pages/blog/index.vue b/pages/blog/index.vue
index f818c20..2e10eba 100644
--- a/pages/blog/index.vue
+++ b/pages/blog/index.vue
@@ -1,8 +1,20 @@
<template>
<div>
- <v-card-title>Blog</v-card-title>
- <v-card-text>This is where I will be posting my stuff</v-card-text>
- <h1>Hello</h1>
+ <v-card>
+ <header id="showcase">
+ <h1 class="display-3">Blog</h1>
+ <h1>This is where I post stuff here.</h1>
+ </header>
+ </v-card>
+ <v-container>
+ <v-col cols="6">
+ <v-card to="/">
+ <v-card-title>Blog Post Title</v-card-title>
+ <v-card-text>Content</v-card-text>
+ </v-card>
+ <br>
+ </v-col>
+ </v-container>
</div>
</template>
@@ -13,8 +25,19 @@ export default {
title: 'Blog'
}
}
+
</script>
<style scoped>
-
+ #showcase {
+ background-image:url("../../assets/img/landing_page.png");
+ background-size: cover;
+ background-position: center;
+ height: 30vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ padding: 0 20px;
+ }
</style>
diff --git a/pages/index.vue b/pages/index.vue
index d66d3fc..420b60e 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,13 +1,98 @@
<template>
<div>
- <v-card>
- <h1>Landing page here</h1>
- </v-card>
- <v-container>
- <v-card flat color="green darken-3" dark>
- <h1>About Me</h1>
- <p>Hello! I am Andrew Lee and I'm 15 years old. In 2014, I started my first youtube channel The Alee Diamond.</p>
+ <!-- Animation goes here -->
+ <div class="landing-page">
+ <v-card>
+ <header id="showcase">
+ <v-img :src="require('../assets/img/Alee.png')" max-height="200px" max-width="200px" />
+ <br/>
+ <h1 class="display-4">Hello, I'm Andrew Lee!</h1>
+ <br/>
+ <h1 class="display-1">Welcome to my personal website.</h1>
+ <h1>Note to Andrew: Replace this background</h1>
+ </header>
</v-card>
+ </div>
+ <v-container>
+ <div class="about">
+ <v-card flat color="green darken-3" dark>
+ <v-container>
+ <h1>About Me</h1>
+ <p><b>Hello, I'm Andrew Lee and I'm currently 15 years old.</b></p>
+ <h1>Timeline</h1>
+ <p> 2014: Created my first YouTube channel The Alee Diamond<br>
+ 2015: First got into programming and learned HTML and Batch.<br>
+ 2016: Learned a bit of VB, The Alee Diamond rebranded into Andrew Lee and AleeTechyPlays is born.<br>
+ 2017: Learned JavaScript and C#.</p>
+ <h1>Programming Languages</h1>
+ <ul>
+ <li>C#</li>
+ <li>C++</li>
+ <li>JavaScript</li>
+ <li>HTML</li>
+ <li>Vue</li>
+ </ul>
+ <h1>My favorite games</h1>
+ <ul>
+ <li>Splatoon 2</li>
+ <li>Animal Crossing: New Horizons</li>
+ <li>Minecraft</li>
+ <li>Super Mario Maker 2</li>
+ <li>Super Mario Odyssey</li>
+ <li>PC Building Simulator</li>
+ <li>Software Inc</li>
+ <li>Hacknet</li>
+ </ul>
+ </v-container>
+ </v-card>
+ </div>
+ <div class="projects">
+ <!-- This might get removed -->
+ </div>
+ <div class="blog">
+ <h1>Blog here</h1>
+ </div>
+ <div class="aleepc-specs">
+ <h1>AleePC Parts</h1>
+ <v-simple-table>
+ <tr>
+ <th>Part Type</th>
+ <th>Part Name</th>
+ </tr>
+ <tr>
+ <td>CPU</td>
+ <td>AMD - Ryzen 3 2200G 3.5 GHz Quad-Core Processor</td>
+ </tr>
+ <tr>
+ <td>CPU Cooler</td>
+ <td>Cooler Master - Hyper T2 54.8 CFM Sleeve Bearing CPU Cooler</td>
+ </tr>
+ <tr>
+ <td>Motherboard</td>
+ <td>ASRock - B450M-HDV Micro ATX AM4</td>
+ </tr>
+ <tr>
+ <td>Memory</td>
+ <td>Corsair - Vengeance LPX 16 GB (2 x 8 GB) DDR4-2400</td>
+ </tr>
+ <tr>
+ <td>Main Storage</td>
+ <td>Western Digital Blue 250 GB M.2-2280 Solid State Drive</td>
+ </tr>
+ <tr>
+ <td>Second Storage</td>
+ <td>Western Digital Blue 2 TB 3.5" 5400RPM Internal Hard Drive</td>
+ </tr>
+ <tr>
+ <td>Case</td>
+ <td>Rosewill - FBM-X1 MicroATX Mini Tower Case</td>
+ </tr>
+ <tr>
+ <td>Power Supply</td>
+ <td>EVGA - 500 W 80+ Certified ATX Power Supply</td>
+ </tr>
+ </v-simple-table>
+ </div>
</v-container>
</div>
</template>
@@ -25,5 +110,15 @@ export default {
</script>
<style scoped>
-
+ #showcase {
+ background-image:url("../assets/img/landing_page.png");
+ background-size: cover;
+ background-position: center;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ padding: 0 20px;
+ }
</style>
diff --git a/pages/projects/index.vue b/pages/projects/index.vue
index 6f9c676..c8487ce 100644
--- a/pages/projects/index.vue
+++ b/pages/projects/index.vue
@@ -1,13 +1,31 @@
<template>
- <p>test</p>
+ <v-card>
+ <header id="showcase">
+ <h1 class="display-3">Projects</h1>
+ <h1>My current and past projects goes here.</h1>
+ </header>
+ </v-card>
</template>
<script>
export default {
- name: 'projects'
+ name: 'projects',
+ head: {
+ title: 'Projects'
+ }
}
</script>
<style scoped>
-
+ #showcase {
+ background-image:url("../../assets/img/landing_page.png");
+ background-size: cover;
+ background-position: center;
+ height: 30vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ padding: 0 20px;
+ }
</style>
diff --git a/static/admin/config.yml b/static/admin/config.yml
index 97288f2..293cd96 100644
--- a/static/admin/config.yml
+++ b/static/admin/config.yml
@@ -2,13 +2,14 @@ backend:
name: git-gateway
branch: master # Branch to update (optional; defaults to master)
- media_folder: assets/img/
- public_folder: /img
+ publish_mode: editorial_workflow
+ media_folder: "static/images/uploads"
+ public_folder: "/images/uploads"
collections:
- name: 'blog'
label: 'Blog'
- format: 'md'
+
folder: 'assets/content/blog'
create: true
slug: '{{year}}-{{month}}-{{day}}-{{slug}}'
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 0000000..306534f
--- /dev/null
+++ b/static/favicon.ico
Binary files differ