.drone.yml

@@ -670,7 +670,6 @@ steps:
       - aws cloudfront create-invalidation --distribution-id EC35D25OP7FSL --paths "/*"
 
 
-
 ---
 kind: pipeline
 type: docker
@@ -685,7 +684,7 @@ platform:
 
 trigger:
   ref:
-  - refs/heads/test-auth-test
+  - refs/heads/test-auth
 
 steps:
   - name: npm-install
@@ -1057,8 +1056,7 @@ steps:
         from_secret: AWS_DEFAULT_REGION
       AWS_MAX_ATTEMPTS: 10
     commands:
-#      - aws s3 sync build_insport_live s3://insports-live --delete
+      - aws s3 sync build_insport_live s3://insports-live --delete
       - aws cloudfront create-invalidation --distribution-id E1LBC88VYP6XVB --paths "/*"
     depends_on:
       - make-insport-live
-

src/config/clients/index.tsx

@@ -7,7 +7,6 @@ import { insports } from './insports'
 import { india } from './india'
 import { tunisia } from './tunisia'
 import { fqtv } from './fqtv'
-import { rustat } from './rustat'
 
 export const currentClient = process.env.REACT_APP_CLIENT || 'insports'
 
@@ -18,7 +17,6 @@ export const isFacrClient = currentClient === 'facr'
 export const isIndiaClient = currentClient === 'india'
 export const isTunisClient = currentClient === 'tunisia'
 export const isFqtvClient = currentClient === 'fqtv'
-export const isRustatClient = currentClient === 'rustat'
 
 const clients = {
   facr,
@@ -27,7 +25,6 @@ const clients = {
   insports,
   instat,
   lff,
-  rustat,
   tunisia,
 }
 

src/config/clients/rustat.tsx

@@ -1,51 +0,0 @@
-import { css } from 'styled-components/macro'
-
-import {
-  ClientConfig,
-  ClientIds,
-  ClientNames,
-} from './types'
-
-export const rustat: ClientConfig = {
-  auth: {
-    clientId: ClientIds.Rustat,
-  },
-  currencyBadge: {
-    color: '#333333',
-    secondColor: 'rgba(255, 255, 255, 0.7)',
-    sign: 'Dollar',
-  },
-  defaultLanguage: 'en',
-  description: 'Live sports streaming platform. Football, basketball, ice hockey and more. Access to various player playlists and game highlights. Multiple subscription options. Available across all devices.',
-  disabledPreferences: true,
-  host: 'demo.insports.tv',
-  name: ClientNames.Rustat,
-  privacyLink: '/privacy-policy-and-statement?client_id=insports-ott-web',
-  showSearch: true,
-  showSmartBanner: true,
-  styles: {
-    background: 'background-image: url(/images/Checker.png);',
-    logo: 'insports-logo.svg',
-    logoHeight: 2.465,
-    logoLeft: 1.7,
-    logoTop: 1.5,
-    logoWidth: 6.37,
-    matchLogoHeight: 2.465,
-    matchLogoWidth: 6.37,
-    matchPageMobileHeaderLogo: css`
-      width: 90px;
-      height: 27px;
-      top: 0;
-    `,
-    mobileHeaderLogo: css`
-      width: 77px;
-      height: 24px;
-    `,
-    userAccountLogo: css`
-      width: 6.37rem;
-      height: 2.465rem;
-    `,
-  },
-  termsLink: '/terms-and-conditions?client_id=insports-ott-web',
-  title: 'InSports TV - The Home of Sports Streaming',
-}

src/config/clients/types.tsx

@@ -12,8 +12,7 @@ export enum ClientIds {
   Insports = 'insports-ott-web',
   Instat = 'ott-web',
   Lff = 'lff-ott-web',
-  Rustat = 'rustat-ott-web',
+  Tunisia = 'tunisia-ott-web',
-  Tunisia = 'tunisia-ott-web'
 }
 
 export enum ClientNames {
@@ -23,9 +22,8 @@ export enum ClientNames {
   India = 'india', // Индия
   Insports = 'insports', // Глобал
   Instat = 'instat', // Глобал
-  Lff = 'lff', // Тунис
+  Lff = 'lff', // Латвия
-  Rustat = 'rustat', // Латвия
+  Tunisia = 'tunisia' // Тунис
-  Tunisia = 'tunisia' // Россия
 }
 
 export type ClientConfig = {

src/config/payments.tsx

@@ -26,5 +26,4 @@ export const payments: PaymentsType = {
   [ClientNames.Facr]: PaymentSystem.Stripe,
   [ClientNames.Lff]: PaymentSystem.Stripe,
   [ClientNames.Fqtv]: PaymentSystem.Stripe,
-  [ClientNames.Rustat]: PaymentSystem.Stripe,
 }

src/features/AuthServiceApp/config/clients/index.tsx

@@ -7,7 +7,6 @@ import { lff } from './lff'
 import { india } from './india'
 import { tunisia } from './tunisia'
 import { fqtv } from './fqtv'
-import { rustat } from './rustat'
 
 export const clients = {
   [ClientIds.Facr]: facr,
@@ -17,7 +16,6 @@ export const clients = {
   [ClientIds.Insports]: insports,
   [ClientIds.India]: india,
   [ClientIds.Tunisia]: tunisia,
-  [ClientIds.Rustat]: rustat,
 }
 
 const params = new URLSearchParams(window.location.search)

src/features/AuthServiceApp/config/clients/rustat.tsx

@@ -1,42 +0,0 @@
-import { css } from 'styled-components'
-
-import { rustat as platformRustat } from 'config/clients/rustat'
-import { isMobileDevice } from 'config/userAgent'
-
-import { Background } from 'features/Background'
-
-import type { ClientConfig } from './types'
-
-export const rustat: ClientConfig = {
-  ...platformRustat,
-  background: Background,
-  styles: {
-    centerBlock: css`
-      margin-top: 9.15rem;
-      ${isMobileDevice ? css`
-        margin-top: 107px;
-        @media screen and (orientation: landscape) {
-          width: 290px;
-          margin: auto;
-        }
-      ` : ''};
-    `,
-    logo: css`
-      background-image: url(/images/insports-logo.svg);
-      background-position: center;
-      height: 85px;
-      width: 275px;
-      margin-bottom: 1.82rem;
-
-      ${isMobileDevice ? css`
-          margin-bottom: 15px;
-          width: 165px;
-          height: 50px;
-          @media screen and (orientation: landscape){
-            width: 92px;
-            height: 22px;
-          }
-        ` : ''}
-    `,
-  },
-}

src/features/AuthStore/helpers.tsx

@@ -29,8 +29,6 @@ export const getClientNameByRedirectUri = () => {
       return 'diwan.insports'
     case ClientNames.Fqtv:
       return 'fqtv.insports'
-    case ClientNames.Rustat:
-      return 'demo.insports'
     case ClientNames.Facr:
       return ClientNames.Facr
     case ClientNames.Instat:
@@ -45,7 +43,6 @@ const clientsForRedirect = {
   fqtv: ClientNames.Fqtv,
   india: ClientNames.India,
   lff: ClientNames.Lff,
-  rustat: ClientNames.Rustat,
   tunisia: ClientNames.Tunisia,
 }
 

src/react-app-env.d.ts

@@ -3,7 +3,7 @@
 
 declare namespace NodeJS {
   export interface ProcessEnv {
-    REACT_APP_CLIENT: 'instat' | 'facr' | 'lff' | 'insports' | 'india' | 'tunisia' | 'fqtv' | 'rustat',
+    REACT_APP_CLIENT: 'instat' | 'facr' | 'lff' | 'insports' | 'india' | 'tunisia' | 'fqtv',
     REACT_APP_ENV: 'production' | 'preproduction' | 'staging',
     REACT_APP_STAGE: 'staging' | 'test-a' | 'test-b' | 'test-c' | 'test-d' | 'test-e' | 'test-f' | 'test-g' | 'test-h' | 'test-i' | 'test-j' | 'test',
     REACT_APP_TYPE: 'auth-service' | 'ott',