summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--megapixels/app/builder/builder.py2
-rw-r--r--megapixels/app/settings/app_cfg.py4
-rw-r--r--site/public/research/index.html20
3 files changed, 6 insertions, 20 deletions
diff --git a/megapixels/app/builder/builder.py b/megapixels/app/builder/builder.py
index cb5d8fe9..df609f60 100644
--- a/megapixels/app/builder/builder.py
+++ b/megapixels/app/builder/builder.py
@@ -74,7 +74,7 @@ def build_research_index(research_posts):
research_posts=research_posts,
latest_research_post=research_posts[-1],
)
- output_fn = public_path + '/research/index.html'
+ output_fn = cfg.DIR_SITE_PUBLIC + '/research/index.html'
with open(output_fn, "w") as file:
file.write(html)
diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py
index 9e03357b..f861700c 100644
--- a/megapixels/app/settings/app_cfg.py
+++ b/megapixels/app/settings/app_cfg.py
@@ -61,8 +61,8 @@ DIR_TEST_IMAGES = join(DIR_APP, 'test', 'images')
# .env config for keys
# -----------------------------------------------------------------------------
-DIR_DOTENV = join(DIR_APP, '.env')
-load_dotenv(dotenv_path=DIR_DOTENV)
+# DIR_DOTENV = join(DIR_APP, '.env')
+load_dotenv() # dotenv_path=DIR_DOTENV)
# -----------------------------------------------------------------------------
# Drawing, GUI settings
diff --git a/site/public/research/index.html b/site/public/research/index.html
index 8b43ac17..59a5fee9 100644
--- a/site/public/research/index.html
+++ b/site/public/research/index.html
@@ -26,23 +26,9 @@
</header>
<div class="content">
- <section>
- <h1>Research</h1>
- <div class='meta'>
- <div>
- <div class='gray'>Posted</div>
- <div>2018-12-15</div>
- </div>
- <div>
- <div class='gray'>By</div>
- <div>Adam Harvey</div>
- </div>
-
- </div>
- </section>
-
- <section><h2>The darkside of datasets and the future of computer vision</h2>
-</section>
+ <section><h1>Research Blog</h1>
+<h2>The darkside of datasets and the future of computer vision</h2>
+</section><div class='research_index'><a href='/research/00_introduction/'><section class='wide'><img src='data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==' alt='Research post' /><section><h1>Untitled Page</h1><h2></h2></section></section></a><a href='/research/01_from_1_to_100_pixels/'><section class='wide'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/research/01_from_1_to_100_pixels/assets/intro.jpg' alt='Research post' /><section><h1>From 1 to 100 Pixels</h1><h2>Photographs are for romantics. For the rest of us, it's all about data. And a photo contains a massive amount of information about who you are.</h2></section></section></a></div>
</div>
<footer>