web copy, dev, ci

.github/workflows/publish-web.yml

@@ -19,15 +19,10 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./web
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      # - uses: actions/configure-pages@v1
-      #   id: pages
 
       - name: Install Node.js
         uses: actions/setup-node@v3
@@ -43,9 +38,10 @@ jobs:
         env:
           BASE_PATH: ''
         run: |
-          npm run build
+          npm --prefix web run build
-          touch build/.nojekyll
+          touch web/build/.nojekyll
-          echo "shokku.dev" > build/CNAME
+          cp bootstrap.sh web/build
+          echo "shokku.dev" > web/build/CNAME
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:

Justfile

@@ -5,7 +5,8 @@ web_npm := 'npm --prefix web'
 shokku_image := 'texm/shokku:latest'
 dokku_image := 'dokku/dokku:0.30.2'
 dokku_container_name := 'shokku-dokku-dev'
-dokku_data_mount_dir := '/tmp/var/lib/dokku'
+# for linux can this just be /var/lib/dokku ?
+dokku_data_mount_dir := '/tmp/colima/var/lib/dokku'
 dokku_ssh_host := '127.0.0.1'
 dokku_ssh_port := '3022'
 db_path := 'test.db'
@@ -143,8 +144,7 @@ _setup-dokku:
 	for plugin in redis postgres mongo mysql letsencrypt; do \
 		echo "installing $plugin"; \
 		docker exec {{dokku_container_name}} bash -c \
-			"dokku plugin:install https://github.com/dokku/dokku-$plugin.git" \
+			"dokku plugin:install https://github.com/dokku/dokku-$plugin.git" > /dev/null; \
-			> /dev/null; \
 	done
 
 	# to fix plugins: https://github.com/dokku/dokku/issues/5004

web/src/routes/Features.svelte

@@ -1,18 +1,17 @@
 <script>
 	const features = [
-	  {title: "Free and Open Source", ref: "", description: "description"},
+	  {title: "100% Free and Open Source", description: "free as in beer"},
-	  {title: "Github Integration", ref: "", description: "description"},
+	  {title: "Github Integration", description: "secure authentication for single users or organisations"},
-	  {title: "Easy Setup", ref: "", description: "description"},
+	  {title: "Easy Setup", description: "ready to go in minutes"},
-	  {title: "Services Support", ref: "", description: "description"},
 	]
 </script>
 
 <div class="flex flex-col gap-4">
 	{#each features as feature}
-		<div class="card bg-base-100 shadow-xl">
+		<div class="card bg-base-100 shadow-xl max-w-md">
 			<div class="card-body">
 				<h2 class="card-title">{feature.title}</h2>
-				<!--p>{feature.description}</p-->
+				<p>{feature.description}</p>
 				<!--div class="card-actions justify-end">
 					<button class="btn btn-ghost">Learn More</button>
 				</div-->

web/src/routes/Hero.svelte

@@ -8,9 +8,9 @@
 <div class="hero h-full">
 	<div class="hero-content text-center flex-col py-10 px-0">
 		<div class="max-w-md mb-4">
-			<h1 class="text-5xl font-bold mb-2">A friendly interface for Dokku</h1>
+			<h1 class="text-5xl font-bold mb-4">A friendly interface for Dokku</h1>
 			<p class="text-xl px-4">
-				an open-source self-hostable web UI to help
+				an open-source web UI to help
 				<strong>configure</strong> and <strong>deploy</strong>
 				your apps and services with <a class="link" href="https://dokku.com/">Dokku</a>
 			</p>

web/src/routes/docs/+layout.svelte

@@ -10,7 +10,7 @@
 		{ref: "/docs/setup", label: "Setup"},
 		{section: "Usage", ref: "/docs/apps", label: "Apps"},
 		{ref: "/docs/services", label: "Services"},
-	  {ref: "/docs/settings", label: "Settings"},
+	  // {ref: "/docs/settings", label: "Settings"},
 		{section: "Maintenance", ref: "/docs/upgrading", label: "Upgrading"},
 		{ref: "/docs/uninstall", label: "Uninstall"},
 	  {ref: "/docs/support", label: "Support"},

web/src/routes/docs/installation/+page.svelte

@@ -47,7 +47,7 @@
 <h4>DigitalOcean</h4>
 <p>
 	For a cheap hosted server to try Shokku out, consider using DigitalOcean via this referral
-	link. You get $200 in credit for 60 days, and I get a $25 kick back :)
+	link. I get a kickback, and you get $200 in credit for 60 days - why not provision something beefy :)
 </p>
 <a target="_blank" href="https://www.digitalocean.com/?refcode=2fb615299eca&utm_campaign=Referral_Invite&utm_medium=Referral_Program&utm_source=badge">
 	<img src="https://web-platforms.sfo2.digitaloceanspaces.com/WWW/Badge%202.svg" alt="DigitalOcean Referral Badge" />

web/src/routes/docs/intro/+page.svelte

@@ -1,17 +1,16 @@
 <p>
-	Shokku is an interface for <a href="https://dokku.com" class="link">Dokku</a> - a
+	Shokku is an interface for <a href="https://dokku.com" class="link">Dokku</a> - an
-	self-hostable PaaS/alternative to Heroku.
+	open source, self-hostable <a href="https://en.wikipedia.org/wiki/Platform_as_a_service">PaaS</a>
+	(commercial options include <a href="heroku.com">Heroku</a>, <a href="fly.io">fly.io</a>,
+	or <a href="render.com">Render</a>)
 	<br />
-	It is recommended you are somewhat familiar with the underlying Dokku project
+	It is recommended you are familiar with the underlying Dokku project
 	(<a href="https://dokku.com/docs" class="link">read the docs</a>).
 </p>
 
 <p>
-	It is not associated with Dokku.
+	Shokku is not associated with Dokku - but it is similarly open-source and
-</p>
+	freely available on Github at
-
-<p>
-	It is open-source and freely available, the repository is hosted on Github at
 	<a class="link" href="https://github.com/texm/shokku">texm/shokku</a>.
 </p>
 
@@ -24,15 +23,15 @@
 </p>
 
 <ul>
-	<li>Works with your existing Dokku installation, or configures one during setup</li>
+	<li>Deploys as an app via an existing Dokku installation</li>
 	<li>Build, deploy, and manage almost any kind of application easily</li>
 	<li>Easy creation of <code>Redis, PostgreSQL, MySQL, and MongoDB</code> services</li>
-	<li>Reverse proxy and automatic SSL via LetsEncrypt</li>
 	<li>Github Integration</li>
 	<ul>
 		<li>Single-user or organisation installation</li>
 		<li>User management / Authentication</li>
-		<li>Repo-aware smart suggestions</li>
+		<li>todo: Repo-aware smart suggestions</li>
 	</ul>
 	<li>Optional API Access</li>
+	<li>... and more, try it out!</li>
 </ul>

web/src/routes/docs/setup/+page.svelte

@@ -1,17 +1,19 @@
 <script>
 	const ghAppUrl = "https://docs.github.com/en/apps/creating-github-apps/creating-github-apps/about-apps"
 	const manifestUrl = "https://docs.github.com/en/apps/creating-github-apps/creating-github-apps/creating-a-github-app-from-a-manifest";
-	// TODO
+	const codeManifestUrl = "https://github.com/texm/shokku/blob/main/ui/src/routes/setup/github/%2Bpage.svelte#L10-L28"
-	const codeManifestUrl = "https://github.com/texm/shokku"
 </script>
 
-<h2>Get Setup Key</h2>
+<h2>Setup Key</h2>
 <p>
 	Once installation is finished, a <i>setup key</i> will be output to
 	the console. Copy this, you will need it for the initial web setup.
+	<br />
+	This setup key is used to prevent any random internet stranger setting
+	up your deployment before you do.
 </p>
 
-<h2>Choose Setup Method</h2>
+<h2>Choose a Setup Method</h2>
 <h3>Github</h3>
 <p>
 	Setting up with Github creates a <a href={ghAppUrl}>Github App</a> to