diff options
-rw-r--r-- | .github/workflows/front-ci.yaml | 13 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | FrontEnd/.vscode/extensions.json | 1 | ||||
-rw-r--r-- | FrontEnd/.vscode/settings.json | 10 | ||||
-rw-r--r-- | FrontEnd/.yarnrc.yml | 5 | ||||
-rw-r--r-- | FrontEnd/src/app/views/search/index.tsx | 7 |
6 files changed, 15 insertions, 23 deletions
diff --git a/.github/workflows/front-ci.yaml b/.github/workflows/front-ci.yaml index 93581dad..2373c48c 100644 --- a/.github/workflows/front-ci.yaml +++ b/.github/workflows/front-ci.yaml @@ -22,19 +22,26 @@ jobs: steps:
- uses: actions/checkout@v2
+ - uses: actions/cache@v2
+ with:
+ path: ~/.npm
+ key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+ restore-keys: |
+ ${{ runner.os }}-node-
+
- name: Use Node.js 15
uses: actions/setup-node@v1
with:
node-version: "15"
- name: Restore Packages
- run: yarn
+ run: npm ci
- name: Build App
- run: yarn build
+ run: npm run build
- name: Lint Code
- run: yarn lint
+ run: npm run lint
- name: Upload Artifact
uses: actions/upload-artifact@v2
@@ -1,7 +1,7 @@ FROM node:latest AS front-build
WORKDIR /timeline-app
COPY FrontEnd .
-RUN yarn && yarn build
+RUN npm ci && npm run build
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS back-build
WORKDIR /timeline-app
diff --git a/FrontEnd/.vscode/extensions.json b/FrontEnd/.vscode/extensions.json index be640996..78df04fa 100644 --- a/FrontEnd/.vscode/extensions.json +++ b/FrontEnd/.vscode/extensions.json @@ -2,7 +2,6 @@ "recommendations": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
- "arcanis.vscode-zipfs",
"syler.sass-indented",
"editorconfig.editorconfig"
]
diff --git a/FrontEnd/.vscode/settings.json b/FrontEnd/.vscode/settings.json deleted file mode 100644 index bd19b53e..00000000 --- a/FrontEnd/.vscode/settings.json +++ /dev/null @@ -1,10 +0,0 @@ -{
- "eslint.nodePath": ".yarn/sdks",
- "prettier.prettierPath": ".yarn/sdks/prettier/index.js",
- "typescript.tsdk": ".yarn/sdks/typescript/lib",
- "typescript.enablePromptUseWorkspaceTsdk": true,
- "search.exclude": {
- "**/.yarn": true,
- "**/.pnp.*": true
- }
-}
diff --git a/FrontEnd/.yarnrc.yml b/FrontEnd/.yarnrc.yml deleted file mode 100644 index 6556c74e..00000000 --- a/FrontEnd/.yarnrc.yml +++ /dev/null @@ -1,5 +0,0 @@ -plugins:
- - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
- spec: "@yarnpkg/plugin-interactive-tools"
-
-yarnPath: .yarn/releases/yarn-2.4.0.cjs
diff --git a/FrontEnd/src/app/views/search/index.tsx b/FrontEnd/src/app/views/search/index.tsx index 3cd3da58..7d11d899 100644 --- a/FrontEnd/src/app/views/search/index.tsx +++ b/FrontEnd/src/app/views/search/index.tsx @@ -1,14 +1,15 @@ -import { TimelineInfo } from "@/services/timeline"; import React from "react"; import { Container, Row } from "react-bootstrap"; import { useHistory, useLocation } from "react-router"; import { Link } from "react-router-dom"; +import { HttpNetworkError } from "@/http/common"; import { getHttpSearchClient } from "@/http/search"; -import SearchInput from "../common/SearchInput"; -import { HttpNetworkError } from "@/http/common"; +import { TimelineInfo } from "@/services/timeline"; import { useAvatar } from "@/services/user"; + +import SearchInput from "../common/SearchInput"; import BlobImage from "../common/BlobImage"; const TimelineSearchResultItemView: React.FC<{ timeline: TimelineInfo }> = ({ |