Revert "Merge pull request #7762 from scratchfoundation/revert-7759-FAR-Revert"

This reverts commit faf84d0cfa, reversing
changes made to 5b190b3acd.

src/redux/session.js

@@ -16,7 +16,6 @@ const banGoodListPaths = [
     '/ip_ban_appeal',
     '/vpn_required',
     '/accounts/banned-response',
-    '/accounts/bad-username',
     '/community_guidelines',
     '/privacy_policy',
     '/terms_of_use'
@@ -86,11 +85,7 @@ const handleSessionResponse = (dispatch, body) => {
         body.user.banned &&
         banGoodListPaths.every(goodPath => window.location.pathname.indexOf(goodPath) === -1)
     ) {
-        if (body.user.banned_status === 'far_banned'){
-            window.location = '/accounts/bad-username/';
-        } else {
-            window.location = '/accounts/banned-response/';
-        }
+        window.location = '/accounts/banned-response/';
         return;
     } else if (
         body.flags &&

src/routes.json

@@ -430,13 +430,6 @@
         "view": "microbit/microbit",
         "title": "micro:bit"
     },
-    {
-        "name": "bad-username-splash",
-        "pattern": "^/accounts/bad-username/?(\\?.*)?$",
-        "routeAlias": "/accounts/bad-username/?$",
-        "view": "bad-username-splash/bad-username-splash",
-        "title": "Account Blocked"
-    },
     {
         "name": "vernier",
         "pattern": "^/vernier/?(\\?.*)?$",

src/views/bad-username-splash/bad-username-splash.scss

@@ -1,134 +0,0 @@
-@import "../../colors";
-@import "../../frameless";
-
-.validation-left {
-    transform: translate(-20.5rem, 0);
-}
-
-@media #{$intermediate-and-smaller} {
-    .validation-full-width-input {
-        box-sizing: border-box;
-        transform: unset;
-        margin-bottom: .75rem;
-        max-width: 100%;
-    }
-}
-
-.inline{
-    display:inline;
-}
-
-#bad-username-splash{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-#force-account-rename{
-    width: 100%;
-    display: flex;
-    justify-content: center;
-
-    #force-account-rename-inner{
-        max-width: 1094px;
-        display: flex;
-        flex-direction: row;
-        @media only screen and (max-width: 800px) {
-            flex-direction: column;
-        }
-
-        text-align: left;
-
-        input{
-            box-sizing: border-box;
-            width: 100%;
-        }
-    }
-    background-color: #575E75;
-    .col{
-        padding: 40px;
-        flex: 1;
-    }
-}
-
-
-#admin-message-list{
-    display: inline-block;
-    padding: 25px;
-    max-width: 1094px;
-
-    #admin-message-list-title{
-        text-align: left;
-    }
-}
-
-.admin-message{
-    text-align: left;   
-    .admin-message-date{
-        color: #575E75;
-        font-size: 12px;
-        padding-bottom: 10px;
-    }
-    text-align: left;
-    border-radius: 8px;
-    padding: 16px;
-    background-color: #E5F0FF;
-    margin: 10px;
-}
-
-#force-account-rename-text{
-    h1, h3, p{
-        color: white;
-    }
-}
-
-.empty{
-    text-align: left;
-
-    .admin-message{
-        margin: 10px;
-    }
-}
-
-.banned-message-box{
-    margin: 20px;
-    text-align: left;
-}
-
-.join-flow-outer-content{
-    background-color: white;
-    border-radius: 16px;
-    color: #575e75;
-    max-width: 468px;
-    min-height: auto !important;
-    @media only screen and (max-width: 800px) {
-        margin: auto;
-    }
-}
-
-.banned-icon{
-    margin-right: 10px;
-    padding-top: 10px;
-    margin-bottom: -3px;
-}
-
-.modal-flush-bottom-button{
-    background-color: #855CD6;
-}
-.modal-flush-bottom-button:hover{
-    background-color: #855CD6;
-}
-
-.join-flow-outer-content{
-    border: solid 4px #818698;
-    border-radius: 21px;
-}
-
-.mt5{
-    margin-top: 5px;
-}
-
-.white-underline-link{
-    color: white !important;
-    text-decoration: underline !important;
-}

src/views/bad-username-splash/blocked-account.svg

@@ -1,3 +0,0 @@
-<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2.66463 34.3035C3.16405 34.7261 3.91148 34.6638 4.33407 34.1643L30.3944 3.36576C30.817 2.86634 30.7547 2.11891 30.2553 1.69632C29.7559 1.27374 29.0084 1.33602 28.5859 1.83544L25.5707 5.39883H7.19999C4.21765 5.39883 1.79999 7.81649 1.79999 10.7988V25.1988C1.79999 27.2974 2.99711 29.1164 4.74571 30.0102L2.52551 32.634C2.10293 33.1335 2.16521 33.8809 2.66463 34.3035ZM6.59065 27.8298L18.6752 13.548H4.49999V25.1988C4.49999 26.4804 5.39295 27.5535 6.59065 27.8298ZM28.8 30.5988H10.4308L12.7154 27.8988H28.8C30.2912 27.8988 31.5 26.69 31.5 25.1988V13.548H24.8584L31.2553 5.98803C33.0033 6.88198 34.2 8.70066 34.2 10.7988V25.1988C34.2 28.1812 31.7823 30.5988 28.8 30.5988Z" fill="white"/>
-</svg>