Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/backend/github.com/aws…
Browse files Browse the repository at this point in the history
…/aws-sdk-go-1.53.5
  • Loading branch information
garrettladley committed May 22, 2024
2 parents e088ec6 + 5c28ace commit 6344721
Show file tree
Hide file tree
Showing 15 changed files with 275 additions and 182 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/frontend_lib_release.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
name: Frontend Lib Release

on:
pull_request:
branches-ignore:
- dependabot/**
push:
branches:
- main
paths:
- "frontend/lib/**"
- frontend/lib/**

permissions:
contents: read

jobs:
build:
Expand All @@ -14,12 +20,11 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20.x'
registry-url: 'https://registry.npmjs.org'
scope: '@octocat'
node-version: 20.x
registry-url: https://registry.npmjs.org
scope: "@octocat"
- run: |
cd frontend/lib
yarn
yarn build
NODE_AUTH_TOKEN=${{ secrets.NPM_AUTH_TOKEN }}
yarn publish --access public
NODE_AUTH_TOKEN=${{ secrets.NPM_AUTH_TOKEN }} yarn publish --access public
281 changes: 143 additions & 138 deletions frontend/dashboard/yarn.lock

Large diffs are not rendered by default.

26 changes: 21 additions & 5 deletions frontend/lib/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1962,7 +1962,16 @@ string-argv@~0.3.1:
resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==

"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.1.0:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand All @@ -1980,7 +1989,14 @@ string-width@^5.0.1, string-width@^5.1.2:
emoji-regex "^9.2.2"
strip-ansi "^7.0.1"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -2202,6 +2218,6 @@ z-schema@~5.0.2:
commander "^10.0.0"

zod@^3.23.6:
version "3.23.6"
resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.6.tgz#c08a977e2255dab1fdba933651584a05fcbf19e1"
integrity sha512-RTHJlZhsRbuA8Hmp/iNL7jnfc4nZishjsanDAfEY1QpDQZCahUp3xDzl+zfweE9BklxMUcgBgS1b7Lvie/ZVwA==
version "3.23.8"
resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==
27 changes: 6 additions & 21 deletions frontend/mobile/app/(app)/(tabs)/discover.tsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,13 @@
import { StyleSheet, Text, View } from 'react-native';
import { Box, Text } from '@/app/(design-system)';

const DiscoverPage = () => {
return (
<View style={styles.container}>
<Text style={styles.title}>Discover</Text>
</View>
<Box flex={1} alignItems="center" justifyContent="center" padding="m">
<Text color="aqua" variant="text-1">
DiscoverAA
</Text>
</Box>
);
};

const styles = StyleSheet.create({
container: {
flex: 1,
alignItems: 'center',
justifyContent: 'center'
},
title: {
fontSize: 20,
fontWeight: 'bold'
},
separator: {
marginVertical: 30,
height: 1,
width: '80%'
}
});

export default DiscoverPage;
14 changes: 14 additions & 0 deletions frontend/mobile/app/(design-system)/Box.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React, { PropsWithChildren } from 'react';
import { ViewProps } from 'react-native-svg/lib/typescript/fabric/utils';

import { BoxProps, createBox } from '@shopify/restyle';

import { Theme } from './theme';

type Props = ViewProps & PropsWithChildren & BoxProps<Theme>;

const BoxDefault = createBox<Theme>();

export const Box: React.FC<Props> = ({ style, ...rest }) => {
return <BoxDefault style={[style]} {...rest} />;
};
12 changes: 12 additions & 0 deletions frontend/mobile/app/(design-system)/Colors.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// TODO: We will have to change these
export const Colors = {
darkBlue: '#0C3354',
darkRed: '#C8102E',
green: '#14AC3F',
blue: '#2663FF',
aqua: '#35B8E2',
purple: '#9226FF',
red: '#EC2215',
orange: '#FF7426',
yellow: '#FFB626'
};
10 changes: 10 additions & 0 deletions frontend/mobile/app/(design-system)/Spacing.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export const Spacing = {
none: 0,
xxs: 4,
xs: 8,
s: 12,
m: 16,
l: 24,
xl: 32,
xxl: 40
};
5 changes: 5 additions & 0 deletions frontend/mobile/app/(design-system)/Text.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { createText } from '@shopify/restyle';

import { Theme } from './theme';

export const Text = createText<Theme>();
20 changes: 20 additions & 0 deletions frontend/mobile/app/(design-system)/TextVariants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Add actual text variants here
const Texts = {
'text-1': {
fontSize: 20,
fontWeight: 'bold'
},
'text-2': {
fontSize: 16,
fontWeight: 'normal'
},
'text-3': {
fontSize: 14,
fontWeight: 'normal'
}
} as const;

export const TextVariants = {
defaults: Texts['text-1'],
...Texts
};
5 changes: 5 additions & 0 deletions frontend/mobile/app/(design-system)/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export * from './Text';
export * from './Box';
export * from './theme';
export * from './Colors';
export * from './Spacing';
13 changes: 13 additions & 0 deletions frontend/mobile/app/(design-system)/theme.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { createTheme } from '@shopify/restyle';

import { Colors } from './Colors';
import { Spacing } from './Spacing';
import { TextVariants } from './TextVariants';

export const theme = createTheme({
colors: Colors,
spacing: Spacing,
textVariants: TextVariants
});

export type Theme = typeof theme;
9 changes: 7 additions & 2 deletions frontend/mobile/app/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ import * as SplashScreen from 'expo-splash-screen';
import { StatusBar } from 'expo-status-bar';

import FontAwesome from '@expo/vector-icons/FontAwesome';
import { ThemeProvider } from '@shopify/restyle';

import { store } from '@/store/store';

import { theme } from './(design-system)';

export { ErrorBoundary } from 'expo-router';

SplashScreen.preventAutoHideAsync();
Expand Down Expand Up @@ -52,8 +55,10 @@ const RootLayout = () => {
return (
<GestureHandlerRootView style={{ flex: 1 }}>

Check warning on line 56 in frontend/mobile/app/_layout.tsx

View workflow job for this annotation

GitHub Actions / Lint

Inline style: { flex: 1 }
<Provider store={store}>
<StatusBar style="light" />
<InitalLayout />
<ThemeProvider theme={theme}>
<StatusBar style="light" />
<InitalLayout />
</ThemeProvider>
</Provider>
</GestureHandlerRootView>
);
Expand Down
2 changes: 1 addition & 1 deletion frontend/mobile/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default function (api) {
module.exports = function async(api) {
api.cache(true);
return {
presets: ['babel-preset-expo']
Expand Down
12 changes: 6 additions & 6 deletions frontend/web/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -899,9 +899,9 @@
integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==

"@types/node@*", "@types/node@^20":
version "20.12.11"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.11.tgz#c4ef00d3507000d17690643278a60dc55a9dc9be"
integrity sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==
version "20.12.12"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050"
integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==
dependencies:
undici-types "~5.26.4"

Expand All @@ -911,9 +911,9 @@
integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==

"@types/react-dom@^18":
version "18.2.25"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.25.tgz#2946a30081f53e7c8d585eb138277245caedc521"
integrity sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==
version "18.3.0"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0"
integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==
dependencies:
"@types/react" "*"

Expand Down
4 changes: 1 addition & 3 deletions go.work.sum
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx
github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cli/browser v1.3.0/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk=
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
Expand Down Expand Up @@ -334,9 +335,6 @@ go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2/go.mod h1:gtSHRuYfbCT0qnbLnovp
go.lsp.dev/uri v0.3.0/go.mod h1:P5sbO1IQR+qySTWOCnhnK7phBx+W3zbLqSMDJNTw88I=
go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/contrib/propagators/b3 v1.17.0/go.mod h1:IkfUfMpKWmynvvE0264trz0sf32NRTZL4nuAN9AbWRc=
go.opentelemetry.io/otel/oteltest v1.0.0-RC3/go.mod h1:xpzajI9JBRr7gX63nO6kAmImmYIAtuQblZ36Z+LfCjE=
go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI=
go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
Expand Down

0 comments on commit 6344721

Please sign in to comment.