Merge remote-tracking branch 'origin/dev' into fix-typos

.gitlab-ci.yml

@@ -11,6 +11,7 @@ variables:
 stages:
   - quality
   - build
+  - build-push
   - deploy
 
 build-test:
@@ -26,11 +27,11 @@ build-test:
     - dev
     - merge_requests
 
-build:
+build-push:
   image: docker:18.09
   services:
     - docker:18.09-dind
-  stage: build
+  stage: build-push
   only:
     - master
     - dev

src/components/Newsletter/MonthlyInfo/MonthlyInfo.tsx

@@ -5,6 +5,7 @@ import CustomEditor from '../CustomEditor'
 import ImagePicker from '../ImagePicker/ImagePicker'
 import { ContentItems } from '../Newsletter'
 import './monthlyInfo.scss'
+
 interface MonthlyInfoProps {
   onSave: () => Promise<void>
   onCancel: () => void

src/components/Newsletter/Newsletter.tsx

@@ -28,6 +28,8 @@ export type ContentItems =
   | 'subject'
   | ''
 
+const Newsletter: React.FC = () => {
+  // Functional rule :
 const Newsletter: React.FC = () => {
   // Functional rule :
   // Display next month after the 3rd of the current month

src/components/Routes/Router.tsx

@@ -7,7 +7,7 @@ import Newsletter from '../Newsletter/Newsletter'
 import Popups from '../Popups/Popups'
 import Prices from '../Prices/Prices'
 
-const links: { [key: string]: { label: string; path: string } } = {
+export const links: { [key: string]: { label: string; path: string } } = {
   newsletter: {
     label: 'Newsletter',
     path: '/newsletter',
@@ -33,6 +33,7 @@ export const routes = Object.keys(links).map((key) => ({
 
 const Router: React.FC = () => {
   const { user } = useContext(UserContext)
+  console.log(user)
 
   return (
     <Switch>

src/hooks/useAuth.ts

@@ -2,6 +2,7 @@ import { useContext, useState } from 'react'
 import axios from 'axios'
 import { UserContext } from './userContext'
 import { useHistory } from 'react-router-dom'
+import { links } from '../components/Routes/Router'
 
 export interface Auth {
   loginUser: () => Promise<void>
@@ -38,7 +39,7 @@ export const useAuth = (): Auth => {
       const { data } = await axios.get(`/api/common/WhoAmI`)
       if (data && setUser) {
         setUser(data)
-        history.push('/editing')
+        history.push(links.newsletter.path)
       }
     } catch (e) {
       setError(e)