Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

S4 us 28 #68

Merged
merged 2 commits into from
Nov 18, 2022
Merged

S4 us 28 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4080da
Add animation for left nav bar buttons. Add animation for top nav but…
YoungkoonLi Nov 18, 2022
1ba1030
Merge pull request #67 from UTSCCSCC01/catkins_dev
YoungkoonLi Nov 18, 2022
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
678 changes: 671 additions & 7 deletions setup/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion setup/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"axios": "^0.27.2",
"bcrypt": "^5.1.0",
"bootstrap": "^5.2.1",
"connect-mongodb-session": "^3.1.1",
"cors": "^2.8.5",
"dotenv": "^16.0.3",
"express": "^4.18.2",
"express-session": "^1.17.3",
"form-data": "^4.0.0",
"mongoose": "^6.7.1",
"mongoose": "^6.7.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-redux": "^8.0.5",
Expand Down
86 changes: 41 additions & 45 deletions setup/src/components/navbars/Left_Navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,43 @@

import pfp from "../../images/image.jpg";

function Left_Navbar () {
return (
<>
{/*PHOTO + BUTTONS DIV */}
<div className=' h-screen w-64 flex flex-col justify-start '>

{/* div for image */}
<div className='flex align-center justify-center '>

<img src={pfp} alt='pfp' className='h-full w-full w-36 h-36 border-2 m-3 border-[#D0D1C9]'/>

</div>

{/* div for buttons to organize them in flex */}
<div className='flex flex-col m-5'>

<button className='bg-[#ffffff] h-10 mx-2 border-2 border-[#D0D1C9] shadow-md'>
Profile
</button>
<button className='bg-[#ffffff] h-10 m-2 border-2 border-[#D0D1C9] shadow-md'>
Friends
</button>
<button className='bg-[#ffffff] h-10 mx-2 border-2 border-[#D0D1C9] shadow-md'>
Settings
</button>
<button className='bg-[#ffffff] h-10 m-2 border-2 border-[#D0D1C9] shadow-md'>
Logout
</button>


</div>

{/* div for chat button */}

<button className='my-10 mx-7 rounded-md border-2 border-[#D0D1C9] shadow-md'>
Chat
</button>

</div>
</>
)
import pfp from "../../images/logo2.png";

function Left_Navbar() {
return (
<>
{/*PHOTO + BUTTONS DIV */}
<div className=" h-screen w-64 flex flex-col justify-start ">
{/* div for image */}
<div className="flex align-center justify-center ">
<img
src={pfp}
alt="pfp"
className="h-full w-full w-36 h-36 border-2 m-3 border-[#D0D1C9]"
/>
</div>

{/* div for buttons to organize them in flex */}
<div className="flex flex-col m-5">
<button className="bg-[#ffffff] h-10 mx-2 border-2 border-[#D0D1C9] shadow-md bg-gray-100 transition ease-in-out delay-150 bg-gray-100 hover:-translate-y-1 hover:scale-110 hover:bg-[#f8fafc] duration-300">
Profile
</button>
<button className="bg-[#ffffff] h-10 m-2 border-2 border-[#D0D1C9] shadow-md transition ease-in-out delay-150 bg-gray-500 hover:-translate-y-1 hover:scale-110 hover:bg-[#f8fafc] duration-300">
Friends
</button>
<button className="bg-[#ffffff] h-10 mx-2 border-2 border-[#D0D1C9] shadow-md transition ease-in-out delay-150 bg-gray-500 hover:-translate-y-1 hover:scale-110 hover:bg-[#f8fafc] duration-300">
Settings
</button>
<button className="bg-[#ffffff] h-10 m-2 border-2 border-[#D0D1C9] shadow-md transition ease-in-out delay-150 bg-gray-500 hover:-translate-y-1 hover:scale-110 hover:bg-[#f8fafc] duration-300">
Logout
</button>
</div>

{/* div for chat button */}

<button className="my-10 mx-7 rounded-md border-2 shadow-md border-[#D0D1C9] transition ease-in-out delay-150 bg-[#f3f4f6] hover:-translate-y-1 hover:scale-110 hover:bg-[#d1d5db] duration-300">
Chat
</button>
</div>
</>
);
}

export default Left_Navbar;
export default Left_Navbar;
81 changes: 50 additions & 31 deletions setup/src/components/navbars/Top_Navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,54 @@
function Top_Navbar () {
return (
<>
<nav className='flex justify-around items-center h-10 border-2 border-[#D0D1C9] shadow-md p-2'>
function Top_Navbar() {
return (
<>
<nav className="flex justify-around items-center h-10 border-2 border-[#D0D1C9] shadow-md p-2">
<a
href="/clubs"
className="transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-110 hover:bg-[#ffffff] duration-300"
>
Clubs List
</a>

<a href="/clubs">
Clubs List
</a>
<a
href="/users"
className="transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-110 hover:bg-[#ffffff] duration-300"
>
Users List
</a>

<a href="/users" >
Users List
</a>

<a href="/clubs/update/:id" >
Update Club
</a>
<a href="/clubs/clubsFeed">
Feed
</a>
<a href='/clubs/create'>
Create a Club
</a>
<a href='/clubs/join'>
Join a Club
</a>
<a href='/post/create'>
Create a Post
</a>

</nav>
</>
)
<a
href="/clubs/update/:id"
className="transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-110 hover:bg-[#ffffff] duration-300"
>
Update Club
</a>
<a
href="/clubs/clubsFeed"
className="transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-110 hover:bg-[#ffffff] duration-300"
>
Feed
</a>
<a
href="/clubs/create"
className="transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-110 hover:bg-[#ffffff] duration-300"
>
Create a Club
</a>
<a
href="/clubs/join"
className="transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-110 hover:bg-[#ffffff] duration-300"
>
Join a Club
</a>
<a
href="/post/create"
className="transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-110 hover:bg-[#ffffff] duration-300"
>
Create a Post
</a>
</nav>
</>
);
}

export default Top_Navbar;
export default Top_Navbar;
Binary file added setup/src/images/background_login.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added setup/src/images/catkins.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added setup/src/images/catkins.psd
View file
Open in desktop
Binary file not shown.
Binary file added setup/src/images/logo.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added setup/src/images/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added setup/src/images/logo.psd
View file
Open in desktop
Binary file not shown.
Binary file added setup/src/images/logo2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added setup/src/images/logo2.psd
View file
Open in desktop
Binary file not shown.