Merge pull request #2160 from codeeu/2147-challenges-2023

Create a spiral
codeeu · Oct 9, 2023 · a000d0d · a000d0d
2 parents 4a1fefe + e0d67f2
commit a000d0d
Show file tree

Hide file tree

Showing 24 changed files with 227 additions and 6 deletions.
diff --git a/public/img/2021/challenges/create-a-spiral-1.png b/public/img/2021/challenges/create-a-spiral-1.png
diff --git a/public/img/2021/challenges/create-a-spiral-10.png b/public/img/2021/challenges/create-a-spiral-10.png
diff --git a/public/img/2021/challenges/create-a-spiral-11.png b/public/img/2021/challenges/create-a-spiral-11.png
diff --git a/public/img/2021/challenges/create-a-spiral-12.png b/public/img/2021/challenges/create-a-spiral-12.png
diff --git a/public/img/2021/challenges/create-a-spiral-13.png b/public/img/2021/challenges/create-a-spiral-13.png
diff --git a/public/img/2021/challenges/create-a-spiral-14.png b/public/img/2021/challenges/create-a-spiral-14.png
diff --git a/public/img/2021/challenges/create-a-spiral-15.png b/public/img/2021/challenges/create-a-spiral-15.png
diff --git a/public/img/2021/challenges/create-a-spiral-16.png b/public/img/2021/challenges/create-a-spiral-16.png
diff --git a/public/img/2021/challenges/create-a-spiral-17.png b/public/img/2021/challenges/create-a-spiral-17.png
diff --git a/public/img/2021/challenges/create-a-spiral-18.png b/public/img/2021/challenges/create-a-spiral-18.png
diff --git a/public/img/2021/challenges/create-a-spiral-19.png b/public/img/2021/challenges/create-a-spiral-19.png
diff --git a/public/img/2021/challenges/create-a-spiral-2.png b/public/img/2021/challenges/create-a-spiral-2.png
diff --git a/public/img/2021/challenges/create-a-spiral-3.png b/public/img/2021/challenges/create-a-spiral-3.png
diff --git a/public/img/2021/challenges/create-a-spiral-4.png b/public/img/2021/challenges/create-a-spiral-4.png
diff --git a/public/img/2021/challenges/create-a-spiral-5.png b/public/img/2021/challenges/create-a-spiral-5.png
diff --git a/public/img/2021/challenges/create-a-spiral-6.png b/public/img/2021/challenges/create-a-spiral-6.png
diff --git a/public/img/2021/challenges/create-a-spiral-7.png b/public/img/2021/challenges/create-a-spiral-7.png
diff --git a/public/img/2021/challenges/create-a-spiral-8.png b/public/img/2021/challenges/create-a-spiral-8.png
diff --git a/public/img/2021/challenges/create-a-spiral-9.png b/public/img/2021/challenges/create-a-spiral-9.png
diff --git a/public/img/2021/challenges/create-a-spiral-example.png b/public/img/2021/challenges/create-a-spiral-example.png
diff --git a/public/img/2021/challenges/thumbnails/create-a-spiral.png b/public/img/2021/challenges/thumbnails/create-a-spiral.png
diff --git a/resources/views/2021/challenges.blade.php b/resources/views/2021/challenges.blade.php
@@ -50,12 +50,12 @@
                         @php
                             $currentDate = \Carbon\Carbon::now();
                         @endphp
-                        @if (strtotime($currentDate) >= strtotime(\Carbon\Carbon::create(2023,10,8)))
-                            @include('2021._thumbnail', ['slug' => 'personal-trainer', 'author'=>'Álvaro Molina Ayuso'])
-                        @endif
-                        @if (strtotime($currentDate) >= strtotime(\Carbon\Carbon::create(2023,10,7)))
-                            @include('2021._thumbnail', ['slug' => 'code-a-dice', 'author'=>'Fabrizia Agnello'])
-                        @endif
+                        {{--                        @if (strtotime($currentDate) >= strtotime(\Carbon\Carbon::create(2023,10,9)))--}}
+                        @include('2021._thumbnail', ['slug' => 'create-a-spiral', 'author'=>'Lydie El-Halougi'])
+                        {{--                        @endif--}}
+
+                        @include('2021._thumbnail', ['slug' => 'personal-trainer', 'author'=>'Álvaro Molina Ayuso'])
+                        @include('2021._thumbnail', ['slug' => 'code-a-dice', 'author'=>'Fabrizia Agnello'])
                         @include('2021._thumbnail', ['slug' => 'build-calliope', 'author'=>'Amazon Future Engineer | Meet and Code feat. Calliope gGmbH'])
                         @include('2021._thumbnail', ['slug' => 'chatbot'])
                         @include('2021._thumbnail', ['slug' => 'paper-circuit'])

diff --git a/resources/views/2021/challenges/create-a-spiral.blade.php b/resources/views/2021/challenges/create-a-spiral.blade.php
@@ -0,0 +1,220 @@
+@extends('layout.base')
+
+<x-tailwind></x-tailwind>
+
+@section('content')
+
+    @php
+        $slug = 'create-a-spiral'
+    @endphp
+
+    <section id="codeweek-schools-page" class="codeweek-page">
+
+
+        <section class="flex flex-row justify-between" style="background-color: #F5B740">
+            <div class="flex justify-center items-center w-full">
+                <div class="text-center m-12">
+                    <div class="text-xl text-white w-full"><a class="text-black"
+                                                              href="{{route('challenges')}}">@lang('challenges.title')</a>
+                    </div>
+                    <div class="text-5xl mt-2" style="color: #ffffff">@lang("challenges-content.$slug.title")</div>
+                </div>
+            </div>
+
+            <div class="md:w-10/12 md:flex hidden">
+                <img src="{{asset('img/2021/challenges/thumbnails/'.$slug.'.png')}}">
+
+
+            </div>
+
+        </section>
+
+        <section class="codeweek-content-wrapper">
+            <div class="m-6">
+
+                @include('2021.challenges._author', ['author' => 'Álvaro Molina Ayuso'])
+
+                <section class="grid grid-cols-1 gap-6 md:grid-cols-4 mx-6 my-4">
+
+
+                    <div>
+                        <div class="text-xl text-left text-blue-600">@lang('challenges.common.target-audience')</div>
+                        <ol class="list-disc ml-5">
+                            <li>@lang('challenges-content.common.audience.1')</li>
+                            <li>@lang('challenges-content.common.audience.2')</li>
+
+                        </ol>
+                    </div>
+
+                    <div>
+                        <div class="text-xl text-left text-blue-600">@lang('challenges.common.experience')</div>
+                        <ol class="list-disc ml-5">
+                            <li>@lang('challenges.common.intermediate')</li>
+                        </ol>
+                    </div>
+
+                    <div>
+                        <div class="text-xl text-left text-blue-600">@lang('challenges.common.duration')</div>
+                        <ol class="list-disc ml-5">
+                            <li>@lang('challenges.common.1-hour')</li>
+                        </ol>
+                    </div>
+
+                    <div>
+
+                        <div class="text-xl text-left text-blue-600">@lang('challenges.common.purpose')</div>
+                        <ol class="list-disc ml-5">
+                            <li>@lang("challenges-content.$slug.purposes.0")</li>
+                            <li>@lang("challenges-content.$slug.purposes.1")</li>
+                        </ol>
+
+                    </div>
+
+
+                </section>
+
+                <div class="mx-6 my-4">
+
+
+                    <div class="text-xl text-left text-blue-600">@lang('challenges.common.materials')</div>
+                    <ol class="list-disc ml-5">
+                        <li><a href="https://scratch.mit.edu/">Scratch</a></li>
+
+                    </ol>
+
+                </div>
+
+
+                <div class="leading-6 text-base text-left">
+
+                    <section class="bg-blue-100 p-2 mt-6">
+                        <div class="orange text-3xl mt-2">
+                            @lang('challenges.common.description')
+                        </div>
+
+
+                        <div class="mt-2">
+                            @lang("challenges-content.$slug.description")
+                        </div>
+                    </section>
+
+
+                    <section class="p-2">
+                        <div class="leading-6">
+                            <div class="mt-6 orange text-3xl">@lang('challenges.common.instructions')</div>
+                            <ul class="leading-7 ml-2 checklist mt-2">
+                                <div class="text-xl text-left text-blue-600">@lang("challenges-content.$slug.instructions.0")</div>
+
+                                <li>@lang("challenges-content.$slug.instructions.1")</li>
+<li>
+    @lang("challenges-content.$slug.instructions.2")
+    <img width="40px" class="inline" src="{{asset('img/2021/challenges/create-a-spiral-1.png')}}"/>
+</li>
+
+                                <li>@lang("challenges-content.$slug.instructions.3")</li>
+                                <li>@lang("challenges-content.$slug.instructions.4")
+                                    <img width="120px" class="inline" src="{{asset('img/2021/challenges/create-a-spiral-2.png')}}"/>
+                                </li>
+
+
+                                <li>@lang("challenges-content.$slug.instructions.5")
+                                    <img width="120px" class="inline" src="{{asset('img/2021/challenges/create-a-spiral-3.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.6")
+                                    <img width="120px" class="inline" src="{{asset('img/2021/challenges/create-a-spiral-4.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.7")</li>
+                                <li>@lang("challenges-content.$slug.instructions.8")
+                                    <img width="120px" class="inline" src="{{asset('img/2021/challenges/create-a-spiral-5.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.9")
+                                    <img width="120px" class="inline" src="{{asset('img/2021/challenges/create-a-spiral-6.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.10")
+                                    <img width="200px" src="{{asset('img/2021/challenges/create-a-spiral-7.png')}}"/>
+                                </li>
+
+                                <div class="text-xl text-left text-blue-600 mt-6">@lang("challenges-content.$slug.instructions.11")</div>
+
+                                <li>@lang("challenges-content.$slug.instructions.12")
+                                    <img width="120px" class="inline" src="{{asset('img/2021/challenges/create-a-spiral-8.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.13")
+                                    <img width="120px" class="inline" src="{{asset('img/2021/challenges/create-a-spiral-9.png')}}"/>
+                                </li>
+
+                                <div class="text-xl text-left text-blue-600 mt-6">@lang("challenges-content.$slug.instructions.14")</div>
+
+                                <li>@lang("challenges-content.$slug.instructions.15")
+                                    <img width="400px" src="{{asset('img/2021/challenges/create-a-spiral-10.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.16")</li>
+                                <li>@lang("challenges-content.$slug.instructions.17")
+                                    <img width="120px" class="inline" src="{{asset('img/2021/challenges/create-a-spiral-11.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.18")
+                                    <img width="400px" src="{{asset('img/2021/challenges/create-a-spiral-12.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.19")
+                                    <img width="180px" src="{{asset('img/2021/challenges/create-a-spiral-13.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.20")
+                                    <img width="180px" src="{{asset('img/2021/challenges/create-a-spiral-14.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.21")
+                                    <img width="240px" src="{{asset('img/2021/challenges/create-a-spiral-15.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.22")
+                                    <img width="260px" src="{{asset('img/2021/challenges/create-a-spiral-16.png')}}"/>
+                                </li>
+                                <div class="text-xl text-left text-blue-600 mt-6">@lang("challenges-content.$slug.instructions.23")</div>
+
+                                <li>@lang("challenges-content.$slug.instructions.24")
+                                    <img width="600px" src="{{asset('img/2021/challenges/create-a-spiral-17.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.25")
+                                    <img width="240px" src="{{asset('img/2021/challenges/create-a-spiral-18.png')}}"/>
+                                </li>
+                                <li>@lang("challenges-content.$slug.instructions.26")</li>
+                                <li>@lang("challenges-content.$slug.instructions.27")
+                                    <img width="290px" src="{{asset('img/2021/challenges/create-a-spiral-19.png')}}"/>
+                                </li>
+                                <strong>@lang("challenges-content.$slug.instructions.28")</strong>
+                            </ul>
+                        </div>
+                    </section>
+
+                    @include('2021.challenges._share')
+
+
+
+                    <section class="p-2">
+                        <div class="orange text-3xl">@lang('challenges.common.example')</div>
+                        <div class="mt-2"><a href="https://scratch.mit.edu/projects/901425275">https://scratch.mit.edu/projects/901425275</a> </div>
+                        <div class="mt-2">
+                                <img src="{{asset('img/2021/challenges/create-a-spiral-example.png')}}"/>
+                        </div>
+
+
+                    </section>
+
+
+                </div>
+
+                @include('2021.challenges._download',['url'=>"https://codeweek-s3.s3.eu-west-1.amazonaws.com/cw2023/$slug.docx"])
+            </div>
+            <div style="text-align: center">@include('include.licence')</div>
+        </section>
+    </section>
+
+@endsection
+
+@section('extra-css')
+    <style>
+        ul.checklist li:before {
+            content: '• ';
+            color: #ee6a2c;
+            font-weight: bold;
+        }
+    </style>
+@endsection
diff --git a/routes/web.php b/routes/web.php
@@ -576,6 +576,7 @@ function () {
     Route::view('european-astro-pi','2021.challenges.european-astro-pi')->name('challenges.european-astro-pi');
     Route::view('code-a-dice','2021.challenges.code-a-dice')->name('challenges.code-a-dice');
     Route::view('personal-trainer','2021.challenges.personal-trainer')->name('challenges.personal-trainer');
+    Route::view('create-a-spiral','2021.challenges.create-a-spiral')->name('challenges.create-a-spiral');
 };
 
 Route::group(['prefix' => '2021/challenges'], $challenges);