Removed dashboard

baking-bad · May 27, 2021 · 96c1460 · 96c1460
1 parent b4e46e0
commit 96c1460
Show file tree

Hide file tree

Showing 52 changed files with 16 additions and 3,722 deletions.
diff --git a/cmd/api/docs/docs.go b/cmd/api/docs/docs.go
@@ -329,7 +329,7 @@ var doc = `{
                     },
                     {
                         "enum": [
-                            "level",
+                            "token_id",
                             "balance"
                         ],
                         "type": "string",
@@ -3733,7 +3733,7 @@ var doc = `{
                     "type": "integer"
                 },
                 "network": {
-                    "type": "string"
+                    "type": "integer"
                 },
                 "protocol": {
                     "type": "string"
@@ -3881,14 +3881,6 @@ var doc = `{
                 "tx_count": {
                     "type": "integer",
                     "x-nullable": true
-                },
-                "verification_source": {
-                    "type": "string",
-                    "x-nullable": true
-                },
-                "verified": {
-                    "type": "boolean",
-                    "x-nullable": true
                 }
             }
         },
@@ -4409,14 +4401,6 @@ var doc = `{
                 "tx_count": {
                     "type": "integer",
                     "x-nullable": true
-                },
-                "verification_source": {
-                    "type": "string",
-                    "x-nullable": true
-                },
-                "verified": {
-                    "type": "boolean",
-                    "x-nullable": true
                 }
             }
         },

diff --git a/cmd/api/docs/swagger.json b/cmd/api/docs/swagger.json
@@ -311,7 +311,7 @@
                     },
                     {
                         "enum": [
-                            "level",
+                            "token_id",
                             "balance"
                         ],
                         "type": "string",
@@ -3715,7 +3715,7 @@
                     "type": "integer"
                 },
                 "network": {
-                    "type": "string"
+                    "type": "integer"
                 },
                 "protocol": {
                     "type": "string"
@@ -3863,14 +3863,6 @@
                 "tx_count": {
                     "type": "integer",
                     "x-nullable": true
-                },
-                "verification_source": {
-                    "type": "string",
-                    "x-nullable": true
-                },
-                "verified": {
-                    "type": "boolean",
-                    "x-nullable": true
                 }
             }
         },
@@ -4391,14 +4383,6 @@
                 "tx_count": {
                     "type": "integer",
                     "x-nullable": true
-                },
-                "verification_source": {
-                    "type": "string",
-                    "x-nullable": true
-                },
-                "verified": {
-                    "type": "boolean",
-                    "x-nullable": true
                 }
             }
         },

diff --git a/cmd/api/docs/swagger.yaml b/cmd/api/docs/swagger.yaml
@@ -250,7 +250,7 @@ definitions:
       level:
         type: integer
       network:
-        type: string
+        type: integer
       protocol:
         type: string
     required:
@@ -357,12 +357,6 @@ definitions:
       tx_count:
         type: integer
         x-nullable: true
-      verification_source:
-        type: string
-        x-nullable: true
-      verified:
-        type: boolean
-        x-nullable: true
     type: object
   handlers.CountResponse:
     properties:
@@ -726,12 +720,6 @@ definitions:
       tx_count:
         type: integer
         x-nullable: true
-      verification_source:
-        type: string
-        x-nullable: true
-      verified:
-        type: boolean
-        x-nullable: true
     type: object
   handlers.SimilarContractsResponse:
     properties:
@@ -1672,7 +1660,7 @@ paths:
         type: string
       - description: Field using for sorting
         enum:
-        - level
+        - token_id
         - balance
         in: query
         name: sort_by

diff --git a/cmd/api/handlers/auth.go b/cmd/api/handlers/auth.go
diff --git a/cmd/api/handlers/config.go b/cmd/api/handlers/config.go
@@ -21,7 +21,6 @@ func (ctx *Context) GetConfig(c *gin.Context) {
 
 	cfg := ConfigResponse{
 		Networks:       ctx.Config.API.Networks,
-		OauthEnabled:   ctx.Config.API.OAuthEnabled,
 		RPCEndpoints:   rpcEndpoints,
 		TzKTEndpoints:  tzktEndpoints,
 		GaEnabled:      ctx.Config.API.Frontend.GaEnabled,

diff --git a/cmd/api/handlers/context.go b/cmd/api/handlers/context.go
@@ -1,9 +1,7 @@
 package handlers
 
 import (
-	"github.com/baking-bad/bcdhub/cmd/api/oauth"
 	"github.com/baking-bad/bcdhub/internal/config"
-	"github.com/gin-gonic/gin"
 	jsoniter "github.com/json-iterator/go"
 )
 
@@ -12,24 +10,13 @@ var json = jsoniter.ConfigCompatibleWithStandardLibrary
 // Context -
 type Context struct {
 	*config.Context
-	OAUTH oauth.Config
 }
 
 // NewContext -
 func NewContext(cfg config.Config) (*Context, error) {
-	var oauthCfg oauth.Config
-	if cfg.API.OAuthEnabled {
-		var err error
-		oauthCfg, err = oauth.New(cfg)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	ctx := config.NewContext(
 		config.WithStorage(cfg.Storage, cfg.API.ProjectName, int64(cfg.API.PageSize)),
 		config.WithRPC(cfg.RPC),
-		config.WithDatabase(cfg.DB),
 		config.WithSearch(cfg.Storage),
 		config.WithShare(cfg.SharePath),
 		config.WithTzKTServices(cfg.TzKT),
@@ -41,17 +28,5 @@ func NewContext(cfg config.Config) (*Context, error) {
 
 	return &Context{
 		Context: ctx,
-		OAUTH:   oauthCfg,
 	}, nil
 }
-
-// CurrentUserID - return userID (uint) from gin context
-func CurrentUserID(c *gin.Context) uint {
-	if val, ok := c.Get("userID"); ok && val != nil {
-		if userID, valid := val.(uint); valid {
-			return userID
-		}
-	}
-
-	return 0
-}
diff --git a/cmd/api/handlers/contract.go b/cmd/api/handlers/contract.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/baking-bad/bcdhub/internal/models/contract"
 	"github.com/gin-gonic/gin"
-	"github.com/jinzhu/gorm"
 )
 
 // GetContract godoc
@@ -39,7 +38,7 @@ func (ctx *Context) GetContract(c *gin.Context) {
 		return
 	}
 
-	res, err := ctx.contractPostprocessing(contract, c)
+	res, err := ctx.contractPostprocessing(contract)
 	if ctx.handleError(c, err, 0) {
 		return
 	}
@@ -74,32 +73,17 @@ func (ctx *Context) GetRandomContract(c *gin.Context) {
 		return
 	}
 
-	res, err := ctx.contractPostprocessing(contract, c)
+	res, err := ctx.contractPostprocessing(contract)
 	if ctx.handleError(c, err, 0) {
 		return
 	}
 	c.JSON(http.StatusOK, res)
 }
 
-func (ctx *Context) contractPostprocessing(contract contract.Contract, c *gin.Context) (Contract, error) {
+func (ctx *Context) contractPostprocessing(contract contract.Contract) (Contract, error) {
 	var res Contract
 	res.FromModel(contract)
 
-	if userID, err := ctx.getUserFromToken(c); err == nil && userID != 0 {
-		if sub, err := ctx.DB.GetSubscription(userID, res.Address, contract.Network); err == nil {
-			subscription := PrepareSubscription(sub)
-			res.Subscription = &subscription
-		} else if !gorm.IsRecordNotFoundError(err) {
-			return res, err
-		}
-	}
-
-	if totalSubscribed, err := ctx.DB.GetSubscriptionsCount(res.Address, contract.Network); err == nil {
-		res.TotalSubscribed = totalSubscribed
-	} else {
-		return res, err
-	}
-
 	if alias, err := ctx.TZIP.Get(contract.Network, contract.Address); err == nil {
 		res.Slug = alias.Slug
 	} else if !ctx.Storage.IsRecordNotFound(err) {