Skip to content

Commit

Permalink
Merge pull request #71 from FGA0138-MDS-Ajax/ProcessoSeletivo
Browse files Browse the repository at this point in the history
  • Loading branch information
isaqzin authored Dec 18, 2024
2 parents 2731245 + 7a8408f commit 8e0cd4f
Show file tree
Hide file tree
Showing 9 changed files with 1,025 additions and 6 deletions.
770 changes: 770 additions & 0 deletions mamutes/guest/static/css/admission.css

Large diffs are not rendered by default.

Binary file added mamutes/guest/static/img/imagens-PS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions mamutes/guest/static/scripts/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,11 @@ document.addEventListener("DOMContentLoaded", function () {
});
});


const accordions = document.querySelectorAll(".accordion");

accordions.forEach(accordion => {
accordion.addEventListener("click", () => {
accordion.classList.toggle("active");
})
})
236 changes: 236 additions & 0 deletions mamutes/guest/templates/admission.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mamutes/guest/templates/comp.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<div class="journeyText">
<p class="journeyTitle">Nossa jornada na <b>competição</b></p>
<p class="journeySubTitle">Você também pode fazer parte dessa história!</p>
<a class="ProSelButton" href="">Entre na equipe</a>
<a href="{% url 'admission' %}" class="ProSelButton" href="">Entre na equipe</a>
</div>
<div class="icons">
<div class="splitIcon">
Expand Down
2 changes: 1 addition & 1 deletion mamutes/guest/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
Se inscreva e faça parte da história da Mamutes
</p>
</div>
<a class="botao-ps-advice">
<a href="{% url 'admission' %}" class="botao-ps-advice">
Clique aqui e participe
</a>
</div>
Expand Down
6 changes: 3 additions & 3 deletions mamutes/guest/templates/partials/_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</svg>
Competição
</a>
<a href="#processo" class="itemMenu">
<a href="{% url 'admission'%}" class="itemMenu">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
<path d="M3 8.20828C3 7.96205 3.0485 7.71824 3.14273 7.49075C3.23695 7.26326 3.37507 7.05657 3.54917 6.88246C3.72328 6.70835 3.92998 6.57024 4.15747 6.47601C4.38495 6.38178 4.62877 6.33328 4.875 6.33328C5.12123 6.33328 5.36505 6.38178 5.59253 6.47601C5.82002 6.57024 6.02671 6.70835 6.20082 6.88246C6.37493 7.05657 6.51305 7.26326 6.60727 7.49075C6.7015 7.71824 6.75 7.96205 6.75 8.20828C6.75 8.70556 6.55246 9.18248 6.20082 9.53411C5.84919 9.88574 5.37228 10.0833 4.875 10.0833C4.37772 10.0833 3.90081 9.88574 3.54917 9.53411C3.19754 9.18248 3 8.70556 3 8.20828ZM4.875 7.58328C4.70924 7.58328 4.55027 7.64913 4.43306 7.76634C4.31585 7.88355 4.25 8.04252 4.25 8.20828C4.25 8.37404 4.31585 8.53301 4.43306 8.65022C4.55027 8.76743 4.70924 8.83328 4.875 8.83328C5.04076 8.83328 5.19973 8.76743 5.31694 8.65022C5.43415 8.53301 5.5 8.37404 5.5 8.20828C5.5 8.04252 5.43415 7.88355 5.31694 7.76634C5.19973 7.64913 5.04076 7.58328 4.875 7.58328ZM7.58333 8.20828C7.58333 8.04252 7.64918 7.88355 7.76639 7.76634C7.8836 7.64913 8.04257 7.58328 8.20833 7.58328H10.2917C10.4574 7.58328 10.6164 7.64913 10.7336 7.76634C10.8508 7.88355 10.9167 8.04252 10.9167 8.20828C10.9167 8.37404 10.8508 8.53301 10.7336 8.65022C10.6164 8.76743 10.4574 8.83328 10.2917 8.83328H8.20833C8.04257 8.83328 7.8836 8.76743 7.76639 8.65022C7.64918 8.53301 7.58333 8.37404 7.58333 8.20828ZM3 4.45828C3 4.29252 3.06585 4.13355 3.18306 4.01634C3.30027 3.89913 3.45924 3.83328 3.625 3.83328H10.2917C10.4574 3.83328 10.6164 3.89913 10.7336 4.01634C10.8508 4.13355 10.9167 4.29252 10.9167 4.45828C10.9167 4.62404 10.8508 4.78301 10.7336 4.90022C10.6164 5.01743 10.4574 5.08328 10.2917 5.08328H3.625C3.45924 5.08328 3.30027 5.01743 3.18306 4.90022C3.06585 4.78301 3 4.62404 3 4.45828Z" fill="#808080"/>
<path d="M3.20833 0.5C2.49004 0.5 1.80116 0.785341 1.29325 1.29325C0.785341 1.80116 0.5 2.49004 0.5 3.20833V10.7083C0.5 11.4266 0.785341 12.1155 1.29325 12.6234C1.80116 13.1313 2.49004 13.4167 3.20833 13.4167H10.7083C11.4266 13.4167 12.1155 13.1313 12.6234 12.6234C13.1313 12.1155 13.4167 11.4266 13.4167 10.7083V3.20833C13.4167 2.49004 13.1313 1.80116 12.6234 1.29325C12.1155 0.785341 11.4266 0.5 10.7083 0.5H3.20833ZM1.75 3.20833C1.75 2.40333 2.40333 1.75 3.20833 1.75H10.7083C11.5133 1.75 12.1667 2.40333 12.1667 3.20833V10.7083C12.1673 11.02 12.0679 11.3237 11.8829 11.5746C11.6979 11.8254 11.4371 12.0102 11.1392 12.1017C11.0025 12.1439 10.8589 12.1656 10.7083 12.1667H3.20833C2.82156 12.1667 2.45063 12.013 2.17714 11.7395C1.90365 11.466 1.75 11.0951 1.75 10.7083V3.20833Z" fill="#808080"/>
Expand Down Expand Up @@ -91,8 +91,8 @@
<div class="active-dot" {% if request.path == '/competition/' %}style="background: #36B5FF;"{% endif %}></div>
</li>
<li>
<a href="#processo">Processo seletivo</a>
<div class="active-dot" {% if request.path == '/selectionProcess/' %}style="background: #36B5FF;"{% endif %}></div>
<a href="{% url 'admission' %}" {% if request.path == '/admission/' %}style="color: #010032; font-weight: 700;"{% endif %}>Processo seletivo</a>
<div class="active-dot" {% if request.path == '/admission/' %}style="background: #36B5FF;"{% endif %}></div>
</li>
</ul>
<div class="lock-menu">
Expand Down
3 changes: 3 additions & 0 deletions mamutes/guest/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ def index(request):
def competition(request):
return render(request,'comp.html')

def admission(request):
return render(request,'admission.html')

4 changes: 3 additions & 1 deletion mamutes/mamutes/urls.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from django.contrib import admin
from django.urls import path
from Users.views import login, register, recoverAccount, redefinePassword
from guest.views import index, competition
from guest.views import index, competition, admission


urlpatterns = [
path('admin/', admin.site.urls),
Expand All @@ -11,4 +12,5 @@
path('redefine_password/<str:username>/<str:token>', redefinePassword, name="redefinePassword"),
path('', index, name="index"),
path('competition/', competition, name="competition"),
path('admission/', admission, name="admission"),
]

0 comments on commit 8e0cd4f

Please sign in to comment.