jakobsn
6 years ago
3 changed files with 21 additions and 8 deletions
Unified View
Diff Options
-
+16 -3src/app/static/stylesheet.css
-
+3 -4src/app/templates/index.html
-
+2 -1src/app/views/index.py
+ 16
- 3
src/app/static/stylesheet.css
View File
| @@ -11,11 +11,17 @@ body { | |||||
| .projects { | .projects { | ||||
| display: flex; /* or inline-flex */ | display: flex; /* or inline-flex */ | ||||
| flex-direction: row; | |||||
| flex-wrap: wrap; | |||||
| } | } | ||||
| .projects * { | .projects * { | ||||
| margin: auto; | margin: auto; | ||||
| min-width: 100px; | |||||
| margin-top: 5px; | |||||
| } | |||||
| .projects div { | |||||
| border: 1px solid gray; | |||||
| } | } | ||||
| .categories { | .categories { | ||||
| @@ -78,5 +84,12 @@ nav ul { | |||||
| } | } | ||||
| .user_projects_category { | .user_projects_category { | ||||
| border: 1px solid black; | |||||
| } | |||||
| border: 1px solid gray; | |||||
| padding: 5px; | |||||
| background-color: lightslategray; | |||||
| cursor: pointer; | |||||
| margin: 2px; | |||||
| } | |||||
| .user_projects_category:hover { | |||||
| background-color: lightskyblue; | |||||
| } | |||||
+ 3
- 4
src/app/templates/index.html
View File
| @@ -1,4 +1,4 @@ | |||||
| $def with (nav, project_bulk_one, project_bulk_two, projects) | |||||
| $def with (nav, project_bulk_one, project_bulk_two, projects, categories) | |||||
| <head> | <head> | ||||
| <title>Beelance2</title> | <title>Beelance2</title> | ||||
| @@ -30,16 +30,15 @@ $def with (nav, project_bulk_one, project_bulk_two, projects) | |||||
| <div class="projects"> | <div class="projects"> | ||||
| $for project in project_bulk_one: | $for project in project_bulk_one: | ||||
| <div class="project" onclick="location.href='/project?projectid=$project[0]'"><h4>$project[3]</h4><p>$project[4]</p></div> | |||||
| <div class="project" onclick="location.href='/project?projectid=$project[0]'"><h4>Title:    $project[3]</h4><p>Description: $project[4]</p><p>Category:   $categories[project[1]-1][1]</p></div> | |||||
| </div> | </div> | ||||
| $if projects == 'my': | $if projects == 'my': | ||||
| <h3>Projects in progress</h3> | <h3>Projects in progress</h3> | ||||
| <div class="projects"> | <div class="projects"> | ||||
| $for project in project_bulk_two: | $for project in project_bulk_two: | ||||
| <div class="project" onclick="location.href='/project?projectid=$project[0]'"><h4>$project[3]</h4><p>$project[4]</p></div> | |||||
| <div class="project" onclick="location.href='/project?projectid=$project[0]'"><h4>Title:    $project[3]</h4><p>Description: $project[4]</p><p>Category:   $categories[project[1]-1][1]</p></div> | |||||
| </div> | </div> | ||||
| </body> | </body> | ||||
+ 2
- 1
src/app/views/index.py
View File
| @@ -17,6 +17,7 @@ class Index: | |||||
| session = web.ctx.session | session = web.ctx.session | ||||
| nav = get_nav_bar(session) | nav = get_nav_bar(session) | ||||
| data = web.input(projects=None) | data = web.input(projects=None) | ||||
| categories = models.project.get_categories() | |||||
| project_bulk_one = [] | project_bulk_one = [] | ||||
| project_bulk_two = [] | project_bulk_two = [] | ||||
| if data.projects == 'my': | if data.projects == 'my': | ||||
| @@ -30,4 +31,4 @@ class Index: | |||||
| project_bulk_one = models.project.get_projects_by_status_and_owner(str(session.userid), "finished") | project_bulk_one = models.project.get_projects_by_status_and_owner(str(session.userid), "finished") | ||||
| project_bulk_two = models.project.get_projects_by_participant_and_status(str(session.userid), "finished") | project_bulk_two = models.project.get_projects_by_participant_and_status(str(session.userid), "finished") | ||||
| return render.index(nav, project_bulk_one, project_bulk_two, data.projects) | |||||
| return render.index(nav, project_bulk_one, project_bulk_two, data.projects, categories) | |||||