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

Jump to bottom

merge phca with trunk #1

Merged
merged 37 commits into from
May 28, 2024
Merged

merge phca with trunk #1

merged 37 commits into from
May 28, 2024

Conversation

sssomeshhh
Copy link
Owner

No description provided.

sssomeshhh added 30 commits May 27, 2024 18:49
@sssomeshhh
merge serverapi.js, serverweb.js as server.js
dd6a9d3
@sssomeshhh
database.js - connectDB -> connectDatabase
fa034c8
@sssomeshhh
Dockerfile - add env SERVER_PORT=80 and update EXPOSE
441c933
@sssomeshhh
remove typo in PropertyList.js
d995fb8
@sssomeshhh
'window.location' -> 'location.'
b1b4019
@sssomeshhh
'location' -> 'location.pathname' in handleSubmit in PropertyDetail.js
5a1a2da
@sssomeshhh
fix views in PropertyDetail
cb5fef2
@sssomeshhh
remove be target and refactor
5206421
@sssomeshhh
Dockerfile - rearrange steps
15a030c
@sssomeshhh
Login - add alert for error in handleLogin
88707c0
@sssomeshhh
Register - redirect to Login when successful
0c32fdc
@sssomeshhh
add evalPopulate()
5032c2a
@sssomeshhh
refactor Dockerfile
44c12ad
@sssomeshhh
remove be.xml
22d7acb
@sssomeshhh
fe.xml - remove buildArgs, contextFolderPath
719db80
@sssomeshhh
xx.xml - remove ' --progress plain'
cd091ad
@sssomeshhh
fs.xml - remove 8080 PortBinding
d55c018
@sssomeshhh
add webpack, webpack-cli to package.json, yarn.lock
fe67a51
@sssomeshhh
add webpack.config.js
9f6bb03
@sssomeshhh
add sea.json
ec0fc7a
@sssomeshhh
remove .env
2b04b85
@sssomeshhh
yarn produce => yarn webpack
64cf04c
@sssomeshhh
webpack.config.js - add output.filename
53b200f
@sssomeshhh
Merge branch 'refs/heads/trunk' into phca
8fe814e 
# Conflicts:
#	Dockerfile
@sssomeshhh
move 'yarn produce' to target 'xe'
e17087c
@sssomeshhh
fe.xml - add buildArgs, contextFolder
e7ded6f
@sssomeshhh
add be.xml
3ba401a
@sssomeshhh
update workflow for target be
6915c33
@sssomeshhh
update 'COPY --from' in target 'fs'
8eaaac2
@sssomeshhh
sea.json - 'main.cjs' -> 'fs.cjs'
7c59f5e
sssomeshhh
sssomeshhh commented May 28, 2024
View reviewed changes
Copy link
Owner Author

@sssomeshhh sssomeshhh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reviewed all changes

@sssomeshhh sssomeshhh merged commit a23bf9f into trunk May 28, 2024
4 checks passed
@sssomeshhh sssomeshhh deleted the phca branch May 28, 2024 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@sssomeshhh