298 auth

frontend/pages/new/profile.tsx

@@ -0,0 +1,3 @@
+import Profile from '../../src/modules/pages/Profile';
+
+export default Profile;

frontend/pages/new/settings.tsx

@@ -0,0 +1,3 @@
+import Settings from '../../src/modules/pages/Settings';
+
+export default Settings;

frontend/src/interfaces/like.ts

@@ -1,4 +1,5 @@
 export interface Like {
     user_id: string;
+    file_id: string;
     count: number;
 }

frontend/src/interfaces/user.ts

@@ -1,11 +1,18 @@
+import { Like } from './like';
+
 export interface User {
     _id: string;
     ip: string | null;
     email: string | null;
-    role: "admin" | null;
+    role: 'admin' | null;
     username: string | null;
     password: string | null;
+    bio?: string | null;
+    name?: string | null;
+    avatar?: string | null;
+    banner?: string | null;
     favourites: string[];
+    likes: Like[];
     verified: boolean;
     followers: string[];
     following: string[];

frontend/src/modules/PageModule.tsx

@@ -16,7 +16,7 @@ const PageModule: React.FC<PageModuleProps> = ({
     return (
         <main className={`page ${className}`}>
             <HeadParser title={title} description={description} file={file} />
-            
+
             {children}
 
             <CheckAuth />

frontend/src/modules/pages/MyFiles.tsx

@@ -12,7 +12,7 @@ const MyFiles: PageComponent<MyFilesProps> = () => {
         <PageModule
             title="MyFiles"
             description="Kidala life - combining social media with file upload"
-            className="pt-24"
+            className="pt-24 px-2"
         >
             <Nav myFiles />
 

frontend/src/modules/pages/Profile.tsx

@@ -0,0 +1,21 @@
+import { NextPage } from 'next';
+import React from 'react';
+import Nav from '../../ui/navigation/Nav';
+import ProfileContainer from '../../ui/profile/ProfileContainer';
+import PageModule from '../PageModule';
+
+const Profile: NextPage = () => {
+    return (
+        <PageModule
+            title="Profile"
+            description="Your profile on kidala upload file hosting services"
+            className="pt-24"
+        >
+            <Nav />
+
+            <ProfileContainer />
+        </PageModule>
+    );
+};
+
+export default Profile;

frontend/src/modules/pages/Settings.tsx

@@ -0,0 +1,21 @@
+import { NextPage } from 'next';
+import React from 'react';
+import Nav from '../../ui/navigation/Nav';
+import SettingsContainer from '../../ui/settings/SettingsContainer';
+import PageModule from '../PageModule';
+
+const Settings: NextPage = () => {
+    return (
+        <PageModule
+            title="Settings"
+            description="Kidala file upload. User settings"
+            className="pt-24 px-2"
+        >
+            <Nav />
+
+            <SettingsContainer />
+        </PageModule>
+    );
+};
+
+export default Settings;

frontend/src/redux/slices/appSlice.ts

@@ -1,5 +1,8 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { FileInterface } from '../../interfaces/file';
+import { Like } from '../../interfaces/like';
+import { User } from '../../interfaces/user';
+import { LikeFileResponse } from '../../requests/fileRequests';
 import { sortFiles } from '../../utils/sortFiles';
 
 export interface SortOptions {
@@ -14,6 +17,7 @@ export interface AppInfo {
     sortOptions: SortOptions;
     audioVolume: number;
     db_file_len: number;
+    collectedUsers: User[];
 }
 
 const initialState: AppInfo = {
@@ -26,6 +30,7 @@ const initialState: AppInfo = {
     },
     audioVolume: 1,
     db_file_len: 0,
+    collectedUsers: [],
 };
 
 export const appSlice = createSlice({
@@ -87,12 +92,47 @@ export const appSlice = createSlice({
                 return state;
             }
 
-            const newfiles: FileInterface[] = state.files.map((prod) => {
-                if (prod._id === updatedFile._id) {
-                    prod = updatedFile;
+            const newfiles: FileInterface[] = state.files.map((fileQ) => {
+                if (fileQ._id === updatedFile._id) {
+                    fileQ = updatedFile;
                 }
 
-                return prod;
+                return fileQ;
+            });
+
+            state = {
+                ...state,
+                files: newfiles,
+            };
+
+            return state;
+        },
+        likeFileRdx: (
+            state,
+            action: { type: string; payload: LikeFileResponse['likeObj'] }
+        ) => {
+            if (!state.files) {
+                return state;
+            }
+
+            const newLike: Like = {
+                ...action.payload,
+            };
+
+            const newfiles: FileInterface[] = state.files.map((fileQ) => {
+                if (fileQ._id === action.payload.file_id) {
+                    fileQ = {
+                        ...fileQ,
+                        likes: [
+                            ...fileQ.likes.filter(
+                                (l) => l.user_id !== newLike.user_id
+                            ),
+                            newLike,
+                        ],
+                    };
+                }
+
+                return fileQ;
             });
 
             state = {
@@ -150,21 +190,21 @@ export const appSlice = createSlice({
                 return state;
             }
 
-            const siftFiles = files.map((blog) => {
-                if (state.files?.some((b) => b._id === blog._id)) {
+            const siftFiles = files.map((file) => {
+                if (state.files?.some((b) => b._id === file._id)) {
                     return null;
                 }
 
-                return blog;
+                return file;
             });
 
             const okFiles = siftFiles.filter((bl) => bl !== null);
 
             let newFiles: FileInterface[] = [...state.files];
 
-            okFiles.forEach((blog) => {
-                if (blog) {
-                    newFiles = [...newFiles, blog];
+            okFiles.forEach((file) => {
+                if (file) {
+                    newFiles = [...newFiles, file];
                 }
             });
 
@@ -181,6 +221,50 @@ export const appSlice = createSlice({
                 db_file_len: action.payload,
             };
 
+            return state;
+        },
+        getUserFromFileRdx: (state, action) => {
+            const collectedUsers: User[] | null = action.payload;
+
+            if (!collectedUsers) {
+                return state;
+            }
+
+            if (
+                !state.collectedUsers ||
+                state.collectedUsers.length === 0
+            ) {
+                state = {
+                    ...state,
+                    collectedUsers: collectedUsers,
+                };
+
+                return state;
+            }
+
+            const siftUsers = collectedUsers.map((user) => {
+                if (state.collectedUsers?.some((b) => b._id === user._id)) {
+                    return null;
+                }
+
+                return user;
+            });
+
+            const okUsers = siftUsers.filter((bl) => bl !== null);
+
+            let newUsers: User[] = [...state.collectedUsers];
+
+            okUsers.forEach((file) => {
+                if (file) {
+                    newUsers = [...newUsers, file];
+                }
+            });
+
+            state = {
+                ...state,
+                collectedUsers: newUsers,
+            };
+
             return state;
         },
     },
@@ -195,7 +279,9 @@ export const {
     setSortOptions,
     setAudioVolume,
     receiveFiles,
-    setDbFileLen
+    setDbFileLen,
+    likeFileRdx,
+    getUserFromFileRdx,
 } = appSlice.actions;
 
 export const selectApp = (state: any) => state.app;