Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
hanazaq committed Nov 24, 2024
2 parents 3bfa063 + 60619e4 commit cc77224
Show file tree
Hide file tree
Showing 3 changed files with 215 additions and 12 deletions.
41 changes: 31 additions & 10 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,15 @@
},
"dependencies": {
"@chakra-ui/icons": "^2.1.1",
<<<<<<<<< Temporary merge branch 1
"@chakra-ui/react": "^2.8.2",
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.10.4",
"prop-types": "^15.8.1",
"axios": "^1.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^3.1.4",
"react-router-dom": "^6.3.0",
"sass": "^1.54.5",
"@vitejs/plugin-react": "^2.0.1",
"vite": "^3.0.9",
=========
"@chakra-ui/react": "^2.10.4",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
>>>>>>>>> Temporary merge branch 2
"@reduxjs/toolkit": "^2.2.3",
"react-redux": "^9.1.1",
"react-lazy-load": "^4.0.1",
Expand All @@ -45,7 +42,31 @@
"@tanstack/react-router": "^1.31.0",
"@tanstack/router-devtools": "^1.31.1",
"@tanstack/router-vite-plugin": "^1.30.0",
"js-cookie": "^3.0.5"
"@vitejs/plugin-react": "^2.0.1",
"axios": "^1.6.8",
<<<<<<<<< Temporary merge branch 1
"js-cookie": "^3.0.5",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-body-highlighter": "^2.0.5",
"react-dom": "^18.2.0",
"react-error-boundary": "^3.1.4",
"react-lazy-load": "^4.0.1",
"react-modal": "^3.16.1",
=========
"framer-motion": "^11.11.17",
"js-cookie": "^3.0.5",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^3.1.4",
"react-lazy-load": "^4.0.1",
>>>>>>>>> Temporary merge branch 2
"react-redux": "^9.1.1",
"react-router-dom": "^6.3.0",
"react-select": "^5.8.0",
"sass": "^1.54.5",
"vite": "^3.0.9"
},
"devDependencies": {
"@babel/core": "^7.18.13",
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { loginRoute } from './routes/login'
import { profileRoute } from './routes/profile'
import { programRoute } from './routes/program'
import { progressRoute } from './routes/progress'
import { searchRoute } from './routes/search'
import {searchRoute} from './routes/search'
import React from 'react'
import { registerRoute } from './routes/register'
import {
Expand All @@ -27,7 +27,7 @@ const routeTree = rootRoute.addChildren([
registerRoute,
profileRoute,
programRoute,
progressRoute, ,
progressRoute,
searchRoute
])

Expand Down
182 changes: 182 additions & 0 deletions frontend/src/routeTree.gen.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
/* prettier-ignore-start */

/* eslint-disable */

// @ts-nocheck

// noinspection JSUnusedGlobalSymbols

// This file is auto-generated by TanStack Router

// Import Routes

import { Route as rootRoute } from './routes/__root'
import { Route as SearchImport } from './routes/search'
import { Route as RegisterImport } from './routes/register'
import { Route as ProfileImport } from './routes/profile'
import { Route as LoginImport } from './routes/login'
import { Route as IndexImport } from './routes/index'

// Create/Update Routes

const SearchRoute = SearchImport.update({
id: '/search',
path: '/search',
getParentRoute: () => rootRoute,
} as any)

const RegisterRoute = RegisterImport.update({
id: '/register',
path: '/register',
getParentRoute: () => rootRoute,
} as any)

const ProfileRoute = ProfileImport.update({
id: '/profile',
path: '/profile',
getParentRoute: () => rootRoute,
} as any)

const LoginRoute = LoginImport.update({
id: '/login',
path: '/login',
getParentRoute: () => rootRoute,
} as any)

const IndexRoute = IndexImport.update({
id: '/',
path: '/',
getParentRoute: () => rootRoute,
} as any)

// Populate the FileRoutesByPath interface

declare module '@tanstack/react-router' {
interface FileRoutesByPath {
'/': {
id: '/'
path: '/'
fullPath: '/'
preLoaderRoute: typeof IndexImport
parentRoute: typeof rootRoute
}
'/login': {
id: '/login'
path: '/login'
fullPath: '/login'
preLoaderRoute: typeof LoginImport
parentRoute: typeof rootRoute
}
'/profile': {
id: '/profile'
path: '/profile'
fullPath: '/profile'
preLoaderRoute: typeof ProfileImport
parentRoute: typeof rootRoute
}
'/register': {
id: '/register'
path: '/register'
fullPath: '/register'
preLoaderRoute: typeof RegisterImport
parentRoute: typeof rootRoute
}
'/search': {
id: '/search'
path: '/search'
fullPath: '/search'
preLoaderRoute: typeof SearchImport
parentRoute: typeof rootRoute
}
}
}

// Create and export the route tree

export interface FileRoutesByFullPath {
'/': typeof IndexRoute
'/login': typeof LoginRoute
'/profile': typeof ProfileRoute
'/register': typeof RegisterRoute
'/search': typeof SearchRoute
}

export interface FileRoutesByTo {
'/': typeof IndexRoute
'/login': typeof LoginRoute
'/profile': typeof ProfileRoute
'/register': typeof RegisterRoute
'/search': typeof SearchRoute
}

export interface FileRoutesById {
__root__: typeof rootRoute
'/': typeof IndexRoute
'/login': typeof LoginRoute
'/profile': typeof ProfileRoute
'/register': typeof RegisterRoute
'/search': typeof SearchRoute
}

export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath
fullPaths: '/' | '/login' | '/profile' | '/register' | '/search'
fileRoutesByTo: FileRoutesByTo
to: '/' | '/login' | '/profile' | '/register' | '/search'
id: '__root__' | '/' | '/login' | '/profile' | '/register' | '/search'
fileRoutesById: FileRoutesById
}

export interface RootRouteChildren {
IndexRoute: typeof IndexRoute
LoginRoute: typeof LoginRoute
ProfileRoute: typeof ProfileRoute
RegisterRoute: typeof RegisterRoute
SearchRoute: typeof SearchRoute
}

const rootRouteChildren: RootRouteChildren = {
IndexRoute: IndexRoute,
LoginRoute: LoginRoute,
ProfileRoute: ProfileRoute,
RegisterRoute: RegisterRoute,
SearchRoute: SearchRoute,
}

export const routeTree = rootRoute
._addFileChildren(rootRouteChildren)
._addFileTypes<FileRouteTypes>()

/* prettier-ignore-end */

/* ROUTE_MANIFEST_START
{
"routes": {
"__root__": {
"filePath": "__root.jsx",
"children": [
"/",
"/login",
"/profile",
"/register",
"/search"
]
},
"/": {
"filePath": "index.jsx"
},
"/login": {
"filePath": "login.jsx"
},
"/profile": {
"filePath": "profile.jsx"
},
"/register": {
"filePath": "register.jsx"
},
"/search": {
"filePath": "search.jsx"
}
}
}
ROUTE_MANIFEST_END */

0 comments on commit cc77224

Please sign in to comment.