wip: add website cmd

Author: davemooreuws

cmd/add.go

@@ -0,0 +1,93 @@
+// Copyright Nitric Pty Ltd.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at:
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+	"fmt"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/nitrictech/cli/pkg/view/tui"
+	add_website "github.com/nitrictech/cli/pkg/view/tui/commands/website"
+	"github.com/nitrictech/cli/pkg/view/tui/teax"
+	"github.com/spf13/afero"
+	"github.com/spf13/cobra"
+)
+
+// addCmd acts as a parent command for adding different types of resources
+// e.g., websites or other components in the future.
+var addCmd = &cobra.Command{
+	Use:   "add",
+	Short: "Add new resources to your Nitric project",
+	Long: `Add new components such as websites to an existing Nitric project.
+Run 'nitric add website' to add a new website.`,
+	Example: `# Add a new website interactively
+nitric add website`,
+}
+
+var forceAddWebsite bool
+
+var addWebsiteCmd = &cobra.Command{
+	Use:   "website [websiteName] [frameworkName]",
+	Short: "Add a new website to your Nitric project",
+	Long:  `Add a new website to your Nitric project, with optional framework selection.`,
+	Example: `# Interactive website addition
+nitric add website
+
+# Non-interactive
+nitric add website my-site astro`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		fs := afero.NewOsFs()
+
+		websiteName := ""
+		if len(args) >= 1 {
+			websiteName = args[0]
+		}
+
+		frameworkName := ""
+		if len(args) >= 2 {
+			frameworkName = args[1]
+		}
+
+		if !tui.IsTerminal() && (websiteName == "" || frameworkName == "") {
+			return fmt.Errorf(`non-interactive environment detected, please provide all mandatory arguments e.g. nitric add website my-site nextjs`)
+		}
+
+		websiteModel, err := add_website.New(fs, add_website.Args{
+			WebsiteName:   websiteName,
+			FrameworkName: frameworkName,
+			Force:         forceAddWebsite,
+		})
+		tui.CheckErr(err)
+
+		if _, err := teax.NewProgram(websiteModel, tea.WithANSICompressor()).Run(); err != nil {
+			return err
+		}
+
+		return nil
+	},
+	Args: cobra.MaximumNArgs(2),
+}
+
+// init registers the 'add' command with the root command
+func init() {
+	rootCmd.AddCommand(addCmd)
+
+	// Add subcommands under 'add'
+	addCmd.AddCommand(addWebsiteCmd)
+
+	addWebsiteCmd.Flags().BoolVarP(&forceAddWebsite, "force", "f", false, "force website creation, even if conflicts exist.")
+}

pkg/project/config.go

@@ -95,15 +95,18 @@ type Dev struct {
 }
 
 type WebsiteConfiguration struct {
-	BaseServiceConfiguration `yaml:",inline"`
-
+	Basedir   string `yaml:"basedir"`
 	Build     Build  `yaml:"build"`
 	Dev       Dev    `yaml:"dev"`
-	Path      string `yaml:"path"`
+	Path      string `yaml:"path,omitempty"`
 	IndexPage string `yaml:"index,omitempty"`
 	ErrorPage string `yaml:"error,omitempty"`
 }
 
+func (w WebsiteConfiguration) GetBasedir() string {
+	return w.Basedir
+}
+
 type ProjectConfiguration struct {
 	Name      string                          `yaml:"name"`
 	Directory string                          `yaml:"-"`

pkg/view/tui/commands/website/frameworks.go

@@ -0,0 +1,136 @@
+// Copyright Nitric Pty Ltd.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at:
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package add_website
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Framework struct {
+	Name         string
+	Value        string
+	Description  string
+	BuildCommand string
+	DevCommand   string
+	DevURL       string
+	OutputDir    string
+
+	createCommand    string
+	npmCreateCommand string
+
+	// link to install the dependency if it doesn't exist
+	InstallLink string
+}
+
+func (f Framework) GetItemValue() string {
+	return f.Name
+}
+
+func (f Framework) GetItemDescription() string {
+	return ""
+}
+
+// get dev command with package manager
+func (f Framework) GetDevCommand(packageManager string, path string) string {
+	return getCommand(f.DevCommand, packageManager, path)
+}
+
+// get build command with package manager
+func (f Framework) GetBuildCommand(packageManager string, path string) string {
+	return getCommand(f.BuildCommand, packageManager, path)
+}
+
+func getCommand(command string, packageManager string, path string) string {
+	// if command has no string interpolation, return it as is
+	if !strings.Contains(command, "%s") {
+		return command
+	}
+
+	baseUrl := ""
+	if path != "" {
+		baseUrl = fmt.Sprintf(" --base-url %s", path)
+	}
+
+	if packageManager == "npm" {
+		return fmt.Sprintf("npm run %s%s", command, baseUrl)
+	}
+
+	return fmt.Sprintf("%s %s%s", packageManager, command, baseUrl)
+}
+
+// get create command with package manager
+func (f Framework) GetCreateCommand(packageManager string, path string) string {
+	if packageManager == "npm" {
+		return fmt.Sprintf(f.npmCreateCommand, path)
+	}
+
+	return fmt.Sprintf(f.createCommand, packageManager, path)
+}
+
+var frameworks = []Framework{
+	{
+		Name:             "Astro",
+		Value:            "astro",
+		BuildCommand:     "build",
+		DevCommand:       "dev --port 3000",
+		DevURL:           "http://localhost:3000",
+		createCommand:    "%s creates astro %s --template minimal --no",
+		npmCreateCommand: "npm create astro@latest %s -- --template minimal --no",
+		OutputDir:        "dist",
+	},
+	{
+		Name:             "React (Vite)",
+		Value:            "react",
+		BuildCommand:     "build",
+		DevCommand:       "dev --port 3000",
+		DevURL:           "http://localhost:3000",
+		OutputDir:        "dist",
+		createCommand:    "%s create vite %s --template react-ts",
+		npmCreateCommand: "npm create vite@latest %s -- --template react-ts",
+	},
+	{
+		Name:             "Vue (Vite)",
+		Value:            "vue",
+		BuildCommand:     "build",
+		DevCommand:       "dev --port 3000",
+		DevURL:           "http://localhost:3000",
+		OutputDir:        "dist",
+		createCommand:    "%s create vite %s --template vue-ts",
+		npmCreateCommand: "npm create vite@latest %s -- --template vue-ts",
+	},
+	{
+		Name:             "Svelte (Vite)",
+		Value:            "svelte",
+		BuildCommand:     "build",
+		DevCommand:       "dev --port 3000",
+		DevURL:           "http://localhost:3000",
+		OutputDir:        "dist",
+		createCommand:    "%s create vite %s --template svelte-ts",
+		npmCreateCommand: "npm create vite@latest %s -- --template svelte-ts",
+	},
+	{
+		Name:          "Hugo",
+		Value:         "hugo",
+		BuildCommand:  "hugo",
+		DevCommand:    "hugo server --port 3000",
+		DevURL:        "http://localhost:3000",
+		OutputDir:     "public",
+		createCommand: "%s new site %s",
+		InstallLink:   "https://gohugo.io/installation/",
+	},
+}