Merge branch 'Dev' into Docker

Adding website features to the system
This commit is contained in:
Dan
2020-07-30 02:53:52 -04:00
3 changed files with 69 additions and 23 deletions

View File

@@ -2,6 +2,7 @@ FROM python:3
ADD main.py / ADD main.py /
ADD requirements.txt / ADD requirements.txt /
ADD templates /templates ADD templates /templates
ADD static /static
VOLUME /download/ VOLUME /download/

View File

@@ -6,13 +6,45 @@
text-decoration: none; text-decoration: none;
font-size: 16px font-size: 16px
} }
body{ .grid-container{
background: white; display: grid;
grid-template-columns: min-content auto auto auto;
grid-template-rows: auto auto auto;
grid-gap: 10px;
// background-color: #2196F3;
padding: 10px;
} }
.wrapper{ .grid-container > div {
display: block; // background-color: rgba(255,255,0.9);
text-align: center;
padding: 20px 0;
fonrt-size: 30px;
}
.header{
grid-column-start: 1;
grid-column-end: 5;
}
.nav{
grid-column:1;
//border-style: dotted;
}
ul{
list-style: none;
text-align:left;
padding-left:2px;
} }
.main{ .main{
float:right grid-column-start: 2;
grid-column-end: 5;
grid-row-start: 2;
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;
} }

View File

@@ -6,22 +6,35 @@
<title>Title</title> <title>Title</title>
</head> </head>
<body> <body>
<div class="container"> <dev class="grid-container">
<Header> <div class="header">Super Awesome Mange Downloading and Viewing Thing</div>
<h1>Test</h1> <div class="nav" align="left">
</header>
<div class=wrapper>
<nav>
<ul> <ul>
<li><a href="/active"><button class=button>Active</button></a></li> <li><button class=button onclick="activeReturn()">Active</button>
<li><a href="/download"><button class=button>Download</button></a></li> <li><button class=button onclick="downloadReturn()">Download</button>
<li><a href="http://google.com"><button class=button>Test</button></a></li> <!-- <li><a href="http://google.com"><button class=button>google<>/button></a></li>
<li><button class=button>asdfl</button></li> <li><button class=button onclick="clickTest()">asdfl</button></li>-->
</nav> </ul>
<section> </div>
HIIIIIII <div class="main" id="main">
<section>
</div>
<div class="footer">
bottom stuffs
</div> </div>
</div> </div>
</body> </body>
</html> </html>
<script>
function activeReturn() {
fetch('/active')
.then(response => response.json())
.then(data => document.getElementById("main").innerHTML = JSON.stringify(data));
};
function downloadReturn() {
fetch('/download')
.then(response => response.json())
.then(data => document.getElementById("main").innerHTML = JSON.stringify(data));
};
</script>