Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨feat: add onboarding feature #8

Merged
merged 2 commits into from
Mar 4, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'Podo-Ticket-ver1.2.0' into feat(fe)/admin_onboarding
YBSeok authored Mar 4, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 58780a55babfdcafafa189bc376c939833acfa94
43 changes: 34 additions & 9 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { useState, useEffect } from "react";
import { BrowserRouter, Routes, Route, useLocation } from "react-router-dom";
import styled, { createGlobalStyle } from "styled-components";

import { AnimatePresence } from "framer-motion";

import PageWrapper from "./styles/animation/PageWrapper.tsx";
@@ -15,13 +16,17 @@ import TicketConfirmation from "./pages/user/TicketConfirmation.tsx";
import TicketScreen from "./pages/user/Ticket.tsx";
import SurveyLink from "./pages/user/SurveyLink.tsx";

import AdminAuth from './pages/admin/AdminAuth.tsx'
import AdminHome from './pages/admin/AdminHome.tsx'
import ManageLockingSeats from './pages/admin/ManageLockingSeats.tsx';
import RealtimeSeats from './pages/admin/RealtimeSeats.tsx'
import ReservedManange from './pages/admin/ReservedManage.tsx'
import OnsiteManage from './pages/admin/OnsiteManage.tsx'
import AdminSetting from './pages/admin/AdminSetting.tsx'
import AdminAuth from "./pages/admin/AdminAuth.tsx";
import AdminHome from "./pages/admin/AdminHome.tsx";
import ManageLockingSeats from "./pages/admin/ManageLockingSeats.tsx";
import RealtimeSeats from "./pages/admin/RealtimeSeats.tsx";
import ReservedManange from "./pages/admin/ReservedManage.tsx";
import ReservedAdd from "./pages/admin/ReservedAdd.tsx";
import ReservedEdit from "./pages/admin/ReservedEdit.tsx";
import ReservedCheck from "./pages/admin/ReservedCheck.tsx";
import OnsiteManage from "./pages/admin/OnsiteManage.tsx";
import AdminSetting from "./pages/admin/AdminSetting.tsx";

import OnboardingModal from './components/modal/OnboardingModal.tsx';

const GlobalStyle = createGlobalStyle`
@@ -125,8 +130,24 @@ function App() {
<Routes location={location} key={location.pathname}>
<Route path="/" element={<UserHome />} />
<Route path="/reserve" element={<OnSiteReserve />} />
<Route path="/select" element={<PageWrapper slideDirection="right"> <SelectSeats /> </PageWrapper>} />
<Route path="/confirm" element={<PageWrapper slideDirection="left"> <TicketConfirmation /> </PageWrapper>} />
<Route
path="/select"
element={
<PageWrapper slideDirection="right">
{" "}
<SelectSeats />{" "}
</PageWrapper>
}
/>
<Route
path="/confirm"
element={
<PageWrapper slideDirection="left">
{" "}
<TicketConfirmation />{" "}
</PageWrapper>
}
/>
<Route path="/ticket" element={<TicketScreen />} />

<Route path="/adminAuth" element={<AdminAuth />} />
@@ -136,6 +157,10 @@ function App() {
<Route path="/home/manage" element={<ManageLockingSeats />} />

<Route path="/reserved" element={<ReservedManange />} />
<Route path="/reserved/add" element={<ReservedAdd />} />
<Route path="/reserved/check" element={<ReservedCheck />} />
<Route path="/reserved/check/edit" element={<ReservedEdit />} />

<Route path="/onsite" element={<OnsiteManage />} />
<Route path="/setting" element={<AdminSetting />} />

You are viewing a condensed version of this merge commit. You can view the full changes here.