From 3906709a48e33710eb3fafe058449bd247fd0761 Mon Sep 17 00:00:00 2001 From: Vitosavero Avila Wibisono <vitosavero.avila@ui.ac.id> Date: Fri, 6 Dec 2019 00:23:12 +0700 Subject: [PATCH] 1506688872 220 welcome students --- assets/js/__test__/components/TopMenu-test.jsx | 9 +++++++++ assets/js/components/TopMenu.jsx | 13 ++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/assets/js/__test__/components/TopMenu-test.jsx b/assets/js/__test__/components/TopMenu-test.jsx index fc18a4d2..9f0edf68 100755 --- a/assets/js/__test__/components/TopMenu-test.jsx +++ b/assets/js/__test__/components/TopMenu-test.jsx @@ -281,4 +281,13 @@ describe('TopMenu', () => { ); expect(topMenu.state.kapeDescription).to.exist; }); + + it('TopMenu state contain welcome student', () => { + const topMenu = ReactTestUtils.renderIntoDocument( + <TopMenu user={studentUser}> + <div> test </div> + </TopMenu>, + ); + expect(topMenu.state.welcomeStudent).to.exist; + }); }); diff --git a/assets/js/components/TopMenu.jsx b/assets/js/components/TopMenu.jsx index 42c31986..723cabb5 100755 --- a/assets/js/components/TopMenu.jsx +++ b/assets/js/components/TopMenu.jsx @@ -56,9 +56,8 @@ export default class TopMenu extends React.Component { "4. Pastikan persyaratan sudah terpenuhi\n" + "5. Jelaskan mengapa anda ingin mengikuti lowongan internship tersebut di 'Cover Letter'\n"+ "6. Klik tombol 'Daftar'\n", - kapeDescription: "Kanal Akses Pendaftaran KP Elektronik" - - + kapeDescription: "Kanal Akses Pendaftaran KP Elektronik", + welcomeStudent: "Selamat Datang, " }; this.logout = this.logout.bind(this); this.logoutCompany = this.logoutCompany.bind(this); @@ -172,6 +171,14 @@ export default class TopMenu extends React.Component { </Menu.Item> </Menu.Menu> + <Menu.Menu position="center"> + {this.props.user.role === 'student' && ( + <Menu.Item style={{ padding: '25px' }}> + {this.state.welcomeStudent} {data.name} + </Menu.Item> + )} + </Menu.Menu> + <Menu.Menu position="right"> {this.props.user.role === 'student' && ( <Menu.Item>{btn}</Menu.Item> -- GitLab