Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mersge last bit of conflic slove #21

Merged
merged 2 commits into from
Sep 24, 2024
Merged

mersge last bit of conflic slove #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebed1ca
Merge conflig slove to prod (#16)
Honghui-Li-8 Sep 20, 2024
e3c0ad8
Merging to prod (#18)
Honghui-Li-8 Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/Node-js-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
name: Node.js CI

on:
# push:
# branches: [ Deployment/CI-CD_RenderUnitTest_HL]
# pull_request:
# branches: [ Deployment/CI-CD_RenderUnitTest_HL ]
push:
branches: [dev]
pull_request:
Expand Down
12 changes: 10 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,19 @@ npm-debug.*
*.mobileprovision
*.orig.*
web-build/
<<<<<<< HEAD
web-report/

# OSX
#
=======
.env

secret/
coverage/

# macOS
>>>>>>> ee31d0c0b1df76c426a6e045192669acdc820312
.DS_Store

# Xcode
Expand Down Expand Up @@ -84,5 +93,4 @@ coverage/**
# @generated expo-cli sync-2b81b286409207a5da26e14c78851eb30d8ccbdb
# The following patterns were generated by expo-cli

expo-env.d.ts
# @end expo-cli
expo-env.d.ts
5 changes: 2 additions & 3 deletions app/(Editor)/MapEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ const MapEditor = () => {

const toggleFloorMenu = () => {
setIsFloorMenuVisible(!isFloorMenuVisible);
if(isFloorMenuVisible){

}
console.log(isFloorMenuVisible)
console.log('floor menu toggled')
}

const applyFilters = (filters: string[]) => {
Expand Down
Loading