Feature/login UI and controller (#14)

Author: developerasun

README.md

@@ -1,11 +1,17 @@
+<div align="center">
+
 # 🦉Owlly
 
-[![wakatime](https://wakatime.com/badge/user/e56daee8-7aae-4b0e-814c-b6bb7f5f841c/project/c15254fd-0a5e-4b66-b897-5ed473191817.svg)](https://wakatime.com/badge/user/e56daee8-7aae-4b0e-814c-b6bb7f5f841c/project/c15254fd-0a5e-4b66-b897-5ed473191817) ![lint-and-format](https://github.com/asunlabs/owlly/actions/workflows/lint-and-format.yml/badge.svg) ![assign](https://github.com/asunlabs/owlly/actions/workflows/release.yml/badge.svg) ![GitHub last commit](https://img.shields.io/github/last-commit/asunlabs/owlly)
+[![wakatime](https://wakatime.com/badge/user/e56daee8-7aae-4b0e-814c-b6bb7f5f841c/project/c15254fd-0a5e-4b66-b897-5ed473191817.svg)](https://wakatime.com/badge/user/e56daee8-7aae-4b0e-814c-b6bb7f5f841c/project/c15254fd-0a5e-4b66-b897-5ed473191817) ![GitHub last commit](https://img.shields.io/github/last-commit/asunlabs/owlly) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
+
+![lint-and-format](https://github.com/asunlabs/owlly/actions/workflows/lint-and-format.yml/badge.svg) ![assign](https://github.com/asunlabs/owlly/actions/workflows/release.yml/badge.svg)
 
 A file-based .env change notifier for your slack team.
 
 <img src="https://user-images.githubusercontent.com/83855174/202204929-9eff7a48-84bc-4673-b721-f3b81403ee83.gif" alt="demo" width="100%" />
 
+</div>
+
 ## Table of Contents
 
 - [Owlly](#owlly)

app.go

@@ -2,13 +2,11 @@ package main
 
 import (
 	"context"
-	"log"
-
-	"owlly/v2/core"
-
-	"github.com/asunlabs/owlly/config"
 	"github.com/fatih/color"
-	"github.com/wailsapp/wails/v2/pkg/runtime"
+	config "github.com/asunlabs/owlly/config"
+	core "owlly/v2/core"
+	// account "github.com/asunlabs/owlly/core/account"
+	bot "owlly/v2/core/bot"
 )
 
 // ==================================================================== //
@@ -46,7 +44,7 @@ func NewOwlly() *Owlly {
 	return &Owlly{}
 }
 
-// @dev set controller for Wails
+// @dev Go/Js binding
 func (o *Owlly) InitEnvBot() bool {
 	if ok := core.InitEnvBot_(); ok {
 		return true
@@ -55,43 +53,14 @@ func (o *Owlly) InitEnvBot() bool {
 	return false
 }
 
-// TODO split service(provider) and controller like Nestjs
 func (o *Owlly) CreateEnvBotConfig(botConfig config.ModelEnvBot) {
-	config.CreateEnvBotConfig(botConfig)
+	bot.CreateEnvBotConfig(botConfig)
 }
 
 // ==================================================================== //
 // ======================= Wails event listener ======================= //
 // ==================================================================== //
 // @dev runtime context should be obtained from the OnStartup or OnDomReady hooks.
 func EventListener(ctx context.Context) {
-	runtime.EventsOn(ctx, config.SLACK_EVENT["update"], func(optionalData ...interface{}) {
-		_newConfig := make(map[int]string)
-
-		var newConfig config.ModelEnvBot
-
-		for k, v := range optionalData {
-			switch _v := v.(type) {
-			case string:
-				_newConfig[k] = _v
-			default:
-				log.Fatal("app.go:EventListener: Invalid config data type")
-			}
-		}
-
-		newConfig.TriggerName = _newConfig[0]
-		newConfig.SlackBotOauthToken = _newConfig[1]
-		newConfig.SlackChannelID = _newConfig[2]
-		newConfig.SlackUserID = _newConfig[3]
-		newConfig.SlackUserName = _newConfig[4]
-
-		// Read config info from frontend and do DB operation
-		config.New(
-			newConfig.TriggerName,
-			newConfig.SlackBotOauthToken,
-			newConfig.SlackChannelID,
-			newConfig.SlackUserID,
-			newConfig.SlackUserName,
-		)
-	})
-}
+	bot.HandleSlackUpdate(ctx)
+}

config/db.go

@@ -12,8 +12,8 @@ import (
 type ModelEmailUser struct {
 	gorm.Model
 	Email    string `gorm:"unique;not null" json:"email"`
-	Password string `gorm:"not null" json:"password"`
-	Username string `gorm:"not null" json:"username"`
+	Password string `gorm:"not null"        json:"password"`
+	Username string `gorm:"not null"        json:"username"`
 }
 
 type ModelWalletUser struct {
@@ -23,10 +23,10 @@ type ModelWalletUser struct {
 }
 
 type ModelEnvBot struct {
-	gorm.Model                
-	TriggerName        string `gorm:"not null" json:"triggerName"`
+	gorm.Model
+	TriggerName        string `gorm:"not null"        json:"triggerName"`
 	SlackBotOauthToken string `gorm:"unique;not null" json:"slackBotOauthToken"`
-	SlackChannelID     string `gorm:"not null" json:"slackChannelID"`
-	SlackUserID        string `gorm:"not null" json:"slackUserID"`
-	SlackUserName      string `gorm:"not null" json:"slackUserName"`
+	SlackChannelID     string `gorm:"not null"        json:"slackChannelID"`
+	SlackUserID        string `gorm:"not null"        json:"slackUserID"`
+	SlackUserName      string `gorm:"not null"        json:"slackUserName"`
 }

config/model.go

@@ -1,14 +1,15 @@
 package config
 
 import (
-	"errors"
-
 	"github.com/fatih/color"
+	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 )
 
 var (
-	EnvBot       *ModelEnvBot
+	DB_HANDLE *gorm.DB
+	EnvBot      *ModelEnvBot
+	DATABASE_NAME = "owlly.db"
 	SLACK_EVENT = map[string]string{
 		"update": "SLACK_UPDATE_EVENT",
 		"delete": "SLACK_DELETE_EVENT",
@@ -20,6 +21,22 @@ var (
 	}
 )
 
+// ==================================================================== //
+// ========================= Init SQLite3 DB ========================== //
+// ==================================================================== //
+func ConnectDB() (bool, string) {
+	_db, oErr := gorm.Open(sqlite.Open(DATABASE_NAME), &gorm.Config{})
+
+	if oErr != nil {
+		return false, oErr.Error()
+	}
+
+	_db.AutoMigrate(&ModelEmailUser{}, &ModelWalletUser{}, &ModelEnvBot{})
+	DB_HANDLE = _db
+
+	return true, ""
+}
+
 // @dev get event values from front end and update config
 func New(
 	triggerName string,
@@ -37,12 +54,5 @@ func New(
 	_EnvBot.SlackUserName = slackUserName
 
 	EnvBot = &_EnvBot
-
-	// TODO fix gorm UNIQUE constraint failed
-	if rErr := DB_HANDLE.Where("id = ?", EnvBot.ID).First(EnvBot).Error; errors.Is(rErr, gorm.ErrRecordNotFound) {
-		CreateEnvBotConfig(*EnvBot)
-	} else { 
-		UpdateEnvBotConfig(*EnvBot)
-	}
 	color.Cyan("Setup.go: Envbot properly configured")
 }

config/setup.go

@@ -0,0 +1,16 @@
+package account
+
+import (
+	"context"
+
+	"github.com/asunlabs/owlly/config"
+	"github.com/wailsapp/wails/v2/pkg/runtime"
+)
+
+// TODO add sign in, sign up event
+func ListenEmailSignUp(ctx context.Context)  {
+	runtime.EventsOn(ctx, config.AUTH_EVENT["sign-up"], func(optionalData ...interface{}) {
+		var newEmailUser config.ModelEmailUser
+		CreateEmailUser(newEmailUser)
+	})
+}