Skip to content
Snippets Groups Projects
Commit 2ce3e8e8 authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

Modification de la vue et du modèle race.

parent ad92aa66
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 106 additions and 99 deletions
WSR/migrations/0002_alter_race_type.py 0 → 100644
+ 18
− 0
View file @ 2ce3e8e8
# Generated by Django 4.2.1 on 2023-06-11 17:48
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('WSR', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='race',
name='type',
field=models.CharField(choices=[('invitation', 'Invitation'), ('championship', 'Championship'), ('single_race', 'Single Race'), ('face_to_face', 'Face To Face')], default='single_race', max_length=100),
),
]
WSR/migrations/0003_alter_race_type.py 0 → 100644
+ 18
− 0
View file @ 2ce3e8e8
# Generated by Django 4.2.1 on 2023-06-11 17:57
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('WSR', '0002_alter_race_type'),
]
operations = [
migrations.AlterField(
model_name='race',
name='type',
field=models.CharField(choices=[('invitation', 'Invitation'), ('championship', 'Championship'), ('single_race', 'Single Race'), ('face_to_face', 'Face To Face'), ('overtaking', 'Overtaking')], default='single_race', max_length=100),
),
]
WSR/migrations/0004_alter_race_type.py 0 → 100644
+ 18
− 0
View file @ 2ce3e8e8
# Generated by Django 4.2.1 on 2023-06-11 20:00
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('WSR', '0003_alter_race_type'),
]
operations = [
migrations.AlterField(
model_name='race',
name='type',
field=models.CharField(choices=[('invitation', 'Invitation'), ('championship', 'Championship'), ('single_race', 'Single Race'), ('face_to_face', 'Face To Face'), ('overtaking', 'Overtaking'), ('against_time', 'Against Time')], default='single_race', max_length=100),
),
]
WSR/migrations/0005_alter_race_type.py 0 → 100644
+ 18
− 0
View file @ 2ce3e8e8
# Generated by Django 4.2.1 on 2023-06-12 06:57
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('WSR', '0004_alter_race_type'),
]
operations = [
migrations.AlterField(
model_name='race',
name='type',
field=models.CharField(choices=[('invitation', 'Invitation'), ('championship', 'Championship'), ('single_race', 'Single Race'), ('face_to_face', 'Face To Face'), ('overtaking', 'Overtaking'), ('against_time', 'Against Time'), ('elimination', 'Elimination')], default='single_race', max_length=100),
),
]
WSR/models.py
+ 5
− 0
View file @ 2ce3e8e8
......@@ -32,6 +32,11 @@ class Race(models.Model):
INVITATION = "invitation"
CHAMPIONSHIP = "championship"
SINGLE_RACE = "single_race"
FACE_TO_FACE = "face_to_face"
OVERTAKING = "overtaking"
AGAINST_TIME = "against_time"
ELIMINATION = "elimination"
ENDURANCE = "endurance"
name = models.CharField(max_length=100)
circuit = models.CharField(max_length=100)
......
WSR/static/scss/components.scss
+ 0
− 1
View file @ 2ce3e8e8
......@@ -74,7 +74,6 @@
flex-direction: column;
justify-content: flex-start;
align-items: flex-start;
background-image: url("https://cdn.builder.io/api/v1/image/assets%2FTEMP%2Fb35a0e22a955470e977bdc214911fc7a");
background-size: cover;
background-repeat: no-repeat;
background-position: center;
......
WSR/templates/home.html
+ 24
− 97
View file @ 2ce3e8e8
......@@ -46,7 +46,7 @@
</div>
<div class="seconds-frames">
{% for race in second_frame_races %}
<div class="second-frame">
<div class="second-frame" style="background-image: url('{% get_media_prefix %}{{ race.image }}');">
<div class="header">
{% if race.finishing_position == 1 %}
<div class="pos">{{ race.pos_string }}</div>
......@@ -58,16 +58,26 @@
<div class="event-type"><i class="fa-solid fa-envelope"></i> Invitation évènement</div>
{% elif race.type == 'championship' %}
<div class="event-type"><i class="fa-solid fa-flag-checkered"></i> Championnat</div>
{% elif race.type == 'face_to_face' %}
<div class="event-type"><i class="fa-solid fa-user"></i> Face à face</div>
{% elif race.type == 'overtaking' %}
<div class="event-type"><i class="fa-solid fa-user"></i> Dépasssements</div>
{% elif race.type == 'against_time' %}
<div class="event-type"><i class="fa-solid fa-timer"></i> Course contre-la-montre</div>
{% elif race.type == 'elimination' %}
<div class="event-type"><i class="fa-solid fa-ranking-star"></i> Eliminations</div>
{% elif race.type == 'endurance' %}
<div class="event-type"><i class="fa-solid fa-timer"></i> Endurance</div>
{% else %}
<div class="event-type"><i class="fa-solid fa-flag-checkered"></i> Course simple</div>
{% endif %}
<div class="event-desc">
<div class="eurostile w-75">{{ race.name }}</div>
{% if race.type == 'invitation' %}
<div class="event-meta-info">{{ race.circuit }}</div>
{% else %}
{% if race.type == 'championship' %}
<div class="event-meta-info">3 manches</div>
{% else %}
<div class="event-meta-info">{{ race.circuit }}</div>
{% endif %}
</div>
</div>
......@@ -87,6 +97,7 @@
<h4 class="eurostile title">Actualité WSR</h4>
<div class="news-cards">
{% for article in six_last_articles %}
<div class="news-card">
<div class="header">
<div class="logo">
......@@ -94,95 +105,11 @@
</div>
</div>
<div class="mt-3">
<div class="eurostile">
Participation au Dubai VIP Motor Club
</div>
<div class="desc">
Cette année encore, les WSR participeron aux traditionnelles
courses du Dubaï VIP Motor Club...
</div>
</div>
</div>
<div class="news-card">
<div class="header">
<div class="logo">
<img src="{% static 'images/WSR.png' %}" alt="Logo WSR">
</div>
</div>
<div class="mt-3">
<div class="eurostile">
Changement d’écurie pour les L.A Race Wars
</div>
<div class="desc">
C’est avec un grand regret que nous avons quitté l’écurie
Volkswagen au profit de Toyota pour la...
</div>
</div>
</div>
<div class="news-card">
<div class="header">
<div class="logo">
<img src="{% static 'images/WSR.png' %}" alt="Logo WSR">
</div>
</div>
<div class="mt-3">
<div class="eurostile">
Ouverture de la chaîne LIVE pour Juin 2023
</div>
<div class="desc">
Pour la première fois depuis la création des WSR en 2013, nous
ouvrons notre propre canal de diffusion...
</div>
</div>
</div>
<div class="news-card">
<div class="header">
<div class="logo">
<img src="{% static 'images/WSR.png' %}" alt="Logo WSR">
</div>
</div>
<div class="mt-3">
<div class="eurostile">
Participation au Dubai VIP Motor Club
</div>
<div class="desc">
Cette année encore, les WSR participeron aux traditionnelles
courses du Dubaï VIP Motor Club...
</div>
</div>
</div>
<div class="news-card">
<div class="header">
<div class="logo">
<img src="{% static 'images/WSR.png' %}" alt="Logo WSR">
</div>
</div>
<div class="mt-3">
<div class="eurostile">
Changement d’écurie pour les L.A Race Wars
</div>
<div class="desc">
C’est avec un grand regret que nous avons quitté l’écurie
Volkswagen au profit de Toyota pour la...
</div>
</div>
</div>
<div class="news-card">
<div class="header">
<div class="logo">
<img src="{% static 'images/WSR.png' %}" alt="Logo WSR">
</div>
</div>
<div class="mt-3">
<div class="eurostile">
Ouverture de la chaîne LIVE pour Juin 2023
</div>
<div class="desc">
Pour la première fois depuis la création des WSR en 2013, nous
ouvrons notre propre canal de diffusion...
</div>
<div class="eurostile">{{ article.title }}</div>
<div class="desc">{{ article.summary }}</div>
</div>
</div>
{% endfor %}
</div>
<div class="d-flex justify-content-end">
<a class="btn" href="#">Voir tout</a>
......
WSR/views.py
+ 1
− 1
View file @ 2ce3e8e8
......@@ -33,7 +33,7 @@ def home(request):
six_last_articles = Article.objects.order_by('-publication_date')[:6]
for article in six_last_articles:
article.summary = ' '.join(article.content.split()[:14])
article.summary = ' '.join(article.content.split()[:14]) + '...'
three_last_races_results = []
......
WSR_website/urls.py
+ 4
− 0
View file @ 2ce3e8e8
......@@ -14,6 +14,8 @@ Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.conf import settings
from django.conf.urls.static import static
from django.contrib import admin
from django.urls import path
......@@ -23,3 +25,5 @@ urlpatterns = [
path('admin/', admin.site.urls),
path('', views.home)
]
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment