update short comic server logic

- add update cache after create comic Moving some event to private api #41
sharproject · Dec 21, 2023 · f88ac9f · f88ac9f
1 parent dd12dbb
commit f88ac9f
Show file tree

Hide file tree

Showing 12 changed files with 150 additions and 110 deletions.
diff --git a/server/comic/graphql/resolver/short.comic.schema.resolvers.go b/server/comic/graphql/resolver/short.comic.schema.resolvers.go
@@ -87,15 +87,15 @@ func (r *mutationResolver) CreateShortComic(ctx context.Context, input model.Cre
 		}, nil
 	}
 	requestId := uuid.New().String()
-	type GenUploadTokenPayload struct {
-		ID        string                                              `json:"id"`
-		SaveData  LocalTypes.UploadComicThumbnailAndBackgroundPayload `json:"data"`
-		EmitTo    string                                              `json:"emit_to"`
-		EventName string                                              `json:"event_name"`
-	}
-	payload := []GenUploadTokenPayload{}
+	// type GenUploadTokenPayload struct {
+	// 	ID        string                                              `json:"id"`
+	// 	SaveData  LocalTypes.UploadComicThumbnailAndBackgroundPayload `json:"data"`
+	// 	EmitTo    string                                              `json:"emit_to"`
+	// 	EventName string                                              `json:"event_name"`
+	// }
+	payload := []util.GenSingleUploadTokenPayload[LocalTypes.UploadComicThumbnailAndBackgroundPayload]{}
 	for _, v := range requestTokensList {
-		payload = append(payload, GenUploadTokenPayload{
+		payload = append(payload, util.GenSingleUploadTokenPayload[LocalTypes.UploadComicThumbnailAndBackgroundPayload]{
 			ID: requestId,
 			SaveData: LocalTypes.UploadComicThumbnailAndBackgroundPayload{
 				ComicId: ShortComicDoc.ID,
@@ -104,26 +104,35 @@ func (r *mutationResolver) CreateShortComic(ctx context.Context, input model.Cre
 			EventName: fmt.Sprintf("SocketChangeComic%s", v),
 		})
 	}
-	requestData := LocalTypes.ServiceRequest{
-		Url:     "upload_token_registry/genToken",
-		Header:  nil,
-		Payload: &payload,
-		From:    "ShortComic/addImages",
-		Type:    "message",
-		ID:      requestId,
-	}
-	data, err := util.ServiceSender[LocalTypes.GetUploadTokensReturn, *interface{}](r.Redis, requestData, true)
+	// requestData := LocalTypes.ServiceRequest{
+	// 	Url:     "upload_token_registry/genToken",
+	// 	Header:  nil,
+	// 	Payload: &payload,
+	// 	From:    "ShortComic/addImages",
+	// 	Type:    "message",
+	// 	ID:      requestId,
+	// }
+	// data, err := util.ServiceSender[LocalTypes.GetUploadTokensReturn, *interface{}](r.Redis, requestData, true)
+	// if err != nil {
+	// 	return nil, err
+	// }
+	// if data.Error != nil {
+	// 	return nil, &gqlerror.Error{
+	// 		Message: *data.Error,
+	// 	}
+	// }
+	uploadToken, err := util.GenMultiUploadToken[LocalTypes.UploadComicThumbnailAndBackgroundPayload](payload)
 	if err != nil {
 		return nil, err
 	}
-	if data.Error != nil {
+	if uploadToken == nil {
 		return nil, &gqlerror.Error{
-			Message: *data.Error,
+			Message: "Failed to generate upload token",
 		}
 	}
 	return &model.CreateShortComicResponse{
 		ShortComic:  ShortComicDoc,
-		UploadToken: data.Payload.Token,
+		UploadToken: *uploadToken,
 	}, nil
 	// requestDataBytes, err := json.Marshal(requestData)
 	// if err != nil {

diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -29,7 +29,7 @@
 		"dotenv-cli": "^7.2.1",
 		"eslint": "^8.54.0",
 		"eslint-config-next": "^14.0.3",
-		"next": "^14.0.3",
+		"next": "^14.0.4",
 		"postcss": "^8.4.25",
 		"tailwindcss": "^3.3.2",
 		"typescript": "^5.2.2"

diff --git a/web/src/app/dashboard/page.module.css b/web/src/app/dashboard/page.module.css
@@ -2,7 +2,7 @@
   min-height: 100vh;
   flex: 1;
   display: flex;
-  flex-direction: column;
+  /* flex-direction: column; */
   justify-content: center;
   align-items: center;
   background-color: #141518;

diff --git a/web/src/app/dashboard/page.tsx b/web/src/app/dashboard/page.tsx
@@ -7,6 +7,7 @@ import styles from './page.module.css'
 import { ComicCardDashboard } from '../../components/ComicCardDashboard'
 import { CreateComicPopup } from '../../components/CreateComicPopup'
 import { ComicCardDataInput } from '../../types'
+import MainWrapper from '../../components/Wrapper'
 export default function MainDashboard() {
 	const { data: AuthData, loading: AuthLoading } = useCheckAuth({
 		unAuthRedirectTo: '/login',
@@ -32,14 +33,15 @@ export default function MainDashboard() {
 			? [...AuthData?.Me.profile.comics, ...AuthData?.Me.profile.ShortComics]
 			: []
 	).sort((a, b) => a?.createdAt - b?.createdAt)
+	console.log(comicData)
 	return (
 		<div>
 			{AuthLoading ? (
 				<div className='w-100 h-[100vh] flex justify-center items-center bg-[#141518]'>
 					<LogoLoading />
 				</div>
 			) : (
-				<main className={styles.main}>
+				<MainWrapper>
 					<Navbar
 						height={height}
 						key='shar-secure'
@@ -59,7 +61,7 @@ export default function MainDashboard() {
 							setIsOpen={setPopupOpen}
 						></CreateComicPopup>
 					</div>
-				</main>
+				</MainWrapper>
 			)}
 		</div>
 	)