diff --git a/app/UserInfo.py b/app/UserInfo.py index 6976f93..815de8f 100644 --- a/app/UserInfo.py +++ b/app/UserInfo.py @@ -63,7 +63,7 @@ def AddFolder(username): username (str): The username to create image folder """ try: - newFolder = os.getcwd() + "static/UserPictures/" + username + newFolder = os.getcwd() + "/static/UserPictures/" + username os.mkdir(newFolder) except FileExistsError: pass \ No newline at end of file diff --git a/app/UserInfo.txt b/app/UserInfo.txt index c3395a1..6711757 100644 --- a/app/UserInfo.txt +++ b/app/UserInfo.txt @@ -6,3 +6,4 @@ bob 9f9d51bc70ef21ca5c14f307980a29d8 Jerry dbaf60f3a397e1d27630a459c1700ea7 hirsh d988318ebac9f246609d6866a10784ae ryan 10c7ccc7a4f0aff03c915c485565b9da +eric 29988429c481f219b8c5ba8c071440e1 diff --git a/app/__pycache__/UserInfo.cpython-37.pyc b/app/__pycache__/UserInfo.cpython-37.pyc index 72f055f..1fffec9 100644 Binary files a/app/__pycache__/UserInfo.cpython-37.pyc and b/app/__pycache__/UserInfo.cpython-37.pyc differ diff --git a/app/static/style.css b/app/static/style.css index c59fb75..9e6f1ec 100644 --- a/app/static/style.css +++ b/app/static/style.css @@ -1,7 +1,24 @@ -* -{ - font-family: helvetica; +*, *::after, *::before { + box-sizing: border-box; +} + +body { + border: 0; + margin: 0; + padding: 0; + font-family: 'Open Sans'; + overflow-x: hidden; + display: flex; + flex-direction: column; +} + +.container { + background-color: #eee; + color: #333; + min-height: 100vh; + width: 100vw; } + .login { padding: 10%; @@ -52,7 +69,7 @@ input } -button, a, input[type=submit] +button, a, input[type=submit], label { background-color: #3c3c3c; border: 2px solid #3c3c3c; @@ -65,9 +82,39 @@ button, a, input[type=submit] margin-top: -10px; transition-duration: 0.6s; cursor: pointer; + margin: 5px; } button:hover, a:hover { background-color: white; color: #3c3c3c; } + +input[type=file] { + background-color: #333; + height: 0vh; + width: 0vw; + opacity: 0; +} + +input[type=file]:focus + label, +input[type=file] + label:hover { + background-color: white; + color: #3c3c3c; + cursor: pointer; +} + +#images { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-around; + padding: 10vh 10vw; +} + +img { + max-width: 30vw; + max-height: 40vh; + height: auto; + margin: 15px; +} \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html index cb74b90..a4ab4eb 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1,5 +1,6 @@ Dogstagram + @@ -9,15 +10,17 @@ -
-

Dogstagram

+
+
- + diff --git a/app/templates/landing.html b/app/templates/landing.html index c6019a0..78b5c59 100644 --- a/app/templates/landing.html +++ b/app/templates/landing.html @@ -3,6 +3,7 @@ Dogstagram + @@ -13,27 +14,29 @@ -
- - Welcome, Test User!
-

- - - - - - - -
-
-
 
-
- +
+
+ + Welcome!
+ + + + + + + +
+
+
 
+
+ +