Skip to content

Commit 1b06084

Browse files
lassejacolassejaco
committed
Merge branch 'main' of github.com:efdevcon/monorepo
2 parents 3b32403 + d971d95 commit 1b06084

10 files changed

Lines changed: 181 additions & 163 deletions

File tree

‎devconnect-app/src/app/api/quests/route.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ export async function GET(request: NextRequest) {
132132
};
133133

134134
// remove 1., 2., 3. from category
135-
const category = getPropertyValue('District')?.replace(/[0-9]\. /, '').toLowerCase();
136-
const name = getPropertyValue('Name')?.toLowerCase().replace(/\s+/g, '-');
135+
// const category = getPropertyValue('District')?.replace(/[0-9]\. /, '').toLowerCase();
136+
// const name = getPropertyValue('Name')?.toLowerCase().replace(/\s+/g, '-');
137137

138138
const conditionType = getPropertyValue('Condition type');
139139
const conditionValues = getPropertyValue('Quest condition values');

‎devconnect-app/src/app/layout.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import type { Metadata, Viewport } from 'next';
22
import { Geist, Geist_Mono } from 'next/font/google';
33
import './globals.css';
44
import '@getpara/react-sdk/styles.css';
5-
import { SkippedProvider } from '@/context/SkippedContext';
65
import NewDeployment from '@/components/NewDeployment';
76
import { Toaster } from 'sonner';
87
import { WalletsProviders } from '@/context/WalletProviders';

‎devconnect-app/src/components/Onboarding.tsx‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ interface OnboardingProps {
2424
export default function Onboarding({ onConnect }: OnboardingProps) {
2525
const { open } = useAppKit();
2626
const { connect, connectors } = useConnect();
27-
const { isSkipped, setSkipped } = useUnifiedConnection();
2827
const [authState, setAuthState] = useState<AuthState | undefined>();
2928
const { user, signOut, sendOtp, verifyOtp, loading, error } = useUser();
3029
const [email, setEmail] = useLocalStorage('email', '');
@@ -270,18 +269,10 @@ export default function Onboarding({ onConnect }: OnboardingProps) {
270269
const handleSkip = () => {
271270
console.log('handleSkip called');
272271
// Set skipped state to allow navigation without connection
273-
if (!isSkipped) {
274-
setSkipped(true);
275-
console.log('setSkipped(true) called');
276-
onConnect?.();
277-
278-
localStorage.setItem('loginIsSkipped', 'true');
279-
router.push('/');
280-
281-
console.log('onConnect callback called');
282-
} else {
283-
setSkipped(false);
284-
}
272+
onConnect?.();
273+
localStorage.setItem('loginIsSkipped', 'true');
274+
router.push('/');
275+
console.log('onConnect callback called');
285276
};
286277

287278
const handleReset = () => {
@@ -294,15 +285,15 @@ export default function Onboarding({ onConnect }: OnboardingProps) {
294285
console.log(
295286
'[ONBOARDING] Resetting onboarding state and redirecting to onboarding'
296287
);
297-
setSkipped(false);
288+
localStorage.removeItem('loginIsSkipped');
298289
router.push('/onboarding');
299290
};
300291

301292
const handleLogout = async () => {
302293
try {
303294
await signOut();
304295
// Reset the onboarding state after logout
305-
setSkipped(false);
296+
localStorage.removeItem('loginIsSkipped');
306297
setAuthState(undefined);
307298
setEmail('');
308299
setVerificationCode('');
@@ -1232,10 +1223,10 @@ export default function Onboarding({ onConnect }: OnboardingProps) {
12321223

12331224
{/* Skip for now */}
12341225
<button
1235-
onClick={isSkipped ? handleReset : handleSkip}
1226+
onClick={handleSkip}
12361227
className="font-bold text-[#1b6fae] text-[16px] text-center tracking-[-0.1px] w-full leading-none hover:underline mb-6"
12371228
>
1238-
{isSkipped ? 'Reset (back to onboarding flow)' : 'Skip for now'}
1229+
Skip for now
12391230
</button>
12401231

12411232
{/* Logout Button - Only show when user is logged in */}

‎devconnect-app/src/context/SkippedContext.tsx‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎devconnect-app/src/data/locations.ts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,26 @@ import type { Locations } from '@/types/api-data';
22

33
export const locationsData: Locations = {
44
"1": {
5-
"name": "Blue Pavilion",
6-
"layerName": "blue-pavilion"
7-
},
8-
"2": {
95
"name": "Green Pavilion",
106
"layerName": "green-pavilion"
117
},
12-
"3": {
8+
"2": {
139
"name": "Pavilion 8",
1410
"layerName": "pavilion-8"
1511
},
16-
"4": {
12+
"3": {
1713
"name": "Pavilion 9",
1814
"layerName": "pavilion-9"
1915
},
20-
"5": {
16+
"4": {
2117
"name": "Pista Central",
2218
"layerName": "pista-central"
2319
},
24-
"6": {
20+
"5": {
2521
"name": "Red Pavilion",
2622
"layerName": "red-pavilion"
2723
},
28-
"7": {
24+
"6": {
2925
"name": "Yellow Pavilion",
3026
"layerName": "yellow-pavilion"
3127
}

‎devconnect-app/src/data/poiGroups.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ export const poiGroupsData: PoiGroups = {
3232
"name": "Food & Beverage"
3333
},
3434
"11": {
35-
"name": "Info desk"
35+
"name": "Interview rooms"
3636
},
3737
"12": {
38-
"name": "Interview rooms"
38+
"name": "Meeting Rooms"
3939
},
4040
"13": {
41-
"name": "Meeting Rooms"
41+
"name": "Music Stage"
4242
},
4343
"14": {
44-
"name": "Music Stage"
44+
"name": "Onboarding desk"
4545
},
4646
"15": {
4747
"name": "Onramp"

‎devconnect-app/src/data/pois.ts‎

Lines changed: 77 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,18 @@ export const poisData: POI[] = [
1616
"logo": "",
1717
"description": "",
1818
"districtId": null,
19-
"locationId": "7",
19+
"locationId": "6",
2020
"groupId": "1"
2121
},
22+
{
23+
"name": "Ai Onboarding",
24+
"layerName": "ai-onboarding",
25+
"logo": "",
26+
"description": "",
27+
"districtId": "1",
28+
"locationId": null,
29+
"groupId": "14"
30+
},
2231
{
2332
"name": "Childcare 1",
2433
"layerName": "childcare-1",
@@ -43,7 +52,7 @@ export const poisData: POI[] = [
4352
"logo": "",
4453
"description": "",
4554
"districtId": null,
46-
"locationId": "5",
55+
"locationId": "4",
4756
"groupId": "5"
4857
},
4958
{
@@ -55,13 +64,31 @@ export const poisData: POI[] = [
5564
"locationId": null,
5665
"groupId": "6"
5766
},
67+
{
68+
"name": "Collectibles Onboarding",
69+
"layerName": "collectibles-onboarding",
70+
"logo": "",
71+
"description": "",
72+
"districtId": "2",
73+
"locationId": null,
74+
"groupId": "14"
75+
},
76+
{
77+
"name": "DeFi Onboarding",
78+
"layerName": "defi-onboarding",
79+
"logo": "",
80+
"description": "",
81+
"districtId": "3",
82+
"locationId": null,
83+
"groupId": "14"
84+
},
5885
{
5986
"name": "Discussion corner 1",
6087
"layerName": "discussion-corner-1",
6188
"logo": "",
6289
"description": "",
6390
"districtId": null,
64-
"locationId": "6",
91+
"locationId": "5",
6592
"groupId": "8"
6693
},
6794
{
@@ -88,7 +115,7 @@ export const poisData: POI[] = [
88115
"logo": "",
89116
"description": "",
90117
"districtId": null,
91-
"locationId": "2",
118+
"locationId": "1",
92119
"groupId": "10"
93120
},
94121
{
@@ -100,6 +127,15 @@ export const poisData: POI[] = [
100127
"locationId": null,
101128
"groupId": "2"
102129
},
130+
{
131+
"name": "Gaming Onboarding",
132+
"layerName": "gaming-onboarding",
133+
"logo": "",
134+
"description": "",
135+
"districtId": "4",
136+
"locationId": null,
137+
"groupId": "14"
138+
},
103139
{
104140
"name": "Governance Geeks Hub",
105141
"layerName": "governance-geeks-hub",
@@ -110,13 +146,13 @@ export const poisData: POI[] = [
110146
"groupId": "7"
111147
},
112148
{
113-
"name": "Info desk 1",
114-
"layerName": "info-desk-1",
149+
"name": "Hardware & Wallets Onboarding",
150+
"layerName": "hardware-wallets-onboarding",
115151
"logo": "",
116152
"description": "",
117-
"districtId": "2",
118-
"locationId": "1",
119-
"groupId": "11"
153+
"districtId": "5",
154+
"locationId": null,
155+
"groupId": "14"
120156
},
121157
{
122158
"name": "Interview room 1",
@@ -125,7 +161,16 @@ export const poisData: POI[] = [
125161
"description": "",
126162
"districtId": null,
127163
"locationId": null,
128-
"groupId": "12"
164+
"groupId": "11"
165+
},
166+
{
167+
"name": "L2 Onboarding",
168+
"layerName": "l2-onboarding",
169+
"logo": "",
170+
"description": "",
171+
"districtId": "6",
172+
"locationId": null,
173+
"groupId": "14"
129174
},
130175
{
131176
"name": "LATAM Hub",
@@ -142,7 +187,7 @@ export const poisData: POI[] = [
142187
"logo": "",
143188
"description": "",
144189
"districtId": null,
145-
"locationId": "4",
190+
"locationId": "3",
146191
"groupId": "9"
147192
},
148193
{
@@ -152,7 +197,7 @@ export const poisData: POI[] = [
152197
"description": "",
153198
"districtId": null,
154199
"locationId": null,
155-
"groupId": "13"
200+
"groupId": "12"
156201
},
157202
{
158203
"name": "Music Stage 1",
@@ -161,7 +206,7 @@ export const poisData: POI[] = [
161206
"description": "",
162207
"districtId": null,
163208
"locationId": null,
164-
"groupId": "14"
209+
"groupId": "13"
165210
},
166211
{
167212
"name": "Node Operators Hub",
@@ -187,7 +232,7 @@ export const poisData: POI[] = [
187232
"logo": "",
188233
"description": "",
189234
"districtId": null,
190-
"locationId": "3",
235+
"locationId": "2",
191236
"groupId": "15"
192237
},
193238
{
@@ -226,6 +271,15 @@ export const poisData: POI[] = [
226271
"locationId": null,
227272
"groupId": "7"
228273
},
274+
{
275+
"name": "Privacy Onboarding",
276+
"layerName": "privacy-onboarding",
277+
"logo": "",
278+
"description": "",
279+
"districtId": "7",
280+
"locationId": null,
281+
"groupId": "14"
282+
},
229283
{
230284
"name": "QR-code 1",
231285
"layerName": "qrcode-1",
@@ -253,6 +307,15 @@ export const poisData: POI[] = [
253307
"locationId": null,
254308
"groupId": "7"
255309
},
310+
{
311+
"name": "Social Onboarding",
312+
"layerName": "social-onboarding",
313+
"logo": "",
314+
"description": "",
315+
"districtId": "8",
316+
"locationId": null,
317+
"groupId": "14"
318+
},
256319
{
257320
"name": "Stage 1",
258321
"layerName": "stage-1",

0 commit comments

Comments
 (0)