Skip to content

Commit

Permalink
[fix] menu list and get date method
Browse files Browse the repository at this point in the history
  • Loading branch information
hikarut committed May 5, 2021
1 parent 8d0a880 commit 9425739
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 21 deletions.
19 changes: 6 additions & 13 deletions components/molecules/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@
</nuxt-link>
</template>
<v-list>
<v-list-item class="item-link">
<nuxt-link to="/mypage"><v-list-item-title class="menu-link">マイページ</v-list-item-title></nuxt-link>
</v-list-item>
<p class="space" />
<v-list-item class="item-link">
<nuxt-link to=""><v-list-item-title class="menu-link" @click="logout">ログアウト</v-list-item-title></nuxt-link>
</v-list-item>
<v-list-tile>
<nuxt-link to="/mypage"><v-list-tile-title class="menu-link">マイページ</v-list-tile-title></nuxt-link>
</v-list-tile>
<v-list-tile>
<nuxt-link to=""><v-list-tile-title class="menu-link" @click="logout">ログアウト</v-list-tile-title></nuxt-link>
</v-list-tile>
</v-list>
</v-menu>
</div>
Expand Down Expand Up @@ -64,13 +63,7 @@ export default {
button {
color: $white;
}
.item-link {
margin: 10px;
}
.menu-link {
color: $black;
}
.space {
margin-bottom: 10px;
}
</style>
2 changes: 1 addition & 1 deletion data/top.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"type":"news","title":"複業でバーを開業する方法 -物件探し編-","link":"https://note.com/snacksally/n/nc80656e30c69","service":"note","month":"202105","date":"20210504","img":"https://assets.st-note.com/production/uploads/images/51522662/rectangle_large_type_2_17ba4f6d01416dfbb26eedce78f64098.jpeg","id":"20210504011"},{"link":"https://note.com/fuminaozono/n/nfe33ff92e3df","date":"20210504","type":"news","month":"202105","id":"20210504012","service":"note","title":"【複業】1つの会社に求めすぎてない?セルフブランディングで拓く、社外のしごと。","img":"https://assets.st-note.com/production/uploads/images/51448469/rectangle_large_type_2_4280b9c8ceda71b66d662a42454c136c.jpg"},{"date":"20210504","img":"","type":"news","link":"https://mikotoniomakase.com/imadokihukugyoudekinaikaisyahaokasiibarenaiosusumenohukugyouwosyoukai/","service":"hatena","title":"今時副業できない会社はおかしい?バレないオススメの副業を紹介 | みことにおまかせ/ひきこもりのブログ講座","month":"202105","id":"20210504021"},{"img":"https://cdn-ak-scissors.b.st-hatena.com/image/square/41143dffd550596d4f13ecc3ffd374dcd418d73a/height=280;version=1;width=400/https%3A%2F%2Fpirosengen.com%2Fwp%2Fwp-content%2Fuploads%2F2021%2F05%2F63429D20-EEFD-49A6-ADB5-8209FFA8965A.jpeg","id":"20210504022","service":"hatena","date":"20210504","title":"副業する時間ない!そんな会社員でも確実に月1万円稼ぐ方法について | Laid Back salaryman","month":"202105","link":"https://pirosengen.com/wp/2021/05/03/side-business-no-time/","type":"news"},{"type":"news","service":"hatena","date":"20210504","month":"202105","img":"","link":"https://mikotoniomakase.com/imadokihukugyoudekinaikaisyahaokasiibarenaiosusumenohukugyouwosyoukai/","title":"今時副業できない会社はおかしい?バレないオススメの副業を紹介 | みことにおまかせ/ひきこもりのブログ講座","id":"20210504023"},{"type":"news","date":"20210504","img":"https://cdn-ak-scissors.b.st-hatena.com/image/square/cf4b7d6bcadc24887717a026cc60c93dc549fa96/height=280;version=1;width=400/https%3A%2F%2Fcdn-ak.f.st-hatena.com%2Fimages%2Ffotolife%2Fe%2Fescape2bangkok%2F20210504%2F20210504101516.jpg","month":"202105","title":"◆海外在住者の一時帰国◆変異株感染拡大で入国制限+検疫強化 - 副業のすすめ","id":"20210504024","link":"https://escape2bangkok.hatenadiary.com/entry/temporary-return-to-japan/","service":"hatena"},{"month":"202105","service":"newspicks","id":"20210504031","link":"https://newspicks.com/news/5818818?ref=search&ref_q=%E5%89%AF%E6%A5%AD&ref_t=top","img":"https://contents.newspicks.com/images/news/5818818?updatedAt=20210504222127","date":"20210504","type":"news","title":"「副業を認めていない」64.3%、その理由は? 都内の企業に聞く"},{"id":"20210504032","type":"news","img":"https://contents.newspicks.com/images/news/5818849?updatedAt=20210504001147","title":"自衛隊不祥事の実態スパイに情報流出、副業で風俗経営 他の公務員より「処分」は多い?","service":"newspicks","link":"https://newspicks.com/news/5818849?ref=search&ref_q=%E5%89%AF%E6%A5%AD&ref_t=top","month":"202105","date":"20210504"},{"title":"ステイホームを逆手に GWに副業 新たな選択肢","type":"news","month":"202105","service":"newspicks","link":"https://newspicks.com/news/5818364?ref=search&ref_q=%E5%89%AF%E6%A5%AD&ref_t=top","id":"20210504033","date":"20210504","img":"https://contents.newspicks.com/images/news/5818364?updatedAt=20210503162141"}]
[{"id":"20210506011","service":"note","type":"news","date":"20210506","title":"F●CK Youマネーを貯めたり複業をするのは何故か","link":"https://note.com/akarinbo_2021/n/nccb762e8fd5e","month":"202105","img":"https://assets.st-note.com/production/uploads/images/51637887/rectangle_large_type_2_7bb96fb51412a1ec605f23f3feee88a5.jpeg"},{"month":"202105","img":"https://assets.st-note.com/production/uploads/images/51633535/rectangle_large_type_2_deecec878f8e8f0e8004a72ab4e9da5e.jpg","service":"note","date":"20210506","id":"20210506012","link":"https://note.com/ayapan_0510/n/n54dae2c49f7d","type":"news","title":"【仕事術】複業フリーランス必見!作業効率を高める4つのマルチタスク必勝法"},{"link":"https://note.com/inazoo/n/n509740220e00","type":"news","service":"note","id":"20210506013","month":"202105","title":"#005【複業】私の参考ツール‗YouTubeノウハウ-2","date":"20210506","img":""},{"id":"20210506014","img":"","month":"202105","type":"news","link":"https://note.com/81728172a/n/n6522a05caa73","date":"20210506","service":"note","title":"【副業 おすすめ】美容業界で転売が流行っている"},{"link":"https://note.com/35zaitaku/n/n083a1bf0d804","type":"news","title":"節約という名の副業","img":"https://assets.st-note.com/production/uploads/images/51634211/rectangle_large_type_2_1a2c11556da4fc6ae8f44a4c49c38f6f.png","date":"20210506","service":"note","month":"202105","id":"20210506015"},{"title":"本業と副業をする事は大事なのか?","img":"https://assets.st-note.com/production/uploads/images/51635102/rectangle_large_type_2_94a33209ac1f88b6d31aba5d77755734.jpeg","service":"note","link":"https://note.com/monech/n/nee6e237b0f73","month":"202105","date":"20210506","id":"20210506016","type":"news"},{"id":"20210506017","img":"https://assets.st-note.com/production/uploads/images/51633535/rectangle_large_type_2_deecec878f8e8f0e8004a72ab4e9da5e.jpg","type":"news","service":"note","month":"202105","link":"https://note.com/ayapan_0510/n/n54dae2c49f7d","date":"20210506","title":"【仕事術】複業フリーランス必見!作業効率を高める4つのマルチタスク必勝法"},{"service":"note","img":"https://assets.st-note.com/production/uploads/images/51629676/rectangle_large_type_2_d5772278eee0ca382b219f1a0e2f75f7.jpg","date":"20210506","month":"202105","title":"副業本業","type":"news","link":"https://note.com/makisatogroup/n/nc1d2a9d0e456","id":"20210506018"},{"title":"#005【複業】私の参考ツール‗YouTubeノウハウ-2","month":"202105","link":"https://note.com/inazoo/n/n509740220e00","date":"20210506","img":"","id":"20210506019","type":"news","service":"note"},{"month":"202105","title":"【副業のススメ】 - ガネしゃん","img":"https://cdn-ak-scissors.b.st-hatena.com/image/square/2678d27c145cdb4e43f6672cc243c5e5b014af9f/height=280;version=1;width=400/https%3A%2F%2Fcdn-ak.f.st-hatena.com%2Fimages%2Ffotolife%2Fy%2Fyu_me_po-lly%2F20210419%2F20210419214213.jpg","id":"20210506021","date":"20210506","type":"news","service":"hatena","link":"https://www.yumepolly.com/entry/2021/05/06/080000"},{"service":"newspicks","month":"202105","type":"news","id":"20210506031","link":"https://newspicks.com/news/5822590?ref=search&ref_q=%E5%89%AF%E6%A5%AD&ref_t=top","img":"https://contents.newspicks.com/images/news/5822590?updatedAt=20210505231251","title":"三菱地所、1カ月50時間まで副業を積極推進","date":"20210506"}]
2 changes: 1 addition & 1 deletion data/updatedAt.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"updatedAt":"2021年05月05日 08:14"}]
[{"updatedAt":"2021年05月06日 08:26"}]
4 changes: 1 addition & 3 deletions lib/date.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ function toDoubleDigits(num) {
* 昨日の日付を取得する
* @return string yyyymmdd
*/
export function getYesterday() {
export function getToday() {
const now = new Date()
// 1日前の日付をセット
now.setDate(now.getDate() - 1)
const year = now.getFullYear()
const month = toDoubleDigits(now.getMonth() + 1)
const day = toDoubleDigits(now.getDate())
Expand Down
6 changes: 3 additions & 3 deletions modules/generator.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import firebase from 'firebase/app'
import 'firebase/firestore'
import fs from 'fs'
import { getYesterday, getAllTerm } from '../lib/date'
import { getToday, getAllTerm } from '../lib/date'

module.exports = function generateModule(moduleOptions) {
// dev環境の場合はスキップ
Expand All @@ -22,11 +22,11 @@ module.exports = function generateModule(moduleOptions) {
}

// トップページ用のデータを取得
const yesterday = getYesterday()
const today = getToday()
// const today = '20210503'
const topSnapshot = await firebase
.firestore()
.collection(yesterday)
.collection(today)
.get()

const topNews = topSnapshot.docs.map(doc => {
Expand Down

0 comments on commit 9425739

Please sign in to comment.