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.

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

[DO NOT MERGE] Nuxt.jsの導入 #54

Open
wants to merge 48 commits into
base: feature/dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
689acd5
move to old
kobakazu0429 Dec 8, 2018
e98f80b
create-nuxt-app kure_kosen_map
kobakazu0429 Dec 8, 2018
b9e86dc
設定の置き換え
kobakazu0429 Dec 8, 2018
758263b
move images
kobakazu0429 Dec 8, 2018
f707eaf
設定のし直し
kobakazu0429 Dec 8, 2018
7c4b213
yarn lint: add fix
kobakazu0429 Dec 8, 2018
e701ad6
yarn lint
kobakazu0429 Dec 8, 2018
8c8c4c0
move index
kobakazu0429 Dec 8, 2018
b1794bf
いらないファイルの削除
kobakazu0429 Dec 8, 2018
a0780ae
fix css imports
kobakazu0429 Dec 8, 2018
e42ed13
move about_us
kobakazu0429 Dec 8, 2018
d16e5d4
contactを移行中
aidmiya Dec 8, 2018
fbd041c
レイアウトを元通りにした
aidmiya Dec 8, 2018
4b482de
scriptの適用に苦戦中
aidmiya Dec 8, 2018
f95dcf5
メニューが動いた
aidmiya Dec 11, 2018
9c35c93
ボタンをfixedにし、リンクをnuxt-linkにした
aidmiya Dec 11, 2018
716c0c5
メニュー内のリンクを変更
aidmiya Dec 11, 2018
48331f3
remove comment
kobakazu0429 Dec 19, 2018
48c37ae
remove logo.vue
kobakazu0429 Dec 19, 2018
76eac0e
fix
kobakazu0429 Dec 19, 2018
be118f0
fix
kobakazu0429 Dec 19, 2018
8b0bd32
headerの切り分け
kobakazu0429 Dec 19, 2018
f55884b
Headerをglobalに登録
kobakazu0429 Dec 19, 2018
d470930
remove drawer.css
kobakazu0429 Dec 19, 2018
b3316b8
fix
kobakazu0429 Dec 19, 2018
a90df0f
clean
kobakazu0429 Dec 19, 2018
477b511
clean
kobakazu0429 Dec 19, 2018
f9a056e
clean
kobakazu0429 Dec 19, 2018
ff0817b
clean
kobakazu0429 Dec 19, 2018
c86e6a3
clean
kobakazu0429 Dec 20, 2018
69c5b3c
Headerのボタンの位置を変更
aidmiya Dec 20, 2018
87543af
clean
aidmiya Dec 20, 2018
6562f3d
sp版contactフォームを中央揃え
aidmiya Dec 20, 2018
86e1b43
メニューの背景色をpropsで可変にした
aidmiya Dec 23, 2018
91b8954
fix
aidmiya Dec 23, 2018
fa740e9
defaultのbackgroundをtransparentにする
aidmiya Dec 23, 2018
7e80d0c
use the latest font-awesome CDN
aidmiya Dec 23, 2018
1b0ce51
use camelCase in JS
aidmiya Dec 23, 2018
a2bf5e1
CSS変数を導入した
aidmiya Dec 23, 2018
d4b6a8d
CSS変数によりPC,SP別々のstyleをpropsで指定可能に
aidmiya Dec 23, 2018
2b49b8f
propsによるSP,PC別々の文字色・背景色の指定が可能になった
aidmiya Dec 23, 2018
d5bee1e
もともとの配色をpropsに指定した
aidmiya Dec 23, 2018
988421f
初期値をwhiteとblackにした
aidmiya Dec 23, 2018
bc4783b
配色をObjectのプロパティで渡すようにした
aidmiya Dec 24, 2018
5c28ad3
メニューのPC表示でのborderもpropsで制御できるようにした
aidmiya Dec 24, 2018
7ffb603
フォームをPCでも中央揃えにした
aidmiya Dec 24, 2018
a960b63
CSS内にあるpropsを使う部分のデフォルトを消す
aidmiya Dec 25, 2018
0418f22
Merge pull request #55 from kure-kosen/nuxt/contact
kobakazu0429 Dec 25, 2018
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
15 changes: 0 additions & 15 deletions .babelrc

This file was deleted.

19 changes: 0 additions & 19 deletions .eslintrc.js

This file was deleted.

14 changes: 0 additions & 14 deletions .gitignore

This file was deleted.

55 changes: 3 additions & 52 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,54 +1,5 @@
{
"[markdown]": {
"files.trimTrailingWhitespace": false
},
"diffEditor.renderSideBySide": false,
"editor.colorDecorators": false,
"editor.detectIndentation": false,
"editor.formatOnPaste": true,
"editor.formatOnSave": true,
"editor.formatOnType": true,
"editor.insertSpaces": true,
"editor.minimap.renderCharacters": false,
"editor.minimap.showSlider": "always",
"editor.multiCursorModifier": "ctrlCmd",
"editor.renderControlCharacters": true,
"editor.renderLineHighlight": "all",
"editor.renderWhitespace": "all",
"editor.snippetSuggestions": "top",
"editor.tabSize": 2,
"editor.wordWrap": "on",
"emmet.showSuggestionsAsSnippets": true,
"emmet.triggerExpansionOnTab": true,
"emmet.variables": {
"lang": "ja"
},
"eslint.validate": ["javascript"],
"explorer.confirmDelete": false,
"files.associations": {
".*lintrc": "json"
},
"files.exclude": {
"**/*.map": true,
"**/node_modules": true
},
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"html.format.contentUnformatted": "pre, code, textarea, title, h1, h2, h3, h4, h5, h6, p",
"html.format.extraLiners": "",
"html.format.unformatted": null,
"html.format.wrapLineLength": 120,
"prettier.bracketSpacing": true,
"prettier.jsxBracketSameLine": false,
"prettier.printWidth": 120,
"prettier.semi": false,
"prettier.singleQuote": true,
"prettier.useTabs": false,
"search.exclude": {
"**/tmp": true
},
"workbench.editor.labelFormat": "short",
"workbench.editor.tabSizing": "shrink",
"workbench.startupEditor": "newUntitledFile"
"editor.formatOnSave": false,
"sslint.autoFixOnSave": true,
"prettier.tslintIntegration": true
}
8 changes: 6 additions & 2 deletions .editorconfig → kure_kosen_map/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
File renamed without changes.
24 changes: 24 additions & 0 deletions kure_kosen_map/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = {
root: true,
env: { browser: true, es6: true },
parserOptions: {
parser: 'babel-eslint',
ecmaVersion: 6,
sourceType: 'module'
},
extends: ['plugin:vue/recommended', 'plugin:prettier/recommended'],
plugins: ['vue', 'prettier'],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'linebreak-style': ['error', 'unix'],
indent: ['error', 2],
quotes: ['error', 'double'],
semi: ['error', 'always'],
'semi-spacing': ['error', { after: true, before: false }],
'semi-style': ['error', 'last'],
'no-extra-semi': 'error',
'no-unexpected-multiline': 'error',
'no-unreachable': 'error'
}
}
84 changes: 84 additions & 0 deletions kure_kosen_map/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# Created by .ignore support plugin (hsz.mobi)
### Node template
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# parcel-bundler cache (https://parceljs.org/)
.cache

# next.js build output
.next

# nuxt.js build output
.nuxt

# Nuxt generate
dist

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless

# IDE
.idea

# Mac ignore file
.DS_Store
9 changes: 9 additions & 0 deletions kure_kosen_map/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"semi": true,
"singleQuote": false,
"printWidth": 120,
"useTabs": false,
"trailingComma": "none",
"bracketSpacing": true,
"jsxBracketSameLine": false
}
19 changes: 19 additions & 0 deletions README.md → kure_kosen_map/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,22 @@ vscode なら以下の拡張機能を入れる
### プルリクエストについて

- `yarn format`を使ってコードを`prettier`で整形しておくこと

## Nuxt

### Build Setup

``` bash
# install dependencies
$ yarn install

# serve with hot reload at localhost:3000
$ yarn run dev

# build for production and launch server
$ yarn run build
$ yarn start

# generate static project
$ yarn run generate
```
7 changes: 7 additions & 0 deletions kure_kosen_map/assets/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# ASSETS

**This directory is not required, you can delete it if you don't want to use it.**

This directory contains your un-compiled assets such as LESS, SASS, or JavaScript.

More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#webpacked).
7 changes: 7 additions & 0 deletions kure_kosen_map/components/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# COMPONENTS

**This directory is not required, you can delete it if you don't want to use it.**

The components directory contains your Vue.js Components.

_Nuxt.js doesn't supercharge these components._
Loading