changes in package functions

spurtcmsdeveloper-46 · spurtcmsdeveloper-46 · commit 1954650fdfc6 · 2024-04-02T13:06:29.000+05:30
diff --git a/controller/authcontroller.go b/controller/authcontroller.go
@@ -4,10 +4,11 @@ import (
 	"bytes"
 	"context"
 	"errors"
-	"gqlserver/graph/model"
 	"html/template"
+	"log"
 	"math/rand"
 	"os"
+	"spurtcms-graphql/graph/model"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -97,7 +98,11 @@ func VerifyMemberOtp(db *gorm.DB,ctx context.Context,email string,otp int)(strin
 
 	currentTime := time.Now().In(TimeZone).Unix()
 
-	token,err := Mem.VerifyLoginOtp(email,otp,currentTime)
+	memberDetails,token,err := Mem.VerifyLoginOtp(email,otp,currentTime)
+
+	log.Println("memberdetails",memberDetails)
+
+	db.Table("tbl_members").Joins("inner join ")
 
 	if err!=nil{
 
diff --git a/controller/category.go b/controller/category.go
@@ -2,7 +2,7 @@ package controller
 
 import (
 	"context"
-	"gqlserver/graph/model"
+	"spurtcms-graphql/graph/model"
 	"log"
 	"strconv"
 	"strings"
diff --git a/controller/channel.go b/controller/channel.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"gqlserver/graph/model"
+	"spurtcms-graphql/graph/model"
 	// "log"
 	"os"
 	"time"
diff --git a/controller/ecommerce.go b/controller/ecommerce.go
@@ -2,7 +2,7 @@ package controller
 
 import (
 	"context"
-	"gqlserver/graph/model"
+	"spurtcms-graphql/graph/model"
 	"time"
 
 	// "log"
diff --git a/controller/space.go b/controller/space.go
@@ -2,7 +2,7 @@ package controller
 
 import (
 	"context"
-	"gqlserver/graph/model"
+	"spurtcms-graphql/graph/model"
 	"os"
 
 	"github.com/gin-gonic/gin"
diff --git a/ginHandler/handler.go b/ginHandler/handler.go
@@ -2,9 +2,9 @@ package ginhandler
 
 import (
 	"context"
-	"gqlserver/controller"
-	"gqlserver/graph"
-	"gqlserver/middleware"
+	"spurtcms-graphql/controller"
+	"spurtcms-graphql/graph"
+	"spurtcms-graphql/middleware"
 
 	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/99designs/gqlgen/graphql/playground"
diff --git a/go.mod b/go.mod
@@ -1,13 +1,13 @@
-module gqlserver
+module spurtcms-graphql
 
 go 1.20
 
 require (
 	github.com/99designs/gqlgen v0.17.40
 	github.com/gin-gonic/gin v1.9.1
 	github.com/joho/godotenv v1.5.1
-	github.com/spurtcms/pkgcontent v1.0.89
-	github.com/spurtcms/pkgcore v1.0.56
+	github.com/spurtcms/pkgcontent v1.0.93
+	github.com/spurtcms/pkgcore v1.0.59
 	github.com/vektah/gqlparser/v2 v2.5.10
 	gorm.io/driver/postgres v1.5.4
 	gorm.io/gorm v1.25.5
diff --git a/go.sum b/go.sum
@@ -99,8 +99,12 @@ github.com/sosodev/duration v1.1.0 h1:kQcaiGbJaIsRqgQy7VGlZrVw1giWO+lDoX3MCPnpVO
 github.com/sosodev/duration v1.1.0/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg=
 github.com/spurtcms/pkgcontent v1.0.89 h1:S21CRzGmmbg4GrfCVoGJIawMxfjhlNj0f+GOEmYM8SY=
 github.com/spurtcms/pkgcontent v1.0.89/go.mod h1:xQhD8scBoAWIcnokG6LrJSOqBHepEBVh6AgVEBZDW6I=
+github.com/spurtcms/pkgcontent v1.0.93 h1:aHPZOocxxd7K9PRgYsZ/aePQTqTcrY9qEDtiGw3+t2k=
+github.com/spurtcms/pkgcontent v1.0.93/go.mod h1:lI4kGwTgivAZ1M2PAEaphM3f3tykDKJrqeKOiI/ZAsI=
 github.com/spurtcms/pkgcore v1.0.56 h1:VESLicpo15V4S2StBBAAOKYIMdZ6kxKUjWskBzvXPuA=
 github.com/spurtcms/pkgcore v1.0.56/go.mod h1:k/HTW4fjgZbQTN92Q7pWfvoHtbT0S08b1LbFNJsdn38=
+github.com/spurtcms/pkgcore v1.0.59 h1:Sg4MEHIThPSL1714Ct4aH/NvNmRji2pFKnCM/FKwYLE=
+github.com/spurtcms/pkgcore v1.0.59/go.mod h1:k/HTW4fjgZbQTN92Q7pWfvoHtbT0S08b1LbFNJsdn38=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
diff --git a/graph/generated.go b/graph/generated.go
diff --git a/graph/resolver.go b/graph/resolver.go
@@ -2,9 +2,9 @@ package graph
 
 import (
 	"context"
-	"gqlserver/controller"
-	"gqlserver/dbconfig"
-	"gqlserver/graph/model"
+	"spurtcms-graphql/controller"
+	"spurtcms-graphql/dbconfig"
+	"spurtcms-graphql/graph/model"
 
 	"gorm.io/gorm"
 )
diff --git a/graph/schema.resolvers.go b/graph/schema.resolvers.go
diff --git a/middleware/authmiddleware.go b/middleware/authmiddleware.go
@@ -3,7 +3,7 @@ package middleware
 import (
 	"context"
 	"fmt"
-	"gqlserver/controller"
+	"spurtcms-graphql/controller"
 	"os"
 
 	"github.com/99designs/gqlgen/graphql"
diff --git a/server.go b/server.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"gqlserver/controller"
-	ginhandler "gqlserver/ginHandler"
-	"gqlserver/middleware"
+	"spurtcms-graphql/controller"
+	ginhandler "spurtcms-graphql/ginHandler"
+	"spurtcms-graphql/middleware"
 	"os"
 	"path/filepath"
 	"strings"
diff --git a/spurtcms-graphql.sh b/spurtcms-graphql.sh
@@ -5,15 +5,19 @@ if [ ! -e /etc/systemd/system/spurtcms-graphql.service ]; then
 fi
 
 if [ $1 ]; then
-    if [ $1 == "start" ]; then
+    if [ $1 = "start" ]; then
+        echo ""
         echo "Application Started Successfully - Visit http://localhost:8081"
-        echo "To Stop Application  - "sudo ./spurtcms-graphql.sh stop" "
+        echo "To Stop Application : 'sudo sh ./spurtcms-graphql.sh stop' "
+        echo ""
         exec systemctl start spurtcms-graphql.service
     fi
 
-    if [ $1 == "stop" ]; then
+    if [ $1 = "stop" ]; then
+        echo ""
         echo "-- Application Stopped Successfully --"
-        echo "-- To Start Application Again - "sudo ./spurtcms-graphql.sh start" "
+        echo "-- To Start Application Again : 'sudo sh ./spurtcms-graphql.sh start' "
+        echo ""
         exec systemctl stop spurtcms-graphql.service
     fi
 fi
