From 0b20101f9709f064d74ff85450baa5efe48c29d6 Mon Sep 17 00:00:00 2001 From: Artemy Date: Wed, 10 Aug 2022 19:47:25 +0300 Subject: [PATCH] feat: menu --- index.html | 4 +- package-lock.json | 89 ++++++++++++++++++++++++++++++++++++++- package.json | 3 +- src/App.jsx | 33 ++++++++++++--- src/components/button.jsx | 11 +++++ src/components/menu.jsx | 13 ++++++ src/index.css | 3 +- src/main.jsx | 17 +++++--- src/pages/regAuth.jsx | 0 tailwind.config.cjs | 1 + 10 files changed, 156 insertions(+), 18 deletions(-) create mode 100644 src/components/button.jsx create mode 100644 src/components/menu.jsx create mode 100644 src/pages/regAuth.jsx diff --git a/index.html b/index.html index 2936215..4ce0e4e 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,11 @@ - + - Vite + React + OSMA app diff --git a/package-lock.json b/package-lock.json index b072e04..e003945 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,8 @@ "dependencies": { "@tauri-apps/api": "^1.0.2", "react": "^18.2.0", - "react-dom": "^18.2.0" + "react-dom": "^18.2.0", + "react-router-dom": "^6.3.0" }, "devDependencies": { "@tauri-apps/cli": "^1.0.5", @@ -380,6 +381,17 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/runtime": { + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "dependencies": { + "regenerator-runtime": "^0.13.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/template": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", @@ -1577,6 +1589,14 @@ "node": ">=4" } }, + "node_modules/history": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz", + "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==", + "dependencies": { + "@babel/runtime": "^7.7.6" + } + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -1995,6 +2015,30 @@ "node": ">=0.10.0" } }, + "node_modules/react-router": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz", + "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==", + "dependencies": { + "history": "^5.2.0" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-router-dom": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz", + "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==", + "dependencies": { + "history": "^5.2.0", + "react-router": "6.3.0" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", @@ -2016,6 +2060,11 @@ "node": ">=8.10.0" } }, + "node_modules/regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + }, "node_modules/resolve": { "version": "1.22.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", @@ -2559,6 +2608,14 @@ "@babel/helper-plugin-utils": "^7.18.6" } }, + "@babel/runtime": { + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, "@babel/template": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", @@ -3290,6 +3347,14 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true }, + "history": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz", + "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==", + "requires": { + "@babel/runtime": "^7.7.6" + } + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -3552,6 +3617,23 @@ "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==", "dev": true }, + "react-router": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz", + "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==", + "requires": { + "history": "^5.2.0" + } + }, + "react-router-dom": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz", + "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==", + "requires": { + "history": "^5.2.0", + "react-router": "6.3.0" + } + }, "read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", @@ -3570,6 +3652,11 @@ "picomatch": "^2.2.1" } }, + "regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + }, "resolve": { "version": "1.22.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", diff --git a/package.json b/package.json index 6f028f5..93338b3 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "dependencies": { "@tauri-apps/api": "^1.0.2", "react": "^18.2.0", - "react-dom": "^18.2.0" + "react-dom": "^18.2.0", + "react-router-dom": "^6.3.0" }, "devDependencies": { "@tauri-apps/cli": "^1.0.5", diff --git a/src/App.jsx b/src/App.jsx index 78a4af6..f3ec408 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,13 +1,34 @@ import { useState } from "react"; +import "./components/menu"; +import Menu from "./components/menu"; +import { Routes, Route } from "react-router-dom"; function App() { - const [signup, setSignup] = useState(true); - return ( -
-
- osma app in developing... -
+
+ + + + Page for check authorisation +
+ } + /> + Main page!
} + /> + Your library!} + /> + Your downloads!} + /> + ); } diff --git a/src/components/button.jsx b/src/components/button.jsx new file mode 100644 index 0000000..65a7b6d --- /dev/null +++ b/src/components/button.jsx @@ -0,0 +1,11 @@ +function Button(props) { + return ( + +
+ {props.children} +
+ + ); +} + +export default Button; diff --git a/src/components/menu.jsx b/src/components/menu.jsx new file mode 100644 index 0000000..553765f --- /dev/null +++ b/src/components/menu.jsx @@ -0,0 +1,13 @@ +import Button from "./button"; + +function Menu() { + return ( +
+ + + +
+ ); +} + +export default Menu; diff --git a/src/index.css b/src/index.css index 3391a11..b098903 100644 --- a/src/index.css +++ b/src/index.css @@ -3,5 +3,6 @@ @tailwind utilities; body{ - @apply bg-gray-700; + @apply dark:bg-zinc-900; + @apply bg-zinc-300; } \ No newline at end of file diff --git a/src/main.jsx b/src/main.jsx index 9af0bb6..9a01ed4 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -1,10 +1,13 @@ -import React from 'react' -import ReactDOM from 'react-dom/client' -import App from './App' -import './index.css' +import React from "react"; +import ReactDOM from "react-dom/client"; +import App from "./App"; +import "./index.css"; +import { BrowserRouter } from "react-router-dom"; -ReactDOM.createRoot(document.getElementById('root')).render( +ReactDOM.createRoot(document.getElementById("root")).render( - + + + -) +); diff --git a/src/pages/regAuth.jsx b/src/pages/regAuth.jsx new file mode 100644 index 0000000..e69de29 diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 7d5ee8c..404d0a2 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -4,5 +4,6 @@ module.exports = { theme: { extend: {}, }, + darkMode: "class", plugins: [], };