Skip to content

Commit

Permalink
Merge pull request #1381 from crupest/front-dev
Browse files Browse the repository at this point in the history
Re-bootstrap front end.
  • Loading branch information
crupest committed Jul 10, 2023
2 parents b416924 + b25cee7 commit 1d5fbed
Show file tree
Hide file tree
Showing 107 changed files with 2,246 additions and 3,108 deletions.
7 changes: 1 addition & 6 deletions .dockerignore
Expand Up @@ -15,9 +15,4 @@ BackEnd/Timeline/publish

FrontEnd/dist
FrontEnd/node_modules
FrontEnd/.yarn/*
!FrontEnd/.yarn/releases
!FrontEnd/.yarn/plugins
!FrontEnd/.yarn/cache
!FrontEnd/.yarn/sdks
!FrontEnd/.yarn/versions
FrontEnd/.parcel-cache
2 changes: 1 addition & 1 deletion .github/workflows/front-ci.yaml
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: pnpm/action-setup@v2
with:
version: 7
version: 8

- name: Use Node.js Latest
uses: actions/setup-node@v3
Expand Down
5 changes: 0 additions & 5 deletions FrontEnd/.eslintignore
@@ -1,6 +1 @@
.yarn
node_modules
dist
.eslintrc.cjs
postcss.config.js
vite.config.js
27 changes: 6 additions & 21 deletions FrontEnd/.eslintrc.cjs
@@ -1,39 +1,24 @@
module.exports = {
root: true,
env: {
browser: true,
es2022: true,
},
extends: [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:react/jsx-runtime",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:prettier/recommended",
"plugin:react-hooks/recommended",
"prettier",
],
plugins: ["@typescript-eslint", "prettier", "react", "react-hooks"],
parser: "@typescript-eslint/parser",
parserOptions: {
tsconfigRootDir: __dirname,
project: ["./tsconfig.json"],
project: true,
tsconfigRootDir: __dirname
},
plugins: ["react", "@typescript-eslint", "react-hooks"],
settings: {
react: {
version: "detect",
},
},
rules: {
"react/prop-types": "off",
"@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_" }],
"@typescript-eslint/explicit-function-return-type": [
"warn",
{
allowExpressions: true,
allowTypedFunctionExpressions: true,
allowHigherOrderFunctions: true,
},
],
},
};
1 change: 0 additions & 1 deletion FrontEnd/.gitattributes

This file was deleted.

18 changes: 2 additions & 16 deletions FrontEnd/.gitignore
Expand Up @@ -3,18 +3,8 @@
# dependencies
/node_modules

.yarn/*
!.yarn/cache
!.yarn/releases
!.yarn/plugins
!.yarn/sdks
!.yarn/versions

# testing
/coverage

# production
/build
/dist

# misc
.DS_Store
Expand All @@ -24,9 +14,5 @@
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

.vscode/launch.json

/dist
/.parcel-cache
7 changes: 7 additions & 0 deletions FrontEnd/.proxyrc.json
@@ -0,0 +1,7 @@
{
"/api": {
"target": "http://localhost:5000",
"changeOrigin": true,
"ws": true
}
}
10 changes: 9 additions & 1 deletion FrontEnd/cspell.json
@@ -1,4 +1,12 @@
{
"version": "0.2",
"ignorePaths": ["**/node_modules/**", "pnpm-lock.yaml"]
"ignorePaths": [
"**/node_modules/**",
"pnpm-lock.yaml"
],
"words": [
"languagedetector",
"popperjs",
"signalr"
]
}
File renamed without changes
File renamed without changes
File renamed without changes
Expand Up @@ -2,7 +2,7 @@
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<square150x150logo src="./mstile-150x150.png"/>
<TileColor>#2d89ef</TileColor>
</tile>
</msapplication>
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Expand Up @@ -5,12 +5,12 @@
"description": "Record your life in Timeline! Created by crupest.",
"icons": [
{
"src": "/android-chrome-192x192.png",
"src": "./android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"src": "./android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
Expand Down
55 changes: 29 additions & 26 deletions FrontEnd/index.html
@@ -1,30 +1,33 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />

<link rel="icon" href="/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="manifest" href="/site.webmanifest" />
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
<meta name="msapplication-TileColor" content="#2d89ef" />
<meta name="theme-color" content="#ffffff" />
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />

<title>Timeline</title>
</head>
<body>
<noscript>
<strong>
We're sorry but Timeline doesn't work properly without JavaScript
enabled. Please enable it to continue.
</strong>
</noscript>
<div id="app"></div>
<div id="portal"></div>
<script type="module" src="/src/index.tsx"></script>
</body>
</html>
<link rel="icon" href="./favicons/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="./favicons/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="./favicons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="./favicons/favicon-16x16.png" />
<link rel="manifest" href="./favicons/site.webmanifest" />
<link rel="mask-icon" href="./favicons/safari-pinned-tab.svg" color="#5bbad5" />
<meta name="msapplication-TileColor" content="#2d89ef" />
<meta name="theme-color" content="#ffffff" />

<title>Timeline</title>
</head>

<body>
<noscript>
<strong>
We're sorry but Timeline doesn't work properly without JavaScript
enabled. Please enable it to continue.
</strong>
</noscript>
<div id="app"></div>
<div id="portal"></div>
<script type="module" src="./src/index.tsx"></script>
</body>

</html>
87 changes: 41 additions & 46 deletions FrontEnd/package.json
Expand Up @@ -2,74 +2,69 @@
"name": "timeline",
"version": "0.4.0",
"private": true,
"homepage": "https://crupest.space",
"keywords": [],
"description": "Timeline app.",
"type": "module",
"source": "index.html",
"scripts": {
"start": "parcel --port 5678",
"build": "tsc && parcel build",
"type-check": "tsc",
"lint": "eslint src/ --ext .js --ext .jsx --ext .ts --ext .tsx",
"lint:fix": "eslint src/ --ext .js --ext .jsx --ext .ts --ext .tsx --fix",
"check": "pnpm run type-check && pnpm run lint",
"check:fix": "pnpm run type-check && pnpm run lint:fix"
},
"dependencies": {
"@microsoft/signalr": "^7.0.3",
"@popperjs/core": "^2.11.6",
"axios": "^1.3.4",
"bootstrap": "^5.2.3",
"bootstrap-icons": "^1.10.3",
"@microsoft/signalr": "^7.0.7",
"@popperjs/core": "^2.11.8",
"axios": "^1.4.0",
"bootstrap": "^5.3.0",
"bootstrap-icons": "^1.10.5",
"classnames": "^2.3.2",
"color": "^4.2.3",
"core-js": "^3.28.0",
"i18next": "^22.4.10",
"i18next-browser-languagedetector": "^7.0.1",
"core-js": "^3.31.1",
"i18next": "^23.2.8",
"i18next-browser-languagedetector": "^7.1.0",
"js-base64": "^3.7.5",
"lodash": "^4.17.21",
"marked": "^4.2.12",
"marked": "^5.1.1",
"moment": "^2.29.4",
"pepjs": "^0.5.3",
"react": "^18.2.0",
"react-color": "^2.19.3",
"react-dom": "^18.2.0",
"react-i18next": "^12.2.0",
"react-i18next": "^13.0.1",
"react-popper": "^2.3.0",
"react-responsive": "^9.0.2",
"react-router-dom": "^6.8.1",
"react-router-dom": "^6.14.1",
"react-transition-group": "^4.4.5",
"regenerator-runtime": "^0.13.11",
"rxjs": "^7.8.0",
"workbox-cacheable-response": "^6.5.4",
"workbox-expiration": "^6.5.4",
"workbox-precaching": "^6.5.4",
"workbox-routing": "^6.5.4",
"workbox-strategies": "^6.5.4",
"workbox-window": "^6.5.4",
"rxjs": "^7.8.1",
"xregexp": "^5.1.1"
},
"scripts": {
"start": "vite",
"build": "tsc && vite build",
"preview": "vite preview",
"type-check": "tsc",
"lint": "eslint src/ --ext .js --ext .jsx --ext .ts --ext .tsx",
"lint:fix": "eslint src/ --ext .js --ext .jsx --ext .ts --ext .tsx --fix"
},
"devDependencies": {
"@tsconfig/vite-react": "^1.0.1",
"@parcel/packager-raw-url": "2.9.3",
"@parcel/transformer-webmanifest": "2.9.3",
"@tsconfig/vite-react": "^2.0.0",
"@types/color": "^3.0.3",
"@types/lodash": "^4.14.191",
"@types/marked": "^4.0.8",
"@types/node": "^18.14.1",
"@types/react": "^18.0.28",
"@types/lodash": "^4.14.195",
"@types/marked": "^5.0.0",
"@types/node": "^20.4.1",
"@types/parcel-env": "^0.0.1",
"@types/react": "^18.2.14",
"@types/react-color": "^3.0.6",
"@types/react-dom": "^18.0.11",
"@types/react-dom": "^18.2.6",
"@types/react-responsive": "^8.0.5",
"@types/react-transition-group": "^4.4.5",
"@typescript-eslint/eslint-plugin": "^5.53.0",
"@typescript-eslint/parser": "^5.53.0",
"@vitejs/plugin-react": "^3.1.0",
"eslint": "^8.35.0",
"eslint-config-prettier": "^8.6.0",
"@types/react-transition-group": "^4.4.6",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"buffer": "^6.0.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"prettier": "^2.8.4",
"typescript": "^4.9.5",
"vite": "^4.1.4",
"vite-plugin-pwa": "^0.14.4"
"parcel": "latest",
"prettier": "^3.0.0",
"process": "^0.11.10",
"typescript": "^5.1.6"
}
}

0 comments on commit 1d5fbed

Please sign in to comment.