Merge pull request #70 from pacstall/develop

2022.04-1
pacstall · Apr 9, 2022 · 1f1ed33 · 1f1ed33
2 parents 0931027 + 64d1ff9
commit 1f1ed33
Show file tree

Hide file tree

Showing 61 changed files with 11,206 additions and 10,231 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
-server/dist:
+server/dist: $(shell find server -not \( -path server/tmp -prune \) -not \( -path server/dist -prune \) -type f)
 	which go
 	+$(MAKE) -s -C server
 
-client/dist:
+client/dist: $(shell find client -not \( -path client/dist -prune \) -not \( -path client/.parcel-cache -prune \) -type f)
 	which node
 	+$(MAKE) -s -C client	
 
@@ -12,13 +12,12 @@ dist:
 	[ -d ./dist/pacstall-programs ] && rm -rf dist/pacstall-programs || :
 	cp -r client/dist/* dist/public
 	cp -r server/dist/* dist
-#git clone https://github.com/pacstall/pacstall-programs dist/pacstall-programs
 
 
 #### Commands
 .PHONY: run clean version
 
-run: dist
+run: server/dist client/dist dist
 	cd dist && ./webserver
 
 clean:
@@ -29,3 +28,9 @@ clean:
 
 version:
 	@cat ./VERSION
+
+prepare: .git/hooks/pre-commit
+
+.git/hooks/pre-commit: ./hooks/client.sh
+	cp ./hooks/client.sh .git/hooks/pre-commit
+	chmod +x .git/hooks/pre-commit
diff --git a/client/.prettierignore b/client/.prettierignore
@@ -0,0 +1,4 @@
+dist/
+public/
+node_modules/
+src/pages/NotFound.tsx
diff --git a/client/.prettierrc.json b/client/.prettierrc.json
@@ -0,0 +1,12 @@
+{
+    "semi": false,
+    "singleQuote": true,
+    "trailingComma": "all",
+    "bracketSpacing": true,
+    "arrowParens": "avoid",
+    "tabWidth": 4,
+    "useTabs": false,
+    "jsxSingleQuote": true,
+    "printWidth": 80,
+    "endOfLine": "lf"
+}
diff --git a/client/Makefile b/client/Makefile
@@ -1,7 +1,10 @@
-all: dist
+all: dist dist/swagger
 
-dist:
+dist: $(shell find . -not \( -path dist -prune \) -not \( -path .parcel-cache -prune \) -type f)
 	npm ci
+	npm run lint
 	npm run clean
 	npm run build
+
+dist/swagger: dist
 	mv dist/public/swagger dist/swagger
diff --git a/client/index.html b/client/index.html
@@ -1,37 +1,44 @@
 <!DOCTYPE html>
 <html>
+    <head>
+        <meta charset="utf-8" />
+        <title>Pacstall - The AUR for Ubuntu</title>
+        <meta name="title" content="Pacstall - The AUR for Ubuntu" />
+        <meta
+            name="description"
+            content="Pacstall automates downloading source packages, installing dependencies, and installing, in Ubuntu"
+        />
+        <meta property="og:type" content="website" />
+        <meta property="og:url" content="https://pacstall.dev" />
+        <meta property="og:title" content="Pacstall - The AUR for Ubuntu" />
+        <meta
+            property="og:description"
+            content="Pacstall automates downloading source packages, installing dependencies, and installing, in Ubuntu"
+        />
+        <meta property="og:image" content="public/pacstall.svg" />
+        <meta property="twitter:card" content="summary_large_image" />
+        <meta property="twitter:url" content="https://pacstall.dev" />
+        <meta
+            property="twitter:title"
+            content="Pacstall - The AUR for Ubuntu"
+        />
+        <meta
+            property="twitter:description"
+            content="Pacstall automates downloading source packages, installing dependencies, and installing, in Ubuntu"
+        />
+        <meta property="twitter:image" content="public/pacstall.svg" />
+        <meta name="apple-mobile-web-app-title" content="Pacstall" />
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <link rel="shortcut icon" type="image/jpg" href="public/favicon.ico" />
+        <link rel="image_src" href="public/pacstall.svg" />
+        <link rel="apple-touch-icon" href="public/apple-touch-icon.png" />
+        <meta name="next-head-count" content="20" />
+        <link rel="stylesheet" href="public/styles/global.css" />
+    </head>
 
-<head>
-    <meta charSet="utf-8" />
-    <title>Pacstall - The AUR for Ubuntu</title>
-    <meta name="title" content="Pacstall - The AUR for Ubuntu" />
-    <meta name="description"
-        content="Pacstall automates downloading source packages, installing dependencies, and installing, in Ubuntu" />
-    <meta property="og:type" content="website" />
-    <meta property="og:url" content="https://pacstall.dev" />
-    <meta property="og:title" content="Pacstall - The AUR for Ubuntu" />
-    <meta property="og:description"
-        content="Pacstall automates downloading source packages, installing dependencies, and installing, in Ubuntu" />
-    <meta property="og:image" content="public/pacstall.svg" />
-    <meta property="twitter:card" content="summary_large_image" />
-    <meta property="twitter:url" content="https://pacstall.dev" />
-    <meta property="twitter:title" content="Pacstall - The AUR for Ubuntu" />
-    <meta property="twitter:description"
-        content="Pacstall automates downloading source packages, installing dependencies, and installing, in Ubuntu" />
-    <meta property="twitter:image" content="public/pacstall.svg" />
-    <meta name="apple-mobile-web-app-title" content="Pacstall" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="shortcut icon" type="image/jpg" href="public/favicon.ico" />
-    <link rel="image_src" href="public/pacstall.svg" />
-    <link rel="apple-touch-icon" href="public/apple-touch-icon.png" />
-    <meta name="next-head-count" content="20" />
-    <link rel="stylesheet" href="public/styles/global.css">
-</head>
-
-<body>
-    <script type="module" src="./src/index.tsx"></script>
-    <div id="app"></div>
-</body>
-
-</html>
+    <body>
+        <script type="module" src="./src/index.tsx"></script>
+        <div id="app"></div>
+    </body>
+</html>
diff --git a/client/index.production.html b/client/index.production.html
@@ -1,37 +1,35 @@
 <!DOCTYPE html>
 <html>
+    <head>
+        <meta charset="utf-8" />
+        <title>{{.Title}}</title>
+        <meta name="title" content="{{.Title}}" />
+        <meta name="description" content="{{.Description}}" />
+        <meta property="og:type" content="website" />
+        <meta property="og:url" content="https://pacstall.dev" />
+        <meta property="og:title" content="{{.Title}}" />
+        <meta property="og:description" content="{{.Description}}" />
+        <meta property="og:image" content="public/pacstall.svg" />
+        <meta property="twitter:card" content="summary_large_image" />
+        <meta property="twitter:url" content="https://pacstall.dev" />
+        <meta property="twitter:title" content="{{.Title}}" />
+        <meta property="twitter:description" content="{{.Description}}" />
+        <meta property="twitter:image" content="public/pacstall.svg" />
+        <meta name="apple-mobile-web-app-title" content="Pacstall" />
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <link rel="shortcut icon" type="image/jpg" href="public/favicon.ico" />
+        <link rel="image_src" href="public/pacstall.svg" />
+        <link rel="apple-touch-icon" href="public/apple-touch-icon.png" />
+        <meta name="next-head-count" content="20" />
+        <link rel="stylesheet" href="public/styles/global.css" />
+    </head>
 
-<head>
-    <meta charSet="utf-8" />
-    <title>{{.Title}}</title>
-    <meta name="title" content="{{.Title}}" />
-    <meta name="description" content="{{.Description}}" />
-    <meta property="og:type" content="website" />
-    <meta property="og:url" content="https://pacstall.dev" />
-    <meta property="og:title" content="{{.Title}}" />
-    <meta property="og:description" content="{{.Description}}" />
-    <meta property="og:image" content="public/pacstall.svg" />
-    <meta property="twitter:card" content="summary_large_image" />
-    <meta property="twitter:url" content="https://pacstall.dev" />
-    <meta property="twitter:title" content="{{.Title}}" />
-    <meta property="twitter:description" content="{{.Description}}" />
-    <meta property="twitter:image" content="public/pacstall.svg" />
-    <meta name="apple-mobile-web-app-title" content="Pacstall" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="shortcut icon" type="image/jpg" href="public/favicon.ico" />
-    <link rel="image_src" href="public/pacstall.svg" />
-    <link rel="apple-touch-icon" href="public/apple-touch-icon.png" />
-    <meta name="next-head-count" content="20" />
-    <link rel="stylesheet" href="public/styles/global.css">
-</head>
-
-<body>
-    <script type="module" src="./src/index.tsx">
-        // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0
-        // @license-end
-    </script>
-    <div id="app"></div>
-</body>
-
-</html>
+    <body>
+        <script type="module" src="./src/index.tsx">
+            // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0
+            // @license-end
+        </script>
+        <div id="app"></div>
+    </body>
+</html>