Skip to content

Website 23 #44

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

Closed
apramodk wants to merge 3 commits into from
Closed

Website 23 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8227c04
commit WIP
kamilbaycora Oct 24, 2022
9b12fbe
completed... for now
kamilbaycora Oct 25, 2022
7c5c816
done
kamilbaycora Oct 25, 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
0 src/routes/components/Calendar.svelte → blame.txt
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions src/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
@tailwind utilities;

body{
background-color: white;
width: 100vw;
height: 100vh;
padding: 10px 10px 10px 10px;
height: 100%;
padding: 10px 10px 10px 10px;
font-family: 'Inter', sans-serif;
color: rgba(28, 28, 28, 0.759);
font-weight: 800;
background: white;
}
34 changes: 19 additions & 15 deletions src/routes/components/Navbar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
<script>
import PDLogo from "./img/logo.svg";
import UserIcon from "./img/usericon.svg";
import KBIcon from "./img/kbicon.jpg";
import PeopleIcon from "./img/peopleicon.svg";
</script>

<main>
<div class="navbar rounded-2xl bg-gradient-to-r from-[#FAE1A7] to-[#FFAB9F]" id="navbar">
<div class="flex-1">
<a class="btn btn-ghost normal-case text-xl" href="/findfeature">
<img class="pl-1" src={PDLogo} alt="ProdoCal" width="25"/>
<div class="navbar rounded-2xl bg-gradient-to-r from-[#FAE1A7] to-[#FFAB9F] w-full shadow-xl" id="navbar">
<div class="navbar-start">
<a class="btn btn-ghost normal-case text-xl hover:fill-white" href="/calendar">
<img class="pl-1" src={PDLogo} alt="ProdoCal" width="50"/>
</a>
</div>

<div class="navbar-center">
<input type="search" id="default-search" class="block p-2 pl-10 w-full text-[#31302e] rounded-xl placeholder-[#31302e]" placeholder="Hello..." required>
</div>

<div class="flex-none gap-2">
<div class="navbar-end">
<nav>
<a href="/login">login</a>
<a href="/registration">registration</a>
<a href="/create">create</a>
<a href="/findfeature">findfeature</a>
<a href="/calendar">calendar</a>
<a class="btn btn-ghost normal-case text-xl" href="/findfeature">
<img class="pl-1" src={PeopleIcon} alt="Social" width="40"/>
</a>
</nav>

<div class="dropdown dropdown-end">
<label for="navbar" tabindex="-1" class="btn btn-ghost btn-circle avatar">
<img class="w-10" src={UserIcon} alt="AP">
<img class="w-12 mask mask-circle" src={KBIcon} alt="AP">
</label>

<ul tabindex="-1" class="mt-3 p-2 shadow menu menu-compact dropdown-content bg-white rounded-box w-52">
<li><a href="/">Profile</a></li>
<li><a href="/">Settings</a></li>
<li><a href="/login">Logout</a></li>
<li><a href="/settings">Profile & Settings</a></li>
<li><a href="/">Logout</a></li>
<li><a href="/create">TEMP: create</a></li>
<li><a href="/create_org">TEMP: create_org</a></li>
</ul>
</div>

Expand Down
Binary file added src/routes/components/img/kbicon.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.
4 changes: 1 addition & 3 deletions src/routes/components/img/logo.svg
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.
1 change: 1 addition & 0 deletions src/routes/components/img/peopleicon.svg
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.
2 changes: 1 addition & 1 deletion src/routes/components/img/usericon.svg
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.
16 changes: 3 additions & 13 deletions src/routes/findfeature/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,10 @@
</script>

<main>
<div class="md:flex md:justify-center mb-6">
<div class="card w-9/12">
<div class="card-body">
<div class="relative">
<input type="search" id="default-search" class="block p-4 pl-10 w-full text-lg text-[#FF899C] rounded-xl border-2 border-[#FF899C] placeholder-[#FF899C] hover:shadow-xl" placeholder="Find Friends & Organizations..." required>
</div>
</div>
</div>
</div>

<div class="md:flex md:justify-center mb-6">
<div class="md:flex md:justify-center mb-6 mt-10">
<div class="card bg-base-100 shadow-xl w-9/12 ">
<div class="card-body bg-gradient-to-r from-[#FFC99F] to-[#FF899C]">
<h1 class="text-white text-3xl text-left pl-6 font-extrabold">Recommended</h1>
<div class="card-body bg-gradient-to-r from-[#FAE1A7] to-[#FFAB9F]">
<h1 class="text-[#31302e] text-3xl text-left pl-6 font-extrabold">Your Friends & Organizations</h1>
<Users />
</div>
</div>
Expand Down
36 changes: 17 additions & 19 deletions src/routes/findfeature/lib/users.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,37 @@
{
num: 0,
icon: UserIcon,
name: "Corey Curtis",
status: "from contacts"
name: "Corey Curtis"
},
{
num: 1,
icon: UserIcon,
name: "Allison Culhane",
status: "mutual friend"
name: "Allison Culhane"
},
{
num: 2,
icon: UserIcon,
name: "Kianna Herwitz",
status: "from contacts"
name: "Kianna Herwitz"
},
{
num: 3,
icon: UserIcon,
name: "Jaylon Lipshutz",
status: "from contacts"
name: "Jaylon Lipshutz"
},
{
num: 4,
icon: UserIcon,
name: "Ererson Aminoff",
status: "mutual friend"
name: "Ererson Aminoff"
},
{
num: 5,
icon: UserIcon,
name: "Terry Brown",
email: "from contacts"
name: "Terry Brown"
},
{
num: 6,
icon: UserIcon,
name: "Aisha Saris",
status: "mutual friend"
name: "Aisha Saris"
},
];

Expand All @@ -55,13 +48,18 @@
<div>
{#each getMember() as {icon, name, status, num}, i(num) }

<div class="m-5 bg-white rounded-xl flex hover:shadow-xl">
<img class="w-15" src={icon} alt={name} width="100"/>
<div class="card card-side m-5 bg-white hover:shadow-xl">
<img class="ml-4 w-15" src={icon} alt={name} width="130"/>

<div class="pt-6">
<p class="text-lg font-bold">{name}</p>
<p class="text-sm font-semibold">{status}</p>
<div class="card card-center">
<div class="card-body items-center text-2xl pt-14">{name}</div>
</div>

<div class="card-body justify-end">
<button class="btn btn-info">View Organizations</button>
<button class="btn btn-outline btn-error">Remove Friend</button>
</div>

</div>

{/each}
Expand Down
Empty file removed src/routes/findfriends/+page.svelte
View file
Open in desktop
Empty file.
28 changes: 28 additions & 0 deletions src/routes/settings/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<script>
import KBIcon from "../components/img/kbicon.jpg";
</script>

<main>
<div class="md:flex md:justify-center mb-6 mt-10">
<div class="card bg-base-100 shadow-xl w-9/12 ">
<div class="card-body bg-gradient-to-r from-[#FAE1A7] to-[#FFAB9F]">
<h1 class="text-[#31302e] text-3xl text-left pl-6 font-extrabold">Profile & Settings</h1>

<div class="card card-side m-5 bg-white hover:shadow-xl">
<img class="ml-10 w-15 mask mask-circle" src={KBIcon} alt="ERR" width="130"/>

<div class="items-center text-2xl pl-5 pt-20">Kamil Baycora</div>

<div class="card-body justify-end">
<button class="btn">Change Image</button>
<button class="btn">Change Name</button>
<button class="btn">View Org/Friends</button>
</div>

</div>


</div>
</div>
</div>
</main>