From 98858207e67692e60db02452c837d5ecb29f3b15 Mon Sep 17 00:00:00 2001
From: dat <dat.nguyen.supper@gmail.com>
Date: Fri, 23 Jun 2023 09:36:37 +0700
Subject: [PATCH] Onboarding update

---
 src/apps/onboarding/index.ts                                | 1 +
 src/apps/onboarding/{ => src}/assets/images/x-icon.svg      | 0
 .../onboarding/{ => src}/components/progress-bar/index.tsx  | 3 ++-
 .../{ => src}/components/progress-bar/styles.module.scss    | 2 +-
 .../onboarding/{ => src}/components/skill-tag/index.tsx     | 0
 .../{ => src}/components/skill-tag/styles.module.scss       | 0
 src/apps/onboarding/{ => src}/config/index.ts               | 0
 src/apps/onboarding/src/index.tsx                           | 1 +
 src/apps/onboarding/{ => src}/models/SkillInfo.ts           | 0
 src/apps/onboarding/{ => src}/onboarding.routes.tsx         | 0
 src/apps/onboarding/{ => src}/pages/onboarding/index.tsx    | 0
 .../{ => src}/pages/onboarding/styles.module.scss           | 0
 src/apps/onboarding/{ => src}/pages/skills/index.tsx        | 6 +++++-
 .../onboarding/{ => src}/pages/skills/styles.module.scss    | 0
 src/apps/onboarding/{ => src}/pages/start/index.tsx         | 6 +++++-
 .../onboarding/{ => src}/pages/start/styles.module.scss     | 0
 src/apps/onboarding/{ => src}/redux/actions/member.ts       | 0
 src/apps/onboarding/{ => src}/redux/reducers/index.ts       | 0
 src/apps/onboarding/{ => src}/redux/reducers/member.ts      | 0
 src/apps/onboarding/{ => src}/redux/store.ts                | 0
 src/apps/onboarding/{ => src}/services/skills.ts            | 0
 src/apps/onboarding/{ => src}/styles/global/_flex.scss      | 0
 src/apps/onboarding/{ => src}/styles/global/_index.scss     | 0
 src/apps/onboarding/{ => src}/styles/global/_layout.scss    | 0
 src/apps/platform/src/platform.routes.tsx                   | 2 +-
 25 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 src/apps/onboarding/index.ts
 rename src/apps/onboarding/{ => src}/assets/images/x-icon.svg (100%)
 rename src/apps/onboarding/{ => src}/components/progress-bar/index.tsx (91%)
 rename src/apps/onboarding/{ => src}/components/progress-bar/styles.module.scss (91%)
 rename src/apps/onboarding/{ => src}/components/skill-tag/index.tsx (100%)
 rename src/apps/onboarding/{ => src}/components/skill-tag/styles.module.scss (100%)
 rename src/apps/onboarding/{ => src}/config/index.ts (100%)
 create mode 100644 src/apps/onboarding/src/index.tsx
 rename src/apps/onboarding/{ => src}/models/SkillInfo.ts (100%)
 rename src/apps/onboarding/{ => src}/onboarding.routes.tsx (100%)
 rename src/apps/onboarding/{ => src}/pages/onboarding/index.tsx (100%)
 rename src/apps/onboarding/{ => src}/pages/onboarding/styles.module.scss (100%)
 rename src/apps/onboarding/{ => src}/pages/skills/index.tsx (97%)
 rename src/apps/onboarding/{ => src}/pages/skills/styles.module.scss (100%)
 rename src/apps/onboarding/{ => src}/pages/start/index.tsx (95%)
 rename src/apps/onboarding/{ => src}/pages/start/styles.module.scss (100%)
 rename src/apps/onboarding/{ => src}/redux/actions/member.ts (100%)
 rename src/apps/onboarding/{ => src}/redux/reducers/index.ts (100%)
 rename src/apps/onboarding/{ => src}/redux/reducers/member.ts (100%)
 rename src/apps/onboarding/{ => src}/redux/store.ts (100%)
 rename src/apps/onboarding/{ => src}/services/skills.ts (100%)
 rename src/apps/onboarding/{ => src}/styles/global/_flex.scss (100%)
 rename src/apps/onboarding/{ => src}/styles/global/_index.scss (100%)
 rename src/apps/onboarding/{ => src}/styles/global/_layout.scss (100%)

diff --git a/src/apps/onboarding/index.ts b/src/apps/onboarding/index.ts
new file mode 100644
index 000000000..6f39cd49b
--- /dev/null
+++ b/src/apps/onboarding/index.ts
@@ -0,0 +1 @@
+export * from './src'
diff --git a/src/apps/onboarding/assets/images/x-icon.svg b/src/apps/onboarding/src/assets/images/x-icon.svg
similarity index 100%
rename from src/apps/onboarding/assets/images/x-icon.svg
rename to src/apps/onboarding/src/assets/images/x-icon.svg
diff --git a/src/apps/onboarding/components/progress-bar/index.tsx b/src/apps/onboarding/src/components/progress-bar/index.tsx
similarity index 91%
rename from src/apps/onboarding/components/progress-bar/index.tsx
rename to src/apps/onboarding/src/components/progress-bar/index.tsx
index 3232b5972..e0672f03b 100644
--- a/src/apps/onboarding/components/progress-bar/index.tsx
+++ b/src/apps/onboarding/src/components/progress-bar/index.tsx
@@ -4,6 +4,7 @@ import styles from './styles.module.scss'
 
 interface ProgressBarProps {
     progress: number
+    label?: string
     className?: string
 }
 
@@ -15,7 +16,7 @@ export const ProgressBar: FC<ProgressBarProps> = (props: ProgressBarProps) => {
 
     return (
         <div className={props.className}>
-            <span>#/##</span>
+            <span>{props.label}</span>
             <div className={styles.wrap}>
                 <div
                     className='progress'
diff --git a/src/apps/onboarding/components/progress-bar/styles.module.scss b/src/apps/onboarding/src/components/progress-bar/styles.module.scss
similarity index 91%
rename from src/apps/onboarding/components/progress-bar/styles.module.scss
rename to src/apps/onboarding/src/components/progress-bar/styles.module.scss
index 1146056d9..47a45a27a 100644
--- a/src/apps/onboarding/components/progress-bar/styles.module.scss
+++ b/src/apps/onboarding/src/components/progress-bar/styles.module.scss
@@ -1,4 +1,4 @@
-@import '../../../../libs/ui/lib/styles/includes';
+@import '../../../../../libs/ui/lib/styles/includes';
 
 .wrap {
     background: $black-10;
diff --git a/src/apps/onboarding/components/skill-tag/index.tsx b/src/apps/onboarding/src/components/skill-tag/index.tsx
similarity index 100%
rename from src/apps/onboarding/components/skill-tag/index.tsx
rename to src/apps/onboarding/src/components/skill-tag/index.tsx
diff --git a/src/apps/onboarding/components/skill-tag/styles.module.scss b/src/apps/onboarding/src/components/skill-tag/styles.module.scss
similarity index 100%
rename from src/apps/onboarding/components/skill-tag/styles.module.scss
rename to src/apps/onboarding/src/components/skill-tag/styles.module.scss
diff --git a/src/apps/onboarding/config/index.ts b/src/apps/onboarding/src/config/index.ts
similarity index 100%
rename from src/apps/onboarding/config/index.ts
rename to src/apps/onboarding/src/config/index.ts
diff --git a/src/apps/onboarding/src/index.tsx b/src/apps/onboarding/src/index.tsx
new file mode 100644
index 000000000..245e2de14
--- /dev/null
+++ b/src/apps/onboarding/src/index.tsx
@@ -0,0 +1 @@
+export { onboardingRoutes } from './onboarding.routes'
diff --git a/src/apps/onboarding/models/SkillInfo.ts b/src/apps/onboarding/src/models/SkillInfo.ts
similarity index 100%
rename from src/apps/onboarding/models/SkillInfo.ts
rename to src/apps/onboarding/src/models/SkillInfo.ts
diff --git a/src/apps/onboarding/onboarding.routes.tsx b/src/apps/onboarding/src/onboarding.routes.tsx
similarity index 100%
rename from src/apps/onboarding/onboarding.routes.tsx
rename to src/apps/onboarding/src/onboarding.routes.tsx
diff --git a/src/apps/onboarding/pages/onboarding/index.tsx b/src/apps/onboarding/src/pages/onboarding/index.tsx
similarity index 100%
rename from src/apps/onboarding/pages/onboarding/index.tsx
rename to src/apps/onboarding/src/pages/onboarding/index.tsx
diff --git a/src/apps/onboarding/pages/onboarding/styles.module.scss b/src/apps/onboarding/src/pages/onboarding/styles.module.scss
similarity index 100%
rename from src/apps/onboarding/pages/onboarding/styles.module.scss
rename to src/apps/onboarding/src/pages/onboarding/styles.module.scss
diff --git a/src/apps/onboarding/pages/skills/index.tsx b/src/apps/onboarding/src/pages/skills/index.tsx
similarity index 97%
rename from src/apps/onboarding/pages/skills/index.tsx
rename to src/apps/onboarding/src/pages/skills/index.tsx
index ad2c6f95c..1a874eaa3 100644
--- a/src/apps/onboarding/pages/skills/index.tsx
+++ b/src/apps/onboarding/src/pages/skills/index.tsx
@@ -118,7 +118,11 @@ const PageSkillsContent: FC<{
                 </div>
             </div>
 
-            <ProgressBar className={styles.ProgressBar} progress={0.5} />
+            <ProgressBar
+                className={styles.ProgressBar}
+                progress={2.0 / 7}
+                label='2/7'
+            />
 
             <div className={classNames('d-flex justify-content-between', styles.blockFooter)}>
                 <Button
diff --git a/src/apps/onboarding/pages/skills/styles.module.scss b/src/apps/onboarding/src/pages/skills/styles.module.scss
similarity index 100%
rename from src/apps/onboarding/pages/skills/styles.module.scss
rename to src/apps/onboarding/src/pages/skills/styles.module.scss
diff --git a/src/apps/onboarding/pages/start/index.tsx b/src/apps/onboarding/src/pages/start/index.tsx
similarity index 95%
rename from src/apps/onboarding/pages/start/index.tsx
rename to src/apps/onboarding/src/pages/start/index.tsx
index fadbf1ca8..add10ccb9 100644
--- a/src/apps/onboarding/pages/start/index.tsx
+++ b/src/apps/onboarding/src/pages/start/index.tsx
@@ -62,7 +62,11 @@ export const PageStart: FC<{}> = () => {
                 </div>
             </div>
 
-            <ProgressBar className={styles.ProgressBar} progress={0.5} />
+            <ProgressBar
+                className={styles.ProgressBar}
+                progress={1.0 / 7}
+                label='1/7'
+            />
 
             <div className={classNames('d-flex justify-content-end', styles.blockFooter)}>
                 <Button
diff --git a/src/apps/onboarding/pages/start/styles.module.scss b/src/apps/onboarding/src/pages/start/styles.module.scss
similarity index 100%
rename from src/apps/onboarding/pages/start/styles.module.scss
rename to src/apps/onboarding/src/pages/start/styles.module.scss
diff --git a/src/apps/onboarding/redux/actions/member.ts b/src/apps/onboarding/src/redux/actions/member.ts
similarity index 100%
rename from src/apps/onboarding/redux/actions/member.ts
rename to src/apps/onboarding/src/redux/actions/member.ts
diff --git a/src/apps/onboarding/redux/reducers/index.ts b/src/apps/onboarding/src/redux/reducers/index.ts
similarity index 100%
rename from src/apps/onboarding/redux/reducers/index.ts
rename to src/apps/onboarding/src/redux/reducers/index.ts
diff --git a/src/apps/onboarding/redux/reducers/member.ts b/src/apps/onboarding/src/redux/reducers/member.ts
similarity index 100%
rename from src/apps/onboarding/redux/reducers/member.ts
rename to src/apps/onboarding/src/redux/reducers/member.ts
diff --git a/src/apps/onboarding/redux/store.ts b/src/apps/onboarding/src/redux/store.ts
similarity index 100%
rename from src/apps/onboarding/redux/store.ts
rename to src/apps/onboarding/src/redux/store.ts
diff --git a/src/apps/onboarding/services/skills.ts b/src/apps/onboarding/src/services/skills.ts
similarity index 100%
rename from src/apps/onboarding/services/skills.ts
rename to src/apps/onboarding/src/services/skills.ts
diff --git a/src/apps/onboarding/styles/global/_flex.scss b/src/apps/onboarding/src/styles/global/_flex.scss
similarity index 100%
rename from src/apps/onboarding/styles/global/_flex.scss
rename to src/apps/onboarding/src/styles/global/_flex.scss
diff --git a/src/apps/onboarding/styles/global/_index.scss b/src/apps/onboarding/src/styles/global/_index.scss
similarity index 100%
rename from src/apps/onboarding/styles/global/_index.scss
rename to src/apps/onboarding/src/styles/global/_index.scss
diff --git a/src/apps/onboarding/styles/global/_layout.scss b/src/apps/onboarding/src/styles/global/_layout.scss
similarity index 100%
rename from src/apps/onboarding/styles/global/_layout.scss
rename to src/apps/onboarding/src/styles/global/_layout.scss
diff --git a/src/apps/platform/src/platform.routes.tsx b/src/apps/platform/src/platform.routes.tsx
index 88a498cc5..eb69e5806 100644
--- a/src/apps/platform/src/platform.routes.tsx
+++ b/src/apps/platform/src/platform.routes.tsx
@@ -8,7 +8,7 @@ import { selfServiceRoutes } from '~/apps/self-service'
 import { profilesRoutes } from '~/apps/profiles'
 import { talentSearchRoutes } from '~/apps/talent-search'
 import { accountsRoutes } from '~/apps/accounts'
-import { onboardingRoutes } from '~/apps/onboarding/onboarding.routes'
+import { onboardingRoutes } from '~/apps/onboarding'
 
 const Home: LazyLoadedComponent = lazyLoad(() => import('./routes/home'), 'HomePage')