diff --git a/WSR/migrations/0002_alter_race_type.py b/WSR/migrations/0002_alter_race_type.py new file mode 100644 index 0000000000000000000000000000000000000000..f535eb5d0f2229364e1dbfae37f27f9dc7264ce3 --- /dev/null +++ b/WSR/migrations/0002_alter_race_type.py @@ -0,0 +1,18 @@ +# 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), + ), + ] diff --git a/WSR/migrations/0003_alter_race_type.py b/WSR/migrations/0003_alter_race_type.py new file mode 100644 index 0000000000000000000000000000000000000000..2d33f271ef19f1e27b729aeefffe18d85f05739c --- /dev/null +++ b/WSR/migrations/0003_alter_race_type.py @@ -0,0 +1,18 @@ +# 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), + ), + ] diff --git a/WSR/migrations/0004_alter_race_type.py b/WSR/migrations/0004_alter_race_type.py new file mode 100644 index 0000000000000000000000000000000000000000..96bfd6e17524ee6548112734ab500f950734e0ef --- /dev/null +++ b/WSR/migrations/0004_alter_race_type.py @@ -0,0 +1,18 @@ +# 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), + ), + ] diff --git a/WSR/migrations/0005_alter_race_type.py b/WSR/migrations/0005_alter_race_type.py new file mode 100644 index 0000000000000000000000000000000000000000..4299b836fddf46940bd46f6b6736a49678adf4e0 --- /dev/null +++ b/WSR/migrations/0005_alter_race_type.py @@ -0,0 +1,18 @@ +# 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), + ), + ] diff --git a/WSR/models.py b/WSR/models.py index fc5d1e68eade15d9fb45a7b6e56b17e01e3e6200..d088d9d9d3df91d0ea546eca9cdb9d7ac8fd895e 100644 --- a/WSR/models.py +++ b/WSR/models.py @@ -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) diff --git a/WSR/static/scss/components.scss b/WSR/static/scss/components.scss index 065bd815ddaced4f527c38f21ad181cf84058fa5..ec14160fa7b5c490e216c1f1ef540ed6d3ac71a2 100644 --- a/WSR/static/scss/components.scss +++ b/WSR/static/scss/components.scss @@ -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; diff --git a/WSR/templates/home.html b/WSR/templates/home.html index 2145f854022dc3f6091754d4f0ff3423f32f32c7..05c75dcba21a9c0fb1cbe0d2cc07179acbd84070 100644 --- a/WSR/templates/home.html +++ b/WSR/templates/home.html @@ -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,102 +97,19 @@ <h4 class="eurostile title">Actualité WSR</h4> <div class="news-cards"> - <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 + {% for article in six_last_articles %} + <div class="news-card"> + <div class="header"> + <div class="logo"> + <img src="{% static 'images/WSR.png' %}" alt="Logo WSR"> + </div> </div> - <div class="desc"> - Cette année encore, les WSR participeron aux traditionnelles - courses du Dubaï VIP Motor Club... + <div class="mt-3"> + <div class="eurostile">{{ article.title }}</div> + <div class="desc">{{ article.summary }}</div> </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> - </div> + {% endfor %} </div> <div class="d-flex justify-content-end"> <a class="btn" href="#">Voir tout</a> diff --git a/WSR/views.py b/WSR/views.py index f847e8b6f0c9a17ad74231118293451444ecae6a..d4f072cfb0da6c3e52797c084ed3ab01ef72b710 100644 --- a/WSR/views.py +++ b/WSR/views.py @@ -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 = [] diff --git a/WSR_website/urls.py b/WSR_website/urls.py index d3dc71896b9c69620ae72364f8f9a94399c03797..78237f0022f573722c77aa7c354e97f77fdfdca1 100644 --- a/WSR_website/urls.py +++ b/WSR_website/urls.py @@ -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