-
+
-
+
-
+
{
)}
-
+ {/*
{post.prompt}
-
+ */}
);
};
+export const HistoryCard = ({ history, className }: { history: History, className?:string }) => {
+ return (
+
+
+ );
+};
+
export default Card;
diff --git a/client/src/components/Homepage/CarouselModel.tsx b/client/src/components/Homepage/CarouselModel.tsx
index 307c82a..c00e7de 100644
--- a/client/src/components/Homepage/CarouselModel.tsx
+++ b/client/src/components/Homepage/CarouselModel.tsx
@@ -1,6 +1,4 @@
-import { useState, useEffect } from 'react';
import { Model } from "../../types/model";
-import { modelList } from "../../utils/models";
import Carousel from "react-multi-carousel";
import "react-multi-carousel/lib/styles.css";
@@ -28,9 +26,11 @@ type CarouselModelProps = {
handleModel: (model_id:string)=>void
removerModel:(model_id: string)=>void
models: Model[];
+ title?: string
+ className?:string;
}
-const CarouselModel = ({models,handleModel, removerModel}:CarouselModelProps) => {
+const CarouselModel = ({models,handleModel, removerModel, title, className}:CarouselModelProps) => {
const onActive = (model: any) =>{
if(model.active){
@@ -42,19 +42,21 @@ const CarouselModel = ({models,handleModel, removerModel}:CarouselModelProps) =>
}
return (
-
+
+
+ {title}
{models.map((model, index) => (
onActive(model)}
- className={`flex p-2 rounded-xl items-center gap-4 mr-4 hover:bg-neutral-900 transition hover:ease-out ${
+ className={`flex p-2 rounded-xl items-center gap-4 mr-4 select-none hover:bg-neutral-900 active:bg-black active:bg-opacity-70 transition hover:ease-out ${
model.active && "bg-hover"
}`}>
{model.name}
-
- {posts.map((post, index) => (
-
+
+ {/* array of JSX items */}
+ {children}
+
+
+ );
+};
+
+const Gallery = ({ posts, type }: GalleryProps) => {
+ if (type) {
+ return (
+
+ {(posts as History[]).map((post, index) => (
+
-
+
+ );
+ }
+
+ return (
+
+ {/* array of JSX items */}
+ {(posts as Post[]).map((post, index) => (
+
);
};
diff --git a/client/src/components/Image.tsx b/client/src/components/Image.tsx
new file mode 100644
index 0000000..963f863
--- /dev/null
+++ b/client/src/components/Image.tsx
@@ -0,0 +1,45 @@
+import { ImgHTMLAttributes, FC, useState, useEffect } from "react";
+import { Blurhash } from "react-blurhash";
+
+interface ImageProps extends ImgHTMLAttributes {
+ image_data?: {
+ encoded: string;
+ width: number;
+ height: number;
+ };
+}
+
+const Image: FC = props => {
+ const [imageLoaded, setImageLoaded] = useState(false);
+
+ useEffect(() => {
+ const image = new (window as any).Image();
+ image.onload = () => {
+ setImageLoaded(true);
+ };
+ image.src = props.src;
+ }, [props.src]);
+
+ return (
+ <>
+
+ {props.image_data && (
+
+
+
PixelAI
@@ -22,14 +36,55 @@ const Navbar = () => {
{status === "authenticated" ? (
-
- Sign in with google
-
-
+ <>
+
+
+
+ Access all features
+
+
+
+
+
+
+
+
+
+ Sign in with Google
+
+
+
+
+
+
+
+
+ Sign in with Facebook
+
+
+
+
+
+
+
+
) : (
<>
)}
diff --git a/client/src/components/UserNavbar.tsx b/client/src/components/UserNavbar.tsx
index cb867aa..f3f4a25 100644
--- a/client/src/components/UserNavbar.tsx
+++ b/client/src/components/UserNavbar.tsx
@@ -1,9 +1,10 @@
import { TbNewSection } from "react-icons/tb";
import { Link } from "react-router-dom";
import { useAppSelector } from "../hooks/useRedux";
+import { Badge, Tooltip } from "flowbite-react";
const UserNavbar = () => {
- const { profilePic, username , slug} = useAppSelector(state => state.auth);
+ const { profilePic, username, slug, credits } = useAppSelector(state => state.auth);
return (
@@ -12,7 +13,7 @@ const UserNavbar = () => {
to="/generate">
Generate your image
-
@@ -20,6 +21,15 @@ const UserNavbar = () => {
aria-hidden="true"
className="block h-6 w-px rounded-full bg-gray-200">
+
+
+ {credits}
+
+
+
diff --git a/client/src/context/generator/GeneratorContext.tsx b/client/src/context/generator/GeneratorContext.tsx
new file mode 100644
index 0000000..010cdad
--- /dev/null
+++ b/client/src/context/generator/GeneratorContext.tsx
@@ -0,0 +1,18 @@
+import { createContext } from "react";
+import { Post } from "../../types/post";
+import { Model } from "../../types/model";
+
+interface ContextProps {
+ loading: boolean,
+ models: Model[],
+ handleChange: (event: React.ChangeEvent
) => void,
+ handleSurpriseMe: () => void,
+ handleRandomNegativePrompt: () => void,
+ handleSubmit: () => Promise,
+ createPost: () => Promise,
+ handleModel: (model_id: string) => void,
+ removerModel:(model_id: string) => void,
+ handleSize: (aspect: string) => void
+}
+
+export const GeneratorContext = createContext({} as ContextProps);
diff --git a/client/src/context/generator/GeneratorProvider.tsx b/client/src/context/generator/GeneratorProvider.tsx
new file mode 100644
index 0000000..4b0d356
--- /dev/null
+++ b/client/src/context/generator/GeneratorProvider.tsx
@@ -0,0 +1,40 @@
+import { FC } from 'react'
+import { GeneratorContext } from './GeneratorContext'
+import { useGenerator } from '../../hooks/useGenerator'
+
+type providerProps = {
+ children: JSX.Element | JSX.Element[]
+}
+
+export const GeneratorProvider: FC = ({children})=>{
+
+ const {
+ loading,
+ models,
+ handleChange,
+ handleSurpriseMe,
+ handleRandomNegativePrompt,
+ handleSubmit,
+ createPost,
+ handleModel,
+ removerModel,
+ handleSize
+ } = useGenerator();
+
+ return (
+
+ {children}
+
+ )
+}
\ No newline at end of file
diff --git a/client/src/context/generator/index.ts b/client/src/context/generator/index.ts
new file mode 100644
index 0000000..ca59e57
--- /dev/null
+++ b/client/src/context/generator/index.ts
@@ -0,0 +1,3 @@
+
+export * from './GeneratorContext'
+export * from './GeneratorProvider'
\ No newline at end of file
diff --git a/client/src/hooks/useGenerator.ts b/client/src/hooks/useGenerator.ts
index 0f777e1..5fea722 100644
--- a/client/src/hooks/useGenerator.ts
+++ b/client/src/hooks/useGenerator.ts
@@ -1,38 +1,43 @@
-import { useState } from "react";
+import { useState, useEffect } from 'react';
import { Model } from "../types/model";
-import { Post } from "../types/post";
import { modelList } from "../utils/models";
-import { useAppSelector } from './useRedux';
+import { useAppDispatch, useAppSelector } from './useRedux';
import { useNavigate } from 'react-router';
import Swal from "sweetalert2";
import { getRandomPrompt } from "../utils";
+import { onSetId, onSetImage, onSetModel, onSetNegativePrompt, onSetNegativePromptBtn, onSetPrompt, onSetSize } from "../store/generator/genratorSlice";
+import { refetchCredits } from '../store/auth/thunks';
export const useGenerator = () => {
const { _id } = useAppSelector(state => state.auth)
+ const { prompt, userid, model, negative_prompt, image, width, height } = useAppSelector(state => state.generator)
+
+ const dispatch = useAppDispatch();
+
const navigate = useNavigate();
const [models, setModels] = useState(modelList);
const [loading, setLoading] = useState(false);
- const [form, setForm] = useState({
- userid: _id,
- prompt: "",
- negative_prompt: "",
- image: "",
- model: "",
- });
+ useEffect(()=>{
+ dispatch(onSetId(_id))
+ },[])
+
const handleSurpriseMe = () => {
- const randomPrompt = getRandomPrompt(form.prompt);
- setForm({ ...form, prompt: randomPrompt });
+ const randomPrompt = getRandomPrompt(prompt);
+ dispatch(onSetPrompt(randomPrompt))
};
const handleRandomNegativePrompt = () => {
- const randomPrompt = getRandomPrompt(form.prompt, true);
-
- setForm((prev) => ({ ...form, negative_prompt: prev.negative_prompt.concat(" | "+randomPrompt) }));
+ const nevRandomPrompt = getRandomPrompt(prompt, true);
+ dispatch(onSetNegativePromptBtn(nevRandomPrompt))
};
+ const handleSize = (aspect: string)=>{
+ dispatch(onSetSize(aspect))
+ }
+
const handleModel = (model_id: string) => {
setModels(models.map(model => {
if (model.mode_id === model_id) {
@@ -43,10 +48,9 @@ export const useGenerator = () => {
return model;
}))
- setForm({
- ...form,
- model: model_id,
- });
+ console.log(model_id);
+
+ dispatch(onSetModel(model_id))
};
const removerModel = (model_id: string) => {
@@ -56,35 +60,36 @@ export const useGenerator = () => {
}
return model;
}));
- setForm({
- ...form,
- model: '',
- });
+
+ dispatch(onSetModel(''))
}
const handleChange = (event: React.ChangeEvent) => {
- setForm({
- ...form,
- [event.target.name]: event.target.value,
- });
+
+ if(event.target.name === 'prompt'){
+ dispatch(onSetPrompt(event.target.value))
+ }else{
+ dispatch(onSetNegativePrompt(event.target.value))
+ }
};
const createPost = async () => {
- if (form.prompt && form.prompt.length > 5) {
+ if (prompt && prompt.length > 5) {
try {
setLoading(true);
const response = await fetch(`${import.meta.env.VITE_SERVER}/api/v1/post/create`, {
method: "POST",
+ credentials: 'include',
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
- userid: form.userid,
- model: form.model,
- prompt: form.prompt,
- negative_prompt: form.negative_prompt,
- image: form.image,
+ userid,
+ model,
+ prompt: prompt,
+ negative_prompt,
+ image,
}),
});
const data = await response.json();
@@ -116,37 +121,38 @@ export const useGenerator = () => {
}
}
- const handleSubmit = async (event: React.FormEvent) => {
- event.preventDefault();
+ const handleSubmit = async () => {
+ if(image) dispatch(onSetImage(''))
- if (form.prompt && form.prompt.length > 5) {
+ if (prompt && prompt.length > 5) {
try {
setLoading(true);
//* FETCH
const response = await fetch(`${import.meta.env.VITE_SERVER}/api/v1/generate`, {
method: "POST",
+ credentials: 'include',
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
- prompt: form.prompt,
- negative_prompt: form.negative_prompt,
- model: form.model,
+ prompt,
+ negative_prompt,
+ model,
+ width,
+ height
}),
});
const data = await response.json();
- if (data.message || data.messege) {
- throw new Error('Out of service')
+ if (data.message) {
+ throw new Error(data.message)
}
- setForm({
- ...form,
- image: data.image,
- });
- } catch (error) {
+ dispatch(onSetImage(data.image))
+
+ } catch (error: any) {
Swal.fire({
- title: 'Out of service',
+ title: error.message || 'Out of service',
text: 'Try again later',
icon: 'error',
focusConfirm: false,
@@ -154,6 +160,7 @@ export const useGenerator = () => {
})
} finally {
setLoading(false);
+ dispatch(refetchCredits())
}
} else {
// alert("llenar el campo");
@@ -170,7 +177,7 @@ export const useGenerator = () => {
return {
loading,
- form,
+ // form,
models,
handleChange,
handleSurpriseMe,
@@ -178,7 +185,8 @@ export const useGenerator = () => {
handleSubmit,
createPost,
handleModel,
- removerModel
+ removerModel,
+ handleSize
};
};
diff --git a/client/src/index.css b/client/src/index.css
index 731a1c5..647fb3b 100644
--- a/client/src/index.css
+++ b/client/src/index.css
@@ -8,7 +8,7 @@
:root {
--dark: #464545;
- --thumb-bg: #57505065;
+ --thumb-bg: #86868665;
}
::-webkit-scrollbar {
width: 5px;
@@ -26,20 +26,69 @@
background: #252423;
}
+.my-masonry-grid {
+ display: -webkit-box; /* Not needed if autoprefixing */
+ display: -ms-flexbox; /* Not needed if autoprefixing */
+ display: flex;
+ margin-left: 0px; /* gutter size offset */
+ width: 100%;
+ margin: auto;
+}
+.my-masonry-grid_column {
+ padding-left: 7.5px;
+ padding-right: 7.5px;
+ background-clip: padding-box;
+}
+
+/* Style your items */
+.my-masonry-grid_column > div {
+ /* change div to reference your elements you put in */
+
+ margin-bottom: 15px;
+}
+
+@keyframes fadeIn {
+ 0% {
+ opacity: 0;
+ }
+ 100% {
+ opacity: 1;
+ }
+}
+
+@-webkit-keyframes fadeIn {
+ 0% {
+ opacity: 0;
+ }
+ 100% {
+ opacity: 1;
+ }
+}
+
+.fadeIn {
+ -webkit-animation-duration: 0.5s;
+ animation-duration: 0.5s;
+ -webkit-animation-fill-mode: both;
+ animation-fill-mode: both;
+
+ -webkit-animation-name: fadeIn;
+ animation-name: fadeIn;
+}
+
body {
background: #202020;
overflow-x: hidden;
- background-blend-mode: multiply;
+ background-blend-mode: multiply;
color: #f2f2f2;
}
-.background{
- background: #323232 ;
+.background {
+ background: #323232;
background-blend-mode: multiply;
}
-body::before{
- content: '';
+body::before {
+ content: "";
position: absolute;
z-index: -1;
top: -15rem;
@@ -47,7 +96,12 @@ body::before{
transform: translateX(-50%);
border-radius: 100%;
filter: blur(50px);
- background: linear-gradient(to right, rgb(251, 113, 133), rgb(217, 70, 239), rgb(99, 102, 241));
+ background: linear-gradient(
+ to right,
+ rgb(251, 113, 133),
+ rgb(217, 70, 239),
+ rgb(99, 102, 241)
+ );
width: 100vw;
height: 300px;
}
@@ -61,12 +115,50 @@ body::before{
border-radius: 5px;
}
+.bg-generator {
+ background-color: hwb(0 13% 87% / 0.377);
+ /* background: rgb(105,105,255); */
+ position: relative;
+ z-index: 0;
+ background-color: #202020;
+ background-image: url("data:image/svg+xml,%3Csvg width='60' height='60' viewBox='0 0 60 60' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cg fill='%23333333' fill-opacity='0.5'%3E%3Cpath d='M36 34v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zm0-30V0h-2v4h-4v2h4v4h2V6h4V4h-4zM6 34v-4H4v4H0v2h4v4h2v-4h4v-2H6zM6 4V0H4v4H0v2h4v4h2V6h4V4H6z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+}
+
+.bg-newimage {
+ background-color: #303030;
+ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='80' height='80' viewBox='0 0 80 80'%3E%3Cg fill='%23202020' fill-opacity='0.4'%3E%3Cpath fill-rule='evenodd' d='M11 0l5 20H6l5-20zm42 31a3 3 0 1 0 0-6 3 3 0 0 0 0 6zM0 72h40v4H0v-4zm0-8h31v4H0v-4zm20-16h20v4H20v-4zM0 56h40v4H0v-4zm63-25a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm10 0a3 3 0 1 0 0-6 3 3 0 0 0 0 6zM53 41a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm10 0a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm10 0a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm-30 0a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm-28-8a5 5 0 0 0-10 0h10zm10 0a5 5 0 0 1-10 0h10zM56 5a5 5 0 0 0-10 0h10zm10 0a5 5 0 0 1-10 0h10zm-3 46a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm10 0a3 3 0 1 0 0-6 3 3 0 0 0 0 6zM21 0l5 20H16l5-20zm43 64v-4h-4v4h-4v4h4v4h4v-4h4v-4h-4zM36 13h4v4h-4v-4zm4 4h4v4h-4v-4zm-4 4h4v4h-4v-4zm8-8h4v4h-4v-4z'/%3E%3C/g%3E%3C/svg%3E");
+}
+
+.bg-generator::after {
+ position: absolute;
+ content: "";
+ top: 0;
+ right: 0;
+ width: 100%;
+ height: 100%;
+ z-index: -1;
+ background: rgb(32, 32, 32);
+ background: linear-gradient(
+ 0deg,
+ rgba(32, 32, 32, 0) 50%,
+ rgba(32, 32, 32, 1) 100%
+ );
+}
+
.gradient {
- @apply bg-gradient-to-r from-rose-400 via-fuchsia-500 to-indigo-500
+ @apply bg-gradient-to-r from-rose-400 via-fuchsia-500 to-indigo-500;
+}
+
+.gradient-shadow {
+ @apply bg-gradient-to-r from-rose-400 via-fuchsia-500 to-indigo-500 blur-sm;
}
.gradient-google {
- background: linear-gradient(-120deg, #0477BF, #49BF72, #F2DC6B, #F24B59);
+ background: linear-gradient(-120deg, #0477bf, #49bf72, #f2dc6b, #f24b59);
+}
+
+.gradient-facebook {
+ @apply bg-gradient-to-r from-blue-500 to-blue-600;
}
.text-gradient {
diff --git a/client/src/main.tsx b/client/src/main.tsx
index cfc7108..eda4d5a 100644
--- a/client/src/main.tsx
+++ b/client/src/main.tsx
@@ -1,14 +1,17 @@
-import React from 'react'
-import ReactDOM from 'react-dom/client'
-import { Provider } from 'react-redux'
-import App from './App'
-import './index.css'
-import { store } from './store/store'
+import React from "react";
+import ReactDOM from "react-dom/client";
+import { Provider } from "react-redux";
+import App from "./App";
+import "./index.css";
+import { store } from "./store/store";
+import { Analytics as VercelAnalytics } from "@vercel/analytics/react"
-ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
- //
+
+ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
+
-
- //
-)
+
+);
diff --git a/client/src/pages/GeneratePage.tsx b/client/src/pages/GeneratePage.tsx
index b3a4f55..03b29ad 100644
--- a/client/src/pages/GeneratePage.tsx
+++ b/client/src/pages/GeneratePage.tsx
@@ -1,11 +1,15 @@
-import Generator from "../components/GeneratePage/Generator";
import Hero from "../components/GeneratePage/Hero";
+import { HistoryGallery } from "../components/GeneratePage/History";
+import { Generator } from "../components/GeneratePage/generator/Generator";
+import { useAppSelector } from "../hooks/useRedux";
const GeneratePage = () => {
+ const { status } = useAppSelector(state => state.auth);
return (
);
};
diff --git a/client/src/pages/UserPage.tsx b/client/src/pages/UserPage.tsx
index 94112f6..44d0a71 100644
--- a/client/src/pages/UserPage.tsx
+++ b/client/src/pages/UserPage.tsx
@@ -4,12 +4,19 @@ import { Navigate } from "react-router";
import { User } from "../types/user";
import Gallery from "../components/Homepage/Gallery";
import Loader from "../components/Loader";
+import { FiLogOut } from "react-icons/fi";
+import { useAppSelector } from "../hooks/useRedux";
const UserPage = () => {
+ const { status, slug } = useAppSelector(state => state.auth);
const { username } = useParams();
const [user, setUser] = useState();
const [loading, setLoading] = useState(false);
+ const handleOnClick = () => {
+ window.open(`${import.meta.env.VITE_SERVER}/api/v1/auth/logout`, "_self");
+ };
+
const fetchUser = async () => {
setLoading(true);
@@ -20,7 +27,6 @@ const UserPage = () => {
if (response.ok) {
const result = await response.json();
- console.log(result.user);
setUser(result.user);
}
} catch (error) {
@@ -55,7 +61,7 @@ const UserPage = () => {
className="pt-16 bg-bgColor min-h-[100vh]"
style={{
backgroundImage:
- "url(https://cdna.artstation.com/p/assets/images/images/000/215/866/large/anton-fadeev-bloodmoon-ruins2-1-800-logo.jpg?1443930004)",
+ "url(https://res.cloudinary.com/dzx6dg1ws/image/upload/v1681429585/anton-fadeev-bloodmoon-ruins2-1-800-logo_ocriyh.jpg)",
}}>
@@ -68,10 +74,17 @@ const UserPage = () => {
/>
-
+
{user[0].username}
+ {status === "authenticated" && slug === username && (
+
+
+ )}
diff --git a/client/src/routes/AppRouter.tsx b/client/src/routes/AppRouter.tsx
index e7ddc53..9bd0257 100644
--- a/client/src/routes/AppRouter.tsx
+++ b/client/src/routes/AppRouter.tsx
@@ -1,4 +1,3 @@
-import React from "react";
import { Navigate, Route } from "react-router";
import { Routes } from "react-router-dom";
import GeneratePage from "../pages/GeneratePage";
@@ -26,7 +25,6 @@ const AppRouter = () => {
}/>
-
}/>
diff --git a/client/src/store/auth/authSlice.ts b/client/src/store/auth/authSlice.ts
index b884915..cf8a622 100644
--- a/client/src/store/auth/authSlice.ts
+++ b/client/src/store/auth/authSlice.ts
@@ -8,7 +8,8 @@ const initialState: User = {
slug: '',
email: '',
profilePic: '',
- posts: []
+ posts: [],
+ credits: 0,
}
const authSlice = createSlice({
@@ -22,6 +23,7 @@ const authSlice = createSlice({
state.slug = payload.slug
state.email = payload.email
state.profilePic = payload.profilePic
+ state.credits = payload.credits
},
logout: (state) => {
state.status = 'not-authenticated';
@@ -33,10 +35,13 @@ const authSlice = createSlice({
},
checkingCredentials: (state) => {
state.status = 'checking';
+ },
+ verifyCredits: (state, {payload}) => {
+ state.credits= payload.credits
}
}
});
-export const { login, logout, checkingCredentials } = authSlice.actions
+export const { login, logout, checkingCredentials, verifyCredits } = authSlice.actions
export default authSlice.reducer
\ No newline at end of file
diff --git a/client/src/store/auth/thunks.ts b/client/src/store/auth/thunks.ts
index 902afc8..0890b7b 100644
--- a/client/src/store/auth/thunks.ts
+++ b/client/src/store/auth/thunks.ts
@@ -1,7 +1,7 @@
import { AnyAction } from "@reduxjs/toolkit";
import { ThunkAction } from "redux-thunk";
import { RootState } from "../store";
-import { checkingCredentials, login, logout } from './authSlice';
+import { checkingCredentials, login, logout, verifyCredits } from './authSlice';
@@ -11,7 +11,6 @@ export const startLoginWithGoogle = (): ThunkAction => {
+export const refetchCredits = (): ThunkAction => {
return async (dispatch, getState) => {
-
-
+ try {
+ const response = await fetch(`${import.meta.env.VITE_SERVER}/api/v1/generate/credits`, { credentials: 'include' });
+ const data = await response.json();
+
+ dispatch(verifyCredits(data))
+ } catch (error) {
+ console.log('error loading credits');
+ }
}
}
\ No newline at end of file
diff --git a/client/src/store/generator/genratorSlice.ts b/client/src/store/generator/genratorSlice.ts
new file mode 100644
index 0000000..e43fc8b
--- /dev/null
+++ b/client/src/store/generator/genratorSlice.ts
@@ -0,0 +1,62 @@
+import { createSlice } from "@reduxjs/toolkit";
+import { Post } from "../../types/post";
+
+type GeneratorState = Omit
+
+const initialState: GeneratorState = {
+ userid: '',
+ prompt: "",
+ negative_prompt: "",
+ image: "",
+ model: "",
+ width: '512',
+ height: '512'
+};
+
+const gallerySlice = createSlice({
+ name: 'generator',
+ initialState,
+ reducers: {
+ onSetId: (state, { payload }) => {
+ state.userid = payload
+ },
+ onSetPrompt: (state, { payload }) => {
+ state.prompt = payload
+ },
+ onSetNegativePrompt: (state, { payload }) => {
+ state.negative_prompt = payload
+ },
+ onSetNegativePromptBtn: (state, { payload }) => {
+ state.negative_prompt = state.negative_prompt.concat(" | " + payload)
+ },
+ onSetModel: (state, { payload }) => {
+ state.model = payload
+ },
+ onSetImage: (state, { payload }) => {
+ state.image = payload
+ },
+ onSetSize: (state, { payload }) => {
+ switch (payload) {
+ case '1/1':
+ state.width = '512'
+ state.height = '512'
+ break;
+
+ case '16/9':
+ state.width = '960'
+ state.height = '512'
+ break;
+ case '9/16':
+ state.width = '288'
+ state.height = '512'
+ break;
+ default:
+ break;
+ }
+ },
+ },
+});
+
+export const { onSetId, onSetPrompt, onSetNegativePrompt, onSetNegativePromptBtn, onSetModel, onSetImage, onSetSize } = gallerySlice.actions;
+
+export default gallerySlice.reducer;
diff --git a/client/src/store/store.ts b/client/src/store/store.ts
index e6c945e..002f081 100644
--- a/client/src/store/store.ts
+++ b/client/src/store/store.ts
@@ -2,11 +2,13 @@ import { configureStore } from '@reduxjs/toolkit'
import authSliceReduce from './auth/authSlice';
import gallerySliceReduce from './gallery/gallerySlice';
+import generatorSliceReduce from './generator/genratorSlice';
export const store = configureStore({
reducer: {
auth: authSliceReduce,
- gallery: gallerySliceReduce
+ gallery: gallerySliceReduce,
+ generator: generatorSliceReduce
},
})
diff --git a/client/src/types/post.ts b/client/src/types/post.ts
index 8eb5f82..017645a 100644
--- a/client/src/types/post.ts
+++ b/client/src/types/post.ts
@@ -1,9 +1,16 @@
import { User } from './user';
-export interface Post{
+export interface Post {
userid: string,
prompt: string,
negative_prompt: string,
image: string,
+ width: string,
+ height: string,
model: string,
- user?:User
+ user?:User,
+ image_data?:{
+ encoded: string,
+ width: number,
+ height: number
+ }
}
\ No newline at end of file
diff --git a/client/src/types/user.ts b/client/src/types/user.ts
index 890df2e..2da80c9 100644
--- a/client/src/types/user.ts
+++ b/client/src/types/user.ts
@@ -7,5 +7,14 @@ export interface User {
slug: string,
email: string,
profilePic: string,
- posts: Post[]
-}
\ No newline at end of file
+ posts: Post[],
+ credits: number,
+}
+
+export type History = {
+ _id: string,
+ prompt: string,
+ negative_prompt: string,
+ image: string,
+ model: string,
+}
diff --git a/client/src/utils/models.ts b/client/src/utils/models.ts
index 74eccc1..5343676 100644
--- a/client/src/utils/models.ts
+++ b/client/src/utils/models.ts
@@ -1,132 +1,118 @@
import { Model } from "../types/model";
export const modelList: Model[] = [
-
+ {
+ name: 'majicMIX Fantasy',
+ mode_id: 'majicmixfantasy',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687821322/PixelAI/2981986281684908770_soipeb.jpg',
+ active: false
+ },
+ {
+ name: 'Disney Pixal Cartoon Type',
+ mode_id: 'disney-pixal-cartoon',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687821406/PixelAI/42705-1080836037-_masterpiece_best_quality_ultra-detailed_highly_detailed_CG_illustration_an_extremely_delicate_and_beauti_z6ujvf.jpg',
+ active: false
+ },
{
name: 'Dream Shaper',
mode_id: 'dream-shaper-8797',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/9782515001675014614.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820345/PixelAI/5_m5hmxw.png',
active: false
},
{
name: 'Redshift Diffusion',
mode_id: 'redshift-diffusion',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/12363803511669563372.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820433/PixelAI/9860833e-e8f7-404a-94dc-270b25df05c8-0_v3rxyp.png',
active: false
},
{
name: 'Arcane Diffusion',
mode_id: 'arcane-diffusion',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/1493213501669561761.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820482/PixelAI/69438-3187489593-arcane_style___1girl_arm_tattoo_asymmetrical_bangs_bangs_blue_hair_braid_brown_shirt_cloud_tattoo_looking_at_viewer_lau_nrwaj7.jpg',
active: false
},
{
name: 'Stable Diffusion 2.1',
mode_id: 'stable-diffu-5089',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/1829088371675101187.png',
- active: false
- },
- {
- name: 'Project Unreal Engine 5',
- mode_id: 'project-unreal-engin',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/171433501675425853.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820631/PixelAI/1628938322191950983_imaixu.jpg',
active: false
},
{
name: 'Vintedois',
mode_id: 'vintedois-diffusion',
- image_url: 'https://stablediffusionapi.com/storage/generations/vintedois.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820692/PixelAI/vintedois_qvkvvw.png',
active: false
},
{
name: 'Deliberate',
mode_id: 'deliberate',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/3577020801675158232.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820733/PixelAI/download_eqxzd5.jpg',
active: false
},
{
name: 'Elldreth Vivid Mix',
mode_id: 'elldreths-vi',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/5642196911675175414.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820781/PixelAI/12373-3660953056-award_winning_waist_up_photo_of_a_rugged_fantasy_wizard_8K_wizard_hat_wearing_torn_wizard_robes_old_and_wrinkled_long_white_z4flgy.jpg',
active: false
},
{
name: 'Realistic Vision V1.3',
mode_id: 'realistic-vision-v13',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/593190021675281138.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820851/PixelAI/download_xbpa4p.jpg',
active: false
},
{
name: 'OpenJourney V2',
mode_id: 'midjourney-v2',
- image_url: 'https://stablediffusionapi.com//storage/generations/out-0.png',
- active: false
- },
- {
- name: 'Babes',
- mode_id: 'babes',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/479676201675092529.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820869/PixelAI/out-0_ww5vmc.png',
active: false
},
{
name: 'Anything V4',
mode_id: 'anything-v4',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/14779611201675081298.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820897/PixelAI/Anything_v4_sucks_00004-2158472955-a_happy_furry_fandom_male_Khajiit_white_brown_male_tiger_big_nose_round_iris_wears_an_open_jacket_close_up_masculine_zs1azq.jpg',
active: false
},
- {
- name: 'redream',
- mode_id: 'redream',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/21177596551674938226.png',
- active: false
- },
-
{
name: 'Low Poly World',
mode_id: 'lowpoly-diffusion',
- image_url: 'https://stablediffusionapi.com//storage/generations/lowpoly.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820942/PixelAI/prompthero-prompt-4194159f9d3_qbcwqv.png',
active: false
},
{
name: 'F222',
mode_id: 'f222-diffusion',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/6729910051670825439.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820974/PixelAI/prompthero-prompt-af7e72451e1_a8rsdd.webp',
active: false
},
{
name: 'MidJourney PaperCut',
mode_id: 'midjourney-papercut',
- image_url: 'https://s3.amazonaws.com/moonup/production/uploads/1668139335005-633a520aecbd8b19357b4806.png',
- active: false
- },
- {
- name: 'SynthwavePunk',
- mode_id: 'synthwave-diffusion',
- image_url: 'https://s3.amazonaws.com/moonup/production/uploads/1670018139245-635eafb49f24f6db0a1eafd1.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687820995/PixelAI/1668139335005-633a520aecbd8b19357b4806_iya7bj.png',
active: false
},
{
name: 'Robo Diffusion',
mode_id: 'robo-diffusion',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/17449677621669563875.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687821023/PixelAI/robo_example_byfqln.png',
active: false
},
{
name: 'GTA5 Artwork Diffusion',
mode_id: 'gta5-artwork-diffusi',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/20313028851675529498.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687821046/PixelAI/1670902497106-635eafb49f24f6db0a1eafd1_gbgti8.png',
active: false
},
{
name: 'MidJourney V4',
mode_id: 'midjourney',
- image_url: 'https://d1okzptojspljx.cloudfront.net/generations/14853540911669470514.png',
+ image_url: 'https://res.cloudinary.com/dzx6dg1ws/image/upload/v1687821069/PixelAI/8-midjourney-v4-v0-774tqcg0fz5a1_ngbk53.webp',
active: false
},
]
-export const getActiveFalse = ()=>{
- return modelList.map(model => ({...model, active:false}));
+export const getActiveFalse = () => {
+ return modelList.map(model => ({ ...model, active: false }));
}
\ No newline at end of file
diff --git a/client/tailwind.config.cjs b/client/tailwind.config.cjs
index 77b537f..fb2035b 100644
--- a/client/tailwind.config.cjs
+++ b/client/tailwind.config.cjs
@@ -1,20 +1,22 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
- content: ['./src/**/*.{ts,tsx}'],
+ content: ["./src/**/*.{ts,tsx}", "./node_modules/flowbite/**/*.js"],
+ plugins: [require("flowbite/plugin")],
+
theme: {
extend: {
screens: {
- xs: '480px',
+ xs: "480px",
},
colors: {
- 'bgColor': '#202020',
- "hover":"#333333"
+ bgColor: "#202020",
+ hover: "#333333",
},
fontFamily: {
- inter: ['Inter var', 'sans-serif'],
+ inter: ["Inter var", "sans-serif"],
},
},
},
plugins: [],
-};
\ No newline at end of file
+};
diff --git a/client/vercel.json b/client/vercel.json
new file mode 100644
index 0000000..998278c
--- /dev/null
+++ b/client/vercel.json
@@ -0,0 +1,8 @@
+{
+ "rewrites": [
+ {
+ "source": "/(.*)",
+ "destination": "/"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/pixelai.png b/pixelai.png
new file mode 100644
index 0000000..eb41e80
Binary files /dev/null and b/pixelai.png differ
diff --git a/server/.example.env b/server/.example.env
new file mode 100644
index 0000000..223d4bc
--- /dev/null
+++ b/server/.example.env
@@ -0,0 +1,12 @@
+PORT=8000
+SD_API_Key= stable diffusion api key
+MONGODB_CNN= mongo connection
+GOOGLE_CLIENT_ID= google cloud
+GOOGLE_SECRET_ID= google cloud
+FACEBOOK_APP_ID= Facebook login API
+FACEBOOK_APP_SECRET= Facebook login API
+CLOUDINARY_CLOUD_NAME=
+CLOUDINARY_API_KEY=
+CLOUDINARY_API_SECRET=
+COOKIE_SECRET= any text that serves as a key for the cookie
+CLIENT_URL= ULR frontend
\ No newline at end of file
diff --git a/server/controllers/auth.ts b/server/controllers/auth.ts
index 7ffd298..0e0b6ef 100644
--- a/server/controllers/auth.ts
+++ b/server/controllers/auth.ts
@@ -3,7 +3,7 @@ import { Request, Response } from "express";
export const loginSuccess = async (req: Request, res: Response) => {
- console.log(req.user);
+ // console.log(req.user);
if (req.user) {
diff --git a/server/controllers/generate.ts b/server/controllers/generate.ts
index 7360494..0782bdf 100644
--- a/server/controllers/generate.ts
+++ b/server/controllers/generate.ts
@@ -1,26 +1,30 @@
import { Request, Response } from "express"
import { fetchApi, fetchApiWithoutModel } from "../helpers/fetchAPi";
+import User from "../models/mongo/User";
export const generateImage = async (req: Request, res: Response) => {
- const { prompt, negative_prompt, model } = req.body;
+ const { prompt, negative_prompt, model, width, height } = req.body;
+
+ const userId = req.user['_id'];
+ const user = await User.findById(userId);
try {
let data;
if(model===''){
- data = await fetchApiWithoutModel(prompt, negative_prompt)
+ data = await fetchApiWithoutModel(prompt, negative_prompt, width, height)
}else{
- data = await fetchApi(prompt, negative_prompt, model)
+ data = await fetchApi(prompt, negative_prompt, model, width, height)
}
- console.log(data);
-
if( data.message === 'Server Error' || data.status === 'failed'){
return res.status(500).json({
'message': 'Try without selecting a model'
})
}
+ // REFACTOR---
+
if (data.status === 'processing') {
console.log('prrroocceessisingg');
@@ -36,6 +40,9 @@ export const generateImage = async (req: Request, res: Response) => {
})
data = await response.json();
+ user.credits -= 1;
+ user.history.push({prompt, negative_prompt, model, image: data.output[0]})
+ await user.save();
return res.status(200).json({
'image': data.output[0]
})
@@ -45,15 +52,31 @@ export const generateImage = async (req: Request, res: Response) => {
}else if(data.status === 'error'){
return res.status(500).json({
- 'message': 'Fuera de servicio'
+ 'message': 'Out of service'
})
}else{
+ user.credits -= 1;
+ user.history.push({prompt, negative_prompt, model, image: data.output[0]})
+ await user.save();
+
return res.status(200).json({
'image': data.output[0]
})
}
+ } catch (error) {
+ res.status(500).send('Something went wrong')
+ }
+}
+
+export const verifyCredits = async (req: Request, res: Response)=>{
+ const userId = req.user['_id'];
+ try {
+ const user = await User.findById(userId);
+ return res.status(200).json({
+ 'credits': user.credits
+ })
} catch (error) {
res.status(500).send('Something went wrong')
}
diff --git a/server/controllers/post.ts b/server/controllers/post.ts
index 0411bda..7114203 100644
--- a/server/controllers/post.ts
+++ b/server/controllers/post.ts
@@ -1,33 +1,51 @@
import { Request, Response } from "express"
import Post from "../models/mongo/Post";
import User from "../models/mongo/User";
+import cd from 'cloudinary'
+const cloudinary = cd.v2
+import dotenv from 'dotenv';
+import { blurhashFromURL } from "../helpers/blurhash-from-url";
+dotenv.config();
+
+cloudinary.config({
+ cloud_name: process.env.CLOUDINARY_CLOUD_NAME,
+ api_key: process.env.CLOUDINARY_API_KEY,
+ api_secret: process.env.CLOUDINARY_API_SECRET,
+});
export const getPosts = async (req: Request, res: Response) => {
const { limit = 10, since = 0, text = "", model = "" } = req.query;
- console.log(model);
let posts;
- if (model) {
- posts = await Post.find({ prompt: { $regex: text }, model: model })
- .sort({ $natural: -1 })
- .skip(Number(since))
- .limit(Number(limit))
- .populate('user')
- } else {
- posts = await Post.find({ prompt: { $regex: text } })
- .sort({ $natural: -1 })
- .skip(Number(since))
- .limit(Number(limit))
- .populate('user')
- }
-
+ try {
+ if (model) {
+ posts = await Post.find({ prompt: { $regex: text }, model: model })
+ .sort({ $natural: -1 })
+ .skip(Number(since))
+ .limit(Number(limit))
+ .populate('user', 'username slug profilePic')
+ } else {
+ posts = await Post.find({ prompt: { $regex: text } })
+ .sort({ $natural: -1 })
+ .skip(Number(since))
+ .limit(Number(limit))
+ .populate('user', 'username slug profilePic')
+ }
+
+ return res.json({
+ posts
+ })
+ } catch (error) {
+ console.log(error);
- res.json({
- posts
- })
+ return res.status(500).json({
+ msg: error,
+ error
+ })
+ }
}
export const createPost = async (req: Request, res: Response) => {
@@ -38,12 +56,18 @@ export const createPost = async (req: Request, res: Response) => {
try {
const user = await User.findById(userid);
+ const { secure_url } = await cloudinary.uploader.upload(image)
+
+ // blur load
+ const image_data = await blurhashFromURL(secure_url)
+
const postDB = new Post({
model,
prompt,
- image,
+ image: secure_url,
negative_prompt,
- user: user._id
+ user: user._id,
+ image_data
});
diff --git a/server/controllers/user.ts b/server/controllers/user.ts
index 2371250..2eb143f 100644
--- a/server/controllers/user.ts
+++ b/server/controllers/user.ts
@@ -3,13 +3,11 @@ import User from "../models/mongo/User";
export const getUser = async (req: Request, res: Response) => {
const { slug } = req.params;
-
-
+
try {
-
- const user = await User.find({slug}).populate('posts')
-
- res.json({
+ const user = await User.find({ slug }).select('-history').populate('posts')
+
+ return res.json({
user
})
@@ -17,5 +15,16 @@ export const getUser = async (req: Request, res: Response) => {
} catch (error) {
return res.status(401).json({ msg: 'User not found' });
}
+}
+
+export const getHistory = async (req: Request, res: Response) => {
+ const userId = req.user['_id'];
+
+ try {
+ const user = await User.findById(userId);
+ return res.status(200).json(user.history)
+ } catch (error) {
+ res.status(500).send('Something went wrong')
+ }
+}
-}
\ No newline at end of file
diff --git a/server/helpers/blurhash-from-url.ts b/server/helpers/blurhash-from-url.ts
new file mode 100644
index 0000000..68379ea
--- /dev/null
+++ b/server/helpers/blurhash-from-url.ts
@@ -0,0 +1,57 @@
+// import fetch from "node-fetch";
+import { encode, decode } from "blurhash";
+import sharp from 'sharp';
+import sizeOf from "image-size";
+
+export interface IOptions {
+ size?: number;
+}
+
+export interface IInput {
+ url: string;
+ options?: IOptions;
+}
+export interface IOutput {
+ encoded: string;
+ width: number;
+ height: number;
+}
+
+export const blurhashFromURL = async (url: string, options: IOptions = {}) => {
+ const { size = 4 } = options;
+
+ const response = await fetch(url);
+ const arrayBuffer = await response.arrayBuffer();
+ console.log(arrayBuffer);
+
+ const returnedBuffer = Buffer.from(arrayBuffer);
+
+ const { width, height, } = sizeOf(returnedBuffer);
+
+ const { info, data } = await sharp(returnedBuffer)
+ .resize(size, size, {
+ fit: "inside",
+ })
+ .ensureAlpha()
+ .raw()
+ .toBuffer({
+ resolveWithObject: true,
+ });
+
+
+ const encoded = encode(
+ new Uint8ClampedArray(data),
+ info.width,
+ info.height,
+ 4,
+ 4
+ );
+
+ const output: IOutput = {
+ encoded,
+ width,
+ height,
+ };
+
+ return JSON.parse(JSON.stringify(output));
+};
\ No newline at end of file
diff --git a/server/helpers/createSlug.ts b/server/helpers/createSlug.ts
index 5bde2d0..7f1571d 100644
--- a/server/helpers/createSlug.ts
+++ b/server/helpers/createSlug.ts
@@ -2,6 +2,9 @@ export const createSlug = (nombre) => {
let slug = nombre.trim().toLowerCase();
slug = slug.replace(/[^a-z0-9]+/g, "_");
-
+
+ const randomNumber = Math.floor(Math.random() * 10000);
+ slug += `-${randomNumber}`;
+
return slug;
}
\ No newline at end of file
diff --git a/server/helpers/fetchAPi.ts b/server/helpers/fetchAPi.ts
index d0c098d..777a8fd 100644
--- a/server/helpers/fetchAPi.ts
+++ b/server/helpers/fetchAPi.ts
@@ -1,20 +1,28 @@
-export const fetchApi = async (prompt: string, negative_prompt: string, model: string) => {
- const gen = {
- "key": process.env.SD_API_Key,
- "model_id": model,
- "prompt": prompt,
- "negative_prompt": negative_prompt,
- "width": "512",
- "height": "512",
- "samples": "1",
- "num_inference_steps": 60,
- "safety_checker": "not",
- "seed": 2029243644,
- "guidance_scale": 13,
- "webhook": null,
- "track_id": null
- }
-
+
+const options = (prompt: string, negative_prompt: string, width: string, height: string) => ({
+ "key": process.env.SD_API_Key,
+ "prompt": prompt,
+ "negative_prompt": negative_prompt + " nsfw, nude, tits, pussy, masturbating, cum, breasts, small_breasts",
+ "width": width,
+ "height": height,
+ "samples": "1",
+ "num_inference_steps": 60,
+ "seed": 2029243644,
+ "guidance_scale": 13,
+ "safety_checker": "yes",
+ "webhook": null,
+ "track_id": null
+})
+
+interface optionsWithModel extends ReturnType {
+ model_id?: string
+}
+
+export const fetchApi = async (prompt: string, negative_prompt: string, model: string, width: string, height: string) => {
+ const gen = options(prompt, negative_prompt, width, height) as optionsWithModel
+ gen.model_id = model
+
+
const response = await fetch('https://stablediffusionapi.com/api/v3/dreambooth', {
method: 'POST',
headers: {
@@ -26,22 +34,9 @@ export const fetchApi = async (prompt: string, negative_prompt: string, model: s
return await response.json();
}
-export const fetchApiWithoutModel = async (prompt: string, negative_prompt: string) => {
- const gen = {
- "key": process.env.SD_API_Key,
- "prompt": prompt,
- "negative_prompt": negative_prompt,
- "width": "512",
- "height": "512",
- "samples": "1",
- "num_inference_steps": 60,
- "seed": 2029243644,
- "guidance_scale": 13,
- "safety_checker": "not",
- "webhook": null,
- "track_id": null
- }
-
+export const fetchApiWithoutModel = async (prompt: string, negative_prompt: string, width: string, height: string) => {
+ const gen = options(prompt, negative_prompt, width, height)
+
const response = await fetch('https://stablediffusionapi.com/api/v3/text2img', {
method: 'POST',
headers: {
diff --git a/server/helpers/passport.ts b/server/helpers/passport.ts
index 8af44c9..498a923 100644
--- a/server/helpers/passport.ts
+++ b/server/helpers/passport.ts
@@ -1,4 +1,5 @@
import { Strategy as GoogleStrategy } from 'passport-google-oauth20'
+import {Strategy as FacebookStrategy} from 'passport-facebook'
import passport from 'passport'
import * as dotenv from 'dotenv';
import User from '../models/mongo/User';
@@ -35,6 +36,36 @@ passport.use(
)
)
+passport.use(
+ new FacebookStrategy(
+ {
+ clientID: `${process.env.FACEBOOK_APP_ID}`,
+ clientSecret: `${process.env.FACEBOOK_APP_SECRET}`,
+ callbackURL: `https://pixelai.azurewebsites.net/api/v1/auth/facebook/callback`,
+ profileFields: ['id', 'displayName', 'picture', 'emails']
+ },
+ async (_accessToken: string, _refreshToken: string, profile: any, done) => {
+ const user = await User.findById(profile.id);
+ // console.log(profile, 'passport');
+
+ if (user) {
+ return done(null, user);
+
+ } else {
+ const newuser = await User.create({
+ username: profile.displayName,
+ slug: createSlug(profile.displayName),
+ email: `${profile.id}-${profile.displayName}`,
+ profilePic: profile.photos[0].value,
+ _id: profile.id
+ })
+ return done(null, newuser);
+ }
+ }
+ )
+)
+
+
passport.serializeUser((user:any, done) => {
done(null, user.id)
})
diff --git a/server/middlewares/checkCredits.ts b/server/middlewares/checkCredits.ts
new file mode 100644
index 0000000..bad1e5a
--- /dev/null
+++ b/server/middlewares/checkCredits.ts
@@ -0,0 +1,24 @@
+import { Request, Response } from "express";
+import User from "../models/mongo/User";
+
+
+
+
+export const checkCredits = async (req: Request, res: Response, next) => {
+ const userId = req.user['_id'];
+ const user = await User.findById(userId);
+
+ if (!user) {
+ return res.status(404).json({ message: 'User not found' });
+ }
+
+ if (user.credits < 1) {
+ return res.status(400).json({ message: 'Insufficient credits' });
+ }
+
+ req.user = user;
+
+ next();
+ };
+
+
\ No newline at end of file
diff --git a/server/middlewares/isAuthenticated.ts b/server/middlewares/isAuthenticated.ts
new file mode 100644
index 0000000..d4d9cb7
--- /dev/null
+++ b/server/middlewares/isAuthenticated.ts
@@ -0,0 +1,17 @@
+import { Request, Response } from "express";
+
+declare global {
+ namespace Express {
+ interface User {
+ credits: number;
+ }
+ }
+ }
+
+export const isAuthenticated = (req: Request, res: Response, next) => {
+
+ if (req.isAuthenticated()) {
+ return next();
+ }
+ return res.status(401).json({ error: 'Unauthorized' });
+}
\ No newline at end of file
diff --git a/server/models/Server.ts b/server/models/Server.ts
index 31f0938..6172678 100644
--- a/server/models/Server.ts
+++ b/server/models/Server.ts
@@ -11,6 +11,11 @@ import helmet from "helmet";
import session from "express-session";
import '../helpers/passport'
import userRouter from "../routes/userRoute";
+import * as dotenv from 'dotenv';
+dotenv.config();
+
+let clientURL: string = process.env.CLIENT_URL
+
class Server {
private app: Application;
@@ -51,7 +56,7 @@ class Server {
name: 'MyCoolWebAppCookieName',
cookie: {
secure: true,
- httpOnly: false,
+ httpOnly: true,
sameSite: 'none'
}
}))
@@ -70,6 +75,9 @@ class Server {
this.app.use(`/api/v1${this.paths.post}`, postRouter)
this.app.use(`/api/v1${this.paths.auth}`, authRouter)
this.app.use(`/api/v1${this.paths.user}`, userRouter)
+ this.app.get('/', (req, res) => {
+ res.redirect(clientURL);
+ });
}
listen() {
diff --git a/server/models/mongo/Post.ts b/server/models/mongo/Post.ts
index e9e698a..ef19a51 100644
--- a/server/models/mongo/Post.ts
+++ b/server/models/mongo/Post.ts
@@ -6,6 +6,12 @@ const PostSchema = new Schema({
prompt: { type: String, required: [true, 'prompt is required'] },
negative_prompt: { type: String },
image: { type: String, required: [true, 'image url is required'] },
+ image_data:
+ {
+ encoded: { type: String },
+ width: {type: Number},
+ height: {type: Number}
+ },
user: {
type: String,
ref: 'User'
diff --git a/server/models/mongo/User.ts b/server/models/mongo/User.ts
index f5970de..e78a6af 100644
--- a/server/models/mongo/User.ts
+++ b/server/models/mongo/User.ts
@@ -24,7 +24,20 @@ const UserSchema = new Schema({
posts: [{
type: Schema.Types.ObjectId,
ref: 'Post'
+ }],
+ credits: {
+ type: Number,
+ required: true,
+ default: 10
+ },
+ history: [{
+ model: { type: String, },
+ prompt: { type: String, required: [true, 'prompt is required'] },
+ negative_prompt: { type: String },
+ image: { type: String, required: [true, 'image url is required'] },
}]
})
+
+
export default model('User', UserSchema)
diff --git a/server/package-lock.json b/server/package-lock.json
index 6498b88..0ca7722 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -7,20 +7,23 @@
"": {
"name": "server",
"version": "1.0.0",
- "license": "ISC",
"dependencies": {
"bcryptjs": "^2.4.3",
- "cloudinary": "^1.33.0",
+ "blurhash": "^2.0.5",
+ "cloudinary": "^1.35.0",
"cors": "^2.8.5",
"dotenv": "^16.0.3",
"express": "^4.18.2",
"express-session": "^1.17.3",
"express-validator": "^6.14.3",
"helmet": "^6.0.1",
+ "image-size": "^1.0.2",
"mongoose": "^6.9.0",
"morgan": "^1.10.0",
"passport": "^0.6.0",
- "passport-google-oauth20": "^2.0.0"
+ "passport-facebook": "^3.0.0",
+ "passport-google-oauth20": "^2.0.0",
+ "sharp": "^0.32.0"
},
"devDependencies": {
"@types/bcryptjs": "^2.4.2",
@@ -32,6 +35,7 @@
"@types/node": "^18.11.18",
"@types/passport": "^1.0.11",
"@types/passport-google-oauth20": "^2.0.11",
+ "@types/sharp": "^0.31.1",
"ts-node": "^10.9.1",
"typescript": "^4.9.5"
}
@@ -1328,6 +1332,15 @@
"@types/node": "*"
}
},
+ "node_modules/@types/sharp": {
+ "version": "0.31.1",
+ "resolved": "https://registry.npmjs.org/@types/sharp/-/sharp-0.31.1.tgz",
+ "integrity": "sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
"node_modules/@types/webidl-conversions": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
@@ -1481,6 +1494,42 @@
"resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
"integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="
},
+ "node_modules/bl": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+ "dependencies": {
+ "buffer": "^5.5.0",
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.4.0"
+ }
+ },
+ "node_modules/bl/node_modules/readable-stream": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/bl/node_modules/string_decoder": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+ "dependencies": {
+ "safe-buffer": "~5.2.0"
+ }
+ },
+ "node_modules/blurhash": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/blurhash/-/blurhash-2.0.5.tgz",
+ "integrity": "sha512-cRygWd7kGBQO3VEhPiTgq4Wc43ctsM+o46urrmPOiuAe+07fzlSB9OJVdpgDL0jPqXUVQ9ht7aq7kxOeJHRK+w=="
+ },
"node_modules/body-parser": {
"version": "1.20.1",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
@@ -1564,10 +1613,15 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/chownr": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+ },
"node_modules/cloudinary": {
- "version": "1.33.0",
- "resolved": "https://registry.npmjs.org/cloudinary/-/cloudinary-1.33.0.tgz",
- "integrity": "sha512-pdqOgd2QAMCFWujdYw1yhZ+lHPTzc6YIfg4WIvbRyoojIbSd/YgnHT8OSnk/OM4Q1WPFD5FM9EEom+4ehG80IA==",
+ "version": "1.35.0",
+ "resolved": "https://registry.npmjs.org/cloudinary/-/cloudinary-1.35.0.tgz",
+ "integrity": "sha512-0aRLVOaVsoiqDCNkSzlPGR/oYOlE3AGrtwFTPx7xlZCPyKNzqeD9t9ENmPwzHn3yn/afAvy4h1sqb2yPyJOAow==",
"dependencies": {
"cloudinary-core": "^2.10.2",
"core-js": "^3.6.5",
@@ -1589,6 +1643,43 @@
"lodash": ">=4.0"
}
},
+ "node_modules/color": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+ "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
+ "dependencies": {
+ "color-convert": "^2.0.1",
+ "color-string": "^1.9.0"
+ },
+ "engines": {
+ "node": ">=12.5.0"
+ }
+ },
+ "node_modules/color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dependencies": {
+ "color-name": "~1.1.4"
+ },
+ "engines": {
+ "node": ">=7.0.0"
+ }
+ },
+ "node_modules/color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+ },
+ "node_modules/color-string": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+ "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+ "dependencies": {
+ "color-name": "^1.0.0",
+ "simple-swizzle": "^0.2.2"
+ }
+ },
"node_modules/content-disposition": {
"version": "0.5.4",
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -1622,9 +1713,9 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
},
"node_modules/core-js": {
- "version": "3.27.2",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz",
- "integrity": "sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w==",
+ "version": "3.29.1",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.29.1.tgz",
+ "integrity": "sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -1672,6 +1763,28 @@
"ms": "2.0.0"
}
},
+ "node_modules/decompress-response": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+ "dependencies": {
+ "mimic-response": "^3.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/deep-extend": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
"node_modules/deep-is": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -1710,6 +1823,14 @@
"npm": "1.2.8000 || >= 1.4.16"
}
},
+ "node_modules/detect-libc": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+ "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/diff": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -1740,6 +1861,14 @@
"node": ">= 0.8"
}
},
+ "node_modules/end-of-stream": {
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+ "dependencies": {
+ "once": "^1.4.0"
+ }
+ },
"node_modules/escape-html": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -1806,6 +1935,14 @@
"node": ">= 0.6"
}
},
+ "node_modules/expand-template": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+ "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/express": {
"version": "4.18.2",
"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
@@ -1949,6 +2086,11 @@
"node": ">= 0.6"
}
},
+ "node_modules/fs-constants": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+ },
"node_modules/fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -2034,10 +2176,15 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"optional": true
},
+ "node_modules/github-from-package": {
+ "version": "0.0.0",
+ "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+ "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
+ },
"node_modules/graceful-fs": {
- "version": "4.2.10",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
- "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+ "version": "4.2.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
"optional": true
},
"node_modules/has": {
@@ -2188,11 +2335,30 @@
}
]
},
+ "node_modules/image-size": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.0.2.tgz",
+ "integrity": "sha512-xfOoWjceHntRb3qFCrh5ZFORYH8XCdYpASltMhZ/Q0KZiOwjdE/Yl2QCiWdwD+lygV5bMCvauzgu5PxBX/Yerg==",
+ "dependencies": {
+ "queue": "6.0.2"
+ },
+ "bin": {
+ "image-size": "bin/image-size.js"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
"node_modules/inherits": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
},
+ "node_modules/ini": {
+ "version": "1.3.8",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+ },
"node_modules/ip": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
@@ -2207,6 +2373,11 @@
"node": ">= 0.10"
}
},
+ "node_modules/is-arrayish": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+ "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
+ },
"node_modules/isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -2320,6 +2491,30 @@
"node": ">= 0.6"
}
},
+ "node_modules/mimic-response": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/mkdirp-classic": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+ },
"node_modules/mongodb": {
"version": "4.13.0",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.13.0.tgz",
@@ -2443,6 +2638,11 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
+ "node_modules/napi-build-utils": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+ "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
+ },
"node_modules/negotiator": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -2460,6 +2660,22 @@
"node": ">= 0.4.0"
}
},
+ "node_modules/node-abi": {
+ "version": "3.35.0",
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.35.0.tgz",
+ "integrity": "sha512-jAlSOFR1Bls963NmFwxeQkNTzqjUF0NThm8Le7eRIRGzFUVJuMOFZDLv5Y30W/Oaw+KEebEJLAigwO9gQHoEmw==",
+ "dependencies": {
+ "semver": "^7.3.5"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/node-addon-api": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.0.0.tgz",
+ "integrity": "sha512-GyHvgPvUXBvAkXa0YvYnhilSB1A+FRYMpIVggKzPZqdaZfevZOuzfWzyvgzOwRLHBeo/MMswmJFsrNF4Nw1pmA=="
+ },
"node_modules/oauth": {
"version": "0.9.15",
"resolved": "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz",
@@ -2500,6 +2716,14 @@
"node": ">= 0.8"
}
},
+ "node_modules/once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+ "dependencies": {
+ "wrappy": "1"
+ }
+ },
"node_modules/optionator": {
"version": "0.8.3",
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -2599,6 +2823,17 @@
"url": "https://github.com/sponsors/jaredhanson"
}
},
+ "node_modules/passport-facebook": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/passport-facebook/-/passport-facebook-3.0.0.tgz",
+ "integrity": "sha512-K/qNzuFsFISYAyC1Nma4qgY/12V3RSLFdFVsPKXiKZt434wOvthFW1p7zKa1iQihQMRhaWorVE1o3Vi1o+ZgeQ==",
+ "dependencies": {
+ "passport-oauth2": "1.x.x"
+ },
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
"node_modules/passport-google-oauth20": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz",
@@ -2647,6 +2882,31 @@
"resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
"integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
},
+ "node_modules/prebuild-install": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
+ "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
+ "dependencies": {
+ "detect-libc": "^2.0.0",
+ "expand-template": "^2.0.3",
+ "github-from-package": "0.0.0",
+ "minimist": "^1.2.3",
+ "mkdirp-classic": "^0.5.3",
+ "napi-build-utils": "^1.0.1",
+ "node-abi": "^3.3.0",
+ "pump": "^3.0.0",
+ "rc": "^1.2.7",
+ "simple-get": "^4.0.0",
+ "tar-fs": "^2.0.0",
+ "tunnel-agent": "^0.6.0"
+ },
+ "bin": {
+ "prebuild-install": "bin.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/prelude-ls": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -2716,6 +2976,15 @@
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
"optional": true
},
+ "node_modules/pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "dependencies": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
"node_modules/punycode": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
@@ -2747,6 +3016,14 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/queue": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
+ "integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
+ "dependencies": {
+ "inherits": "~2.0.3"
+ }
+ },
"node_modules/random-bytes": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
@@ -2777,6 +3054,20 @@
"node": ">= 0.8"
}
},
+ "node_modules/rc": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+ "dependencies": {
+ "deep-extend": "^0.6.0",
+ "ini": "~1.3.0",
+ "minimist": "^1.2.0",
+ "strip-json-comments": "~2.0.1"
+ },
+ "bin": {
+ "rc": "cli.js"
+ }
+ },
"node_modules/readable-stream": {
"version": "1.1.14",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
@@ -2825,6 +3116,36 @@
"node": ">=6"
}
},
+ "node_modules/semver": {
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
+ "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
+ "dependencies": {
+ "lru-cache": "^6.0.0"
+ },
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/semver/node_modules/lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/semver/node_modules/yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+ },
"node_modules/send": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -2872,6 +3193,28 @@
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
},
+ "node_modules/sharp": {
+ "version": "0.32.0",
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.0.tgz",
+ "integrity": "sha512-yLAypVcqj1toSAqRSwbs86nEzfyZVDYqjuUX8grhFpeij0DDNagKJXELS/auegDBRDg1XBtELdOGfo2X1cCpeA==",
+ "hasInstallScript": true,
+ "dependencies": {
+ "color": "^4.2.3",
+ "detect-libc": "^2.0.1",
+ "node-addon-api": "^6.0.0",
+ "prebuild-install": "^7.1.1",
+ "semver": "^7.3.8",
+ "simple-get": "^4.0.1",
+ "tar-fs": "^2.1.1",
+ "tunnel-agent": "^0.6.0"
+ },
+ "engines": {
+ "node": ">=14.15.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
"node_modules/side-channel": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -2890,6 +3233,57 @@
"resolved": "https://registry.npmjs.org/sift/-/sift-16.0.1.tgz",
"integrity": "sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ=="
},
+ "node_modules/simple-concat": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
+ },
+ "node_modules/simple-get": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "dependencies": {
+ "decompress-response": "^6.0.0",
+ "once": "^1.3.1",
+ "simple-concat": "^1.0.0"
+ }
+ },
+ "node_modules/simple-swizzle": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+ "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+ "dependencies": {
+ "is-arrayish": "^0.3.1"
+ }
+ },
"node_modules/smart-buffer": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@@ -2986,12 +3380,67 @@
"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
"optional": true
},
+ "node_modules/strip-json-comments": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+ "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/strnum": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
"integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
"optional": true
},
+ "node_modules/tar-fs": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+ "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+ "dependencies": {
+ "chownr": "^1.1.1",
+ "mkdirp-classic": "^0.5.2",
+ "pump": "^3.0.0",
+ "tar-stream": "^2.1.4"
+ }
+ },
+ "node_modules/tar-stream": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+ "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+ "dependencies": {
+ "bl": "^4.0.3",
+ "end-of-stream": "^1.4.1",
+ "fs-constants": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^3.1.1"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/tar-stream/node_modules/readable-stream": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/tar-stream/node_modules/string_decoder": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+ "dependencies": {
+ "safe-buffer": "~5.2.0"
+ }
+ },
"node_modules/toidentifier": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -3060,6 +3509,17 @@
"integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
"optional": true
},
+ "node_modules/tunnel-agent": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+ "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+ "dependencies": {
+ "safe-buffer": "^5.0.1"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/type-check": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -3130,6 +3590,11 @@
"node": ">= 0.8"
}
},
+ "node_modules/util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+ },
"node_modules/utils-merge": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -3170,9 +3635,9 @@
}
},
"node_modules/vm2": {
- "version": "3.9.13",
- "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz",
- "integrity": "sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q==",
+ "version": "3.9.14",
+ "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.14.tgz",
+ "integrity": "sha512-HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA==",
"optional": true,
"dependencies": {
"acorn": "^8.7.0",
@@ -3214,6 +3679,11 @@
"node": ">=0.10.0"
}
},
+ "node_modules/wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+ },
"node_modules/xregexp": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
diff --git a/server/package.json b/server/package.json
index f0a3989..411881c 100644
--- a/server/package.json
+++ b/server/package.json
@@ -11,20 +11,23 @@
},
"keywords": [],
"author": "",
- "license": "ISC",
"dependencies": {
"bcryptjs": "^2.4.3",
- "cloudinary": "^1.33.0",
+ "blurhash": "^2.0.5",
+ "cloudinary": "^1.35.0",
"cors": "^2.8.5",
"dotenv": "^16.0.3",
"express": "^4.18.2",
"express-session": "^1.17.3",
"express-validator": "^6.14.3",
"helmet": "^6.0.1",
+ "image-size": "^1.0.2",
"mongoose": "^6.9.0",
"morgan": "^1.10.0",
"passport": "^0.6.0",
- "passport-google-oauth20": "^2.0.0"
+ "passport-facebook": "^3.0.0",
+ "passport-google-oauth20": "^2.0.0",
+ "sharp": "^0.32.0"
},
"devDependencies": {
"@types/bcryptjs": "^2.4.2",
@@ -36,6 +39,7 @@
"@types/node": "^18.11.18",
"@types/passport": "^1.0.11",
"@types/passport-google-oauth20": "^2.0.11",
+ "@types/sharp": "^0.31.1",
"ts-node": "^10.9.1",
"typescript": "^4.9.5"
}
diff --git a/server/routes/authRouter.ts b/server/routes/authRouter.ts
index 4061159..a473e04 100644
--- a/server/routes/authRouter.ts
+++ b/server/routes/authRouter.ts
@@ -10,7 +10,7 @@ let clientURL: string = process.env.CLIENT_URL
const authRouter = Router();
-authRouter.get('/login/success',loginSuccess)
+authRouter.get('/login/success', loginSuccess)
authRouter.get('/login/failed', loginFailed)
@@ -21,6 +21,13 @@ authRouter.get('/google/callback', passport.authenticate('google', {
failureRedirect: '/login/failed'
}))
+authRouter.get("/facebook", passport.authenticate('facebook', { scope: 'email' }));
+
+authRouter.get('/facebook/callback', passport.authenticate('facebook', {
+ successRedirect: clientURL,
+ failureRedirect: '/login/failed'
+}))
+
authRouter.get('/logout', logout)
export default authRouter;
\ No newline at end of file
diff --git a/server/routes/generateRouter.ts b/server/routes/generateRouter.ts
index 0613acd..205d003 100644
--- a/server/routes/generateRouter.ts
+++ b/server/routes/generateRouter.ts
@@ -1,13 +1,22 @@
import { Router } from "express";
import { check } from "express-validator";
-import { generateImage } from "../controllers/generate";
+import { generateImage, verifyCredits } from "../controllers/generate";
import { validate } from "../middlewares/validate";
+import { isAuthenticated } from "../middlewares/isAuthenticated";
+import { checkCredits } from "../middlewares/checkCredits";
const generateRouter = Router();
generateRouter.post('/',[
+ isAuthenticated,
+ checkCredits,
check('prompt',"Prompt is required").not().isEmpty(),
validate
], generateImage)
+generateRouter.get('/credits', [
+ isAuthenticated,
+ validate
+], verifyCredits)
+
export default generateRouter
\ No newline at end of file
diff --git a/server/routes/userRoute.ts b/server/routes/userRoute.ts
index 339bf21..932e30b 100644
--- a/server/routes/userRoute.ts
+++ b/server/routes/userRoute.ts
@@ -1,10 +1,15 @@
import { Router } from "express";
-import { getUser } from "../controllers/user";
+import { getHistory, getUser } from "../controllers/user";
+import { isAuthenticated } from "../middlewares/isAuthenticated";
+import { validate } from "../middlewares/validate";
const userRouter = Router();
-userRouter.get('/:slug', getUser)
-
+userRouter.get('/history',[
+ isAuthenticated,
+ validate
+],getHistory)
+userRouter.get('/:slug', getUser)
export default userRouter
\ No newline at end of file
diff --git "a/task/Task_2_AI_vs_Human\342\200\223Academic_Essay_Authenticity_Challenge.ipynb" "b/task/Task_2_AI_vs_Human\342\200\223Academic_Essay_Authenticity_Challenge.ipynb"
new file mode 100644
index 0000000..b284c13
--- /dev/null
+++ "b/task/Task_2_AI_vs_Human\342\200\223Academic_Essay_Authenticity_Challenge.ipynb"
@@ -0,0 +1,739 @@
+{
+ "nbformat": 4,
+ "nbformat_minor": 0,
+ "metadata": {
+ "colab": {
+ "provenance": [],
+ "mount_file_id": "1mYWOZdUA25h-MHks0Yy4f-UW-ge7Xyms",
+ "authorship_tag": "ABX9TyMna4pfYo5KLeNb1ANM0rZu",
+ "include_colab_link": true
+ },
+ "kernelspec": {
+ "name": "python3",
+ "display_name": "Python 3"
+ },
+ "language_info": {
+ "name": "python"
+ }
+ },
+ "cells": [
+ {
+ "cell_type": "markdown",
+ "metadata": {
+ "id": "view-in-github",
+ "colab_type": "text"
+ },
+ "source": [
+ "\n",
+ "
\n",
+ "\n",
+ "
\n",
+ " \n",
+ " \n",
+ " id \n",
+ " essay \n",
+ " label \n",
+ " \n",
+ " \n",
+ " \n",
+ " \n",
+ " 0 \n",
+ " cc7727e8bfbc6e0051b71ceeeb928755def0f5e94b5168... \n",
+ " I disagree with the statement that the develop... \n",
+ " ai \n",
+ " \n",
+ " \n",
+ " 1 \n",
+ " fa7e1bc99ea20c78df905eb3780cb835bed078b64fce6a... \n",
+ " I disagree with the statement that the primary... \n",
+ " ai \n",
+ " \n",
+ " \n",
+ " 2 \n",
+ " d16ec17f6ffd059cf2eefe79ca2ccd9bdb78ea5ec2d6a0... \n",
+ " International sports events require the most w... \n",
+ " human \n",
+ " \n",
+ " \n",
+ " 3 \n",
+ " 838f538cf1b0e03e51e423266844492af1a72874a224d4... \n",
+ " While some individuals may argue that working ... \n",
+ " ai \n",
+ " \n",
+ " \n",
+ " 4 \n",
+ " cd9fe478b001e04bcdc276f9675b90bc8c6332a7ea8abf... \n",
+ " I disagree with the statement that working rem... \n",
+ " ai \n",
+ " \n",
+ " \n",
+ " ... \n",
+ " ... \n",
+ " ... \n",
+ " ... \n",
+ " \n",
+ " \n",
+ " 2091 \n",
+ " 1cf89b43ddf6f54c41ce5ff8d584dd47fbe21fc9007048... \n",
+ " Capital punishment is always associated with i... \n",
+ " human \n",
+ " \n",
+ " \n",
+ " 2092 \n",
+ " 90aeae7d7df06d9e45cff4494973ad4cc668aa92f395b7... \n",
+ " Sport play an essential role in shaping the pe... \n",
+ " human \n",
+ " \n",
+ " \n",
+ " 2093 \n",
+ " a6ac8461fe6b71161372b63438d531af3168e3f4c5ce1c... \n",
+ " It is true that artificial activities cause te... \n",
+ " human \n",
+ " \n",
+ " \n",
+ " 2094 \n",
+ " a0bf652b04c7f6fdfea48ccabcc853aa21c832ce749257... \n",
+ " Packing of goods has become a noticeable issue... \n",
+ " human \n",
+ " \n",
+ " \n",
+ " 2095 \n",
+ " 21847eeb48b24217c3c17297c1d7ea3856d234e5c76ae2... \n",
+ " In my opinion, cultural traditions should be p... \n",
+ " ai \n",
+ " \n",
+ " \n",
+ "
\n",
+ "
2096 rows × 3 columns
\n",
+ "
\n",
+ "
\n",
+ "
\n",
+ "\n",
+ "
\n",
+ " \n",
+ " \n",
+ " count \n",
+ " \n",
+ " \n",
+ " label \n",
+ " \n",
+ " \n",
+ " \n",
+ " \n",
+ " ai \n",
+ " 1467 \n",
+ " \n",
+ " \n",
+ " human \n",
+ " 629 \n",
+ " \n",
+ " \n",
+ "
\n",
+ "
dtype: int64\n",
+ "\n",
+ "
\n",
+ " \n",
+ " \n",
+ " label \n",
+ " \n",
+ " \n",
+ " \n",
+ " \n",
+ " 0 \n",
+ " ai \n",
+ " \n",
+ " \n",
+ " 1 \n",
+ " ai \n",
+ " \n",
+ " \n",
+ " 2 \n",
+ " human \n",
+ " \n",
+ " \n",
+ " 3 \n",
+ " ai \n",
+ " \n",
+ " \n",
+ " 4 \n",
+ " ai \n",
+ " \n",
+ " \n",
+ " ... \n",
+ " ... \n",
+ " \n",
+ " \n",
+ " 2091 \n",
+ " human \n",
+ " \n",
+ " \n",
+ " 2092 \n",
+ " human \n",
+ " \n",
+ " \n",
+ " 2093 \n",
+ " human \n",
+ " \n",
+ " \n",
+ " 2094 \n",
+ " human \n",
+ " \n",
+ " \n",
+ " 2095 \n",
+ " ai \n",
+ " \n",
+ " \n",
+ "
\n",
+ "
2096 rows × 1 columns
\n",
+ "
dtype: object 
+ )}
+
+ );
+};
diff --git a/client/src/components/GeneratePage/generator/Form.tsx b/client/src/components/GeneratePage/generator/Form.tsx
new file mode 100644
index 0000000..daac23f
--- /dev/null
+++ b/client/src/components/GeneratePage/generator/Form.tsx
@@ -0,0 +1,72 @@
+import { RxSymbol, RxPaperPlane, RxInfoCircled } from "react-icons/rx";
+import { Tooltip } from "flowbite-react";
+import { FaMagic } from "react-icons/fa";
+import { GeneratorContext } from "../../../context/generator";
+import { useContext } from "react";
+import { useAppSelector } from "../../../hooks/useRedux";
+
+export const Form = () => {
+ const { prompt, negative_prompt } = useAppSelector(state => state.generator);
+ const {
+ handleSubmit,
+ handleSurpriseMe,
+ handleRandomNegativePrompt,
+ handleChange,
+ loading,
+ } = useContext(GeneratorContext);
+
+ return (
+
+ );
+};
diff --git a/client/src/components/GeneratePage/generator/Generator.tsx b/client/src/components/GeneratePage/generator/Generator.tsx
new file mode 100644
index 0000000..033a0ff
--- /dev/null
+++ b/client/src/components/GeneratePage/generator/Generator.tsx
@@ -0,0 +1,26 @@
+import { GeneratorProvider } from "../../../context/generator";
+import { DisplayPanel } from "./DisplayPanel";
+import { SelectModel } from "./SelectModel";
+import { Settings } from "./Settings";
+
+
+export const Generator = () => {
+
+ return (
+ 
{
)}
- 