diff --git a/.vscode/extensions.json b/.vscode/extensions.json index a134a2d..853063f 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,6 +3,7 @@ "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "octref.vetur", - "bradlc.vscode-tailwindcss" + "bradlc.vscode-tailwindcss", + "ecmel.vscode-html-css" ] } diff --git a/.vscode/setting.json b/.vscode/settings.json similarity index 63% rename from .vscode/setting.json rename to .vscode/settings.json index 52f16ee..1375a74 100644 --- a/.vscode/setting.json +++ b/.vscode/settings.json @@ -1,12 +1,9 @@ { - "eslint.enable": true, - "stylelint.enable": true, "editor.codeActionsOnSave": { "source.fixAll.eslint": true, "source.fixAll.stylelint": true }, "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.tabSize": 2, - "editor.formatOnSave": true, - "nuxt.isNuxtApp": true + "editor.formatOnSave": true } diff --git a/Dockerfile b/Dockerfile index 1fd1d6d..88c93bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,5 @@ RUN apk update && \ apk add git COPY package*.json ./ -RUN yarn install COPY . ./ \ No newline at end of file diff --git a/assets/css/main.css b/assets/css/main.css new file mode 100644 index 0000000..9527ccf --- /dev/null +++ b/assets/css/main.css @@ -0,0 +1,9 @@ +.vh-full { + height: 100vh !important; + height: 100lvh !important; +} + +.svh-full { + height: 100vh !important; + height: 100svh !important; +} diff --git a/components/Header.vue b/components/Header.vue index 7612638..b501b76 100644 --- a/components/Header.vue +++ b/components/Header.vue @@ -107,7 +107,7 @@ />
- {{ getName }} + {{ getDisplayName }}
@@ -198,8 +198,8 @@ export default class Header extends Vue { return authStore.getUser.avatar_url } - get getName() { - return authStore.getUser.name + get getDisplayName() { + return authStore.getUser.display_name } get getUserId() { @@ -209,7 +209,7 @@ export default class Header extends Vue { toDraftPage() { workFilterStore.setOnPageName('menu') workFilterStore.setFilterVisibility('draft') - this.$router.push(`/users/${this.getUserId}`) + this.$router.push(`/users/${this.getUserId}#user_work`) } clickLogin() { diff --git a/components/comments/CommentUser.vue b/components/comments/CommentUser.vue index d699716..685123b 100644 --- a/components/comments/CommentUser.vue +++ b/components/comments/CommentUser.vue @@ -14,7 +14,7 @@ :class="{ 'pointer-events-auto': user.id !== '0' }" >
- {{ user.name }} + {{ user.display_name }}
diff --git a/components/comments/CommentsField.vue b/components/comments/CommentsField.vue index 8aa0fe2..1eb9097 100644 --- a/components/comments/CommentsField.vue +++ b/components/comments/CommentsField.vue @@ -19,6 +19,8 @@ placeholder="コメント" maxlength="500" @focus="focusCommentForm = true" + v-on:keydown.ctrl.enter="click" + v-on:keydown.meta.enter="click" />
- + /> -->