still changing

still making changes to public codebase

Signed-off-by: tobigiwa <[email protected]>

Author: tobyweb3x

Diff for: .gitignore

@@ -1,2 +1,3 @@
 bin/
-vendor/
+vendor/
+.env

Diff for: BlockRideLogo.png

@@ -11,14 +11,14 @@ COPY go.mod go.sum ./
 
 COPY . .
 
-RUN CGO_ENABLED=0 GOOS=linux go build -mod vendor -o /app/blockride cmd/blockride/main.go
+RUN CGO_ENABLED=0 GOOS=linux go build -mod vendor -o /app/companyXYZ cmd/companyXYZ/main.go
 
 FROM alpine 
 
 WORKDIR /
 
-COPY --from=builder /app/blockride /blockride
+COPY --from=builder /app/companyXYZ /companyXYZ
 
-RUN chmod +x blockride
+RUN chmod +x companyXYZ
 
-ENTRYPOINT [ "/blockride" ]
+ENTRYPOINT [ "/companyXYZ" ]

Diff for: Dockerfile

@@ -1,4 +1,4 @@
-![Logo](/templ/BlockRideLogo.png)
+![Logo](/templ/companyXYZLogo.png)
 
 # Waitlist Backend
 

Diff for: README.MD

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"Blockride-waitlistAPI/env"
-	blockride "Blockride-waitlistAPI/http"
-	"Blockride-waitlistAPI/internal/store"
+	"companyXYZ-waitlistAPI/env"
+	companyXYZ "companyXYZ-waitlistAPI/http"
+	"companyXYZ-waitlistAPI/internal/store"
 	"context"
 	"errors"
 	"log"
@@ -16,20 +16,20 @@ import (
 
 	"strings"
 
-	"Blockride-waitlistAPI/docs"
+	"companyXYZ-waitlistAPI/docs"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
-//	@title						BlockRide waitlist-backend
-//	@description				BlockRide waitlist-backend API endpoints.
+//	@title						companyXYZ waitlist-backend
+//	@description				companyXYZ waitlist-backend API endpoints.
 //	@x-logo						{"url": "https://example.com/img.png", "backgroundColor": "#000000", "altText": "example logo", "href": "https://example.com/img.png"}
 //
-// contact.name   BlockRide
+// contact.name   companyXYZ
 //
-//	@contact.url				https://www.blockride.xyz/
+//	@contact.url				https://www.companyXYZ.xyz/
 //
 // contact.email  [email protected]
 //
@@ -62,7 +62,7 @@ func main() {
 	)
 
 	uri = "mongodb://localhost:27017/"
-	if env.GetEnvVar().Server.Env == blockride.Production {
+	if env.GetEnvVar().Server.Env == companyXYZ.Production {
 		uri = env.BuildURI(
 			env.GetEnvVar().Databases.Mongo.Username,
 			env.GetEnvVar().Databases.Mongo.Password,
@@ -87,7 +87,7 @@ func main() {
 	log.Println("MongoDB collection indexed by `email` field successfully")
 
 	// setup Application Server
-	app := blockride.NewApplication(mongoDbCollection, logger)
+	app := companyXYZ.NewApplication(mongoDbCollection, logger)
 
 	srv := &http.Server{
 		Addr:         ":" + env.GetEnvVar().Server.Port,

Diff for: cmd/blockride/main.go renamed to cmd/companyXYZ/main.go

@@ -10,7 +10,7 @@ const docTemplate = `{
         "description": "{{escape .Description}}",
         "title": "{{.Title}}",
         "contact": {
-            "url": "https://www.blockride.xyz/"
+            "url": "https://www.companyXYZ.xyz/"
         },
         "version": "{{.Version}}",
         "x-logo": {
@@ -44,7 +44,7 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "200": {
-                        "description": "REDIRECT TO BLOCKRIDE HOMEPAGE",
+                        "description": "REDIRECT TO companyXYZ HOMEPAGE",
                         "schema": {
                             "type": "string"
                         }
@@ -118,7 +118,7 @@ const docTemplate = `{
                 "parameters": [
                     {
                         "type": "string",
-                        "description": "Users any preferred name",
+                        "description": "user any preferred name",
                         "name": "name",
                         "in": "formData",
                         "required": true
@@ -202,8 +202,8 @@ var SwaggerInfo = &swag.Spec{
 	Host:             "",
 	BasePath:         "",
 	Schemes:          []string{},
-	Title:            "BlockRide waitlist-backend",
-	Description:      "BlockRide waitlist-backend API endpoints.",
+	Title:            "companyXYZ waitlist-backend",
+	Description:      "companyXYZ waitlist-backend API endpoints.",
 	InfoInstanceName: "swagger",
 	SwaggerTemplate:  docTemplate,
 	LeftDelim:        "{{",

Diff for: docs/docs.go

@@ -1,10 +1,10 @@
 {
     "swagger": "2.0",
     "info": {
-        "description": "BlockRide waitlist-backend API endpoints.",
-        "title": "BlockRide waitlist-backend",
+        "description": "companyXYZ waitlist-backend API endpoints.",
+        "title": "companyXYZ waitlist-backend",
         "contact": {
-            "url": "https://www.blockride.xyz/"
+            "url": "https://www.companyXYZ.xyz/"
         },
         "x-logo": {
             "altText": "example logo",
@@ -35,7 +35,7 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "REDIRECT TO BLOCKRIDE HOMEPAGE",
+                        "description": "REDIRECT TO companyXYZ HOMEPAGE",
                         "schema": {
                             "type": "string"
                         }
@@ -109,7 +109,7 @@
                 "parameters": [
                     {
                         "type": "string",
-                        "description": "Users any preferred name",
+                        "description": "user any preferred name",
                         "name": "name",
                         "in": "formData",
                         "required": true

Diff for: docs/swagger.json

@@ -12,9 +12,9 @@ externalDocs:
   description: OpenAPI
 info:
   contact:
-    url: https://www.blockride.xyz/
-  description: BlockRide waitlist-backend API endpoints.
-  title: BlockRide waitlist-backend
+    url: https://www.companyXYZ.xyz/
+  description: companyXYZ waitlist-backend API endpoints.
+  title: companyXYZ waitlist-backend
   x-logo:
     altText: example logo
     backgroundColor: '#000000'
@@ -34,7 +34,7 @@ paths:
       - application/json
       responses:
         "200":
-          description: REDIRECT TO BLOCKRIDE HOMEPAGE
+          description: REDIRECT TO companyXYZ HOMEPAGE
           schema:
             type: string
         "400":
@@ -79,7 +79,7 @@ paths:
       - application/x-www-form-urlencoded
       description: sends user registration email
       parameters:
-      - description: Users any preferred name
+      - description: user any preferred name
         in: formData
         name: name
         required: true

Diff for: docs/swagger.yaml

@@ -1,4 +1,4 @@
-module Blockride-waitlistAPI
+module companyXYZ-waitlistAPI
 
 go 1.21.4
 

Diff for: go.mod

@@ -1,8 +1,8 @@
 package http
 
 import (
-	"Blockride-waitlistAPI/env"
-	"Blockride-waitlistAPI/internal/store"
+	"companyXYZ-waitlistAPI/env"
+	"companyXYZ-waitlistAPI/internal/store"
 	"context"
 	"encoding/json"
 	"errors"
@@ -20,7 +20,7 @@ import (
 //	@Accept			x-www-form-urlencoded
 //	@Produce		json
 //	@Success		200				{string}	string	"OK"
-//	@Param			name			formData	string	true	"Users any preferred name"
+//	@Param			name			formData	string	true	"user any preferred name"
 //	@Param			email			formData	string	true	"valid email address"	Format(email)
 //	@Param			country			formData	string	true	"country"
 //	@Param			splWalletAddr	formData	string	true	"SPL wallet Address"
@@ -67,8 +67,8 @@ func (a Application) waitListHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if a.repository.CheckIfUserExist(subscriber) {
-		w.Header().Set("Location", "https://www.blockride.xyz/")
-		http.Redirect(w, r, "https://www.blockride.xyz/", http.StatusConflict)
+		w.Header().Set("Location", "https://www.companyXYZ.xyz/")
+		http.Redirect(w, r, "https://www.companyXYZ.xyz/", http.StatusConflict)
 		return
 	}
 
@@ -84,8 +84,8 @@ func (a Application) waitListHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	w.Header().Set("Location", "https://www.blockride.xyz/")
-	http.Redirect(w, r, "https://www.blockride.xyz/", http.StatusOK)
+	w.Header().Set("Location", "https://www.companyXYZ.xyz/")
+	http.Redirect(w, r, "https://www.companyXYZ.xyz/", http.StatusOK)
 }
 
 // ConfirmAndSaveHandler
@@ -95,7 +95,7 @@ func (a Application) waitListHandler(w http.ResponseWriter, r *http.Request) {
 //	@Tags			application
 //	@Produce		json
 //	@Param			k	query		string	true	"BASE64 ENCODED STRING"
-//	@Success		200	{string}	string	"REDIRECT TO BLOCKRIDE HOMEPAGE"
+//	@Success		200	{string}	string	"REDIRECT TO companyXYZ HOMEPAGE"
 //	@Failure		400	{string}	string	"CLIENT ERROR: BAD REQUEST, KEY MISSING IN REQUEST"
 //	@Failure		404	{string}	string	"CLIENT ERROR: NOT FOUND, LINK/KEY EXPIRED"
 //	@Failure		409	{string}	string	"CLIENT ERROR: USER WITH EMAIL ALREADY EXIST"
@@ -127,18 +127,18 @@ func (a Application) confirmAndSaveHandler(w http.ResponseWriter, r *http.Reques
 
 	if err := a.repository.SaveToDb(user); err != nil {
 		if strings.Contains(err.Error(), "duplicate key error") {
-			w.Header().Set("Location", "https://www.blockride.xyz/")
-			http.Redirect(w, r, "https://www.blockride.xyz/", http.StatusConflict)
+			w.Header().Set("Location", "https://www.companyXYZ.xyz/")
+			http.Redirect(w, r, "https://www.companyXYZ.xyz/", http.StatusConflict)
 			return
 		}
-		
+
 		a.serverError(w)
 		a.logger.LogAttrs(context.TODO(), slog.LevelError, err.Error())
 		return
 	}
 
-	w.Header().Set("Location", "https://www.blockride.xyz/")
-	http.Redirect(w, r, "https://www.blockride.xyz/", http.StatusOK)
+	w.Header().Set("Location", "https://www.companyXYZ.xyz/")
+	http.Redirect(w, r, "https://www.companyXYZ.xyz/", http.StatusOK)
 }
 
 type ServerStatus struct {

Diff for: http/handlers.go

@@ -1,10 +1,10 @@
 package http
 
 import (
-	"Blockride-waitlistAPI/env"
-	"Blockride-waitlistAPI/internal/store"
-	"Blockride-waitlistAPI/templ"
 	"bytes"
+	"companyXYZ-waitlistAPI/env"
+	"companyXYZ-waitlistAPI/internal/store"
+	"companyXYZ-waitlistAPI/templ"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/rand"
@@ -26,27 +26,27 @@ type templData struct {
 func sendConfirmationMail(name, email, key string) error {
 
 	var (
-		from     = env.GetEnvVar().Mail.EmailAcc
-		tpl      bytes.Buffer
-		s        = templData{Name: name, Key: key}
-		data     []byte
-		err      error
+		from = env.GetEnvVar().Mail.EmailAcc
+		tpl  bytes.Buffer
+		s    = templData{Name: name, Key: key}
+		data []byte
+		err  error
 	)
-	
+
 	m := gomail.NewMessage()
 	m.SetHeader("From", from)
 	m.SetHeader("To", email)
-	m.SetHeader("Subject", "BlockRide Confirmation mail")
+	m.SetHeader("Subject", "companyXYZ Confirmation mail")
 
 	if err = prepareMail(s, &tpl); err != nil {
 		return err
 	}
 
-	if data, err = templ.BlockRideLogo.ReadFile("BlockRideLogo.png"); err != nil {
+	if data, err = templ.CompanyXYZLogo.ReadFile("companyXYZLogo.png"); err != nil {
 		return err
 	}
-	m.Attach("BlockRideLogo.png", gomail.SetHeader(map[string][]string{
-		"Content-ID": {"BlockRideLogo"},
+	m.Attach("companyXYZLogo.png", gomail.SetHeader(map[string][]string{
+		"Content-ID": {"companyXYZLogo"},
 	}), gomail.SetCopyFunc(func(w io.Writer) error {
 		_, err := w.Write(data)
 		return err

Diff for: http/helpers.go

@@ -1,7 +1,7 @@
 package http
 
 import (
-	"Blockride-waitlistAPI/env"
+	"companyXYZ-waitlistAPI/env"
 	"net/http"
 	"time"
 
@@ -13,8 +13,8 @@ import (
 )
 
 const (
-	blockrideHOMEURL string = "https://www.blockride.xyz/"
-	Production       string = "production"
+	companyXYZHOMEURL string = "https://www.companyXYZ.xyz/"
+	Production        string = "production"
 )
 
 func (a Application) Routes() *chi.Mux {
@@ -51,5 +51,5 @@ func (a Application) Routes() *chi.Mux {
 }
 
 func AllowOriginFunc(r *http.Request, origin string) bool {
-	return origin == blockrideHOMEURL
+	return origin == companyXYZHOMEURL
 }

Diff for: http/routes.go

@@ -1,7 +1,7 @@
 package http
 
 import (
-	"Blockride-waitlistAPI/internal/store"
+	"companyXYZ-waitlistAPI/internal/store"
 	"log/slog"
 
 	"go.mongodb.org/mongo-driver/mongo"

Diff for: http/server.go

@@ -1,7 +1,7 @@
 package http
 
 import (
-	"Blockride-waitlistAPI/internal/store"
+	"companyXYZ-waitlistAPI/internal/store"
 
 	solana "github.com/blocto/solana-go-sdk/common"
 	"github.com/go-playground/validator/v10"

Diff for: http/validation.go

@@ -1,4 +1,4 @@
-BINARY_NAME=BlockRide
+BINARY_NAME=companyXYZ
 
 run:
 	@echo "Running server"
@@ -10,15 +10,15 @@ tidy:
 
 build:
 	@echo "Building binary"
-	@go build -o bin/${BINARY_NAME} cmd/blockride/main.go
+	@go build -o bin/${BINARY_NAME} cmd/companyXYZ/main.go
 
 test:
 	@echo "Running all test"
 	@go test ./... -v
 
 swagger:
 	@echo "Generating swagger"
-	@swag init -d cmd/blockride/,http/
+	@swag init -d cmd/companyXYZ/,http/
 	@swag fmt --exclude internal/,templ/,env/