Merge branch 'master' of https://source.sidali.vertizoncode.com/appsptb/PTB-fe

# Conflicts:
#	components/Layout/Sidebar.js

components/Layout/Sidebar.js

@@ -152,7 +152,22 @@ class Sidebar extends Component {
 		// const user = await getUser();
 		const user = this.props.user;
 		if (ENV === "production") {
+<<<<<<< HEAD
 			this.menu = user.role.id === 2022 ? MenuPT : user.user_id === "2A080F42-AE7F-407B-976E-DE5FA87BD277" || user.user_id === "28DB23AE-2976-47E0-9410-241A11EE1F88" ? MenuBypass : user.role.id === 2021 ? MenuLLDIKTI : user.role.id === 2024 ? MenuReadOnly : Menu;
+=======
+          if (user.user_id === "2A080F42-AE7F-407B-976E-DE5FA87BD277" || user.user_id === "28DB23AE-2976-47E0-9410-241A11EE1F88") {
+            this.menu = MenuBypass
+          } else if (user.role.id === 2022) {
+            this.menu = MenuPT
+		  } else if (user.role.id === 2021) {
+            this.menu = MenuLLDIKTI
+          } else if (user.role.id === 2024) {
+          	this.menu = MenuReadOnly
+          } else {
+            this.menu = Menu
+          }
+		  // this.menu = user.user_id === "2A080F42-AE7F-407B-976E-DE5FA87BD277" || user.user_id === "28DB23AE-2976-47E0-9410-241A11EE1F88" ? MenuBypass : user.role.id === 2022 ? MenuPT : user.role.id === 2021 ? MenuLLDIKTI : user.role.id === 2024 ? MenuReadOnly : Menu;
+>>>>>>> 0fad092fa2ae79cdabb20319dc3d80b900b8ccf7
 		}
 		if (ENV === "development") {
 			this.menu = user.role.id === 2022 ? MenuPT : user.user_id === "28DB23AE-2976-47E0-9410-241A11EE1F88" ? MenuBypass : user.role.id === 2021 ? MenuLLDIKTI : user.role.id === 2024 ? MenuReadOnly : MenuPT;