Skip to content

add: support pc #135

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

Open
boxp wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add: support pc #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f157437
fix: profile to compatible for pc
boxp Jun 1, 2021
a8ba03f
fix: profiles to compatible for pc
boxp Jun 1, 2021
1a69f0e
remove: debug prints
boxp Jun 1, 2021
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: 2 additions & 2 deletions front-end/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions front-end/src/cljs/vr_match/lib/components/profile.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
:direction "column"
:style {:width "100vw"}}
[:img {:style {:object-fit "cover"
:width "100vw"
:height "100vw"}
:width "100%"
:max-height "480px"
:height "60%"}
:src (-> images first :url)}]
[:div {:style {:padding 16}}
[:div {:style {:padding "16px 16px 52px"}}
[mui/grid {:container true
:spacing 16}
[mui/grid {:item true
Expand Down
36 changes: 19 additions & 17 deletions front-end/src/cljs/vr_match/mypage/component.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,29 +64,31 @@
handleSubmitPlatforms]
:as props}]
[navigation-bar-layout {:title "プロフィールを編集"}
[:div {:style {:position "relative"}}
[:div
(when isLoading
[linear-progress])
[mui/button-base {:on-click #(handle-click-reset-image image-ref)
:style {:width "100vw"
:height "100vw"}}
[:div {:style {:width "100vw"
:height "100vw"
:max-height "480px"
:height "60%"}}
[:div {:style {:width "100%"
:height "100%"
:background-image (str "url(" (some-> props :me :images first :url) ")")
:background-size "cover"
:background-position "center"}}]]
[mui/icon-button {:on-click #(handle-click-reset-image image-ref)
:style
{:position "absolute"
:width "64px"
:height "64px"
:top "calc(100vw - 40px)"
:right "16px"
:background-color mui/primary-color}}
[mui/icon {:font-size "inherit"
:style {:color "white"
:font-size "32px"}}
"edit"]]
:background-position "center"
:position "relative"}}
[mui/icon-button {:on-click #(handle-click-reset-image image-ref)
:style
{:position "absolute"
:width "64px"
:height "64px"
:bottom "-16px"
:right "16px"
:background-color mui/primary-color}}
[mui/icon {:font-size "inherit"
:style {:color "white"
:font-size "32px"}}
"edit"]]]]
[mui/list {:subheader (r/as-element [mui/list-subheader "ユーザー名"])}
[mui/list-item {:key "user-name"
:on-click handle-click-user-name}
Expand Down
7 changes: 5 additions & 2 deletions front-end/src/cljs/vr_match/myprofile/component.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@
:right 0
:left 0
:bottom "16px"
:padding "0 16px"}}
:padding "0 16px"
:display "flex"}}
[mui/button {:variant "contained"
:color "primary"
:style {:width "100%"}
:style {:width "100%"
:max-width "640px"
:margin "0 auto"}
:on-click handleClickEditMyProfile}
[mui/icon {:style {:margin-right "8px"}}
"edit"]
Expand Down
8 changes: 6 additions & 2 deletions front-end/src/cljs/vr_match/profile/component.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,14 @@
:right 0
:left 0
:bottom "16px"
:padding "0 16px"}}
:padding "0 16px"
:display "flex"
:justify-content "center"}}
[mui/button {:variant "contained"
:color "primary"
:style {:width "100%"}
:style {:width "100%"
:max-width "640px"
:margin "0 auto"}
:disabled favorited?
:on-click handleClickFavorite}
[mui/icon {:style {:margin-right "8px"}} "favorite"]
Expand Down