Merge branch 'main' of github.com:algora-io/algora into feat/contracts

Author: zcesur

README.md

@@ -25,7 +25,7 @@
 
 </p>
 
-Algora exists to reduce the friction in hiring, collaborating and paying open source developers.
+Algora exists to reduce the friction in hiring and collaborating with open source developers.
 
 Algora combines:
 
@@ -104,17 +104,36 @@ Algora combines:
   </tr>
 </table>
 
+<!-- ROADMAP -->
+
+## Roadmap & community requests
+
+- Profile enhancements
+  - Highlighting top non-bounty open source contributions
+  - Embeddable profile for GitHub and personal websites
+  - One-click bounty and contract sharing
+- Hiring platform features
+  - Job posting and application management
+  - Developer ranking system using our ELO algorithm based on OSS contributions
+  - Technical interview tools with bounties and contract work
+  - Customizable career page embeds for seamless integration
+- New payment/payout options
+  - Alipay, Wise, crypto etc.
+- New workflow integrations
+  - GitLab, Linear, Plane, Cursor etc.
+- New clients
+  - Mobile, desktop, CLI
+- Crowdfunding enhancements
+
 <!-- GETTING STARTED -->
 
 ## Getting Started
 
-To get a local copy up and running, follow these steps.
-
 ### Prerequisites
 
 The easiest way to get up and running is to [install](https://docs.docker.com/get-docker/) and use Docker for running Postgres.
 
-Make sure Docker, Elixir, Erlang and Node.js are all installed on your development machine. The [.tool-versions](https://github.com/algora-io/algora/blob/main/.tool-versions) file is available to use with [asdf](https://github.com/asdf-vm/asdf) or similar tools.
+Make sure Docker, Elixir, Erlang and Node.js are all installed on your development machine. You can install Elixir and Erlang/OTP by running [`asdf install`](https://github.com/asdf-vm/asdf) from the project root.
 
 We also recommend using [direnv](https://github.com/direnv/direnv) to load environment variables and [entr](https://github.com/eradman/entr) to watch for file changes.
 
@@ -126,37 +145,31 @@ We also recommend using [direnv](https://github.com/direnv/direnv) to load envir
    git clone [email protected]:algora-io/algora.git && cd algora
    ```
 
-2. Install Elixir and Erlang/OTP
-
-   ```sh
-   asdf install
-   ```
-
-3. Initialize and load `.env`
+2. Initialize and load `.env`
 
    ```sh
    cp .env.example .env && direnv allow .env
    ```
 
-4. Start a container with latest postgres
+3. Start a container with latest postgres
 
    ```sh
    make postgres
    ```
 
-5. Install and setup dependencies
+4. Install and setup dependencies
 
    ```sh
    make install
    ```
 
-6. Start the web server inside IEx
+5. Start the web server inside IEx
 
    ```sh
    make server
    ```
 
-7. (Optional) Watch for file changes and auto reload IEx shell in a separate terminal
+6. (Optional) Watch for file changes and auto reload IEx shell in a separate terminal
 
    ```sh
    make watch
@@ -166,24 +179,6 @@ We also recommend using [direnv](https://github.com/direnv/direnv) to load envir
 
 Some features of Algora rely on external services. If you're not planning on using these features, feel free to skip setting them up.
 
-#### Tunnel
-
-To receive webhooks from GitHub or Stripe on your local machine, you'll need a way to expose your local server to the internet. The easiest way to get up and running is to use a tool like [ngrok](https://ngrok.com/) or [Cloudflare Tunnel](https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/).
-
-Here's how you can setup a re-usable named tunnel on your own domain name so you have a consistent URL:
-
-```sh
-cloudflared tunnel login
-cloudflared tunnel create local
-cloudflared tunnel route dns local http://local.yourdomain.com
-```
-
-Once you have setup your tunnel, add it to your `.env` file and run `direnv allow .env`.
-
-```env
-CLOUDFLARE_TUNNEL="local"
-```
-
 #### GitHub
 
 [Register new GitHub app](https://github.com/settings/apps/new) and set
@@ -200,7 +195,7 @@ CLOUDFLARE_TUNNEL="local"
   - Read account email address
 - Events: issues, pull requests, issue comment, pull request review, pull request review comment
 
-Once you have obtained your client ID and secret, add them to your `.env` file.
+Once you have obtained your client ID and secret, add them to your `.env` file and run `direnv allow .env`.
 
 ```env
 GITHUB_CLIENT_ID=""
@@ -232,3 +227,23 @@ AWS_ACCESS_KEY_ID=""
 AWS_SECRET_ACCESS_KEY=""
 BUCKET_NAME=""
 ```
+
+#### Tunnel
+
+To receive webhooks from GitHub or Stripe on your local machine, you'll need a way to expose your local server to the internet. The easiest way is to use a service like [Cloudflare Tunnel](https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/) or [ngrok](https://ngrok.com/).
+
+If you'd like to utilize our Cloudflare Tunnel [GenServer](https://github.com/algora-io/algora/blob/main/lib/algora/integrations/tunnel.ex) to automatically run a tunnel when you start the app, you'll need to set up a named tunnel on your own domain:
+
+```sh
+cloudflared tunnel login
+cloudflared tunnel create local
+cloudflared tunnel route dns local http://local.yourdomain.com
+```
+
+And then add it to your `.env` file:
+
+```env
+CLOUDFLARE_TUNNEL="local"
+```
+
+If you're using another service, make sure to start the tunnel manually in another terminal.

lib/algora/bounties/bounties.ex

@@ -1188,7 +1188,7 @@ defmodule Algora.Bounties do
         from([b, r: r] in query, where: b.owner_id == ^owner_id or r.user_id == ^owner_id)
 
       {:owner_handle, owner_handle}, query ->
-        from([b, o: o] in query, where: o.handle == ^owner_handle)
+        from([b, o: o, ro: ro] in query, where: o.handle == ^owner_handle or ro.handle == ^owner_handle)
 
       {:status, status}, query ->
         query = where(query, [b], b.status == ^status)
@@ -1224,7 +1224,7 @@ defmodule Algora.Bounties do
               end
 
             query =
-              case criteria[:owner_id] do
+              case criteria[:owner_id] || criteria[:owner_handle] do
                 nil ->
                   where(query, [b, o: o], (b.visibility == :public and o.featured == true) or b.visibility == :exclusive)
 

lib/algora_web/components/banner.ex

@@ -0,0 +1,48 @@
+defmodule AlgoraWeb.Components.Banner do
+  @moduledoc false
+  use AlgoraWeb.Component
+  use AlgoraWeb, :verified_routes
+
+  import AlgoraWeb.CoreComponents
+
+  alias AlgoraWeb.Constants
+
+  def banner(assigns) do
+    ~H"""
+    <div class="group flex items-center gap-x-6 bg-emerald-600 px-6 py-2.5 sm:px-3.5 sm:before:flex-1">
+      <p class="text-sm/6 text-foreground">
+        <.link
+          href={Constants.get(:github_repo_url)}
+          rel="noopener"
+          target="_blank"
+          class="font-medium"
+        >
+          <strong class="font-semibold">🎉 Algora is now open source!</strong><svg
+            viewBox="0 0 2 2"
+            class="mx-2 inline size-1 fill-current"
+            aria-hidden="true"
+          ><circle cx="1" cy="1" r="1" /></svg>Give us a star
+          <.icon
+            name="tabler-arrow-right"
+            class="size-4 group-hover:translate-x-1.5 transition-transform"
+          />
+        </.link>
+      </p>
+      <div class="flex flex-1 justify-end">
+        <%!-- <button type="button" class="-m-3 p-3 focus-visible:outline-offset-[-4px]">
+          <span class="sr-only">Dismiss</span>
+          <svg
+            class="size-5 text-white"
+            viewBox="0 0 20 20"
+            fill="currentColor"
+            aria-hidden="true"
+            data-slot="icon"
+          >
+            <path d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z" />
+          </svg>
+        </button> --%>
+      </div>
+    </div>
+    """
+  end
+end

lib/algora_web/components/header.ex

@@ -19,7 +19,11 @@ defmodule AlgoraWeb.Components.Header do
   def header(assigns) do
     ~H"""
     <header class="absolute inset-x-0 top-0 z-50">
-      <nav class="mx-auto flex max-w-7xl items-center justify-between p-6 lg:px-8" aria-label="Global">
+      <AlgoraWeb.Components.Banner.banner />
+      <nav
+        class="-mt-4 mx-auto flex max-w-7xl items-center justify-between p-6 lg:px-8"
+        aria-label="Global"
+      >
         <div class="flex">
           <.wordmark class="h-8 w-auto text-foreground" />
         </div>

lib/algora_web/components/layouts/user.html.heex

@@ -348,7 +348,7 @@
   <% end %>
 <% end %>
 
-<div :if={!@current_user && !assigns[:screenshot?]} class="relative pt-16">
+<div :if={!@current_user && !assigns[:screenshot?]} class="relative pt-24">
   <.flash_group flash={@flash} />
   <AlgoraWeb.Components.Header.header />
   {@inner_content}

lib/algora_web/live/user/profile_live.ex

@@ -110,7 +110,7 @@ defmodule AlgoraWeb.User.ProfileLive do
                   <%= for %{transaction: transaction, ticket: ticket, project: project} <- @transactions do %>
                     <tr class="border-b transition-colors hover:bg-muted/10">
                       <td class="p-4 align-middle">
-                        <div class="flex items-center gap-4">
+                        <div class="flex items-start gap-4">
                           <.link navigate={User.url(project)}>
                             <span class="relative flex h-14 w-14 shrink-0 overflow-hidden rounded-xl">
                               <img
@@ -161,6 +161,11 @@ defmodule AlgoraWeb.User.ProfileLive do
                                 </div>
                               </div>
                             </.maybe_link>
+                            <div :if={ticket.repository && ticket.repository.tech_stack}>
+                              <%= for tech <- ticket.repository.tech_stack do %>
+                                <.badge>{tech}</.badge>
+                              <% end %>
+                            </div>
                           </div>
                         </div>
                       </td>