From a728d630a058b47382d36c4f0b7ea09d5921db1f Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 30 Jul 2020 00:54:54 -0400 Subject: [PATCH 1/2] added static to dockerfile. Started setting up css grid, with nav on left and large main window --- Dockerfile | 3 ++- static/style.css | 38 +++++++++++++++++++++++++++++++------- templates/index.html | 27 ++++++++++++--------------- 3 files changed, 45 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0780da0..2e6b44d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ FROM python:3 ADD main.py / ADD requirements.txt / ADD templates /templates +ADD static /static VOLUME /download/ @@ -10,4 +11,4 @@ RUN pip install manga-py -CMD ["python", "./main.py"] \ No newline at end of file +CMD ["python", "./main.py"] diff --git a/static/style.css b/static/style.css index 1847971..6c68ed7 100644 --- a/static/style.css +++ b/static/style.css @@ -6,13 +6,37 @@ text-decoration: none; font-size: 16px } -body{ - background: white; +.grid-container{ + display: grid; + grid-template-columns: auto auto auto auto; + grid-template-rows: auto auto auto auto; + grid-gap: 10px; + // background-color: #2196F3; + padding: 10px; } -.wrapper{ - display: block; +.grid-container > div { + // background-color: rgba(255,255,0.9); + text-align: center; + padding: 20px 0; + fonrt-size: 30px; } - -.main { - float:right +.header{ + grid-column-start: 2; + grid-column-end: 4; +} +.nav{ + grid-column:1; + border-style: dotted; +} +ul{ + list-style: none; + text-align:left; + padding-left:2px; +} +.main{ + grid-column-start: 2; + grid-column-end: 4; + grid-row-start: 2; + grid-row-end: 4; + background-color: rgba(255,255,0,0.9); } diff --git a/templates/index.html b/templates/index.html index ffa5288..c63c2e0 100644 --- a/templates/index.html +++ b/templates/index.html @@ -6,21 +6,18 @@ Title -
-
-

Test

-
-
- -
- HIIIIIII -
+ +
Super Awesome Mange Downloading and Viewing Thing
+
+ +
+
+ main
From af4c2dc08dfbde44839361dca9007b1f34b2d966 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 30 Jul 2020 02:51:01 -0400 Subject: [PATCH 2/2] More work on setting up the webpage. There's now an active and download button. The reponse should populate the main section of the page in a scrolling overflow box. Although it's a long string instead of a nicely parsed json file at this point. --- static/style.css | 24 ++++++++++++++++-------- templates/index.html | 28 ++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/static/style.css b/static/style.css index 6c68ed7..8eb4bda 100644 --- a/static/style.css +++ b/static/style.css @@ -8,8 +8,8 @@ } .grid-container{ display: grid; - grid-template-columns: auto auto auto auto; - grid-template-rows: auto auto auto auto; + grid-template-columns: min-content auto auto auto; + grid-template-rows: auto auto auto; grid-gap: 10px; // background-color: #2196F3; padding: 10px; @@ -21,12 +21,12 @@ fonrt-size: 30px; } .header{ - grid-column-start: 2; - grid-column-end: 4; + grid-column-start: 1; + grid-column-end: 5; } .nav{ grid-column:1; - border-style: dotted; + //border-style: dotted; } ul{ list-style: none; @@ -35,8 +35,16 @@ ul{ } .main{ grid-column-start: 2; - grid-column-end: 4; + grid-column-end: 5; grid-row-start: 2; - grid-row-end: 4; - background-color: rgba(255,255,0,0.9); + grid-row-end: 2; + //background-color: rgba(255,255,0,0.9); + overflow: scroll; + height: 200px; +} +.footer{ + grid-column-start: 1; + grid-column-end: 5; + grid-row: 3; + padding-bottom:2px; } diff --git a/templates/index.html b/templates/index.html index c63c2e0..8d61f66 100644 --- a/templates/index.html +++ b/templates/index.html @@ -10,15 +10,31 @@
Super Awesome Mange Downloading and Viewing Thing
-
- main +
+ +
+
+ bottom stuffs
+ +