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.

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

[WIP] falcon profile display #47

Open
wants to merge 27 commits into
base: release
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
59d6013
feat: add user profile display
ayanchoudhary Jun 7, 2020
ae59f75
test
ayanchoudhary Jun 8, 2020
73b50f7
refactor: remove fullpage scroll and oauth support
ayanchoudhary Sep 17, 2020
e2ca747
fix: link redirect on contact page and sidebar fonts
ayanchoudhary Sep 22, 2020
b2ac7a5
fix: chat redirect link
ayanchoudhary Sep 22, 2020
507c0d2
Fix card position in contact page
wryonik Sep 22, 2020
281bc8e
fix: add pointer in carousel and fix safari bug in projects image
ayanchoudhary Sep 22, 2020
f6a6dc7
chore: chnage favicon
ayanchoudhary Oct 7, 2020
d29fddc
Add left scroll arrow in timeline
wryonik Oct 11, 2020
c75d845
Remove sidebar in projects page when footer starts
wryonik Oct 12, 2020
d8cf0dc
feat: add ongoing event tag for news
Ishan-002 Oct 12, 2020
ada3685
remove order by title in projects
Ishan-002 Oct 12, 2020
9f7c2eb
Merge pull request #52 from sdslabs/news-minor-changes
ayanchoudhary Oct 12, 2020
f836345
fix: render ongoing event
Ishan-002 Oct 12, 2020
c33b56b
Merge pull request #53 from sdslabs/news-minor-changes
ayanchoudhary Oct 12, 2020
c2de56e
fix: change hideFooter flag in home route
ayanchoudhary Oct 12, 2020
fb941ad
fix: remove onScrollEvent
ayanchoudhary Oct 12, 2020
df68651
Fix scrolling in projects page
wryonik Oct 12, 2020
95f39a4
Remove footer from projects page
wryonik Oct 12, 2020
ae84b09
fix: add links to sister groups
ayanchoudhary Oct 12, 2020
c3adc97
feat: add meta tags
ayanchoudhary Oct 12, 2020
b4aa12d
fix: change link structure and email link
ayanchoudhary Oct 12, 2020
a568625
fix: mail link in contact page
ayanchoudhary Oct 12, 2020
724726e
Remove falcon dependency
wryonik Oct 16, 2020
d9868f3
add discord widget and fix news page
burnerlee Jul 6, 2021
3b2da8c
update margin top for footer
burnerlee Jul 8, 2021
3ab1043
Merge pull request #58 from sdslabs/discord-widget
ayanchoudhary Jul 12, 2021
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
1 change: 1 addition & 0 deletions apps/news/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Create your models here.

TYPES = [
('ongoing event', 'ongoing'),
('upcoming event', 'upcoming'),
('app update', 'app'),
('online competition', 'online'),
Expand Down
2 changes: 1 addition & 1 deletion apps/projects/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def get_projects(request):
"""
Get a list of projects
"""
projects = Project.objects.filter(is_visible=True).order_by('title')
projects = Project.objects.filter(is_visible=True)
serializer = ProjectSerializer(
projects, many=True, context={'request': request})
response_data = serializer.data
Expand Down
3 changes: 3 additions & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ yarn-error.log*
*.njsproj
*.sln
*.sw*

# Misc files
/src/config/config.js
22 changes: 20 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
},
"dependencies": {
"axios": "^0.18.1",
"cookies": "^0.7.3",
"js-cookie": "^2.2.1",
"masonry-layout": "^4.2.2",
"vue": "^2.5.17",
"vue-carousel": "^0.18.0",
Expand Down
Binary file removed frontend/public/favicon.ico
Binary file not shown.
4 changes: 3 additions & 1 deletion frontend/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<meta name="description" content="The portfolio of Software Development Section, IIT Roorkee, India">
<meta name="author" content="SDSLabs">
<link rel="icon" href="<%= BASE_URL %>sdslabs.png">
<script src="./scripts/Masonry.js"></script>
<script src="https://kit.fontawesome.com/a076d05399.js"></script>
<title>SDSLabs</title>
Expand Down
Binary file added frontend/public/sdslabs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions frontend/src/assets/images/logo-square.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions frontend/src/assets/images/scroll-arrow-left.svg
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 frontend/src/components/Button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<a
v-if="native"
:href="url"
rel="noreferrer noopener"
class="no-underline flex flex-row max-w-content bg-black inline-block font-bold text-1.5xl sm:text-base text-white leading-none px-14 py-10 sm:py-5 border-solid border-black border-1"
target="_blank"
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</div>
<div class="mr-14">
<a
href="https://feedburner.google.com/fb/a/mailverify?uri=sdslabs/IOpf1&loc=en_US"
href="mailto:[email protected]"
rel="noopener noreferrer"
target="blank"
>
Expand Down
12 changes: 8 additions & 4 deletions frontend/src/components/Gallery.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@
</div>
<div class="self-center sm:self-start sm:-mt-32">
<span
class="h-4 w-4 sm:h-3 sm:w-3 rounded-50 inline-block mt-16"
class="h-4 w-4 sm:h-3 sm:w-3 rounded-50 inline-block mt-16 pointer"
v-bind:class="{
'bg-black': queue === 1,
'bg-carousel': queue !== 1
}"
v-on:click="queue = 1"
/>
<span
class="h-4 w-4 sm:h-3 sm:w-3 rounded-50 inline-block mt-16 ml-4"
class="h-4 w-4 sm:h-3 sm:w-3 rounded-50 inline-block mt-16 ml-4 pointer"
v-bind:class="{
'bg-black': queue === 2,
'bg-carousel': queue !== 2
}"
v-on:click="queue = 2"
/>
<span
class="h-4 w-4 sm:h-3 sm:w-3 rounded-50 inline-block mt-16 ml-4"
class="h-4 w-4 sm:h-3 sm:w-3 rounded-50 inline-block mt-16 ml-4 pointer"
v-bind:class="{
'bg-black': queue === 3,
'bg-carousel': queue !== 3
}"
v-on:click="queue = 3"
/>
<span
class="h-4 w-4 sm:h-3 sm:w-3 rounded-50 inline-block mt-16 ml-4"
class="h-4 w-4 sm:h-3 sm:w-3 rounded-50 inline-block mt-16 ml-4 pointer"
v-bind:class="{
'bg-black': queue === 4,
'bg-carousel': queue !== 4
Expand Down Expand Up @@ -125,4 +125,8 @@ export default {
box-shadow: 0px 6px 30px rgba(0, 0, 0, 0.07);
border-radius: 5px;
}

.pointer {
cursor: pointer;
}
</style>
23 changes: 15 additions & 8 deletions frontend/src/components/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
class="relative w-full flex-grow sm:flex sm:items-center sm:w-auto z-10 hidden"
>
<div
class="text-sm text-black leading-normal sm:flex justify-center sm:flex-grow "
class="text-sm text-black leading-normal sm:flex justify-center sm:flex-grow"
>
<NavLink
v-bind:native="false"
Expand Down Expand Up @@ -60,17 +60,19 @@
/>
</div>
</div>
<div
<!-- <div
:class="open ? 'block' : 'hidden'"
class="text-sm sm:flex mt-4 sm:mt-0 hidden"
>
<Button
v-if="!$store.state.login"
v-bind:native="true"
url="https://accounts.sdslabs.co/"
:url="url"
text="Login"
/>
</div>
<div class="fixed -ml-16 -mt-20">
<User class="sm:flex hidden" v-else />
</div> -->
<div class="fixed -ml-16 -mt-39">
<NavMobile :open="open" @click="toggle" />
</div>
</nav>
Expand All @@ -79,14 +81,18 @@
<script>
import NavLink from "@/components/navbar/NavLink.vue";
import NavMobile from "@/components/navbar/NavMobile.vue";
import Button from "@/components/Button.vue";
// import Button from "@/components/Button.vue";
// import User from "@/components/navbar/User.vue";

export default {
name: "TopNavbar",
data: function initData() {
return {
open: false,
scrolled: false
scrolled: false,
url: `https://accounts.sdslabs.co/login?redirect=${
window.location.href
}`
};
},
methods: {
Expand All @@ -105,8 +111,9 @@ export default {
},
components: {
NavLink,
Button,
// Button,
NavMobile
// User
}
};
</script>
Expand Down
7 changes: 6 additions & 1 deletion frontend/src/components/Project.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
</div>
<div class="-ml-6 flex sm:-ml-0 sm:pl-24 sm:w-7/10">
<div class="self-center flex flex-row z-10">
<div class="image self-center flex flex-row z-10">
<img class="w-full z-20" :src="image_url" />
<div
:class="
Expand Down Expand Up @@ -75,3 +75,8 @@ export default {
}
};
</script>
<style lang="scss" scoped>
.image {
align-items: center;
}
</style>
1 change: 1 addition & 0 deletions frontend/src/components/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script>
import SideLink from "@/components/sidebar/SideLink.vue";

// eslint-disable-next-line
function handleIntersect(entries, observer) {
for (let i = 0; i < entries.length; i++) {
let entry = entries[i];
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/SisterGroups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<div>
<Sister
v-bind:url="dsg"
website="https://dsgiitr.com"
title="DATA SCIENCE GROUP"
description="As a part of SDS, this group aims at improving the culture of Data Science and Machine Learning in IIT Roorkee."
/>
Expand All @@ -30,6 +31,7 @@
<Sister
class="ml-10"
v-bind:url="pag"
website="https://www.facebook.com/groups/sdspag"
title="PROGRAMMING & ALGORITHMS GROUP"
description="A bunch of competitive programming enthusiasts, PAG, frequently organizes coding lectures and contests for IITR people."
/>
Expand All @@ -38,6 +40,7 @@
<Sister
class="ml-10"
v-bind:url="infosec"
website="https://infoseciitr.in"
title="INFOSECIITR"
description="InfoSecIITR is a group of information security enthusiasts. It is an open group that consists only of IITR students and alumni."
/>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Team.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<img class="w-64 mt-12" src="@/assets/images/dev.svg" />
</div>
<div class="self-center mt-8">
<span class="font-black text-3xl sm:text-4xl">20 </span>
<span class="font-black text-3xl sm:text-4xl">20+ </span>
<span class="font-black text-lg sm:text-xl"
>Developers</span
>
Expand All @@ -20,7 +20,7 @@
<img class="w-28 mt-20" src="@/assets/images/des.svg" />
</div>
<div class="self-center mt-1">
<span class="font-black text-3xl sm:text-4xl">9 </span>
<span class="font-black text-3xl sm:text-4xl">9+ </span>
<span class="font-black text-lg sm:text-xl"
>Designers</span
>
Expand Down
13 changes: 10 additions & 3 deletions frontend/src/components/about/Sister.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="flex flex-col w-144 h-96 shadow-sister">
<div class="flex flex-col w-144 h-108 shadow-sister">
<div class="flex flex-row mt-8">
<div><img class="ml-12 w-56 h-40" :src="url" /></div>
<div class="mt-12 mx-12 leading-160 font-semibold text-lg w-96">
Expand All @@ -9,7 +9,13 @@
<div
class="mt-6 ml-10 mr-12 text-1.5xl sm:text-base text-grey leading-normal"
>
{{ description }}
{{ description }} Visit them
<a
target="_blank"
class="no-underline text-darkblue"
:href="website"
>here</a
>.
</div>
</div>
</template>
Expand All @@ -20,7 +26,8 @@ export default {
props: {
url: String,
title: String,
description: String
description: String,
website: String
}
};
</script>
11 changes: 10 additions & 1 deletion frontend/src/components/about/SisterGallery.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@
<div
class="mt-6 ml-10 mr-12 text-xl sm:text-lg text-grey leading-normal"
>
{{ slide.description }}
{{ slide.description }} Visit them
<a
target="_blank"
class="no-underline text-darkblue"
:href="slide.website"
>here</a
>.
</div>
</div>
</slide>
Expand All @@ -42,18 +48,21 @@ export default {
return {
slides: [
{
website: "https://dsgiitr.com",
image: dsg,
title: "DATA SCIENCE GROUP",
description:
"As a part of SDS, this group aims at improving the culture of Data Science and Machine Learning in IIT Roorkee."
},
{
website: "https://www.facebook.com/groups/sdspag",
image: pag,
title: "PROGRAMMING & ALGORITHMS GROUP",
description:
"A bunch of competetive programming enthusiasts, PAG, frequently organizes coding lectures and contests for IITR people."
},
{
website: "https://infoseciitr.in",
image: infosec,
title: "INFOSECIITR",
description:
Expand Down
Loading