Skip to content

Commit

Permalink
feat: welcome screen
Browse files Browse the repository at this point in the history
  • Loading branch information
in-mai-space committed Feb 25, 2024
1 parent 530080f commit c250f69
Show file tree
Hide file tree
Showing 10 changed files with 431 additions and 747 deletions.
8 changes: 8 additions & 0 deletions backend/src/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"dependencies": {
"@react-navigation/stack": "^6.3.23"
},
"devDependencies": {
"@types/react": "^18.2.58"
}
}
86 changes: 86 additions & 0 deletions backend/src/yarn.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


"@react-navigation/elements@^1.3.24":
version "1.3.24"
resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.24.tgz#184eabb869338dd268761e9d0f3a4c96f8e322f3"
integrity sha512-zgZV50qjlv3/N+MzNV0DIRmtg30IZcR0+LaTQRP/OxLtveQkgUG6wIEKl6SXO2ykC9yF9V82msdCzKl9uPSQCA==

"@react-navigation/stack@^6.3.23":
version "6.3.23"
resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-6.3.23.tgz#c97c14df4a9dd64a7778b52097c539b25033afd5"
integrity sha512-bfi3ydidwMgDUYBM1EfC69gedVw2GeWPxqb5n/cQl+dsqPHEiDNGTANaVLJnotRyUzoR6w1hpeoLrj5jXdxm8g==
dependencies:
"@react-navigation/elements" "^1.3.24"
color "^4.2.3"
warn-once "^0.1.0"

"@types/prop-types@*":
version "15.7.11"
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563"
integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==

"@types/react@^18.2.58":
version "18.2.58"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.58.tgz#22082d12898d11806f4a1aefb5583116a047493d"
integrity sha512-TaGvMNhxvG2Q0K0aYxiKfNDS5m5ZsoIBBbtfUorxdH4NGSXIlYvZxLJI+9Dd3KjeB3780bciLyAb7ylO8pLhPw==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
csstype "^3.0.2"

"@types/scheduler@*":
version "0.16.8"
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==

color-convert@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
dependencies:
color-name "~1.1.4"

color-name@^1.0.0, color-name@~1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==

color-string@^1.9.0:
version "1.9.1"
resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
dependencies:
color-name "^1.0.0"
simple-swizzle "^0.2.2"

color@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
dependencies:
color-convert "^2.0.1"
color-string "^1.9.0"

csstype@^3.0.2:
version "3.1.3"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==

is-arrayish@^0.3.1:
version "0.3.2"
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==

simple-swizzle@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
dependencies:
is-arrayish "^0.3.1"

warn-once@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/warn-once/-/warn-once-0.1.1.tgz#952088f4fb56896e73fd4e6a3767272a3fccce43"
integrity sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q==
Empty file added frontend/components/button.tsx
Empty file.
8 changes: 8 additions & 0 deletions frontend/components/wordmark.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react';
import { View, Text, StyleSheet } from 'react-native';

const Wordmark = () => {
return (<View>
<Text>Wordmark</Text>
</View>);
};
9 changes: 8 additions & 1 deletion frontend/sac-mobile/app/(auth)/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ import { Stack } from 'expo-router';

const AuthLayout = () => {
return (
<Stack initialRouteName="login">
<Stack initialRouteName="welcome">
<Stack.Screen
name="welcome"
options={{
title: 'Welcome',
headerShown: false
}}
/>
<Stack.Screen
name="login"
options={{
Expand Down
42 changes: 42 additions & 0 deletions frontend/sac-mobile/app/(auth)/welcome.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import React from 'react';
import {View, Text, StyleSheet, Button} from 'react-native';

Check failure on line 2 in frontend/sac-mobile/app/(auth)/welcome.tsx

View workflow job for this annotation

GitHub Actions / Lint (18.x)

Replace `View,·Text,·StyleSheet,·Button}·from·'react-native';·` with `·Button,·StyleSheet,·Text,·View·}·from·'react-native';⏎`
import { useAuthStore } from '@/hooks/use-auth';

Check failure on line 3 in frontend/sac-mobile/app/(auth)/welcome.tsx

View workflow job for this annotation

GitHub Actions / Lint (18.x)

'useAuthStore' is defined but never used

const Welcome = () => {
return (
<View style={styles.container}>
<Text style={styles.wordmark}>Wordmark</Text>

Check failure on line 8 in frontend/sac-mobile/app/(auth)/welcome.tsx

View workflow job for this annotation

GitHub Actions / Lint (18.x)

Insert `··`
<Text style={styles.header}>Welcome to StudCal</Text>

Check failure on line 9 in frontend/sac-mobile/app/(auth)/welcome.tsx

View workflow job for this annotation

GitHub Actions / Lint (18.x)

Insert `··`
<Text style={styles.description}>Discover, follow, and join all the clubs & events Northeastern has to offer</Text>

Check failure on line 10 in frontend/sac-mobile/app/(auth)/welcome.tsx

View workflow job for this annotation

GitHub Actions / Lint (18.x)

Replace `<Text·style={styles.description}>Discover,·follow,·and·join·all·the·clubs·&·events·Northeastern·has·to·offer` with `··<Text·style={styles.description}>⏎················Discover,·follow,·and·join·all·the·clubs·&·events·Northeastern⏎················has·to·offer⏎············`
<Button title="Login" />

Check failure on line 11 in frontend/sac-mobile/app/(auth)/welcome.tsx

View workflow job for this annotation

GitHub Actions / Lint (18.x)

Insert `··`
</View>
)

Check failure on line 13 in frontend/sac-mobile/app/(auth)/welcome.tsx

View workflow job for this annotation

GitHub Actions / Lint (18.x)

Replace `······)` with `····);`
};

export default Welcome;

const styles = StyleSheet.create({
container: {
flex: 1,

Check failure on line 20 in frontend/sac-mobile/app/(auth)/welcome.tsx

View workflow job for this annotation

GitHub Actions / Lint (18.x)

Replace `flex:·1,·⏎` with `··flex:·1,⏎··`
flexDirection: 'column',
marginTop: '5%',

Check failure on line 22 in frontend/sac-mobile/app/(auth)/welcome.tsx

View workflow job for this annotation

GitHub Actions / Lint (18.x)

Replace `······marginTop:·'5%',·⏎······marginBottom:·'10%',·` with `········marginTop:·'5%',⏎········marginBottom:·'10%',`
marginBottom: '10%',
marginLeft: 30,

Check failure on line 24 in frontend/sac-mobile/app/(auth)/welcome.tsx

View workflow job for this annotation

GitHub Actions / Lint (18.x)

Replace `marginLeft:·30,·⏎······marginRight:·30,` with `··marginLeft:·30,⏎········marginRight:·30`
marginRight: 30,
},
wordmark: {
marginTop: 60,
fontSize: 20,
flex: 1,
},
header: {
color: 'black',
flex: 1.7,
fontSize: 60,
},
description: {
color: 'black',
flex: 1,
fontSize: 18,
},
});
2 changes: 1 addition & 1 deletion frontend/sac-mobile/app/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function RootLayoutNav() {
if (isLoggedIn === null) return;

if (!isLoggedIn) {
router.push('/(auth)/login');
router.push('/(auth)/welcome');
return;
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/sac-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"axios": "^1.6.7",
"clsx": "^2.1.0",
"eslint": "^8.56.0",
"expo": "~50.0.5",
"expo": "^50.0.7",
"expo-dev-client": "~3.3.8",
"expo-font": "~11.10.2",
"expo-linking": "~6.2.2",
Expand Down
Loading

0 comments on commit c250f69

Please sign in to comment.