leon 1 anno fa
parent
commit
736fbe3a45

File diff suppressed because it is too large
+ 0 - 0
ios/main.jsbundle


+ 6 - 6
src/context/locales/en.js

@@ -120,7 +120,7 @@ export default {
             limit_time_offer: 'Limit-Time Offer',
             next: 'Next',
             alert_title: 'Premium Access Required',
-            alert_content: 'Grow your faststreak to {{day}} {{day_unit}} to unlock.',
+            alert_content: 'Log another fasting and grow your faststreak to {{day}} {{day_unit}} to unlock.',
             alert_btn: 'Got it',
         },
         suggest: {
@@ -191,13 +191,13 @@ export default {
             },
             sleep_schedule: {
                 title: 'Sleep Schedule',
-                desc: 'Your previous sleep schedule was {{start_time}} - {{end_time}}.\nDo you want to set a new schedule?',
+                desc: 'Your previous sleep schedule was {{start_time}} - {{end_time}}.Do you want to set a new schedule?',
                 confirm: 'Set a new schedule',
                 cancel: 'Keep old schedule'
             },
             stay_qualified: {
                 title: 'Streaks Updated',
-                desc: 'You\'re on a {{fast_streak_day}}-day faststreak \nand on a {{sleep_streak_day}}-day sleepstreak.',
+                desc: 'You\'re on a {{fast_streak_day}}-day faststreak and on a {{sleep_streak_day}}-day sleepstreak.',
                 // desc:'You\'re on a {{fast_streak_day}}-day fasting streak and a {{sleep_streak_day}}-day sleep streak.\nKeep \'em going to stay in the game.',
                 btn: 'Keep them going',
             },
@@ -496,9 +496,9 @@ export default {
                 not_determined: 'Not Determined',
                 faststreak: 'Faststreak',
                 sleepstreak: 'Sleepstreak',
-                alert_title: 'Begin Your Sleepstreak',
-                alert_content: 'Begin growing your sleepstreak \nalong with your faststreak.',
-                alert_confirm: 'Got it!',
+                alert_title: 'Don\'t forget to log your sleep tonight too!',
+                alert_content: 'To keep your premium access and make the most of it, your sleepstreak must be activated and grow along with your faststreak.',
+                alert_confirm: 'Roger that',
                 heads_up: 'Heads-up',
             },
             change_tz_alert: {

+ 9 - 9
src/context/locales/zh.js

@@ -123,7 +123,7 @@ export default {
             limit_time_offer: '限时免费',
             next:'下一步',
             alert_title:'需要高级权限',
-            alert_content:'断食连续打卡{{day}} 天可解锁。',
+            alert_content:'再次完成断食打卡并连续{{day}}天可解锁。',
             alert_btn:'我知道了',
         },
         suggest: {
@@ -174,17 +174,17 @@ export default {
         check_access: {
             non_access: {
                 title: '连续纪录更新',
-                desc: '您已连续{{day}}天完成断食记录。',//'You\'re on a {{day}}-day streak.\n{{day_left}} more {{day_unit}} until unlocking \'Fasting with sleep.\'',
+                desc: '您已连续{{day}}天完成断食打卡。',//'You\'re on a {{day}}-day streak.\n{{day_left}} more {{day_unit}} until unlocking \'Fasting with sleep.\'',
                 btn: '继续保持'
             },
             gain_access:{
                 title:'高级功能已解锁',
-                desc:'{{reason}}您已解锁“断食与睡眠”功能。\n现在要启用高级功能吗?',
+                desc:'{{reason}}您已解锁“断食与睡眠”功能。现在要启用高级功能吗?',
                 // desc:'You\'ve unlocked \'Fasting with Sleep\' since you\'re on a {{day}}-day streak.\nAre you ready to up the game?',
                 upgrade:'启用"断食与睡眠"',
                 upgrade_desc:'{{time}} 后失效',
                 stay_btn:'保持仅断食',
-                reason:'因您已连续{{day}}天完成断食记录,',
+                reason:'因您已连续{{day}}天完成断食打卡,',
                 // more:'Learn more'
             },
             upgrade_pro:{
@@ -194,13 +194,13 @@ export default {
             },
             sleep_schedule:{
                 title:'睡眠日程',
-                desc:'您此前的睡眠日程为 {{start_time}} - {{end_time}}。\n是否要设置新日程?',
+                desc:'您此前的睡眠日程为 {{start_time}} - {{end_time}}。是否要设置新日程?',
                 confirm:'设置新日程',
                 cancel:'保持老日程'
             },
             stay_qualified:{
                 title:'连续纪录已更新',
-                desc:'您已连续{{fast_streak_day}}天完成断食记录、\n连续{{sleep_streak_day}}天完成睡眠记录。',
+                desc:'您已连续{{fast_streak_day}}天完成断食打卡、连续{{sleep_streak_day}}天完成睡眠打卡。',
                 // desc:'You\'re on a {{fast_streak_day}}-day fasting streak and a {{sleep_streak_day}}-day sleep streak.\nKeep \'em going to stay in the game.',
                 btn:'继续保持',
             },
@@ -498,9 +498,9 @@ export default {
                 not_determined: '待定',
                 faststreak:'断食连续',
                 sleepstreak:'睡眠连续',
-                alert_title:'开启睡眠连续纪录',
-                alert_content:'让你的睡眠连续纪录\n与断食连续纪录一起同步增长。',
-                alert_confirm:'我知道了',
+                alert_title:'别忘了今晚也要睡眠打卡!',
+                alert_content:'为了保障您的高级体验, 您需要激活睡眠连续纪录, 并让睡眠与断食连续打卡天数保持同步增长。',
+                alert_confirm:'好的收到',
                 heads_up:'提示',
             },
             change_tz_alert: {

+ 3 - 4
src/features/trackTimeDuration/components/CheckAccess.scss

@@ -17,7 +17,7 @@
 
 .fast_alert_title {
     color: #fff;
-    font-size: 56px;
+    font-size: 48px;
     line-height: 60px;
     font-weight: bold;
     margin-bottom: 20px;
@@ -27,9 +27,8 @@
 .fast_alert_detail {
     color: #fff;
     opacity: 0.6;
-    font-size: 28px;
+    font-size: 32px;
     line-height: 48px;
-    font-weight: bold;
     margin-bottom: 20px;
     text-align: center;
 }
@@ -40,7 +39,7 @@
     border-radius: 48px;
     color: #000D1FFF;
     background-color: $fastColor;
-    font-size: 30px;
+    font-size: 32px;
     font-weight: bold;
     display: flex;
     align-items: center;

+ 34 - 34
src/features/trackTimeDuration/components/IndexConsole.tsx

@@ -523,15 +523,15 @@ export default function IndexConsole(props: { record: any, count: number }) {
                     if (process.env.TARO_ENV == 'weapp') {
                         debugger
                         if (permission.wxPubFollow) {
-                            showAlert({
-                                title: t('feature.track_time_duration.reminders.fast_end_title'),
-                                content:
-                                    t('feature.track_time_duration.reminders.enable_post_fast_content',
-                                        { date: TimeFormatter.dateDescription(t1 + fastDuration, true), time: TimeFormatter.timeDescription(t1 + fastDuration) }
-                                    ),
-                                showCancel: false,
-                                confirmText: t('feature.track_time_duration.reminders.ok')
-                            })
+                            // showAlert({
+                            //     title: t('feature.track_time_duration.reminders.fast_end_title'),
+                            //     content:
+                            //         t('feature.track_time_duration.reminders.enable_post_fast_content',
+                            //             { date: TimeFormatter.dateDescription(t1 + fastDuration, true), time: TimeFormatter.timeDescription(t1 + fastDuration) }
+                            //         ),
+                            //     showCancel: false,
+                            //     confirmText: t('feature.track_time_duration.reminders.ok')
+                            // })
                         }
                         else {
                             showAlert({
@@ -550,15 +550,15 @@ export default function IndexConsole(props: { record: any, count: number }) {
                         JPush.isNotificationEnabled((res) => {
                             if (res) {
                                 getLocalPush()
-                                showAlert({
-                                    title: t('feature.track_time_duration.reminders.fast_end_title'),
-                                    content:
-                                        t('feature.track_time_duration.reminders.enable_post_fast_content',
-                                            { date: TimeFormatter.dateDescription(t1 + fastDuration, true), time: TimeFormatter.timeDescription(t1 + fastDuration) }
-                                        ),
-                                    showCancel: false,
-                                    confirmText: t('feature.track_time_duration.reminders.ok')
-                                })
+                                // showAlert({
+                                //     title: t('feature.track_time_duration.reminders.fast_end_title'),
+                                //     content:
+                                //         t('feature.track_time_duration.reminders.enable_post_fast_content',
+                                //             { date: TimeFormatter.dateDescription(t1 + fastDuration, true), time: TimeFormatter.timeDescription(t1 + fastDuration) }
+                                //         ),
+                                //     showCancel: false,
+                                //     confirmText: t('feature.track_time_duration.reminders.ok')
+                                // })
                             }
                             else {
                                 showAlert({
@@ -594,14 +594,14 @@ export default function IndexConsole(props: { record: any, count: number }) {
                     refreshDayNight()
                     if (process.env.TARO_ENV == 'weapp') {
                         if (permission.wxPubFollow) {
-                            showAlert({
-                                title: t('feature.track_time_duration.reminders.wake_title'),
-                                content:
-                                    t('feature.track_time_duration.reminders.enable_post_sleep_content',
-                                        { date: TimeFormatter.dateDescription(t1 + sleepDuration, true), time: TimeFormatter.timeDescription(t1 + sleepDuration) }),
-                                showCancel: false,
-                                confirmText: t('feature.track_time_duration.reminders.ok')
-                            })
+                            // showAlert({
+                            //     title: t('feature.track_time_duration.reminders.wake_title'),
+                            //     content:
+                            //         t('feature.track_time_duration.reminders.enable_post_sleep_content',
+                            //             { date: TimeFormatter.dateDescription(t1 + sleepDuration, true), time: TimeFormatter.timeDescription(t1 + sleepDuration) }),
+                            //     showCancel: false,
+                            //     confirmText: t('feature.track_time_duration.reminders.ok')
+                            // })
                         }
                         else {
 
@@ -621,14 +621,14 @@ export default function IndexConsole(props: { record: any, count: number }) {
                         JPush.isNotificationEnabled((res) => {
                             if (res) {
                                 getLocalPush()
-                                showAlert({
-                                    title: t('feature.track_time_duration.reminders.wake_title'),
-                                    content:
-                                        t('feature.track_time_duration.reminders.enable_post_sleep_content',
-                                            { date: TimeFormatter.dateDescription(t1 + sleepDuration, true), time: TimeFormatter.timeDescription(t1 + sleepDuration) }),
-                                    showCancel: false,
-                                    confirmText: t('feature.track_time_duration.reminders.ok')
-                                })
+                                // showAlert({
+                                //     title: t('feature.track_time_duration.reminders.wake_title'),
+                                //     content:
+                                //         t('feature.track_time_duration.reminders.enable_post_sleep_content',
+                                //             { date: TimeFormatter.dateDescription(t1 + sleepDuration, true), time: TimeFormatter.timeDescription(t1 + sleepDuration) }),
+                                //     showCancel: false,
+                                //     confirmText: t('feature.track_time_duration.reminders.ok')
+                                // })
                             }
                             else {
                                 showAlert({

+ 28 - 29
src/pages/clock/Clock.tsx

@@ -451,7 +451,6 @@ export default function Page() {
     }
 
     function getCheckData() {
-        debugger
         Promise.all([getClocks(), getPlans()]).then((list) => {
             setErrorPage(false)
             setCheckData(list)
@@ -609,14 +608,14 @@ export default function Page() {
     global.popScheduleAlert = (scenario, startTime) => {
         if (process.env.TARO_ENV == 'weapp') {
             if (permission.wxPubFollow) {
-                showAlert({
-                    title: t('feature.track_time_duration.reminders.schedule_title'),
-                    content: scenario.name == 'FAST' ?
-                        t('feature.track_time_duration.reminders.enable_schedule_fast_content', { time: startTime }) :
-                        t('feature.track_time_duration.reminders.enable_schedule_sleep_content', { time: startTime }),
-                    showCancel: false,
-                    confirmText: t('feature.track_time_duration.reminders.ok')
-                })
+                // showAlert({
+                //     title: t('feature.track_time_duration.reminders.schedule_title'),
+                //     content: scenario.name == 'FAST' ?
+                //         t('feature.track_time_duration.reminders.enable_schedule_fast_content', { time: startTime }) :
+                //         t('feature.track_time_duration.reminders.enable_schedule_sleep_content', { time: startTime }),
+                //     showCancel: false,
+                //     confirmText: t('feature.track_time_duration.reminders.ok')
+                // })
             }
             else {
                 showAlert({
@@ -636,14 +635,14 @@ export default function Page() {
         else {
             JPush.isNotificationEnabled((res) => {
                 if (res) {
-                    showAlert({
-                        title: t('feature.track_time_duration.reminders.schedule_title'),
-                        content: scenario.name == 'FAST' ?
-                            t('feature.track_time_duration.reminders.enable_schedule_fast_content', { time: startTime }) :
-                            t('feature.track_time_duration.reminders.enable_schedule_sleep_content', { time: startTime }),
-                        showCancel: false,
-                        confirmText: t('feature.track_time_duration.reminders.ok')
-                    })
+                    // showAlert({
+                    //     title: t('feature.track_time_duration.reminders.schedule_title'),
+                    //     content: scenario.name == 'FAST' ?
+                    //         t('feature.track_time_duration.reminders.enable_schedule_fast_content', { time: startTime }) :
+                    //         t('feature.track_time_duration.reminders.enable_schedule_sleep_content', { time: startTime }),
+                    //     showCancel: false,
+                    //     confirmText: t('feature.track_time_duration.reminders.ok')
+                    // })
                 }
                 else {
                     showAlert({
@@ -668,12 +667,12 @@ export default function Page() {
     global.popMixScheduleAlert = (time1, time2) => {
         if (process.env.TARO_ENV == 'weapp') {
             if (permission.wxPubFollow) {
-                showAlert({
-                    title: t('feature.track_time_duration.reminders.schedule_title'),
-                    content: t('feature.track_time_duration.reminders.enable_schedule_mix_content', { time1: time1, time2: time2 }),
-                    showCancel: false,
-                    confirmText: t('feature.track_time_duration.reminders.ok')
-                })
+                // showAlert({
+                //     title: t('feature.track_time_duration.reminders.schedule_title'),
+                //     content: t('feature.track_time_duration.reminders.enable_schedule_mix_content', { time1: time1, time2: time2 }),
+                //     showCancel: false,
+                //     confirmText: t('feature.track_time_duration.reminders.ok')
+                // })
             }
             else {
                 showAlert({
@@ -694,12 +693,12 @@ export default function Page() {
         else {
             JPush.isNotificationEnabled((res) => {
                 if (res) {
-                    showAlert({
-                        title: t('feature.track_time_duration.reminders.schedule_title'),
-                        content: t('feature.track_time_duration.reminders.enable_schedule_mix_content', { time1: time1, time2: time2 }),
-                        showCancel: false,
-                        confirmText: t('feature.track_time_duration.reminders.ok')
-                    })
+                    // showAlert({
+                    //     title: t('feature.track_time_duration.reminders.schedule_title'),
+                    //     content: t('feature.track_time_duration.reminders.enable_schedule_mix_content', { time1: time1, time2: time2 }),
+                    //     showCancel: false,
+                    //     confirmText: t('feature.track_time_duration.reminders.ok')
+                    // })
                 }
                 else {
                     showAlert({

+ 26 - 26
src/pages/clock/SetGoal.tsx

@@ -361,20 +361,20 @@ export default function SetGoal() {
             JPush.isNotificationEnabled((res) => {
                 if (res) {
                     getLocalPush();
-                    showAlert({
-                        title: t('feature.track_time_duration.reminders.schedule_title'),
-                        content: scenario.name == 'FAST' ?
-                            t('feature.track_time_duration.reminders.enable_schedule_fast_content', { time: startTime }) :
-                            t('feature.track_time_duration.reminders.enable_schedule_sleep_content', { time: startTime }),
-                        showCancel: false,
-                        confirmText: t('feature.track_time_duration.reminders.ok'),
-                        cancel: () => {
-                            navigation.popToTop()
-                        },
-                        confirm: () => {
-                            navigation.popToTop()
-                        },
-                    })
+                    // showAlert({
+                    //     title: t('feature.track_time_duration.reminders.schedule_title'),
+                    //     content: scenario.name == 'FAST' ?
+                    //         t('feature.track_time_duration.reminders.enable_schedule_fast_content', { time: startTime }) :
+                    //         t('feature.track_time_duration.reminders.enable_schedule_sleep_content', { time: startTime }),
+                    //     showCancel: false,
+                    //     confirmText: t('feature.track_time_duration.reminders.ok'),
+                    //     cancel: () => {
+                    //         navigation.popToTop()
+                    //     },
+                    //     confirm: () => {
+                    //         navigation.popToTop()
+                    //     },
+                    // })
                 }
                 else {
                     showAlert({
@@ -409,18 +409,18 @@ export default function SetGoal() {
             JPush.isNotificationEnabled((res) => {
                 if (res) {
                     getLocalPush();
-                    showAlert({
-                        title: t('feature.track_time_duration.reminders.schedule_title'),
-                        content: t('feature.track_time_duration.reminders.enable_schedule_mix_content', { time1: time1, time2: time2 }),
-                        showCancel: false,
-                        confirmText: t('feature.track_time_duration.reminders.ok'),
-                        cancel: () => {
-                            navigation.popToTop()
-                        },
-                        confirm: () => {
-                            navigation.popToTop()
-                        },
-                    })
+                    // showAlert({
+                    //     title: t('feature.track_time_duration.reminders.schedule_title'),
+                    //     content: t('feature.track_time_duration.reminders.enable_schedule_mix_content', { time1: time1, time2: time2 }),
+                    //     showCancel: false,
+                    //     confirmText: t('feature.track_time_duration.reminders.ok'),
+                    //     cancel: () => {
+                    //         navigation.popToTop()
+                    //     },
+                    //     confirm: () => {
+                    //         navigation.popToTop()
+                    //     },
+                    // })
                 }
                 else {
                     showAlert({

+ 2 - 0
src/pages/clock/Suggest.config.ts

@@ -3,5 +3,7 @@ export default definePageConfig({
         // 'ec-canvas': '../../lib/ec-canvas/ec-canvas',
         // 'demo':'../../components/demo'
     },
+    "disableScroll": true,
     "navigationBarTitleText": ""
+
 })

+ 22 - 13
src/pages/clock/Suggest.tsx

@@ -14,6 +14,7 @@ import Footer from "@/components/layout/Footer";
 import { IconCheck } from "@/components/basic/Icons";
 import Rings2, { BgRing, RingCommon, TargetRing } from '@/features/trackTimeDuration/components/Rings';
 import { useTranslation } from "react-i18next";
+import Taro from "@tarojs/taro";
 
 let ScrollViewRN
 if (process.env.TARO_ENV === 'rn') {
@@ -44,6 +45,7 @@ export default function Suggest() {
     const [scrollTop, setScrollTop] = useState(0)
     const [fastRecommendIndex, setFastRecommendIndex] = useState(-1)
     const [fastLastIndex, setFastLastIndex] = useState(-1)
+    const [scrollHeight, setScrollHeight] = useState(0)
     const { t } = useTranslation()
     const scrollViewRef = useRef(null);
 
@@ -111,11 +113,18 @@ export default function Suggest() {
             setFastLastIndex(lastIndex)
             setSuggestItem(array)
             setSuggestIndex(currentIndex)
-            setScrollTop(currentIndex * rpxToPx(244) + 50)
-            if (process.env.TARO_ENV=='rn'){
-                setTimeout(()=>{
-                    (scrollViewRef.current as any).scrollTo({x:0,y:currentIndex * rpxToPx(244)+20,animated:true})
-                },500)
+            setScrollTop(currentIndex * rpxToPx(264) - 30)
+            if (process.env.TARO_ENV == 'rn') {
+                setTimeout(() => {
+                    (scrollViewRef.current as any).scrollTo({ x: 0, y: currentIndex * rpxToPx(264) - 30, animated: true })
+                }, 500)
+            }
+            else {
+                setTimeout(() => {
+                    Taro.createSelectorQuery().select('#myScrollView').boundingClientRect((rect) => {
+                        setScrollHeight(Taro.getSystemInfoSync().windowHeight-(rect as any).top-rpxToPx(188)-40);
+                    }).exec()
+                }, 100)
             }
         }
         else if (pageStep == 3) {
@@ -293,7 +302,7 @@ export default function Suggest() {
 
         var minutes: string[] = []
         for (let i = min; i <= max; i += step) {
-            minutes.push(i + ' '+t('feature.suggest.mins'))
+            minutes.push(i + ' ' + t('feature.suggest.mins'))
         }
         return [minutes]
     }
@@ -549,7 +558,7 @@ export default function Suggest() {
 
     function suggestList() {
         if (pageStep == 1 && process.env.TARO_ENV === 'weapp') {
-            return <ScrollView scrollY style={{ height: 450 }} scrollTop={scrollTop}>
+            return <ScrollView scrollY style={{ height: scrollHeight }} id="myScrollView" scrollTop={scrollTop}>
                 {
                     scrollContent()
                 }
@@ -577,8 +586,8 @@ export default function Suggest() {
                         </View>
                         <View>
 
-                            <View className="suggest_item_title">{item.hours}{t('feature.suggest.hours2')}{item.minutes>0&&item.minutes+t('feature.suggest.minute')}</View>
-                            <View className="suggest_item_desc">{t('feature.suggest.cycles',{times:item.number})}</View>
+                            <View className="suggest_item_title">{item.hours}{t('feature.suggest.hours2')}{item.minutes > 0 && item.minutes + t('feature.suggest.minute')}</View>
+                            <View className="suggest_item_desc">{t('feature.suggest.cycles', { times: item.number })}</View>
                             {
                                 index == suggestIndex && <View className="suggest_choose">
                                     <View className="suggest_choose_text" style={{ color: ColorType.sleep }}>{t('feature.suggest.go_to_bed_at', { time: item.time })}</View>
@@ -605,7 +614,7 @@ export default function Suggest() {
     }
 
     function content() {
-        return <View style={{ flex: 1, display: 'flex', flexDirection: 'column' }}>
+        return <View style={{ flex: 1, display: 'flex', flexDirection: 'column', backgroundColor: 'red' }}>
             {
                 (pageStep == 0 || pageStep == 2) && timePicker()
             }
@@ -613,7 +622,7 @@ export default function Suggest() {
                 (pageStep == 1 || pageStep == 3) && suggestList()
             }
             {
-                pageStep==3 && <Text className="suggest_footer_note">{t('feature.suggest.sleep_suggest_footer')}</Text>
+                pageStep == 3 && <Text className="suggest_footer_note">{t('feature.suggest.sleep_suggest_footer')}</Text>
             }
             {
                 pageStep == 2 && fallSleepPicker()
@@ -624,7 +633,7 @@ export default function Suggest() {
         </View>
     }
 
-    function btnText(){
+    function btnText() {
         // if (pageStep == 3){
         //     return t('feature.suggest.done')
         // }
@@ -635,7 +644,7 @@ export default function Suggest() {
     }
 
 
-    return <View style={{ display: 'flex', flexDirection: 'column', flex: 1 }}>
+    return <View style={{ display: 'flex', flexDirection: 'column', flex: 1, height: process.env.TARO_ENV == 'weapp' ? '100vh' : 'auto' }}>
         <Text className="target_title">{suggestTitle()}</Text>
         <Text className="target_desc">{suggestDesc()}</Text>
         {

+ 1 - 1
src/services/http/request.ts

@@ -90,7 +90,7 @@ export async function request<T>(param: RequestParam): Promise<T> {
         header['X-Timestamp'] = new Date().getTime()
         if (token.length > 0) {
             header['Authorization'] = `Bearer ${token}`;
-            // header['Authorization'] = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhY2NvdW50Iiwic3ViIjoiMjU0YjFjM2YxMWMzODk0ZjlmNjYyNGJiZDQ1N2ZjOWMiLCJpc3MiOiJmYXN0Iiwibmlja25hbWUiOiJCb3l1IiwidHlwIjoiQmVhcmVyIiwic2Vzc2lvbl9zdGF0ZSI6IjYwOWVjMDgyYzgxMTZjNGYwNGIxZjIwNDYyYjFlZjk5IiwiZXhwIjoxNzQ4MzE0NzU5LCJpYXQiOjE3MTY3Nzg3NTl9.HRE1b8bTzElV_I_nlz5LC0P3bweLPOSQipAdiiRb1Mk';
+            // header['Authorization'] = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhY2NvdW50Iiwic3ViIjoiMjZkOGE1YTg0MDMyYmExN2Q4NDk3MTlkNTljNGY1NzgiLCJpc3MiOiJmYXN0Iiwibmlja25hbWUiOiJCSyIsInR5cCI6IkJlYXJlciIsInNlc3Npb25fc3RhdGUiOiJkODczZTBhZGJhY2M2NDQ0OTllYTUwMTUzOGQxZmQ3MSIsImV4cCI6MTc0OTIwMTM2NywiaWF0IjoxNzE3NjY1MzY3fQ.cTQTsHzxBFRSKBztlPKBspg1e9DGT9ppAwb3zD0SDJ0';
             // header['Authorization'] = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhY2NvdW50Iiwic3ViIjoiMjZkOGE1YTg0MDMyYmExN2Q4NDk3MTlkNTljNGY1NzgiLCJpc3MiOiJmYXN0Iiwibmlja25hbWUiOiJCSyIsInR5cCI6IkJlYXJlciIsInNlc3Npb25fc3RhdGUiOiI1ZDU2NTkzYmNjNWFmNzM0OWNlZTMwZjlkNGYzMWIyMCIsImV4cCI6MTc0ODE3MDg5NSwiaWF0IjoxNzE2NjM0ODk1fQ.uaRm2vSNCX8fkFS63Oe-WNWIDHG_cRM-nQ5EGyUMaBg';
         }
 

Some files were not shown because too many files changed in this diff