From 9864dfff56210a1f444f49b7e858d10f3ffaa6a0 Mon Sep 17 00:00:00 2001 From: Anthony Manrique Date: Fri, 12 Nov 2021 00:35:47 -0800 Subject: [PATCH 1/7] Change landing page navigation --- FrontEnd/src/components/NavBar/NavBar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FrontEnd/src/components/NavBar/NavBar.tsx b/FrontEnd/src/components/NavBar/NavBar.tsx index 676643d33..c3af5b632 100644 --- a/FrontEnd/src/components/NavBar/NavBar.tsx +++ b/FrontEnd/src/components/NavBar/NavBar.tsx @@ -32,7 +32,7 @@ const NavBar: FunctionComponent = () => {
- +
From 29497da1a143d225da39697817b947e868c11032 Mon Sep 17 00:00:00 2001 From: Anthony Manrique Date: Mon, 13 Dec 2021 18:49:41 -0800 Subject: [PATCH 2/7] Fix: post modal shown after login modal --- .../src/components/HouseBrowsing/Header/Header.tsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/FrontEnd/src/components/HouseBrowsing/Header/Header.tsx b/FrontEnd/src/components/HouseBrowsing/Header/Header.tsx index 97921d395..5920407af 100644 --- a/FrontEnd/src/components/HouseBrowsing/Header/Header.tsx +++ b/FrontEnd/src/components/HouseBrowsing/Header/Header.tsx @@ -1,4 +1,4 @@ -import React, { FunctionComponent } from 'react'; +import React, { FunctionComponent, useState, useEffect } from 'react'; import { filterIcons } from '@icons'; import styles from './Header.module.scss'; import cn from 'classnames'; @@ -11,6 +11,14 @@ import { Row, Col } from 'react-bootstrap'; const Filter: FunctionComponent = () => { const { data: user } = useUser(); const dispatch = useDispatch(); + const [isPosting, setisPosting] = useState(false); + + useEffect(() => { + if (!(user.isLoggedIn && isPosting)) return; + dispatch(showPost()); + setisPosting(false); + }, [user.isLoggedIn]); + return ( { size="secondary" variant="outline" onClick={() => - user.isLoggedIn ? dispatch(showPost()) : dispatch(showLogin()) + user.isLoggedIn + ? dispatch(showPost()) + : (setisPosting(true), dispatch(showLogin())) } > Post it Now From bb7fa16244aa82696173d2b96f9229fc4ba7c11c Mon Sep 17 00:00:00 2001 From: Anthony Manrique Date: Mon, 13 Dec 2021 18:52:18 -0800 Subject: [PATCH 3/7] Fix: post modal shown after login modal --- FrontEnd/src/components/HouseBrowsing/Header/Header.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/FrontEnd/src/components/HouseBrowsing/Header/Header.tsx b/FrontEnd/src/components/HouseBrowsing/Header/Header.tsx index 53e9d49d3..983941037 100644 --- a/FrontEnd/src/components/HouseBrowsing/Header/Header.tsx +++ b/FrontEnd/src/components/HouseBrowsing/Header/Header.tsx @@ -1,13 +1,9 @@ -<<<<<<< HEAD -import React, { FunctionComponent, useState, useEffect } from 'react'; -======= import { Button, Subtitle2 } from '@basics'; import { useUser } from '@hooks'; ->>>>>>> f73211f85ce86ed2363bcccbbec1b2cc7173562d import { filterIcons } from '@icons'; import { showLogin, showPost } from '@redux'; import cn from 'classnames'; -import React, { FunctionComponent } from 'react'; +import React, { FunctionComponent, useState, useEffect } from 'react'; import { Col, Row } from 'react-bootstrap'; import { useDispatch } from 'react-redux'; import styles from './Header.module.scss'; @@ -15,7 +11,6 @@ import styles from './Header.module.scss'; const Filter: FunctionComponent = () => { const { data: user } = useUser(); const dispatch = useDispatch(); -<<<<<<< HEAD const [isPosting, setisPosting] = useState(false); useEffect(() => { @@ -23,8 +18,6 @@ const Filter: FunctionComponent = () => { dispatch(showPost()); setisPosting(false); }, [user.isLoggedIn]); -======= ->>>>>>> f73211f85ce86ed2363bcccbbec1b2cc7173562d return ( From 25ebacc5bb9f938a7d15638889462ca52179013a Mon Sep 17 00:00:00 2001 From: rafa-faj <76830815+rafa-faj@users.noreply.github.com> Date: Wed, 15 Dec 2021 20:26:10 -0800 Subject: [PATCH 4/7] Setup account r3 fixes (#37) * chore: sorted array in alphabetical order * chore: instead of calling .sort() on the array, i ran it through a sorter online and now is sorted without calling .sort() chore: changed wizard-form-height to 45rem so that dropdown menu dropped down instead of up; asterisk already in Page2.tsx of NewUserSetup --- .../basics/WizardForm/WizardForm.module.scss | 2 +- FrontEnd/src/constants/majors.ts | 174 +++++++++--------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/FrontEnd/src/components/basics/WizardForm/WizardForm.module.scss b/FrontEnd/src/components/basics/WizardForm/WizardForm.module.scss index 4cb86119b..c866474dc 100644 --- a/FrontEnd/src/components/basics/WizardForm/WizardForm.module.scss +++ b/FrontEnd/src/components/basics/WizardForm/WizardForm.module.scss @@ -1,5 +1,5 @@ $padding-x: 1.75rem; -$wizard-form-height: 42.5rem; +$wizard-form-height: 45rem; $wizard-form-max-height: 90vh; $top-bar-height: 3.75rem; $bottom-bar-height: 5rem; diff --git a/FrontEnd/src/constants/majors.ts b/FrontEnd/src/constants/majors.ts index 132253167..0c8b209af 100644 --- a/FrontEnd/src/constants/majors.ts +++ b/FrontEnd/src/constants/majors.ts @@ -2,163 +2,163 @@ * List of majors offered in UCSD/ need to extract from API endpoints in the future for other schools */ export const majors = [ + '5-year International Studies—Economics BA/MIA', + '5-year International Studies—International Business BA/MIA', + '5-year International Studies—Political Science BA/MIA', + 'Aerospace Engineering BS', 'Anthropological (Archaeology) BA', 'Anthropology (Biological Anthropology) BA', 'Anthropology (Climate Change and Human Solutions) BA', 'Anthropology (Sociocultural Anthropology) BA', - 'Biological Anthropology BS', - 'Bioengineering BS', - 'Bioengineering: Biotechnology BS', + 'Biochemistry/Chemistry BS', 'Bioengineering: Bioinformatics BS', 'Bioengineering: BioSystems BS', - 'General Biology BS', + 'Bioengineering: Biotechnology BS', + 'Bioengineering BS', + 'Bioinformatics BS', + 'Biological Anthropology BS', 'Biology with a Specialization in Bioinformatics BS', - 'Ecology, Behavior, and Evolution BS', - 'Human Biology BS', - 'Microbiology BS', - 'Molecular and Cell Biology BS', - 'Neurobiology BS', + 'Business Psychology BS', + 'Chemical Engineering BS', 'Chemistry BS', 'Chemistry with Specialization in Earth Sciences BS', - 'Biochemistry/Chemistry BS', - 'Environmental Chemistry BS', - 'Molecular Synthesis BS', - 'Pharmacological Chemistry BS', - 'Bioinformatics BS', + 'Chinese Studies BA', + 'Classical Studies BA', + 'Cognitive and Behavioral Neuroscience Bachelor of Science BS', + 'Cognitive and Behavioral Neuroscience BS', 'Cognitive Science BA/BS', 'Cognitive Science with Specialization in Clinical Aspects of Cognition BS', 'Cognitive Science with Specialization in Design and Interaction BS', + 'Cognitive Science with Specialization in Language and Culture BS', 'Cognitive Science with Specialization in Machine Learning and Neural Computation BS', 'Cognitive Science with Specialization in Neuroscience BS', - 'Cognitive Science with Specialization in Language and Culture BS', - 'Cognitive and Behavioral Neuroscience BS', + 'College Special Individual Majors BA', 'Communication BA', - 'Computer Science BA/BS', 'Computer Engineering BS', + 'Computer Science BA/BS', 'Computer Science with Specialization in Bioinformatics BS', + 'Critical Gender Studies BA', + 'Dance BA', + 'Data Science BS', + 'Earth Sciences BS', + 'Ecology, Behavior, and Evolution BS', 'Economics BA', 'Economics–Public Policy BA/MPP only', - 'Management Science BS', - 'Joint Economics-Mathematics BS', 'Education Sciences BS', - 'Electrical Engineering BS', 'Electrical Engineering and Society BA', + 'Electrical Engineering BS', 'Engineering Physics BS', + 'Environmental Chemistry BS', + 'Environmental Engineering BS', + 'Environmental Systems—Earth Sciences BS', + 'Environmental Systems—Ecology, Behavior and Evolution BS', + 'Environmental Systems—Environmental Chemistry BS', + 'Environmental Systems—Environmental Policy BA', 'Ethnic Studies BA', - 'Public Health BS', - 'Data Science BS', + 'General Biology BS', + 'General Physics BA', + 'General Physics/Secondary Education BA', + 'German Studies BA', + 'Global Health BA', + 'Global Health BS', + 'Global South Studies BA', 'History BA', + 'Human Biology BS', + 'Human Developmental Sciences BA', + 'Human Developmental Sciences BS', + 'Human Developmental Sciences with a Specialization in Equity and Diversity BS', + 'Human Developmental Sciences with a Specialization in Healthy Aging BS', + 'Interdisciplinary Computing and the Arts BA', + 'International Studies—Anthropology BA', + 'International Studies—Economics BA', + 'International Studies—History BA', + 'International Studies—International Business BA', + 'International Studies—Linguistics BA', + 'International Studies—Literature BA', + 'International Studies—Philosophy BA', + 'International Studies—Political Science BA', + 'International Studies—Sociology BA', + 'Italian Studies BA', + 'Japanese Studies BA', + 'Jewish Studies BA', + 'Joint Economics-Mathematics BS', + 'Joint Mathematics-Economics BS', + 'Language Studies BA', + 'Latin American Studies BA', + 'Latin American Studies with a Concentration in Mexico BA', + 'Latin American Studies with a Concentration in Migration and Border Studies BA', 'Linguistics (Cognition and Language) BA', 'Linguistics (Language and Society) BA', 'Linguistics (Speech and Language Sciences) BA', - 'Language Studies BA', 'Linguistics BA', + 'Literature/Writing BA', 'Literatures in English BA', 'Literatures in Spanish BA', - 'Literature/Writing BA', - 'World Literature and Culture BA', - 'Mathematics BS', + 'Management Science BS', + 'Marine Biology BS', 'Mathematics (Applied) BS', - 'Mathematics—Computer Science BS', + 'Mathematics BS', 'Mathematics—Applied Science BS', - 'Joint Mathematics-Economics BS', + 'Mathematics—Computer Science BS', 'Mathematics—Scientific Computation BS', 'Mathematics—Secondary Education BA', - 'Probability and Statistics BS', - 'Aerospace Engineering BS', - 'Environmental Engineering BS', 'Mechanical Engineering BS', 'Mechanical Engineering with a Specialization in Controls and Robotics BS', 'Mechanical Engineering with a Specialization in Fluid Mechanics and Thermal Systems BS', 'Mechanical Engineering with a Specialization in Materials Science and Engineering BS', 'Mechanical Engineering with a Specialization in Mechanics of Materials BS', 'Mechanical Engineering with a Specialization in Renewable Energy and Environmental Flows BS', + 'Microbiology BS', + 'Molecular and Cell Biology BS', + 'Molecular Synthesis BS', 'Music BA', 'Music/Humanities BA', - 'Chemical Engineering BS', 'Nanoengineering BS', + 'Neurobiology BS', + 'Oceanic and Atmospheric Sciences BS', + 'Pharmacological Chemistry BS', 'Philosophy BA', - 'General Physics BA', - 'General Physics/Secondary Education BA', 'Physics BS', 'Physics/Biophysics BS', + 'Physics with Specialization in Astrophysics BS', 'Physics with Specialization in Computational Physics BS', 'Physics with Specialization in Earth Sciences BS', 'Physics with Specialization in Materials Physics BS', - 'Physics with Specialization in Astrophysics BS', - 'Political Science BA', 'Political Science (American Politics) BA', 'Political Science (Comparative Politics) BA', - 'Political Science (International Relations) BA', 'Political Science (International Affairs) BA/MIA only', + 'Political Science (International Relations) BA', 'Political Science (Political Theory) BA', 'Political Science (Public Law) BA', 'Political Science (Public Policy) BA', - 'Business Psychology BS', - 'Cognitive and Behavioral Neuroscience Bachelor of Science BS', + 'Political Science BA', + 'Probability and Statistics BS', 'Psychology BA', - 'Psychology BS', 'Psychology Bachelor of Science with a Specialization in Clinical Psychology BS', 'Psychology Bachelor of Science with a Specialization in Cognitive Psychology BS', 'Psychology Bachelor of Science with a Specialization in Developmental Psychology BS', 'Psychology Bachelor of Science with a Specialization in Human Health BS', 'Psychology Bachelor of Science with a Specialization in Sensation and Perception BS', 'Psychology Bachelor of Science with a Specialization in Social Psychology BS', - 'Earth Sciences BS', - 'Marine Biology BS', - 'Oceanic and Atmospheric Sciences BS', + 'Psychology BS', + 'Public Health BS', + 'Real Estate and Development BS', + 'Russian, East European, and Eurasian Studies BA', 'Sociology BA', - 'Sociology—International Studies BA', 'Sociology—American Studies BA', - 'Sociology—Science and Medicine BA', - 'Sociology—Economy and Society BA', 'Sociology—Culture and Communication BA', - 'Sociology—Social Inequity BA', + 'Sociology—Economy and Society BA', + 'Sociology—International Studies BA', 'Sociology—Law and Society BA', + 'Sociology—Science and Medicine BA', + 'Sociology—Social Inequity BA', + 'Speculative Design BA', 'Structural Engineering BS', - 'Dance BA', + 'Study of Religion BA', 'Theatre BA', 'Urban Studies and Planning BA', 'Visual Arts (Art History/Criticism) BA', 'Visual Arts (Media) BA', 'Visual Arts (Studio) BA', - 'Interdisciplinary Computing and the Arts BA', - 'Speculative Design BA', - 'Chinese Studies BA', - 'Classical Studies BA', - 'College Special Individual Majors BA', - 'Critical Gender Studies BA', - 'Environmental Systems—Earth Sciences BS', - 'Environmental Systems—Ecology, Behavior and Evolution BS', - 'Environmental Systems—Environmental Chemistry BS', - 'Environmental Systems—Environmental Policy BA', - 'German Studies BA', - 'Global Health BA', - 'Global Health BS', - 'Global South Studies BA', - 'Human Developmental Sciences BA', - 'Human Developmental Sciences BS', - 'Human Developmental Sciences with a Specialization in Equity and Diversity BS', - 'Human Developmental Sciences with a Specialization in Healthy Aging BS', - 'International Studies—Anthropology BA', - 'International Studies—Economics BA', - 'International Studies—History BA', - 'International Studies—International Business BA', - 'International Studies—Linguistics BA', - 'International Studies—Literature BA', - 'International Studies—Philosophy BA', - 'International Studies—Political Science BA', - 'International Studies—Sociology BA', - '5-year International Studies—Economics BA/MIA', - '5-year International Studies—International Business BA/MIA', - '5-year International Studies—Political Science BA/MIA', - 'Italian Studies BA', - 'Japanese Studies BA', - 'Jewish Studies BA', - 'Latin American Studies BA', - 'Latin American Studies with a Concentration in Mexico BA', - 'Latin American Studies with a Concentration in Migration and Border Studies BA', - 'Real Estate and Development BS', - 'Russian, East European, and Eurasian Studies BA', - 'Study of Religion BA', + 'World Literature and Culture BA', ]; From 556cae7c3681fa66a66e4a1b9025c9a5bba1f573 Mon Sep 17 00:00:00 2001 From: Anthony Manrique Date: Mon, 17 Jan 2022 17:07:09 -0800 Subject: [PATCH 5/7] Add landing page sungod login --- FrontEnd/src/assets/icons/index.ts | 1 + .../src/assets/icons/landingLogin/Bearl.png | Bin 0 -> 4623 bytes .../src/assets/icons/landingLogin/SunGod.png | Bin 0 -> 16513 bytes .../src/assets/icons/landingLogin/index.ts | 2 + .../LandingPage/LandingPage.module.scss | 59 ++++++++++++++++++ .../components/LandingPage/LandingPage.tsx | 54 ++++++++++++++-- 6 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 FrontEnd/src/assets/icons/landingLogin/Bearl.png create mode 100644 FrontEnd/src/assets/icons/landingLogin/SunGod.png create mode 100644 FrontEnd/src/assets/icons/landingLogin/index.ts diff --git a/FrontEnd/src/assets/icons/index.ts b/FrontEnd/src/assets/icons/index.ts index a7992034c..862a33160 100644 --- a/FrontEnd/src/assets/icons/index.ts +++ b/FrontEnd/src/assets/icons/index.ts @@ -24,6 +24,7 @@ export * as MakeAPost from './makeAPost'; export * as aboutIcons from './about'; export * as chipIcons from './chipIcons'; export * as howToPost from './howToPost'; +export * as landingLogin from './landingLogin'; // import any logo to be used in the `Icon` type below import { default as ExampleIcon } from './misc/logo.svg'; diff --git a/FrontEnd/src/assets/icons/landingLogin/Bearl.png b/FrontEnd/src/assets/icons/landingLogin/Bearl.png new file mode 100644 index 0000000000000000000000000000000000000000..83052cc84e7810c5883a6a6c3662d5b30bd28a48 GIT binary patch literal 4623 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 FV1fa{qtpNZ literal 0 HcmV?d00001 diff --git a/FrontEnd/src/assets/icons/landingLogin/SunGod.png b/FrontEnd/src/assets/icons/landingLogin/SunGod.png new file mode 100644 index 0000000000000000000000000000000000000000..6acdc7c762193e105a81ceb5d04eca914bb365fd GIT binary patch literal 16513 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 literal 0 HcmV?d00001 diff --git a/FrontEnd/src/assets/icons/landingLogin/index.ts b/FrontEnd/src/assets/icons/landingLogin/index.ts new file mode 100644 index 000000000..60fd14f49 --- /dev/null +++ b/FrontEnd/src/assets/icons/landingLogin/index.ts @@ -0,0 +1,2 @@ +export { default as Bearl } from './Bearl.png'; +export { default as SunGod } from './SunGod.png'; diff --git a/FrontEnd/src/components/LandingPage/LandingPage.module.scss b/FrontEnd/src/components/LandingPage/LandingPage.module.scss index dcb37237d..85ad66ce9 100644 --- a/FrontEnd/src/components/LandingPage/LandingPage.module.scss +++ b/FrontEnd/src/components/LandingPage/LandingPage.module.scss @@ -25,6 +25,10 @@ @include font-type('body 1'); } +.bold { + font-weight: bold; +} + .textLg { justify-content: center; @@ -278,3 +282,58 @@ } } } +.loginWrapper { + display: flex; + justify-content: center; +} + +.bearlMessageWrapper { + display: flex; + flex-direction: column; + align-items: center; +} + +.loginFrame { + display: flex; + align-items: center; + justify-content: center; + + width: fit-content; + + border-style: solid; + border-width: thin; + border-color: $border-color; + border-radius: 0.5rem 0.5rem 0.5rem 0; + + padding: 2rem; +} + +.loginText { + width: 29rem; + color: $primary-400-color; +} + +.bearlImage { + width: 5.875rem; + height: 6.5rem; + background-size: contain; + align-self: flex-end; +} + +.sunGodImage { + width: 12.1875rem; + height: 13.625rem; + background-size: contain; +} +// +.findHeading { + text-align: center; + margin-top: 4rem; + margin-bottom: 5rem; + + @include font-type('h3'); +} + +.findWrapper { + background-color: black; //need to change entire landing page to white later +} diff --git a/FrontEnd/src/components/LandingPage/LandingPage.tsx b/FrontEnd/src/components/LandingPage/LandingPage.tsx index 586e55331..1b951edb6 100644 --- a/FrontEnd/src/components/LandingPage/LandingPage.tsx +++ b/FrontEnd/src/components/LandingPage/LandingPage.tsx @@ -5,9 +5,12 @@ import styles from './LandingPage.module.scss'; import Button from '@components/basics/Button'; import { useRouter } from 'next/dist/client/router'; import { TriggerPageView } from '@components/ga'; -import { miscIcons, howToPost } from '@icons'; -import { FilledImage } from '@basics'; +import { miscIcons, howToPost, landingLogin } from '@icons'; +import { Body2, FilledImage, Subtitle2 } from '@basics'; import cn from 'classnames'; +import { useUser } from '@hooks'; +import { useDispatch } from 'react-redux'; +import { showLogin } from '@redux'; const HomehubWelcomeInfo: FunctionComponent = () => { const router = useRouter(); @@ -47,6 +50,8 @@ const HomehubWelcomeInfo: FunctionComponent = () => { const Landing: FunctionComponent = () => { const router = useRouter(); + const { data: user } = useUser(); + const dispatch = useDispatch(); const [currentPostStep, setCurrentPostStep] = useState(1); const isCurrentStep = (step: number) => step === currentPostStep; @@ -108,7 +113,6 @@ const Landing: FunctionComponent = () => { return ( - @@ -122,7 +126,6 @@ const Landing: FunctionComponent = () => {
-
@@ -143,7 +146,6 @@ const Landing: FunctionComponent = () => {
-

Post Your Place

@@ -167,6 +169,48 @@ const Landing: FunctionComponent = () => {
+ +
+ {/* {animation and background color change needed} */} +
+
+ + + + Homehub requests a{' '} + UCSD email to ensure the + authenticity of people signing up! + + {!user.isLoggedIn ? ( + + ) : ( + <> + )} + +
+
+ +
+ +
+ {/* change backgorund color, plain cards (no data) -> animation -> data */} +

Find Your Spot

+ +
+ + {/* need to center */} +
+
); }; From 1088d0d38eb99085b22384416f4cf957b53dffd4 Mon Sep 17 00:00:00 2001 From: Anthony Manrique Date: Mon, 17 Jan 2022 20:28:48 -0800 Subject: [PATCH 6/7] Incomplete scrollbar --- .../LandingPage/LandingPage.module.scss | 29 +++++++++++++++++-- .../components/LandingPage/LandingPage.tsx | 19 ++++++++---- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/FrontEnd/src/components/LandingPage/LandingPage.module.scss b/FrontEnd/src/components/LandingPage/LandingPage.module.scss index 85ad66ce9..a04e28e3c 100644 --- a/FrontEnd/src/components/LandingPage/LandingPage.module.scss +++ b/FrontEnd/src/components/LandingPage/LandingPage.module.scss @@ -328,12 +328,35 @@ // .findHeading { text-align: center; - margin-top: 4rem; - margin-bottom: 5rem; @include font-type('h3'); } .findWrapper { - background-color: black; //need to change entire landing page to white later + padding: 4rem 0 5rem; + background-color: white; //need to change entire landing page to white later +} + +.exploreButton { + padding: 3rem 0 8rem 0; +} + +.houseCardWrapper { + & > div { + overflow: scroll; + + &::-webkit-scrollbar { + // display: none; + } + + & > div { + flex-wrap: unset; + } + } + + &:hover > div { + &::-webkit-scrollbar { + display: block; + } + } } diff --git a/FrontEnd/src/components/LandingPage/LandingPage.tsx b/FrontEnd/src/components/LandingPage/LandingPage.tsx index 1b951edb6..8125ff5bc 100644 --- a/FrontEnd/src/components/LandingPage/LandingPage.tsx +++ b/FrontEnd/src/components/LandingPage/LandingPage.tsx @@ -10,7 +10,8 @@ import { Body2, FilledImage, Subtitle2 } from '@basics'; import cn from 'classnames'; import { useUser } from '@hooks'; import { useDispatch } from 'react-redux'; -import { showLogin } from '@redux'; +import { showLogin, useShowPostType } from '@redux'; +import { BrowsingStudentList, HouseCardList } from '..'; const HomehubWelcomeInfo: FunctionComponent = () => { const router = useRouter(); @@ -50,6 +51,7 @@ const HomehubWelcomeInfo: FunctionComponent = () => { const Landing: FunctionComponent = () => { const router = useRouter(); + const showPostType = useShowPostType(); const { data: user } = useUser(); const dispatch = useDispatch(); const [currentPostStep, setCurrentPostStep] = useState(1); @@ -184,10 +186,10 @@ const Landing: FunctionComponent = () => { UCSD email to ensure the authenticity of people signing up! + {/* also move sungod when logged in */} {!user.isLoggedIn ? ( - {/* need to center */} +
+ +
+
+ +
From 888d95e36eefddf8d01be8475a86a41d5306be51 Mon Sep 17 00:00:00 2001 From: Anthony Manrique Date: Thu, 3 Feb 2022 17:29:43 -0800 Subject: [PATCH 7/7] Change scrollbar styling and button roundedness --- FrontEnd/src/assets/scss/utils/_mixins.scss | 2 +- .../components/LandingPage/LandingPage.module.scss | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/FrontEnd/src/assets/scss/utils/_mixins.scss b/FrontEnd/src/assets/scss/utils/_mixins.scss index 179637cc2..9d8f45847 100644 --- a/FrontEnd/src/assets/scss/utils/_mixins.scss +++ b/FrontEnd/src/assets/scss/utils/_mixins.scss @@ -131,7 +131,7 @@ } @mixin rounded-pill-shape { - border-radius: 5000rem; // overloading border-radius results in a "pill like" shape + border-radius: 0.9375rem; // overloading border-radius results in a "pill like" shape } // NOTE: width and height must be the same for this to be circular diff --git a/FrontEnd/src/components/LandingPage/LandingPage.module.scss b/FrontEnd/src/components/LandingPage/LandingPage.module.scss index c21879261..e0c7a6707 100644 --- a/FrontEnd/src/components/LandingPage/LandingPage.module.scss +++ b/FrontEnd/src/components/LandingPage/LandingPage.module.scss @@ -310,7 +310,7 @@ padding: 2rem; margin-top: 2rem; - transition: all 3s; + transition: all 2s; @include absCenter { top: 100%; @@ -366,14 +366,16 @@ &::-webkit-scrollbar { visibility: hidden; display: block; - width: 1px; - height: 5px; - background-color: #aaa; + height: 12px; + border-radius: 50px; + background-color: $border-color; } &::-webkit-scrollbar-thumb { visibility: hidden; - background: #000; + background: $primary-300-color; + width: auto; + border-radius: 50px; } &:hover {