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

Release 2023-08-31 04:35:29 #6841

Merged
merged 23 commits into from
Aug 31, 2023
Merged

Release 2023-08-31 04:35:29 #6841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
103d62f
提出物が提出後に更新されたかを確認するメソッドをProductモデルに追加
Kassy0220 Jul 30, 2023
a2dfbde
追加したメソッドに対するテストを追加
Kassy0220 Jul 29, 2023
777cdbb
提出物を更新時に飛ぶ通知の文面を、「XXさんの提出物が更新されました」に変更
Kassy0220 Jul 29, 2023
1301cd3
重複していたコードを修正
Kassy0220 Aug 5, 2023
9749fbf
テストを修正
Kassy0220 Aug 5, 2023
101a5aa
Product#notification_type のテストを修正
Kassy0220 Aug 23, 2023
1ea6a37
Product#updated_after_submission?のテストを追加
Kassy0220 Aug 23, 2023
680a316
企業ページの日報一覧が重複表示されていたのを修正
Kassy0220 Aug 19, 2023
b9ceb35
参照されなくなったVueコンポーネントを削除
Kassy0220 Aug 19, 2023
eca2b52
Merge pull request #6827 from fjordllc/bug/duplicate-display-of-reports
komagata Aug 29, 2023
03fb229
Merge pull request #6772 from fjordllc/feature/change-notification-me…
komagata Aug 29, 2023
0a9bd41
メンターのプラクティス編集周りのページ構造を修正
machida Aug 30, 2023
e06334c
新しいロゴとメインカラーをあわせた
machida Aug 30, 2023
19bd315
プラクティス作成周りのページ構造を修正
machida Aug 30, 2023
16b6422
borderの修正
machida Aug 30, 2023
0d10e73
コース周りのページの構造を修正
machida Aug 30, 2023
b50167b
テストの修正
machida Aug 30, 2023
70639a4
Merge pull request #6851 from fjordllc/m-f
machida Aug 31, 2023
a3d2896
iconをXにし、borderの色を全体的に調整
machida Aug 27, 2023
b5b42d3
プラクティス作成ボタンを削除
machida Aug 31, 2023
8c9c8a6
ダッシュボード周りのページの構造を修正
machida Aug 31, 2023
82dbc34
:cop:
machida Aug 31, 2023
7908079
Merge pull request #6853 from fjordllc/icon-border
machida Aug 31, 2023
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
116 changes: 81 additions & 35 deletions app/javascript/components/Bookmarks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,51 +32,97 @@ export default function Bookmarks() {
} else {
return (
<>
<Pagination
sum={data.totalPages * per}
per={per}
neighbours={neighbours}
page={page}
onChange={(e) => handlePaginate(e.page)}
/>
<div className="card-list-tools">
<div className="form-item is-inline">
<EditButton editable={editable} setEditable={setEditable} />
<div className="page-main">
<div className="page-main-header">
<div className="container">
<div className="page-main-header__inner">
<div className="page-main-header__start">
<h1 className="page-main-header__title">ブックマーク</h1>
</div>
<div className="page-main-header__end">
<div className="page-header-actions">
<div className="page-header-actions__items">
<div className="page-header-actions__item">
<div className="form-item is-inline">
<EditButton
editable={editable}
setEditable={setEditable}
/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div className="card-list a-card">
<div className="card-list__items">
{data.bookmarks.map((bookmark) => {
return (
<Bookmark
key={bookmark.id}
bookmark={bookmark}
editable={editable}
setEditable={setEditable}
bookmarksUrl={bookmarksUrl}
/>
)
})}
{/* .page-main-header */}
<hr className="a-border"></hr>
<div className="page-body">
<div className="container is-md">
<Pagination
sum={data.totalPages * per}
per={per}
neighbours={neighbours}
page={page}
onChange={(e) => handlePaginate(e.page)}
/>
<div className="card-list a-card">
<div className="card-list__items">
{data.bookmarks.map((bookmark) => {
return (
<Bookmark
key={bookmark.id}
bookmark={bookmark}
editable={editable}
setEditable={setEditable}
bookmarksUrl={bookmarksUrl}
/>
)
})}
</div>
</div>
<Pagination
sum={data.totalPages * per}
per={per}
neighbours={neighbours}
page={page}
onChange={(e) => handlePaginate(e.page)}
/>
</div>
{/* .container */}
</div>
{/* .page-body */}
</div>
<Pagination
sum={data.totalPages * per}
per={per}
neighbours={neighbours}
page={page}
onChange={(e) => handlePaginate(e.page)}
/>
{/* .page-main */}
</>
)
}
}

const NoBookmarks = () => {
return (
<div className="o-empty-message">
<div className="o-empty-message__icon">
<i className="fa-regular fa-face-sad-tear" />
<p className="o-empty-message__text">ブックマークはまだありません。</p>
<div className="page-main">
<div className="page-main-header">
<div className="container">
<div className="page-main-header__inner">
<div className="page-main-header__start">
<h1 className="page-main-header__title">ブックマーク</h1>
</div>
</div>
</div>
</div>
{/* .page-main-header */}
<hr className="a-border"></hr>
<div className="page-body">
<div className="o-empty-message">
<div className="o-empty-message__icon">
<i className="fa-regular fa-face-sad-tear" />
<p className="o-empty-message__text">
ブックマークはまだありません。
</p>
</div>
</div>
</div>
</div>
)
Expand Down
166 changes: 0 additions & 166 deletions app/javascript/components/reports.vue
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions app/javascript/components/user-sns.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
a.sns-links__item-link.a-button.is-sm.is-secondary.is-icon(
v-if='user.twitter_account',
:href='twitterUrl')
i.fa-brands.fa-twitter
i.fa-brands.fa-x-twitter
.sns-links__item-link.a-button.is-sm.is-disabled.is-icon(v-else)
i.fa-brands.fa-twitter
i.fa-brands.fa-x-twitter
li.sns-links__item
a.sns-links__item-link.a-button.is-sm.is-secondary.is-icon(
v-if='user.facebook_url',
Expand Down
75 changes: 43 additions & 32 deletions app/javascript/components/watches.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,47 @@
<template lang="pug">
.page-body
.container.is-md(v-if='!loaded')
loadingListPlaceholder
.container.is-md(v-else)
.o-empty-message(v-if='watches.length === 0')
.o-empty-message__icon
i.fa-regular.fa-sad-tear
p.o-empty-message__text
| Watchしているものはまだありません。
div(v-else)
nav.pagination(v-if='totalPages > 1')
pager(v-bind='pagerProps')
.card-list-tools(v-if='watches.length')
.form-item.is-inline
label.a-form-label(for='card-list-tools__action')
| 編集
label.a-on-off-checkbox.is-sm
input#card-list-tools__action(
type='checkbox',
name='card-list-tools__action',
v-model='checked')
span#spec-edit-mode
.card-list.a-card
.card-list__items
watch(
v-for='watch in watches',
:key='watch.id',
:watch='watch',
:checked='checked',
@updateIndex='updateIndex')
nav.pagination(v-if='totalPages > 1')
pager(v-bind='pagerProps')
.page-main
.page-main-header
.container
.page-main-header__inner
.page-main-header__start
h1.page-main-header__title
| Watch中
.page-main-header__end
.page-header-actions
.page-header-actions__items
.page-header-actions__item(v-if='watches.length')
.form-item.is-inline
label.a-form-label(for='card-list-tools__action')
| 編集
label.a-on-off-checkbox.is-sm
input#card-list-tools__action(
type='checkbox',
name='card-list-tools__action',
v-model='checked')
span#spec-edit-mode
hr.a-border
.page-body
.container.is-md(v-if='!loaded')
loadingListPlaceholder
.container.is-md(v-else)
.o-empty-message(v-if='watches.length === 0')
.o-empty-message__icon
i.fa-regular.fa-sad-tear
p.o-empty-message__text
| Watchしているものはまだありません。
div(v-else)
nav.pagination(v-if='totalPages > 1')
pager(v-bind='pagerProps')
.card-list.a-card
.card-list__items
watch(
v-for='watch in watches',
:key='watch.id',
:watch='watch',
:checked='checked',
@updateIndex='updateIndex')
nav.pagination(v-if='totalPages > 1')
pager(v-bind='pagerProps')
</template>

<script>
Expand Down
Loading
Loading