Skip to content

Commit

Permalink
Merge pull request #82 from eldersantoss/multi-service-deploy
Browse files Browse the repository at this point in the history
Multi service deploy
  • Loading branch information
eldersantoss authored May 2, 2024
2 parents 0b29c03 + 309b81b commit 74f5f9b
Show file tree
Hide file tree
Showing 50 changed files with 2,394 additions and 691 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,6 @@ dmypy.json

# Pyre type checker
.pyre/

# ssh keys
*.pem
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: source scripts/railway_start.sh
web: source scripts/service_start.sh web
3 changes: 0 additions & 3 deletions accounts/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
from django.contrib import admin

# Register your models here.
3 changes: 0 additions & 3 deletions accounts/models.py
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
from django.db import models

# Create your models here.
2 changes: 1 addition & 1 deletion accounts/templates/registration/login.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% extends "base.html" %}

{% load static %}

{% block title %}Palpiteiros | Entrar{% endblock title %}
Expand All @@ -12,7 +13,6 @@
</a>
</div>


<form action="{% url 'login' %}" method="post" class="main-form">
{% csrf_token %}
<div>
Expand Down
21 changes: 15 additions & 6 deletions accounts/templates/registration/register.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
{% extends 'base.html' %}
{% extends "base.html" %}

{% load static %}

{% block title %}Palpiteiros | Cadastrar{% endblock title %}

{% block content %}

<div>
<a href={% if pool %}{% url 'core:pool_home' pool.slug %}{% else %}{% url 'core:index' %}{% endif %}>
<img src={% static 'core/img/palpiteiros.png' %} alt="Logotipo Palpiteiros"
class="small-logo">
</a>
</div>

<form action="{% url 'register' %}" method="post" class="main-form">
{% csrf_token %}
{{ form.as_div }}
<input type="hidden" name="next" value="{{ next }}">
<input type="submit" value="Criar conta">
{% csrf_token %}
{{ form.as_div }}
<input type="hidden" name="next" value="{{ next }}">
<input type="submit" value="Criar conta">
</form>

<nav class="menu vertical">
<a href="{% url 'login' %}">Voltar para login</a>
<a href="{% url 'login' %}">Voltar para login</a>
</nav>

{% endblock content %}
3 changes: 0 additions & 3 deletions accounts/tests.py

This file was deleted.

2 changes: 1 addition & 1 deletion core/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ class GuessPoolAdmin(admin.ModelAdmin):
)
list_editable = ("private", "new_matches", "updated_matches")
prepopulated_fields = {"slug": ("name",)}
filter_horizontal = ["teams", "guessers", "guesses"]
filter_horizontal = ["competitions", "teams", "guessers", "guesses"]
Loading

0 comments on commit 74f5f9b

Please sign in to comment.