From 200c4f43ea93c2c42d82b759debd9946a2d97434 Mon Sep 17 00:00:00 2001 From: erangel1 Date: Thu, 7 May 2026 00:55:46 +0200 Subject: [PATCH] phase 3 bug fixing --- .repos/3/my-project.git/HEAD | 1 + .repos/3/my-project.git/config | 6 + .repos/3/my-project.git/description | 1 + .../hooks/applypatch-msg.sample | 15 ++ .../3/my-project.git/hooks/commit-msg.sample | 74 ++++++++ .../hooks/fsmonitor-watchman.sample | 168 +++++++++++++++++ .../3/my-project.git/hooks/post-update.sample | 8 + .../hooks/pre-applypatch.sample | 14 ++ .../3/my-project.git/hooks/pre-commit.sample | 49 +++++ .../hooks/pre-merge-commit.sample | 13 ++ .repos/3/my-project.git/hooks/pre-push.sample | 53 ++++++ .../3/my-project.git/hooks/pre-rebase.sample | 169 ++++++++++++++++++ .../3/my-project.git/hooks/pre-receive.sample | 24 +++ .../hooks/prepare-commit-msg.sample | 42 +++++ .../hooks/push-to-checkout.sample | 78 ++++++++ .../hooks/sendemail-validate.sample | 77 ++++++++ .repos/3/my-project.git/hooks/update.sample | 128 +++++++++++++ .repos/3/my-project.git/info/exclude | 6 + Makefile | 4 +- frontend/src/App.tsx | 69 +++---- frontend/src/components/layout/Sidebar.tsx | 37 +++- frontend/src/contexts/AuthContext.tsx | 64 +++++++ frontend/src/pages/ExplorePage.tsx | 16 +- frontend/src/pages/LoginPage.tsx | 79 ++++++++ frontend/src/pages/PipelinesPage.tsx | 28 ++- frontend/src/pages/RegisterPage.tsx | 79 ++++++++ frontend/src/pages/ReposPage.tsx | 25 ++- frontend/src/pages/SettingsPage.tsx | 43 ++++- internal/api/router.go | 29 ++- 29 files changed, 1337 insertions(+), 62 deletions(-) create mode 100644 .repos/3/my-project.git/HEAD create mode 100644 .repos/3/my-project.git/config create mode 100644 .repos/3/my-project.git/description create mode 100755 .repos/3/my-project.git/hooks/applypatch-msg.sample create mode 100755 .repos/3/my-project.git/hooks/commit-msg.sample create mode 100755 .repos/3/my-project.git/hooks/fsmonitor-watchman.sample create mode 100755 .repos/3/my-project.git/hooks/post-update.sample create mode 100755 .repos/3/my-project.git/hooks/pre-applypatch.sample create mode 100755 .repos/3/my-project.git/hooks/pre-commit.sample create mode 100755 .repos/3/my-project.git/hooks/pre-merge-commit.sample create mode 100755 .repos/3/my-project.git/hooks/pre-push.sample create mode 100755 .repos/3/my-project.git/hooks/pre-rebase.sample create mode 100755 .repos/3/my-project.git/hooks/pre-receive.sample create mode 100755 .repos/3/my-project.git/hooks/prepare-commit-msg.sample create mode 100755 .repos/3/my-project.git/hooks/push-to-checkout.sample create mode 100755 .repos/3/my-project.git/hooks/sendemail-validate.sample create mode 100755 .repos/3/my-project.git/hooks/update.sample create mode 100644 .repos/3/my-project.git/info/exclude create mode 100644 frontend/src/contexts/AuthContext.tsx create mode 100644 frontend/src/pages/LoginPage.tsx create mode 100644 frontend/src/pages/RegisterPage.tsx diff --git a/.repos/3/my-project.git/HEAD b/.repos/3/my-project.git/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/.repos/3/my-project.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/.repos/3/my-project.git/config b/.repos/3/my-project.git/config new file mode 100644 index 0000000..e6da231 --- /dev/null +++ b/.repos/3/my-project.git/config @@ -0,0 +1,6 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true diff --git a/.repos/3/my-project.git/description b/.repos/3/my-project.git/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/.repos/3/my-project.git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/.repos/3/my-project.git/hooks/applypatch-msg.sample b/.repos/3/my-project.git/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/.repos/3/my-project.git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/.repos/3/my-project.git/hooks/commit-msg.sample b/.repos/3/my-project.git/hooks/commit-msg.sample new file mode 100755 index 0000000..f7458ef --- /dev/null +++ b/.repos/3/my-project.git/hooks/commit-msg.sample @@ -0,0 +1,74 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines and messages that +# would confuse 'git am'. + +ret=0 + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + ret=1 +} + +comment_re="$( + { + git config --get-regexp "^core\.comment(char|string)\$" || + echo '#' + } | sed -n -e ' + ${ + s/^[^ ]* // + s|[][*./\]|\\&|g + s/^auto$/[#;@!$%^&|:]/ + p + }' +)" +scissors_line="^${comment_re} -\{8,\} >8 -\{8,\}\$" +comment_line="^${comment_re}.*" +blank_line='^[ ]*$' +# Disallow lines starting with "diff -" or "Index: " in the body of the +# message. Stop looking if we see a scissors line. +line="$(sed -n -e " + # Skip comments and blank lines at the start of the file. + /${scissors_line}/q + /${comment_line}/d + /${blank_line}/d + # The first paragraph will become the subject header so + # does not need to be checked. + : subject + n + /${scissors_line}/q + /${blank_line}/!b subject + # Check the body of the message for problematic + # prefixes. + : body + n + /${scissors_line}/q + /${comment_line}/b body + /^diff -/{p;q;} + /^Index: /{p;q;} + b body + " "$1")" +if test -n "$line" +then + echo >&2 "Message contains a diff that will confuse 'git am'." + echo >&2 "To fix this indent the diff." + ret=1 +fi + +exit $ret diff --git a/.repos/3/my-project.git/hooks/fsmonitor-watchman.sample b/.repos/3/my-project.git/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..429e0a5 --- /dev/null +++ b/.repos/3/my-project.git/hooks/fsmonitor-watchman.sample @@ -0,0 +1,168 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $o->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/.repos/3/my-project.git/hooks/post-update.sample b/.repos/3/my-project.git/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/.repos/3/my-project.git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/.repos/3/my-project.git/hooks/pre-applypatch.sample b/.repos/3/my-project.git/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/.repos/3/my-project.git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/.repos/3/my-project.git/hooks/pre-commit.sample b/.repos/3/my-project.git/hooks/pre-commit.sample new file mode 100755 index 0000000..29ed5ee --- /dev/null +++ b/.repos/3/my-project.git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff-index --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/.repos/3/my-project.git/hooks/pre-merge-commit.sample b/.repos/3/my-project.git/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..399eab1 --- /dev/null +++ b/.repos/3/my-project.git/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/.repos/3/my-project.git/hooks/pre-push.sample b/.repos/3/my-project.git/hooks/pre-push.sample new file mode 100755 index 0000000..4ce688d --- /dev/null +++ b/.repos/3/my-project.git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/.repos/3/my-project.git/hooks/pre-rebase.sample b/.repos/3/my-project.git/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/.repos/3/my-project.git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/.repos/3/my-project.git/hooks/pre-receive.sample b/.repos/3/my-project.git/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/.repos/3/my-project.git/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/.repos/3/my-project.git/hooks/prepare-commit-msg.sample b/.repos/3/my-project.git/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/.repos/3/my-project.git/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/.repos/3/my-project.git/hooks/push-to-checkout.sample b/.repos/3/my-project.git/hooks/push-to-checkout.sample new file mode 100755 index 0000000..af5a0c0 --- /dev/null +++ b/.repos/3/my-project.git/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/.repos/3/my-project.git/hooks/update.sample b/.repos/3/my-project.git/hooks/update.sample new file mode 100755 index 0000000..c4d426b --- /dev/null +++ b/.repos/3/my-project.git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/.repos/3/my-project.git/info/exclude b/.repos/3/my-project.git/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/.repos/3/my-project.git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/Makefile b/Makefile index fa5210a..a0e7d53 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,10 @@ FRONTEND_DIR := frontend # ─── Development ───────────────────────────────────────────────────────────── dev: - @echo "Starting backend + frontend dev servers..." + @echo "Starting backend (:8080) + Vite (:5173)..." @trap 'kill %1 %2 2>/dev/null; exit' INT; \ go run $(GO_CMD) & \ - cd $(FRONTEND_DIR) && pnpm dev & \ + pnpm -C $(FRONTEND_DIR) dev & \ wait # ─── Production build ───────────────────────────────────────────────────────── diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 1ec087d..67bd95c 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,6 +1,7 @@ import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom' import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { AppShell } from './components/layout/AppShell' +import { AuthProvider } from './contexts/AuthContext' import { RepoListSkeleton } from './ui/Skeleton' import { Suspense, lazy, useEffect } from 'react' import { bootstrapCSRF } from './api/client' @@ -10,33 +11,30 @@ const queryClient = new QueryClient({ defaultOptions: { queries: { staleTime: 30_000, - retry: 1, + retry: false, placeholderData: (prev: unknown) => prev, }, }, }) // Pages — code-split per route -const DashboardPage = lazy(() => import('./pages/DashboardPage')) -const ReposPage = lazy(() => import('./pages/ReposPage')) -const RepoPage = lazy(() => import('./pages/RepoPage')) -const RepoPRsPage = lazy(() => import('./pages/RepoPRsPage')) -const PRDetailPage = lazy(() => import('./pages/PRDetailPage')) -const PRsPage = lazy(() => import('./pages/PRsPage')) -const PipelinesPage = lazy(() => import('./pages/PipelinesPage')) -const ProfilePage = lazy(() => import('./pages/ProfilePage')) -const ExplorePage = lazy(() => import('./pages/ExplorePage')) -const SettingsPage = lazy(() => import('./pages/SettingsPage')) - -function PageLoader() { - return
-} +const LoginPage = lazy(() => import('./pages/LoginPage')) +const RegisterPage = lazy(() => import('./pages/RegisterPage')) +const DashboardPage = lazy(() => import('./pages/DashboardPage')) +const ReposPage = lazy(() => import('./pages/ReposPage')) +const RepoPage = lazy(() => import('./pages/RepoPage')) +const RepoPRsPage = lazy(() => import('./pages/RepoPRsPage')) +const PRDetailPage = lazy(() => import('./pages/PRDetailPage')) +const PRsPage = lazy(() => import('./pages/PRsPage')) +const PipelinesPage = lazy(() => import('./pages/PipelinesPage')) +const ProfilePage = lazy(() => import('./pages/ProfilePage')) +const ExplorePage = lazy(() => import('./pages/ExplorePage')) +const SettingsPage = lazy(() => import('./pages/SettingsPage')) function S({ children }: { children: React.ReactNode }) { - return }>{children} + return }>{children} } -// Primes the CSRF cookie once when the SPA mounts function CSRFBootstrap() { useEffect(() => { bootstrapCSRF() }, []) return null @@ -47,21 +45,28 @@ export default function App() { - - }> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - - + + + {/* Public — no shell */} + } /> + } /> + + {/* App shell wraps all authenticated pages */} + }> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + + + ) diff --git a/frontend/src/components/layout/Sidebar.tsx b/frontend/src/components/layout/Sidebar.tsx index 7b6aaa7..fc1b3eb 100644 --- a/frontend/src/components/layout/Sidebar.tsx +++ b/frontend/src/components/layout/Sidebar.tsx @@ -1,6 +1,7 @@ import { useState } from 'react' -import { NavLink } from 'react-router-dom' +import { NavLink, Link } from 'react-router-dom' import { cn } from '../../lib/utils' +import { useAuth } from '../../contexts/AuthContext' type SidebarState = 'expanded' | 'collapsed' | 'hidden' @@ -64,6 +65,7 @@ interface SidebarProps { export function Sidebar({ className }: SidebarProps) { const [state, setState] = useState('expanded') + const { user, isAuthenticated } = useAuth() const isCollapsed = state === 'collapsed' const width = isCollapsed ? 'w-14' : 'w-80' @@ -133,8 +135,37 @@ export function Sidebar({ className }: SidebarProps) { - {/* Bottom: settings */} -
+ {/* Bottom: user + settings */} +
+ {isAuthenticated ? ( + + cn( + 'flex items-center gap-3 rounded px-2 min-h-[44px] transition-colors', + isActive ? 'bg-white/20 text-white' : 'text-white/70 hover:bg-white/10 hover:text-white', + ) + } + title={isCollapsed ? user?.username : undefined} + > +
+ {user?.username?.[0]?.toUpperCase()} +
+ {!isCollapsed && {user?.username}} + + ) : ( + + + {!isCollapsed && Sign in} + + )} + diff --git a/frontend/src/contexts/AuthContext.tsx b/frontend/src/contexts/AuthContext.tsx new file mode 100644 index 0000000..5c0d234 --- /dev/null +++ b/frontend/src/contexts/AuthContext.tsx @@ -0,0 +1,64 @@ +import { createContext, useContext } from 'react' +import { useQuery, useQueryClient } from '@tanstack/react-query' +import { api } from '../api/client' +import { z } from 'zod' +import type { User } from '../types/api' + +const userSchema = z.object({ + id: z.number(), + username: z.string(), + email: z.string(), + avatarUrl: z.string(), + isAdmin: z.boolean(), + createdAt: z.string(), + updatedAt: z.string(), +}) + +interface AuthContextValue { + user: User | null + isLoading: boolean + isAuthenticated: boolean + logout: () => Promise +} + +const AuthContext = createContext({ + user: null, + isLoading: true, + isAuthenticated: false, + logout: async () => {}, +}) + +export function AuthProvider({ children }: { children: React.ReactNode }) { + const queryClient = useQueryClient() + + const { data: user, isLoading } = useQuery({ + queryKey: ['me'], + queryFn: () => api.get('/api/v1/me', userSchema), + retry: false, + // Don't treat 401 as a fatal error — it just means not logged in + throwOnError: false, + }) + + const logout = async () => { + try { + await fetch('/api/v1/auth/logout', { + method: 'POST', + credentials: 'include', + headers: { 'X-CSRF-Token': document.cookie.match(/fb_csrf=([^;]+)/)?.[1] ?? '' }, + }) + } finally { + queryClient.clear() + window.location.href = '/login' + } + } + + return ( + + {children} + + ) +} + +export function useAuth() { + return useContext(AuthContext) +} diff --git a/frontend/src/pages/ExplorePage.tsx b/frontend/src/pages/ExplorePage.tsx index af8a7f1..7e77849 100644 --- a/frontend/src/pages/ExplorePage.tsx +++ b/frontend/src/pages/ExplorePage.tsx @@ -1,8 +1,18 @@ export default function ExplorePage() { return ( -
-

Explore

-

Coming soon — Phase 2 implementation.

+
+

Explore

+
+ + + +
+

Explore public repositories

+

+ Federated discovery across ForgeBucket instances — coming soon. +

+
+
) } diff --git a/frontend/src/pages/LoginPage.tsx b/frontend/src/pages/LoginPage.tsx new file mode 100644 index 0000000..f7799f9 --- /dev/null +++ b/frontend/src/pages/LoginPage.tsx @@ -0,0 +1,79 @@ +import { useState } from 'react' +import { Link, useNavigate } from 'react-router-dom' +import { bootstrapCSRF, api, ApiError } from '../api/client' +import { z } from 'zod' +import { useQueryClient } from '@tanstack/react-query' + +const userSchema = z.object({ + id: z.number(), username: z.string(), email: z.string(), + avatarUrl: z.string(), isAdmin: z.boolean(), createdAt: z.string(), updatedAt: z.string(), +}) + +export default function LoginPage() { + const navigate = useNavigate() + const queryClient = useQueryClient() + const [username, setUsername] = useState('') + const [password, setPassword] = useState('') + const [error, setError] = useState('') + const [loading, setLoading] = useState(false) + + const handleSubmit = async (e: React.FormEvent) => { + e.preventDefault() + setError('') + setLoading(true) + try { + await bootstrapCSRF() + await api.post('/api/v1/auth/login', userSchema, { username, password }) + queryClient.invalidateQueries({ queryKey: ['me'] }) + navigate('/') + } catch (err) { + setError(err instanceof ApiError && err.status === 401 ? 'Invalid username or password.' : 'Login failed. Please try again.') + } finally { + setLoading(false) + } + } + + return ( +
+
+
+

ForgeBucket

+

Sign in to your account

+
+ +
+
+
+ + setUsername(e.target.value)} + required autoFocus autoComplete="username" + className="w-full border border-[#DFE1E6] rounded px-3 py-2 text-sm focus:outline-none focus:border-[#4C9AFF] focus:ring-1 focus:ring-[#4C9AFF]" + /> +
+
+ + setPassword(e.target.value)} + required autoComplete="current-password" + className="w-full border border-[#DFE1E6] rounded px-3 py-2 text-sm focus:outline-none focus:border-[#4C9AFF] focus:ring-1 focus:ring-[#4C9AFF]" + /> +
+ {error &&

{error}

} + +
+
+ +

+ No account?{' '} + Create one +

+
+
+ ) +} diff --git a/frontend/src/pages/PipelinesPage.tsx b/frontend/src/pages/PipelinesPage.tsx index ebef270..c5d5652 100644 --- a/frontend/src/pages/PipelinesPage.tsx +++ b/frontend/src/pages/PipelinesPage.tsx @@ -1,23 +1,19 @@ -import { PipelineWaterfall } from '../components/ci/PipelineWaterfall' -import type { Pipeline } from '../types/api' - -const DEMO_PIPELINE: Pipeline = { - id: 1, - repoId: 1, - ref: 'main', - status: 'running', - createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString(), -} - export default function PipelinesPage() { return (

Pipelines

-

CI/CD pipeline integration — preview below.

- - - +
+ + + +
+

No pipelines yet

+

+ Pipelines run automatically when you push to a repository.
+ Add a .forgebucket.yml file to get started. +

+
+
) } diff --git a/frontend/src/pages/RegisterPage.tsx b/frontend/src/pages/RegisterPage.tsx new file mode 100644 index 0000000..c269d49 --- /dev/null +++ b/frontend/src/pages/RegisterPage.tsx @@ -0,0 +1,79 @@ +import { useState } from 'react' +import { Link, useNavigate } from 'react-router-dom' +import { bootstrapCSRF, api, ApiError } from '../api/client' +import { z } from 'zod' +import { useQueryClient } from '@tanstack/react-query' + +const userSchema = z.object({ + id: z.number(), username: z.string(), email: z.string(), + avatarUrl: z.string(), isAdmin: z.boolean(), createdAt: z.string(), updatedAt: z.string(), +}) + +export default function RegisterPage() { + const navigate = useNavigate() + const queryClient = useQueryClient() + const [username, setUsername] = useState('') + const [email, setEmail] = useState('') + const [password, setPassword] = useState('') + const [error, setError] = useState('') + const [loading, setLoading] = useState(false) + + const handleSubmit = async (e: React.FormEvent) => { + e.preventDefault() + setError('') + setLoading(true) + try { + await bootstrapCSRF() + await api.post('/api/v1/auth/register', userSchema, { username, email, password }) + // Auto-login after register + await api.post('/api/v1/auth/login', userSchema, { username, password }) + queryClient.invalidateQueries({ queryKey: ['me'] }) + navigate('/') + } catch (err) { + setError(err instanceof ApiError && err.status === 409 ? 'Username or email already taken.' : 'Registration failed. Please try again.') + } finally { + setLoading(false) + } + } + + return ( +
+
+
+

ForgeBucket

+

Create your account

+
+ +
+
+
+ + setUsername(e.target.value)} required autoFocus + className="w-full border border-[#DFE1E6] rounded px-3 py-2 text-sm focus:outline-none focus:border-[#4C9AFF] focus:ring-1 focus:ring-[#4C9AFF]" /> +
+
+ + setEmail(e.target.value)} required + className="w-full border border-[#DFE1E6] rounded px-3 py-2 text-sm focus:outline-none focus:border-[#4C9AFF] focus:ring-1 focus:ring-[#4C9AFF]" /> +
+
+ + setPassword(e.target.value)} required + className="w-full border border-[#DFE1E6] rounded px-3 py-2 text-sm focus:outline-none focus:border-[#4C9AFF] focus:ring-1 focus:ring-[#4C9AFF]" /> +
+ {error &&

{error}

} + +
+
+ +

+ Already have an account?{' '} + Sign in +

+
+
+ ) +} diff --git a/frontend/src/pages/ReposPage.tsx b/frontend/src/pages/ReposPage.tsx index 71f892e..619a8a6 100644 --- a/frontend/src/pages/ReposPage.tsx +++ b/frontend/src/pages/ReposPage.tsx @@ -2,6 +2,7 @@ import { useState } from 'react' import { useRepos, useCreateRepo } from '../api/queries/repos' import { RepoCard } from '../components/repos/RepoCard' import { RepoListSkeleton } from '../ui/Skeleton' +import { Link } from 'react-router-dom' export default function ReposPage() { const { data: repos, isLoading, isError } = useRepos() @@ -32,9 +33,12 @@ export default function ReposPage() { {isLoading ? ( ) : isError ? ( -

Failed to load repositories.

+ ) : !repos?.length ? ( -

No repositories yet.

+
+ No repositories yet.{' '} + +
) : (
{repos.map(r => )} @@ -44,6 +48,23 @@ export default function ReposPage() { ) } +function NotSignedIn() { + return ( +
+ + + +
+

Sign in to see your repositories

+

You need to be signed in to view and create repositories.

+
+ + Sign in + +
+ ) +} + function CreateRepoForm({ onClose }: { onClose: () => void }) { const createRepo = useCreateRepo() const [name, setName] = useState('') diff --git a/frontend/src/pages/SettingsPage.tsx b/frontend/src/pages/SettingsPage.tsx index 037806f..d059d87 100644 --- a/frontend/src/pages/SettingsPage.tsx +++ b/frontend/src/pages/SettingsPage.tsx @@ -1,8 +1,45 @@ +import { useAuth } from '../contexts/AuthContext' + export default function SettingsPage() { + const { user, logout } = useAuth() + return ( -
-

Settings

-

Coming soon — Phase 2 implementation.

+
+

Settings

+ +
+
+

Account

+
+
+
+

Username

+

{user?.username}

+
+
+

Email

+

{user?.email}

+
+
+

Role

+

{user?.isAdmin ? 'Administrator' : 'Member'}

+
+
+
+ +
+
+

Danger zone

+
+
+ +
+
) } diff --git a/internal/api/router.go b/internal/api/router.go index 8103b3f..3c06032 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -4,6 +4,8 @@ import ( "encoding/json" "io/fs" "net/http" + "net/http/httputil" + "net/url" "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" @@ -95,11 +97,36 @@ func New(cfg *config.Config, engine *xorm.Engine, store sessions.Store, staticFi }) r.With(auth.Optional).Get("/ws", wsH.Hub) - r.Handle("/*", spaHandler(staticFiles)) + + // In debug mode proxy non-API routes to the Vite dev server so :8080 works too. + // In production the built React app is embedded and served from staticFiles. + if cfg.Debug { + r.Handle("/*", viteProxy("http://localhost:5173")) + } else { + r.Handle("/*", spaHandler(staticFiles)) + } return r } +func viteProxy(target string) http.Handler { + proxy := &httputil.ReverseProxy{ + Rewrite: func(r *httputil.ProxyRequest) { + r.SetURL(mustParseURL(target)) + r.Out.Host = r.In.Host + }, + } + return proxy +} + +func mustParseURL(raw string) *url.URL { + u, err := url.Parse(raw) + if err != nil { + panic(err) + } + return u +} + func spaHandler(staticFiles fs.FS) http.Handler { fileServer := http.FileServer(http.FS(staticFiles)) return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {