diff --git a/.envrc b/.envrc deleted file mode 100644 index c4b77792..00000000 --- a/.envrc +++ /dev/null @@ -1,7 +0,0 @@ -# If lorri exists, better try it first. -if has lorri; then - eval "$(lorri direnv)" -else - # Otherwise fall back to pure nix - use nix -fi diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9b5fbda0..40d42946 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,25 +5,38 @@ on: tags: - v0.0* +env: + IMAGE_NAME: fs-node + jobs: docker: runs-on: ubuntu-latest + permissions: + packages: write + contents: read + steps: - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v3 - with: - push: true - tags: ilhanu/fs-node:latest + - uses: actions/checkout@v3 + + - name: Build image + run: docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" + + - name: Log in to registry + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin + + - name: Push image + run: | + IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME + + # Change all uppercase to lowercase + IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') + # Strip git ref prefix from version + VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') + # Strip "v" prefix from tag name + [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') + # Use Docker `latest` tag convention + [ "$VERSION" == "master" ] && VERSION=latest + echo IMAGE_ID=$IMAGE_ID + echo VERSION=$VERSION + docker tag $IMAGE_NAME $IMAGE_ID:$VERSION + docker push $IMAGE_ID:$VERSION \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 55b38dbf..00000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "Run ", - "type": "shell", - "command": "cargo", - "args": ["run", "--release", "--", "--dev"], - "group": { - "kind": "build", - "isDefault": true - }, - "presentation": { - "reveal": "always", - "panel": "new" - }, - "problemMatcher": [ - { - "owner": "rust", - "fileLocation": ["relative", "${workspaceRoot}"], - "pattern": { - "regexp": "^(.*):(\\d+):(\\d+):\\s+(\\d+):(\\d+)\\s+(warning|error):\\s+(.*)$", - "file": 1, - "line": 2, - "column": 3, - "endLine": 4, - "endColumn": 5, - "severity": 6, - "message": 7 - } - } - ] - } - ] -} \ No newline at end of file diff --git a/README.md b/README.md index 8b919ad0..27fba3f7 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,19 @@ -
- - Discord - - - Twitter Follow Fair Squares - -
-# Fair Squares (FS) -## Description -FS connects supply and demand of house-owners & renters and houses & investors. Our motive is that we want to create an affordable housing market. Investors of a house get a social return while renters can have cheaper housing. +# Fair Squares (FS) · [![Twitter URL](https://img.shields.io/twitter/follow/fairsquares?style=social)](https://twitter.com/fairsquares) [![License](https://img.shields.io/github/license/fair-Squares/fair-squares)](https://github.com/Fair-Squares/fair-squares/blob/main/LICENSE) [![Discord](https://img.shields.io/badge/Discord-gray?logo=discord)](https://discord.gg/5u3dxE49V5) -It removes the financial barrier of investing in real estate for investors that don't have the means to fully invest in a house themselves. In between the end-users, there is coordination taking place between different stakeholders to achieve the desired outcome. This is where the runtime and the logic of all pallets come together, orchestrating while adhering to strict rules set for a equitable system. +
+ + +
+
-FS can be positions as a programmed DAO that has the financial tools housing-fund that is programmed to bid on houses as they have been succesfully onboarded. The onboarding is achieved by verfied actors such as a fullfilling tasks to get the truth on-chain. The real world actors the following real-world actors to fullfill tasks and get paid out by the digital society. +**Fair Squares** connects supply and demand of house-owners & renters and houses & investors. Our motive is that we want to create an more affordable housing market. Investors of the house get a social return while renters can have cheaper housing. We want to remove the financial barrier of investing in real estate for investors that don't have the means to fully invest in a house themselves for a social return. In between the end-users, there is coordination taking place between different stakeholders to achieve the desired outcome. This is where the runtime and the logic of all pallets come together, orchestrating while adhering to strict rules set for an equitable system. The orchestration towards an equitable housing market is configurable and governable by the stakeholders that are concerend with it and are willing to work for it. We are zooming much more on the problem definition, stakeholders and the solution in our paper on our [website](https://fair-squares.nl/). To learn more and get in touch with us, please join our [discord channel FS](https://discord.gg/5u3dxE49V5) +Our current development is funded by [Web3 Foundation Grants Program](https://github.com/w3f/Grants-Program) +
## Run & build @@ -39,7 +35,6 @@ We added a [Dockerfile](https://github.com/Fair-Squares/fair-squares/blob/main/D ### Docker images // - ### Run in Docker in linux First, install [Docker](https://docs.docker.com/get-docker/) and diff --git a/assets/fs_works.jpeg b/assets/fs_works.jpeg deleted file mode 100644 index e145d256..00000000 Binary files a/assets/fs_works.jpeg and /dev/null differ diff --git a/assets/img/web3_foundation_grants_badge_white.svg b/assets/img/web3_foundation_grants_badge_white.svg new file mode 100755 index 00000000..07d3091c --- /dev/null +++ b/assets/img/web3_foundation_grants_badge_white.svg @@ -0,0 +1 @@ +web3 foundation grants_2 \ No newline at end of file