Skip to content

Commit f78eef1

Browse files
committed
Redesign site
1 parent 2f5e095 commit f78eef1

32 files changed

+662
-395
lines changed

.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
_site
2-
_projects/testing
3-
*~
1+
_site
2+
_projects/testing
3+
*~
4+
.jekyll-cache/
5+
css/.jekyll-cache/

404.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
---
2-
layout: static_page
3-
title: 404 Error
4-
permalink: /404.html
5-
---
6-
<section class="full-height">
7-
<h1>404 Error</h1>
8-
<p>Oof. It looks like this page doesn't exist. Maybe you can find what you're looking for on the <a href="/"></a>homepage</a>?</p>
9-
10-
{% include footer.html %}
11-
</section>
1+
---
2+
layout: static_page
3+
title: 404 Error
4+
permalink: /404.html
5+
---
6+
<section class="full-height">
7+
<h1>404 Error</h1>
8+
<p>Oof. It looks like this page doesn't exist. Maybe you can find what you're looking for on the <a href="/"></a>homepage</a>?</p>
9+
10+
{% include footer.html %}
11+
</section>

LICENSE

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
MIT License
2-
3-
Copyright (c) 2017 John Goodliff
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
MIT License
2+
3+
Copyright (c) 2017 John Goodliff
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# [johng.io](https://johng.io) [Web]
2-
![](https://img.shields.io/badge/type-HTML-orange.svg "Project type")
3-
![](https://img.shields.io/github/repo-size/jerboa88/jerboa88.github.io.svg "Repository size")
4-
[![](https://img.shields.io/github/license/jerboa88/jerboa88.github.io.svg "Project license")](LICENSE)
5-
6-
My personal/portfolio site. Made by hand using the Jekyll static site generator and the Liquid template language for modularization, as well as vanilla HTML and CSS
7-
8-
9-
## License
10-
This project is licensed under the MIT License. See [LICENSE](LICENSE) for details.
1+
# [johng.io](https://johng.io) [Web]
2+
![](https://img.shields.io/badge/type-HTML-orange.svg "Project type")
3+
![](https://img.shields.io/github/repo-size/jerboa88/jerboa88.github.io.svg "Repository size")
4+
[![](https://img.shields.io/github/license/jerboa88/jerboa88.github.io.svg "Project license")](LICENSE)
5+
6+
My personal/portfolio site. Made by hand using the Jekyll static site generator and the Liquid template language for modularization, as well as vanilla HTML and CSS
7+
8+
9+
## License
10+
This project is licensed under the MIT License. See [LICENSE](LICENSE) for details.

_config.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
# Site settings
2-
title: John's Portfolio
3-
author: John Goodliff
4-
description: "John Goodliff's personal portfolio"
5-
url: "https://johng.io"
6-
github_link: "https://github.com/jerboa88/jerboa88.github.io"
7-
8-
# Change the primary color of the entire site
9-
theme_color: "#317b71"
10-
11-
# File structure settings
12-
image_path: /img
13-
14-
# Build settings
15-
markdown: kramdown
16-
permalink: pretty
17-
18-
# Collection definitions and settings
19-
collections:
20-
projects:
21-
output: true
22-
permalink: /projects/:path/
23-
24-
# Set default layout for projects
25-
defaults:
26-
-
27-
scope:
28-
path: "" # An empty string here means all files in the project
29-
type: projects
30-
values:
31-
layout: project_page
1+
# Site settings
2+
title: John's Portfolio
3+
author: John Goodliff
4+
description: "John Goodliff's personal portfolio"
5+
url: "https://johng.io"
6+
github_link: "https://github.com/jerboa88/jerboa88.github.io"
7+
8+
# Change the primary color of the entire site
9+
theme_color: "#317b71"
10+
11+
# File structure settings
12+
image_path: /img
13+
14+
# Build settings
15+
markdown: kramdown
16+
permalink: pretty
17+
18+
# Collection definitions and settings
19+
collections:
20+
projects:
21+
output: true
22+
permalink: /projects/:path/
23+
24+
# Set default layout for projects
25+
defaults:
26+
-
27+
scope:
28+
path: "" # An empty string here means all files in the project
29+
type: projects
30+
values:
31+
layout: project_page

_includes/common_head.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,6 @@
4242
<meta name="msapplication-TileColor" content="{{ color }}">
4343
<meta name="theme-color" content="{{ color }}">
4444
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
45+
46+
<script src="https://cdnjs.cloudflare.com/ajax/libs/rellax/1.11.0/rellax.min.js"></script>
4547
</head>

_includes/link_buttons.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
<nav>
2+
{% if page.instagram_link %}
3+
<a href="{{ page.instagram_link }}" class="icon-instagram" rel="external" target="_blank"></a>
4+
{% endif %}
5+
6+
{% if page.linkedin_link %}
7+
<a href="{{ page.linkedin_link }}" class="icon-linkedin-square" rel="external" target="_blank"></a>
8+
{% endif %}
9+
210
{% if page.github_link %}
3-
<a rel="external" href="{{ page.github_link }}" target="_blank"><i class="fa-github-square"></i> Github</a>
11+
<a href="{{ page.github_link }}" class="icon-github-square" rel="external" target="_blank"></a>
412
{% endif %}
513

614
{% if page.chrome_link %}
7-
<a rel="external" href="{{ page.chrome_link }}" target="_blank"><i class="fa-chrome"></i> Chrome Extension</a>
15+
<a href="{{ page.chrome_link }}" class="icon-chrome" rel="external" target="_blank"></a>
816
{% endif %}
917

1018
{% if page.firefox_link %}
11-
<a rel="external" href="{{ page.firefox_link }}" target="_blank"><i class="fa-firefox"></i> Add-on for Firefox</a>
19+
<a href="{{ page.firefox_link }}" class="icon-firefox" rel="external" target="_blank"></a>
1220
{% endif %}
1321

1422
{% if page.visit_link %}
15-
<a rel="external" href="{{ page.visit_link }}" target="_blank"><i class="fa-globe"></i> {{ page.visit_name | default: 'Visit' }}</a>
23+
<a href="{{ page.visit_link }}" class="icon-globe" rel="external" target="_blank">{{ page.visit_name | default: '' }}</a>
1624
{% endif %}
1725
</nav>

_layouts/project_page.html

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
1-
---
2-
layout: scrolling_page
3-
---
4-
<header class="project-header" style="background-image: url('{{ site.image_path }}/{{ page.image | default: 'unknown.png' }}')">
5-
{% include down_button.html %}
6-
</header>
7-
8-
<section id="next" class="full-height">
9-
<h1>{{- page.title -}}</h1>
10-
<p>{{- content -}}</p>
11-
12-
{% include link_buttons.html %}
13-
{% include footer.html %}
14-
</section>
1+
---
2+
layout: scrolling_page
3+
---
4+
5+
6+
<div class="background project-image" style="background-image: url('{{ site.image_path }}/{{ page.image | default: 'unknown.png' }}')"></div>
7+
8+
<header class="project-header" data-bg="{{ site.image_path }}/{{ page.image | default: 'unknown.png' }}">
9+
<a href="/#projects" class="back-button icon-arrow_back_ios"></a>
10+
<div class="project-type {{ page.category | default: 'unknown' }}"><p>{{ page.type | default: 'Unknown' }}</p></div>
11+
<h1>{{- page.title -}}</h1>
12+
<p>{{- page.description -}}</p>
13+
14+
<!-- {% include down_button.html %} -->
15+
</header>
16+
17+
<section id="about" class="full-height">
18+
<h2>About</h2>
19+
20+
<p>{{- content -}}</p>
21+
</section>
22+
23+
{% if page.show_links %}
24+
<section id="links" class="full-height">
25+
<h2>Links</h2>
26+
27+
{% include link_buttons.html %}
28+
</section>
29+
{% endif %}
30+
31+
{% include footer.html %}

_layouts/scrolling_page.html

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,18 @@
1-
<!DOCTYPE html>
2-
<html style="--bg-color: {{ site.theme_color }}">
3-
{% include common_head.html %}
4-
5-
<body>
6-
{{ content }}
7-
</body>
8-
9-
<!-- Use JS to handle scrolling page instead of anchor links if possible -->
10-
<script>
11-
let down_button = document.getElementById('down-button'),
12-
next = document.getElementById('next')
13-
14-
down_button.setAttribute('href', 'javascript:;')
15-
down_button.addEventListener('click', function() {
16-
next.scrollIntoView(true)
17-
})
18-
</script>
19-
20-
{% if page.title != 'Portfolio' %}
21-
<script>
22-
if (location.hash == '#next') {
23-
let port = window.location.port
24-
location.replace(window.location.protocol + '//' + window.location.hostname + (port ? ':' + port : '') + window.location.pathname)
25-
}
26-
27-
else {
28-
setTimeout(function() {
29-
location.replace(window.location.href + '#next')
30-
}, 2000)
31-
}
32-
33-
34-
</script>
35-
{% endif %}
36-
</html>
1+
<!DOCTYPE html>
2+
<html style="--bg-color: {{ site.theme_color }}">
3+
{% include common_head.html %}
4+
5+
<body>
6+
<div class="background"></div>
7+
{{ content }}
8+
9+
<!-- Use JS to handle scrolling page instead of anchor links if possible -->
10+
<script src="/js/down-button.js"></script>
11+
12+
{% if page.title == 'Portfolio' %}
13+
<script src="/js/stars.js"></script>
14+
{% else %}
15+
<script src="/js/scroll.js"></script>
16+
{% endif %}
17+
</body>
18+
</html>

_layouts/static_page.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<!DOCTYPE html>
2-
<html style="--bg-color: {{ site.theme_color }}">
3-
{% include common_head.html %}
4-
5-
<body>
6-
{{ content }}
7-
</body>
8-
</html>
1+
<!DOCTYPE html>
2+
<html style="--bg-color: {{ site.theme_color }}">
3+
{% include common_head.html %}
4+
5+
<body>
6+
{{ content }}
7+
</body>
8+
</html>

_projects/MiniCalc.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
---
2-
title: MiniCalc
3-
description: A complete command line calculator and parser implemented in Python
4-
type: Python
5-
category: python
6-
date: February 28, 2019
7-
image: minicalc.png
8-
---
9-
A complete command line calculator and parser implemented in Python. Compatible with both Python 2 and Python 3. Allows complex expressions to be evaluated in the terminal.
1+
---
2+
title: MiniCalc
3+
description: A complete command line calculator and parser implemented in Python
4+
type: Python
5+
category: python
6+
date: February 28, 2019
7+
image: minicalc.png
8+
---
9+
A complete command line calculator and parser implemented in Python. Compatible with both Python 2 and Python 3. Allows complex expressions to be evaluated in the terminal.

_projects/Tally-Extension.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ date: September 22, 2018
77
image: tally-extension.png
88
github_link: https://github.com/jerboa88/Tally-Extension
99
chrome_link: https://chrome.google.com/webstore/detail/tally-word-counter/eggkmbghbmjmbdjloifaklghfiecjbnk
10+
show_links: true
1011
importance: 4
1112
---
1213
A Chrome extension port of my online character counter [Tally](https://tallywordcounter.online). A tool to easily count the number of words, characters, and paragraphs on any site. Just right click on any selected text and click Count. The project has over 300 daily users.

_projects/Tally.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
---
2-
title: Tally Word Counter
3-
description: Your favorite character counter, with a dark mode! Count the number of words, sentences, and paragraphs in your text instantly.
4-
type: HTML, CSS, JS
5-
category: web
6-
date: March 14, 2019
7-
image: tally.png
8-
github_link: https://github.com/jerboa88/Tally
9-
visit_link: https://tally.johng.io
10-
importance: 3
11-
---
12-
A site that counts the number of words, sentences, and paragraphs in inputted text. A personal project,
13-
created partly because there is a lack of dark character counters online, and also to practice using CSS grid
14-
layouts, parsing, and cookie handling in Javascript.
1+
---
2+
title: Tally Word Counter
3+
description: Your favorite character counter, with a dark mode! Count the number of words, sentences, and paragraphs in your text instantly.
4+
type: HTML, CSS, JS
5+
category: web
6+
date: March 14, 2019
7+
image: tally.png
8+
github_link: https://github.com/jerboa88/Tally
9+
visit_link: https://tally.johng.io
10+
show_links: true
11+
importance: 3
12+
---
13+
A site that counts the number of words, sentences, and paragraphs in inputted text. A personal project,
14+
created partly because there is a lack of dark character counters online, and also to practice using CSS grid
15+
layouts, parsing, and cookie handling in Javascript.

0 commit comments

Comments
 (0)