Update core pages
This commit is contained in:
parent
c96d627c56
commit
17c65ee6e0
3 changed files with 22 additions and 26 deletions
|
|
@ -8,11 +8,11 @@
|
||||||
<div class="container text-center">
|
<div class="container text-center">
|
||||||
<h3>The page you were looking for could not be found.</h3>
|
<h3>The page you were looking for could not be found.</h3>
|
||||||
<h1>¯\_(ツ)_/¯</h1>
|
<h1>¯\_(ツ)_/¯</h1>
|
||||||
<p>For now, here's a picture of a cat!</p>
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
<section>
|
<section>
|
||||||
<div class="container text-center">
|
<div class="container text-center">
|
||||||
|
<p>For now, here's a picture of a cat!</p>
|
||||||
<img src="https://2.bp.blogspot.com/-mh8wLBv3gzk/TcTXhBCp3oI/AAAAAAAAxGA/dE9RuE1bNdc/s1600/CaturdayTechSupport6.jpg" alt="Cat" style="width: 75%;" />
|
<img src="https://2.bp.blogspot.com/-mh8wLBv3gzk/TcTXhBCp3oI/AAAAAAAAxGA/dE9RuE1bNdc/s1600/CaturdayTechSupport6.jpg" alt="Cat" style="width: 75%;" />
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,13 @@
|
||||||
<head>
|
<head>
|
||||||
<meta name="slug" content="about" />
|
<meta name="slug" content="about" />
|
||||||
<meta name="title" content="About Me" />
|
<meta name="title" content="About" />
|
||||||
<meta name="no_container" content="true" />
|
<meta name="no_container" content="true" />
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<section id="me">
|
<section id="me">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-8">
|
<div class="text-center github-card-container">
|
||||||
<p>
|
|
||||||
Hi, I'm Jake, a software engineer currently working for a company in Brighton. I've been working as a developer since mid-2015, and have been studying IT and computer science since college.
|
|
||||||
I work as a full stack developer, but I prefer working on servers and mobile apps.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div class="col-sm-4 text-center github-card-container">
|
|
||||||
<div data-theme="medium" data-github="RealOrangeOne" class="github-card"></div>
|
<div data-theme="medium" data-github="RealOrangeOne" class="github-card"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -22,27 +16,34 @@
|
||||||
</section>
|
</section>
|
||||||
<section class="bg-primary" id="website">
|
<section class="bg-primary" id="website">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<h2>About my website</h2>
|
<h2>Websites</h2>
|
||||||
<p>
|
<p>
|
||||||
My website is the culmination of all my knowledge, compiled into 1 place. It not only contains all my projects, but it in itself is a project. Making sure this website works properly is a tall order, especially considering it's self hosted.
|
My website is the culmination of all my knowledge, compiled into 1 place. It not only contains all my projects, but is itself is a project.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
The site is primarily powered by <a href="http://getpelican.com">Pelican</a>, a static site generator. This converts markdown and HTML templates into static HTML files. The templates are generated using <a href="http://jinja.pocoo.org/">Jinja2</a>, a templating language similar to <a href="https://www.djangoproject.com/">Django</a>'s. This allows me to write nice clean, <i>DRY</i> content, and have it come out as clean HTML.
|
The site is primarily built with <a href="http://getpelican.com">Pelican</a>, a static site generator. This allows me to write nice clean, <i>DRY</i> content, and have it come out as clean, minified HTML.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
The static content (JS, CSS etc) is built using a custom build pipeline. The Javascript is built and compiled using <a href="https://babeljs.io/">Babel</a> and <a href="http://browserify.org/">Browserify</a>, and the CSS is written using <a href="https://github.com/sass/node-sass">node-SCSS</a> as a pre-processor.
|
The Javascript is built using <a href="http://browserify.org/">Browserify</a>, and the CSS is built using <a href="https://github.com/sass/node-sass">node-SCSS</a>. Both are run as a build step when pelican builds.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
<section id="server">
|
<section id="server">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<h2>The Server</h2>
|
<h2>Server</h2>
|
||||||
<p>
|
<p>
|
||||||
The website is hosted on my <a href="/setup/web-server/">UK VPS</a>. Previous versions have been hosted on <a href="https://www.1and1.com/">1&1</a> and <a href="http://www.myWindowsHosting.com/index?r=100196823">MyWindowsHosting</a>.
|
The website is hosted on part of my dedicated server from <a href="https://www.soyoustart.com/en/">SoYouStart</a>, running an Ubuntu Server VM with <a href="http://dokku.viewdocs.io/dokku/">Dokku</a> installed.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
The static files are served using a <a href="https://github.com/RealOrangeOne/host-container">custom Express server</a>, which allows me to auto-deploy the site from my <a href="https://circleci.com/">CI</a>. This is then served using a custom, closed-source reverse proxy, which makes local development and domain switching much easier. This is pointed to by <a href="https://www.nginx.com/">NGINX</a>, which actually serves port 80.
|
The prebuilt static files are served using a <a href="https://github.com/RealOrangeOne/tstatic">custom Express server</a>, to make the site as fast and effective as possible.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
<section class="text-center">
|
||||||
|
<div class="container">
|
||||||
|
<div class="btn-group">
|
||||||
|
<a class="btn btn-github btn-xl" href="https://github.com/RealOrangeOne/theorangeone.net"><i class="fa fa-github fa-lg"></i> View Source</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
<div class="header-content-inner">
|
<div class="header-content-inner">
|
||||||
<h1>{{ AUTHOR }}</h1>
|
<h1>{{ AUTHOR }}</h1>
|
||||||
<hr>
|
<hr>
|
||||||
<p>Full-stack Developer, Hardware tinkerer, <i>Hacker</i> of all the things</p>
|
<p>Full-stack Developer, Security Enthusiast, <i>Hacker</i> of all the things</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<a href="#about" class="page-scroll">
|
<a href="#about" class="page-scroll">
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
<h2 class="section-heading">About</h2>
|
<h2 class="section-heading">About</h2>
|
||||||
<hr class="light">
|
<hr class="light">
|
||||||
<p>
|
<p>
|
||||||
Hi, I'm Jake. I've been working as a full-stack developer for just over a year. This is my website, where all my projects, blog posts, and other stuff live. Some of it useful, some not so much!
|
I'm Jake. A software engineer with a passion for security and privacy. This is my website, a home for my projects, blog posts, and anything else for that matter.
|
||||||
</p>
|
</p>
|
||||||
<a href="/about/" class="btn btn-primary-dark btn-xl">More Info</a>
|
<a href="/about/" class="btn btn-primary-dark btn-xl">More Info</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -37,29 +37,25 @@
|
||||||
<div class="col-lg-3 col-md-6">
|
<div class="col-lg-3 col-md-6">
|
||||||
<div class="service-box">
|
<div class="service-box">
|
||||||
<i class="fa fa-4x fa-server wow bounceIn text-primary" data-wow-delay=".3s"></i>
|
<i class="fa fa-4x fa-server wow bounceIn text-primary" data-wow-delay=".3s"></i>
|
||||||
<h3>Server</h3>
|
<h3>Servers</h3>
|
||||||
<p>Designing and building high-performance server applications and environments</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-3 col-md-6">
|
<div class="col-lg-3 col-md-6">
|
||||||
<div class="service-box">
|
<div class="service-box">
|
||||||
<i class="fa fa-4x fa-firefox wow bounceIn text-primary" data-wow-delay=".5s"></i>
|
<i class="fa fa-4x fa-lock wow bounceIn text-primary" data-wow-delay=".5s"></i>
|
||||||
<h3>Client</h3>
|
<h3>Security</h3>
|
||||||
<p>Creating functional, fast, and responsive websites</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-3 col-md-6">
|
<div class="col-lg-3 col-md-6">
|
||||||
<div class="service-box">
|
<div class="service-box">
|
||||||
<i class="fa fa-4x fa-mobile wow bounceIn text-primary" data-wow-delay=".7s"></i>
|
<i class="fa fa-4x fa-mobile wow bounceIn text-primary" data-wow-delay=".7s"></i>
|
||||||
<h3>Mobile</h3>
|
<h3>Mobile</h3>
|
||||||
<p>Building lightweight, cross-platform mobile applications</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-3 col-md-6">
|
<div class="col-lg-3 col-md-6">
|
||||||
<div class="service-box">
|
<div class="service-box">
|
||||||
<i class="fa fa-4x fa-usb wow bounceIn text-primary" data-wow-delay=".9s"></i>
|
<i class="fa fa-4x fa-usb wow bounceIn text-primary" data-wow-delay=".9s"></i>
|
||||||
<h3>Hardware</h3>
|
<h3>Hardware</h3>
|
||||||
<p>Constructing workflow-specific Desktops, Servers and Notebooks</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -116,7 +112,6 @@
|
||||||
<div class="container text-center">
|
<div class="container text-center">
|
||||||
<h2 class="section-heading">More Content</h2>
|
<h2 class="section-heading">More Content</h2>
|
||||||
<hr class="primary">
|
<hr class="primary">
|
||||||
<p>There's more than just my project and blog!</p>
|
|
||||||
{% for category, articles in categories %}
|
{% for category, articles in categories %}
|
||||||
{% if category.name not in ['blog', 'projects'] %}
|
{% if category.name not in ['blog', 'projects'] %}
|
||||||
<a class="btn btn-primary btn-xl margin" href="{{ category.url }}">
|
<a class="btn btn-primary btn-xl margin" href="{{ category.url }}">
|
||||||
|
|
|
||||||
Reference in a new issue