Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

import Navbar from './components/Navbar';
import Profile from './components/Profile';
import Carousel from './components/Carousel'
import Connect from './components/connect'
import './index.css';
import React, { useEffect, useState } from "react";
import Carousel from './components/Carousel'
Expand Down Expand Up @@ -34,6 +36,7 @@ function App() {
<div className="content">
<Profile />
<Carousel />

<div className= "Plannections" id='Plannections'>
<h1 className="subhead">Your Plannections: </h1>
<div className="card-content1">
Expand Down
3 changes: 3 additions & 0 deletions client/src/components/Carousel.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

import React from "react"
import cardimg from './images/blueplanet.png';
import cardimg2 from './images/greenplanet.png';
Expand Down Expand Up @@ -102,4 +103,6 @@ const Carousel = () => {
);
}



export default Carousel;
3 changes: 0 additions & 3 deletions client/src/components/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ import React from "react"
import {Link} from 'react-scroll';
import logo from './images/toplogo.png';




const Navbar = () => {
return (
<nav className = "navbar">
Expand Down
22 changes: 22 additions & 0 deletions client/src/components/connect.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React from "react";


const Connect = () => {
return (
<div className= "Connect">
<h1 className="subhead">Your Plannections: </h1>
<div className = "connect-wrapper">
<div className = "connection1">
<div className="card-content1">
<h1 className="name">Jane Doe</h1>
<h4>You connected on: Microbiology, Solo Travel, Dance</h4>
<h4>They are 5 km away </h4>
</div>
</div>
</div>

</div>
);
}

export default Connect;
13 changes: 13 additions & 0 deletions client/src/components/swiper-bundle.min.css

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions client/src/components/swiper-bundle.min.js

Large diffs are not rendered by default.

26 changes: 25 additions & 1 deletion client/src/index.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
riya
#7197

riya — Today at 2:39 AM
react-scripts --openssl-legacy-provider start
cristal — Today at 6:23 AM
import React from "react"
import cardimg from './images/blueplanet.png';
import cardimg2 from './images/greenplanet.png';


Expand
message.txt
3 KB
@font-face {
font-family: 'Roca';
src: local('Roca One Regular'), local('Roca-One-Regular'),
url('RocaOne-Rg.woff2') format('woff2'),
url('RocaOne-Rg.woff') format('woff'),
url('RocaOne-Rg.ttf') format('truetype');
Expand
message.txt
4 KB

@font-face {
font-family: 'Roca';
src: local('Roca One Regular'), local('Roca-One-Regular'),
Expand Down Expand Up @@ -222,4 +246,4 @@ justify-content: center
width:100%;
height: 800px;
margin: 40px;
}
}