.dockerignore

@@ -1,3 +0,0 @@
-api/.venv
-web/node_modules
-*.pyc

.gitignore

@@ -1,3 +1 @@
 *.swp
-.DS_Store
-mobile/android/app/.cxx/

.woodpecker.yml

@@ -8,10 +8,17 @@ steps:
       - VITE_API_URL=https://api.treadl.com
       - VITE_IMAGINARY_URL=https://images.treadl.com
       - VITE_SENTRY_DSN=https://7c88f77dd19c57bfb92bb9eb53e33c4b@o4508066290532352.ingest.de.sentry.io/4508075022090320
+      - VITE_SOURCE_REPO_URL=https://git.wilw.dev/wilw/treadl
+      - VITE_PATREON_URL=https://www.patreon.com/treadl
+      - VITE_KOFI_URL=https://ko-fi.com/wilw88
+      - VITE_IOS_APP_URL=https://apps.apple.com/gb/app/treadl/id1525094357
+      - "VITE_ANDROID_APP_URL=https://play.google.com/store/apps/details/Treadl?id=com.treadl"
+      - VITE_CONTACT_EMAIL=hello@treadl.com
+      - VITE_APP_NAME=Treadl
     commands:
       - cd web
-      - npm install
+      - yarn install
-      - npx vite build
+      - yarn build
 
   buildapi:
     group: build

README.md

@@ -2,43 +2,54 @@
 
 This is a monorepo containing the code for the web and mobile front-ends and web API for the Treadl platform.
 
+## Running and developing Treadl locally
+
+To run Treadl locally, we recommend taking the following steps:
+
+1. Check out this repository locally.
+1. Follow the instructions in the `api/` directory to launch a MongoDB instance and to run the Treadl API.
+1. Follow the instructions in the `web/` directory to install the local dependencies and run the web UI.
 
 ## Deploying your own version of Treadl
 
-### Run with Docker (recommended)
+If you'd like to launch your own version of Treadl in a web production environment, follow the steps below. These instructions set-up a basic version of Treadl, and you may want or need to take additional steps for more advanced options.
 
-We publish and maintain a [Docker image](https://hub.docker.com/r/wilw/treadl) for Treadl, which is the easiest way to get started.
+We recommend forking this repository. That way you can make adjustments to the code to suit your needs, and pull in upstream updates as we continue to develop them.
 
-We recommend using Docker Compose and our [template `docker-compose.yml`](https://git.wilw.dev/wilw/treadl/src/branch/main/docker/docker-compose.yml) to configure the app and the MongoDB database. Download this file to your computer and then run `docker compose up` to start Treadl.
+### 1. Launch a MongoDB cluster/instance
 
-In production, it is very important to change the values in the file's `environment` block to suit your own setup. We also strongly recommend the use of a reverse-proxy to handle TLS connections to the app.
+Treadl uses MongoDB as its data store, and this should be setup first. You can either use a commercial hosted offering, or host the database yourself.
 
+Hosted options:
 
-### Alternative deployment
+* [MongoDB Atlas](https://www.mongodb.com)
+* [DigitalOcean managed MongoDB](https://www.digitalocean.com/products/managed-databases-mongodb)
 
-In scenarios where you want more control over the deployment, or you are more concerned with scalability, you may wish to use a more manual approach.
+Self-hosted guides:
 
-In this case you'll need to:
+* [Creating a MongoDB Replica Set](https://www.linode.com/docs/guides/create-a-mongodb-replica-set)
-- Launch (or re-use) a MongoDB cluster/instance
+* [MongoDB official Docker Image](https://hub.docker.com/_/mongo)
-- Provision a server or service for running the Flask app (in the `api/` directory), ensuring all dependencies are installed and that it runs with the needed [environment variables](https://git.wilw.dev/wilw/treadl/src/branch/main/api/envfile.template)
-- Build the web front-end (with `npx vite build` using your needed [environment variables](https://git.wilw.dev/wilw/treadl/src/branch/main/web/.env), having installed dependencies with `npm install`) and host the resulting `dist/` directory on a server or object store.
 
+Either way, once launched, make a note of the cluster/instance's:
 
-### S3-compatible object storage
+* URI: The database's URI, probably in a format like `mongodb+srv://USERNAME:PASSWORD@host.com/AUTHDATABASE?retryWrites=true&w=majority`
+* Database: The name of the database, within your cluster/instance, where you want Treadl to store the data.
 
-Treadl uses S3-compatible object storage for storing user uploads. If you want to allow file uploads (apart from WIF files, which are processed directly), you should create and configure a bucket for Treadl to use.
+### 2. Provision an S3-compatible bucket
+
+Treadl uses S3-compatible object storage for storing assets (e.g. uploaded files). You should create and configure a bucket for Treadl to use.
 
 Hosted options:
 
 * [Amazon S3](https://aws.amazon.com/s3)
-* [Linode Object Storage](https://www.linode.com/products/object-storage) 
+* [Linode Object Storage](https://www.linode.com/products/object-storage) - Recommended option.
 * [DigitalOcean Spaces](https://www.digitalocean.com/products/spaces)
 
 Self-hosted options:
 
 * [MinIO](https://min.io/download)
 
-Once you have a bucket, generate some access keys for the bucket that will enable Treadl to read from and write to it. Ensure you make a record of the following for inclusion in your environment file/variables:
+Once you have a bucket, generate some access keys for the bucket that will enable Treadl to read from and write to it. Ensure you make a record of the following for later:
 
 * Bucket name: The name of the S3-compatible bucket you created
 * Endpoint URL: The endpoint for your bucket. This helps Treadl understand which provider you are using.
@@ -47,49 +58,64 @@ Once you have a bucket, generate some access keys for the bucket that will enabl
 
 _Note: assets in your bucket should be public. Treadl does not currently used signed requests to access uploaded files._
 
+### 3. Provision the API
 
-## Running Treadl locally in development mode
+The best way to run the web API is to do so via Docker. A `Dockerfile` is provided in the `api/` directory.
 
-To run Treadl locally, first ensure you have the needed software installed:
+Simply build the image and transfer it to your server (or just build it directly on the server, if easier).
 
-- Python ^3.12
+Make a copy of the `envfile.template` file included in the `api/` directory into a new file named `envfile` and make changes to this file to suit your needs. For example, you will likely need to:
-- Node.js (we recommend v22.x)
-- Docker (we use this for the Mongo database)
-    - It can be installed via the Docker website or your package manager
-    - Ensure the Docker service is running
-- [Taskfile](https://taskfile.dev) (convenience tool for running tasks)
-    - This can be installed using `brew install go-task`
 
-To begin, clone this repository to your computer:
+* Add in the Mongo URI and database into the relevant parts
+* Add the S3 detais into the relevant parts
+* Add Mailgun connection details (for sending outbound mail)
+* Change the app's URL and email addresses
 
-```bash
+Once ready, you can launch the API by passing in this envfile (assuming you built the image with a name of `treadl-api`):
-git clone https://git.wilw.dev/wilw/treadl.git
+
+```shell
+$ docker run --env-file envfile -d treadl-api
 ```
 
-Next, initialise the project by installing dependencies and creating an environment file for the API:
+_Note: a reverse proxy (such as Nginx or Traefik) should be running on your server to proxy traffic through to port 8000 on your running Treadl API container._
 
-```bash
+### 4. Host the front-end
-task init
+
+The front-end is formed from static files that can be simply served from a webserver, from a CDN-fronted object store, or anything else.
+
+Before building or hosting the front-end, please copy the `.env.development` file into a new file called `.env.production` and make changes to it as required. For example, you will need to:
+
+* Include the URL of the web API you deployed earlier in the relevant field.
+* Include a contact email address.
+
+**Vercel**
+
+We use [Vercel](https://vercel.com) to host the web UI. Once you have an account to which you are logged-in to locally, the front-end can be deployed by simply running:
+
+```shell
+$ vercel --prod
 ```
 
-This generates a 'envfile' in your 'api' directory. You can edit this as needed (though the defaults should allow you to at least launch the app). Note: if you run this command again then any changes you made to your `envfile` will be overwritten.
+_Note: You will need to configure Vercel to use your own domain, and set-up a project, etc. first._
 
-Finally, you can start the API and web UI by running:
+**Manual**
 
-```bash
+Simply build the app and then deploy the resulting `build/` directory to a server or storage of your choice:
-task
+
+```shell
+$ yarn build
+$ s3cmd cp build/ s3://my-treadl-ui # Example
 ```
 
-Note: this command also starts the MongoDB database on port 27017. If the DB is already running, you'll see errors reported, but the API and web will still be launched.
+### 5. Optional extras
 
-You can now navigate to [http://localhost:8002](http://localhost:8002) to start using the app.
+**Imaginary server**
 
-If you pull updates from the repository in the future (e.g. with `git pull`) you may need to ensure your dependencies are up-to-date before starting the app again. This can be done with:
+To help improve the performance of the app, you may wish to make use of [Imaginary](https://github.com/h2non/imaginary) to crop/resize large images. The web UI is already equipped to handle Imaginary if a server is configured.
 
-```bash
+To use this feature, simply rebuild the app ensuring that an environment entry is made into `.env.production` that includes `"VITE_IMAGINARY_URL=https://your.imaginaryserver.com"`.
-task install-deps
-```
 
+_Note: If this is not set, Treadl will by default fetch the full size images straight from the S3 source._
 
 ## Contributions
 

Taskfile.yml

@@ -1,130 +0,0 @@
-version: '3'
-
-vars:
-  VENV: ".venv/bin/activate"
-
-tasks:
-  default:
-    desc: Run web bundler and API
-    deps:
-      - start-db
-      - run-api
-      - run-web
-
-  run-web:
-    desc: Run web frontend
-    dir: 'web'
-    cmds:
-      - echo "[Web] Starting React app..."
-      - npx vite --port 8002
-
-  run-api:
-    desc: Run API server
-    dir: 'api'
-    dotenv: ['envfile']
-    cmds:
-      - echo "[FLASK] Starting Flask app..."
-      - bash -c "source {{.VENV}} && flask run --debug"
-
-  start-db:
-    desc: Start database
-    ignore_error: true
-    cmds:
-      - echo "[DB] Starting database..."
-      - docker run --rm -d --name mongo -v ~/.mongo:/data/db -p 27017:27017 mongo:6
-
-  init:
-    desc: Initialize project
-    cmds:
-      - task: install-deps
-      - cp api/envfile.template api/envfile
-
-  install-deps:
-    desc: Install all dependencies
-    deps:
-      - install-deps-web
-      - install-deps-api
-
-  install-deps-web:
-    desc: Install web dependencies
-    dir: 'web'
-    cmds:
-      - echo "[Web] Installing dependencies..."
-      - npm install
-
-  install-deps-api:
-    desc: Install API dependencies
-    dir: 'api'
-    cmds:
-      - echo "[FLASK] Installing dependencies..."
-      - cmd: python3.12 -m venv .venv
-        ignore_error: true
-      - bash -c "source {{.VENV}} && pip install poetry"
-      - bash -c "source {{.VENV}} && poetry install"
-
-  lint:
-    desc: Lint all
-    deps:
-      - lint-web
-      - lint-api
-      - lint-mobile
-
-  lint-web:
-    desc: Lint web frontend
-    dir: 'web'
-    cmds:
-      - echo "[Web] Linting React app..."
-      - npx standard --fix
-
-  lint-api:
-    desc: Lint API server
-    dir: 'api'
-    cmds:
-      - echo "[FLASK] Linting Flask app..."
-      - bash -c "source {{.VENV}} && ruff format ."
-      - bash -c "source {{.VENV}} && ruff check --fix ."
-
-  lint-mobile:
-    desc: Lint mobile app
-    dir: 'mobile'
-    cmds:
-      - echo "[MOBILE] Linting Flutter app..."
-      - dart fix --apply
-      - dart analyze
-
-  clean:
-    desc: Remove all dependencies
-    cmds:
-      - rm -rf web/node_modules
-      - rm -rf api/.venv
-
-  build-docker:
-    desc: Build all-in-one Docker image
-    cmds:
-      - echo "Building Docker image..."
-      - docker build -f docker/Dockerfile -t wilw/treadl --platform linux/amd64,linux/arm64 .
-  
-  deploy:
-    desc: Deploy all
-    deps:
-      - deploy-web
-      - deploy-api
-  
-  deploy-web:
-    desc: Deploy web front-end
-    dir: 'web'
-    env:
-      AWS_REQUEST_CHECKSUM_CALCULATION: when_required
-      AWS_RESPONSE_CHECKSUM_VALIDATION: when_required
-    cmds:
-      - npm install
-      - npx vite build
-      - aws --profile personal s3 sync dist s3://treadl.com
-      - 'curl -X POST -H "AccessKey: $BUNNY_PERSONAL" https://api.bunny.net/pullzone/782753/purgeCache'
-  
-  deploy-api:
-    desc: Deploy API
-    dir: 'api'
-    cmds:
-      - docker build -t wilw/treadl-api --platform linux/amd64 .
-      - docker push wilw/treadl-api

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM amd64/python:3.12-slim
+FROM python:3.12-slim
 
 # set work directory
 WORKDIR /app

api/README.md

@@ -1,3 +1,67 @@
 # Treadl web API
 
 This directory contains the code for the back-end Treadl API.
+
+## Run locally
+
+To run this web API locally, follow the steps below.
+
+### 1. Run a local MongoDB instance
+
+Install MongoDB for your operating system and then launch a local version in the background. For example:
+
+```shell
+$ mongod --fork --dbpath=/path/to/.mongo --logpath /dev/null
+```
+
+(Remember to restart the database upon system restart or if the instance stops for another reason.)
+
+### 2. Create and activate a virtual environment
+
+Install and activate the environment using `virtualenv`:
+
+```shell
+$ virtualenv -p python3 .venv # You only need to run this the first time
+$ source .venv/bin/activate
+```
+
+### 3. Install dependencies
+
+We use Poetry to manage dependencies. If you don't have this yet, please refer to [the Poetry documentation](https://python-poetry.org) to install it. Once done, install the dependencies (ensuring you have `source`d your virtualenv first):
+
+```shell
+$ poetry install
+```
+
+### 4. Create an `envfile`
+
+Copy the template file into a new `envfile`:
+
+```shell
+$ cp envfile.template envfile
+```
+
+If you need to, make any changes to your new `envfile`. Note that changes are probably not required if you are running this locally. When happy, you can `source` this file too:
+
+```shell
+$ source envfile
+```
+
+### 5. Run the API
+
+Ensure that both the virtualenv and `envfile` have been loaded into the environment:
+
+```shell
+$ source .venv/bin/activate
+$ source envfile
+```
+
+Now you can run the API:
+
+```shell
+$ flask run
+```
+
+The API will now be available on port 2001.
+
+Remember that you will need a local instance of [MongoDB](https://www.mongodb.com) running for the API to connect to.

api/api/accounts.py

@@ -5,7 +5,6 @@ import re
 import os
 from bson.objectid import ObjectId
 from util import database, mail, util
-from api import projects, uploads
 
 jwt_secret = os.environ["JWT_SECRET"]
 MIN_PASSWORD_LENGTH = 8
@@ -41,7 +40,6 @@ def register(username, email, password, how_find_us):
             {
                 "username": username,
                 "email": email,
-                "emailVerified": False,
                 "password": hashed_password,
                 "createdAt": datetime.datetime.now(),
                 "subscriptions": {
@@ -55,7 +53,6 @@ def register(username, email, password, how_find_us):
                 },
             }
         )
-        send_verification_email(db.users.find_one({"_id": result.inserted_id}))
         mail.send(
             {
                 "to": os.environ.get("ADMIN_EMAIL"),
@@ -65,7 +62,48 @@ def register(username, email, password, how_find_us):
                 ),
             }
         )
+        mail.send(
+            {
+                "to": email,
+                "subject": "Welcome to {}!".format(os.environ.get("APP_NAME")),
+                "text": """Dear {0},
 
+Welcome to {3}! We won't send you many emails but we just want to introduce ourselves and to give you some tips to help you get started.
+
+LOGGING-IN
+
+To login to your account please visit {1} and click Login. Use your username ({0}) and password to get back into your account.
+
+INTRODUCTION
+
+{3} has been designed as a resource for weavers – not only for those working alone as individuals, but also for groups who wish to share ideas, design inspirations and weaving patterns. It is ideal for those looking for a depository to store their individual work, and also for groups such as guilds, teaching groups, or any other collaborative working partnerships.
+Projects can be created within {3} using the integral WIF-compatible draft editor, or alternatively files can be imported from other design software along with supporting images and other information you may wish to be saved within the project file. Once complete, projects may be stored privately, shared within a closed group, or made public for other {3} users to see. The choice is yours!
+
+{3} is free to use. For more information please visit our website at {1}.
+
+GETTING STARTED
+
+Creating a profile: You can add a picture, links to a personal website, and other social media accounts to tell others more about yourself.
+
+Creating a group: You have the option to do things alone, or create a group. By clicking on the ‘Create a group’ button, you can name your group, and then invite members via email or directly through {3} if they are existing {3} users.
+
+Creating a new project: When you are ready to create/store a project on the system, you are invited to give the project a name, and a brief description. You will then be taken to a ‘Welcome to your project’ screen, where if you click on ‘add something’, you have the option of creating a new weaving pattern directly inside {3} or you can simply import a WIF file from your preferred weaving software. Once imported, you can perform further editing within {3}, or you can add supporting picture files and any other additional information you wish to keep (eg weaving notes, yarn details etc).
+
+Once complete you then have the option of saving the file privately, shared within a group, or made public for other {3} users to see.
+
+We hope you enjoy using {3} and if you have any comments or feedback please tell us by emailing {2}!
+
+Best wishes,
+
+The {3} Team
+""".format(
+                    username,
+                    os.environ.get("APP_URL"),
+                    os.environ.get("CONTACT_EMAIL"),
+                    os.environ.get("APP_NAME"),
+                ),
+            }
+        )
         return {"token": generate_access_token(result.inserted_id)}
     except Exception as e:
         print(e)
@@ -104,18 +142,33 @@ def update_email(user, data):
     if len(data["email"]) < 4:
         raise util.errors.BadRequest("New email is too short")
     db = database.get_db()
-    db.users.update_one(
+    db.users.update_one({"_id": user["_id"]}, {"$set": {"email": data["email"]}})
-        {"_id": user["_id"]},
+    mail.send(
         {
-            "$set": {
+            "to": user["email"],
-                "email": data["email"],
+            "subject": "Your email address has changed on {}".format(
-                "emailVerified": False,
+                os.environ.get("APP_NAME")
-                "emailVerifiedAt": None,
+            ),
-            },
+            "text": "Dear {0},\n\nThis email is to let you know that we recently received a request to change your account email address on {2}. We have now made this change.\n\nThe new email address for your account is {1}.\n\nIf you think this is a mistake then please get in touch with us as soon as possible.".format(
-            "$unset": {"tokens.emailVerification": ""},
+                user["username"],
-        },
+                data["email"],
+                os.environ.get("APP_NAME"),
+            ),
+        }
+    )
+    mail.send(
+        {
+            "to": data["email"],
+            "subject": "Your email address has changed on {}".format(
+                os.environ.get("APP_NAME")
+            ),
+            "text": "Dear {0},\n\nThis email is to let you know that we recently received a request to change your account email address on {2}. We have now made this change.\n\nThe new email address for your account is {1}.\n\nIf you think this is a mistake then please get in touch with us as soon as possible.".format(
+                user["username"],
+                data["email"],
+                os.environ.get("APP_NAME"),
+            ),
+        }
     )
-    send_verification_email(db.users.find_one({"_id": user["_id"]}))
     return {"email": data["email"]}
 
 
@@ -166,7 +219,6 @@ def update_password(user, data):
 
     mail.send(
         {
-            "force": True,
             "to_user": user,
             "subject": "Your {} password has changed".format(
                 os.environ.get("APP_NAME")
@@ -180,95 +232,18 @@ def update_password(user, data):
     return {"passwordUpdated": True}
 
 
-def verify_email(token):
-    if not token:
-        raise util.errors.BadRequest("Invalid request")
-    db = database.get_db()
-    user = None
-    try:
-        id = jwt.decode(token, jwt_secret, algorithms="HS256")["sub"]
-        user = db.users.find_one(
-            {"_id": ObjectId(id), "tokens.emailVerification": token}
-        )
-        if not user:
-            raise Exception
-    except Exception:
-        raise util.errors.BadRequest(
-            "There was a problem verifying your email. Your token may be invalid or out of date"
-        )
-    db.users.update_one(
-        {"_id": user["_id"]},
-        {
-            "$set": {
-                "emailVerified": True,
-                "emailVerifiedAt": datetime.datetime.utcnow(),
-            },
-            "$addToSet": {
-                "emailVerifications": {
-                    "email": user["email"],
-                    "verifiedAt": datetime.datetime.utcnow(),
-                }
-            },
-            "$unset": {"tokens.emailVerification": ""},
-        },
-    )
-    mail.send(
-        {
-            "to": user["email"],
-            "subject": "Welcome to {}!".format(os.environ.get("APP_NAME")),
-            "text": """Dear {0},
-
-Welcome to {3}! We won't send you many emails but we just want to introduce ourselves and to give you some tips to help you get started.
-
-LOGGING-IN
-
-To login to your account please visit {1} and click Login. Use your username ({0}) and password to get back into your account.
-
-INTRODUCTION
-
-{3} has been designed as a resource for weavers – not only for those working alone as individuals, but also for groups who wish to share ideas, design inspirations and weaving patterns. It is ideal for those looking for a depository to store their individual work, and also for groups such as guilds, teaching groups, or any other collaborative working partnerships.
-Projects can be created within {3} using the integral WIF-compatible draft editor, or alternatively files can be imported from other design software along with supporting images and other information you may wish to be saved within the project file. Once complete, projects may be stored privately, shared within a closed group, or made public for other {3} users to see. The choice is yours!
-
-{3} is free to use. For more information please visit our website at {1}.
-
-GETTING STARTED
-
-Creating a profile: You can add a picture, links to a personal website, and other social media accounts to tell others more about yourself.
-
-Creating a group: You have the option to do things alone, or create a group. By clicking on the ‘Create a group’ button, you can name your group, and then invite members via email or directly through {3} if they are existing {3} users.
-
-Creating a new project: When you are ready to create/store a project on the system, you are invited to give the project a name, and a brief description. You will then be taken to a ‘Welcome to your project’ screen, where if you click on ‘add something’, you have the option of creating a new weaving pattern directly inside {3} or you can simply import a WIF file from your preferred weaving software. Once imported, you can perform further editing within {3}, or you can add supporting picture files and any other additional information you wish to keep (eg weaving notes, yarn details etc).
-
-Once complete you then have the option of saving the file privately, shared within a group, or made public for other {3} users to see.
-
-We hope you enjoy using {3} and if you have any comments or feedback please tell us by emailing {2}!
-
-Best wishes,
-
-The {3} Team
-""".format(
-                user["username"],
-                os.environ.get("APP_URL"),
-                os.environ.get("CONTACT_EMAIL"),
-                os.environ.get("APP_NAME"),
-            ),
-        }
-    )
-    return {"emailVerified": True}
-
-
 def delete(user, password):
     if not password or not bcrypt.checkpw(password.encode("utf-8"), user["password"]):
         raise util.errors.BadRequest("Incorrect password")
     db = database.get_db()
     for project in db.projects.find({"user": user["_id"]}):
-        projects.delete(user, user["username"], project.get("path"))
+        db.objects.delete_many({"project": project["_id"]})
+        db.projects.delete_one({"_id": project["_id"]})
     db.comments.delete_many({"user": user["_id"]})
     db.users.update_many(
         {"following.user": user["_id"]}, {"$pull": {"following": {"user": user["_id"]}}}
     )
     db.users.delete_one({"_id": user["_id"]})
-    uploads.delete_folder("users/" + str(user["_id"]))
     return {"deletedUser": user["_id"]}
 
 
@@ -303,45 +278,6 @@ def get_user_context(token):
         return None
 
 
-def send_verification_email(user):
-    db = database.get_db()
-    if user.get("emailVerified"):
-        return {"emailVerified": True}
-    existing_token = user.get("tokens", {}).get("emailVerification")
-    if existing_token:
-        ten_mins_ago = datetime.datetime.utcnow() - datetime.timedelta(minutes=10)
-        decoded = jwt.decode(existing_token, jwt_secret, algorithms="HS256")
-        if datetime.datetime.fromtimestamp(decoded["iat"]) > ten_mins_ago:
-            raise util.errors.BadRequest(
-                "Email verifications can only be sent every 10 minutes. Remember to check your spam folder."
-            )
-
-    payload = {
-        "exp": datetime.datetime.utcnow() + datetime.timedelta(days=30),
-        "iat": datetime.datetime.utcnow(),
-        "sub": str(user["_id"]),
-    }
-    token = jwt.encode(payload, jwt_secret, algorithm="HS256")
-    mail.send(
-        {
-            "force": True,
-            "to_user": user,
-            "subject": "Verify your email address on {}".format(
-                os.environ.get("APP_NAME")
-            ),
-            "text": "Dear {0},\n\nThis email address has been used with an account on {2}. Please verify that you own this email address by following the link below:\n\n{1}\n\nIf you did not sign up for an account, please ignore this email or reach out to us.".format(
-                user["username"],
-                "{}/email/verify?token={}".format(os.environ.get("APP_URL"), token),
-                os.environ.get("APP_NAME"),
-            ),
-        }
-    )
-    db.users.update_one(
-        {"_id": user["_id"]}, {"$set": {"tokens.emailVerification": token}}
-    )
-    return {"verificationEmailSent": True}
-
-
 def reset_password(data):
     if not data or "email" not in data:
         raise util.errors.BadRequest("Invalid request")
@@ -358,7 +294,6 @@ def reset_password(data):
         token = jwt.encode(payload, jwt_secret, algorithm="HS256")
         mail.send(
             {
-                "force": True,
                 "to_user": user,
                 "subject": "Reset your password",
                 "text": "Dear {0},\n\nA password reset email was recently requested for your {2} account. If this was you and you want to continue, please follow the link below:\n\n{1}\n\nThis link will expire after 24 hours.\n\nIf this was not you, then someone may be trying to gain access to your account. We recommend using a strong and unique password for your account.".format(

api/api/groups.py

@@ -37,7 +37,6 @@ def create(user, data):
         "name": data["name"],
         "description": data.get("description", ""),
         "closed": data.get("closed", False),
-        "advertised": data.get("advertised", False),
         "memberPermissions": [
             "viewMembers",
             "viewNoticeboard",
@@ -92,21 +91,9 @@ def update(user, id, update):
         raise util.errors.NotFound("Group not found")
     if user["_id"] not in group.get("admins", []):
         raise util.errors.Forbidden("You're not a group admin")
-    allowed_keys = [
+    allowed_keys = ["name", "description", "closed", "memberPermissions", "image"]
-        "name",
-        "description",
-        "closed",
-        "advertised",
-        "memberPermissions",
-        "image",
-    ]
     updater = util.build_updater(update, allowed_keys)
     if updater:
-        if "$set" in updater and (
-            "name" in update or "description" in update or "image" in update
-        ):
-            updater["$set"]["moderationRequired"] = True
-            util.send_moderation_request(user, "groups", group)
         db.groups.update_one({"_id": id}, updater)
     return get_one(user, id)
 
@@ -142,7 +129,6 @@ def create_entry(user, id, data):
         "group": id,
         "user": user["_id"],
         "content": data["content"],
-        "moderationRequired": True,
     }
     if "attachments" in data:
         entry["attachments"] = data["attachments"]
@@ -167,24 +153,12 @@ def create_entry(user, id, data):
         entry["authorUser"]["avatarUrl"] = uploads.get_presigned_url(
             "users/{0}/{1}".format(user["_id"], user["avatar"])
         )
-    util.send_moderation_request(user, "groupEntries", entry)
-    return entry
-
-
-def send_entry_notification(id):
-    db = database.get_db()
-    entry = db.groupEntries.find_one({"_id": ObjectId(id)})
-    # If this is a reply, then send the reply email instead
-    if entry.get("inReplyTo"):
-        return send_entry_reply_notification(id)
-    group = db.groups.find_one({"_id": entry["group"]})
-    user = db.users.find_one({"_id": entry["user"]})
 
     for u in db.users.find(
         {
             "_id": {"$ne": user["_id"]},
-            "groups": group["_id"],
+            "groups": id,
-            "subscriptions.email": "groupFeed-" + str(group["_id"]),
+            "subscriptions.email": "groupFeed-" + str(id),
         },
         {"email": 1, "username": 1},
     ):
@@ -196,17 +170,18 @@ def send_entry_notification(id):
                     u["username"],
                     user["username"],
                     group["name"],
-                    entry["content"],
+                    data["content"],
-                    "{}/groups/{}".format(APP_URL, str(group["_id"])),
+                    "{}/groups/{}".format(APP_URL, str(id)),
                     APP_NAME,
                 ),
             }
         )
     push.send_multiple(
-        list(db.users.find({"_id": {"$ne": user["_id"]}, "groups": group["_id"]})),
+        list(db.users.find({"_id": {"$ne": user["_id"]}, "groups": id})),
         "{} posted in {}".format(user["username"], group["name"]),
-        entry["content"][:30] + "...",
+        data["content"][:30] + "...",
     )
+    return entry
 
 
 def get_entries(user, id):
@@ -219,14 +194,8 @@ def get_entries(user, id):
         raise util.errors.BadRequest("You're not a member of this group")
     if not has_group_permission(user, group, "viewNoticeboard"):
         raise util.errors.Forbidden("You don't have permission to view the feed")
-    # Only return entries that have been moderated or are owned by the user
     entries = list(
-        db.groupEntries.find(
+        db.groupEntries.find({"group": id}).sort("createdAt", pymongo.DESCENDING)
-            {
-                "group": id,
-                "$or": [{"user": user["_id"]}, {"moderationRequired": {"$ne": True}}],
-            }
-        ).sort("createdAt", pymongo.DESCENDING)
     )
     authors = list(
         db.users.find(
@@ -289,7 +258,6 @@ def create_entry_reply(user, id, entry_id, data):
         "inReplyTo": entry_id,
         "user": user["_id"],
         "content": data["content"],
-        "moderationRequired": True,
     }
     if "attachments" in data:
         reply["attachments"] = data["attachments"]
@@ -314,22 +282,9 @@ def create_entry_reply(user, id, entry_id, data):
         reply["authorUser"]["avatarUrl"] = uploads.get_presigned_url(
             "users/{0}/{1}".format(user["_id"], user["avatar"])
         )
-    util.send_moderation_request(user, "groupEntries", entry)
-    return reply
-
-
-def send_entry_reply_notification(id):
-    db = database.get_db()
-    reply = db.groupEntries.find_one({"_id": ObjectId(id)})
-    user = db.users.find_one({"_id": reply["user"]})
-    original_entry = db.groupEntries.find_one({"_id": reply["inReplyTo"]})
-    group = db.groups.find_one({"_id": original_entry["group"]})
     op = db.users.find_one(
         {
-            "$and": [
+            "$and": [{"_id": entry.get("user")}, {"_id": {"$ne": user["_id"]}}],
-                {"_id": original_entry.get("user")},
-                {"_id": {"$ne": user["_id"]}},
-            ],
             "subscriptions.email": "messages.replied",
         }
     )
@@ -342,12 +297,13 @@ def send_entry_reply_notification(id):
                     op["username"],
                     user["username"],
                     group["name"],
-                    reply["content"],
+                    data["content"],
-                    "{}/groups/{}".format(APP_URL, str(group["_id"])),
+                    "{}/groups/{}".format(APP_URL, str(id)),
                     APP_NAME,
                 ),
             }
         )
+    return reply
 
 
 def delete_entry_reply(user, id, entry_id, reply_id):
@@ -630,7 +586,6 @@ def create_forum_topic_reply(user, id, topic_id, data):
         "user": user["_id"],
         "content": data["content"],
         "attachments": data.get("attachments", []),
-        "moderationRequired": True,
     }
     result = db.groupForumTopicReplies.insert_one(reply)
     db.groupForumTopics.update_one(
@@ -668,21 +623,11 @@ def create_forum_topic_reply(user, id, topic_id, data):
                 )
             )
 
-    util.send_moderation_request(user, "groupForumTopicReplies", reply)
-    return reply
-
-
-def send_forum_topic_reply_notification(id):
-    db = database.get_db()
-    reply = db.groupForumTopicReplies.find_one({"_id": ObjectId(id)})
-    user = db.users.find_one({"_id": reply["user"]})
-    topic = db.groupForumTopics.find_one({"_id": reply["topic"]})
-    group = db.groups.find_one({"_id": topic["group"]})
     for u in db.users.find(
         {
-            "_id": {"$ne": reply["user"]},
+            "_id": {"$ne": user["_id"]},
-            "groups": topic["group"],
+            "groups": id,
-            "subscriptions.email": "groupForumTopic-" + str(topic["_id"]),
+            "subscriptions.email": "groupForumTopic-" + str(topic_id),
         },
         {"email": 1, "username": 1},
     ):
@@ -695,15 +640,17 @@ def send_forum_topic_reply_notification(id):
                     user["username"],
                     topic["title"],
                     group["name"],
-                    reply["content"],
+                    data["content"],
                     "{}/groups/{}/forum/topics/{}".format(
-                        APP_URL, str(group["_id"]), str(topic["_id"])
+                        APP_URL, str(id), str(topic_id)
                     ),
                     APP_NAME,
                 ),
             }
         )
 
+    return reply
+
 
 def get_forum_topic_replies(user, id, topic_id, data):
     REPLIES_PER_PAGE = 20
@@ -723,12 +670,7 @@ def get_forum_topic_replies(user, id, topic_id, data):
         )
     total_replies = db.groupForumTopicReplies.count_documents({"topic": topic_id})
     replies = list(
-        db.groupForumTopicReplies.find(
+        db.groupForumTopicReplies.find({"topic": topic_id})
-            {
-                "topic": topic_id,
-                "$or": [{"moderationRequired": {"$ne": True}}, {"user": user["_id"]}],
-            }
-        )
         .sort("createdAt", pymongo.ASCENDING)
         .skip((page - 1) * REPLIES_PER_PAGE)
         .limit(REPLIES_PER_PAGE)

api/api/objects.py

@@ -12,7 +12,7 @@ APP_URL = os.environ.get("APP_URL")
 
 def delete(user, id):
     db = database.get_db()
-    obj = db.objects.find_one(ObjectId(id), {"project": 1, "storedName": 1})
+    obj = db.objects.find_one(ObjectId(id), {"project": 1})
     if not obj:
         raise util.errors.NotFound("Object not found")
     project = db.projects.find_one(obj.get("project"), {"user": 1})
@@ -21,8 +21,6 @@ def delete(user, id):
     if not util.can_edit_project(user, project):
         raise util.errors.Forbidden("Forbidden", 403)
     db.objects.delete_one({"_id": ObjectId(id)})
-    db.comments.delete_many({"object": ObjectId(id)})
-    uploads.delete_file(f"projects/{project['_id']}/{obj.get('storedName')}")
     return {"deletedObject": id}
 
 
@@ -36,9 +34,7 @@ def get(user, id):
         raise util.errors.NotFound("Project not found")
     is_owner = user and (user.get("_id") == proj["user"])
     if not is_owner and proj["visibility"] != "public":
-        raise util.errors.Forbidden("Forbidden")
+        raise util.errors.BadRequest("Forbidden")
-    if not util.can_edit_project(user, proj) and obj.get("moderationRequired"):
-        raise util.errors.Forbidden("Awaiting moderation")
     owner = db.users.find_one({"_id": proj["user"]}, {"username": 1, "avatar": 1})
     if obj["type"] == "file" and "storedName" in obj:
         obj["url"] = uploads.get_presigned_url(
@@ -173,12 +169,12 @@ def create_comment(user, id, data):
     obj = db.objects.find_one({"_id": ObjectId(id)})
     if not obj:
         raise util.errors.NotFound("We could not find the specified object")
+    project = db.projects.find_one({"_id": obj["project"]})
     comment = {
         "content": data.get("content", ""),
         "object": ObjectId(id),
         "user": user["_id"],
         "createdAt": datetime.datetime.now(),
-        "moderationRequired": True,
     }
     result = db.comments.insert_one(comment)
     db.objects.update_one({"_id": ObjectId(id)}, {"$inc": {"commentCount": 1}})
@@ -190,16 +186,6 @@ def create_comment(user, id, data):
             "users/{0}/{1}".format(user["_id"], user.get("avatar"))
         ),
     }
-    util.send_moderation_request(user, "comments", comment)
-    return comment
-
-
-def send_comment_notification(id):
-    db = database.get_db()
-    comment = db.comments.find_one({"_id": ObjectId(id)})
-    user = db.users.find_one({"_id": comment["user"]})
-    obj = db.objects.find_one({"_id": comment["object"]})
-    project = db.projects.find_one({"_id": obj["project"]})
     project_owner = db.users.find_one(
         {"_id": project["user"], "subscriptions.email": "projects.commented"}
     )
@@ -223,6 +209,7 @@ def send_comment_notification(id):
                 ),
             }
         )
+    return comment
 
 
 def get_comments(user, id):
@@ -237,14 +224,7 @@ def get_comments(user, id):
     is_owner = user and (user.get("_id") == proj["user"])
     if not is_owner and proj["visibility"] != "public":
         raise util.errors.Forbidden("This project is private")
-    query = {
+    comments = list(db.comments.find({"object": id}))
-        "object": id,
-        "$or": [
-            {"moderationRequired": {"$ne": True}},
-            {"user": user["_id"] if user else None},
-        ],
-    }
-    comments = list(db.comments.find(query))
     user_ids = list(map(lambda c: c["user"], comments))
     users = list(
         db.users.find({"_id": {"$in": user_ids}}, {"username": 1, "avatar": 1})

api/api/projects.py

@@ -1,8 +1,7 @@
 import datetime
 import re
-import os
 from bson.objectid import ObjectId
-from util import database, wif, util, mail
+from util import database, wif, util
 from api import uploads, objects
 
 default_pattern = {
@@ -12,7 +11,6 @@ default_pattern = {
         "defaultColour": "178,53,111",
         "defaultSpacing": 1,
         "defaultThickness": 1,
-        "guideFrequency": 8,
     },
     "weft": {
         "treadles": 8,
@@ -20,7 +18,6 @@ default_pattern = {
         "defaultColour": "53,69,178",
         "defaultSpacing": 1,
         "defaultThickness": 1,
-        "guideFrequency": 8,
     },
     "tieups": [[]] * 8,
     "colours": [
@@ -230,12 +227,8 @@ def delete(user, username, project_path):
     project = get_by_username(username, project_path)
     if not util.can_edit_project(user, project):
         raise util.errors.Forbidden("Forbidden")
-
-    objects = list(db.objects.find({"project": project["_id"]}, {"_id": 1}))
     db.projects.delete_one({"_id": project["_id"]})
     db.objects.delete_many({"project": project["_id"]})
-    db.comments.delete_many({"object": {"$in": [o["_id"] for o in objects]}})
-    uploads.delete_folder("projects/" + str(project["_id"]))
     return {"deletedProject": project["_id"]}
 
 
@@ -247,12 +240,9 @@ def get_objects(user, username, path):
     if not util.can_view_project(user, project):
         raise util.errors.Forbidden("This project is private")
 
-    query = {"project": project["_id"]}
-    if not util.can_edit_project(user, project):
-        query["moderationRequired"] = {"$ne": True}
     objs = list(
         db.objects.find(
-            query,
+            {"project": project["_id"]},
             {
                 "createdAt": 1,
                 "name": 1,
@@ -304,7 +294,6 @@ def create_object(user, username, path, data):
             "storedName": data["storedName"],
             "createdAt": datetime.datetime.now(),
             "type": "file",
-            "moderationRequired": True,
         }
         if re.search(r"(.jpg)|(.png)|(.jpeg)|(.gif)$", data["storedName"].lower()):
             obj["isImage"] = True
@@ -323,7 +312,6 @@ def create_object(user, username, path, data):
             uploads.blur_image(
                 "projects/" + str(project["_id"]) + "/" + data["storedName"], handle_cb
             )
-        util.send_moderation_request(user, "object", obj)
         return obj
     if data["type"] == "pattern":
         obj = {
@@ -337,16 +325,7 @@ def create_object(user, username, path, data):
                 if pattern:
                     obj["name"] = pattern["name"]
                     obj["pattern"] = pattern
-            except Exception as e:
+            except Exception:
-                mail.send(
-                    {
-                        "to": os.environ.get("ADMIN_EMAIL"),
-                        "subject": "Error loading WIF file",
-                        "text": "A WIF file failed to parse with error: {}. The contents are below:\n\n{}".format(
-                            e, data["wif"]
-                        ),
-                    }
-                )
                 raise util.errors.BadRequest(
                     "Unable to load WIF file. It is either invalid or in a format we cannot understand."
                 )

api/api/root.py

@@ -1,7 +1,5 @@
-import datetime
-from bson.objectid import ObjectId
 from util import database, util
-from api import uploads, objects, groups
+from api import uploads
 
 
 def get_users(user):
@@ -54,82 +52,3 @@ def get_groups(user):
     for group in groups:
         group["memberCount"] = db.users.count_documents({"groups": group["_id"]})
     return {"groups": groups}
-
-
-def get_moderation(user):
-    db = database.get_db()
-    if not util.is_root(user):
-        raise util.errors.Forbidden("Not allowed")
-    object_list = list(db.objects.find({"moderationRequired": True}))
-    for obj in object_list:
-        if obj["type"] == "file" and "storedName" in obj:
-            obj["url"] = uploads.get_presigned_url(
-                "projects/{0}/{1}".format(obj["project"], obj["storedName"])
-            )
-    comment_list = list(db.comments.find({"moderationRequired": True}))
-    user_list = list(db.users.find({"moderationRequired": True}, {"username": 1}))
-    group_list = list(db.groups.find({"moderationRequired": True}, {"name": 1}))
-    group_entry_list = list(db.groupEntries.find({"moderationRequired": True}))
-    for entry in group_entry_list:
-        for a in entry.get("attachments", []):
-            if a["type"] == "file" and "storedName" in a:
-                a["url"] = uploads.get_presigned_url(
-                    "groups/{0}/{1}".format(entry["group"], a["storedName"])
-                )
-    group_topic_reply_list = list(
-        db.groupForumTopicReplies.find({"moderationRequired": True})
-    )
-    for reply in group_topic_reply_list:
-        for a in reply.get("attachments", []):
-            if a["type"] == "file" and "storedName" in a:
-                a["url"] = uploads.get_presigned_url(
-                    "groups/{0}/topics/{1}/{2}".format(
-                        reply["group"], reply["topic"], a["storedName"]
-                    )
-                )
-    return {
-        "objects": object_list,
-        "comments": comment_list,
-        "users": user_list,
-        "groups": group_list,
-        "groupEntries": group_entry_list,
-        "groupForumTopicReplies": group_topic_reply_list,
-    }
-
-
-def moderate(user, item_type, item_id, allowed):
-    db = database.get_db()
-    if not util.is_root(user):
-        raise util.errors.Forbidden("Not allowed")
-    if item_type not in [
-        "objects",
-        "comments",
-        "users",
-        "groups",
-        "groupEntries",
-        "groupForumTopicReplies",
-    ]:
-        raise util.errors.BadRequest("Invalid item type")
-    item_id = ObjectId(item_id)
-    item = db[item_type].find_one({"_id": item_id})
-    # For now, handle only allowed moderations.
-    # Disallowed will be manually managed.
-    if item and allowed:
-        db[item_type].update_one(
-            {"_id": item_id},
-            {
-                "$set": {
-                    "moderationRequired": False,
-                    "moderated": True,
-                    "moderatedAt": datetime.datetime.now(),
-                    "moderatedBy": user["_id"],
-                }
-            },
-        )
-        if item_type == "comments":
-            objects.send_comment_notification(item_id)
-        if item_type == "groupEntries":
-            groups.send_entry_notification(item_id)
-        if item_type == "groupForumTopicReplies":
-            groups.send_forum_topic_reply_notification(item_id)
-    return {"success": True}

api/api/search.py

@@ -105,7 +105,6 @@ def discover(user, count=3):
     db = database.get_db()
     projects = []
     users = []
-    groups = []
 
     all_projects_query = {
         "name": {"$not": re.compile("my new project", re.IGNORECASE)},
@@ -166,25 +165,9 @@ def discover(user, count=3):
         if len(users) >= count:
             break
 
-    all_groups = list(
-        db.groups.find(
-            {"advertised": True, "name": {"$ne": "My group"}}, {"name": 1, "image": 1}
-        )
-    )
-    random.shuffle(all_groups)
-    for g in all_groups:
-        if "image" in g:
-            g["imageUrl"] = uploads.get_presigned_url(
-                "groups/{0}/{1}".format(g["_id"], g["image"])
-            )
-        groups.append(g)
-        if len(groups) >= count:
-            break
-
     return {
         "highlightProjects": projects,
         "highlightUsers": users,
-        "highlightGroups": groups,
     }
 
 

api/api/uploads.py

@@ -8,8 +8,6 @@ import blurhash
 from util import database, util
 from api.groups import has_group_permission
 
-s3_client = None
-
 
 def sanitise_filename(s):
     bad_chars = re.compile("[^a-zA-Z0-9_.]")
@@ -18,9 +16,6 @@ def sanitise_filename(s):
 
 
 def get_s3():
-    global s3_client
-    if s3_client:
-        return s3_client
     session = boto3.session.Session()
 
     s3_client = session.client(
@@ -33,6 +28,7 @@ def get_s3():
 
 
 def get_presigned_url(path):
+    return os.environ["AWS_S3_ENDPOINT"] + os.environ["AWS_S3_BUCKET"] + "/" + path
     s3 = get_s3()
     return s3.generate_presigned_url(
         "get_object", Params={"Bucket": os.environ["AWS_S3_BUCKET"], "Key": path}
@@ -49,38 +45,10 @@ def upload_file(path, data):
 
 
 def get_file(key):
-    if not key:
-        return None
     s3 = get_s3()
     return s3.get_object(Bucket=os.environ["AWS_S3_BUCKET"], Key=key)
 
 
-def delete_file(key):
-    if not key:
-        return
-    s3 = get_s3()
-    s3.delete_object(Bucket=os.environ["AWS_S3_BUCKET"], Key=key)
-
-
-def delete_folder(path):
-    bucket_name = os.environ["AWS_S3_BUCKET"]
-    if not path:
-        return
-    s3 = get_s3()
-
-    response = s3.list_objects_v2(Bucket=bucket_name, Prefix=path)
-    if "Contents" in response:
-        files_in_folder = response["Contents"]
-        files_to_delete = []
-
-        for f in files_in_folder:
-            files_to_delete.append({"Key": f["Key"]})
-
-        response = s3.delete_objects(
-            Bucket=bucket_name, Delete={"Objects": files_to_delete}
-        )
-
-
 def generate_file_upload_request(
     user, file_name, file_size, file_type, for_type, for_id
 ):

api/api/users.py

@@ -12,7 +12,6 @@ def me(user):
         "username": user["username"],
         "bio": user.get("bio"),
         "email": user.get("email"),
-        "emailVerified": user.get("emailVerified"),
         "avatar": user.get("avatar"),
         "avatarUrl": user.get("avatar")
         and uploads.get_presigned_url(
@@ -116,19 +115,12 @@ def update(user, username, data):
         uploads.blur_image(
             "users/" + str(user["_id"]) + "/" + data["avatar"], handle_cb
         )
-    if "avatar" in data and user.get("avatar") and user["avatar"] != data["avatar"]:
-        uploads.delete_file("users/" + str(user["_id"]) + "/" + user["avatar"])
     updater = util.build_updater(data, allowed_keys)
     if updater:
         if "avatar" in updater.get(
             "$unset", {}
         ):  # Also unset blurhash if removing avatar
             updater["$unset"]["avatarBlurHash"] = ""
-        if "$set" in updater and (
-            "avatar" in data or "bio" in data or "website" in data or "username" in data
-        ):
-            updater["$set"]["moderationRequired"] = True
-            util.send_moderation_request(user, "users", user)
         db.users.update_one({"username": username}, updater)
     return get(user, data.get("username", username))
 

api/app.py

@@ -77,7 +77,7 @@ def handle_unprocessable_entity(e):
                 message += f"""{str(key)}: """
                 return build_message(message, d[key])
             elif isinstance(d[key], list):
-                message += f"""{str(key)}: {",\n ".join(d[key])}\n"""
+                message += f"""{str(key)}: {',\n '.join(d[key])}\n"""
         return message
 
     if validation_errors:
@@ -156,21 +156,6 @@ def email_address(args):
     return util.jsonify(accounts.update_email(util.get_user(), args))
 
 
-@app.route("/accounts/email/verificationRequests", methods=["POST"])
-def email_verification_request():
-    return util.jsonify(accounts.send_verification_email(util.get_user()))
-
-
-@app.route("/accounts/email/verified", methods=["PUT"])
-@use_args(
-    {
-        "token": fields.Str(required=True),
-    }
-)
-def email_verify(args):
-    return util.jsonify(accounts.verify_email(args.get("token")))
-
-
 @limiter.limit("5 per minute", key_func=util.limit_by_user, methods=["POST"])
 @app.route("/accounts/password", methods=["PUT"])
 @use_args(
@@ -249,7 +234,7 @@ def users_username_get(username):
 @use_args(
     {
         "username": fields.Str(validate=validate.Length(min=3)),
-        "avatar": fields.Str(allow_none=True),
+        "avatar": fields.Str(),
         "bio": fields.Str(),
         "location": fields.Str(),
         "website": fields.Str(),
@@ -473,7 +458,6 @@ def groups_route_get():
         "name": fields.Str(required=True, validate=validate.Length(min=3)),
         "description": fields.Str(),
         "closed": fields.Bool(),
-        "advertised": fields.Bool(),
     }
 )
 def groups_route_post(args):
@@ -494,7 +478,6 @@ def group_route(id):
         "name": fields.Str(),
         "description": fields.Str(),
         "closed": fields.Bool(),
-        "advertised": fields.Bool(),
         "memberPermissions": fields.List(fields.Str()),
         "image": fields.Str(allow_none=True),
     }
@@ -773,37 +756,6 @@ def root_groups():
     return util.jsonify(root.get_groups(util.get_user(required=True)))
 
 
-@app.route("/root/moderation", methods=["GET"])
-def root_moderation():
-    return util.jsonify(root.get_moderation(util.get_user(required=True)))
-
-
-@app.route("/root/moderation/<item_type>/<id>", methods=["PUT", "DELETE"])
-def root_moderation_item(item_type, id):
-    return util.jsonify(
-        root.moderate(
-            util.get_user(required=True), item_type, id, request.method == "PUT"
-        )
-    )
-
-
-## REPORTS
-
-
-@app.route("/reports", methods=["POST"])
-@use_args(
-    {
-        "referrer": fields.Str(),
-        "url": fields.Str(required=True, validate=validate.Length(min=5)),
-        "description": fields.Str(required=True, validate=validate.Length(min=5)),
-        "email": fields.Email(allow_none=True),
-    }
-)
-def reports(args):
-    util.send_report_email(args)
-    return {"success": True}
-
-
 ## ActivityPub Support
 
 

api/lint.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ruff format .
+ruff check --fix .

api/pyproject.toml

@@ -1,32 +1,31 @@
 [tool.poetry]
 name = "api"
 version = "0.1.0"
-package-mode = false
 description = "Treadl API"
 authors = ["Will <will@treadl.com>"]
 
 [tool.poetry.dependencies]
 python = "^3.12"
-flask = "^3.1.0"
+flask = "^3.0.3"
-bcrypt = "^4.3.0"
+bcrypt = "^4.2.0"
-pyjwt = "^2.10.0"
+pyjwt = "^2.9.0"
-boto3 = "^1.37.4"
+boto3 = "^1.35.34"
-flask-cors = "^5.0.1"
+flask-cors = "^5.0.0"
-dnspython = "^2.7.0"
+dnspython = "^2.6.1"
 requests = "^2.32.3"
-pymongo = "^4.11.1"
+pymongo = "^4.10.1"
-flask_limiter = "^3.10.1"
+flask_limiter = "^3.8.0"
-firebase-admin = "^6.6.0"
+firebase-admin = "^6.5.0"
 blurhash-python = "^1.2.2"
 gunicorn = "^23.0.0"
-sentry-sdk = {extras = ["flask"], version = "^2.22.0"}
+sentry-sdk = {extras = ["flask"], version = "^2.15.0"}
-pyOpenSSL = "^25.0.0"
+pyOpenSSL = "^24.2.1"
 webargs = "^8.6.0"
 
 [tool.poetry.dev-dependencies]
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.9.9"
+ruff = "^0.6.9"
 
 [build-system]
 requires = ["poetry>=0.12"]

api/util/mail.py

@@ -36,8 +36,5 @@ def handle_send(data):
 
 
 def send(data):
-    if data.get("to_user"):
-        if not data["to_user"].get("emailVerified") and not data.get("force"):
-            return
     thr = Thread(target=handle_send, args=[data])
     thr.start()

api/util/util.py

@@ -1,4 +1,3 @@
-import os
 import json
 import datetime
 from flask import request, Response
@@ -8,7 +7,7 @@ from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 from bson.objectid import ObjectId
 from api import accounts
-from util import util, mail
+from util import util
 
 errors = werkzeug.exceptions
 
@@ -93,34 +92,6 @@ def build_updater(obj, allowed_keys):
     return updater
 
 
-def send_report_email(report):
-    if not report:
-        return
-    mail.send(
-        {
-            "to": os.environ.get("ADMIN_EMAIL"),
-            "subject": "{} report".format(os.environ.get("APP_NAME")),
-            "text": "A new report has been submitted: {0}".format(
-                json.dumps(report, indent=4)
-            ),
-        }
-    )
-
-
-def send_moderation_request(from_user, item_type, item):
-    if not from_user or not item_type or not item:
-        return
-    mail.send(
-        {
-            "to": os.environ.get("ADMIN_EMAIL"),
-            "subject": "{} moderation needed".format(os.environ.get("APP_NAME")),
-            "text": "New content has been added by {0} ({1}) and needs moderating: {2} ({3})".format(
-                from_user["username"], from_user["email"], item_type, item["_id"]
-            ),
-        }
-    )
-
-
 def generate_rsa_keypair():
     private_key = rsa.generate_private_key(public_exponent=65537, key_size=4096)
     private_pem = private_key.private_bytes(

api/util/wif.py

@@ -12,7 +12,7 @@ def normalise_colour(max_color, triplet):
     components = triplet.split(",")
     new_components = []
     for component in components:
-        new_components.append(str(int(float(color_factor) * int(float(component)))))
+        new_components.append(str(int(float(color_factor) * int(component))))
     return ",".join(new_components)
 
 
@@ -152,35 +152,11 @@ def dumps(obj):
 
 
 def loads(wif_file):
-    # Ensure file exists:
+    config = configparser.ConfigParser(allow_no_value=True, strict=False)
-    if not wif_file or type(wif_file) is not str:
+    config.read_string(wif_file.lower())
-        raise Exception("Invalid file: null or empty or not string")
-
-    # Some user-uploaded files (Quickdraw?) start with strange HTTP header info.
-    # Remove all preceding non-section lines:
-    wif_file = "[" + wif_file.split("[", 1)[1]
-
-    # Make all section names lowercase
-    normalized_lines = []
-    for line in wif_file.splitlines():
-        if line.strip().startswith("[") and line.strip().endswith("]"):
-            section_name = line.strip()[1:-1].lower()
-            normalized_lines.append(f"[{section_name}]")
-        else:
-            normalized_lines.append(line)
-    wif_file = "\n".join(normalized_lines)
-
-    # Load config
-    config = configparser.ConfigParser(
-        allow_no_value=True, strict=False, inline_comment_prefixes=("#", ";")
-    )
-    config.read_string(wif_file)
     DEFAULT_TITLE = "Untitled Pattern"
     draft = {}
 
-    if "wif" in config:
-        draft["wifInfo"] = dict(config["wif"])
-        draft["wifInfo"]["importedFile"] = wif_file
     if "text" in config:
         text = config["text"]
         draft["name"] = text.get("title") or DEFAULT_TITLE
@@ -206,36 +182,30 @@ def loads(wif_file):
             normalise_colour(255, "0,0,255"),
         ]
 
-    weaving = config["weaving"] if "weaving" in config else None
+    weaving = config["weaving"]
 
-    threading = config["threading"] if "threading" in config else []
+    threading = config["threading"]
-    warp = config["warp"] if "warp" in config else None
+    warp = config["warp"]
     draft["warp"] = {}
-    draft["warp"]["shafts"] = weaving.getint("shafts") if weaving else 0
+    draft["warp"]["shafts"] = weaving.getint("shafts")
     draft["warp"]["threading"] = []
 
-    # Work out default warp colour
+    if warp.get("color"):
-    if warp and warp.get("color"):
         warp_colour_index = warp.getint("color") - 1
-        if warp_colour_index < len(draft["colours"]):
+        draft["warp"]["defaultColour"] = draft["colours"][warp_colour_index]
-            draft["warp"]["defaultColour"] = draft["colours"][warp_colour_index]
+
-    if not draft.get("warp").get("defaultColour"):
+    else:
         # In case of no color table or colour index out of bounds
         draft["warp"]["defaultColour"] = draft["colours"][0]
 
     for x in threading:
-        shaft = threading[x].strip()
+        shaft = threading[x]
         if "," in shaft:
             shaft = shaft.split(",")[0]
-        shaft = int(shaft) if shaft else 0
+        shaft = int(shaft)
-        while int(x) > len(
+        while int(x) >= len(draft["warp"]["threading"]) - 1:
-            draft["warp"]["threading"]
-        ):  # grow threading array to current x
             draft["warp"]["threading"].append({"shaft": 0})
         draft["warp"]["threading"][int(x) - 1] = {"shaft": shaft}
-        if shaft > draft["warp"]["shafts"]:
-            draft["warp"]["shafts"] = shaft
-    draft["warp"]["guideFrequency"] = draft["warp"]["shafts"]
     try:
         warp_colours = config["warp colors"]
         for x in warp_colours:
@@ -244,37 +214,28 @@ def loads(wif_file):
             ]
     except Exception:
         pass
-    if not draft["warp"]["threading"]:  # Make a bunch of empty threads
-        draft["warp"]["threading"] = [{"shaft": 0} for i in range(20)]
 
-    treadling = config["treadling"] if "treadling" in config else []
+    treadling = config["treadling"]
-    weft = config["weft"] if "weft" in config else None
+    weft = config["weft"]
     draft["weft"] = {}
-    draft["weft"]["treadles"] = weaving.getint("treadles") if weaving else 0
+    draft["weft"]["treadles"] = weaving.getint("treadles")
     draft["weft"]["treadling"] = []
 
-    # Work out default weft colour
+    if weft.get("color"):
-    if weft and weft.get("color"):
         weft_colour_index = weft.getint("color") - 1
-        if weft_colour_index < len(draft["colours"]):
+        draft["weft"]["defaultColour"] = draft["colours"][weft_colour_index]
-            draft["weft"]["defaultColour"] = draft["colours"][weft_colour_index]
+    else:
-    if not draft.get("weft").get("defaultColour"):
         # In case of no color table or colour index out of bounds
         draft["weft"]["defaultColour"] = draft["colours"][1]
 
     for x in treadling:
-        treadle = treadling[x].strip()
+        shaft = treadling[x]
-        if "," in treadle:
+        if "," in shaft:
-            treadle = treadle.split(",")[0]
+            shaft = shaft.split(",")[0]
-        treadle = int(treadle) if treadle else 0
+        shaft = int(shaft)
-        while int(x) > len(
+        while int(x) >= len(draft["weft"]["treadling"]) - 1:
-            draft["weft"]["treadling"]
-        ):  # grow treadling array to current x
             draft["weft"]["treadling"].append({"treadle": 0})
-        draft["weft"]["treadling"][int(x) - 1] = {"treadle": treadle}
+        draft["weft"]["treadling"][int(x) - 1] = {"treadle": shaft}
-        if treadle > draft["weft"]["treadles"]:
-            draft["weft"]["treadles"] = treadle
-    draft["weft"]["guideFrequency"] = draft["weft"]["treadles"]
     try:
         weft_colours = config["weft colors"]
         for x in weft_colours:
@@ -283,20 +244,17 @@ def loads(wif_file):
             ]
     except Exception:
         pass
-    if not draft["weft"]["treadling"]:  # Make a bunch of empty threads
-        draft["weft"]["treadling"] = [{"treadle": 0} for i in range(20)]
 
-    tieup = config["tieup"] if "tieup" in config else None
+    tieup = config["tieup"]
-    draft["tieups"] = []
+    draft["tieups"] = []  # [0]*len(tieup)
-    if tieup:
+    for x in tieup:
-        for x in tieup:
+        while int(x) >= len(draft["tieups"]) - 1:
-            while int(x) >= len(draft["tieups"]) - 1:
+            draft["tieups"].append([])
-                draft["tieups"].append([])
+        split = tieup[x].split(",")
-            try:
+        try:
-                split = tieup[x].split(",")
+            draft["tieups"][int(x) - 1] = [int(i) for i in split]
-                draft["tieups"][int(x) - 1] = [int(i) for i in split]
+        except Exception:
-            except Exception:
+            draft["tieups"][int(x) - 1] = []
-                draft["tieups"][int(x) - 1] = []
 
     return draft
 
@@ -365,9 +323,6 @@ def draw_image(obj, with_plan=False):
     drawdown_left = warp_left if with_plan else 0
     drawdown_bottom = weft_bottom if with_plan else full_height
 
-    warp_guides = warp.get("guideFrequency") or 0
-    weft_guides = weft.get("guideFrequency") or 0
-
     WHITE = (255, 255, 255)
     GREY = (150, 150, 150)
     BLACK = (0, 0, 0)
@@ -393,10 +348,7 @@ def draw_image(obj, with_plan=False):
                 width=1,
                 joint=None,
             )
-        col_index = 1
         for i, x in enumerate(range(len(warp["threading"]) - 1, 0, -1)):
-            is_guide = warp_guides and col_index % warp_guides == 0
-            col_index += 1
             thread = warp["threading"][i]
             xcoord = x * BASE_SIZE
             draw.line(
@@ -404,8 +356,8 @@ def draw_image(obj, with_plan=False):
                     (xcoord, warp_top),
                     (xcoord, warp_bottom),
                 ],
-                fill=BLACK if is_guide else GREY,
+                fill=GREY,
-                width=2 if is_guide else 1,
+                width=1,
                 joint=None,
             )
             if thread.get("shaft", 0) > 0:
@@ -445,10 +397,7 @@ def draw_image(obj, with_plan=False):
                 width=1,
                 joint=None,
             )
-        row_index = 0
         for i, y in enumerate(range(0, len(weft["treadling"]))):
-            is_guide = weft_guides and row_index % weft_guides == 0
-            row_index += 1
             thread = weft["treadling"][i]
             ycoord = weft_top + y * BASE_SIZE
             draw.line(
@@ -456,8 +405,8 @@ def draw_image(obj, with_plan=False):
                     (weft_left, ycoord),
                     (weft_right, ycoord),
                 ],
-                fill=BLACK if is_guide else GREY,
+                fill=GREY,
-                width=2 if is_guide else 1,
+                width=1,
                 joint=None,
             )
             if thread.get("treadle", 0) > 0:
@@ -536,9 +485,7 @@ def draw_image(obj, with_plan=False):
             shaft = 0 if warp_thread["shaft"] > warp["shafts"] else warp_thread["shaft"]
 
             # Work out if should be warp or weft in "front"
-            tieup = (
+            tieup = tieups[treadle - 1] if treadle > 0 else []
-                tieups[treadle - 1] if (treadle > 0 and treadle <= len(tieups)) else []
-            )
             tieup = [t for t in tieup if t <= warp["shafts"]]
             thread_type = "warp" if shaft in tieup else "weft"
 
@@ -581,13 +528,9 @@ def draw_image(obj, with_plan=False):
     in_mem_file = io.BytesIO()
     img.save(in_mem_file, "PNG")
     in_mem_file.seek(0)
-    file_name_prefix = "preview-{0}_{1}".format(
+    file_name = "preview-{0}_{1}-{2}.png".format(
-        "full" if with_plan else "base", obj["_id"]
+        "full" if with_plan else "base", obj["_id"], int(time.time())
     )
-    file_name = "{0}-{1}.png".format(file_name_prefix, int(time.time()))
+    path = "projects/{}/{}".format(obj["project"], file_name)
-    folder = "projects/{}".format(obj["project"])
+    uploads.upload_file(path, in_mem_file)
-    # Delete existing preview images of this type
-    uploads.delete_folder("{}/{}".format(folder, file_name_prefix))
-    # Upload the new preview image
-    uploads.upload_file("{}/{}".format(folder, file_name), in_mem_file)
     return file_name

docker/Dockerfile

@@ -1,40 +0,0 @@
-# Stage 1: Build React SPA
-FROM node:20 AS react-build
-WORKDIR /app
-COPY web/package.json web/package-lock.json ./
-RUN npm install
-COPY web/ ./
-RUN npx vite build
-
-# Stage 2: Set up Nginx with React and Flask
-FROM python:3.12-slim
-WORKDIR /app
-
-# Install Flask and dependencies
-RUN pip install poetry
-COPY api/poetry.lock .
-COPY api/pyproject.toml .
-RUN poetry config virtualenvs.create false --local
-RUN poetry install
-
-# Copy Flask app
-COPY api/ ./
-
-# Install Nginx
-RUN apt-get update && apt-get install -y nginx && rm -rf /var/lib/apt/lists/*
-RUN unlink /etc/nginx/sites-enabled/default # Ensure default Nginx configuration is not used
-
-# Copy React build files into Nginx's static directory
-COPY --from=react-build /app/dist /usr/share/nginx/html
-
-# Copy custom Nginx configuration file
-COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
-
-# Expose ports for Nginx
-EXPOSE 80
-
-# Start both Flask and Nginx using a script
-COPY docker/start.sh /start.sh
-RUN chmod +x /start.sh
-
-CMD ["/start.sh"]

docker/docker-compose.yml

@@ -1,33 +0,0 @@
-services:
-  treadl:
-    image: wilw/treadl:latest
-    ports:
-      - "8080:80"
-    environment:
-      # App settings
-      - JWT_SECRET=secret # Change this to a secure secret
-      - APP_URL=http://example.com
-      - APP_DOMAIN=example.com
-      - APP_NAME=Treadl
-
-      # MongoDB connection
-      - MONGO_URL=mongodb://mongo:27017/treadl
-      - MONGO_DATABASE=treadl
-
-      # Mailgun email settings
-      - MAILGUN_URL=
-      - MAILGUN_KEY
-      - FROM_EMAIL= # An email address to send emails from
-
-      # Email addresses
-      - CONTACT_EMAIL= # An email address for people to contact you
-      - ADMIN_EMAIL= # An email address for admin notifications
-
-      # S3 storage settings
-      - AWS_S3_ENDPOINT=https://eu-central-1.linodeobjects.com/
-      - AWS_S3_BUCKET=treadl
-      - AWS_ACCESS_KEY_ID=
-      - AWS_SECRET_ACCESS_KEY=
-
-  mongo:
-    image: mongo:6

docker/nginx.conf

@@ -1,22 +0,0 @@
-server {
-    listen 80;
-
-    # Serve React static files for all non-API routes
-    location / {
-        root /usr/share/nginx/html;
-        index index.html;
-        try_files $uri /index.html;
-    }
-
-    # Proxy API requests to Flask backend
-    location /api/ {
-        proxy_pass http://127.0.0.1:5000/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    gzip on;
-    gzip_types text/plain application/json text/css application/javascript;
-}

docker/start.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Start Flask app in the background
-gunicorn -b 0.0.0.0:5000 app:app &
-
-# Start Nginx in the foreground
-nginx -g "daemon off;"
-

mobile/android/app/build.gradle

@@ -1,10 +1,3 @@
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    id "dev.flutter.flutter-gradle-plugin"
-    id "com.google.gms.google-services"
-}
-
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -13,6 +6,11 @@ if (localPropertiesFile.exists()) {
     }
 }
 
+def flutterRoot = localProperties.getProperty('flutter.sdk')
+if (flutterRoot == null) {
+    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+}
+
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -23,6 +21,10 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
@@ -30,18 +32,20 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 33
-    namespace 'com.treadl'
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
+    lintOptions {
+        disable 'InvalidPackage'
+    }
 
     defaultConfig {
         applicationId "com.treadl"
-        minSdk = flutter.minSdkVersion
+        minSdkVersion 29
-        targetSdk = flutter.targetSdkVersion
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -60,19 +64,14 @@ android {
             signingConfig signingConfigs.release
         }
     }
-    lint {
-        disable 'InvalidPackage'
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
 }
 
 flutter {
     source '../..'
 }
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+
+apply plugin: 'com.google.gms.google-services'

mobile/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java

@@ -0,0 +1,25 @@
+// Generated file.
+//
+// If you wish to remove Flutter's multidex support, delete this entire file.
+//
+// Modifications to this file should be done in a copy under a different name
+// as this file may be regenerated.
+
+package io.flutter.app;
+
+import android.app.Application;
+import android.content.Context;
+import androidx.annotation.CallSuper;
+import androidx.multidex.MultiDex;
+
+/**
+ * Extension of {@link android.app.Application}, adding multidex support.
+ */
+public class FlutterMultiDexApplication extends Application {
+  @Override
+  @CallSuper
+  protected void attachBaseContext(Context base) {
+    super.attachBaseContext(base);
+    MultiDex.install(this);
+  }
+}

mobile/android/build.gradle

@@ -1,3 +1,17 @@
+buildscript {
+    ext.kotlin_version = '1.8.20'
+    repositories {
+        google()
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.google.gms:google-services:4.3.3'
+    }
+}
+
 allprojects {
     repositories {
         google()

mobile/android/gradle.properties

@@ -1,3 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
+android.bundle.enableUncompressedNativeLibs=false

mobile/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Apr 06 21:07:46 BST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mobile/android/settings.gradle

@@ -1,26 +1,15 @@
-pluginManagement {
+include ':app'
-    def flutterSdkPath = {
-        def properties = new Properties()
-        file("local.properties").withInputStream { properties.load(it) }
-        def flutterSdkPath = properties.getProperty("flutter.sdk")
-        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-        return flutterSdkPath
-    }()
 
-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
 
-    repositories {
+def plugins = new Properties()
-        google()
+def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-        mavenCentral()
+if (pluginsFile.exists()) {
-        gradlePluginPortal()
+    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
-    }
 }
 
-plugins {
+plugins.each { name, path ->
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    id "com.android.application" version '8.9.1' apply false
+    include ":$name"
-    id "org.jetbrains.kotlin.android" version "2.1.10" apply false
+    project(":$name").projectDir = pluginDirectory
-    id "com.google.gms.google-services" version "4.3.3" apply false
 }
-
-include ":app"

mobile/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

mobile/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '12.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

mobile/ios/Podfile.lock

@@ -1,120 +1,112 @@
 PODS:
-  - DKImagePickerController/Core (4.3.9):
+  - DKImagePickerController/Core (4.3.4):
     - DKImagePickerController/ImageDataManager
     - DKImagePickerController/Resource
-  - DKImagePickerController/ImageDataManager (4.3.9)
+  - DKImagePickerController/ImageDataManager (4.3.4)
-  - DKImagePickerController/PhotoGallery (4.3.9):
+  - DKImagePickerController/PhotoGallery (4.3.4):
     - DKImagePickerController/Core
     - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.9)
+  - DKImagePickerController/Resource (4.3.4)
-  - DKPhotoGallery (0.0.19):
+  - DKPhotoGallery (0.0.17):
-    - DKPhotoGallery/Core (= 0.0.19)
+    - DKPhotoGallery/Core (= 0.0.17)
-    - DKPhotoGallery/Model (= 0.0.19)
+    - DKPhotoGallery/Model (= 0.0.17)
-    - DKPhotoGallery/Preview (= 0.0.19)
+    - DKPhotoGallery/Preview (= 0.0.17)
-    - DKPhotoGallery/Resource (= 0.0.19)
+    - DKPhotoGallery/Resource (= 0.0.17)
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Core (0.0.19):
+  - DKPhotoGallery/Core (0.0.17):
     - DKPhotoGallery/Model
     - DKPhotoGallery/Preview
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Model (0.0.19):
+  - DKPhotoGallery/Model (0.0.17):
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Preview (0.0.19):
+  - DKPhotoGallery/Preview (0.0.17):
     - DKPhotoGallery/Model
     - DKPhotoGallery/Resource
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Resource (0.0.19):
+  - DKPhotoGallery/Resource (0.0.17):
     - SDWebImage
     - SwiftyGif
   - file_picker (0.0.1):
     - DKImagePickerController/PhotoGallery
     - Flutter
-  - Firebase/CoreOnly (11.10.0):
+  - Firebase/CoreOnly (10.9.0):
-    - FirebaseCore (~> 11.10.0)
+    - FirebaseCore (= 10.9.0)
-  - Firebase/Messaging (11.10.0):
+  - Firebase/Messaging (10.9.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 11.10.0)
+    - FirebaseMessaging (~> 10.9.0)
-  - firebase_core (3.13.0):
+  - firebase_core (2.13.1):
-    - Firebase/CoreOnly (= 11.10.0)
+    - Firebase/CoreOnly (= 10.9.0)
     - Flutter
-  - firebase_messaging (15.2.5):
+  - firebase_messaging (14.6.2):
-    - Firebase/Messaging (= 11.10.0)
+    - Firebase/Messaging (= 10.9.0)
     - firebase_core
     - Flutter
-  - FirebaseCore (11.10.0):
+  - FirebaseCore (10.9.0):
-    - FirebaseCoreInternal (~> 11.10.0)
+    - FirebaseCoreInternal (~> 10.0)
-    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/Logger (~> 8.0)
+    - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreInternal (11.10.0):
+  - FirebaseCoreInternal (10.10.0):
-    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInstallations (11.10.0):
+  - FirebaseInstallations (10.10.0):
-    - FirebaseCore (~> 11.10.0)
+    - FirebaseCore (~> 10.0)
-    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/UserDefaults (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 7.8)
-    - PromisesObjC (~> 2.4)
+    - PromisesObjC (~> 2.1)
-  - FirebaseMessaging (11.10.0):
+  - FirebaseMessaging (10.9.0):
-    - FirebaseCore (~> 11.10.0)
+    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 11.0)
+    - FirebaseInstallations (~> 10.0)
-    - GoogleDataTransport (~> 10.0)
+    - GoogleDataTransport (~> 9.2)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/Reachability (~> 8.0)
+    - GoogleUtilities/Reachability (~> 7.8)
-    - GoogleUtilities/UserDefaults (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 7.8)
-    - nanopb (~> 3.30910.0)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
   - Flutter (1.0.0)
-  - fluttertoast (0.0.2):
+  - GoogleDataTransport (9.2.3):
-    - Flutter
+    - GoogleUtilities/Environment (~> 7.7)
-  - GoogleDataTransport (10.1.0):
+    - nanopb (< 2.30910.0, >= 2.30908.0)
-    - nanopb (~> 3.30910.0)
+    - PromisesObjC (< 3.0, >= 1.2)
-    - PromisesObjC (~> 2.4)
+  - GoogleUtilities/AppDelegateSwizzler (7.11.1):
-  - GoogleUtilities/AppDelegateSwizzler (8.0.2):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-    - GoogleUtilities/Privacy
+  - GoogleUtilities/Environment (7.11.1):
-  - GoogleUtilities/Environment (8.0.2):
+    - PromisesObjC (< 3.0, >= 1.2)
-    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (7.11.1):
-  - GoogleUtilities/Logger (8.0.2):
     - GoogleUtilities/Environment
-    - GoogleUtilities/Privacy
+  - GoogleUtilities/Network (7.11.1):
-  - GoogleUtilities/Network (8.0.2):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Privacy
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (8.0.2)":
+  - "GoogleUtilities/NSData+zlib (7.11.1)"
-    - GoogleUtilities/Privacy
+  - GoogleUtilities/Reachability (7.11.1):
-  - GoogleUtilities/Privacy (8.0.2)
-  - GoogleUtilities/Reachability (8.0.2):
     - GoogleUtilities/Logger
-    - GoogleUtilities/Privacy
+  - GoogleUtilities/UserDefaults (7.11.1):
-  - GoogleUtilities/UserDefaults (8.0.2):
     - GoogleUtilities/Logger
-    - GoogleUtilities/Privacy
   - image_picker_ios (0.0.1):
     - Flutter
-  - nanopb (3.30910.0):
+  - nanopb (2.30909.0):
-    - nanopb/decode (= 3.30910.0)
+    - nanopb/decode (= 2.30909.0)
-    - nanopb/encode (= 3.30910.0)
+    - nanopb/encode (= 2.30909.0)
-  - nanopb/decode (3.30910.0)
+  - nanopb/decode (2.30909.0)
-  - nanopb/encode (3.30910.0)
+  - nanopb/encode (2.30909.0)
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - PromisesObjC (2.4.0)
+  - PromisesObjC (2.2.0)
-  - SDWebImage (5.21.0):
+  - SDWebImage (5.18.8):
-    - SDWebImage/Core (= 5.21.0)
+    - SDWebImage/Core (= 5.18.8)
-  - SDWebImage/Core (5.21.0)
+  - SDWebImage/Core (5.18.8)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - SwiftyGif (5.4.5)
+  - SwiftyGif (5.4.4)
   - url_launcher_ios (0.0.1):
     - Flutter
 
@@ -123,7 +115,6 @@ DEPENDENCIES:
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
-  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
@@ -155,8 +146,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_messaging/ios"
   Flutter:
     :path: Flutter
-  fluttertoast:
-    :path: ".symlinks/plugins/fluttertoast/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   path_provider_foundation:
@@ -169,30 +158,29 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
+  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
-  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
+  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
+  file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
-  Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
+  Firebase: bd152f0f3d278c4060c5c71359db08ebcfd5a3e2
-  firebase_core: 2d4534e7b489907dcede540c835b48981d890943
+  firebase_core: ce64b0941c6d87c6ef5022ae9116a158236c8c94
-  firebase_messaging: 75bc93a4df25faccad67f6662ae872ac9ae69b64
+  firebase_messaging: 42912365e62efc1ea3e00724e5eecba6068ddb88
-  FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7
+  FirebaseCore: b68d3616526ec02e4d155166bbafb8eca64af557
-  FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
+  FirebaseCoreInternal: 971029061d326000d65bfdc21f5502c75c8b0893
-  FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3
+  FirebaseInstallations: 52153982b057d3afcb4e1fbb3eb0b6d00611e681
-  FirebaseMessaging: 2b9f56aa4ed286e1f0ce2ee1d413aabb8f9f5cb9
+  FirebaseMessaging: 6b7052cc3da7bc8e5f72bef871243e8f04a14eed
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
+  GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd
-  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
+  GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
-  GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
+  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
-  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
-  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
-  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  SDWebImage: a81bbb3ba4ea5f810f4069c68727cb118467a04a
-  SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868
+  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
-  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
-  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
-  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
 
-PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.16.2
+COCOAPODS: 1.14.2

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -156,7 +156,6 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				2341743D762090318428F35C /* [CP] Embed Pods Frameworks */,
-				4777130FB39D1044BC14FC9C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -173,7 +172,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -249,23 +248,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		4777130FB39D1044BC14FC9C /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;

mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -48,7 +48,6 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

mobile/ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@main
+@UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

mobile/lib/account.dart

@@ -1,162 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:provider/provider.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'api.dart';
-import 'model.dart';
-
-class _AccountScreenState extends State<AccountScreen> {
-  final TextEditingController _emailController = TextEditingController();
-  final TextEditingController _usernameController = TextEditingController();
-  bool loading = false;
-  Api api = Api();
-
-  @override
-  initState() {
-    super.initState();
-    AppModel model = Provider.of<AppModel>(context, listen: false);
-    if (model.user != null) {
-      _emailController.text = model.user!.email ?? '';
-      _usernameController.text = model.user!.username;
-    }
-  }
-
-  void _saveEmail(BuildContext context) async {
-    setState(() {
-      loading = true;
-    });
-    AppModel model = Provider.of<AppModel>(context, listen: false);
-    var data = await api.request('PUT', '/accounts/email', {'email': _emailController.text});
-    if (data['success'] == true) {
-      model.setUserEmail(_emailController.text);
-      setState(() {
-        loading = false;
-      });
-      Fluttertoast.showToast(
-        msg: "Email updated successfully",
-        toastLength: Toast.LENGTH_LONG,
-        gravity: ToastGravity.BOTTOM,
-        timeInSecForIosWeb: 10,
-        backgroundColor: Colors.green[800],
-        textColor: Colors.white,
-      );
-    } else {
-      setState(() {
-        loading = false;
-      });
-      Fluttertoast.showToast(
-        msg: data['message'],
-        toastLength: Toast.LENGTH_LONG,
-        gravity: ToastGravity.BOTTOM,
-        timeInSecForIosWeb: 10,
-        backgroundColor: Colors.red[800],
-        textColor: Colors.white,
-      );
-    }
-  }
-
-  void _saveUsername(BuildContext context) async {
-    setState(() {
-      loading = true;
-    });
-    AppModel model = Provider.of<AppModel>(context, listen: false);
-    var data = await api.request('PUT', '/users/${model.user?.username}', {'username': _usernameController.text});
-    if (data['success'] == true) {
-      model.setUserUsername(_usernameController.text);
-      setState(() {
-        loading = false;
-      });
-      Fluttertoast.showToast(
-        msg: "Username updated successfully",
-        toastLength: Toast.LENGTH_LONG,
-        gravity: ToastGravity.BOTTOM,
-        timeInSecForIosWeb: 10,
-        backgroundColor: Colors.green[800],
-        textColor: Colors.white,
-      );
-    } else {
-      setState(() {
-        loading = false;
-      });
-      Fluttertoast.showToast(
-        msg: data['message'],
-        toastLength: Toast.LENGTH_LONG,
-        gravity: ToastGravity.BOTTOM,
-        timeInSecForIosWeb: 10,
-        backgroundColor: Colors.red[800],
-        textColor: Colors.white,
-      );
-    }
-  }
-  
-
-  @override
-  Widget build(BuildContext context) {
-    AppModel model = Provider.of<AppModel>(context);
-    return Scaffold(
-      appBar: AppBar(
-        title: Text('Edit Account'),
-      ),
-      body: ListView(
-        padding: const EdgeInsets.all(8),
-        children: <Widget>[
-          Text('Account email address', style: Theme.of(context).textTheme.titleLarge),
-          SizedBox(height: 10),
-          Row(
-            children: [
-              Expanded(child: TextField(
-                controller: _emailController,
-                decoration: InputDecoration(
-                  hintText: 'sam@example.com', labelText: 'Account email address',
-                  border: OutlineInputBorder(),
-                ),
-              )),
-              TextButton(
-                child: Text('Save'),
-                onPressed: () => _saveEmail(context),
-              ),
-            ],
-          ),
-
-          SizedBox(height: 20),
-          Text('Account username', style: Theme.of(context).textTheme.titleLarge),
-          SizedBox(height: 10),
-          Row(
-            children: [
-              Expanded(child: TextField(
-                controller: _usernameController,
-                decoration: InputDecoration(
-                  hintText: 'sam', labelText: 'Account username',
-                  border: OutlineInputBorder(),
-                ),
-              )),
-              TextButton(
-                child: Text('Save'),
-                onPressed: () {
-                  _saveUsername(context);
-                },
-              ),
-            ],
-          ),
-
-          SizedBox(height: 20),
-          Text('To edit your profile or change your password, please use the Treadl website.', style: Theme.of(context).textTheme.bodyMedium),
-          SizedBox(height: 20),
-          ElevatedButton(
-            child: Text('Open Treadl website'),
-            onPressed: () {
-              launchUrl(Uri.parse('https://treadl.com/${model.user?.username}'));
-            },
-          ),
-        ]
-      ),
-    );
-  }
-}
-
-class AccountScreen extends StatefulWidget {
-  @override
-  const AccountScreen({super.key});
-  @override
-  State<AccountScreen> createState() => _AccountScreenState();
-}

mobile/lib/api.dart

@@ -1,16 +1,19 @@
+import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
+import 'package:provider/provider.dart';
 import 'dart:convert';
 import 'dart:io';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'util.dart';
+import 'model.dart';
 
 class Api {
 
   String? _token;
   final String apiBase = 'https://api.treadl.com';
-  //final String apiBase = 'http://localhost:2001';
+  //final String apiBase = 'http://192.168.5.134:2001';
 
-  Api({token}) {
+  Api({token: null}) {
     if (token != null) _token = token;
   }
 
@@ -26,7 +29,7 @@ class Api {
     Map<String,String> headers = {};
     String? token = await loadToken();
     if (token != null) {
-      headers['Authorization'] = 'Bearer $token';
+      headers['Authorization'] = 'Bearer ' + token!;
     }
     if (method == 'POST' || method == 'DELETE') {
       headers['Content-Type'] = 'application/json';
@@ -39,17 +42,17 @@ class Api {
     return await client.get(url, headers: await getHeaders('GET'));
   }
   Future<http.Response> _post(Uri url, Map<String, dynamic>? data) async {
-    String? json;
+    String? json = null;
     if (data != null) {
-      json = jsonEncode(data);
+      json = jsonEncode(data!);
     }
     http.Client client = http.Client();
     return await client.post(url, headers: await getHeaders('POST'), body: json);
   }
   Future<http.Response> _put(Uri url, Map<String, dynamic>? data) async {
-    String? json;
+    String? json = null;
     if (data != null) {
-      json = jsonEncode(data);
+      json = jsonEncode(data!);
     }
     http.Client client = http.Client();
     return await client.put(url, headers: await getHeaders('POST'), body: json);
@@ -83,13 +86,15 @@ class Api {
     if (response == null) {
       return {'success': false, 'message': 'No response for your request'};
     }
-    int status = response.statusCode;
+    int status = response!.statusCode;
     if (status == 200) {
-      Map<String, dynamic> respData = jsonDecode(response.body);
+      print('SUCCESS');
+      Map<String, dynamic> respData = jsonDecode(response!.body);
       return {'success': true, 'payload': respData};
     }
     else {
-      Map<String, dynamic> respData = jsonDecode(response.body);
+      print('ERROR');
+      Map<String, dynamic> respData = jsonDecode(response!.body);
       return {'success': false, 'code': status, 'message': respData['message']};
     }
   }

mobile/lib/explore.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:provider/provider.dart';
 import 'api.dart';
 import 'util.dart';
 import 'lib.dart';
@@ -20,7 +22,7 @@ class _ExploreTabState extends State<ExploreTab> {
 
   void getExploreData() async {
     if (explorePage == -1) return;
-    var data = await api.request('GET', '/search/explore?page=$explorePage');
+    var data = await api.request('GET', '/search/explore?page=${explorePage}');
     if (data['success'] == true) {
       setState(() {
         loading = false;
@@ -54,7 +56,7 @@ class _ExploreTabState extends State<ExploreTab> {
           borderRadius: BorderRadius.all(Radius.circular(10)),
         ),
         child:Center(
-          child: TextButton(
+          child: CupertinoButton(
             child: Text('Load more'),
             onPressed: () => getExploreData(),
           )
@@ -64,8 +66,7 @@ class _ExploreTabState extends State<ExploreTab> {
 
     return Scaffold(
       appBar: AppBar(
-        title: Text('Explore Treadl'),
+        title: Text('Explore'),
-        forceMaterialTransparency: true,
       ),
       body: loading ?
         Container(
@@ -73,42 +74,42 @@ class _ExploreTabState extends State<ExploreTab> {
           alignment: Alignment.center,
           child: CircularProgressIndicator()
         )
-      : Column(
+      : Container(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
+          child: Column(
-          children: [
+            crossAxisAlignment: CrossAxisAlignment.stretch,
-            SizedBox(height: 10),
+            children: [
-            CustomText('Discover projects', 'h1', margin: 5),
+              SizedBox(height: 10),
-            SizedBox(height: 5),
+              CustomText('Discover projects', 'h1', margin: 5),
-            SizedBox(
+              SizedBox(height: 5),
-              height: 130,
+              Container(
-              child: ListView(
+                height: 130,
-                scrollDirection: Axis.horizontal,
+                child: ListView(
-                children: projects.map((p) => ProjectCard(p)).toList()
+                  scrollDirection: Axis.horizontal,
-              )
+                  children: projects.map((p) => ProjectCard(p)).toList()
-            ),
+                )
-            SizedBox(height: 10),
-            CustomText('Recent patterns', 'h1', margin: 5),
-            SizedBox(height: 5),
-            Expanded(child: Container(
-              margin: EdgeInsets.only(left: 15, right: 15),
-              child: GridView.count(
-                crossAxisCount: 2,
-                mainAxisSpacing: 5,
-                crossAxisSpacing: 5,
-                childAspectRatio: 0.9,
-                children: patternCards,
               ),
-            )),
+              SizedBox(height: 10),
-          ]
+              CustomText('Recent patterns', 'h1', margin: 5),
+              SizedBox(height: 5),
+              Expanded(child: Container(
+                margin: EdgeInsets.only(left: 15, right: 15),
+                child: GridView.count(
+                  crossAxisCount: 2,
+                  mainAxisSpacing: 5,
+                  crossAxisSpacing: 5,
+                  childAspectRatio: 0.9,
+                  children: patternCards,
+                ),
+              )),
+            ]
+          )
         ),
     ); 
   }
 }
 
 class ExploreTab extends StatefulWidget {
-  const ExploreTab({super.key});
-
   @override
-  State<ExploreTab> createState() => _ExploreTabState(); 
+  _ExploreTabState createState() => _ExploreTabState(); 
 }
 

mobile/lib/group.dart

@@ -1,12 +1,17 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:provider/provider.dart';
 import 'api.dart';
 import 'group_noticeboard.dart';
 import 'group_members.dart';
 
 class _GroupScreenState extends State<GroupScreen> {
+  final String id;
   Map<String, dynamic>? _group;
   int _selectedIndex = 0;
 
+  _GroupScreenState(this.id) { }
+
   @override
   void initState() {
     fetchGroup();
@@ -15,7 +20,7 @@ class _GroupScreenState extends State<GroupScreen> {
 
   void fetchGroup() async {
     Api api = Api();
-    var data = await api.request('GET', '/groups/${widget.id}');
+    var data = await api.request('GET', '/groups/' + id);
     if (data['success'] == true) {
       setState(() {
         _group = data['payload'];
@@ -60,7 +65,7 @@ class _GroupScreenState extends State<GroupScreen> {
 
 class GroupScreen extends StatefulWidget {
   final String id;
-  const GroupScreen(this.id, {super.key});
+  GroupScreen(this.id) { }
   @override
-  State<GroupScreen> createState() => _GroupScreenState(); 
+  _GroupScreenState createState() => _GroupScreenState(id); 
 }

mobile/lib/group_members.dart

@@ -1,22 +1,27 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:go_router/go_router.dart';
 import 'api.dart';
 import 'util.dart';
+import 'user.dart';
 
 class _GroupMembersTabState extends State<GroupMembersTab> {
+  final Map<String,dynamic> _group;
   final Api api = Api();
   List<dynamic> _members = [];
   bool _loading = false;
   
+  _GroupMembersTabState(this._group) { }
+
   @override
   initState() {
     super.initState();
-    getMembers(widget.group['_id']);
+    getMembers(_group['_id']);
   }
 
   void getMembers(String id) async {
     setState(() => _loading = true);
-    var data = await api.request('GET', '/groups/$id/members');
+    var data = await api.request('GET', '/groups/' + id + '/members');
     if (data['success'] == true) {
       setState(() {
         _members = data['payload']['members'];
@@ -26,8 +31,8 @@ class _GroupMembersTabState extends State<GroupMembersTab> {
   }
 
   Widget getMemberCard(member) {
-    return ListTile(
+    return new ListTile(
-      onTap: () => context.push('/${member["username"]}'),
+      onTap: () => context.push('/' + member['username']),
       leading: Util.avatarImage(Util.avatarUrl(member), size: 40),
       trailing: Icon(Icons.keyboard_arrow_right),
       title: Text(member['username'])
@@ -44,15 +49,17 @@ class _GroupMembersTabState extends State<GroupMembersTab> {
       )
     :Column(
       children: [
-        Expanded(
+        Container(
-          child: ListView.builder(
+          child: Expanded(
-            padding: const EdgeInsets.all(8),
+            child: ListView.builder(
-            itemCount: _members.length,
+              padding: const EdgeInsets.all(8),
-            itemBuilder: (BuildContext context, int index) {
+              itemCount: _members.length,
-              return getMemberCard(_members[index]);
+              itemBuilder: (BuildContext context, int index) {
-            },
+                return getMemberCard(_members[index]);
+              },
+            ),
           ),
-        ),
+	)
       ]
     ); 
   }
@@ -60,7 +67,7 @@ class _GroupMembersTabState extends State<GroupMembersTab> {
 
 class GroupMembersTab extends StatefulWidget {
   final Map<String,dynamic> group;
-  const GroupMembersTab(this.group, {super.key});
+  GroupMembersTab(this.group) { }
   @override
-  State<GroupMembersTab> createState() => _GroupMembersTabState(); 
+  _GroupMembersTabState createState() => _GroupMembersTabState(group); 
 }

mobile/lib/group_noticeboard.dart

@@ -1,29 +1,34 @@
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
 import 'api.dart';
 import 'lib.dart';
 
 class _GroupNoticeBoardTabState extends State<GroupNoticeBoardTab> {
   final TextEditingController _newEntryController = TextEditingController();
   final Api api = Api();
+  Map<String,dynamic> _group;
   List<dynamic> _entries = [];
   bool showPostButton = false;
   bool _loading = false; 
   bool _posting = false;
   
+  _GroupNoticeBoardTabState(this._group) { }
+
   @override
   initState() {
     super.initState();
-    getEntries(widget.group['_id']);
+    getEntries(_group['_id']);
     _newEntryController.addListener(() {
       setState(() {
-        showPostButton = _newEntryController.text.isNotEmpty ? true : false;
+        showPostButton = _newEntryController.text.length > 0 ? true : false;
       });
     });
   }
 
   void getEntries(String id) async {
     setState(() => _loading = true);
-    var data = await api.request('GET', '/groups/$id/entries');
+    var data = await api.request('GET', '/groups/' + id + '/entries');
     if (data['success'] == true) {
       setState(() {
         _entries = data['payload']['entries'];
@@ -34,9 +39,9 @@ class _GroupNoticeBoardTabState extends State<GroupNoticeBoardTab> {
 
   void _sendPost(context) async {
     String text =  _newEntryController.text;
-    if (text.isEmpty) return;
+    if (text.length == 0) return;
     setState(() => _posting = true);
-    var data = await api.request('POST', '/groups/${widget.group["_id"]}/entries', {'content': text});
+    var data = await api.request('POST', '/groups/' + _group['_id'] + '/entries', {'content': text});
     if (data['success'] == true) {
       _newEntryController.value = TextEditingValue(text: '');
       FocusScope.of(context).requestFocus(FocusNode());
@@ -78,26 +83,28 @@ class _GroupNoticeBoardTabState extends State<GroupNoticeBoardTab> {
     return Column(
       children: <Widget>[
         NoticeboardInput(_newEntryController, () => _sendPost(context), _posting, label: 'Write a new post to the group'),
-        Expanded(
+        Container(
-          child: _loading ?
+          child: Expanded(
-            Container(
+            child: _loading ?
-              margin: const EdgeInsets.all(10.0),
+              Container(
-              alignment: Alignment.center,
+                margin: const EdgeInsets.all(10.0),
-              child: CircularProgressIndicator()
+                alignment: Alignment.center,
-            )
+                child: CircularProgressIndicator()
-          :
+              )
-            ListView.builder(
+            :
-            padding: const EdgeInsets.all(0),
+              ListView.builder(
-            itemCount: entries.length,
+              padding: const EdgeInsets.all(0),
-            itemBuilder: (BuildContext context, int index) {
+              itemCount: entries.length,
-              return Container(
+              itemBuilder: (BuildContext context, int index) {
-                key: Key(entries[index]['_id']),
+                return Container(
-                child: NoticeboardPost(entries[index],
+                  key: Key(entries[index]['_id']),
-                onDelete: _onDelete,
+                  child: NoticeboardPost(entries[index],
-                onReply: _onReply,
+                  onDelete: _onDelete,
-              ));
+                  onReply: _onReply,
-            },
+                ));
-          ),
+              },
+            ),
+          )
         )
       ]
     ); 
@@ -106,7 +113,7 @@ class _GroupNoticeBoardTabState extends State<GroupNoticeBoardTab> {
 
 class GroupNoticeBoardTab extends StatefulWidget {
   final Map<String,dynamic> group;
-  const GroupNoticeBoardTab(this.group, {super.key});
+  GroupNoticeBoardTab(this.group) { }
   @override
-  State<GroupNoticeBoardTab> createState() => _GroupNoticeBoardTabState(); 
+  _GroupNoticeBoardTabState createState() => _GroupNoticeBoardTabState(group); 
 }

mobile/lib/groups.dart

@@ -32,13 +32,13 @@ class _GroupsTabState extends State<GroupsTab> {
   Widget buildGroupCard(Map<String,dynamic> group) {
     String? description = group['description'];
     if (description != null && description.length > 80) {
-      description = '${description.substring(0, 77)}...';
+      description = description.substring(0, 77) + '...';
-    } else {
+    } else if (description == null) {
-      description ??= 'This group doesn\'t have a description.';
+      description = 'This group doesn\'t have a description.';
     }
     return Card(
       child: InkWell(
-        onTap: () => context.push('/groups/${group["_id"]}'),
+        onTap: () => context.push('/groups/' + group['_id']),
         child: ListTile(
           leading: Icon(Icons.people, size: 40, color: Colors.pink[300]),
           trailing: Icon(Icons.keyboard_arrow_right),
@@ -51,18 +51,18 @@ class _GroupsTabState extends State<GroupsTab> {
 
   Widget getBody() {
     AppModel model = Provider.of<AppModel>(context);
-    if (model.user == null) {
+    if (model.user == null)
       return LoginNeeded(text: 'Once logged in, you\'ll find your groups here.');
-    } else if (_loading) {
+    else if (_loading)
       return CircularProgressIndicator();
-    } else if (_groups.isNotEmpty) {
+    else if (_groups != null && _groups.length > 0)
       return ListView.builder(
         itemCount: _groups.length,
         itemBuilder: (BuildContext context, int index) {
           return buildGroupCard(_groups[index]);
         },
       );
-    } else {
+    else
       return Column(
         crossAxisAlignment: CrossAxisAlignment.center,
         mainAxisAlignment: MainAxisAlignment.center,
@@ -72,7 +72,6 @@ class _GroupsTabState extends State<GroupsTab> {
           Text('Groups let you meet and keep in touch with others in the weaving community.', textAlign: TextAlign.center),
           Text('Please use our website to join and leave groups.', textAlign: TextAlign.center),
       ]);
-    }
   }
 
   @override
@@ -91,8 +90,6 @@ class _GroupsTabState extends State<GroupsTab> {
 }
 
 class GroupsTab extends StatefulWidget {
-  const GroupsTab({super.key});
-
   @override
-  State<GroupsTab> createState() => _GroupsTabState(); 
+  _GroupsTabState createState() => _GroupsTabState(); 
 }

mobile/lib/home.dart

@@ -1,18 +1,19 @@
 import 'package:flutter/material.dart';
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+import 'package:shared_preferences/shared_preferences.dart';
 import 'explore.dart';
 import 'projects.dart';
 import 'groups.dart';
 
 class HomeScreen extends StatefulWidget {
-  const HomeScreen({super.key});
-
   @override
   State<HomeScreen> createState() => _MyStatefulWidgetState();
 }
 
 class _MyStatefulWidgetState extends State<HomeScreen> {
   int _selectedIndex = 0;
-  final List<Widget> _widgetOptions = <Widget> [
+  List<Widget> _widgetOptions = <Widget> [
     ExploreTab(),
     ProjectsTab(),
     GroupsTab()

mobile/lib/lib.dart

@@ -1,4 +1,5 @@
 import 'dart:core';
+import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:intl/intl.dart';
@@ -6,6 +7,9 @@ import 'package:url_launcher/url_launcher.dart';
 import 'package:go_router/go_router.dart';
 import 'api.dart';
 import 'util.dart';
+import 'user.dart';
+import 'object.dart';
+import 'project.dart';
 
 class Alert extends StatelessWidget {
   final String type;
@@ -14,7 +18,7 @@ class Alert extends StatelessWidget {
   final String actionText;
   final Widget? descriptionWidget;
   final Function? action;
-  const Alert({super.key, this.type = 'info', this.title = '', this.description = '', this.descriptionWidget, this.actionText = 'Click here', this.action});
+  Alert({this.type = 'info', this.title = '', this.description = '', this.descriptionWidget = null, this.actionText = 'Click here', this.action}) {}
 
   @override
   Widget build(BuildContext context) {
@@ -34,9 +38,9 @@ class Alert extends StatelessWidget {
     return Container(
       padding: EdgeInsets.all(15),
       margin: EdgeInsets.all(15),
-      decoration: BoxDecoration(
+      decoration: new BoxDecoration(
         color: accentColor,
-        borderRadius: BorderRadius.all(Radius.circular(10.0)),
+        borderRadius: new BorderRadius.all(Radius.circular(10.0)),
         boxShadow: [
           BoxShadow(color: Colors.grey[50]!, spreadRadius: 5),
         ],
@@ -47,12 +51,11 @@ class Alert extends StatelessWidget {
           Icon(icon, color: color),
           SizedBox(height: 20),
           Text(description, textAlign: TextAlign.center),
-          if (descriptionWidget != null) descriptionWidget!,
+          descriptionWidget != null ? descriptionWidget! : Text(""),
-          if (action != null)
+          action != null ? CupertinoButton(
-            ElevatedButton(
+            child: Text(actionText),
-              child: Text(actionText),
+            onPressed: () => action!(),
-              onPressed: () => action!(),
+          ) : Text("")
-            )
         ]
       )
     );
@@ -63,25 +66,28 @@ class NoticeboardPost extends StatefulWidget {
   final Map<String,dynamic> _entry;
   final Function? onDelete;
   final Function? onReply;
-  const NoticeboardPost(this._entry, {super.key, this.onDelete, this.onReply});
+  NoticeboardPost(this._entry, {this.onDelete = null, this.onReply = null});
-  @override
+  _NoticeboardPostState createState() => _NoticeboardPostState(_entry, onDelete: onDelete, onReply: onReply);
-  State<NoticeboardPost> createState() => _NoticeboardPostState();
 }
 class _NoticeboardPostState extends State<NoticeboardPost> {
-  final Api api = Api();
+  final Map<String,dynamic> _entry;
+  final Api api = new Api();
+  final Function? onDelete;
+  final Function? onReply;
   final TextEditingController _replyController = TextEditingController();
   bool _isReplying = false;
   bool _replying = false;
 
+  _NoticeboardPostState(this._entry, {this.onDelete = null, this.onReply = null}) { }
+
   void _sendReply() async {
     setState(() => _replying = true);
-    var data = await api.request('POST', '/groups/${widget._entry["group"]}/entries/${widget._entry["_id"]}/replies', {'content': _replyController.text});
+    var data = await api.request('POST', '/groups/' + _entry['group'] + '/entries/' + _entry['_id'] + '/replies', {'content': _replyController.text});
     if (data['success'] == true) {
       _replyController.value = TextEditingValue(text: '');
-      if (!mounted) return;
       FocusScope.of(context).requestFocus(FocusNode());
-      if (widget.onReply != null) {
+      if (onReply != null) {
-        widget.onReply!(data['payload']);
+        onReply!(data['payload']);
       }
       setState(() {
         _replying = false;
@@ -91,40 +97,38 @@ class _NoticeboardPostState extends State<NoticeboardPost> {
   }
 
   void _deletePost() async {
-    var data = await api.request('DELETE', '/groups/${widget._entry["group"]}/entries/${widget._entry["_id"]}');
+    var data = await api.request('DELETE', '/groups/' + _entry['group'] + '/entries/' + _entry['_id']);
     if (data['success'] == true) {
-      if (widget.onDelete != null) {
+      if (onDelete != null) {
-        widget.onDelete!(widget._entry);
+        onDelete!(_entry);
-      }
-      if (mounted) {
-        context.pop();
       }
+      context.pop();
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    var createdAt = DateTime.parse(widget._entry['createdAt']);
+    var createdAt = DateTime.parse(_entry['createdAt']);
-    bool isReply = widget._entry['inReplyTo'] != null;
+    bool isReply = _entry['inReplyTo'] != null;
-    int replyCount = widget._entry['replies'] == null ? 0 : widget._entry['replies']!.length;
+    int replyCount = _entry['replies'] == null ? 0 : _entry['replies']!.length;
     String replyText = 'Write a reply...';
     if (replyCount == 1) replyText = '1 Reply';
-    if (replyCount > 1) replyText = '$replyCount replies';
+    if (replyCount > 1) replyText = replyCount.toString() + ' replies';
     if (_isReplying) replyText = 'Cancel reply';
     List<Widget> replyWidgets = [];
-    if (widget._entry['replies'] != null) {
+    if (_entry['replies'] != null) {
-      for (int i = 0; i < widget._entry['replies']!.length; i++) {
+      for (int i = 0; i < _entry['replies']!.length; i++) {
-        replyWidgets.add(Container(
+        replyWidgets.add(new Container(
-          key: Key(widget._entry['replies']![i]['_id']),
+          key: Key(_entry['replies']![i]['_id']),
-          child: NoticeboardPost(widget._entry['replies']![i], onDelete: widget.onDelete)
+          child: NoticeboardPost(_entry['replies']![i], onDelete: onDelete)
         ));
       }
     }
-    return GestureDetector(
+    return new GestureDetector(
-      key: Key(widget._entry['_id']),
+      key: Key(_entry['_id']),
       onLongPress: () async {
         Dialog simpleDialog = Dialog(
-          child: SizedBox(
+          child: Container(
             height: 160.0,
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
@@ -132,7 +136,7 @@ class _NoticeboardPostState extends State<NoticeboardPost> {
                 ElevatedButton(
                   //color: Colors.orange,
                   onPressed: () {
-                    launchUrl(Uri.parse('https://www.treadl.com/report'));
+                    launch('https://www.treadl.com');
                   },
                   child: Text('Report this post'),
                 ),
@@ -163,11 +167,11 @@ class _NoticeboardPostState extends State<NoticeboardPost> {
           Row(
             children: <Widget>[
               GestureDetector(
-                onTap: () => context.push('/${widget._entry["authorUser"]["username"]}'),
+                onTap: () => context.push('/' + _entry['authorUser']['username']),
-                child: Util.avatarImage(Util.avatarUrl(widget._entry['authorUser']), size: isReply ? 30 : 40)
+                child: Util.avatarImage(Util.avatarUrl(_entry['authorUser']), size: isReply ? 30 : 40)
               ),
               SizedBox(width: 5),
-              Text(widget._entry['authorUser']['username'], style: TextStyle(color: Colors.pink)),
+              Text(_entry['authorUser']['username'], style: TextStyle(color: Colors.pink)),
               SizedBox(width: 5),
               Text(DateFormat('kk:mm on MMMM d y').format(createdAt), style: TextStyle(color: Colors.grey, fontSize: 10)),
               SizedBox(width: 10),
@@ -179,7 +183,7 @@ class _NoticeboardPostState extends State<NoticeboardPost> {
           ),
           Row(children: [
             SizedBox(width: 45),
-            Expanded(child: Text(widget._entry['content'], textAlign: TextAlign.left))
+            Expanded(child: Text(_entry['content'], textAlign: TextAlign.left))
           ]),
           _isReplying ? NoticeboardInput(_replyController, _sendReply, _replying, label: 'Reply to this post') : SizedBox(width: 0),
           Column(
@@ -196,7 +200,7 @@ class NoticeboardInput extends StatelessWidget {
   final Function _onPost;
   final bool _posting;
   final String label;
-  const NoticeboardInput(this._controller, this._onPost, this._posting, {super.key, this.label = 'Write a new post'});
+  NoticeboardInput(this._controller, this._onPost, this._posting, {this.label = 'Write a new post'}) {}
 
   @override
   Widget build(BuildContext context) {
@@ -213,7 +217,7 @@ class NoticeboardInput extends StatelessWidget {
             ),
           )),
           IconButton(
-            onPressed: () => _onPost(),
+            onPressed: () => _onPost!(),
             color: Colors.pink,
             icon: _posting ? CircularProgressIndicator() : Icon(Icons.send),
           )
@@ -225,13 +229,13 @@ class NoticeboardInput extends StatelessWidget {
 
 class UserChip extends StatelessWidget {
   final Map<String,dynamic> user;
-  const UserChip(this.user, {super.key});
+  UserChip(this.user) {}
 
   @override
   Widget build(BuildContext context) {
     ImageProvider? avatar = Util.avatarUrl(user);
     return GestureDetector(
-      onTap: () => context.push('/${user["username"]}'),
+      onTap: () => context.push('/' + user['username']),
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
@@ -246,7 +250,7 @@ class UserChip extends StatelessWidget {
 
 class PatternCard extends StatelessWidget {
   final Map<String,dynamic> object;
-  const PatternCard(this.object, {super.key});
+  PatternCard(this.object) {}
 
   @override
   Widget build(BuildContext context) {
@@ -258,7 +262,7 @@ class PatternCard extends StatelessWidget {
       ),
       child: InkWell(
         onTap: () {
-          context.push('/${object["projectObject"]["owner"]["username"]}/${object["projectObject"]["path"]}/${object["_id"]}');
+          context.push('/' + object['projectObject']['owner']['username'] + '/' + object['projectObject']['path'] + '/' + object['_id']);
         },
         child: Column(
           children: [
@@ -291,7 +295,7 @@ class PatternCard extends StatelessWidget {
 
 class ProjectCard extends StatelessWidget {
   final Map<String,dynamic> project;
-  const ProjectCard(this.project, {super.key});
+  ProjectCard(this.project) {}
 
   @override
   Widget build(BuildContext context) {
@@ -303,7 +307,7 @@ class ProjectCard extends StatelessWidget {
       ),
       child: InkWell(
         onTap: () {
-          context.push('/${project["owner"]["username"]}/${project["path"]}');
+          context.push('/' + this.project['owner']['username'] + '/' + this.project['path']);
         },
         child: Column(
           children: [
@@ -332,10 +336,10 @@ class CustomText extends StatelessWidget {
   final String text;
   final String type;
   final double margin;
-  late final TextStyle style;
+  TextStyle? style;
-  CustomText(this.text, this.type, {super.key, this.margin = 0}) {
+  CustomText(this.text, this.type, {this.margin = 0}) {
-    if (type == 'h1') {
+    if (this.type == 'h1') {
-      style = TextStyle(fontSize: 30, fontWeight: FontWeight.bold);
+      style = TextStyle(fontSize: 25, fontWeight: FontWeight.bold);
     }
     else {
       style = TextStyle();
@@ -345,7 +349,7 @@ class CustomText extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      margin: EdgeInsets.all(margin), 
+      margin: EdgeInsets.all(this.margin), 
       child: Text(text, style: style)
     );
   }
@@ -353,7 +357,7 @@ class CustomText extends StatelessWidget {
 
 class LoginNeeded extends StatelessWidget {
   final String? text;
-  const LoginNeeded({super.key, this.text});
+  LoginNeeded({this.text}) {}
   @override
   Widget build(BuildContext context) {
     return Column(
@@ -363,12 +367,11 @@ class LoginNeeded extends StatelessWidget {
         Text('You need to login to see this', style: TextStyle(fontSize: 20), textAlign: TextAlign.center),
         Image(image: AssetImage('assets/login.png'), width: 300),
         text != null ? Text(text!, textAlign: TextAlign.center) : SizedBox(height: 10),
-        SizedBox(height: 20),
+        CupertinoButton(
-        ElevatedButton(
           onPressed: () {
             context.push('/welcome');
           },
-          child: Text("Login or register",
+          child: new Text("Login or register",
             textAlign: TextAlign.center,
           )
         )
@@ -381,7 +384,7 @@ class EmptyBox extends StatelessWidget {
   final String title;
   final String? description;
 
-  const EmptyBox(this.title, {super.key, this.description});
+  EmptyBox(this.title, {this.description}) {}
 
   @override
   Widget build(BuildContext context) {

mobile/lib/login.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart'; 
+import 'package:flutter/widgets.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:provider/provider.dart';
 import 'package:go_router/go_router.dart';
@@ -17,19 +18,16 @@ class _LoginScreenState extends State<LoginScreen> {
     var data = await api.request('POST', '/accounts/login', {'email': _emailController.text, 'password': _passwordController.text});
     setState(() => _loggingIn = false);
     if (data['success'] == true) {
-      if (!context.mounted) return;
       AppModel model = Provider.of<AppModel>(context, listen: false);
       await model.setToken(data['payload']['token']);
-      if (!context.mounted) return;
       context.go('/onboarding');
     }
     else {
-      if (!context.mounted) return;
       showDialog(
         context: context,
         builder: (BuildContext context) => CupertinoAlertDialog(
-          title: Text("There was a problem logging you in"),
+          title: new Text("There was a problem logging you in"),
-          content: Text(data['message']),
+          content: new Text(data['message']),
           actions: <Widget>[
             CupertinoDialogAction(
               isDefaultAction: true,
@@ -52,7 +50,7 @@ class _LoginScreenState extends State<LoginScreen> {
         margin: const EdgeInsets.only(top: 40, left: 10, right: 10),
         child: ListView(
           children: <Widget>[
-            Text('Login with your Treadl account', style: Theme.of(context).textTheme.titleLarge),
+            Text('Login with your Treadl account', style: TextStyle(fontSize: 20)),
             SizedBox(height: 30),
             TextField(
               autofocus: true,
@@ -76,7 +74,7 @@ class _LoginScreenState extends State<LoginScreen> {
             Row(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [GestureDetector(
-                onTap: () => launchUrl(Uri.parse('https://treadl.com/password/forgotten')),
+                onTap: () => launch('https://treadl.com/password/forgotten'),
                 child: Text('Forgotten your password?'),
               )]
             ),
@@ -85,6 +83,7 @@ class _LoginScreenState extends State<LoginScreen> {
               onPressed: () => _submit(context),
               child: _loggingIn ? SizedBox(height: 20, width: 20, child:CircularProgressIndicator(backgroundColor: Colors.white)) : Text("Login",
                 textAlign: TextAlign.center,
+                style: TextStyle(color: Colors.white, fontSize: 15)
               )
             ),
           ]
@@ -95,8 +94,6 @@ class _LoginScreenState extends State<LoginScreen> {
 }
 
 class LoginScreen extends StatefulWidget {
-  const LoginScreen({super.key});
-
   @override
-  State<LoginScreen> createState() => _LoginScreenState(); 
+  _LoginScreenState createState() => _LoginScreenState(); 
 }

mobile/lib/main.dart

@@ -4,6 +4,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:go_router/go_router.dart';
+//import 'package:fluttertoast/fluttertoast.dart';
 import 'api.dart';
 import 'model.dart';
 import 'welcome.dart';
@@ -14,10 +15,8 @@ import 'home.dart';
 import 'project.dart';
 import 'object.dart';
 import 'settings.dart';
-import 'verify_email.dart';
 import 'group.dart';
 import 'user.dart';
-import 'account.dart';
 
 final router = GoRouter(
   routes: [
@@ -42,8 +41,6 @@ final router = GoRouter(
     GoRoute(path: '/home', builder: (context, state) => HomeScreen()),
     GoRoute(path: '/settings', builder: (context, state) => SettingsScreen()),
     GoRoute(path: '/groups/:id', builder: (context, state) => GroupScreen(state.pathParameters['id']!)),
-    GoRoute(path: '/email/verify', builder: (context, state) => VerifyEmailScreen(token: state.uri.queryParameters['token'])),
-    GoRoute(path: '/account', builder: (context, state) => AccountScreen()),
     GoRoute(path: '/:username', builder: (context, state) => UserScreen(state.pathParameters['username']!)),
     GoRoute(path: '/:username/:path', builder: (context, state) => ProjectScreen(state.pathParameters['username']!, state.pathParameters['path']!)),
     GoRoute(path: '/:username/:path/:id', builder: (context, state) => ObjectScreen(state.pathParameters['username']!, state.pathParameters['path']!, state.pathParameters['id']!)),
@@ -60,11 +57,9 @@ void main() {
 }
 
 class MyApp extends StatefulWidget {
-  const MyApp({super.key});
-
   // Create the initialization Future outside of `build`:
   @override
-  State<MyApp> createState() => _AppState();
+  _AppState createState() => _AppState();
 }
 
 class _AppState extends State<MyApp> {
@@ -83,6 +78,7 @@ class _AppState extends State<MyApp> {
           title: 'Treadl',
           theme: ThemeData(
             primarySwatch: Colors.pink,
+            scaffoldBackgroundColor: Color.fromRGBO(255, 251, 248, 1),
           ),   
         );
       },
@@ -91,16 +87,17 @@ class _AppState extends State<MyApp> {
 }
 
 class Startup extends StatelessWidget {
+  bool _handled = false;
 
-  Startup({super.key}) {
+  Startup() {
-    /*FirebaseMessaging.onMessage.listen((RemoteMessage message) {
+    FirebaseMessaging.onMessage.listen((RemoteMessage message) {
       if (message.notification != null) {
         print(message.notification!);
         String text = '';
         if (message.notification != null && message.notification!.body != null) {
           text = message.notification!.body!;
         }
-        Fluttertoast.showToast(
+        /*Fluttertoast.showToast(
           msg: text,
           toastLength: Toast.LENGTH_LONG,
           gravity: ToastGravity.TOP,
@@ -108,20 +105,21 @@ class Startup extends StatelessWidget {
           backgroundColor: Colors.grey[100],
           textColor: Colors.black,
           fontSize: 16.0
-        );
+        );*/
       }
-    });*/
+    });
   }
 
   void checkToken(BuildContext context) async {
+    if (_handled) return;
+    _handled = true;
     SharedPreferences prefs = await SharedPreferences.getInstance();      
     String? token = prefs.getString('apiToken');
     if (token != null) {
-      if (!context.mounted) return;
       AppModel model = Provider.of<AppModel>(context, listen: false);
-      await model.setToken(token);
+      await model.setToken(token!);
-      FirebaseMessaging firebaseMessaging = FirebaseMessaging.instance;
+      FirebaseMessaging _firebaseMessaging = FirebaseMessaging.instance;
-      await firebaseMessaging.requestPermission(
+      await _firebaseMessaging.requestPermission(
         alert: true,
         announcement: false,
         badge: true,
@@ -130,13 +128,13 @@ class Startup extends StatelessWidget {
         provisional: false,
         sound: true,
       );
-      String? pushToken = await firebaseMessaging.getToken();
+      String? _pushToken = await _firebaseMessaging.getToken();
-      if (pushToken != null) {
+      if (_pushToken != null) {
+        print("sending push");
         Api api = Api();
-        api.request('PUT', '/accounts/pushToken', {'pushToken': pushToken});
+        api.request('PUT', '/accounts/pushToken', {'pushToken': _pushToken!});
       }
     }
-    if (!context.mounted) return;
     context.go('/home');
   }
 

mobile/lib/model.dart

@@ -4,19 +4,14 @@ import 'api.dart';
 
 class User {
   final String id;
-  String username;
+  final String username;
-  String? email;
   String? avatar;
   String? avatarUrl;
-  bool? emailVerified;
 
-  User(this.id, this.username, {this.avatar, this.avatarUrl});
+  User(this.id, this.username, {this.avatar, this.avatarUrl}) {}
 
   static User loadJSON(Map<String,dynamic> input) {
-    User newUser = User(input['_id'], input['username'], avatar: input['avatar'], avatarUrl: input['avatarUrl']);
+    return User(input['_id'], input['username'], avatar: input['avatar'], avatarUrl: input['avatarUrl']);
-    newUser.email = input['email'];
-    newUser.emailVerified = input['emailVerified'];
-    return newUser;
   }
 }
 
@@ -27,27 +22,6 @@ class AppModel extends ChangeNotifier {
     notifyListeners();
   }
 
-  void verifyEmail() {
-    if (user != null) {
-      user!.emailVerified = true;
-      notifyListeners();
-    }
-  }
-
-  void setUserEmail(String? email) {
-    if (user != null) {
-      user!.email = email;
-      notifyListeners();
-    }
-  }
-
-  void setUserUsername(String username) {
-    if (user != null) {
-      user!.username = username;
-      notifyListeners();
-    }
-  }
-
   String? apiToken;
   Future<void> setToken(String? newToken) async {
     apiToken = newToken;
@@ -58,9 +32,34 @@ class AppModel extends ChangeNotifier {
       var data = await api.request('GET', '/users/me');
       if (data['success'] == true) {
         setUser(User.loadJSON(data['payload']));
+        print(data);
       }
     } else {
       prefs.remove('apiToken');
     }
   }
+/*
+  /// Internal, private state of the cart.
+  final List<Item> _items = [];
+
+  /// An unmodifiable view of the items in the cart.
+  UnmodifiableListView<Item> get items => UnmodifiableListView(_items);
+
+  /// The current total price of all items (assuming all items cost $42).
+  int get totalPrice => _items.length * 42;
+
+  /// Adds [item] to cart. This and [removeAll] are the only ways to modify the
+  /// cart from the outside.
+  void add(Item item) {
+    _items.add(item);
+    // This call tells the widgets that are listening to this model to rebuild.
+    notifyListeners();
+  }
+
+  /// Removes all items from the cart.
+  void removeAll() {
+    _items.clear();
+    // This call tells the widgets that are listening to this model to rebuild.
+    notifyListeners();
+  }*/
 }

mobile/lib/object.dart

@@ -2,19 +2,26 @@ import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:flutter_html/flutter_html.dart';
 import 'package:go_router/go_router.dart';
 import 'dart:io';
 import 'api.dart';
 import 'util.dart';
 import 'model.dart';
+import 'patterns/pattern.dart';
 import 'patterns/viewer.dart';
 
 class _ObjectScreenState extends State<ObjectScreen> {
+  final String username;
+  final String projectPath;
+  final String id;
   Map<String,dynamic>? object;
   Map<String,dynamic>? pattern;
   bool _isLoading = false;
   final Api api = Api();
   
+  _ObjectScreenState(this.username, this.projectPath, this.id) { }
+
   @override
   initState() {
     super.initState();
@@ -22,7 +29,7 @@ class _ObjectScreenState extends State<ObjectScreen> {
   }
 
   void fetchObject() async {
-    var data = await api.request('GET', '/objects/${widget.id}');
+    var data = await api.request('GET', '/objects/' + id);
     if (data['success'] == true) {
       setState(() {
         object = data['payload'];
@@ -35,26 +42,24 @@ class _ObjectScreenState extends State<ObjectScreen> {
     setState(() => _isLoading = true);
     File? file;
     if (object!['type'] == 'pattern') {
-      var data = await api.request('GET', '/objects/${widget.id}/wif');
+      var data = await api.request('GET', '/objects/' + id + '/wif');
       if (data['success'] == true) {
         file = await Util.writeFile(object!['name'] + '.wif', data['payload']['wif']);
       }
     } else {
       String fileName = Uri.file(object!['url']).pathSegments.last;
-      fileName = fileName.split('?').first;
       file = await api.downloadFile(object!['url'], fileName);
     }
 
     if (file != null) {
-      Util.shareFile(file, withDelete: true);
+      Util.shareFile(file!, withDelete: true);
     }
     setState(() => _isLoading = false);
   }
 
   void _deleteObject(BuildContext context, BuildContext modalContext) async {
-    var data = await api.request('DELETE', '/objects/${widget.id}');
+    var data = await api.request('DELETE', '/objects/' + id);
     if (data['success']) {
-      if (!context.mounted) return;
       context.go('/home');
     }
   }
@@ -63,8 +68,8 @@ class _ObjectScreenState extends State<ObjectScreen> {
     showDialog(
       context: modalContext,
       builder: (BuildContext context) => CupertinoAlertDialog(
-        title: Text('Really delete this item?'),
+        title: new Text('Really delete this item?'),
-        content: Text('This action cannot be undone.'),
+        content: new Text('This action cannot be undone.'),
         actions: <Widget>[
           CupertinoDialogAction(
             isDefaultAction: true,
@@ -103,8 +108,7 @@ class _ObjectScreenState extends State<ObjectScreen> {
             TextButton(
               child: Text('OK'),
               onPressed: () async {
-                var data = await api.request('PUT', '/objects/${widget.id}', {'name': renameController.text});
+                var data = await api.request('PUT', '/objects/' + id, {'name': renameController.text});
-                if (!context.mounted) return;
                 if (data['success']) {
                   context.pop();
                   object!['name'] = data['payload']['name'];
@@ -138,8 +142,8 @@ class _ObjectScreenState extends State<ObjectScreen> {
             ),
             CupertinoActionSheetAction(
               onPressed: () => _confirmDeleteObject(modalContext),
-              isDestructiveAction: true,
               child: Text('Delete item'),
+              isDestructiveAction: true,
             ),
           ]
         );
@@ -155,6 +159,7 @@ class _ObjectScreenState extends State<ObjectScreen> {
       ));
     }
     else if (object!['isImage'] == true && object!['url'] != null) {
+      print(object!['url']);
       return Image.network(object!['url']);
     }
     else if (object!['type'] == 'pattern') {
@@ -162,7 +167,7 @@ class _ObjectScreenState extends State<ObjectScreen> {
         return PatternViewer(pattern!, withEditor: true);
       }
       else if (object!['previewUrl'] != null) {
-        return Image.network(object!['previewUrl']!);
+        return Image.network(object!['previewUrl']!);;
       }
       else {
         return Column(
@@ -182,7 +187,7 @@ class _ObjectScreenState extends State<ObjectScreen> {
           Text('Treadl cannot display this type of item.'),
           SizedBox(height: 20),
           ElevatedButton(child: Text('View file'), onPressed: () {
-            launchUrl(object!['url']);
+            launch(object!['url']);
           }),
         ],
       ));
@@ -193,6 +198,9 @@ class _ObjectScreenState extends State<ObjectScreen> {
   Widget build(BuildContext context) {
     AppModel model = Provider.of<AppModel>(context);
     User? user = model.user;
+    String description = '';
+    if (object?['description'] != null)
+      description = object!['description']!;
     return Scaffold(
       appBar: AppBar(
         title: Text(object?['name'] ?? 'Object'),
@@ -228,8 +236,8 @@ class ObjectScreen extends StatefulWidget {
   final String username;
   final String projectPath;
   final String id;
-  const ObjectScreen(this.username, this.projectPath, this.id, {super.key});
+  ObjectScreen(this.username, this.projectPath, this.id, ) { }
   @override
-  State<ObjectScreen> createState() => _ObjectScreenState(); 
+  _ObjectScreenState createState() => _ObjectScreenState(username, projectPath, id); 
 }
 

mobile/lib/onboarding.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:url_launcher/url_launcher.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:go_router/go_router.dart';
 import 'api.dart';
@@ -20,8 +22,8 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
   void _requestPushPermissions() async {
     try {
       setState(() => _loading = true);
-      FirebaseMessaging firebaseMessaging = FirebaseMessaging.instance;
+      FirebaseMessaging _firebaseMessaging = FirebaseMessaging.instance;
-      await firebaseMessaging.requestPermission(
+      await _firebaseMessaging.requestPermission(
         alert: true,
         announcement: false,
         badge: true,
@@ -30,11 +32,12 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
         provisional: false,
         sound: true,
       );
-      _pushToken = await firebaseMessaging.getToken();
+      _pushToken = await _firebaseMessaging.getToken();
       if (_pushToken != null) {
         api.request('PUT', '/accounts/pushToken', {'pushToken': _pushToken!});
       }
-    } catch (_) { }
+    }
+    on Exception { }
     setState(() => _loading = false);
     _controller.animateToPage(2, duration: Duration(milliseconds: 500), curve: Curves.easeInOut);
   }
@@ -60,7 +63,8 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
                 SizedBox(height: 10),
                 Text('You can create as many projects as you like. Upload weaving draft patterns, images, and other files to your projects to store or showcase your work.', style: TextStyle(color: Colors.white, fontSize: 13), textAlign: TextAlign.center),
                 SizedBox(height: 20),
-                ElevatedButton(
+                CupertinoButton(
+                  color: Colors.white,
                   child: Text('OK, I know what projects are!', style: TextStyle(color: Colors.pink)),
                   onPressed: () => _controller.animateToPage(1, duration: Duration(milliseconds: 500), curve: Curves.easeInOut),
                 )
@@ -81,13 +85,14 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
                 SizedBox(height: 10),
                 Text('We recommend enabling push notifications so you can keep up-to-date with your groups and projects.', style: TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.bold), textAlign: TextAlign.center),
                 SizedBox(height: 20),
-                ElevatedButton(
+                CupertinoButton(
-                  onPressed: _requestPushPermissions,
+                  color: Colors.white,
                   child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
                     _loading ? CircularProgressIndicator() : SizedBox(width: 0),
                     _loading ? SizedBox(width: 10) : SizedBox(width: 0),
                     Text('Continue', style: TextStyle(color: Colors.pink)),
                   ]),
+                  onPressed: _requestPushPermissions,
                 )
               ]
             )
@@ -104,7 +109,8 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
                 SizedBox(height: 10),
                 Text('You\'re ready to get started. We hope you enjoy using Treadl.', style: TextStyle(color: Colors.white, fontSize: 13), textAlign: TextAlign.center),
                 SizedBox(height: 20),
-                ElevatedButton(
+                CupertinoButton(
+                  color: Colors.white,
                   child: Text('Get started', style: TextStyle(color: Colors.pink)),
                   onPressed: () => context.go('/home'),
                 ),
@@ -118,8 +124,6 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
 }
 
 class OnboardingScreen extends StatefulWidget {
-  const OnboardingScreen({super.key});
-
   @override
-  State<OnboardingScreen> createState() => _OnboardingScreenState(); 
+  _OnboardingScreenState createState() => _OnboardingScreenState(); 
 }

mobile/lib/patterns/drawdown.dart

@@ -4,10 +4,10 @@ import '../util.dart';
 
 class DrawdownPainter extends CustomPainter {
   final Map<String,dynamic> pattern;
-  final double baseSize;
+  final double BASE_SIZE;
 
   @override
-  DrawdownPainter(this.baseSize, this.pattern);
+  DrawdownPainter(this.BASE_SIZE, this.pattern) {}
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -20,10 +20,10 @@ class DrawdownPainter extends CustomPainter {
       ..strokeWidth = 1;
 
     // Draw grid
-    for (double i = 0; i <= size.width; i += baseSize) {
+    for (double i = 0; i <= size.width; i += BASE_SIZE) {
       canvas.drawLine(Offset(i.toDouble(), size.height), Offset(i.toDouble(), 0), paint);
     }
-    for (double y = 0; y <= size.height; y += baseSize) {
+  for (double y = 0; y <= size.height; y += BASE_SIZE) {
       canvas.drawLine(Offset(0, y.toDouble()), Offset(size.width, y.toDouble()), paint);
     }
 
@@ -38,13 +38,13 @@ class DrawdownPainter extends CustomPainter {
         // Only capture valid tie-ups (e.g. in case there is data for more shafts, which are then reduced)
         // Dart throws error if index < 0 so check fiest
         List<dynamic> tieup = treadle > 0 ? tieups[treadle - 1] : [];
-        List<dynamic> filteredTieup = tieup.where((t) => t <= warp['shafts']).toList();
+        List<dynamic> filteredTieup = tieup.where((t) => t< warp['shafts']).toList();
         String threadType = filteredTieup.contains(shaft) ? 'warp' : 'weft';
        
         Rect rect = Offset(
-            size.width - baseSize * (thread + 1),
+            size.width - BASE_SIZE * (thread + 1),
-            tread * baseSize
+            tread * BASE_SIZE
-          ) & Size(baseSize, baseSize);
+          ) & Size(BASE_SIZE, BASE_SIZE);
         canvas.drawRect(
           rect,
           Paint()

mobile/lib/patterns/pattern.dart

@@ -7,40 +7,40 @@ import 'drawdown.dart';
 class Pattern extends StatelessWidget {
   final Map<String,dynamic> pattern;
   final Function? onUpdate;
-  final double baseSize = 5;
+  final double BASE_SIZE = 5;
 
   @override
-  const Pattern(this.pattern, {super.key, this.onUpdate});
+  Pattern(this.pattern, {this.onUpdate}) {}
 
   @override
   Widget build(BuildContext context) {
     var warp = pattern['warp'];
     var weft = pattern['weft'];
 
-    double draftWidth = warp['threading']?.length * baseSize + weft['treadles'] * baseSize + baseSize;
+    double draftWidth = warp['threading']?.length * BASE_SIZE + weft['treadles'] * BASE_SIZE + BASE_SIZE;
-    double draftHeight = warp['shafts'] * baseSize + weft['treadling']?.length * baseSize + baseSize;
+    double draftHeight = warp['shafts'] * BASE_SIZE + weft['treadling']?.length * BASE_SIZE + BASE_SIZE;
 
-    double tieupTop = baseSize;
+    double tieupTop = BASE_SIZE;
-    double tieupRight = baseSize;
+    double tieupRight = BASE_SIZE;
-    double tieupWidth = weft['treadles'] * baseSize;
+    double tieupWidth = weft['treadles'] * BASE_SIZE;
-    double tieupHeight = warp['shafts'] * baseSize;
+    double tieupHeight = warp['shafts'] * BASE_SIZE;
 
     double warpTop = 0;
-    double warpRight = weft['treadles'] * baseSize + baseSize * 2;
+    double warpRight = weft['treadles'] * BASE_SIZE + BASE_SIZE * 2;
-    double warpWidth = warp['threading']?.length * baseSize;
+    double warpWidth = warp['threading']?.length * BASE_SIZE;
-    double warpHeight = warp['shafts'] * baseSize + baseSize;
+    double warpHeight = warp['shafts'] * BASE_SIZE + BASE_SIZE;
 
     double weftRight = 0;
-    double weftTop = warp['shafts'] * baseSize + baseSize * 2;
+    double weftTop = warp['shafts'] * BASE_SIZE + BASE_SIZE * 2;
-    double weftWidth = weft['treadles'] * baseSize + baseSize;
+    double weftWidth = weft['treadles'] * BASE_SIZE + BASE_SIZE;
-    double weftHeight = weft['treadling'].length * baseSize;
+    double weftHeight = weft['treadling'].length * BASE_SIZE;
 
-    double drawdownTop = warpHeight + baseSize;
+    double drawdownTop = warpHeight + BASE_SIZE;
-    double drawdownRight = weftWidth + baseSize;
+    double drawdownRight = weftWidth + BASE_SIZE;
     double drawdownWidth = warpWidth;
     double drawdownHeight = weftHeight;
 
-    return  SizedBox(
+    return  Container(
       width: draftWidth,
       height: draftHeight,
       child: Stack(
@@ -53,13 +53,14 @@ class Pattern extends StatelessWidget {
                 var tieups = pattern['tieups'];
                 double dx = details.localPosition.dx;
                 double dy = details.localPosition.dy;
-                int tie = (dx / baseSize).toInt();
+                int tie = (dx / BASE_SIZE).toInt();
-                int shaft = ((tieupHeight - dy) / baseSize).toInt() + 1;
+                int shaft = ((tieupHeight - dy) / BASE_SIZE).toInt() + 1;
                 if (tieups[tie].contains(shaft)) {
                   tieups[tie].remove(shaft);
                 } else {
                   tieups[tie].add(shaft);
                 }
+                print(tieups);
                 if (onUpdate != null) {
                   onUpdate!({'tieups': tieups});
                 }
@@ -67,7 +68,7 @@ class Pattern extends StatelessWidget {
               },
               child: CustomPaint(
               size: Size(tieupWidth, tieupHeight),
-              painter: TieupPainter(baseSize, pattern),
+              painter: TieupPainter(BASE_SIZE, this.pattern),
             )),
           ),
           Positioned(
@@ -75,7 +76,7 @@ class Pattern extends StatelessWidget {
             top: warpTop,
             child: CustomPaint(
               size: Size(warpWidth, warpHeight),
-              painter: WarpPainter(baseSize, pattern),
+              painter: WarpPainter(BASE_SIZE, this.pattern),
             ),
           ),
           Positioned(
@@ -83,7 +84,7 @@ class Pattern extends StatelessWidget {
             top: weftTop,
             child: CustomPaint(
               size: Size(weftWidth, weftHeight),
-              painter: WeftPainter(baseSize, pattern),
+              painter: WeftPainter(BASE_SIZE, this.pattern),
             ),
           ),
           Positioned(
@@ -91,7 +92,7 @@ class Pattern extends StatelessWidget {
             top: drawdownTop,
             child: CustomPaint(
               size: Size(drawdownWidth, drawdownHeight),
-              painter: DrawdownPainter(baseSize, pattern),
+              painter: DrawdownPainter(BASE_SIZE, this.pattern),
             ),
           )
         ]

mobile/lib/patterns/tieup.dart

@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 
 class TieupPainter extends CustomPainter {
   final Map<String,dynamic> pattern;
-  final double baseSize;
+  final double BASE_SIZE;
 
   @override
-  TieupPainter(this.baseSize, this.pattern);
+  TieupPainter(this.BASE_SIZE, this.pattern) {}
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -15,20 +15,20 @@ class TieupPainter extends CustomPainter {
       ..color = Colors.black..strokeWidth = 0.5;
 
     // Draw grid
-    for (double i = 0; i <= size.width; i += baseSize) {
+    for (double i = 0; i <= size.width; i += BASE_SIZE) {
       canvas.drawLine(Offset(i.toDouble(), size.height), Offset(i.toDouble(), 0), paint);
     }
-  for (double y = 0; y <= size.height; y += baseSize) {
+  for (double y = 0; y <= size.height; y += BASE_SIZE) {
       canvas.drawLine(Offset(0, y.toDouble()), Offset(size.width, y.toDouble()), paint);
     }
 
     for (var i = 0; i < tieup.length; i++) {
       List<dynamic>? tie = tieup[i];
       if (tie != null) {
-        for (var j = 0; j < tie.length; j++) {
+        for (var j = 0; j < tie!.length; j++) {
           canvas.drawRect(
-            Offset(i.toDouble()*baseSize, size.height - (tie[j]*baseSize)) &
+            Offset(i.toDouble()*BASE_SIZE, size.height - (tie[j]*BASE_SIZE)) &
-            Size(baseSize.toDouble(), baseSize.toDouble()),
+            Size(BASE_SIZE.toDouble(), BASE_SIZE.toDouble()),
             paint);
         }
       }

mobile/lib/patterns/viewer.dart

@@ -4,29 +4,33 @@ import 'pattern.dart';
 class PatternViewer extends StatefulWidget {
   final Map<String,dynamic> pattern;
   final bool withEditor;
-  const PatternViewer(this.pattern, {super.key, this.withEditor = false});
+  PatternViewer(this.pattern, {this.withEditor = false}) {}
 
   @override
-  State<PatternViewer> createState() => _PatternViewerState();
+  State<PatternViewer> createState() => _PatternViewerState(this.pattern, this.withEditor);
 }
 
 class _PatternViewerState extends State<PatternViewer> {
+  Map<String,dynamic> pattern; 
+  final bool withEditor;
   bool controllerInitialised = false;
   final controller = TransformationController();
-  final double baseSize = 5;
+  final double BASE_SIZE = 5;
+
+  _PatternViewerState(this.pattern, this.withEditor) {} 
 
   void updatePattern(update) {
     setState(() {
-      widget.pattern.addAll(update);
+      pattern!.addAll(update);
     });
   }
 
   @override
   Widget build(BuildContext context) {
     if (!controllerInitialised) {
-      var warp = widget.pattern['warp'];
+      var warp = pattern['warp'];
-      var weft = widget.pattern['weft'];
+      var weft = pattern['weft'];
-      double draftWidth = warp['threading']?.length * baseSize + weft['treadles'] * baseSize + baseSize;
+      double draftWidth = warp['threading']?.length * BASE_SIZE + weft['treadles'] * BASE_SIZE + BASE_SIZE;
       final zoomFactor = 1.0;
       final xTranslate = draftWidth - MediaQuery.of(context).size.width - 0; 
       final yTranslate = 0.0;
@@ -43,7 +47,22 @@ class _PatternViewerState extends State<PatternViewer> {
       maxScale: 5,
       constrained: false,
       transformationController: controller,
-      child: RepaintBoundary(child: Pattern(widget.pattern))
+      child: RepaintBoundary(child: Pattern(pattern))
     );
+
+
+    /*return  Column(
+      children: [
+        Text('Hi'),
+        Expanded(child: InteractiveViewer(
+      minScale: 0.5,
+      maxScale: 5,
+      constrained: false,
+      transformationController: controller,
+      child: RepaintBoundary(child: Pattern(pattern))))
+    ,
+        Text('Another'),
+      ]
+    );*/
   }
 }

mobile/lib/patterns/warp.dart

@@ -3,10 +3,10 @@ import '../util.dart';
 
 class WarpPainter extends CustomPainter {
   final Map<String,dynamic> pattern;
-  final double baseSize;
+  final double BASE_SIZE;
 
   @override
-  WarpPainter(this.baseSize, this.pattern);
+  WarpPainter(this.BASE_SIZE, this.pattern) {}
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -15,12 +15,17 @@ class WarpPainter extends CustomPainter {
     var paint = Paint()
       ..color = Colors.black
       ..strokeWidth = 0.5;
+    var thickPaint = Paint()
+      ..color = Colors.black
+      ..strokeWidth = 1.5;
 
     // Draw grid
-    for (double i = size.width; i >= 0; i -= baseSize) {
+    int columnsPainted = 0;
+    for (double i = size.width; i >= 0; i -= BASE_SIZE) {
       canvas.drawLine(Offset(i.toDouble(), size.height), Offset(i.toDouble(), 0), paint);
+      columnsPainted += 1;
     }
-  for (double y = 0; y <= size.height; y += baseSize) {
+  for (double y = 0; y <= size.height; y += BASE_SIZE) {
       canvas.drawLine(Offset(0, y.toDouble()), Offset(size.width, y.toDouble()), paint);
     }
 
@@ -29,12 +34,12 @@ class WarpPainter extends CustomPainter {
       var thread = warp['threading'][i];
       int? shaft = thread?['shaft'];
       String? colour = warp['defaultColour'];
-      double x = size.width - (i+1)*baseSize;
+      double x = size.width - (i+1)*BASE_SIZE;
       if (shaft != null) {
-        if (shaft > 0) {
+        if (shaft! > 0) {
           canvas.drawRect(
-            Offset(x, size.height - shaft*baseSize) &
+            Offset(x, size.height - shaft!*BASE_SIZE) &
-            Size(baseSize.toDouble(), baseSize.toDouble()),
+            Size(BASE_SIZE.toDouble(), BASE_SIZE.toDouble()),
             paint
           );
         }
@@ -46,9 +51,9 @@ class WarpPainter extends CustomPainter {
       if (colour != null) {
         canvas.drawRect(
           Offset(x, 0) &
-          Size(baseSize.toDouble(), baseSize.toDouble()),
+          Size(BASE_SIZE.toDouble(), BASE_SIZE.toDouble()),
           Paint()
-            ..color = Util.rgb(colour)
+            ..color = Util.rgb(colour!)
         );
       }
     }

mobile/lib/patterns/weft.dart

@@ -3,10 +3,10 @@ import '../util.dart';
 
 class WeftPainter extends CustomPainter {
   final Map<String,dynamic> pattern;
-  final double baseSize;
+  final double BASE_SIZE;
 
   @override
-  WeftPainter(this.baseSize, this.pattern);
+  WeftPainter(this.BASE_SIZE, this.pattern) {}
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -15,24 +15,29 @@ class WeftPainter extends CustomPainter {
     var paint = Paint()
       ..color = Colors.black
       ..strokeWidth = 0.5;
+    var thickPaint = Paint()
+      ..color = Colors.black
+      ..strokeWidth = 1.5;
 
     // Draw grid
-    for (double i = 0; i <= size.width; i += baseSize) {
+    int rowsPainted = 0;
+    for (double i = 0; i <= size.width; i += BASE_SIZE) {
       canvas.drawLine(Offset(i.toDouble(), size.height), Offset(i.toDouble(), 0), paint);
     }
-  for (double y = 0; y <= size.height; y += baseSize) {
+  for (double y = 0; y <= size.height; y += BASE_SIZE) {
       canvas.drawLine(Offset(0, y.toDouble()), Offset(size.width, y.toDouble()), paint);
+      rowsPainted += 1;
     }
 
     for (var i = 0; i < weft['treadling'].length; i++) {
       var thread = weft['treadling'][i];
       int? treadle = thread?['treadle'];
       String? colour = weft['defaultColour'];
-      double y = i.toDouble()*baseSize;
+      double y = i.toDouble()*BASE_SIZE;
-      if (treadle != null && treadle > 0) {
+      if (treadle != null && treadle! > 0) {
         canvas.drawRect(
-          Offset((treadle.toDouble()-1)*baseSize, y) &
+          Offset((treadle!.toDouble()-1)*BASE_SIZE, y) &
-          Size(baseSize.toDouble(), baseSize.toDouble()),
+          Size(BASE_SIZE.toDouble(), BASE_SIZE.toDouble()),
           paint
         );
       }
@@ -41,10 +46,10 @@ class WeftPainter extends CustomPainter {
       }
       if (colour != null) {
         canvas.drawRect(
-          Offset(size.width - baseSize, y) &
+          Offset(size.width - BASE_SIZE, y) &
-          Size(baseSize.toDouble(), baseSize.toDouble()),
+          Size(BASE_SIZE.toDouble(), BASE_SIZE.toDouble()),
           Paint()
-            ..color = Util.rgb(colour)
+            ..color = Util.rgb(colour!)
         );
       }
     }

mobile/lib/project.dart

@@ -6,7 +6,6 @@ import 'package:file_picker/file_picker.dart';
 import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
 import 'package:go_router/go_router.dart';
 import 'package:intl/intl.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'dart:io';
 import 'api.dart';
 import 'util.dart';
@@ -14,7 +13,11 @@ import 'model.dart';
 import 'lib.dart';
 
 class _ProjectScreenState extends State<ProjectScreen> {
-  late final String fullPath;
+  final String username;
+  final String projectPath;
+  final String fullPath;
+  final Function? onUpdate;
+  final Function? onDelete;
   final picker = ImagePicker();
   final Api api = Api();
   Map<String,dynamic>? project;
@@ -22,17 +25,19 @@ class _ProjectScreenState extends State<ProjectScreen> {
   bool _loading = false;
   Map<String,dynamic>? _creatingObject;
   
+  _ProjectScreenState(this.username, this.projectPath, {this.project, this.onUpdate, this.onDelete}) :
+      fullPath = username + '/' + projectPath;
+
   @override
   initState() {
     super.initState();
-    fullPath = '${widget.username}/${widget.projectPath}';
     getProject(fullPath);
     getObjects(fullPath);
   }
 
   void getProject(String fullName) async {
     setState(() => _loading = true);
-    var data = await api.request('GET', '/projects/$fullName');
+    var data = await api.request('GET', '/projects/' + fullName);
     if (data['success'] == true) {
       setState(() {
         project = data['payload'];
@@ -43,7 +48,7 @@ class _ProjectScreenState extends State<ProjectScreen> {
 
   void getObjects(String fullName) async {
     setState(() => _loading = true);
-    var data = await api.request('GET', '/projects/$fullName/objects');
+    var data = await api.request('GET', '/projects/' + fullName + '/objects');
     if (data['success'] == true) {
       setState(() {
         _objects = data['payload']['objects'];
@@ -57,11 +62,31 @@ class _ProjectScreenState extends State<ProjectScreen> {
   }
 
   void _onDeleteProject() {
-    context.go('/');
+    context.pop();
+    onDelete!(project!['_id']);
   }
-  void _onUpdateProject(p) {
+  void _onUpdateProject(project) {
     setState(() {
-      project = p;
+      project = project;
+    });
+    onUpdate!(project!['_id'], project!);
+  }
+
+  void _onUpdateObject(String id, Map<String,dynamic> update) {
+    List<dynamic> _newObjects = _objects.map((o) {
+      if (o['_id'] == id) {
+        o.addAll(update);
+      }
+      return o;
+    }).toList();
+    setState(() {
+      _objects = _newObjects;
+    });
+  }
+  void _onDeleteObject(String id) {
+    List<dynamic> _newObjects = _objects.where((p) => p['_id'] != id).toList();
+    setState(() {
+      _objects = _newObjects;
     });
   }
 
@@ -120,7 +145,7 @@ class _ProjectScreenState extends State<ProjectScreen> {
       PlatformFile file = result.files.single;
       XFile xFile = XFile(file.path!);
       String? ext = file.extension;
-      if (ext != null && ext.toLowerCase() == 'wif' || xFile.name.toLowerCase().contains('.wif')) {
+      if (ext != null && ext!.toLowerCase() == 'wif' || xFile.name.toLowerCase().contains('.wif')) {
         final String contents = await xFile.readAsString();
         _createObjectFromWif(file.name, contents);
       } else {
@@ -130,16 +155,16 @@ class _ProjectScreenState extends State<ProjectScreen> {
   }
 
   void _chooseImage() async {
+    File file;
     try {
       final XFile? imageFile = await picker.pickImage(source: ImageSource.gallery);
       if (imageFile == null) return;
-      final f = DateFormat('yyyy-MM-dd_hh-mm-ss');
+      final f = new DateFormat('yyyy-MM-dd_hh-mm-ss');
-      String time = f.format(DateTime.now());
+      String time = f.format(new DateTime.now());
-      String name = '${project!["name"]} $time.${imageFile.name.split(".").last}';
+      String name = project!['name'] + ' ' + time + '.' + imageFile.name.split('.').last;
       _createObjectFromFile(name, imageFile);
     }
     on Exception {
-      if (!mounted) return;
       showDialog(
         context: context,
         builder: (BuildContext context) => CupertinoAlertDialog(
@@ -158,30 +183,30 @@ class _ProjectScreenState extends State<ProjectScreen> {
   }
   
   void showSettingsModal() {
-    Widget settingsDialog = _ProjectSettingsDialog(project!, _onDeleteProject, _onUpdateProject);
+    Widget settingsDialog = new _ProjectSettingsDialog(project!, _onDeleteProject, _onUpdateProject);
     showCupertinoModalPopup(context: context, builder: (BuildContext context) => settingsDialog);
   }
 
   Widget getNetworkImageBox(String url) {
-    return AspectRatio(
+    return new AspectRatio(
       aspectRatio: 1 / 1,
-      child: Container(
+      child: new Container(
-        decoration: BoxDecoration(
+        decoration: new BoxDecoration(
           borderRadius: BorderRadius.circular(10.0),
-          image: DecorationImage(
+          image: new DecorationImage(
             fit: BoxFit.cover,
             alignment: FractionalOffset.topCenter,
-            image: NetworkImage(url),
+            image: new NetworkImage(url),
           )
         ),
       ),
     );
   }
   Widget getIconBox(Icon icon) {
-    return AspectRatio(
+    return new AspectRatio(
       aspectRatio: 1 / 1,
-      child: Container(
+      child: new Container(
-        decoration: BoxDecoration(
+        decoration: new BoxDecoration(
           color: Colors.grey[100],
           borderRadius: BorderRadius.circular(10.0),
         ),
@@ -232,10 +257,10 @@ class _ProjectScreenState extends State<ProjectScreen> {
       leader = CircularProgressIndicator();
     }
 
-    return Card(
+    return new Card(
       child: InkWell(
         onTap: () {
-          context.push('/${widget.username}/${widget.projectPath}/${object["_id"]}');
+          context.push('/' + username + '/' + projectPath + '/' + object['_id']);
         },
         child: ListTile(
           leading: leader,
@@ -248,18 +273,17 @@ class _ProjectScreenState extends State<ProjectScreen> {
   }
 
   Widget getBody() {
-    if (_loading || project == null) {
+    if (_loading || project == null)
       return CircularProgressIndicator();
-    } else if ((_objects.isNotEmpty) || _creatingObject != null) {
+    else if ((_objects != null && _objects.length > 0) || _creatingObject != null)
       return ListView.builder(
         itemCount: _objects.length + (_creatingObject != null ? 1 : 0),
         itemBuilder: (BuildContext context, int index) {
           return getObjectCard(index);
         },
       );
-    } else {
+    else 
       return EmptyBox('This project is currently empty', description: 'If this is your project, you can add a pattern file, an image, or something else to this project using the + button below.');
-    }
   }
 
   @override
@@ -269,7 +293,6 @@ class _ProjectScreenState extends State<ProjectScreen> {
     return Scaffold(
       appBar: AppBar(
         title: Text(project?['name'] ?? 'Project'),
-        forceMaterialTransparency: true,
         actions: <Widget>[
           IconButton(
             icon: Icon(Icons.ios_share),
@@ -277,12 +300,12 @@ class _ProjectScreenState extends State<ProjectScreen> {
               _shareProject(); 
             },
           ),
-          IconButton(
+          onUpdate != null ? IconButton(
             icon: Icon(Icons.settings),
             onPressed: () {
               showSettingsModal(); 
             },
-          ),
+          ) : SizedBox(width: 0),
         ]
       ),
       body: Container(
@@ -326,8 +349,8 @@ class _ProjectScreenState extends State<ProjectScreen> {
             SizedBox(width: 10),
             FloatingActionButton(
               heroTag: null,
-              onPressed: _chooseFile,
               child: const Icon(Icons.insert_drive_file_outlined),
+              onPressed: _chooseFile,
             ),
           ]),
         ],
@@ -339,9 +362,12 @@ class _ProjectScreenState extends State<ProjectScreen> {
 class ProjectScreen extends StatefulWidget {
   final String username;
   final String projectPath;
-  const ProjectScreen(this.username, this.projectPath, {super.key});
+  final Map<String,dynamic>? project;
+  final Function? onUpdate;
+  final Function? onDelete;
+  ProjectScreen(this.username, this.projectPath, {this.project, this.onUpdate, this.onDelete}) { }
   @override
-  State<ProjectScreen> createState() => _ProjectScreenState(); 
+  _ProjectScreenState createState() => _ProjectScreenState(username, projectPath, project: project, onUpdate: onUpdate, onDelete: onDelete); 
 }
 
 class _ProjectSettingsDialog extends StatelessWidget {
@@ -351,7 +377,7 @@ class _ProjectSettingsDialog extends StatelessWidget {
   final Function _onUpdateProject;
   final Api api = Api();
   _ProjectSettingsDialog(this.project, this._onDelete, this._onUpdateProject) :
-    fullPath = '${project["owner"]["username"]}/${project["path"]}';
+    fullPath = project['owner']['username'] + '/' + project['path'];
   
   void _renameProject(BuildContext context) async {
     TextEditingController renameController = TextEditingController();
@@ -375,22 +401,11 @@ class _ProjectSettingsDialog extends StatelessWidget {
             TextButton(
               child: Text('OK'),
               onPressed: () async {
-                var data = await api.request('PUT', '/projects/$fullPath', {'name': renameController.text});
+                var data = await api.request('PUT', '/projects/' + fullPath, {'name': renameController.text});
                 if (data['success']) {
-                  if (!context.mounted) return;
                   context.pop(); 
                   _onUpdateProject(data['payload']);
-                } else {
-                  Fluttertoast.showToast(
-                    msg: data['message'],
-                    toastLength: Toast.LENGTH_LONG,
-                    gravity: ToastGravity.BOTTOM,
-                    timeInSecForIosWeb: 10,
-                    backgroundColor: Colors.red[800],
-                    textColor: Colors.white,
-                  );
                 }
-                if (!context.mounted) return;
                 context.pop();
               },
             ),
@@ -401,17 +416,18 @@ class _ProjectSettingsDialog extends StatelessWidget {
   }
 
   void _toggleVisibility(BuildContext context, bool checked) async {
-    var data = await api.request('PUT', '/projects/$fullPath', {'visibility': checked ? 'private': 'public'});
+    var data = await api.request('PUT', '/projects/' + fullPath, {'visibility': checked ? 'private': 'public'});
     if (data['success']) {
-      if (!context.mounted) return;
       context.pop(); 
       _onUpdateProject(data['payload']);
     }
   }
 
   void _deleteProject(BuildContext context, BuildContext modalContext) async {
-    var data = await api.request('DELETE', '/projects/$fullPath');
+    var data = await api.request('DELETE', '/projects/' + fullPath);
     if (data['success']) {
+      context.pop();
+      context.pop();
       _onDelete();
     }
   }
@@ -420,8 +436,8 @@ class _ProjectSettingsDialog extends StatelessWidget {
     showDialog(
       context: modalContext,
       builder: (BuildContext context) => CupertinoAlertDialog(
-        title: Text('Really delete this project?'),
+        title: new Text('Really delete this project?'),
-        content: Text('This will remove any files and objects inside the project. This action cannot be undone.'),
+        content: new Text('This will remove any files and objects inside the project. This action cannot be undone.'),
         actions: <Widget>[
           CupertinoDialogAction(
             isDefaultAction: true,
@@ -453,11 +469,11 @@ class _ProjectSettingsDialog extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
              CupertinoSwitch(
-                value: project['visibility'] == 'private',
+                value: project?['visibility'] == 'private',
                 onChanged: (c) => _toggleVisibility(context, c),
               ),
               SizedBox(width: 10),
-              Text('Private project', style: Theme.of(context).textTheme.bodyMedium),
+              Text('Private project', style: Theme.of(context).textTheme.bodyText1),
             ]
           )
         ),
@@ -467,8 +483,8 @@ class _ProjectSettingsDialog extends StatelessWidget {
         ),
         CupertinoActionSheetAction(
           onPressed: () { _confirmDeleteProject(context); },
-          isDestructiveAction: true,
           child: Text('Delete project'),
+          isDestructiveAction: true,
         ),
       ]
     );

mobile/lib/projects.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:provider/provider.dart';
 import 'package:go_router/go_router.dart';
 import 'api.dart';
@@ -38,42 +39,59 @@ class _ProjectsTabState extends State<ProjectsTab> {
     });
   }
   void _onCreateProject(newProject) {
-    List<dynamic> newProjects = _projects;
+    List<dynamic> _newProjects = _projects;
-    newProjects.insert(0, newProject);
+    _newProjects.insert(0, newProject);
     setState(() {
-      _projects = newProjects;
+      _projects = _newProjects;
       _creatingProject = false;
     });
   }
   
+  void _onUpdateProject(String id, Map<String,dynamic> update) {
+    List<dynamic> _newProjects = _projects.map((p) {
+      if (p['_id'] == id) {
+        p.addAll(update);
+      }
+      return p;
+    }).toList();
+    setState(() {
+      _projects = _newProjects;
+    });
+  }
+
+  void _onDeleteProject(String id) {
+    List<dynamic> _newProjects = _projects.where((p) => p['_id'] != id).toList();
+    setState(() {
+      _projects = _newProjects;
+    });
+  }
+
   void showNewProjectDialog() async {
-    Widget simpleDialog = _NewProjectDialog(_onCreatingProject, _onCreateProject);
+    Widget simpleDialog = new _NewProjectDialog(_onCreatingProject, _onCreateProject);
     showDialog(context: context, builder: (BuildContext context) => simpleDialog);
   }
 
   Widget buildProjectCard(Map<String,dynamic> project) {
     String description = project['description'] != null ? project['description'].replaceAll("\n", " ") : '';
-    if (description.length > 80) {
+    if (description != null && description.length > 80) {
-      description = '${description.substring(0, 77)}...';
+      description = description.substring(0, 77) + '...';
     }
     if (project['visibility'] == 'public') {
-      description = "PUBLIC PROJECT\n$description";
+      description = "PUBLIC PROJECT\n" + description;
     }
-    else {
+    else description = "PRIVATE PROJECT\n" + description;
-      description = "PRIVATE PROJECT\n$description";
+    return new Card(
-    }
-    return Card(
         child: InkWell(
           onTap: () {
-            context.push('/${project["owner"]["username"]}/${project["path"]}');
+            context.push('/' + project['owner']['username'] + '/' + project['path']);
           },
           child: Container(
             padding: EdgeInsets.all(5),
             child: ListTile(
-            leading: AspectRatio(
+            leading: new AspectRatio(
               aspectRatio: 1 / 1,
-              child: Container(
+              child: new Container(
-                decoration: BoxDecoration(
+                decoration: new BoxDecoration(
                   color: Colors.grey[100],
                   borderRadius: BorderRadius.circular(10.0),
                 ),
@@ -81,7 +99,7 @@ class _ProjectsTabState extends State<ProjectsTab> {
               ),
             ),
             trailing: Icon(Icons.keyboard_arrow_right),
-            title: Text(project['name'] ?? 'Untitled project'),
+            title: Text(project['name'] != null ? project['name'] : 'Untitled project'),
             subtitle: Text(description),
           ),
         ))
@@ -91,29 +109,26 @@ class _ProjectsTabState extends State<ProjectsTab> {
 
   Widget getBody() {
     AppModel model = Provider.of<AppModel>(context);
-    if (model.user == null) {
+    if (model.user == null)
       return LoginNeeded(text: 'Once logged in, you\'ll find your own projects shown here.');
-    }
+    if (_loading) 
-    if (_loading) {
       return CircularProgressIndicator();
-    } else if (_projects.isNotEmpty) {
+    else if (_projects != null && _projects.length > 0)
       return ListView.builder(
         itemCount: _projects.length,
         itemBuilder: (BuildContext context, int index) {
           return buildProjectCard(_projects[index]);
         },
       );
-    } else {
+    else return Column(
-      return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
-        crossAxisAlignment: CrossAxisAlignment.center,
+      mainAxisAlignment: MainAxisAlignment.center,
-        mainAxisAlignment: MainAxisAlignment.center,
+      children: [
-        children: [
+        Text('Create your first project', style: TextStyle(fontSize: 20), textAlign: TextAlign.center),
-          Text('Create your first project', style: TextStyle(fontSize: 20), textAlign: TextAlign.center),
+        Image(image: AssetImage('assets/reading.png'), width: 300),
-          Image(image: AssetImage('assets/reading.png'), width: 300),
+        Text('Projects contain all the files and patterns that make up a piece of work. Create one using the + button below.', textAlign: TextAlign.center),
-          Text('Projects contain all the files and patterns that make up a piece of work. Create one using the + button below.', textAlign: TextAlign.center),
+      ]
-        ]
+    );
-      );
-    }
   }
 
   @override
@@ -124,13 +139,6 @@ class _ProjectsTabState extends State<ProjectsTab> {
       appBar: AppBar(
         title: Text('My Projects'),
         actions: <Widget>[
-          if (user != null && user.emailVerified != true) IconButton(
-            onPressed: () {
-              context.push('/email/verify');
-            },
-            icon: Icon(Icons.warning),
-            color: Colors.red,
-          ),
           IconButton(
             icon: Icon(Icons.info_outline),
             onPressed: () {
@@ -147,23 +155,27 @@ class _ProjectsTabState extends State<ProjectsTab> {
       floatingActionButton: user != null ? FloatingActionButton(
         onPressed: showNewProjectDialog,
         child: _creatingProject ? CircularProgressIndicator(backgroundColor: Colors.white) : Icon(Icons.add),
+        backgroundColor: Colors.pink[500],
       ) : null,
     ); 
   }
 }
 
 class ProjectsTab extends StatefulWidget {
-  const ProjectsTab({super.key});
-
   @override
-  State<ProjectsTab> createState() => _ProjectsTabState(); 
+  _ProjectsTabState createState() => _ProjectsTabState(); 
 }
 
 class _NewProjectDialogState extends State<_NewProjectDialog> {
   final TextEditingController _newProjectNameController = TextEditingController();
+  final Function _onStart;
+  final Function _onComplete;
+  String _newProjectName = '';
   bool _newProjectPrivate = false;
   final Api api = Api();
 
+  _NewProjectDialogState(this._onStart, this._onComplete) {}
+
   void _onToggleProjectVisibility(checked) {
     setState(() {
       _newProjectPrivate = checked;
@@ -171,15 +183,13 @@ class _NewProjectDialogState extends State<_NewProjectDialog> {
   }
 
   void _createProject() async {
-    widget._onStart();
+    _onStart();
     String name = _newProjectNameController.text;
     bool priv = _newProjectPrivate;
     var data = await api.request('POST', '/projects', {'name': name, 'visibility': priv ? 'private' : 'public'});
     if (data['success'] == true) {
-      widget._onComplete(data['payload']);
+      _onComplete(data['payload']);
-      if (mounted) {
+      context.pop();
-        context.pop();
-      }
     }
   }
 
@@ -207,12 +217,13 @@ class _NewProjectDialogState extends State<_NewProjectDialog> {
               title: Text('Make this project private')
             ),
             SizedBox(height: 20),
-            ElevatedButton(
+            CupertinoButton(
+              color: Colors.pink,
               onPressed: _createProject,
               child: Text('Create'),
             ),
             SizedBox(height: 10),
-            TextButton(
+            CupertinoButton(
               onPressed: () {
                 context.pop();
               },
@@ -227,7 +238,7 @@ class _NewProjectDialogState extends State<_NewProjectDialog> {
 class _NewProjectDialog extends StatefulWidget {
   final Function _onComplete;
   final Function _onStart;
-  const _NewProjectDialog(this._onStart, this._onComplete);
+  _NewProjectDialog(this._onStart, this._onComplete) {}
   @override
-  State<_NewProjectDialog> createState() => _NewProjectDialogState(); 
+  _NewProjectDialogState createState() => _NewProjectDialogState(_onStart, _onComplete); 
 }

mobile/lib/register.dart

@@ -14,24 +14,21 @@ class _RegisterScreenState extends State<RegisterScreen> {
   final Api api = Api();
   bool _registering = false;
 
-  void _submit(BuildContext context) async {
+  void _submit(context) async {
     setState(() => _registering = true);
     var data = await api.request('POST', '/accounts/register', {'username': _usernameController.text, 'email': _emailController.text, 'password': _passwordController.text});
     setState(() => _registering = false);
     if (data['success'] == true) {
-      if (!context.mounted) return;
       AppModel model = Provider.of<AppModel>(context, listen: false);
-      await model.setToken(data['payload']['token']);
+      model.setToken(data['payload']['token']);
-      if (!context.mounted) return;
       context.go('/onboarding');
     }
     else {
-      if (!context.mounted) return;
       showDialog(
         context: context,
         builder: (BuildContext context) => CupertinoAlertDialog(
-          title: Text("There was a problem registering your account"),
+          title: new Text("There was a problem registering your account"),
-          content: Text(data['message']),
+          content: new Text(data['message']),
           actions: <Widget>[
             CupertinoDialogAction(
               isDefaultAction: true,
@@ -85,11 +82,11 @@ class _RegisterScreenState extends State<RegisterScreen> {
               textAlign: TextAlign.center,
               text: TextSpan(
                 text: 'By registering you agree to Treadl\'s ',
-                style: Theme.of(context).textTheme.bodyMedium,
+                style: Theme.of(context).textTheme.bodyText1,
                 children: <TextSpan>[
-                  TextSpan(text: 'Terms of Use', style: TextStyle(fontWeight: FontWeight.bold, color: Colors.pink), recognizer: TapGestureRecognizer()..onTap = () => launchUrl(Uri.parse('https://treadl.com/terms-of-use'))),
+                  TextSpan(text: 'Terms of Use', style: TextStyle(fontWeight: FontWeight.bold, color: Colors.pink), recognizer: new TapGestureRecognizer()..onTap = () => launch('https://treadl.com/terms-of-use')),
                   TextSpan(text: ' and '),
-                  TextSpan(text: 'Privacy Policy', style: TextStyle(fontWeight: FontWeight.bold, color: Colors.pink), recognizer: TapGestureRecognizer()..onTap = () => launchUrl(Uri.parse('https://treadl.com/privacy'))),
+                  TextSpan(text: 'Privacy Policy', style: TextStyle(fontWeight: FontWeight.bold, color: Colors.pink), recognizer: new TapGestureRecognizer()..onTap = () => launch('https://treadl.com/privacy')),
                   TextSpan(text: '.'),
                 ],
               ),
@@ -97,8 +94,10 @@ class _RegisterScreenState extends State<RegisterScreen> {
             SizedBox(height: 20),
             ElevatedButton(
               onPressed: () => _submit(context),
+              //color: Colors.pink,
               child: _registering ? SizedBox(height: 20, width: 20, child:CircularProgressIndicator(backgroundColor: Colors.white)) : Text("Register",
                 textAlign: TextAlign.center,
+                style: TextStyle(color: Colors.white, fontSize: 15)
               )
             ),
           ]
@@ -109,8 +108,6 @@ class _RegisterScreenState extends State<RegisterScreen> {
 }
 
 class RegisterScreen extends StatefulWidget {
-  const RegisterScreen({super.key});
-
   @override
-  State<RegisterScreen> createState() => _RegisterScreenState(); 
+  _RegisterScreenState createState() => _RegisterScreenState(); 
 }

mobile/lib/settings.dart

@@ -9,8 +9,6 @@ import 'model.dart';
 class SettingsScreen extends StatelessWidget {
   final TextEditingController _passwordController = TextEditingController();
  
-  SettingsScreen({super.key});
- 
   void _logout(BuildContext context) async {
     AppModel model = Provider.of<AppModel>(context, listen: false);
     Api api = Api();
@@ -46,18 +44,16 @@ class SettingsScreen extends StatelessWidget {
             Api api = Api();
             var data = await api.request('DELETE', '/accounts', {'password': _passwordController.text});
             if (data['success'] == true) {
-              if (!context.mounted) return;
               AppModel model = Provider.of<AppModel>(context, listen: false);
               model.setToken(null);
               model.setUser(null);
               context.go('/home');
             } else {
-              if (!context.mounted) return;
               showDialog(
                 context: context,
                 builder: (BuildContext context) => CupertinoAlertDialog(
-                  title: Text('There was a problem with deleting your account'),
+                  title: new Text('There was a problem with deleting your account'),
-                  content: Text(data['message']),
+                  content: new Text(data['message']),
                   actions: <Widget>[
                     CupertinoDialogAction(
                       isDefaultAction: true,
@@ -90,14 +86,16 @@ class SettingsScreen extends StatelessWidget {
         title: Text('About Treadl'),
       ),
       body:ListView(
-        padding: const EdgeInsets.all(10),
+        padding: const EdgeInsets.all(8),
         children: <Widget>[
           Container(
             margin: const EdgeInsets.only(top: 10.0, bottom: 10.0),
             child: 
               Text('Thanks for using Treadl', style: Theme.of(context).textTheme.titleLarge),
           ),
-          Text("Treadl is an app for managing your projects and for keeping in touch with your weaving communities.\n\nWe're always trying to make Treadl better, so if you have any feedback please let us know!", style: Theme.of(context).textTheme.bodyMedium),
+          Container(
+            child: Text("Treadl is an app for managing your projects and for keeping in touch with your weaving communities.\n\nWe're always trying to make Treadl better, so if you have any feedback please let us know!", style: Theme.of(context).textTheme.bodyText1)
+          ),
 
           SizedBox(height: 30),
 
@@ -108,56 +106,37 @@ class SettingsScreen extends StatelessWidget {
                 title: Text('Logout'),
                 onTap: () => _logout(context),
               ),
-              ListTile(
-                leading: Icon(Icons.mode_edit),
-                title: Text('Edit Account'),
-                onTap: () => context.push('/account'),
-              ),
               ListTile(
                 leading: Icon(Icons.delete),
                 title: Text('Delete Account'),
                 onTap: () => _deleteAccount(context),
               ),
             ]
-          ) : ElevatedButton(
+          ) : CupertinoButton(
-            child: Text('Join Treadl'),
+            color: Colors.pink,
+            child: Text('Join Treadl', style: TextStyle(color: Colors.white)),
             onPressed: () => context.push('/welcome'),
           ),
 
           SizedBox(height: 30),
 
-          ListTile(
-            leading: Icon(Icons.email),
-            title: Text('Email Us'),
-            onTap: () {
-              Uri emailLaunchUri = Uri(
-               scheme: 'mailto',
-               path: 'hello@treadl.com',
-               queryParameters: {
-                'subject': 'Mobile App Contact',
-                'body': ''
-               },
-              );
-              launchUrl(Uri.parse(emailLaunchUri.toString()));
-            }
-          ),
           ListTile(
             leading: Icon(Icons.link),
             trailing: Icon(Icons.explore),
             title: Text('Visit Our Website'),
-            onTap: () => launchUrl(Uri.parse('https://treadl.com')),
+            onTap: () => launch('https://treadl.com'),
           ),
           ListTile(
             leading: Icon(Icons.insert_drive_file),
             trailing: Icon(Icons.explore),
             title: Text('Terms of Use'),
-            onTap: () => launchUrl(Uri.parse('https://treadl.com/terms-of-use')),
+            onTap: () => launch('https://treadl.com/terms-of-use'),
           ),
           ListTile(
             leading: Icon(Icons.insert_drive_file),
             trailing: Icon(Icons.explore),
             title: Text('Privacy Policy'),
-            onTap: () => launchUrl(Uri.parse('https://treadl.com/privacy')),
+            onTap: () => launch('https://treadl.com/privacy'),
           ),
         ]
       ),

mobile/lib/user.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:intl/intl.dart';
 import 'util.dart';
@@ -7,21 +8,24 @@ import 'api.dart';
 import 'lib.dart';
 
 class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateMixin {
+  final String username;
   final Api api = Api();
   TabController? _tabController;
   Map<String,dynamic>? _user;
   bool _loading = false;
+  _UserScreenState(this.username) { }
 
   @override
   initState() {
     super.initState();
-    _tabController = TabController(length: 2, vsync: this);
+    _tabController = new TabController(length: 2, vsync: this);
-    getUser(widget.username);
+    getUser(username);
   }
 
   void getUser(String username) async {
+    if (username == null) return;
     setState(() => _loading = true);
-    var data = await api.request('GET', '/users/$username');
+    var data = await api.request('GET', '/users/' + username);
     if (data['success'] == true) {
       setState(() {
         _user = data['payload'];
@@ -31,9 +35,9 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM
   }
 
   Widget getBody() {
-    if (_loading) {
+    if (_loading)
       return CircularProgressIndicator();
-    } else if (_user != null && _tabController != null) {
+    else if (_user != null && _tabController != null) {
       var u = _user!;
       String? created;
       if (u['createdAt'] != null) {
@@ -59,7 +63,7 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM
                       Text(u['location'])
                     ]) : SizedBox(height: 1),
                   SizedBox(height: 10),
-                  Text('Member${created != null ? (' since $created') : ''}',
+                  Text('Member' + (created != null ? (' since ' + created!) : ''),
                     style: TextStyle(color: Colors.grey[500])
                   ),
                   SizedBox(height: 10),
@@ -68,9 +72,9 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM
                       onTap: () {
                         String url = u['website'];
                         if (!url.startsWith('http')) {
-                          url = 'http://$url';
+                          url = 'http://' + url;
                         }
-                        launchUrl(Uri.parse(url));
+                        launch(url);
                       },
                       child: Text(u['website'],
                         style: TextStyle(color: Colors.pink))
@@ -130,9 +134,8 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM
             )
           ]);
     }
-    else {
+    else
       return Text('User not found');
-    }
   }
 
   @override
@@ -140,12 +143,12 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM
     
     return Scaffold(
       appBar: AppBar(
-        title: Text(widget.username),
+        title: Text(username),
         actions: <Widget>[
           IconButton(
             icon: Icon(Icons.person),
             onPressed: () {
-              launchUrl(Uri.parse('https://www.treadl.com/${widget.username}'));
+              launch('https://www.treadl.com/' + username);
             },
           ),
         ]
@@ -161,7 +164,7 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM
 
 class UserScreen extends StatefulWidget {
   final String username;
-  const UserScreen(this.username, {super.key});
+  UserScreen(this.username) { }
   @override
-  State<UserScreen> createState() => _UserScreenState(); 
+  _UserScreenState createState() => _UserScreenState(username); 
 }

mobile/lib/util.dart

@@ -2,14 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:share_plus/share_plus.dart';
 import 'dart:io';
+import 'dart:convert';
 import 'model.dart';
 
-String appBaseUrl = 'https://www.treadl.com';
+String APP_URL = 'https://www.treadl.com';
 
 class Util {
 
   static ImageProvider? avatarUrl(Map<String,dynamic> user) {
-    if (user['avatar'] != null) {
+    if (user != null && user['avatar'] != null) {
       if (user['avatar'].length < 3) {
         return AssetImage('assets/avatars/${user['avatar']}.png');
       }
@@ -22,19 +23,19 @@ class Util {
 
   static Widget avatarImage(ImageProvider? image, {double size=30}) {
     if (image != null) {
-      return Container(
+      return new Container(
         width: size,
         height: size,
-        decoration: BoxDecoration(
+        decoration: new BoxDecoration(
           shape: BoxShape.circle,
-          image: DecorationImage(
+          image: new DecorationImage(
             fit: BoxFit.fill,
             image: image
           )
         )
       );
     }
-    return Container(
+    return new Container(
       width: size,
       height: size,
       decoration: BoxDecoration(
@@ -53,7 +54,7 @@ class Util {
   }
 
   static String appUrl(String path) {
-    return '$appBaseUrl/$path';
+    return APP_URL + '/' + path;
   }
 
   static Future<String> storagePath() async {

mobile/lib/verify_email.dart

@@ -1,153 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:go_router/go_router.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'api.dart';
-import 'model.dart';
-import 'lib.dart';
-
-class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
-  String? token;
-  bool loading = false;
-  String? error;
-  String? success;
-  Api api = Api();
-  _VerifyEmailScreenState();
-
-  @override
-  initState() {
-    super.initState();
-    _verify(context);
-    token = widget.token;
-  }
- 
-  void _verify(BuildContext context) async {
-    if (token == null) {
-      return;
-    }
-    setState(() {
-      loading = true;
-      error = null;
-      success = null;
-    });
-    AppModel model = Provider.of<AppModel>(context, listen: false);
-    var data = await api.request('PUT', '/accounts/email/verified', {'token': token});
-    if (data['success'] == true) {
-      model.verifyEmail();
-      setState(() {
-        loading = false;
-        success = 'Email verified successfully';
-      });
-      Fluttertoast.showToast(
-        msg: "Email verified successfully",
-        toastLength: Toast.LENGTH_LONG,
-        gravity: ToastGravity.CENTER,
-        timeInSecForIosWeb: 10,
-        backgroundColor: Colors.green[800],
-        textColor: Colors.white,
-        fontSize: 20.0
-      );
-      if (!context.mounted) return;
-      context.go('/');
-    } else {
-      setState(() {
-        loading = false;
-        error = data['message'];
-      });
-    }
-  }
-
-  void _resend(BuildContext context) async {
-    setState(() {
-      loading = true;
-      error = null;
-      success = null;
-    });
-    var data = await api.request('POST', '/accounts/email/verificationRequests', null);
-    if (data['success'] == true) {
-      setState(() {
-        success = 'Verification email sent. Remember to check your spam folder.';
-      }); 
-    } else {
-      setState(() {
-        error = data['message'];
-        loading = false;
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    AppModel model = Provider.of<AppModel>(context);
-    User? user = model.user;
-    return Scaffold(
-      appBar: AppBar(
-        title: Text('Email Verification'),
-      ),
-      body: ListView(
-        padding: const EdgeInsets.all(8),
-        children: <Widget>[
-          Text('Please verify your email address', style: Theme.of(context).textTheme.titleLarge),
-          if (loading) Column(
-            children: [
-              SizedBox(height: 20),
-              CircularProgressIndicator(),
-            ]
-          ),
-          SizedBox(height: 20),
-          Text('We have sent you an email with a verification link. Please tap the link in the email to verify your email address.', style: Theme.of(context).textTheme.bodyMedium),
-          SizedBox(height: 20),
-          if (user != null && user.email != null)
-            Row(
-              children: [
-                Expanded(
-                 child: TextField(
-                    enabled: false,
-                    controller: TextEditingController()..text = user.email!,
-                    decoration: InputDecoration(
-                      labelText: 'Email address to verify',
-                      hintText: user.email,
-                      border: OutlineInputBorder(),
-                    ),
-                  ),
-                ),
-                TextButton(
-                  onPressed: () => context.push('/account'),
-                  child: Text('Edit Email'),
-                ),
-              ]
-            ),
-          SizedBox(height: 20),
-          if (success != null) Alert(
-            title: 'Success',
-            description: success!,
-            type: 'success',
-          ),
-          if (error != null) Alert(
-            title: 'There was a problem',
-            description: error!,
-            type: 'failure',
-          ),
-          SizedBox(height: 20),
-          ElevatedButton(
-            onPressed: () => _resend(context),
-            child: Text('Resend Verification Email'),
-          ), 
-          SizedBox(height: 20),
-          TextButton(
-            onPressed: () => context.go('/'),
-            child: Text('Cancel'),
-          ),
-        ]
-      ),
-    );
-  }
-}
-
-class VerifyEmailScreen extends StatefulWidget {
-  final String? token;
-  @override
-  const VerifyEmailScreen({super.key, required this.token});
-  @override
-  State<VerifyEmailScreen> createState() => _VerifyEmailScreenState();
-}

mobile/lib/welcome.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:go_router/go_router.dart';
+import 'login.dart';
 
 class WelcomeScreen extends StatelessWidget {
-  const WelcomeScreen({super.key});
-
   void _login(BuildContext context) {
     context.push('/login');
   }
@@ -25,24 +25,27 @@ class WelcomeScreen extends StatelessWidget {
           SizedBox(height: 10),
           Text('Treadl is a place for weavers to connect and manage their portfolios.', style: TextStyle(color: Colors.white), textAlign: TextAlign.center),
           SizedBox(height: 30),
-          ElevatedButton(
+          CupertinoButton(
             onPressed: () => _login(context),
-            child: Text("Login",
+            color: Colors.white,
+            child: new Text("Login",
               style: TextStyle(color: Colors.pink),
               textAlign: TextAlign.center,
             )
           ),
           SizedBox(height: 15),
-          ElevatedButton(
+          CupertinoButton(
             onPressed: () => _register(context),
-            child: Text("Register",
+            color: Colors.pink[400],
+            child: new Text("Register",
+              style: TextStyle(color: Colors.white),
               textAlign: TextAlign.center,
             )
           ),
           SizedBox(height: 35),
-          TextButton(
+          CupertinoButton(
             onPressed: () => context.pop(),
-            child: Text("Cancel",
+            child: new Text("Cancel",
               style: TextStyle(color: Colors.white),
               textAlign: TextAlign.center,
             )

mobile/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,7 +5,6 @@
 import FlutterMacOS
 import Foundation
 
-import file_picker
 import file_selector_macos
 import firebase_core
 import firebase_messaging
@@ -15,7 +14,6 @@ import shared_preferences_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
   FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))

mobile/pubspec.yaml

@@ -15,36 +15,35 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.3.0+12
+version: 1.2.1+11
 
 environment:
-  sdk: '>=2.17.0 <4.0.0'
+  sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
   flutter:
     sdk: flutter
-  cupertino_icons: ^1.0.8
+  cupertino_icons: ^1.0.4
-  http: ^1.3.0
+  http: ^0.13.4
-  shared_preferences: ^2.5.2
+  shared_preferences: ^2.0.15
-  provider: ^6.1.2
+  provider: ^6.0.3
-  url_launcher: ^6.3.1
+  url_launcher: ^6.1.2
-  flutter_html: ^3.0.0
+  flutter_html: ^3.0.0-alpha.3
-  intl: ^0.20.2
+  intl: ^0.17.0
-  image_picker: ^1.1.2
+  image_picker: ^1.0.6
-  file_picker: ^9.2.1
+  file_picker: ^6.1.1
-  flutter_launcher_icons: ^0.14.3
+  flutter_launcher_icons: ^0.9.0
-  firebase_messaging: ^15.2.4
+  firebase_messaging: ^14.4.0
-  path_provider: ^2.1.5
+  path_provider: ^2.1.1
-  share_plus: ^10.1.4
+  share_plus: ^7.2.1
-  flutter_expandable_fab: ^2.4.0
+  flutter_expandable_fab: ^2.0.0
-  go_router: ^14.8.1
+  go_router: ^13.0.1
-  fluttertoast: ^8.2.12
+
+  #fluttertoast: ^8.0.9
 
-  firebase_core: any
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^5.0.0
 
 flutter_icons:
   android: "launcher_icon"

web/.env

@@ -1,21 +0,0 @@
-VITE_API_URL="https://api.treadl.com"
-VITE_IMAGINARY_URL="https://images.treadl.com"
-VITE_SENTRY_DSN="https://7c88f77dd19c57bfb92bb9eb53e33c4b@o4508066290532352.ingest.de.sentry.io/4508075022090320"
-VITE_SOURCE_REPO_URL="https://git.wilw.dev/wilw/treadl"
-VITE_PATREON_URL="https://www.patreon.com/treadl"
-VITE_KOFI_URL="https://ko-fi.com/wilw88"
-VITE_STATUS_URL="https://status.wilw.dev/status/treadl"
-VITE_STATUS_BADGE_URL="https://status.wilw.dev/api/badge/1/uptime?labelPrefix=API+"
-VITE_IOS_APP_URL="https://apps.apple.com/gb/app/treadl/id1525094357"
-VITE_ANDROID_APP_URL="https://play.google.com/store/apps/details/Treadl?id=com.treadl"
-VITE_CONTACT_EMAIL="hello@treadl.com"
-VITE_APP_NAME="Treadl"
-VITE_APP_DOMAIN="treadl.com"
-VITE_TERMS_OF_USE_URL="https://git.wilw.dev/wilw/treadl/wiki/Terms-of-Use"
-VITE_PRIVACY_POLICY_URL="https://git.wilw.dev/wilw/treadl/wiki/Privacy-Policy"
-VITE_ONLINE_SAFETY_URL="https://git.wilw.dev/wilw/treadl/wiki/Online-Safety"
-VITE_ONLINE_SAFETY_POLICY_URL="https://git.wilw.dev/wilw/treadl/wiki/Online-Safety-Policy"
-VITE_FOLLOWING_ENABLED="false"
-VITE_GROUP_DISCOVERY_ENABLED="false"
-VITE_USER_DISCOVERY_ENABLED="false"
-VITE_GROUPS_ENABLED="false"

web/.env.development

@@ -1 +1,10 @@
 VITE_API_URL="http://localhost:2001"
+VITE_IMAGINARY_URL=""
+VITE_SENTRY_DSN=""
+VITE_SOURCE_REPO_URL="https://git.wilw.dev/wilw/treadl"
+VITE_PATREON_URL="https://www.patreon.com/treadl"
+VITE_KOFI_URL="https://ko-fi.com/wilw88"
+VITE_IOS_APP_URL="https://apps.apple.com/gb/app/treadl/id1525094357"
+VITE_ANDROID_APP_URL="https://play.google.com/store/apps/details/Treadl?id=com.treadl"
+VITE_CONTACT_EMAIL="hello@treadl.com"
+VITE_APP_NAME="Treadl"

web/.eslintignore

@@ -0,0 +1,2 @@
+node_modules/
+build/

web/.eslintrc

@@ -0,0 +1,17 @@
+{
+  "env": {
+    "browser": true
+  },
+  "extends": ["react-app", "airbnb"],
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "rules": {
+    "no-underscore-dangle": [2, { "allow": ["_id"] }],
+    "max-len": 0
+  }
+}