Merge pull request #29 from weseek/imprv/120946-new-top-design-organi…

…zation

release

.devcontainer/Dockerfile

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:10
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-18
 
 # The node image includes a non-root user with sudo access. Use the
 # "remoteUser" property in devcontainer.json to use it. On Linux, update
@@ -15,6 +15,8 @@ ARG USER_GID=$USER_UID
 
 RUN mkdir -p /growi-org/node_modules
 
+RUN apt-get update && apt-get -y install --no-install-recommends git-lfs
+
 # [Optional] Update UID/GID if needed
 RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \
         groupmod --gid $USER_GID $USERNAME \

.devcontainer/devcontainer.json

@@ -2,35 +2,36 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/javascript-node-12-mongo
 // If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
 {
-	"name": "growi-org",
-	"dockerComposeFile": "docker-compose.yml",
-	"service": "node",
-	"workspaceFolder": "/growi-org",
+  "name": "growi-org",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "node",
+  "workspaceFolder": "/growi-org",
 
-	// Set *default* container specific settings.json values on container create.
+  // Set *default* container specific settings.json values on container create.
 	"settings": {
 		"terminal.integrated.shell.linux": "/bin/bash"
 	},
 
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"dbaeumer.vscode-eslint",
-		"eamodio.gitlens",
-		"editorconfig.editorconfig",
-		"esbenp.prettier-vscode",
-		"shinnn.stylelint",
-		"hex-ci.stylelint-plus",
-	],
+  // Add the IDs of extensions you want installed when the container is created.
+  "extensions": [
+    "dbaeumer.vscode-eslint",
+    "eamodio.gitlens",
+    "editorconfig.editorconfig",
+    "esbenp.prettier-vscode",
+    "shinnn.stylelint",
+    "hex-ci.stylelint-plus",
+    "taichi.vscode-textlint",
+  ],
 
-	// Uncomment the next line if you want start specific services in your Docker Compose config.
-	// "runServices": [],
+  // Uncomment the next line if you want start specific services in your Docker Compose config.
+  // "runServices": [],
 
-	// Uncomment the line below if you want to keep your containers running after VS Code shuts down.
-	// "shutdownAction": "none",
+  // Uncomment the line below if you want to keep your containers running after VS Code shuts down.
+  // "shutdownAction": "none",
 
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "yarn install",
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "yarn install",
 
-	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "node"
+  // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "node"
 }

.gitattributes

@@ -0,0 +1,2 @@
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text

.github/workflows/deploy.yml

@@ -12,18 +12,19 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.14]
+        node-version: [18]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
+        lfs: true
 
     - name: Cache/Restore node_modules
       id: cache-dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: node_modules
         key: ${{ runner.OS }}-node_modules-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
@@ -35,7 +36,7 @@ jobs:
 
     - name: Cache/Restore yarn cache
       if: steps.cache-dependencies.outputs.cache-hit != 'true'
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ steps.cache-yarn.outputs.dir }}
         key: ${{ runner.os }}-yarn-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
@@ -54,7 +55,7 @@ jobs:
         yarn list --depth=0
 
     - name: Build and deploy
-      uses: miya/vuepress-deploy@master # TODO: Using jenkey2011/vuepress-deploy after upgrading node
+      uses: jenkey2011/vuepress-deploy@master
       env:
         ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BUILD_SCRIPT: yarn docs:build

.github/workflows/textlint.yml

@@ -0,0 +1,20 @@
+name: Textlint
+on: pull_request
+jobs:
+  textlint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    # setup Node.js
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '18'
+        cache: 'yarn'
+        cache-dependency-path: '**/yarn.lock'
+
+    # Run scripts
+    - name: Install dependencies
+      run: yarn install
+    - name: linting markdown files
+      run: yarn run lint

.textlintrc

@@ -0,0 +1,8 @@
+{
+  "filters": {
+    "comments": true
+  },
+  "rules": {
+    "preset-weseek": true
+  }
+}

README.md

@@ -2,9 +2,10 @@
 [![Deploy](https://github.com/weseek/growi-org/actions/workflows/deploy.yml/badge.svg)](https://github.com/weseek/growi-org/actions/workflows/deploy.yml)
 
 ## Requirements
-
-- Node.js 10.x
-- npm 6.x
+<!-- textlint-disable weseek/ginger -->
+- Node.js 14.x
+<!-- textlint-disable weseek/ginger -->
+- NPM 6.x
 - Yarn 1.12 or above
 
 ## How to start?
@@ -14,14 +15,14 @@ yarn
 yarn start
 ```
 
-Then, access to the url that VuePress will print like below.
+Then, access to the URL that VuePress will print like below.
 
 ``` bash
 > VuePress dev server listening at http://localhost:8080/
 ```
 
 ## How to write docs?
 
-Add markdown file to `docs` dir.
+Add Markdown file to `docs` dir.
 
-For detail, please reference [VuePress Documents](https://vuepress.vuejs.org/).
+For detail, please refer [VuePress Documents](https://vuepress.vuejs.org/).

docs/.vuepress/config.js

@@ -51,8 +51,10 @@ module.exports = ctx => ({
     ['link', { href: 'https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css', rel: 'stylesheet'}],
     // Fonts
     ['link', { href: 'https://fonts.googleapis.com/css?family=Lato:300,400,400italic,700', rel: 'stylesheet', type: 'text/css'}],
-    ['link', { href: 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', rel: 'stylesheet', integrity: 'sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN', crossorigin: 'anonymous'}],
+    ['link', { href: 'https://use.fontawesome.com/releases/v6.2.0/css/all.css', rel: 'stylesheet'}],
     ['link', { href: 'https://cdn.linearicons.com/free/1.0.0/icon-font.min.css', rel: 'stylesheet'}],
+    ['link', { href: 'https://fonts.googleapis.com/css2?family=Montserrat:wght@400;600&display=swap', rel: 'stylesheet', type: 'text/css'}],
+    ['link', { href: 'https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@100;300;400;500;700;900&display=swap', rel: 'stylesheet'}],
   ],
   locales: {
     '/en/': {

docs/.vuepress/enhanceApp.js

@@ -1,4 +1,5 @@
 import VS2 from 'vue-script2'
+import 'bootstrap/dist/css/bootstrap.css';
 
 export default ({
   Vue,

docs/.vuepress/nav/en.js

@@ -1,30 +1,10 @@
 module.exports = [
   {
-    text: 'Home',
-    link: '/en/#home'
-  },
-  {
-    text: 'Features',
-    link: '/en/#features'
-  },
-  {
-    text: 'GROWI.cloud',
-    link: '/en/#cloud'
+    text: 'Demo',
+    link: 'https://demo.growi.org/'
   },
   {
     text: 'Documents',
-    link: '/en/#documents'
+    link: 'https://docs.growi.org/en/'
   },
-  {
-    text: 'JOIN US',
-    link: '/en/#joinus'
-  },
-  {
-    text: 'Plugin',
-    link: '/plugins',
-  },
-  {
-    text: 'Blog',
-    link: 'https://weseek.co.jp/tech/category/growi/'
-  }
 ]

docs/.vuepress/nav/ja.js

@@ -1,30 +1,10 @@
 module.exports = [
   {
-    text: 'ホーム',
-    link: '/ja/#home'
-  },
-  {
-    text: '機能紹介',
-    link: '/ja/#features'
-  },
-  {
-    text: 'GROWI.cloud',
-    link: '/ja/#cloud'
+    text: 'デモ',
+    link: 'https://demo.growi.org/'
   },
   {
     text: 'ドキュメント',
-    link: '/ja/#documents'
+    link: 'https://docs.growi.org/ja/'
   },
-  {
-    text: 'JOIN US',
-    link: '/ja/#joinus'
-  },
-  {
-    text: 'プラグイン',
-    link: '/plugins',
-  },
-  {
-    text: 'Blog',
-    link: 'https://weseek.co.jp/tech/category/growi/'
-  }
 ]