Skip to content

Commit

Permalink
refactored home view file structure
Browse files Browse the repository at this point in the history
  • Loading branch information
calixo888 committed Jun 8, 2020
1 parent 4cecb14 commit 6a4557a
Show file tree
Hide file tree
Showing 7 changed files with 176 additions and 165 deletions.
1 change: 0 additions & 1 deletion home/urls.py
Expand Up @@ -11,7 +11,6 @@
url("^contact/$", views.contact, name="contact"),
url("^login/$", views.user_login, name="login"),
url("^register/$", views.register, name="register"),

url("^leaderboards/$", views.leaderboards, name="leaderboards"),

# Activities URL routes
Expand Down
7 changes: 4 additions & 3 deletions home/views/__init__.py
@@ -1,10 +1,11 @@
# GENERAL VIEWS
from .general import *
from .profile import *

# EXTERNAL EXERCISE VIEWS
from .project_exercises import *
from .quiz_exercises import *
from .mini_exercises import *
from .exercise_views.project_exercises import *
from .exercise_views.quiz_exercises import *
from .exercise_views.mini_exercises import *

# API VIEWS
from .api_views import *
Expand Up @@ -13,7 +13,7 @@ def mini_exercises(request):
{ "text": "Mini Exercises", "link": None }
]

return render(request, "app/exercises/mini-exercises/mini-exercises.html", context={
return render(request, "home/exercises/mini-exercises/mini-exercises.html", context={
"breadcrumbs": breadcrumbs
})

Expand Down Expand Up @@ -56,14 +56,14 @@ def fix_the_code_exercises(request):
})


return render(request, "app/exercises/mini-exercises/fix-the-code-exercises.html", context={
return render(request, "home/exercises/mini-exercises/fix-the-code-exercises.html", context={
"topics": topics,
"breadcrumbs": breadcrumbs,
"exercises": fix_the_code_exercises,
"topic": specific_topic
})

return render(request, "app/exercises/mini-exercises/fix-the-code-exercises.html")
return render(request, "home/exercises/mini-exercises/fix-the-code-exercises.html")


@login_required(login_url="http://www.w3hacks.com/login")
Expand Down Expand Up @@ -119,7 +119,7 @@ def fix_the_code_exercise(request):
user_already_completed_mini_exercise = True


return render(request, "app/exercises/mini-exercises/fix-the-code-exercise.html", context={
return render(request, "home/exercises/mini-exercises/fix-the-code-exercise.html", context={
"exercise": fix_the_code_exercise,
"resources": list(fix_the_code_exercise.resources.all()),
"user_already_completed_mini_exercise": user_already_completed_mini_exercise,
Expand Down Expand Up @@ -166,14 +166,14 @@ def brainteaser_exercises(request):
"link": None
})

return render(request, "app/exercises/mini-exercises/brainteaser-exercises.html", context={
return render(request, "home/exercises/mini-exercises/brainteaser-exercises.html", context={
"topics": topics,
"exercises": brainteaser_exercises,
"breadcrumbs": breadcrumbs,
"topic": specific_topic
})

return render(request, "app/exercises/mini-exercises/brainteaser-exercises.html")
return render(request, "home/exercises/mini-exercises/brainteaser-exercises.html")


@login_required(login_url="http://www.w3hacks.com/login")
Expand Down Expand Up @@ -229,7 +229,7 @@ def brainteaser_exercise(request):
user_already_completed_mini_exercise = True


return render(request, "app/exercises/mini-exercises/brainteaser-exercise.html", context={
return render(request, "home/exercises/mini-exercises/brainteaser-exercise.html", context={
"exercise": brainteaser_exercise,
"resources": list(brainteaser_exercise.resources.all()),
"user_already_completed_mini_exercise": user_already_completed_mini_exercise,
Expand Down Expand Up @@ -276,14 +276,14 @@ def visualization_exercises(request):
"link": None,
})

return render(request, "app/exercises/mini-exercises/visualization-exercises.html", context={
return render(request, "home/exercises/mini-exercises/visualization-exercises.html", context={
"topics": topics,
"exercises": visualization_exercises,
"breadcrumbs": breadcrumbs,
"topic": specific_topic
})

return render(request, "app/exercises/mini-exercises/visualization-exercises.html")
return render(request, "home/exercises/mini-exercises/visualization-exercises.html")


@login_required(login_url="http://www.w3hacks.com/login")
Expand Down Expand Up @@ -339,7 +339,7 @@ def visualization_exercise(request):
user_already_completed_mini_exercise = True


return render(request, "app/exercises/mini-exercises/visualization-exercise.html", context={
return render(request, "home/exercises/mini-exercises/visualization-exercise.html", context={
"exercise": visualization_exercise,
"resources": list(visualization_exercise.resources.all()),
"user_already_completed_mini_exercise": user_already_completed_mini_exercise,
Expand Down Expand Up @@ -386,14 +386,14 @@ def refactor_exercises(request):
"link": None
})

return render(request, "app/exercises/mini-exercises/refactor-exercises.html", context={
return render(request, "home/exercises/mini-exercises/refactor-exercises.html", context={
"topics": topics,
"exercises": refactor_exercises,
"topic": specific_topic,
"breadcrumbs": breadcrumbs
})

return render(request, "app/exercises/mini-exercises/refactor-exercises.html")
return render(request, "home/exercises/mini-exercises/refactor-exercises.html")


@login_required(login_url="http://www.w3hacks.com/login")
Expand Down Expand Up @@ -450,7 +450,7 @@ def refactor_exercise(request):
user_already_completed_mini_exercise = True


return render(request, "app/exercises/mini-exercises/refactor-exercise.html", context={
return render(request, "home/exercises/mini-exercises/refactor-exercise.html", context={
"exercise": refactor_exercise,
"resources": list(refactor_exercise.resources.all()),
"user_already_completed_mini_exercise": user_already_completed_mini_exercise,
Expand Down Expand Up @@ -497,7 +497,7 @@ def teaching_exercises(request):
"link": None
})

return render(request, "app/exercises/mini-exercises/teaching-exercises.html", context={
return render(request, "home/exercises/mini-exercises/teaching-exercises.html", context={
"topics": topics,
"exercises": teaching_exercises,
"topic": specific_topic,
Expand Down Expand Up @@ -559,7 +559,7 @@ def teaching_exercise(request):
user_already_completed_mini_exercise = True


return render(request, "app/exercises/mini-exercises/teaching-exercise.html", context={
return render(request, "home/exercises/mini-exercises/teaching-exercise.html", context={
"exercise": teaching_exercise,
"resources": list(teaching_exercise.resources.all()),
"user_already_completed_mini_exercise": user_already_completed_mini_exercise,
Expand Down Expand Up @@ -606,14 +606,14 @@ def github_exercises(request):
"link": None
})

return render(request, "app/exercises/mini-exercises/github-exercises.html", context={
return render(request, "home/exercises/mini-exercises/github-exercises.html", context={
"topics": topics,
"exercises": github_exercises,
"breadcrumbs": breadcrumbs,
"topic": specific_topic
})

return render(request, "app/exercises/mini-exercises/github-exercises.html")
return render(request, "home/exercises/mini-exercises/github-exercises.html")


@login_required(login_url="http://www.w3hacks.com/login")
Expand Down Expand Up @@ -670,7 +670,7 @@ def github_exercise(request):
user_already_completed_mini_exercise = True


return render(request, "app/exercises/mini-exercises/github-exercise.html", context={
return render(request, "home/exercises/mini-exercises/github-exercise.html", context={
"exercise": github_exercise,
"resources": list(github_exercise.resources.all()),
"user_already_completed_mini_exercise": user_already_completed_mini_exercise,
Expand Down Expand Up @@ -717,14 +717,14 @@ def research_exercises(request):
"link": None
})

return render(request, "app/exercises/mini-exercises/research-exercises.html", context={
return render(request, "home/exercises/mini-exercises/research-exercises.html", context={
"topics": topics,
"exercises": research_exercises,
"breadcrumbs": breadcrumbs,
"topic": specific_topic
})

return render(request, "app/exercises/mini-exercises/research-exercises.html")
return render(request, "home/exercises/mini-exercises/research-exercises.html")


@login_required(login_url="http://www.w3hacks.com/login")
Expand Down Expand Up @@ -781,7 +781,7 @@ def research_exercise(request):
user_already_completed_mini_exercise = True


return render(request, "app/exercises/mini-exercises/research-exercise.html", context={
return render(request, "home/exercises/mini-exercises/research-exercise.html", context={
"exercise": research_exercise,
"resources": list(research_exercise.resources.all()),
"user_already_completed_mini_exercise": user_already_completed_mini_exercise,
Expand Down
Expand Up @@ -41,7 +41,7 @@ def project_exercises(request):
})


return render(request, "app/exercises/project-exercises/project-exercises.html", context={
return render(request, "home/exercises/project-exercises/project-exercises.html", context={
"topics": topics,
"exercises": project_exercises,
"topic": specific_topic,
Expand Down Expand Up @@ -103,7 +103,7 @@ def project_exercise(request):
user_already_completed_project = True


return render(request, "app/exercises/project-exercises/project-exercise.html", context={
return render(request, "home/exercises/project-exercises/project-exercise.html", context={
"exercise": project_exercise,
"resources": list(project_exercise.resources.all()),
"user_already_completed_project": user_already_completed_project,
Expand Down
Expand Up @@ -41,7 +41,7 @@ def quiz_exercises(request):
"link": None
})

return render(request, "app/exercises/quiz-exercises/quiz-exercises.html", context={
return render(request, "home/exercises/quiz-exercises/quiz-exercises.html", context={
"topics": topics,
"exercises": quiz_exercises,
"topic": specific_topic,
Expand Down Expand Up @@ -73,7 +73,7 @@ def quiz_exercise(request):
{ "text": quiz_exercise.name, "link": None }
]

return render(request, "app/exercises/quiz-exercises/quiz-exercise.html", context={
return render(request, "home/exercises/quiz-exercises/quiz-exercise.html", context={
"exercise": quiz_exercise,
"resources": list(quiz_exercise.resources.all()),
"breadcrumbs": breadcrumbs
Expand Down Expand Up @@ -121,7 +121,7 @@ def take_quiz(request):
user_already_taken_quiz = True


return render(request, "app/exercises/quiz-exercises/take-quiz.html", context={
return render(request, "home/exercises/quiz-exercises/take-quiz.html", context={
"quiz": quiz_exercise,
"breadcrumbs": breadcrumbs,
"questions": questions,
Expand Down Expand Up @@ -180,7 +180,7 @@ def quiz_results(request):

# results = json.dumps(results)

return render(request, "app/exercises/quiz-exercises/quiz-results.html", context={
return render(request, "home/exercises/quiz-exercises/quiz-results.html", context={
"quiz_exercise": quiz_exercise,
"completed_quiz_exercise": completed_quiz_exercise,
"breadcrumbs": breadcrumbs,
Expand Down

0 comments on commit 6a4557a

Please sign in to comment.