Merge pull request #9 from justinvasel/feature-style-dark

Version 3.0 upgrade! (btw the branch name is a misnomer; it has nothing to do with a dark style. I was too lazy to fix)

.gitignore

@@ -1,9 +1,11 @@
 # Global
 *.DS_Store
 *.pyc
+*.psd
 
 # Directory structure
 env
+ideas
 
 # Data-related
 app/data/app.db

app/__init__.py

@@ -1,6 +1,6 @@
 # Using "Semantic Versioning": MAJOR.MINOR.PATCH form.
 # See: https://semver.org/ for more details.
-__version__ = '2.0.1'
+__version__ = '3.0.0'
 
 
 # -*- coding: utf-8 -*-

app/routes.py

@@ -16,54 +16,54 @@
 def index():
     return render_template('index.html')
 
-@app.route('/cat')
-def cat():
-    return render_template('cat.html', title='CAT!')
-
-@app.route('/code')
-def code():
-    return render_template('code.html', title='Code')
-
-@app.route('/contact')
-def contact():
-    return render_template('contact.html', title='Contact')
-
-@app.route('/cv')
-def cv():
-    gh_tag_latest = helpers.GetLatestGithubRelease(app.config['CV_GITHUB_REPO'])
-    return render_template('cv.html', title='Curriculum Vitae', gh_tag_latest=gh_tag_latest, config=app.config)
-
-@app.route('/events')
-def events():
-    upcoming_events = models.Event.query.filter(models.Event.date >= datetime.utcnow()).order_by(models.Event.date.asc()).all()
-    past_events     = models.Event.query.filter(models.Event.date < datetime.utcnow()).order_by(models.Event.date.desc()).all()
-
-    return render_template('events.html', title='Events', upcoming_events=upcoming_events, past_events=past_events)
-
-@app.route('/research')
-def research():
-    return render_template('research.html', title='Research')
-
-@app.route('/#', methods=['GET', 'POST'])
-def login():
-    if current_user.is_authenticated:
-        return redirect(url_for('index'))
-    form = forms.LoginForm()
-
-    if form.validate_on_submit():
-        user = models.User.query.filter_by(username=form.username.data).first()
-        if user is None or not user.check_password(form.password.data):
-            flash('Invalid username or password')
-            return redirect(url_for('login'))
-        login_user(user)
-        return redirect(url_for('index'))
-
-    return render_template('login.html', title='#', form=form)
-
-@app.route('/logout')
-def logout():
-    logout_user()
-    return redirect(url_for('index'))
+# @app.route('/cat')
+# def cat():
+#     return render_template('cat.html', title='CAT!')
+#
+# @app.route('/code')
+# def code():
+#     return render_template('code.html', title='Code')
+#
+# @app.route('/contact')
+# def contact():
+#     return render_template('contact.html', title='Contact')
+#
+# @app.route('/cv')
+# def cv():
+#     gh_tag_latest = helpers.GetLatestGithubRelease(app.config['CV_GITHUB_REPO'])
+#     return render_template('cv.html', title='Curriculum Vitae', gh_tag_latest=gh_tag_latest, config=app.config)
+#
+# @app.route('/events')
+# def events():
+#     upcoming_events = models.Event.query.filter(models.Event.date >= datetime.utcnow()).order_by(models.Event.date.asc()).all()
+#     past_events     = models.Event.query.filter(models.Event.date < datetime.utcnow()).order_by(models.Event.date.desc()).all()
+#
+#     return render_template('events.html', title='Events', upcoming_events=upcoming_events, past_events=past_events)
+#
+# @app.route('/research')
+# def research():
+#     return render_template('research.html', title='Research')
+
+# @app.route('/#', methods=['GET', 'POST'])
+# def login():
+#     if current_user.is_authenticated:
+#         return redirect(url_for('index'))
+#     form = forms.LoginForm()
+#
+#     if form.validate_on_submit():
+#         user = models.User.query.filter_by(username=form.username.data).first()
+#         if user is None or not user.check_password(form.password.data):
+#             flash('Invalid username or password')
+#             return redirect(url_for('login'))
+#         login_user(user)
+#         return redirect(url_for('index'))
+#
+#     return render_template('login.html', title='#', form=form)
+#
+# @app.route('/logout')
+# def logout():
+#     logout_user()
+#     return redirect(url_for('index'))
 
 
 # ERROR HANDLING

app/static/css/style.css

@@ -1,7 +1,12 @@
 body {
-  font-family: 'Source Sans Pro', sans-serif;
-  background-image: url('../img/bg.png');
-  background-repeat: repeat;
+  font-family: 'Helvetica Neue', sans-serif;
+  /* font-family: 'Source Sans Pro', sans-serif; */
+  /* background-image: url('../img/bg-dark.png');
+  background-repeat: repeat; */
+  /* background-color: #111; */
+  background-color: #eee;
+  /* color: #eee; */
+  color: #111;
 }
 
 .readable {
@@ -26,10 +31,12 @@ a:hover {
 
 .social-media-links a {
   color: #666;
+  /* color: #ccc; */
 }
 
 .social-media-links a:hover {
-  color: #111;
+  color: #6b1818;
+  /* color: #999; */
 }
 
 .bg-nav {

app/templates/404.html

@@ -1,15 +1,8 @@
-{% extends "base.html" %}
+{% extends "page.html" %}
 
-{% block page %}
+{% block content %}
 
-<div class="container pt-5">
-  <div class="row">
-    <div class="col-12">
-      <h1 class="display-1 serif text-center">Justin Vasel</h1>
-      <h5 class="serif text-center text-muted">~ <em>Physics Ph.D. Candidate</em> ~</h5>
-    </div>
-  </div>
-  <br><br><br><br>
+<div class="container pt-5 pb-5 bg-page border rounded">
   <div class="row">
     <div class="col-12">
       <h1 class="display-2 mono text-center">404</h1>
@@ -18,15 +11,15 @@ <h1 class="display-2 mono text-center">404</h1>
   <br>
   <div class="row">
     <div class="col-12">
-      <h3 class="serif text-center">The existence of this page is disfavored at 5\(\sigma\).</h3>
+      <h4 class="text-center">The existence of this page is disfavored at 5\(\sigma\).</h4>
     </div>
   </div>
   <br><br><br><br><br>
   <div class="row">
     <div class="col-12">
-      <h5 class="serif text-center">
+      <h5 class="text-center">
         <em>
-          <a href="/"><i class="fas fa-arrow-alt-circle-left"></i> Back to safety</a>
+          <a href="/"><i class="fas fa-arrow-alt-circle-left"></i> Back home</a>
         </em>
       </h5>
     </div>

app/templates/base.html

@@ -21,7 +21,7 @@
     <meta property="og:title" content="Justin Vasel, Physics Ph.D. Candidate">
     <meta property="og:site_name" content="JustinVasel.com">
     <meta property="og:description" content="Hi, I'm Justin. I do physics and stuff.">
-    <meta property="og:image" content="https://justinvasel.com/static/img/splash.png">
+    <meta property="og:image" content="https://justinvasel.com/static/img/splash_v2.png">
     <meta property="og:image:width" content="1200">
     <meta property="og:image:height" content="630">
     <meta property="og:image:alt" content="Justin Vasel, Physics Ph.D. Candidate Official Website">

app/templates/index.html

@@ -2,96 +2,92 @@
 
 {% block content %}
 
-<div class="container serif bg-page pt-4 pb-4 rounded-bottom">
-  <div class="row">
-    <div class="col-12">
-      <h1>Who am I?</h1>
+<div class="container pt-4 pb-4">
 
-      <hr>
-      <figure class="figure float-left mr-3" style="width: 30%;">
-        <img class="figure-img rounded border" src="{{ url_for('static', filename='img/vasel.jpg') }}" width="100%">
-        <figcaption class="figure-caption">
-          <em>Fig. 1:</em> There I am. <em>(Photo credit: Filip Jediny)</em>
-        </figcaption>
-      </figure>
+  <div class="row mt-4">
+    <div class="col-6 border-right pr-4">
+      <div class="text-center">
+        <h4>Ph.D. Physics Candidate</h4>
+        <h5><em>Indiana University</em></h5>
+        <img class="rounded" src="{{ url_for('static', filename='img/iu_banner.png') }}" width=100%;>
+      </div>
 
-      <h2>
-        I'm Justin. I do physics and stuff.
-      </h2>
-
-      <p class="readable">
-        More specifically, I am a Ph.D.
-        Candidate at Indiana University studying supernova neutrinos. I work on
-        the NOvA long-baseline oscillation experiment full-time and moonlight at
-        the HALO supernova neutrino detector at SNOLAB.
+      <br>
+      <p>
+        For my Ph.D. research, I am preparing the NOvA neutrino detectors for
+        the next galactic core-collapse supernova and exploring their sensitivity
+        to underlying physics for a selection of supernova models and progenitor
+        distances. A major component of this research is separating the faint
+        signal in the presence of a large background, a "needle in a haystack"
+        sort of problem. As a part of this effort, NOvA interfaces with the
+        SuperNova Early Warning System (SNEWS), a global network of neutrino
+        detectors dedicated to alerting global neutrino and astronomical
+        communities to an imminent supernova.
       </p>
 
-      <p class="readable">
-        You can read more about that on the <a href="/research">Research</a>
-        page.
+      <p>
+        • <a href="https://physics.indiana.edu/" target="_blank">Learn more about Indiana University's Physics program</a><br>
+        • <a href="https://novaexperiment.fnal.gov/" target="_blank">Learn more about the NOvA neutrino experiment</a><br>
+        • <a href="https://snews.bnl.gov/" target="_blank">Learn more about the SuperNova Early Warning System (SNEWS)</a>
       </p>
+    </div>
 
-      <p class="readable">
-        Hailing from the great state of Wisconsin, I'm an avid cheesehead,
-        midwestern-polite to a fault, and a firm believer in the
-        <a href="http://www.themidwestival.com/blog/2015/1/15/the-wisconsin-old-fashioned-an-abridged-history" target="_blank">
-          Brandy Old Fashioned
-        </a>
-        (as opposed to lesser variants).
-      </p>
+    <div class="col-6 pl-4">
+      <div class="text-center">
+        <h4>Technology and National Security Fellow</h4>
+        <h5><em>National Security Innovation Network</em></h5>
+        <img class="rounded" src="{{ url_for('static', filename='img/tnsf_banner.png') }}" width=100%;>
+      </div>
 
-      <p class="readable">
-        When I'm not physics-ing to pay the bills, I can be spotted working on
-        a variety of hobbies depending on my mood, including but not limited to:
-        physics-ing for fun, reading (Goodreads me), programing personal
-        (Github me) projects, writing, buying strawberry rhubarb jam at the
-        farmer's market, and playing Civilization, the greatest video game
-        franchise known to human-kind.
+      <br>
+      <p>
+        As a TNSF fellow, I am applying my training as a physicist to U.S.
+        national security challenges with the Office of the Assistant Secretary
+        of the Air Force for Installations, Environment, and Energy (SAF/IE).
       </p>
 
-      <p class="readable">
-        One of my favorite pastimes is website building. I've been creating
-        websites since the era of Angelfire and Geocities (and Homestead) and I
-        just kept at it through the years picking up new technologies as they've
-        developed. To my surprise, this eneded up being a pretty useful skill,
-        and I've put it to use in a professional context through the development
-        of monitoring and information systems at several neutrino experiments.
-        Web design also provides a great creative outlet for me; something that
-        I believe is an important but undervalued aspect of being a scientist.
+      <p>
+        • <a href="https://www.nsin.us/tnsf/" target="_blank">Learn more about the Technology and National Security Fellowship</a><br>
+        • <a href="https://www.nsin.us/" target="_blank">Learn more about the National Security Innovation Network</a><br>
+        • <a href="https://www.safie.hq.af.mil/" target="_blank">Learn more about SAF/IE</a>
       </p>
+    </div>
+  </div>
 
-      <p class="readable">
-        I strongly believe that it is important to give back to the communities
-        of which one is a part. I have primarily tended to this responsibility
-        through civil service and outreach efforts. Over the years, I have
-        served as a leader in a variety of organizations and I tend to approach
-        leadership with the "leave it better than found you it" philosophy, both
-        in terms of the organization itself and the community which it serves.
+  <div class="row bg-page pt-3 pb-3 border rounded" style="margin-top: 75px;">
+    <div class="col-3">
+      <img class="rounded" src="{{ url_for('static', filename='img/vasel.png') }}" width=100%;>
+    </div>
+    <div class="col-9">
+      <h3>Hi, I'm Justin 👋</h3>
+      <p>
+        I am an experimental particle physicist by
+        training with an interest in where physics and government intersect,
+        especially as it relates to issues of national security. I am currently
+        working in that space as a
+        <a href="https://www.nsin.us/tnsf/" target="_blank">Technology and
+        National Security Fellow</a> with the
+        <a href="https://www.nsin.us/" target="_blank">National Security
+        Innovation Network</a> within the U.S. Department of Defense.
       </p>
-
-      <p class="readable">
-        As for outreach, I believe as scientists we have a responsibility to
-        interface with the general public. After all, they pay for our salaries
-        and lab equipment, and who would want to pass up an opportunity to
-        inspire young, curious minds? I try to take advantage of opportunities
-        to share my enthusiasm and work with the general public when they
-        present themselves, often in the form of ask-a-scientist style talks.
-        In addition to that, I've volunteered at local astronomy days and for
-        programs like adopt-a-physicist. More recently, I've turned some
-        attention to reaching a wider audience through social media. That's a
-        work in progress, but an important one in these days.
+      <p>
+        In physics, I have been deeply involved in efforts to detect neutrinos
+        from the next galactic core-collapse supernova as a member of the
+        <a href="https://novaexperiment.fnal.gov/" target="_blank">NOvA</a>,
+        <a href="https://www.snolab.ca/halo/" target="_blank">HALO</a>, and
+        <a href="https://snews.bnl.gov/" target="_blank">SNEWS</a>
+        collaborations.
       </p>
-
-      <p class="readable">
-        Well that's about it for this page. I'm glad you're here and hope you
-        enjoy the rest of your stay.
+      <p>
+        I also enjoy outreach, and try to give talks to the general public
+        whenever I get the chance. In the meantime, I post about science and my
+        work on social media, particualrly Twitter
+        (<a href="https://www.twitter.com/justinvasel" target="_blank">@justinvasel</a>).
       </p>
-
-      <p class="readable">
-        Stay as long as you'd like and feel free to
-        pet the <a href="/cat">Cat</a> if you see him wandering around.
+      <p>
+        If you would like to reach out, you can reach me by
+        <a href="mailto:justin.vasel@gmail.com" target="_blank">email</a>.
       </p>
-
     </div>
   </div>
 </div>