daniel-eder · pull · Aug 28, 2025 · Aug 29, 2025 · Aug 29, 2025 · Aug 29, 2025
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,43 @@
+{
+  "name": "Memcode Development",
+  "dockerComposeFile": "../docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/app",
+
+  // Configure tool-specific properties
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "dbaeumer.vscode-eslint"
+      ],
+      "settings": {
+        "editor.codeActionsOnSave": {
+          "source.fixAll.eslint": true
+        }
+      }
+    }
+  },
+
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally
+  "forwardPorts": [3000, 5432, 9229],
+  "portsAttributes": {
+    "3000": {
+      "label": "Memcode App",
+      "onAutoForward": "openBrowser"
+    },
+    "5432": {
+      "label": "PostgreSQL Database"
+    },
+    "9229": {
+      "label": "Debug Port",
+      "protocol": "debug"
+    }
+  },
+
+  // Use 'postCreateCommand' to run commands after the container is created
+  "postCreateCommand": "chmod +x docker-setup.sh && ./docker-setup.sh setup && ./docker-setup.sh start-bg",
+
+  // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root
+  "remoteUser": "node"
+}
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
@@ -271,8 +271,6 @@ module.exports = {
   },
   "globals": {
     "fetch": true,
-    "it": true,
-    "expect": true,
     "alert": true,
     "document": true,
     "localStorage": true,
@@ -288,11 +286,6 @@ module.exports = {
     "URL": true,
     "Image": true,
 
-    // in our tests
-    "describe": true,
-    "expect": true,
-    "beforeEach": true,
-
     // things I make global with ProvidePlugin
     "React": true,
     "PropTypes": true,

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
-# These are supported funding model platforms
+# Support Memcode development
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: memcode

diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ npm-debug.log
 .DS_Store
 
 lakesare.secrets.js
-/meresei/**
+/meresei/frontend/node_modules
+/meresei/frontend/dist
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
diff --git a/.gitpod.yml b/.gitpod.yml
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+legacy-peer-deps=true
diff --git a/Contributing.md b/Contributing.md
@@ -0,0 +1,52 @@
+# Contributing
+
+First of all - you are welcome to contribute, Memcode is a joint effort.   
+Feel free to ask questions/propose features in github issues, or email [email protected].
+
+# Github Codespaces
+
+If you would like to develop in the browser, you can simply open Github Codespaces - after a few minutes of waiting, in the PORTS tab, a few ports will appear. Click on the port 3000. This will open a browser window, where you can see normal memcode.com ui.
+You can now edit both frontend and backend code in Github Codespaces - the changes will get reflected in the ui automatically.
+
+When developing in Github Codespaces, please username&password to register.
+
+# Local setup
+
+### One-Time Setup
+
+#### Create a database
+
+1. Install PostgreSQL (any modern should work, for example v14.17 and v16.9 certainly work)
+2. Go to postgres console: `psql postgres` (as the default postgres superuser)
+3. Create a `memcode` user with password: `CREATE ROLE memcode WITH LOGIN PASSWORD 'memcode';`.
+4. Give the user permission to create databases: `ALTER ROLE memcode CREATEDB;`.
+5. Create a new development database 'memcode': `make db-reset`. This will create the raw database for you - a schema and a few necessary database rows.
+
+> [!NOTE]  
+> The project uses a PostgreSQL user named `memcode` with password `memcode` for the database `memcode`. All database commands in the Makefile are configured to use these credentials.
+
+#### Copypaste environment variables
+
+1. Copy the example environment file with `cp env.example.js env.js`
+
+   For basic development you do not need to change anything in this file.
+
+#### Install the needed libraries
+
+1. Install node v22.19.0
+1. Install npm
+2. Run `npm install`
+
+### Development
+
+1. Run `make frontend-webpack` (compiles the frontend code)
+2. Run `make start` (starts the node server)
+2. Go to <a href="http://localhost:3000/">http://localhost:3000</a>, and enjoy the development!  
+   Locally, please use username&password to sign up.
+
+<br/>
+<div align="center">
+  <img width="50px" src="https://user-images.githubusercontent.com/7578559/154219522-280c4f96-4e3d-45e9-9beb-671b339b3f92.png" alt="Memcode Logo"/>
+</div>
+
+___
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,32 @@
+# Use Node.js 22 as specified in package.json
+FROM node:22-alpine
+
+# Install system dependencies
+RUN apk add --no-cache \
+    python3 \
+    make \
+    g++ \
+    postgresql-client \
+    bash
+
+# Create app directory
+WORKDIR /app
+
+# Copy package files
+COPY package*.json ./
+
+# Install dependencies
+RUN npm install --legacy-peer-deps
+
+# Copy source code
+COPY . .
+
+# Make entrypoint script executable
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
+
+# Expose port 3000
+EXPOSE 3000
+
+# Use custom entrypoint script
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Gitpod.md b/Gitpod.md
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Evgenia Karunus
+Copyright (c) 2016-present Evgenia Karunus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
@@ -1,77 +1,47 @@
 
-all:
-	make start & make backend-webpack & make frontend-webpack
-
-# $(npm bin)/nodemon doesn't work, npm bin is '' then.
+# _______________________________DEVELOPMENT_______________________________
 start:
-	NODE_ENV=development node_modules/.bin/nodemon --inspect --watch backend backend/webpacked/index.js
+	NODE_ENV=development node_modules/.bin/nodemon --inspect --watch backend backend/index.js
 
-# build and watch
-backend-webpack:
-	cd backend; ../node_modules/.bin/webpack --config ./webpack/development.config.js -w
 frontend-webpack:
-	cd frontend; ../node_modules/.bin/webpack --config ./webpack/development.config.js -w
+	cd frontend; NODE_OPTIONS="--openssl-legacy-provider" ../node_modules/.bin/webpack --config ./webpack/development.config.js -w
 
-# database
+LOCAL_DB_URL = postgresql://memcode:memcode@localhost/memcode
+LOCAL_POSTGRES_URL = postgresql://memcode:memcode@localhost/postgres
 db-drop:
-	psql -U postgres -c 'DROP DATABASE IF EXISTS memcode'
+	psql $(LOCAL_POSTGRES_URL) -c 'DROP DATABASE IF EXISTS memcode'
 db-reset:
-	# 'database=' here is a variable used in schema.sql (-v).
-	psql -v database=memcode -U postgres -f backend/db/schema.sql
+	make db-drop
+	psql $(LOCAL_POSTGRES_URL) -c 'CREATE DATABASE memcode'
+	psql $(LOCAL_DB_URL) -f backend/db/schema.sql
 db-migrate:
-	psql -v database=memcode -U postgres -f backend/db/migrations/14.sql
-
-# dump and restore data
-db-dump:
-	pg_dump -d memcode -U postgres > backend/db/dump.sql
-db-restore:
-	psql -d memcode -U postgres < backend/db/dump.sql
+	psql $(LOCAL_DB_URL) -f backend/db/migrations/19.sql
 
-# test
-test-db-reset:
-	psql -v database=memcode_test -U postgres -f backend/db/schema.sql
-test-backend:
-	cd backend; NODE_ENV=test ../node_modules/.bin/mocha --recursive ./webpacked/test --require babel-polyfill --require source-map-support/register
-test-frontend:
-	cd frontend; NODE_ENV=test ../node_modules/.bin/karma start
-
-# production
+# _______________________________PRODUCTION_______________________________
+# ___Why don't we run `npm install`?
+#    `npm install` is run automatically. since we need to compile code on heroku, we need our devDependencies installed too. so I set `heroku config:set NPM_CONFIG_PRODUCTION=false` for this purpose.
 heroku-postbuild:
-	# npm install
-	# is run automatically. since we need to compile code on heroku, we need our devDependencies installed too. so I set
-	# heroku config:set NPM_CONFIG_PRODUCTION=false
-	# for this purpose.
 	touch env.js;
-	make heroku-backend-webpack &
-	make heroku-frontend-webpack
-
+	make heroku-frontend-webpack &
+	make heroku-meresei-frontend-webpack
 heroku-deploy:
-	git push heroku master
-
-heroku-backend-webpack:
-	cd backend; ../node_modules/.bin/webpack --config ./webpack/production.config.js
+	git push https://git.heroku.com/memcode.git master
 heroku-frontend-webpack:
-	cd frontend; ../node_modules/.bin/webpack --config ./webpack/production.config.js
-
+	cd frontend; NODE_OPTIONS="--openssl-legacy-provider" ../node_modules/.bin/webpack --config ./webpack/production.config.js
+heroku-meresei-frontend-webpack:
+	cd meresei/frontend; npm install && npm run production
 
-DB_URL = $$(heroku config:get DATABASE_URL --app memcode)
 # ___Where did we get these credentials from?
 #    Find our credentials from `heroku config`
 # ___How to run a particular migration?
 #    Manually input migration you want to run (eg 1.sql)
 # ___Where is 7.sql taken from?
 #    From local files!
 heroku-db-migrate:
-	psql -v database=d9glthq2q1grjs $(DB_URL) -f backend/db/migrations/14.sql
-heroku-db-console:
-	psql -v $(DB_URL)
-
+	psql $$(heroku config:get DATABASE_URL --app memcode) -f backend/db/migrations/19.sql
 # when they ask for password - they ask for the local one (yes, 4 times)
 heroku-db-pull:
 	make db-drop
-	PGUSER=postgres PGPASSWORD=§1§1§1 heroku pg:pull DATABASE_URL memcode --app memcode
-
-# when they ask for password - they ask for the local one (yes, 4 times)
-# heroku-pg-push:
-# 	PGUSER=postgres heroku pg:reset DATABASE_URL
-# 	PGUSER=postgres heroku pg:push memcode DATABASE_URL --app memcode
+	heroku pg:pull DATABASE_URL memcode --app memcode
+heroku-export-emails:
+	psql $$(heroku config:get DATABASE_URL --app memcode) -c "\COPY (SELECT DISTINCT email FROM \"user\" WHERE email IS NOT NULL AND is_subscribed_to_marketing_emails = true ORDER BY email) TO STDOUT WITH CSV HEADER" > emails.csv
diff --git a/Procfile b/Procfile
diff --git a/README-DOCKER.md b/README-DOCKER.md
@@ -0,0 +1,34 @@
+# Memcode Docker Setup
+
+## Quick Start
+
+**Local Development:**
+```bash
+git clone https://github.com/lakesare/memcode.git
+cd memcode
+./docker-setup.sh setup
+./docker-setup.sh start
+```
+
+**GitHub Codespaces:**  
+Just open in Codespaces - automatically starts!
+
+Open http://localhost:3000 when ready
+
+## Commands
+
+```bash
+./docker-setup.sh setup     # First time setup
+./docker-setup.sh start     # Start Memcode
+./docker-setup.sh stop      # Stop Memcode  
+./docker-setup.sh logs      # View logs
+./docker-setup.sh reset     # Reset everything
+```
+
+## Manual Docker Commands
+
+```bash
+docker-compose up           # Start
+docker-compose down         # Stop
+docker-compose down -v      # Reset (deletes data)
+```