-
- {/* Content */}
-
- Content
-
-
-
+ {articleList.length > 0 && (
+
+ )}
{/*
{
+const BigCarousel = ({ head, navigator, content }) => {
const classes = useStyles();
return (
@@ -14,9 +14,7 @@ const BigCarousel = ({ head, navigator, IMAGE }) => {
{head}
-
+
);
};
@@ -34,11 +32,10 @@ const useStyles = makeStyles((theme) => ({
},
textWrapper: {
display: 'flex',
- direction: 'row',
justifyContent: 'center',
},
text: {
+ fontSize: '28px',
color: theme.palette.common.white,
- alignSelf: 'center',
},
}));
diff --git a/client/src/components/widgets/DropDownCard.js b/client/src/components/widgets/DropDownCard.js
index b6a7f8d8..040135a5 100644
--- a/client/src/components/widgets/DropDownCard.js
+++ b/client/src/components/widgets/DropDownCard.js
@@ -56,5 +56,8 @@ const useStyles = makeStyles((theme) => ({
lineHeight: '32px',
color: '#222222',
paddingTop: '6px',
+ [theme.breakpoints.down('sm')]: {
+ fontSize: '20px',
+ },
},
}));
diff --git a/client/src/components/widgets/PostHolder.js b/client/src/components/widgets/PostHolder.js
index f5bd66d1..ea6f4c60 100644
--- a/client/src/components/widgets/PostHolder.js
+++ b/client/src/components/widgets/PostHolder.js
@@ -1,11 +1,10 @@
import React from 'react';
-import { Typography, Grid } from '@mui/material';
-import makeStyles from '@mui/styles/makeStyles';
-
import { PhoneOutlined } from '@mui/icons-material';
+import { Grid, Typography } from '@mui/material';
+import makeStyles from '@mui/styles/makeStyles';
-const PostHolders = () => {
+const PostHolders = ({ position, name, email, phone }) => {
const classes = useStyles();
return (
{
alignItems='flex-start'
>
- Second year
+ {position}
-
- name: Anish Patro
+
+ {name}
- Roll: 121CE0877
+ Email:- {email}
-
+ {phone ? (
+
+ ) : (
+ <>
+ )}
);
};
@@ -39,9 +42,10 @@ const useStyles = makeStyles((theme) => ({
position: {
color: theme.palette.secondary.neutral80,
fontFamily: 'Source Sans Pro',
- fontSize: '16px',
+ fontSize: '20px',
marginBottom: '5px',
marginTop: '5px',
+ fontWeight: '600',
},
holderDetails: {
fontFamily: theme.typography.fontFamily,
@@ -49,6 +53,13 @@ const useStyles = makeStyles((theme) => ({
color: '#000',
marginBottom: '5px',
},
+ name: {
+ fontFamily: theme.typography.fontFamily,
+ fontSize: '20px',
+ color: '#000',
+ marginBottom: '5px',
+ fontWeight: '600',
+ },
phoneDetails: {
display: 'flex',
flexDirection: 'row',
diff --git a/client/src/components/widgets/SacInfoNavbar.js b/client/src/components/widgets/SacInfoNavbar.js
index df502731..0508a2f2 100644
--- a/client/src/components/widgets/SacInfoNavbar.js
+++ b/client/src/components/widgets/SacInfoNavbar.js
@@ -1,72 +1,137 @@
import React, { useState } from 'react';
+
import {
ButtonBase,
Container,
Typography,
useMediaQuery,
} from '@mui/material';
-import theme from '../../config/themes/light';
-
import makeStyles from '@mui/styles/makeStyles';
+
+import theme from '../../config/themes/light';
+import PostHolders from './PostHolder';
import SocietyCards from './SocietyCards';
const STAGE = {
+ DSW: 'Dean SW',
+ SP: 'Sac President',
SOB: 'SAC Office Bearers',
- DNF: 'Dean’s Nominee for Fests',
- DNS: 'Dean’s Nominee for societies',
- FC: 'Fest Convenors',
+};
+
+const POSTS = {
+ FMS: [
+ {
+ position: 'Vice President',
+ name: 'Prof. Binod Bihari Sahu',
+ phone: '0661-2462782',
+ email: 'sahub@nitrkl.ac.in',
+ },
+ {
+ position: 'Vice President',
+ name: 'Dr. Balaji P.S.',
+ phone: '0661-2462528',
+ email: 'psbalaji@nitrkl.ac.in',
+ },
+ ],
+ LCS: [
+ {
+ position: 'Vice President',
+ name: 'Dr. Akshaya Kumar Rath',
+ phone: '0661-2462697',
+ email: 'ratha@nitrkl.ac.in',
+ },
+ {
+ position: 'Vice President',
+ name: 'Dr. Winny Routray',
+ phone: '',
+ email: 'routrayw@nitrkl.ac.in',
+ },
+ ],
+ GSS: [
+ {
+ position: 'Vice President',
+ name: 'Prof. Ramesh Kumar Mohapatra',
+ phone: '0661-2462366',
+ email: 'mohapatrark@nitrkl.ac.in',
+ },
+ {
+ position: 'Vice President',
+ name: 'Dr. Mayank Yadav',
+ phone: '',
+ email: 'yadavm@nitrkl.ac.in',
+ },
+ ],
+ TS: [
+ {
+ position: 'Vice President',
+ name: 'Dr. Kaustav Chaudhury',
+ phone: '0661-2462535 ',
+ email: 'chaudhuryk@nitrkl.ac.in',
+ },
+ {
+ position: 'Vice President',
+ name: 'Dr. Prasun Chongder',
+ phone: '',
+ email: 'chongderp@nitrkl.ac.in',
+ },
+ ],
};
const SacInfoNavbar = () => {
- const [stage, setStage] = useState(STAGE.SOB);
+ const [stage, setStage] = useState(STAGE.DSW);
const classes = useStyles();
const matches = useMediaQuery(theme.breakpoints.down('md'));
const renderTeam = () => {
switch (stage) {
- case STAGE.SOB:
+ case STAGE.DSW:
return (
<>
-
-
{' '}
-
-
{' '}
+
);
- case STAGE.DNF:
+ case STAGE.SP:
return (
<>
-
-
-
-
{' '}
+
);
- case STAGE.DNS:
- return (
- <>
-
-
{' '}
-
-
{' '}
-
- );
- case STAGE.FC:
+ case STAGE.SOB:
return (
<>
-
-
{' '}
-
-
{' '}
+
+
{' '}
+
+
{' '}
);
default:
return (
<>
-
-
{' '}
-
-
{' '}
+
+
{' '}
+
+
{' '}
);
}
diff --git a/client/src/components/widgets/SocietyCards.js b/client/src/components/widgets/SocietyCards.js
index bf50534f..31ae15e5 100644
--- a/client/src/components/widgets/SocietyCards.js
+++ b/client/src/components/widgets/SocietyCards.js
@@ -1,19 +1,21 @@
import React, { useState } from 'react';
import clsx from 'clsx';
+
+import { ExpandMore } from '@mui/icons-material';
import {
- Typography,
Card,
CardActions,
- IconButton,
- Collapse,
CardContent,
+ Collapse,
+ IconButton,
+ Typography,
} from '@mui/material';
import makeStyles from '@mui/styles/makeStyles';
-import { ExpandMore } from '@mui/icons-material';
-import PostHolders from '../widgets/PostHolder';
-const SocietyCards = ({ society }) => {
+import PostHolders from './PostHolder';
+
+const SocietyCards = ({ society, posts }) => {
const classes = useStyles();
const [expanded, setExpanded] = useState(false);
@@ -37,14 +39,19 @@ const SocietyCards = ({ society }) => {
{society}
- {/*
+
-
- */}
+
);
};
diff --git a/client/src/components/widgets/SubCategoryLink.js b/client/src/components/widgets/SubCategoryLink.js
new file mode 100644
index 00000000..aae777d1
--- /dev/null
+++ b/client/src/components/widgets/SubCategoryLink.js
@@ -0,0 +1,52 @@
+import React from 'react';
+import Link from 'next/link';
+import { ButtonBase } from '@mui/material';
+import makeStyles from '@mui/styles/makeStyles';
+
+const SubCategoryLink = ({ text, isRed, onclick, path }) => {
+ const classes = useStyles({ isRed });
+
+ return (
+
+
+
+ {text}
+
+
+
+ );
+};
+
+export default SubCategoryLink;
+
+const useStyles = makeStyles((theme) => ({
+ container: {
+ display: 'inline',
+ textDecoration: 'none',
+ },
+ button: {
+ textAlign: 'center',
+ backgroundColor: ({ isRed }) =>
+ isRed ? 'rgba(215, 36, 46, 0.6)' : theme.palette.primary.blue10,
+ borderRadius: '4px',
+ margin: '8px 8px 0px 0px',
+ padding: '12px 16px',
+ [theme.breakpoints.down('md')]: {
+ padding: '3px 8px',
+ },
+ },
+ label: {
+ textTransform: 'capitalize',
+ fontFamily: 'IBM Plex sans',
+ fontSize: '22px',
+ fontWeight: '600',
+ lineHeight: '1.5rem',
+ textDecoration: 'none',
+ color: ({ isRed }) =>
+ isRed ? theme.palette.secondary.neutral20 : theme.palette.secondary.main,
+ [theme.breakpoints.down('md')]: {
+ fontSize: '16px',
+ lineHeight: '20px',
+ },
+ },
+}));
diff --git a/client/src/config/ApolloClient.js b/client/src/config/ApolloClient.js
index da1c9412..9db0d17a 100644
--- a/client/src/config/ApolloClient.js
+++ b/client/src/config/ApolloClient.js
@@ -9,6 +9,7 @@ import {
} from '@apollo/client';
import { setContext } from '@apollo/client/link/context';
import { onError } from '@apollo/client/link/error';
+import { parseCookies } from 'nookies';
const cache = new InMemoryCache();
@@ -38,15 +39,16 @@ const errorLink = onError(({ graphQLErrors, networkError }) => {
const link = from([
errorLink,
new HttpLink({
- uri: process.env.NEXT_PUBLIC_SERVER_ADDRESS,
+ uri: `${process.env.NEXT_PUBLIC_SERVER_ADDRESS}/v1/graph`,
}),
]);
const getApolloLink = (token) => {
+ const cookies = parseCookies();
const authLink = setContext((_, { headers }) => ({
headers: {
...headers,
- Authorization: token ? token : '',
+ Authorization: token || cookies.firebaseToken || '',
},
}));
return authLink.concat(link);
diff --git a/client/src/context/auth/AuthState.js b/client/src/context/auth/AuthState.js
index 59de7d13..b8512fbf 100644
--- a/client/src/context/auth/AuthState.js
+++ b/client/src/context/auth/AuthState.js
@@ -48,7 +48,7 @@ const AuthState = ({ children }) => {
sameSite: true,
maxAge: 3600,
});
- }, [firebaseToken]);
+ }, [user, firebaseToken, refreshToken]);
const loginWithToken = async (_token) => {
const credential = GoogleAuthProvider.credential(_token);
@@ -56,19 +56,29 @@ const AuthState = ({ children }) => {
const res = await signInWithCredential(auth, credential);
const { user, _tokenResponse } = res;
- setUser(user);
+
+ GraphClient.setLink(getApolloLink(user.accessToken));
setFirebaseToken(user.accessToken);
setRefreshToken(user.refreshToken);
+ setUser(user);
if (getAdditionalUserInfo(res).isNewUser) {
try {
const imagekit = new ImageKit({
publicKey: process.env.NEXT_PUBLIC_IMAGEKIT_PUBLIC_KEY,
urlEndpoint: process.env.NEXT_PUBLIC_IMAGEKIT_URLENDPOINT,
- authenticationEndpoint:
- process.env.NEXT_PUBLIC_IMAGEKIT_AUTHENTICATION_ENDPOINT,
+ authenticationEndpoint: `${process.env.NEXT_PUBLIC_SERVER_ADDRESS}${process.env.NEXT_PUBLIC_IMAGEKIT_AUTHENTICATION_ENDPOINT}`,
});
+ const newAccount = await GraphClient.mutate({
+ mutation: registerUser,
+ variables: {
+ fullName: user.displayName,
+ email: user.email,
+ },
+ });
+ console.log('Account Created ', newAccount);
+
const userPicture = await (await fetch(user.photoURL)).blob();
if (!['image/png', 'image/jpeg'].includes(userPicture.type)) {
@@ -77,9 +87,9 @@ const AuthState = ({ children }) => {
const imageUpload = await imagekit
.upload({
- file: userPicture,
+ file: user.photoURL,
folder: '/user',
- fileName: `${user.uid}.${
+ fileName: `${newAccount.data.registerUser.id}.${
userPicture.type.toString().split('/')[1]
}`,
tags: [user.uid, 'user', 'profilePicture'],
@@ -87,15 +97,6 @@ const AuthState = ({ children }) => {
.then((result) => {
console.log('Upload Success', result);
});
-
- const newAccount = await GraphClient.mutate({
- mutation: registerUser,
- variables: {
- fullName: user.displayName,
- email: user.email,
- },
- });
- console.log('Account Created ', newAccount);
} catch (err) {
console.log(err);
}
diff --git a/client/src/hooks/useAutoComplete.js b/client/src/hooks/useAutoComplete.js
index a7104609..8b3598af 100644
--- a/client/src/hooks/useAutoComplete.js
+++ b/client/src/hooks/useAutoComplete.js
@@ -9,9 +9,12 @@ const useAutoComplete = (searchText, limit) => {
const [searchResult, setSearchResult] = useState([]);
useEffect(() => {
- const timer = setTimeout(() => {
- setSearchKeyword(searchText);
- }, 800);
+ const timer = setTimeout(
+ () => {
+ setSearchKeyword(searchText);
+ },
+ searchText.length < 3 ? 10 : 300,
+ );
return () => {
clearTimeout(timer);
diff --git a/client/src/pages/article/[...article].jsx b/client/src/pages/article/[...article].jsx
index 7fab22a6..e5a4b1d1 100644
--- a/client/src/pages/article/[...article].jsx
+++ b/client/src/pages/article/[...article].jsx
@@ -166,7 +166,8 @@ function ArticlePage({ article, isError }) {
diff --git a/client/src/pages/guide.jsx b/client/src/pages/guide.jsx
index 8131083e..b5c91ecc 100644
--- a/client/src/pages/guide.jsx
+++ b/client/src/pages/guide.jsx
@@ -89,13 +89,4 @@ const GuidePage = ({ issues }) => {
);
};
-export async function getServerSideProps() {
- return {
- redirect: {
- destination: '/comingSoon',
- permanent: false,
- },
- };
-}
-
export default GuidePage;
diff --git a/client/src/pages/hallInfo.jsx b/client/src/pages/hallInfo.jsx
new file mode 100644
index 00000000..9d35563b
--- /dev/null
+++ b/client/src/pages/hallInfo.jsx
@@ -0,0 +1,77 @@
+import React from 'react';
+import Head from 'next/head';
+
+// Components
+import Marginals from '../components/marginals/Marginals';
+import HallInfo from '../screens/HallInfo';
+
+function HallInfos() {
+ return (
+ <>
+
+ {/* */}
+
Hall Info | Monday Morning
+
+
+
+
+ {/* */}
+
+
+
+
+
+
+
+
+
+
+ {/* */}
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default HallInfos;
diff --git a/client/src/pages/photostory/[...photostory].jsx b/client/src/pages/photostory/[...photostory].jsx
index 1cd6d40b..c3f0c353 100644
--- a/client/src/pages/photostory/[...photostory].jsx
+++ b/client/src/pages/photostory/[...photostory].jsx
@@ -4,6 +4,7 @@ import Head from 'next/head';
// Libraries
import { GraphClient } from '../../config/ApolloClient';
+import STORES from '../../utils/getStores';
// Components
import Marginals from '../../components/marginals/Marginals';
@@ -110,23 +111,29 @@ function PhotostoryPage({ photostory, isError }) {
property='og:site_name'
content='Monday Morning | The Student Media Body of NIT Rourkela, India'
/>
-
-
+
+
@@ -134,17 +141,23 @@ function PhotostoryPage({ photostory, isError }) {
-
+
{isFallback || !photostory ? (
diff --git a/client/src/pages/portfolio/[...userId].jsx b/client/src/pages/portfolio/[...userId].jsx
index 58133644..79fb10af 100644
--- a/client/src/pages/portfolio/[...userId].jsx
+++ b/client/src/pages/portfolio/[...userId].jsx
@@ -111,10 +111,14 @@ const PortfolioPage = ({
<>
{/* */}
-
{firstName + ' ' + lastName} | Monday Morning
+
+ {!lastName ? firstName : firstName + ' ' + lastName} | Monday Morning
+
-
-
+
+
{/* */}
@@ -211,7 +211,9 @@ export async function getStaticProps({
return {
redirect: {
- destination: `/portfolio/${id}/${getUserSlug(fullName)}`,
+ destination: `/portfolio/${id}/${getUserSlug(
+ `${user.firstName}${user.lastName ? ' ' + user.lastName : ''}`,
+ )}`,
permanent: false,
},
};
@@ -237,10 +239,17 @@ export async function getStaticProps({
};
}
- if (userSlug !== getUserSlug(user.fullName)) {
+ if (
+ userSlug !==
+ getUserSlug(
+ `${user.firstName}${user.lastName ? ' ' + user.lastName : ''}`,
+ )
+ ) {
return {
redirect: {
- destination: `/portfolio/${user.id}/${getUserSlug(user.fullName)}`,
+ destination: `/portfolio/${user.id}/${getUserSlug(
+ `${user.firstName}${user.lastName ? ' ' + user.lastName : ''}`,
+ )}`,
permanent: false,
},
};
@@ -262,17 +271,21 @@ export async function getStaticProps({
.filter(({ model }) => model === 'Article')
.reduce((prev, curr) => [...prev, curr.reference], []);
- const {
- data: { getListOfArticles: articleList },
- } = await GraphClient.query({
- query: getListOfArticles,
- variables: {
- ids: articleIdList,
- limit: 40,
- },
- });
+ let _articleList = [];
+
+ if (articleIdList.length > 0) {
+ const {
+ data: { getListOfArticles: articleList },
+ } = await GraphClient.query({
+ query: getListOfArticles,
+ variables: {
+ ids: articleIdList,
+ limit: 40,
+ },
+ });
+ _articleList = articleList.filter((article) => article);
+ }
- const _articleList = articleList.filter((article) => article);
const noOfArticle = _articleList.length;
let { store, storePath } = picture;
diff --git a/client/src/screens/Article.js b/client/src/screens/Article.js
index bf617223..c1d6c15c 100644
--- a/client/src/screens/Article.js
+++ b/client/src/screens/Article.js
@@ -5,6 +5,7 @@ import React from 'react';
// libraries
import { Container, Grid, useMediaQuery } from '@mui/material';
+import { makeStyles } from '@mui/styles';
// Components
import Comments from '../components/article/comments';
@@ -22,8 +23,10 @@ import theme from '../config/themes/light';
function Article({ article }) {
const isMatch = useMediaQuery(theme.breakpoints.down('md'));
+ const classes = useStyles();
+
return (
- <>
+
@@ -53,8 +56,16 @@ function Article({ article }) {
{/* TODO: Implement reccomender */}
{/*
);
}
export default Article;
+
+const useStyles = makeStyles(() => ({
+ container: {
+ [theme.breakpoints.down('sm')]: {
+ maxWidth: '100vw',
+ },
+ },
+}));
diff --git a/client/src/screens/Category.js b/client/src/screens/Category.js
index 980136a5..647f6981 100644
--- a/client/src/screens/Category.js
+++ b/client/src/screens/Category.js
@@ -8,6 +8,7 @@ import { Link as ScrollLink, Element } from 'react-scroll';
// Components
import SubCategory from '../components/widgets/SubCategory';
+import SubCategoryLink from '../components/widgets/SubCategoryLink';
import ArticleCarousel from '../components/widgets/article/ArticleCarousel';
import SubCategorySection from '../components/categories/SubCategorySection';
@@ -35,13 +36,12 @@ function Category({ articleList, categoryShortName, category }) {
),
)}
{categoryShortName === 'career' && (
-
-
-
+
)}