Skip to content

Commit

Permalink
Merge pull request #22 from mahajanmahesh935/updated-UserService
Browse files Browse the repository at this point in the history
Task #215234 Updating User Service
  • Loading branch information
paritshivani authored Mar 14, 2024
2 parents d30cf24 + c52ee02 commit 641bd60
Show file tree
Hide file tree
Showing 4 changed files with 431 additions and 89 deletions.
80 changes: 46 additions & 34 deletions packages/nulp_elite/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,21 @@ import Sample from "pages/Sample";
import Home from "pages/Home";
import Courses from "pages/Courses";
import Contents from "pages/Contents";
import { NativeBaseProvider,Box, Stack, VStack,Text, HStack, Button, extendTheme,
Actionsheet,ScrollView } from "native-base";
import {
NativeBaseProvider,
Box,
Stack,
VStack,
Text,
HStack,
Button,
extendTheme,
Actionsheet,
ScrollView,
} from "native-base";
import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
import { DEFAULT_THEME, initializeI18n,H2, } from "@shiksha/common-lib";
import { useTranslation } from 'react-i18next'
import { DEFAULT_THEME, initializeI18n, H2 } from "@shiksha/common-lib";
import { useTranslation } from "react-i18next";
import Framework from "pages/Frmework";
import User from "pages/User";
import Registration from "pages/Registration";
Expand All @@ -20,9 +30,9 @@ function App() {
const [search, setSearch] = React.useState(true);
const [searchState, setSearchState] = React.useState(false);
// const theme = extendTheme(DEFAULT_THEME);
const colors = '';
const colors = "";
const [sortArray, setSortArray] = React.useState([]);

const routes = [
{
moduleName: "nulp_elite",
Expand All @@ -38,46 +48,50 @@ function App() {
moduleName: "nulp_elite",
path: "/all",
component: Courses,
},,{
},
{
moduleName: "nulp_elite",
path: "/sample",
component: Sample,
},
{
moduleName: "nulp_elite",
path: "/profile",
component: Profile,
},
{
moduleName: "nulp_elite",
path: "/framework",
component: Framework,
},
{
moduleName: "nulp_elite",
path: "/user",
component: User,
{
moduleName: "nulp_elite",
path: "/profile",
component: Profile,
},
{
moduleName: "nulp_elite",
path: "/framework",
component: Framework,
},
{
moduleName: "nulp_elite",

path: "/registration",
component: Registration,
},
{
moduleName: "nulp_elite",
path: "/userPrefData",
component: UserPrefData,
},
path: "/registration",
component: Registration,
},
{
moduleName: "nulp_elite",
path: "/userPrefData",
component: UserPrefData,
},
{
moduleName: "nulp_elite",
path: "/user",
component: User,
},
];

// return(
// // <Box></Box>
// <NativeBaseProvider >
// <Router routes={routes}>
// </Router>

// </Router>
// </NativeBaseProvider>
// // <NativeBaseProvider ><Router><Sample /></Router> </NativeBaseProvider>

// );
// );
// <NativeBaseProvider > <Sample /></NativeBaseProvider>;

// <AppShell routes={routes} AuthComponent={LoginComponent} />;
Expand All @@ -100,6 +114,4 @@ function App() {
);
}



export default App;
Loading

0 comments on commit 641bd60

Please sign in to comment.