diff --git a/.gitignore b/.gitignore index 7943741..6e668ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -<<<<<<< HEAD # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # dependencies @@ -34,7 +33,3 @@ yarn-error.log* # vercel .vercel -======= -**.pyc -**/__pycache__/** ->>>>>>> 4d16d24a15497db48f449576d1265580e4116827 diff --git a/deploy.sh b/deploy.sh index b7c5994..a33b9e8 100755 --- a/deploy.sh +++ b/deploy.sh @@ -5,24 +5,23 @@ set -xe MODE=$1 x=$(sudo docker container ls | grep next-js | wc -l) if [ $x -eq 1 ]; then - sudo docker-compose rm -sf + sudo MODE=$MODE docker-compose rm -sf fi sudo MODE=$MODE docker-compose build if [ ! -d "./src/powerpanel" ]; then - sudo docker-compose run powerpanel-webview npx create-next-app powerpanel - #sudo docker-compose run node npx tailwindcss init -p + sudo MODE=$MODE docker-compose run powerpanel-webview npx create-next-app powerpanel sudo chown -R $USER:$USER ./src - sudo docker-compose run powerpanel-webview npx next telemetry disable + sudo MODE=$MODE docker-compose run powerpanel-webview npx next telemetry disable fi if [ $MODE == "dev" ] || [ $MODE == "start" ]; then sudo MODE=$MODE docker-compose up --build --force-recreate --remove-orphans -d - sudo docker-compose logs -f + sudo MODE=$MODE docker-compose logs -f elif [ $MODE == "build" ]; then - sudo docker-compose run powerpanel-webview bash -c "cd powerpanel && npm install" - sudo docker-compose run powerpanel-webview bash -c "cd powerpanel && npm run build" + sudo MODE=$MODE docker-compose run powerpanel-webview bash -c "cd powerpanel && npm install" + sudo MODE=$MODE docker-compose run powerpanel-webview bash -c "cd powerpanel && npm run build" else echo "Please use 'dev', 'build', or 'start' as an argument." exit 1 diff --git a/src/powerpanel/components/main_view.js b/src/powerpanel/components/main_view.js new file mode 100644 index 0000000..c072d33 --- /dev/null +++ b/src/powerpanel/components/main_view.js @@ -0,0 +1,36 @@ +import Head from "next/head"; + +export default function MainView() { + return ( +
+ + PowerPanel Webview + + + + + +
+
+
+ PowerPanel Info | Power Supply by: Power Supply | Model: Model + Name | Firmware: Firmware Number +
+
+ + + +
+
+
+

item

+

status_dict[item]

+
+
+

item: item

+
+
+ +
+ ); +} diff --git a/src/powerpanel/package-lock.json b/src/powerpanel/package-lock.json index 94e28dd..eec01d0 100644 --- a/src/powerpanel/package-lock.json +++ b/src/powerpanel/package-lock.json @@ -3789,6 +3789,11 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, + "xp.css": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/xp.css/-/xp.css-0.2.4.tgz", + "integrity": "sha512-Ys78J7QYojkN9ZHOeuDvIcVZL34liCybU7csRyj886P+ZmyLxydSnSsk4jV9+xCyMoWtNPiPptwS07DKmp4Fyw==" + }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/src/powerpanel/package.json b/src/powerpanel/package.json index 4dc0489..9f1c754 100644 --- a/src/powerpanel/package.json +++ b/src/powerpanel/package.json @@ -11,7 +11,8 @@ "dependencies": { "next": "11.1.2", "react": "17.0.2", - "react-dom": "17.0.2" + "react-dom": "17.0.2", + "xp.css": "^0.2.4" }, "devDependencies": { "eslint": "7.32.0", diff --git a/src/powerpanel/pages/_app.js b/src/powerpanel/pages/_app.js index 1e1cec9..4e8aaf0 100644 --- a/src/powerpanel/pages/_app.js +++ b/src/powerpanel/pages/_app.js @@ -1,4 +1,4 @@ -import '../styles/globals.css' +import "xp.css/dist/XP.css"; function MyApp({ Component, pageProps }) { return diff --git a/src/powerpanel/pages/index.js b/src/powerpanel/pages/index.js index 08145bb..247e0ca 100644 --- a/src/powerpanel/pages/index.js +++ b/src/powerpanel/pages/index.js @@ -1,69 +1,5 @@ -import Head from 'next/head' -import Image from 'next/image' -import styles from '../styles/Home.module.css' +import MainView from "../components/main_view"; export default function Home() { - return ( -
- - Create Next App - - - - -
-

- Welcome to Next.js! -

- -

- Get started by editing{' '} - pages/index.js -

- -
- -

Documentation →

-

Find in-depth information about Next.js features and API.

- - - -

Learn →

-

Learn about Next.js in an interactive course with quizzes!

- - - -

Examples →

-

Discover and deploy boilerplate example Next.js projects.

- - - -

Deploy →

-

- Instantly deploy your Next.js site to a public URL with Vercel. -

- -
-
- - -
- ) + return ; }