From 5f0159034a02cae4657670d4b0d5c00adc7cbd4d Mon Sep 17 00:00:00 2001 From: Garrit Franke Date: Thu, 21 Oct 2021 16:41:42 +0200 Subject: [PATCH] chore: clean up files from old project --- .gitignore | 2 ++ README.md | 20 +++++++++---------- client/README.md | 2 +- docker-compose.yml | 6 +++--- server/README.md | 7 ++++++- .../20210710224914_add_shape_table.js | 15 -------------- server/package.json | 3 ++- server/routes/shapes.js | 1 - 8 files changed, 23 insertions(+), 33 deletions(-) delete mode 100644 server/migrations/20210710224914_add_shape_table.js delete mode 100644 server/routes/shapes.js diff --git a/.gitignore b/.gitignore index 5aa3494..817481f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,5 +60,7 @@ typings/ .cache dist/ .parcel-cache/ +.DS_Store server/sqlite.db + diff --git a/README.md b/README.md index 15ef932..ac16638 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,19 @@ -# shape.camp +# Mail Proxy -Collect and trade random geometric shapes! +Proper name TBD -## State of the project +Gives you an anonymous mail address that sends incoming mail to your private +inbox. -shape.camp is still in early development. It is not yet deployed, but can be -self-hosted. Pull requests are always welcome! +## Todo -### Todo - -- [ ] Generate shape for user -- [ ] Open shape for trade -- [ ] See shapes in gallery +- [ ] Listen for incoming mail +- [ ] Let user set up aliases +- [ ] Forward mail to user email ## Setup -To deploy a shape.camp backend and frontend, follow the instructions in +To deploy a mail-proxy backend and frontend, follow the instructions in `server/` and `client/` respectively. Alternatively, you can deploy the app via docker-compose. See diff --git a/client/README.md b/client/README.md index 958489d..00005a5 100644 --- a/client/README.md +++ b/client/README.md @@ -1,4 +1,4 @@ -# shape.camp Client +# mail-proxy Client These environment variables need to be set before launching the application diff --git a/docker-compose.yml b/docker-compose.yml index 3a2e8bf..1b73b74 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: AUTH_SECRET: mysecretl networks: - - shapecamp + - mail-proxy client: build: ./client @@ -20,6 +20,6 @@ services: environment: API_BASE_PATH: http://localhost:8080 networks: - - shapecamp + - mail-proxy networks: - shapecamp: + mail-proxy: diff --git a/server/README.md b/server/README.md index b12a383..f317452 100644 --- a/server/README.md +++ b/server/README.md @@ -3,4 +3,9 @@ To configure the server, you need these fields in your `.env` file: * AUTH_SECRET - Secret used to sign JWTs -* DATABASE_URL - Database path \ No newline at end of file + +## Running + +1. Migrate database: `npm run migrate:latest` +1. Run: `npm start` + diff --git a/server/migrations/20210710224914_add_shape_table.js b/server/migrations/20210710224914_add_shape_table.js deleted file mode 100644 index c835a21..0000000 --- a/server/migrations/20210710224914_add_shape_table.js +++ /dev/null @@ -1,15 +0,0 @@ - -exports.up = function(knex) { - // create a shape table with an array of coordinates, color and background color - return knex.schema.createTable('shape', function(table) { - table.increments('id').primary(); - table.string('name'); - table.string('color'); - table.string('background_color'); - table.string('coordinates'); - } -}; - -exports.down = function(knex) { - -}; diff --git a/server/package.json b/server/package.json index 1fd2a48..9f3ea29 100644 --- a/server/package.json +++ b/server/package.json @@ -1,7 +1,8 @@ { "main": "app.js", "scripts": { - "start": "nodemon app.js" + "start": "nodemon app.js", + "migrate:latest": "knex migrate:latest" }, "author": "", "license": "ISC", diff --git a/server/routes/shapes.js b/server/routes/shapes.js deleted file mode 100644 index 8b13789..0000000 --- a/server/routes/shapes.js +++ /dev/null @@ -1 +0,0 @@ -