Skip to content

Commit

Permalink
Merge branch 'main' into showcase
Browse files Browse the repository at this point in the history
  • Loading branch information
heonjwa authored Aug 18, 2024
2 parents 181ad25 + c3f7002 commit 176342c
Show file tree
Hide file tree
Showing 6 changed files with 185 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*
.yarn

# local env files
.env*.local
Expand Down
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
4 changes: 0 additions & 4 deletions components/Room.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { useEffect, useState } from 'react';
import Image from 'next/image';
import { useMediaQuery } from '@react-hook/media-query';


const Room = () => {
const [isClient, setIsClient] = useState(false);
const isLargeScreen = useMediaQuery('(min-width: 1000px)');
Expand Down Expand Up @@ -52,6 +51,3 @@ const Room = () => {


export default Room;



13 changes: 9 additions & 4 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,15 @@ function MeetingInfo() {
color="brand.light_brown"
align="center"
>
Join us every Tuesday from 6:00pm to 7:30pm PST at CSE2 G04!
</Text>
<Box width="70%" height="370px">
Join us every Tuesday from 6:00pm to 7:30pm PST at MOR Hall 220!
</Text>
<Box width="60%" height="370px" style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
}}>
<Room />

</Box>
{isLargerThan1000 ? (
<Text
Expand All @@ -331,7 +336,7 @@ function MeetingInfo() {
color="brand.light_brown"
align="center"
>
Gates Center Room G04 @ University of Washington
More Hall 220 @ University of Washington
</Text>
) : (
<Spacer paddingBottom="20px" />
Expand Down
Binary file added public/more_hall.webp
Binary file not shown.
174 changes: 174 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3331,3 +3331,177 @@ yargs@^17.7.2:
string-width "^4.2.3"
y18n "^5.0.5"
yargs-parser "^21.1.1"
=======
# This file is generated by running "yarn install" inside your project.
# Manual changes might be lost - proceed with caution!

__metadata:
version: 6
cacheKey: 8

"@babel/code-frame@npm:^7.0.0":
version: 7.24.2
resolution: "@babel/code-frame@npm:7.24.2"
dependencies:
"@babel/highlight": ^7.24.2
picocolors: ^1.0.0
checksum: 70e867340cfe09ca5488b2f36372c45cabf43c79a5b6426e6df5ef0611ff5dfa75a57dda841895693de6008f32c21a7c97027a8c7bcabd63a7d17416cbead6f8
languageName: node
linkType: hard

"@babel/helper-module-imports@npm:^7.16.7":
version: 7.24.3
resolution: "@babel/helper-module-imports@npm:7.24.3"
dependencies:
"@babel/types": ^7.24.0
checksum: c23492189ba97a1ec7d37012336a5661174e8b88194836b6bbf90d13c3b72c1db4626263c654454986f924c6da8be7ba7f9447876d709cd00bd6ffde6ec00796
languageName: node
linkType: hard

"@babel/helper-string-parser@npm:^7.24.1":
version: 7.24.1
resolution: "@babel/helper-string-parser@npm:7.24.1"
checksum: 8404e865b06013979a12406aab4c0e8d2e377199deec09dfe9f57b833b0c9ce7b6e8c1c553f2da8d0bcd240c5005bd7a269f4fef0d628aeb7d5fe035c436fb67
languageName: node
linkType: hard

"@babel/helper-validator-identifier@npm:^7.24.5":
version: 7.24.5
resolution: "@babel/helper-validator-identifier@npm:7.24.5"
checksum: 75d6f9f475c08f3be87bae4953e9b8d8c72983e16ed2860870b328d048cb20dccb4fcbf85eacbdd817ea1efbb38552a6db9046e2e37bfe13bdec44ac8939024c
languageName: node
linkType: hard

"@babel/highlight@npm:^7.24.2":
version: 7.24.5
resolution: "@babel/highlight@npm:7.24.5"
dependencies:
"@babel/helper-validator-identifier": ^7.24.5
chalk: ^2.4.2
js-tokens: ^4.0.0
picocolors: ^1.0.0
checksum: eece0e63e9210e902f1ee88f15cabfa31d2693bd2e56806eb849478b859d274c24477081c649cee6a241c4aed7da6f3e05c7afa5c3cd70094006ed095292b0d0
languageName: node
linkType: hard

"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.13":
version: 7.24.5
resolution: "@babel/runtime@npm:7.24.5"
dependencies:
regenerator-runtime: ^0.14.0
checksum: 755383192f3ac32ba4c62bd4f1ae92aed5b82d2c6665f39eb28fa94546777cf5c63493ea92dd03f1c2e621b17e860f190c056684b7f234270fdc91e29beda063
languageName: node
linkType: hard

"@babel/types@npm:^7.24.0":
version: 7.24.5
resolution: "@babel/types@npm:7.24.5"
dependencies:
"@babel/helper-string-parser": ^7.24.1
"@babel/helper-validator-identifier": ^7.24.5
to-fast-properties: ^2.0.0
checksum: 8eeeacd996593b176e649ee49d8dc3f26f9bb6aa1e3b592030e61a0e58ea010fb018dccc51e5314c8139409ea6cbab02e29b33e674e1f6962d8e24c52da6375b
languageName: node
linkType: hard

"@biomejs/biome@npm:^1.5.3":
version: 1.7.2
resolution: "@biomejs/biome@npm:1.7.2"
dependencies:
"@biomejs/cli-darwin-arm64": 1.7.2
"@biomejs/cli-darwin-x64": 1.7.2
"@biomejs/cli-linux-arm64": 1.7.2
"@biomejs/cli-linux-arm64-musl": 1.7.2
"@biomejs/cli-linux-x64": 1.7.2
"@biomejs/cli-linux-x64-musl": 1.7.2
"@biomejs/cli-win32-arm64": 1.7.2
"@biomejs/cli-win32-x64": 1.7.2
dependenciesMeta:
"@biomejs/cli-darwin-arm64":
optional: true
"@biomejs/cli-darwin-x64":
optional: true
"@biomejs/cli-linux-arm64":
optional: true
"@biomejs/cli-linux-arm64-musl":
optional: true
"@biomejs/cli-linux-x64":
optional: true
"@biomejs/cli-linux-x64-musl":
optional: true
"@biomejs/cli-win32-arm64":
optional: true
"@biomejs/cli-win32-x64":
optional: true
bin:
biome: bin/biome
checksum: 274328838c04a3e1ef0bbcbf9ba3f7fb459088a2fe6cb422b860e28e9a55462f00ae6493e50a93547d3568fd3cc65834b3a29007d171e9a167e57e5eca35791e
languageName: node
linkType: hard

"@biomejs/cli-darwin-arm64@npm:1.7.2":
version: 1.7.2
resolution: "@biomejs/cli-darwin-arm64@npm:1.7.2"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@biomejs/cli-darwin-x64@npm:1.7.2":
version: 1.7.2
resolution: "@biomejs/cli-darwin-x64@npm:1.7.2"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@biomejs/cli-linux-arm64-musl@npm:1.7.2":
version: 1.7.2
resolution: "@biomejs/cli-linux-arm64-musl@npm:1.7.2"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@biomejs/cli-linux-arm64@npm:1.7.2":
version: 1.7.2
resolution: "@biomejs/cli-linux-arm64@npm:1.7.2"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@biomejs/cli-linux-x64-musl@npm:1.7.2":
version: 1.7.2
resolution: "@biomejs/cli-linux-x64-musl@npm:1.7.2"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@biomejs/cli-linux-x64@npm:1.7.2":
version: 1.7.2
resolution: "@biomejs/cli-linux-x64@npm:1.7.2"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@biomejs/cli-win32-arm64@npm:1.7.2":
version: 1.7.2
resolution: "@biomejs/cli-win32-arm64@npm:1.7.2"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@biomejs/cli-win32-x64@npm:1.7.2":
version: 1.7.2
resolution: "@biomejs/cli-win32-x64@npm:1.7.2"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"@chakra-ui/accordion@npm:2.3.1":
version: 2.3.1
resolution: "@chakra-ui/accordion@npm:2.3.1"
dependencies:
"@chakra-ui/descendant": 3.1.0
"@chakra-ui/icon": 3.2.0
"@chakra-ui/react-context": 2.1.0
"@chakra-ui/react-use-controllable-state": 2.1.0
"@chakra-ui/react-use-merge-refs": 2.1.0
"@chakra-ui/shared-utils": 2.0.5

0 comments on commit 176342c

Please sign in to comment.