Skip to content

Commit

Permalink
Merge pull request hackclub#731 from hackclub/730-hackatime-not-hakatime
Browse files Browse the repository at this point in the history
Rename all instances of Hakatime to Hackatime
  • Loading branch information
cytronicoder authored Nov 12, 2024
2 parents 44904ba + 086dddf commit 539b48a
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions public/scripts/hackatime-install.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Write-Host "Starting Hakatime setup..."
Write-Host "Starting Hackatime setup..."

# Check if BEARER_TOKEN is set
if (-not $env:BEARER_TOKEN) {
Expand Down Expand Up @@ -81,5 +81,5 @@ for ($i = 1; $i -le 2; $i++) {
}

Write-Host ""
Write-Host "$([char]8730) Hakatime setup completed successfully!"
Write-Host "$([char]8730) Hackatime setup completed successfully!"
Write-Host "You can now return to the setup page for further instructions."
4 changes: 2 additions & 2 deletions public/scripts/hackatime-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ EOF
}

main() {
log "Starting Hakatime setup..."
log "Starting Hackatime setup..."

check_command "curl"

Expand All @@ -140,7 +140,7 @@ main() {
install_wakatime_extension
send_heartbeat

echo "Hakatime setup completed successfully!"
echo "Hackatime setup completed successfully!"
echo "You can now return to the setup page for further instructions."
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/harbor/shipyard/ship-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export async function stagedToShipped(ship: Ship, ships: Ship[]) {
}
if (!ship.wakatimeProjectNames) {
throw new Error(
"You can't ship a Ship that has no Hakatime projects associated with it!"
"You can't ship a Ship that has no Hackatime projects associated with it!"
);
}

Expand Down
6 changes: 3 additions & 3 deletions src/app/harbor/signpost/signpost.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default function Signpost() {
.map((s) => Number(s))
: null;

// Show or hide instructions for installing hakatime
// Show or hide instructions for installing Hackatime
const [showInstructions, setShowInstructions] = useState(!hasHb);

return (
Expand Down Expand Up @@ -95,7 +95,7 @@ export default function Signpost() {
: "Project time loading..."}
</>) : (
<>
You have <b>NOT</b> set up Hakatime. Your hours are <b>not</b>{" "}
You have <b>NOT</b> set up Hackatime. Your hours are <b>not</b>{" "}
being tracked!
</>
)}
Expand All @@ -109,7 +109,7 @@ export default function Signpost() {
{wakaKey ? (
<Platforms wakaKey={wakaKey} hasHb={hasHb} showInstructions={showInstructions} setShowInstructions={setShowInstructions} />
) : (
<p>Loading Hakatime token...</p>
<p>Loading Hackatime token...</p>
)}
</JaggedCard>

Expand Down
2 changes: 1 addition & 1 deletion src/app/harbor/signpost/verification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const getVerificationMessage = (status: string, reason: string | undefined) => {
return {
color: "yellow",
message:
"Hang tight, we're still reviewing your verification documents! Don't worry, it usually takes less than day. In the meantime, get hacking! Your hours still count as long as you've installed Hakatime.",
"Hang tight, we're still reviewing your verification documents! Don't worry, it usually takes less than day. In the meantime, get hacking! Your hours still count as long as you've installed Hackatime.",
};
case "Insufficient":
return {
Expand Down
4 changes: 2 additions & 2 deletions src/app/harbor/signpost/wakatime-setup-instructions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function WakatimeSetupInstructions({
style={{ "-webkit-user-select": "none", userSelect: "none" }}
>
<p className="m-0 opacity-80">Step 1</p>
<p className="m-0 text-xl">{"Let's set up Hakatime!"}</p>
<p className="m-0 text-xl">{"Let's set up Hackatime!"}</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -147,7 +147,7 @@ export default function WakatimeSetupInstructions({
<code>{session ? session?.slackId : "???"}</code>), and your
email is <code>{email ? email : "???"}</code>. {"You'll"} need
to request a password reset link (unless {"you've"} already
signed up for Hakatime!)
signed up for Hackatime!)
</p>
</Card>
</motion.div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/harbor/tabs/tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export default function Harbor({
{!hasHb ? (
<JaggedCard className="!p-4">
<p className="text-center text-white">
No Hakatime install detected. Have you run the script?{" "}
No Hackatime install detected. Have you run the script?{" "}
<a className="underline" href="/signpost">
See the instructions at the Signpost.
</a>
Expand Down
6 changes: 3 additions & 3 deletions src/app/harbor/tabs/tour.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ function setupSteps(tourManager: Tour) {
},
{
id: "ts-draft-field-project",
text: `next ye link yer ship to <strong style='color: #ec3750;'>Hakatime</strong>, the Hack Club time-tracking tool. if ye haven't installed it yet… we'll get to that later.
text: `next ye link yer ship to <strong style='color: #ec3750;'>Hackatime</strong>, the Hack Club time-tracking tool. if ye haven't installed it yet… we'll get to that later.
<br /><br />
select <strong style='color: #ec3750;'>hack-club-site</strong> from the dropdown. when ye start coding for real, yer Hakatime hours will magically appear here!!`,
select <strong style='color: #ec3750;'>hack-club-site</strong> from the dropdown. when ye start coding for real, yer Hackatime hours will magically appear here!!`,
attachTo: {
element: "#project-field",
on: "top",
Expand Down Expand Up @@ -576,7 +576,7 @@ function setupSteps(tourManager: Tour) {
<p>
and so concludes Pirate Academy. yer stickers will ship as soon as ye get verified (unless ye be previously verified with Hack Club). ye won't be able to ship projects until then, but the time to start building is now!!
<br/><br/>
<strong style="color:#ec3750;">ye just need to install Hakatime for yer hours to count…</strong> if ye haven't done that already, the instructions lie here on this page.
<strong style="color:#ec3750;">ye just need to install Hackatime for yer hours to count…</strong> if ye haven't done that already, the instructions lie here on this page.
<br/><br/>
good luck to ye 🫡
</p>
Expand Down
6 changes: 3 additions & 3 deletions src/app/utils/wakatime-setup/platforms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ api_key = ${wakaKey}`}
<SinglePlatform os={userOs} wakaKey={wakaKey} />
<h2 className="mt-6 text-xl">What exactly does the script do?</h2>
<p className="mt-2">
This script installs and configures Hakatime, our custom fork of a
This script installs and configures Hackatime, our custom fork of a
popular open-source coding time-tracker called Wakatime.
First it tries to install the Wakatime extension for VS Code,
and then it installs a configuration file that tells the extension
to send your coding hours to the Hakatime server.
to send your coding hours to the Hackatime server.
<br></br>
<br></br>
If you don't use VS Code, run the script anyway and manually install the
Expand Down Expand Up @@ -114,7 +114,7 @@ api_key = ${wakaKey}`}
className="underline cursor-pointer"
onClick={() => setShowInstructions(true)}
>
{"> Show Hakatime install instructions"}
{"> Show Hackatime install instructions"}
</span>
</p>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/app/utils/wakatime-setup/tutorial-utils.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const SinglePlatform = ({
<p className="inline-flex items-end gap-2 text-xl">
<Icon glyph="terminal" size={26} />
<span>
How to install Hakatime on {platform.label}:
How to install Hackatime on {platform.label}:
</span>
</p>
<ol className="mt-2 list-inside list-decimal">
Expand Down
2 changes: 1 addition & 1 deletion src/components/steps.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Pill from "./ui/pill";

const steps = [
{ name: "Hakatime", done: true },
{ name: "Hackatime", done: true },
{ name: "Ship", done: true },
{ name: "Vote", done: false },
{ name: "Prizes", done: false },
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/waka-lock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const WakaLock = ({ wakaOverride, wakaToken, tabName }) => {
<div className="text-white flex flex-col items-center mx-auto w-full max-w-2xl max-h-[80vh] overflow-y-auto text-left p-4">
<Icon glyph="private-outline" width={64} height={64} />

<p>Waiting for Hakatime install...</p>
<p>Waiting for Hackatime install...</p>

{showAllPlatforms ? (
<>
Expand Down

0 comments on commit 539b48a

Please sign in to comment.