Move package.json and webpack to under webapp

.vscode/launch.json

@@ -22,4 +22,4 @@
 			"type": "pwa-node"
 		}
 	]
-}
+}

Makefile

@@ -1,44 +1,30 @@
-.PHONY: prebuild clean cleanall pack packdev builddev build watch go goUbuntu
+.PHONY: prebuild clean cleanall server server-linux generate watch-server
 
-all: build
+all: server
 
-pack:
-	npm run pack
+prebuild:
+	go get github.com/gorilla/mux
+	go get github.com/gorilla/websocket
+	go get github.com/spf13/viper
+	go get github.com/lib/pq
+	go get github.com/mattn/go-sqlite3
 
-packdev:
-	npm run packdev
-
-go:
+server:
 	cd server; go build -o ../bin/octoserver ./main
 
+server-linux:
+	cd server; env GOOS=linux GOARCH=amd64 go build -o ../bin/octoserver ./main
+
 generate:
 	cd server; go generate ./...
 
 watch-server:
 	cd server; modd
 
-goUbuntu:
-	cd server; env GOOS=linux GOARCH=amd64 go build -o ../bin/octoserver ./main
-
-builddev: packdev go
-
-build: pack go
-
-watch:
-	npm run watchdev
-
-prebuild:
-	npm install
-	go get github.com/gorilla/mux
-	go get github.com/gorilla/websocket
-	go get github.com/spf13/viper
-	go get github.com/lib/pq
-	go get github.com/mattn/go-sqlite3
-
 clean:
 	rm -rf bin
 	rm -rf dist
-	rm -rf pack
+	rm -rf webapp/pack
 
 cleanall: clean
-	rm -rf node_modules
+	rm -rf webapp/node_modules

README.md

@@ -3,6 +3,10 @@
 ## Build instructions
 
 ```
+cd webapp
+npm install
+npm run packdev
+cd ..
 make prebuild
 make
 ```

config.json

@@ -5,7 +5,7 @@
 	"dbconfig": "./octo.db",
 	"postgres_dbconfig": "dbname=octo sslmode=disable",
 	"useSSL": false,
-	"webpath": "./pack",
+	"webpath": "./webapp/pack",
 	"filespath": "./files",
 	"telemetry": true
 }

webapp/tsconfig.json

@@ -18,12 +18,12 @@
 		"paths": {
 			"*": [
 				"node_modules/*",
-				"webapp/@custom_types/*"
+				"@custom_types/*"
 			]
 		}
 	},
 	"include": [
-		"./webapp"
+		"."
 	],
 	"exclude": [
 	]

webapp/webpack.common.js

@@ -9,7 +9,7 @@ function makeCommonConfig() {
 	const commonConfig = {
 		target: "web",
 		mode: "development",
-		entry: "./webapp/index.js",
+		entry: "./index.js",
 		node: {
 			__dirname: false,
 			__filename: false
@@ -51,7 +51,7 @@ function makeCommonConfig() {
 		plugins: [
 			new CopyPlugin({
 				patterns: [
-					{ from: path.resolve(__dirname, "webapp/static"), to: "static" },
+					{ from: path.resolve(__dirname, "static"), to: "static" },
 					{ from: path.resolve(__dirname, "node_modules/easymde/dist/easymde.min.css"), to: "static" },
 				],
 			}),
@@ -65,7 +65,7 @@ function makeCommonConfig() {
 			}),
 		],
 		entry: {
-			main: "./webapp/src/main.tsx",
+			main: "./src/main.tsx",
 		},
 		output: {
 			filename: "static/[name].js",