diff --git a/client/deploy.sh b/client/deploy.sh new file mode 100755 index 0000000..b402d5a --- /dev/null +++ b/client/deploy.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +sudo rm -rf /var/www/html/project2/* + +DEPLOY_PATH="/var/www/html/project2" + +echo "Deleted old build from $DEPLOY_PATH" + +npm i +npm run build + +echo "Built project to dist" + +sudo cp -r ./dist/* $DEPLOY_PATH + +echo "Copied new build to $DEPLOY_PATH" diff --git a/client/package-lock.json b/client/package-lock.json index a34fe0c..22aec45 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,11 +1,11 @@ { - "name": "super-cool-recipe-app-straght-out-of-ntnu", + "name": "recipe-finder-client", "version": "0.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "super-cool-recipe-app-straght-out-of-ntnu", + "name": "recipe-finder-client", "version": "0.0.0", "dependencies": { "react": "^19.2.8", diff --git a/server/.gitignore b/server/.gitignore index 6ed48a9..ecff565 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -1,2 +1,3 @@ .env node_modules +dist diff --git a/server/setup.sh b/server/deploySystemd.sh similarity index 98% rename from server/setup.sh rename to server/deploySystemd.sh index 0bacba4..7ab7809 100755 --- a/server/setup.sh +++ b/server/deploySystemd.sh @@ -4,7 +4,7 @@ set -e SERVICE_NAME="project2-server" -APP_DIR="$(pwd)" +APP_DIR="$(pwd)/dist" APP_USER="$USER" NODE_PATH="$(which node)" SCRIPT_PATH="$APP_DIR/index.js" diff --git a/server/src/index.d.ts b/server/dist/index.d.ts similarity index 100% rename from server/src/index.d.ts rename to server/dist/index.d.ts diff --git a/server/dist/index.d.ts.map b/server/dist/index.d.ts.map new file mode 100644 index 0000000..535b86d --- /dev/null +++ b/server/dist/index.d.ts.map @@ -0,0 +1 @@ +{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/server/index.js b/server/dist/index.js similarity index 97% rename from server/index.js rename to server/dist/index.js index 6cb3e23..5c140bb 100644 --- a/server/index.js +++ b/server/dist/index.js @@ -3,7 +3,7 @@ import { createYoga, createSchema } from "graphql-yoga"; import { createServer } from "node:http"; const ADDR = "0.0.0.0"; const PORT = 3001; -const db = new Database("./data/database.sql", { readonly: true }); +const db = new Database("../data/database.sql", { readonly: true }); const yoga = createYoga({ schema: createSchema({ typeDefs: /* GraphQL */ ` diff --git a/server/dist/index.js.map b/server/dist/index.js.map new file mode 100644 index 0000000..20ff727 --- /dev/null +++ b/server/dist/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,IAAI,GAAG,SAAS,CAAC;AACvB,MAAM,IAAI,GAAG,IAAI,CAAC;AAElB,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAEpE,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;QACnB,QAAQ,EAAE,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAqDvB;QACD,SAAS,EAAE;YACT,KAAK,EAAE;gBACL,OAAO,EAAE,CACP,CAAC,EACD,EACE,KAAK,GAAG,EAAE,EACV,MAAM,GAAG,CAAC,EACV,MAAM,GAAG,EAAE,EACX,MAAM,GAAG,IAAI,EACb,SAAS,GAAG,KAAK,EACjB,SAAS,GAAG,CAAC,EACb,YAAY,GAAG,MAAM,CAAC,gBAAgB,EAAE,0DAA0D;kBACnG,EACD,EAAE;oBACF,IAAI,KAAK,GAAG,iCAAiC,CAAC;oBAC9C,MAAM,MAAM,GAAU,EAAE,CAAC;oBAEzB,IAAI,MAAM,EAAE,CAAC;wBACX,KAAK,IAAI,yBAAyB,CAAC;wBACnC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC;oBAC7B,CAAC;oBAED,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;wBAClD,KAAK,IAAI,wBAAwB,CAAC;wBAClC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACzB,CAAC;oBAED,IAAI,YAAY,KAAK,MAAM,CAAC,gBAAgB,EAAE,CAAC;wBAC7C,KAAK,IAAI,mDAAmD,CAAC;wBAC7D,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAC5B,CAAC;oBAED,MAAM,gBAAgB,GAAG;wBACvB,IAAI;wBACJ,gBAAgB;wBAChB,gBAAgB;wBAChB,iBAAiB;wBACjB,gBAAgB;wBAChB,cAAc;qBACf,CAAC;oBACF,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;oBAErE,MAAM,SAAS,GAAG,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;oBAExD,KAAK,IAAI,uBAAuB,UAAU,eAAe,UAAU,+BAA+B,UAAU,IAAI,SAAS,mBAAmB,CAAC;oBAC7I,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;oBAE3B,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;gBAC1C,CAAC;aACF;SACF;KACF,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;AAElC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE;IAC7B,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;AAChE,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/server/package-lock.json b/server/package-lock.json index c7c5db9..98f6055 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1140,6 +1140,7 @@ "version": "13.0.3", "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-13.0.3.tgz", "integrity": "sha512-RbOBxmLBG8uvFUc15X9+9SFemKcQ0WBuISBVkpuiaUB2qblC8UWlHEjdWVoZ8AdhSwmoEgsiXKfopX0CQxaACQ==", + "hasInstallScript": true, "license": "MIT", "dependencies": { "node-addon-api": "^8.0.0" diff --git a/server/src/index.d.ts.map b/server/src/index.d.ts.map deleted file mode 100644 index 82335e7..0000000 --- a/server/src/index.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/server/src/index.js.map b/server/src/index.js.map deleted file mode 100644 index 34c3994..0000000 --- a/server/src/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,IAAI,GAAG,SAAS,CAAC;AACvB,MAAM,IAAI,GAAG,IAAI,CAAC;AAElB,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,qBAAqB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAEnE,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;QACnB,QAAQ,EAAE,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAqDvB;QACD,SAAS,EAAE;YACT,KAAK,EAAE;gBACL,OAAO,EAAE,CACP,CAAC,EACD,EACE,KAAK,GAAG,EAAE,EACV,MAAM,GAAG,CAAC,EACV,MAAM,GAAG,EAAE,EACX,MAAM,GAAG,IAAI,EACb,SAAS,GAAG,KAAK,EACjB,SAAS,GAAG,CAAC,EACb,YAAY,GAAG,MAAM,CAAC,gBAAgB,EAAE,0DAA0D;kBACnG,EACD,EAAE;oBACF,IAAI,KAAK,GAAG,iCAAiC,CAAC;oBAC9C,MAAM,MAAM,GAAU,EAAE,CAAC;oBAEzB,IAAI,MAAM,EAAE,CAAC;wBACX,KAAK,IAAI,yBAAyB,CAAC;wBACnC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC;oBAC7B,CAAC;oBAED,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;wBAClD,KAAK,IAAI,wBAAwB,CAAC;wBAClC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACzB,CAAC;oBAED,IAAI,YAAY,KAAK,MAAM,CAAC,gBAAgB,EAAE,CAAC;wBAC7C,KAAK,IAAI,mDAAmD,CAAC;wBAC7D,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAC5B,CAAC;oBAED,MAAM,gBAAgB,GAAG;wBACvB,IAAI;wBACJ,gBAAgB;wBAChB,gBAAgB;wBAChB,iBAAiB;wBACjB,gBAAgB;wBAChB,cAAc;qBACf,CAAC;oBACF,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;oBAErE,MAAM,SAAS,GAAG,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;oBAExD,KAAK,IAAI,uBAAuB,UAAU,eAAe,UAAU,+BAA+B,UAAU,IAAI,SAAS,mBAAmB,CAAC;oBAC7I,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;oBAE3B,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;gBAC1C,CAAC;aACF;SACF;KACF,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;AAElC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE;IAC7B,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;AAChE,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/server/src/index.ts b/server/src/index.ts index 615b3df..3da1467 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -5,7 +5,7 @@ import { createServer } from "node:http"; const ADDR = "0.0.0.0"; const PORT = 3001; -const db = new Database("./data/database.sql", { readonly: true }); +const db = new Database("../data/database.sql", { readonly: true }); const yoga = createYoga({ schema: createSchema({ diff --git a/server/tsconfig.json b/server/tsconfig.json index cec4a3a..bdbad8c 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -2,8 +2,8 @@ // Visit https://aka.ms/tsconfig to read more about this file "compilerOptions": { // File Layout - // "rootDir": "./src", - // "outDir": "./dist", + "rootDir": "./src", + "outDir": "./dist", // Environment Settings // See also https://aka.ms/tsconfig/module