fix blog, news, projects, profiles pages

amfoss · Nov 25, 2020 · 77d31eb · 77d31eb
1 parent 95460e4
commit 77d31eb
Show file tree

Hide file tree

Showing 61 changed files with 68 additions and 73 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -46,7 +46,6 @@ build-website:
   script:
     - echo ${CI_COMMIT_REF_SLUG}
     - npm install 
-    - sed -i "s/%%VERSION%%/$CI_COMMIT_SHORT_SHA/" ./src/pages/index.js
     - npm run export
     - rm -rf public
     - mv out public

diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,6 @@
 package-lock.json
 node_modules/
-public/
+public/
+.next
+.idea
+.cache
diff --git a/.travis.yml b/.travis.yml
diff --git a/src/components/about/storySections.js → components/about/storySections.js b/src/components/about/storySections.js → components/about/storySections.js
diff --git a/...omponents/achievements/achievementList.js → components/achievements/achievementList.js b/...omponents/achievements/achievementList.js → components/achievements/achievementList.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import ListCard from '../theme/listCard';
-import defaultAvatar from '../../../public/defaults/avatar.png';
+import defaultAvatar from '../../public/defaults/avatar.png';
 
 const AchievementList = ({ title, achievements }) => {
   let years = [...new Set(achievements.map((obj) => obj.year))];

diff --git a/src/components/blog/blogCard.js → components/blog/blogCard.js b/src/components/blog/blogCard.js → components/blog/blogCard.js
diff --git a/src/components/clubLife/clubLife.js → components/clubLife/clubLife.js b/src/components/clubLife/clubLife.js → components/clubLife/clubLife.js
diff --git a/src/components/events/eventsCard.js → components/events/eventsCard.js b/src/components/events/eventsCard.js → components/events/eventsCard.js
diff --git a/src/components/footer.js → components/footer.js b/src/components/footer.js → components/footer.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import FooterNav from './theme/footerNav';
 
-import amritaLogo from '../../public/logos/amrita.png';
-import bi0sLogo from '../../public/logos/bi0s.png';
+import amritaLogo from '../public/logos/amrita.png';
+import bi0sLogo from '../public/logos/bi0s.png';
 
 const Footer = () => (
   <footer>

diff --git a/src/components/header.js → components/header.js b/src/components/header.js → components/header.js
@@ -4,7 +4,7 @@ import Menu from './theme/menu';
 import SocialMenu from './theme/socialMenu';
 import Link from 'next/link';
 import classnames from 'classnames';
-import amFOSSLogo from '../../public/logo_light.png';
+import amFOSSLogo from '../public/logo_light.png';
 
 const styling = {
   backgroundImage: `url('../../logo_light.png')`,

diff --git a/src/components/home/alumniSuccess.js → components/home/alumniSuccess.js b/src/components/home/alumniSuccess.js → components/home/alumniSuccess.js
diff --git a/src/components/home/homeLanding.js → components/home/homeLanding.js b/src/components/home/homeLanding.js → components/home/homeLanding.js
diff --git a/src/components/home/homeSections.js → components/home/homeSections.js b/src/components/home/homeSections.js → components/home/homeSections.js
diff --git a/src/components/home/thanksAll.js → components/home/thanksAll.js b/src/components/home/thanksAll.js → components/home/thanksAll.js
diff --git a/src/components/home/whyJoin.js → components/home/whyJoin.js b/src/components/home/whyJoin.js → components/home/whyJoin.js
diff --git a/src/components/layout.js → components/layout.js b/src/components/layout.js → components/layout.js
diff --git a/src/components/news/newsCard.js → components/news/newsCard.js b/src/components/news/newsCard.js → components/news/newsCard.js
diff --git a/src/components/projects/membersList.js → components/projects/membersList.js b/src/components/projects/membersList.js → components/projects/membersList.js
diff --git a/src/components/projects/projectCard.js → components/projects/projectCard.js b/src/components/projects/projectCard.js → components/projects/projectCard.js
diff --git a/src/components/seo.js → components/seo.js b/src/components/seo.js → components/seo.js
@@ -1,5 +1,5 @@
 import Head from 'next/head';
-import config from '../../config.yml';
+import config from '../config.yml';
 
 export default function SEO({ description, title }) {
   const siteTitle = 'FOSS@Amrita (amFOSS) - Code | Share | Grow';

diff --git a/src/components/theme/footerNav.js → components/theme/footerNav.js b/src/components/theme/footerNav.js → components/theme/footerNav.js
diff --git a/src/components/theme/getProfiles.js → components/theme/getProfiles.js b/src/components/theme/getProfiles.js → components/theme/getProfiles.js
diff --git a/src/components/theme/listCard.js → components/theme/listCard.js b/src/components/theme/listCard.js → components/theme/listCard.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Link from 'next/link';
 
-import defaultAvatar from '../../../public/defaults/avatar.png';
+import defaultAvatar from '../../public/defaults/avatar.png';
 
 const ListCard = ({
   username,

diff --git a/src/components/theme/loading.js → components/theme/loading.js b/src/components/theme/loading.js → components/theme/loading.js
diff --git a/src/components/theme/memberCard.js → components/theme/memberCard.js b/src/components/theme/memberCard.js → components/theme/memberCard.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Link from 'next/link';
 
-import defaultAvatar from '../../../public/defaults/avatar.png';
+import defaultAvatar from '../../public/defaults/avatar.png';
 
 const MemberCard = ({
   username,

diff --git a/src/components/theme/menu.js → components/theme/menu.js b/src/components/theme/menu.js → components/theme/menu.js
@@ -1,15 +1,15 @@
 import React from 'react';
 import MenuItem from './menuItem';
 import Link from 'next/link';
-import homeIcon from '../../../public/icons/home.png';
-import aboutIcon from '../../../public/icons/bulb.png';
-import lifeIcon from '../../../public/icons/mentorship.png';
-import achievementsIcon from '../../../public/icons/crown.png';
-import membersIcon from '../../../public/icons/coworking.png';
-import ProjectsIcon from '../../../public/icons/project.png';
-import blogIcon from '../../../public/icons/blog.png';
-import newsIcon from '../../../public/icons/newsArt.png';
-import crowdsIcon from '../../../public/icons/crowd.png';
+import homeIcon from '../../public/icons/home.png';
+import aboutIcon from '../../public/icons/bulb.png';
+import lifeIcon from '../../public/icons/mentorship.png';
+import achievementsIcon from '../../public/icons/crown.png';
+import membersIcon from '../../public/icons/coworking.png';
+import ProjectsIcon from '../../public/icons/project.png';
+import blogIcon from '../../public/icons/blog.png';
+import newsIcon from '../../public/icons/newsArt.png';
+import crowdsIcon from '../../public/icons/crowd.png';
 
 const Menu = () => (
   <div className="menu">

diff --git a/src/components/theme/menuItem.js → components/theme/menuItem.js b/src/components/theme/menuItem.js → components/theme/menuItem.js
diff --git a/src/components/theme/sectionCard.js → components/theme/sectionCard.js b/src/components/theme/sectionCard.js → components/theme/sectionCard.js
diff --git a/src/components/theme/socialIcon.js → components/theme/socialIcon.js b/src/components/theme/socialIcon.js → components/theme/socialIcon.js
@@ -1,15 +1,15 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 
-import facebook from '../../../public/icons/facebook.png';
-import instagram from '../../../public/icons/instagram.png';
-import twitter from '../../../public/icons/twitter.png';
-import linkedin from '../../../public/icons/linkedin.png';
-import github from '../../../public/icons/github.png';
-import website from '../../../public/icons/website.png';
-import chatroom from '../../../public/icons/chatroom.png';
-import gitlab from '../../../public/icons/gitlab.png';
-import gmail from '../../../public/icons/gmail.png';
+import facebook from '../../public/icons/facebook.png';
+import instagram from '../../public/icons/instagram.png';
+import twitter from '../../public/icons/twitter.png';
+import linkedin from '../../public/icons/linkedin.png';
+import github from '../../public/icons/github.png';
+import website from '../../public/icons/website.png';
+import chatroom from '../../public/icons/chatroom.png';
+import gitlab from '../../public/icons/gitlab.png';
+import gmail from '../../public/icons/gmail.png';
 
 const SocialIcon = ({ name, link }) =>
   link ? (

diff --git a/src/components/theme/socialMenu.js → components/theme/socialMenu.js b/src/components/theme/socialMenu.js → components/theme/socialMenu.js
diff --git a/src/components/theme/titleBar.js → components/theme/titleBar.js b/src/components/theme/titleBar.js → components/theme/titleBar.js
diff --git a/src/content/alumniImage.json → content/alumniImage.json b/src/content/alumniImage.json → content/alumniImage.json
diff --git a/src/content/alumniSuccess.json → content/alumniSuccess.json b/src/content/alumniSuccess.json → content/alumniSuccess.json
diff --git a/src/content/clubLife.json → content/clubLife.json b/src/content/clubLife.json → content/clubLife.json
diff --git a/src/content/homeSections.json → content/homeSections.json b/src/content/homeSections.json → content/homeSections.json
diff --git a/src/content/story.json → content/story.json b/src/content/story.json → content/story.json
diff --git a/src/content/thankYou.json → content/thankYou.json b/src/content/thankYou.json → content/thankYou.json
diff --git a/src/content/whyJoin.json → content/whyJoin.json b/src/content/whyJoin.json → content/whyJoin.json
diff --git a/next.config.js b/next.config.js
@@ -12,6 +12,7 @@ module.exports = {
     author: 'amfoss',
     siteUrl: 'https://amfoss.in/',
   },
+  trailingSlash: true,
 };
 module.exports = withCSS(
   withSass({

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/pages/404.js → pages/404.js b/src/pages/404.js → pages/404.js
@@ -3,7 +3,7 @@ import React from 'react';
 import Layout from '../components/layout';
 import SEO from '../components/seo';
 import TitleBar from '../components/theme/titleBar';
-import img404 from '../../public/illus/404_stuart.png';
+import img404 from '../public/illus/404_stuart.png';
 
 const NotFoundPage = () => (
   <Layout>

diff --git a/src/pages/_app.js → pages/_app.js b/src/pages/_app.js → pages/_app.js
diff --git a/src/pages/about.js → pages/about.js b/src/pages/about.js → pages/about.js
diff --git a/src/pages/achievements.js → pages/achievements.js b/src/pages/achievements.js → pages/achievements.js
diff --git a/src/pages/blog/[slug].js → pages/blog/[slug].js b/src/pages/blog/[slug].js → pages/blog/[slug].js
diff --git a/src/pages/blog.js → pages/blog/index.js b/src/pages/blog.js → pages/blog/index.js
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react';
-import Layout from '../components/layout';
-import SEO from '../components/seo';
-import TitleBar from '../components/theme/titleBar';
-import BlogCard from '../components/blog/blogCard';
-import dataFetch from '../utils/dataFetch';
+import Layout from '../../components/layout';
+import SEO from '../../components/seo';
+import TitleBar from '../../components/theme/titleBar';
+import BlogCard from '../../components/blog/blogCard';
+import dataFetch from '../../utils/dataFetch';
 import ReactLoading from 'react-loading';
 
 const blogsQuery = ` {

diff --git a/src/pages/events.js → pages/events.js b/src/pages/events.js → pages/events.js
diff --git a/src/pages/index.js → pages/index.js b/src/pages/index.js → pages/index.js
diff --git a/src/pages/life.js → pages/life.js b/src/pages/life.js → pages/life.js
diff --git a/src/pages/members/[username].js → pages/members/[username].js b/src/pages/members/[username].js → pages/members/[username].js
@@ -1,16 +1,16 @@
 import React, { useEffect, useState } from 'react';
 import SEO from '../../components/seo';
 import Layout from '../../components/layout';
-import Avatar from '../../../public/defaults/avatar.png';
+import Avatar from '../../public/defaults/avatar.png';
 import dataFetch from '../../utils/dataFetch';
 import Loading from '../../components/theme/loading';
 import SocialIcon from '../../components/theme/socialIcon';
-import langIcon from '../../../public/icons/language.png';
-import profileIcon from '../../../public/icons/profile.png';
-import blogIcon from '../../../public/icons/blog.png';
+import langIcon from '../../public/icons/language.png';
+import profileIcon from '../../public/icons/profile.png';
+import blogIcon from '../../public/icons/blog.png';
 import dateFormat from 'dateformat';
 import Link from 'next/link';
-import NotFoundPage from '../../pages/404';
+import NotFoundPage from '../404';
 
 import { useRouter } from 'next/router';
 

diff --git a/src/pages/members.js → pages/members/index.js b/src/pages/members.js → pages/members/index.js
@@ -1,11 +1,11 @@
 import React from 'react';
 
-import Layout from '../components/layout';
-import SEO from '../components/seo';
+import Layout from '../../components/layout';
+import SEO from '../../components/seo';
 
-import MemberCard from '../components/theme/memberCard';
-import TitleBar from '../components/theme/titleBar';
-import dataFetch from '../utils/dataFetch';
+import MemberCard from '../../components/theme/memberCard';
+import TitleBar from '../../components/theme/titleBar';
+import dataFetch from '../../utils/dataFetch';
 import ReactLoading from 'react-loading';
 
 const query = ` query {
@@ -25,7 +25,7 @@ const query = ` query {
       }
   }`;
 
-export default class Members extends React.Component {
+export default class Index extends React.Component {
   constructor(props) {
     super(props);
     this.state = {

diff --git a/src/pages/news/[slug].js → pages/news/[slug].js b/src/pages/news/[slug].js → pages/news/[slug].js
diff --git a/src/pages/news.js → pages/news/index.js b/src/pages/news.js → pages/news/index.js
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react';
-import Layout from '../components/layout';
-import SEO from '../components/seo';
-import TitleBar from '../components/theme/titleBar';
-import NewsCard from '../components/news/newsCard';
-import dataFetch from '../utils/dataFetch';
+import Layout from '../../components/layout';
+import SEO from '../../components/seo';
+import TitleBar from '../../components/theme/titleBar';
+import NewsCard from '../../components/news/newsCard';
+import dataFetch from '../../utils/dataFetch';
 import ReactLoading from 'react-loading';
 
 const newsQuery = ` {
@@ -20,7 +20,7 @@ const newsQuery = ` {
   }
 }`;
 
-const News = () => {
+const Index = () => {
   const [data, setData] = useState([]);
   const [isLoading, setLoading] = useState(false);
   const [query, setQuery] = useState('');
@@ -127,4 +127,4 @@ const News = () => {
   );
 };
 
-export default News;
+export default Index;
diff --git a/src/pages/projects/[slug].js → pages/projects/[slug].js b/src/pages/projects/[slug].js → pages/projects/[slug].js
@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import Layout from '../../components/layout';
 import SEO from '../../components/seo';
-import crowdIcon from '../../../public/icons/crowd.png';
-import bulbIcon from '../../../public/icons/bulb.png';
+import crowdIcon from '../../public/icons/crowd.png';
+import bulbIcon from '../../public/icons/bulb.png';
 import MemberList from '../../components/projects/membersList';
 import SocialIcon from '../../components/theme/socialIcon';
 import dataFetch from '../../utils/dataFetch';

diff --git a/src/pages/projects.js → pages/projects/index.js b/src/pages/projects.js → pages/projects/index.js
@@ -1,11 +1,11 @@
 import React, { useEffect, useState } from 'react';
 
-import Layout from '../components/layout';
-import SEO from '../components/seo';
+import Layout from '../../components/layout';
+import SEO from '../../components/seo';
 
-import ProjectCard from '../components/projects/projectCard';
-import TitleBar from '../components/theme/titleBar';
-import dataFetch from '../utils/dataFetch';
+import ProjectCard from '../../components/projects/projectCard';
+import TitleBar from '../../components/theme/titleBar';
+import dataFetch from '../../utils/dataFetch';
 import ReactLoading from 'react-loading';
 
 const projectsQuery = ` query {

diff --git a/src/styles/member.sass → styles/member.sass b/src/styles/member.sass → styles/member.sass
diff --git a/src/styles/navigation.sass → styles/navigation.sass b/src/styles/navigation.sass → styles/navigation.sass
@@ -63,7 +63,7 @@ $font-size-menu: calc(1rem + 0.3vh)
     width: 100%
 
   .logo
-    background-image: url("../../public/logo_light.png")
+    background-image: url("../public/logo_light.png")
     background-size: contain
     background-position: center
     background-repeat: no-repeat

diff --git a/src/styles/profile.sass → styles/profile.sass b/src/styles/profile.sass → styles/profile.sass
diff --git a/src/styles/project.sass → styles/project.sass b/src/styles/project.sass → styles/project.sass
diff --git a/src/styles/style.sass → styles/style.sass b/src/styles/style.sass → styles/style.sass
@@ -4,10 +4,10 @@
 @import url('https://fonts.googleapis.com/css?family=Poppins:400&display=swap')
 @import url('https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.2/animate.min.css')
 
-@import "./navigation"
-@import "./project"
-@import "./member"
-@import "./profile"
+@import "navigation"
+@import "project"
+@import "member"
+@import "profile"
 
 body
   background: #eee
@@ -433,7 +433,7 @@ main .profile
   background-size: cover
   background-position: center
   background-color: #333
-  background-image: url("../../public/photos/cover.jpg")
+  background-image: url("../public/photos/cover.jpg")
   color: white
   .overlay
     background: linear-gradient(to right, rgba(0,0,0,0.70),rgba(0,0,0,0.75),rgba(0,0,0,0.80),rgba(0,0,0,0.75),rgba(0,0,0,0.70))

diff --git a/src/utils/dataFetch.js → utils/dataFetch.js b/src/utils/dataFetch.js → utils/dataFetch.js