Upgrade - remove font awesome, simplify homepage + hire us

README.md

@@ -9,8 +9,8 @@
 Install npm and dependencies:
 
 ```bash
-yarn install
-yarn run dev
+npm install
+npm run dev
 ```
 
 Install composer dependencies:

first-run.sh

@@ -17,7 +17,7 @@ mkdir -p storage/framework/sessions
 mkdir -p storage/framework/views
 
 # create the manifest.json file
-npm build
+npm run build
 
 
 # since Laravel 11 ↓

package.json

@@ -2,10 +2,6 @@
     "name": "getrector-com",
     "type": "module",
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.2",
-        "@fortawesome/free-brands-svg-icons": "^6.2",
-        "@fortawesome/free-regular-svg-icons": "^6.2",
-        "@fortawesome/free-solid-svg-icons": "^6.2",
         "ajv": "^8.0",
         "bootstrap": "^5.3",
         "codemirror": "^5.0.1",

resources/blog/posts/2020/2020-09-07-how-to-inline-value-object-in-symfony-php-config.md

@@ -71,7 +71,7 @@ $services->set(FuncCallToStaticCallRector::class)
 
 <br>
 
-<em class="fas fa-fw fa-times text-danger fa-2x"></em>
+❌
 
 ## 2. Native `inline_service()` Function
 
@@ -106,7 +106,7 @@ This approach shuts us back to coding in the dark with Notepad.
 
 <br>
 
-<em class="fas fa-fw fa-times text-danger fa-2x"></em>
+❌
 
 ## 3. Best of Both Worlds - `inline_value_objects()`
 
@@ -158,7 +158,7 @@ And you're set!
 
 <br>
 
-<em class="fas fa-fw fa-check text-success fa-2x"></em>
+✅
 
 This way, **anyone can configure even the most complex Rector rules** without ever looking inside the Rector rule and scan for configuration values.
 

resources/blog/posts/2021/2021-05-03-prefixed-rector-by-default.md

@@ -20,7 +20,7 @@ composer require symfony/console:2.8
 composer require rector/rector --dev
 ```
 
-<em class="fas fa-fw fa-times text-danger fa-2x"></em>
+❌
 
 That's where [prefixed version](/blog/2020/01/20/how-to-install-rector-despite-composer-conflicts) helps too.
 
@@ -29,7 +29,7 @@ composer require symfony/console:2.8
 composer require rector/rector-prefixed --dev
 ```
 
-<em class="fas fa-fw fa-check text-success fa-2x"></em>
+✅
 
 The ultimate problem with this setup is a terrible user experience [with hidden knowledge](@todo memory lock post). As a user, I don't want to think about different names for the same package. Would you install `symfony/console` or `symfony/console-prefixed` based on conflicts on install? No.
 
@@ -42,7 +42,7 @@ composer require symfony/console:2.8
 composer require rector/rector --dev
 ```
 
-<em class="fas fa-fw fa-check text-success fa-2x"></em>
+✅
 
 In April and May we've been working hard to make `rector/rector-prefixed` experience identical to `rector/rector`. It included:
 

resources/blog/posts/2021/2021-05-10-how-to-bump-minimal-version-without-leaving-anyone-behind.md

@@ -143,7 +143,7 @@ composer require symfony/console:^6.0
 
 This way, if any package will require `symfony/console:^6.0`, they will always match the current set of features.
 
-<em class="fas fa-fw fa-check text-success fa-2x"></em>
+✅
 
 For now, it's just an idea. Yet we already can see working ~~prototype~~ examples in the PHP world. PHPStan is using this release approach since 0.12. This week Rector and [ECS has joined](https://twitter.com/VotrubaT/status/1391445133405696014).
 

resources/css/app.scss

@@ -1,15 +1,7 @@
 @import "bootstrap/scss/bootstrap";
-@import "@fortawesome/fontawesome-free/css/all.css";
-
-
-// setting the value of this variable to an empty data URL is the only working solution
-// to load the Bootswatch web fonts locally and avoid loading them from Google servers
-// see https://github.com/thomaspark/bootswatch/issues/55#issuecomment-298093182
-
-// @import url('https://rsms.me/inter/inter.css');
 
 html {
-    font-family: 'Inter', sans-serif;
+    font-family: 'Inter var', sans-serif;
 }
 
 $black: #24292e;
@@ -22,6 +14,8 @@ body {
     display: flex;
     flex-direction: column;
     font-size: 110%;
+
+    background: hsl(48 33.3% 97.1% / 1)
 }
 
 a, a:hover, a:focus, button, button:focus {
@@ -30,6 +24,23 @@ a, a:hover, a:focus, button, button:focus {
     box-shadow: none !important;
 }
 
+.navbar-dark .navbar-nav {
+    margin-top: .3em;
+    margin-bottom: .3em;
+
+    a.nav-link {
+        color: white;
+        text-decoration: none;
+
+        margin-right: 1em;
+    }
+
+    a {
+        font-size: 1.15em;
+    }
+}
+
+
 .bigger-buttons .btn {
     padding: .8rem 1.3rem;
     font-size: 1.3rem;
@@ -73,7 +84,7 @@ a, a:hover, a:focus, button, button:focus {
 ============================*/
 
 h1, h2, h3 {
-    font-family: 'Inter', sans-serif;
+    font-family: 'Inter var', sans-serif;
 }
 
 h3 {
@@ -126,7 +137,7 @@ html, body {
         }
     }
 
-    a {
+    a, a svg {
         color: #FFF;
 
         &:hover {
@@ -655,4 +666,10 @@ label.required:before {
 .anchor-link {
     margin-left: .1em;
     padding: .1em .3em;
+    opacity: .5;
+    text-decoration: none !important;
+
+    &:hover {
+        opacity: .8;
+    }
 }

resources/views/_snippets/javascripts.blade.php

@@ -1,3 +1,5 @@
+@isset ($codeMirror)
+
 <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
 
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
@@ -54,3 +56,5 @@
         }
     });
 </script>
+
+@endisset

resources/views/_snippets/layout/footer.blade.php

@@ -7,20 +7,25 @@
 
             <div class="col-6 col-md-3 mt-2">
                 <a href="http://github.com/rectorphp/rector" class="p-2">
-                    <em class="fab fa-github fa-fw fa-lg"></em>
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="30" height="30" viewBox="0 0 30 30">
+                        <path d="M15,3C8.373,3,3,8.373,3,15c0,5.623,3.872,10.328,9.092,11.63C12.036,26.468,12,26.28,12,26.047v-2.051 c-0.487,0-1.303,0-1.508,0c-0.821,0-1.551-0.353-1.905-1.009c-0.393-0.729-0.461-1.844-1.435-2.526 c-0.289-0.227-0.069-0.486,0.264-0.451c0.615,0.174,1.125,0.596,1.605,1.222c0.478,0.627,0.703,0.769,1.596,0.769 c0.433,0,1.081-0.025,1.691-0.121c0.328-0.833,0.895-1.6,1.588-1.962c-3.996-0.411-5.903-2.399-5.903-5.098 c0-1.162,0.495-2.286,1.336-3.233C9.053,10.647,8.706,8.73,9.435,8c1.798,0,2.885,1.166,3.146,1.481C13.477,9.174,14.461,9,15.495,9 c1.036,0,2.024,0.174,2.922,0.483C18.675,9.17,19.763,8,21.565,8c0.732,0.731,0.381,2.656,0.102,3.594 c0.836,0.945,1.328,2.066,1.328,3.226c0,2.697-1.904,4.684-5.894,5.097C18.199,20.49,19,22.1,19,23.313v2.734 c0,0.104-0.023,0.179-0.035,0.268C23.641,24.676,27,20.236,27,15C27,8.373,21.627,3,15,3z"></path>
+                    </svg>
                 </a>
 
                 <a href="https://twitter.com/rectorphp" class="p-2">
-                    <em class="fab fa-twitter fa-fw fa-lg"></em>
+                    <svg role="img" fill="currentColor" width="30" height="30" viewBox="0 0 25 25" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0022 5.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.072 4.072 0 012.8 9.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 012 18.407a11.616 11.616 0 006.29 1.84"></path>
+                    </svg>
                 </a>
 
                 <a href="https://www.linkedin.com/company/rectorphp" class="p-2">
-                    <em class="fab fa-linkedin fa-fw fa-lg"></em>
+                    <svg role="img" width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg" fill="currentColor"> <path d="M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433c-1.144 0-2.063-.926-2.063-2.065 0-1.138.92-2.063 2.063-2.063 1.14 0 2.064.925 2.064 2.063 0 1.139-.925 2.065-2.064 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z"/> </svg>
                 </a>
 
-                <a href="{{ action(\App\Controller\RssController::class) }}"
-                   class="p-2">
-                    <em class="fas fa-rss fa-fw fa-lg"></em>
+                <a href="{{ action(\App\Controller\RssController::class) }}" class="p-2">
+                    <svg role="img" width="30" height="30" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg" fill="currentColor">
+                        <path d="M6.503 20.752c0 1.794-1.456 3.248-3.251 3.248-1.796 0-3.252-1.454-3.252-3.248 0-1.794 1.456-3.248 3.252-3.248 1.795.001 3.251 1.454 3.251 3.248zm-6.503-12.572v4.811c6.05.062 10.96 4.966 11.022 11.009h4.817c-.062-8.71-7.118-15.758-15.839-15.82zm0-3.368c10.58.046 19.152 8.594 19.183 19.188h4.817c-.03-13.231-10.755-23.954-24-24v4.812z"></path>
+                    </svg>
                 </a>
             </div>
 

resources/views/_snippets/menu.blade.php

@@ -9,7 +9,8 @@
 
         <div class="collapse navbar-collapse" id="navbarTogglerDemo01">
             <ul class="navbar-nav me-auto text-start text-md-center">
-                <li class="nav-item me-0 me-md-3 mb-1 mb-md-0" id="top_right_logo"><a href="{{ action(\App\Controller\HomepageController::class) }}">
+                <li class="nav-item me-0 me-md-3 mb-1 mb-md-0" id="top_right_logo">
+                    <a href="{{ action(\App\Controller\HomepageController::class) }}">
                         <img src="/assets/images/new-logo/rector-with-name-white.png" alt="">
                     </a>
                 </li>
@@ -22,7 +23,9 @@
             <ul class="navbar-nav me-auto text-md-center">
                 <li class="nav-item">
                     <a href="http://github.com/rectorphp/rector" class="nav-link">
-                        <em class="fab fa-github fa-lg"></em>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="30" height="30" viewBox="0 0 30 30">
+                            <path d="M15,3C8.373,3,3,8.373,3,15c0,5.623,3.872,10.328,9.092,11.63C12.036,26.468,12,26.28,12,26.047v-2.051 c-0.487,0-1.303,0-1.508,0c-0.821,0-1.551-0.353-1.905-1.009c-0.393-0.729-0.461-1.844-1.435-2.526 c-0.289-0.227-0.069-0.486,0.264-0.451c0.615,0.174,1.125,0.596,1.605,1.222c0.478,0.627,0.703,0.769,1.596,0.769 c0.433,0,1.081-0.025,1.691-0.121c0.328-0.833,0.895-1.6,1.588-1.962c-3.996-0.411-5.903-2.399-5.903-5.098 c0-1.162,0.495-2.286,1.336-3.233C9.053,10.647,8.706,8.73,9.435,8c1.798,0,2.885,1.166,3.146,1.481C13.477,9.174,14.461,9,15.495,9 c1.036,0,2.024,0.174,2.922,0.483C18.675,9.17,19.763,8,21.565,8c0.732,0.731,0.381,2.656,0.102,3.594 c0.836,0.945,1.328,2.066,1.328,3.226c0,2.697-1.904,4.684-5.894,5.097C18.199,20.49,19,22.1,19,23.313v2.734 c0,0.104-0.023,0.179-0.035,0.268C23.641,24.676,27,20.236,27,15C27,8.373,21.627,3,15,3z"></path>
+                        </svg>
                     </a>
                 </li>
             </ul>

resources/views/_snippets/menu_items.blade.php

@@ -32,10 +32,6 @@ class="nav-link">Docs</a>
     <li class="nav-item">
         <a href="{{ action(\App\Ast\Controller\AstController::class) }}"
            class="nav-link">AST</a>
-
-        <div class="badge text-white bg-danger"
-             style="float:right; margin-top: -4.7em; margin-right: -.3em; font-size: .6em">NEW
-        </div>
     </li>
 @endif
 

resources/views/base.blade.php

@@ -14,11 +14,18 @@
     <body>
         @include('_snippets/menu')
 
-        <div class="container mobile-margin-top">
+        @if (request()->route()->action['controller'] === \App\Controller\HomepageController::class)
+            {{-- special case for homepage, to allow full width white panels --}}
             @include('_snippets/flash_messages')
 
             @yield('main')
-        </div>
+        @else
+            <div class="container mobile-margin-top">
+                @include('_snippets/flash_messages')
+
+                @yield('main')
+            </div>
+        @endif
 
         @include('_snippets/layout/footer')
 

resources/views/homepage/_parts/faq.blade.php

@@ -18,9 +18,7 @@
     <div class="col-12">
         <h3>We're in a hurry. Can you start today?</h3>
         <p>
-            We begin with a 3-week <a
-                    href="{{ action(\App\Controller\HireTeamController::class) }}">intro
-                analysis</a>, followed by an upgrade work.
+            We begin with a 3-week <a href="{{ action(\App\Controller\HireTeamController::class) }}">intro analysis</a>, followed by an upgrade work.
         </p>
     </div>
 

resources/views/homepage/codebase_renovation.blade.php

@@ -27,7 +27,7 @@
             <div class="row">
                 <div class="col-12 col-sm-6">
                     <h3 style="text-transform: uppercase; font-weight: 300;" class="mb-3">
-                        <em class="fas fa-lg fa-times-circle text-danger fa-fw"></em>
+                        @include('icons/error_cross', ['size' => 30])
                         Before
                     </h3>
 
@@ -38,7 +38,9 @@
                 </div>
                 <div class="col-12 col-sm-6">
                     <h3 style="text-transform: uppercase; font-weight: 300;" class="mb-3">
-                        <em class="fas fa-lg fa-check-circle text-success fa-fw"></em>
+                        <span class="text-success">
+                            @include('icons/success_check', ['size' => 30])
+                        </span>
                         After
                     </h3>