WIP: Quality of life Updates

.dockerignore

@@ -15,5 +15,4 @@ __pycache__
 *.md
 *.yml
 *.bat
-generated
-images
+collections

.gitignore

@@ -7,6 +7,7 @@ traits.json
 images
 .tempfile
 config.json
+collections/*/
 
 # ---> Python
 # Byte-compiled / optimized / DLL files

.gitmodules

@@ -1,4 +1,11 @@
 [submodule "minter"]
 	path = minter
 	url = https://github.com/Montspy/LooPyMinty.git
-	branch = rel/LooPyGen
+	branch = rel/LooPyGen
+[submodule "react"]
+	path = react
+	url = https://github.com/you3h/LooPyGen_Client.git
+	branch = main
+[submodule "ipfs-hash"]
+	path = ipfs-hash
+	url = https://github.com/sk33z3r/ipfs-only-hash.git

Dockerfile

@@ -11,24 +11,33 @@ ADD minter/requirements.txt /minter.txt
 ADD minter/hello_loopring/requirements.txt /hello_loopring.txt
 RUN pip install -r /generator.txt -r /hello_loopring.txt -r /minter.txt
 
-FROM node:16-alpine as node_modules
+FROM node:16 as node_modules
 # Set workdir initially just for npm to install
 WORKDIR /usr/src/app
-# Install the app from npm directly
-RUN npm i --only=production pure-ipfs-only-hash
+# Install container pre-requisites
+RUN apt-get -y update; \
+    apt-get -y upgrade
+RUN apt-get -y install python3
+# Install modules
+ADD ipfs-hash/package*.json ./
+RUN npm install
+# Install app files
+ADD ipfs-hash/* ./
 
-FROM php:fpm AS php
-# install python3.9
+FROM python:3.9
+# install npm and ffmpeg
 RUN dpkg --configure -a
 RUN apt-get update; \
     apt-get -y upgrade
-RUN apt-get install -y python3 npm ffmpeg
+RUN apt-get install -y npm ffmpeg
 # get compiled modules from previous stages
-COPY --from=python_modules /usr/local/lib/python3.9 /usr/lib/python3.9
-COPY --from=node_modules /usr/src/app/node_modules /usr/src/app/node_modules
+COPY --from=python_modules /usr/local/lib/python3.9 /usr/local/lib/python3.9
+COPY --from=node_modules /usr/src/app /usr/src/app
 # add the python files for the game
 ADD dockerfiles/scripts/* /usr/local/bin/
 # link cid calculator
-RUN ln -s /usr/src/app/node_modules/pure-ipfs-only-hash/cli.js /usr/bin/cid
+RUN ln -s /usr/src/app/cli.js /usr/bin/cid
 # finish up container
-WORKDIR /var/www/html
+WORKDIR /app
+
+CMD [ "tail", "-f", "/dev/null" ]

docker-compose.yml

@@ -5,27 +5,47 @@ services:
   nginx:
     container_name: "loopygen.nginx"
     image: nginx:alpine
+    restart: unless-stopped
+    depends_on:
+      - react
     ports:
       - "8080:80"
     volumes:
-      - ./:/var/www/html:ro
       - ./dockerfiles/nginx.conf:/etc/nginx/conf.d/default.conf:ro
     networks:
       loopygen:
         ipv4_address: 172.101.0.100
 
-  php:
-    container_name: "loopygen.php"
-    build: .
+  react:
+    container_name: "loopygen.react"
+    build:
+      context: ./react
+      args:
+        UID: ${UID}
+        GID: ${GID}
+    restart: unless-stopped
     user: ${UID}:${GID}
     volumes:
       - /etc/passwd:/etc/passwd:ro
       - /etc/group:/etc/group:ro
-      - ./:/var/www/html:rw
+      - ./:/usr/src/common:rw
     networks:
       loopygen:
         ipv4_address: 172.101.0.110
 
+  python:
+    container_name: "loopygen.python"
+    build: .
+    restart: unless-stopped
+    user: ${UID}:${GID}
+    volumes:
+      - /etc/passwd:/etc/passwd:ro
+      - /etc/group:/etc/group:ro
+      - ./:/app:rw
+    networks:
+      loopygen:
+        ipv4_address: 172.101.0.115
+
 networks:
   loopygen:
     name: loopygen

docker.sh

@@ -18,20 +18,37 @@ checkDotenv() {
 }
 
 reload() {
-    docker-compose down
+    docker-compose down --remove-orphans
     checkDotenv
     docker builder prune -f
     docker-compose up -d --build --force-recreate
 }
 
+migrate() {
+    for i in $(ls images); do
+        mkdir -p collections/$i/{config,stats,ipfs}
+        mv images/$i/*.json collections/$i/config/
+        mv images/$i collections/$i/config/source_layers
+        mv generated/$i/{gen-stats.json,all-traits.json} collections/$i/stats/
+        mv generated/$i/metadata-cids.json collections/$i/config/
+        mv generated/$i/{images,thumbnails,metadata} collections/$i/ipfs/
+    done
+    rm -r images generated
+}
+
 case $1 in
     build) docker-compose build;;
     reload) reload;;
     update) git pull --recurse-submodules && reload;;
     up)
         checkDotenv
-        docker-compose up -d
+        if [ "$2" = "prod" ]; then
+            docker-compose up -d react
+        else
+            docker-compose up -d
+        fi
     ;;
     down) docker-compose down;;
-    *) docker-compose exec php $@;;
+    migrate) migrate;;
+    *) docker-compose exec python $@;;
 esac

dockerfiles/nginx.conf

@@ -1,21 +1,18 @@
 server {
     listen 0.0.0.0:80;
     server_name _;
-    root /var/www/html;
-    index index.php index.html;
 
-    location ~* /(?!index.php|.*\.(gif|png|css|js|woff|svg|eot|jpg|jpeg|html|htm|zip)$) {
-        rewrite ^/(.*)$ /index.php?page=$1;
-    }
-
-    location ~ /\.(?!well-known) {
-        deny all;
-    }
-
-    location ~ \.php$ {
-        include fastcgi_params;
-        fastcgi_pass 172.101.0.110:9000;
-        fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
+    location / {
+        proxy_pass                                http://172.101.0.110:8080/;
+        proxy_http_version                        1.1;
+        proxy_redirect                            off;
+        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;
+        proxy_set_header X-Forwarded-Host	      $host;
+        proxy_set_header X-Forwarded-Port	      $server_port;
+        client_max_body_size                      0;
+        proxy_buffering                           off;
     }
 }

dockerfiles/scripts/generate

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-cd /var/www/html
+cd /app
 python3 generator/generate.py $@

dockerfiles/scripts/metadata

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-cd /var/www/html
+cd /app
 python3 generator/metadata.py $@

dockerfiles/scripts/mint

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-cd /var/www/html
+cd /app
 python3 minter/minter.py --loopygen $@

dockerfiles/scripts/prepare

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-cd /var/www/html
+cd /app
 python3 minter/prepare.py --loopygen $@

generator/metadata.py

@@ -145,7 +145,7 @@ def main():
                 "name": f"{traits.collection_name} #{token_id:03}",
                 "description": traits.description,
                 "royalty_percentage": int(traits.royalty_percentage),
-                "tokenId": token_id,
+                "id": token_id,
                 "attributes": properties_to_attributes(properties),
                 "properties": properties
             }

generator/utils.py

@@ -28,15 +28,15 @@ def __repr__(self):
 def load_traits(name: str = None):
     traits_path = ""
     if name:
-        traits_path = os.path.join("./images", name, "traits.json")
+        traits_path = os.path.join("./collections", name, "config", "traits.json")
     else:
-        all_jsons = glob("./images/*/traits.json")
+        all_jsons = glob("./collections/*/config/traits.json")
         all_names = []
         for f in all_jsons:
             with open(f, 'r') as j:
                 all_names.append(json.load(j).get("collection_name", "Unknown collection name"))
-        assert len(all_names) > 0, "Found 0 existing collections in ./images"
-        
+        assert len(all_names) > 0, "Found 0 existing collections in ./collections"
+
         print(f"Found {len(all_names)} collections:\n  " + "\n  ".join( [ f"{i+1}. {n}" for i,n in enumerate(all_names)] ))
         while True:
             print(f"Pick one (1~{len(all_names)}): ", end="")
@@ -48,7 +48,7 @@ def load_traits(name: str = None):
             if (s > 0) and (s <= len(all_names)):
                 break
         traits_path = all_jsons[s - 1]
-    
+
     with open(traits_path) as f:
         traits_json = json.load(f)
     return Struct(traits_json)
@@ -60,15 +60,20 @@ def load_config(paths: Struct):
 
 def generate_paths(traits: Struct):
     paths = Struct()
-    paths.collection = os.path.join("./generated", traits.collection_lower)
-    paths.metadata = os.path.join(paths.collection, "metadata")
-    paths.images = os.path.join(paths.collection, "images")
-    paths.thumbnails = os.path.join(paths.collection, "thumbnails")
-    paths.source = os.path.join("./images", traits.collection_lower)
+    paths.collection = os.path.join("./collections", traits.collection_lower)
+    paths.ipfs_folder = os.path.join(paths.collection, "ipfs")
+    paths.metadata = os.path.join(paths.ipfs_folder, "metadata")
+    paths.images = os.path.join(paths.ipfs_folder, "images")
+    paths.thumbnails = os.path.join(paths.ipfs_folder, "thumbnails")
+
+    paths.gen_conf = os.path.join(paths.collection, "config")
+    paths.source = os.path.join(paths.gen_conf, "source_layers")
+    paths.metadata_cids = os.path.join(paths.gen_conf, "metadata-cids.json")
+
+    paths.stats = os.path.join(paths.collection, "stats")
+    paths.all_traits = os.path.join(paths.stats, "all-traits.json")
+    paths.gen_stats = os.path.join(paths.stats, "gen-stats.json")
 
-    paths.all_traits = os.path.join(paths.collection, "all-traits.json")
-    paths.gen_stats = os.path.join(paths.collection, "gen-stats.json")
-    paths.metadata_cids = os.path.join(paths.collection, "metadata-cids.json")
     paths.config = "./config.json"
 
     return paths