diff --git a/frontend/frontend/src/assets/avgupta456_langs.png b/frontend/frontend/src/assets/avgupta456_langs.png deleted file mode 100644 index 7dcb3978..00000000 Binary files a/frontend/frontend/src/assets/avgupta456_langs.png and /dev/null differ diff --git a/frontend/frontend/src/assets/dhermes_langs.png b/frontend/frontend/src/assets/dhermes_langs.png deleted file mode 100644 index a1e70a02..00000000 Binary files a/frontend/frontend/src/assets/dhermes_langs.png and /dev/null differ diff --git a/frontend/frontend/src/assets/mockup.png b/frontend/frontend/src/assets/mockup.png deleted file mode 100644 index a3f07d39..00000000 Binary files a/frontend/frontend/src/assets/mockup.png and /dev/null differ diff --git a/frontend/frontend/src/assets/notes.txt b/frontend/frontend/src/assets/notes.txt deleted file mode 100644 index 42725561..00000000 --- a/frontend/frontend/src/assets/notes.txt +++ /dev/null @@ -1,2 +0,0 @@ -2022: Generated laptop mockups using deviceshots.com -2023: Used https://www.anthonyboyd.graphics/mockups/m2-macbook-air-mockup/ and Adobe Express \ No newline at end of file diff --git a/frontend/frontend/src/assets/reinink_repos.png b/frontend/frontend/src/assets/reinink_repos.png deleted file mode 100644 index e875bf6f..00000000 Binary files a/frontend/frontend/src/assets/reinink_repos.png and /dev/null differ diff --git a/frontend/frontend/src/assets/tiangolo_repos.png b/frontend/frontend/src/assets/tiangolo_repos.png deleted file mode 100644 index 74894a40..00000000 Binary files a/frontend/frontend/src/assets/tiangolo_repos.png and /dev/null differ diff --git a/frontend/frontend/src/pages/App/AppTrends.js b/frontend/frontend/src/pages/App/AppTrends.js index d516821e..55f39207 100644 --- a/frontend/frontend/src/pages/App/AppTrends.js +++ b/frontend/frontend/src/pages/App/AppTrends.js @@ -1,16 +1,14 @@ import React, { useEffect } from 'react'; import { useDispatch } from 'react-redux'; -import { BrowserRouter as Router, Route, Routes } from 'react-router-dom'; +import { BrowserRouter as Router } from 'react-router-dom'; import { logout as _logout, setUserAccess as _setUserAccess, } from '../../redux/actions/userActions'; import Header from './Header'; -import LandingScreen from '../Landing'; import HomeScreen from '../Home'; -import { NoMatchScreen } from '../Misc'; import { getUserMetadata } from '../../api'; import { useIsAuthenticated, @@ -44,11 +42,7 @@ function App() {
- - } /> - } /> - } /> - +
diff --git a/frontend/frontend/src/pages/App/Header.js b/frontend/frontend/src/pages/App/Header.js index 89f03423..0b213109 100644 --- a/frontend/frontend/src/pages/App/Header.js +++ b/frontend/frontend/src/pages/App/Header.js @@ -12,6 +12,7 @@ import appIcon from '../../assets/appLogo64.png'; import { classnames } from '../../utils'; import { GITHUB_PUBLIC_AUTH_URL } from '../../constants'; import { FaGithub as GithubIcon } from 'react-icons/fa'; +import { ProgressBar } from '../../components'; const propTypes = { to: PropTypes.string.isRequired, @@ -63,12 +64,13 @@ const Header = ({ mode }) => { const [toggle, setToggle] = useState(false); const isAuthenticated = useIsAuthenticated(); + const [stage, setStage] = useState(isAuthenticated ? 1 : 0); const dispatch = useDispatch(); const logout = () => dispatch(_logout()); return ( -
+
{/* GitHub Trends Logo */} { )}
+
); }; diff --git a/frontend/frontend/src/pages/Home/Home.js b/frontend/frontend/src/pages/Home/Home.js index 821d55ae..2964b0ab 100644 --- a/frontend/frontend/src/pages/Home/Home.js +++ b/frontend/frontend/src/pages/Home/Home.js @@ -3,7 +3,6 @@ import { useDispatch } from 'react-redux'; import BounceLoader from 'react-spinners/BounceLoader'; import { v4 as uuidv4 } from 'uuid'; -import { ProgressBar } from '../../components'; import { CustomizeStage, DisplayStage, @@ -239,17 +238,6 @@ const HomeScreen = () => { return (
-
diff --git a/frontend/frontend/src/pages/Landing/Landing.js b/frontend/frontend/src/pages/Landing/Landing.js deleted file mode 100644 index 96cce4a4..00000000 --- a/frontend/frontend/src/pages/Landing/Landing.js +++ /dev/null @@ -1,171 +0,0 @@ -/* eslint-disable react/jsx-one-expression-per-line */ - -import React from 'react'; - -import { Link } from 'react-router-dom'; -import { FaCheck as CheckIcon, FaGithub as GithubIcon } from 'react-icons/fa'; - -import { Button, Preview } from '../../components'; - -import mockup from '../../assets/mockup.png'; -import avgupta456Langs from '../../assets/avgupta456_langs.png'; -import tiangoloRepos from '../../assets/tiangolo_repos.png'; -import reininkRepos from '../../assets/reinink_repos.png'; -import dhermesLangs from '../../assets/dhermes_langs.png'; -import { useIsAuthenticated } from '../../redux/selectors/userSelectors'; - -function LandingScreen() { - const isAuthenticated = useIsAuthenticated(); - - return ( -
-
-
-
- Discover and share code contribution insights -
-
- GitHub Trends dives deep into the GitHub API to bring you insightful - metrics on your contributions, broken by repository and language. -
-
- - - - - - -
-
-
- preview -
-
-
-
- -
-
-

- Display your GitHub stats -
with embeddable cards
-

-

1. Comprehensive

-

- GitHub Trends counts each individual commit, across all your - open-source contributions. We surface line of code metrics by - repository and languages. -

-
-

2. Customizable

-

- Using the online dashboard, easily modify the time range, include - private commits, and choose your display theme. -

-
-

3. Shareable

-

- Share your GitHub Trends cards as a PNG on Twitter, or as a dynamic - embeddable image on your GitHub profile or personal website. -

-
-
- - - - {!isAuthenticated && ( - - - - )} -
-
-
-
-

GitHub Trends

-

- GitHub Trends dives deep into the GitHub API to bring you insightful - metrics and visualizations. We access individual commits to compute - accurate and granular statistics. -

-
- {[ - { - header: 'Measures Contribs', - text: 'Calculates your stats on a per-contribution level, allowing for deeper insights', - }, - { - header: 'LOC Insights', - text: 'See aggregate stats on lines of code (LOC) written across all contributions', - }, - { - header: 'Language Breakdowns', - text: 'Showcase your favorite languages with LOC language breakdowns', - }, - { - header: 'Private Mode', - text: 'Use a PAT to avoid rate limiting and include private contributions', - }, - { - header: 'Exciting Visualizations', - text: 'Visualize your contributions with bar graphs, pie charts, and more', - }, - { - header: 'Shareable Stats', - text: 'Easily add your cards to your GitHub and share them online', - }, - ].map((item, index) => ( - // eslint-disable-next-line react/no-array-index-key -
-
- -
-
-

{item.header}

-

{item.text}

-
-
- ))} -
-
- {!isAuthenticated && ( -
-

Ready to get started?

-

Create an account today.

-
- - - -
-
- )} -
- ); -} - -export default LandingScreen; diff --git a/frontend/frontend/src/pages/Landing/index.js b/frontend/frontend/src/pages/Landing/index.js deleted file mode 100644 index b11123d7..00000000 --- a/frontend/frontend/src/pages/Landing/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import LandingScreen from './Landing'; - -export default LandingScreen;