+
+
-->
+
-
![]()
import Button from "@/components/Button.vue";
+
export default {
name: "Error404",
components: {
diff --git a/frontend/src/views/Error404.vue b/frontend/src/views/Error404.vue
index b158129..7cb8621 100644
--- a/frontend/src/views/Error404.vue
+++ b/frontend/src/views/Error404.vue
@@ -1,5 +1,5 @@
-
+
![]()
- {{ text }}
+ {{
+ text
+ }}
diff --git a/frontend/src/components/navbar/NavMobile.vue b/frontend/src/components/navbar/NavMobile.vue
index 70784ac..584e061 100644
--- a/frontend/src/components/navbar/NavMobile.vue
+++ b/frontend/src/components/navbar/NavMobile.vue
@@ -20,7 +20,7 @@
-
+.image {
+ align-items: center;
+}
+
diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue
index 18931ce..03ae760 100644
--- a/frontend/src/components/Sidebar.vue
+++ b/frontend/src/components/Sidebar.vue
@@ -15,6 +15,7 @@
diff --git a/frontend/src/components/about/SisterGallery.vue b/frontend/src/components/about/SisterGallery.vue
index fa452bd..2db1632 100644
--- a/frontend/src/components/about/SisterGallery.vue
+++ b/frontend/src/components/about/SisterGallery.vue
@@ -19,7 +19,13 @@
@@ -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:
diff --git a/frontend/src/components/navbar/NavLink.vue b/frontend/src/components/navbar/NavLink.vue
index 669abf8..172b809 100644
--- a/frontend/src/components/navbar/NavLink.vue
+++ b/frontend/src/components/navbar/NavLink.vue
@@ -6,7 +6,9 @@
class="no-underline block mt-8 sm:inline-block sm:mt-0"
target="_blank"
>
- {{ text }}
+ {{
+ text
+ }}
- {{ slide.description }}
+ {{ slide.description }} Visit them
+ here.
+
diff --git a/frontend/src/components/navbar/User.vue b/frontend/src/components/navbar/User.vue
new file mode 100644
index 0000000..9cf4d92
--- /dev/null
+++ b/frontend/src/components/navbar/User.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
diff --git a/frontend/src/config/config.sample.js b/frontend/src/config/config.sample.js
new file mode 100644
index 0000000..680684f
--- /dev/null
+++ b/frontend/src/config/config.sample.js
@@ -0,0 +1,17 @@
+export const config = {
+ client: {
+ id: "",
+ secret: ""
+ },
+ auth: {
+ tokenHost: "http://falcon.sdslabs.local",
+ tokenPath: "http://falcon.sdslabs.local/access_token",
+ authorizePath: "http://falcon.sdslabs.local/authorize"
+ },
+ scopes: ["email", "image_url", "organizations"],
+ user: {
+ url_resource_owner_details: "http://falcon.sdslabs.local/users",
+ redirect_url: "",
+ accounts_url: "http://arceus.sdslabs.local"
+ }
+};
diff --git a/frontend/src/mutation-types.js b/frontend/src/mutation-types.js
new file mode 100644
index 0000000..9fcd790
--- /dev/null
+++ b/frontend/src/mutation-types.js
@@ -0,0 +1,3 @@
+export const TOGGLE_USER = "TOGGLE_USER";
+export const CLOSE_USER = "CLOSE_USER";
+export const LOGOUT = "LOGOUT";
diff --git a/frontend/src/store.js b/frontend/src/store.js
index 5c73fda..2ed3d91 100644
--- a/frontend/src/store.js
+++ b/frontend/src/store.js
@@ -1,10 +1,29 @@
import Vue from "vue";
import Vuex from "vuex";
+import { TOGGLE_USER, CLOSE_USER, LOGOUT } from "./mutation-types";
Vue.use(Vuex);
export default new Vuex.Store({
- state: {},
- mutations: {},
- actions: {}
+ state: {
+ login: true,
+ user: false
+ },
+ mutations: {
+ [TOGGLE_USER](state) {
+ state.user = !state.user;
+ },
+ [CLOSE_USER](state) {
+ if (state.user) state.user = false;
+ }
+ },
+ actions: {
+ [LOGOUT]({ state }) {
+ state.login = false;
+ state.user = false;
+ // const cookieRemoveString =
+ // "sdslabs= ; expires = Thu, 01 Jan 1970 00:00:00 GMT; Domain=.sdslabs.co; path=/;";
+ // document.cookie = cookieRemoveString;
+ }
+ }
});
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index c23d089..2df4222 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -1,5 +1,5 @@
export const CONFIG = {
- baseURL: "http://0.0.0.0:8000",
+ baseURL: "https://portfolio-backend.sdslabs.co",
colors: ["blue", "red", "green", "yellow", "purple", "orange"],
mobileSize: 576
};
diff --git a/frontend/src/views/About.vue b/frontend/src/views/About.vue
index 25ffae6..c9be5b8 100644
--- a/frontend/src/views/About.vue
+++ b/frontend/src/views/About.vue
@@ -1,5 +1,8 @@
-
+ {{ this.name[0].toLowerCase() }}
+
+
+
+
+
+
+ {{ this.name[0].toLowerCase() }}
+
+
+ {{ this.name.toUpperCase() }}
+
+
+
+
+ 
+
+
+
+
+ Logout
+
+
+
-
-
@@ -214,15 +217,26 @@
+
+
+
Or find us on these platforms:
@@ -45,7 +57,7 @@
+
![]()
diff --git a/frontend/src/views/Event.vue b/frontend/src/views/Event.vue
index be072f3..954e27b 100644
--- a/frontend/src/views/Event.vue
+++ b/frontend/src/views/Event.vue
@@ -1,5 +1,8 @@
-
+
@@ -85,6 +88,8 @@ import Label from "@/components/Label.vue";
import Update from "@/components/Update.vue";
import Button from "@/components/Button.vue";
import { CONFIG } from "@/utils/constants.js";
+import { CLOSE_USER } from "@/mutation-types";
+
export default {
name: "event",
components: {
@@ -98,6 +103,11 @@ export default {
title: ""
};
},
+ methods: {
+ close() {
+ this.$store.commit(CLOSE_USER);
+ }
+ },
created() {
this.title = this.$route.params.title;
},
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index b6545ed..5bd3880 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -1,6 +1,6 @@
-
@@ -34,7 +37,7 @@
v-if="events.event[0].types !== 'past event'"
v-bind:native="true"
:url="events.event[0].url"
- text="Register Now"
+ text="Event Link"
/>
-
+ {
- this.inMove = false;
- }, 400);
- },
- handleMouseWheel: function(e) {
- if (e.wheelDelta < 30 && !this.inMove) {
- this.moveUp();
- } else if (e.wheelDelta > 30 && !this.inMove) {
- this.moveDown();
- }
- e.preventDefault();
- return false;
- },
- moveDown() {
- this.inMove = true;
- if (this.activeSection > 0) this.activeSection--;
- if (this.activeSection < 0)
- this.activeSection = this.offsets.length - 1;
- this.scrollToSection(this.activeSection, true);
- },
- moveUp() {
- this.inMove = true;
- if (this.activeSection < this.offsets.length - 2)
- this.activeSection++;
- if (this.activeSection > this.offsets.length - 1)
- this.activeSection = 0;
- this.scrollToSection(this.activeSection, true);
+ close() {
+ this.$store.commit(CLOSE_USER);
},
- touchStart(e) {
- e.preventDefault();
- this.touchStartY = e.touches[0].clientY;
+ handleScroll(e) {
+ let projectsElement = document.getElementById("projects");
+ this.show =
+ window.scrollY <
+ projectsElement.offsetHeight +
+ 10 *
+ parseFloat(
+ getComputedStyle(document.documentElement).fontSize
+ )
+ ? 1
+ : 0;
},
- touchMove(e) {
- if (this.inMove) return false;
- e.preventDefault();
- const currentY = e.touches[0].clientY;
- if (this.touchStartY < currentY) {
- this.moveDown();
- } else {
- this.moveUp();
- }
- this.touchStartY = 0;
- return false;
- }
+ createObserver: createObserver,
+ handleIntersect: handleIntersect
+ },
+ created() {
+ window.addEventListener("scroll", this.handleScroll);
+ },
+ destroyed() {
+ window.removeEventListener("scroll", this.handleScroll);
},
mounted() {
- this.calculateSectionOffsets();
window.scrollTo(0, 0);
axios
.get(`${CONFIG.baseURL}/api/projects/?format=json`)
@@ -177,7 +144,6 @@ export default {
});
},
updated() {
- this.calculateSectionOffsets();
if (!this.isObserverSet && Object.keys(this.projects).length > 0) {
let currentRoute = this.$route;
let projectsElement = document.querySelector("#projects");
@@ -191,22 +157,6 @@ export default {
this.isObserverSet = true;
}, 1);
}
- },
- created() {
- window.addEventListener("mousewheel", this.handleMouseWheel, {
- passive: false
- });
- window.addEventListener("touchstart", this.touchStart, {
- passive: true
- });
- window.addEventListener("touchmove", this.touchMove, {
- passive: true
- });
- },
- beforeDestroy() {
- window.removeEventListener("mousewheel", this.handleMouseWheel);
- window.removeEventListener("touchstart", this.touchStart);
- window.removeEventListener("touchmove", this.touchMove);
}
};
diff --git a/frontend/src/views/News.vue b/frontend/src/views/News.vue
index 9ca6329..12d0c8d 100644
--- a/frontend/src/views/News.vue
+++ b/frontend/src/views/News.vue
@@ -2,6 +2,7 @@
News Updates
@@ -18,53 +19,78 @@
v-for="event_block in event"
v-bind:key="event_block.event.title"
>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+ :event="event_block.event"
+ />
+
+
+
+
+
{
eventList.push(event_block);
});
+ eventList.forEach(events_list => {
+ if (events_list.event.types === "ongoing event")
+ event.push(events_list);
+ });
eventList.forEach(events_list => {
if (events_list.event.types === "upcoming event")
event.push(events_list);
diff --git a/frontend/tailwind.js b/frontend/tailwind.js
index 01eee8c..acd6d28 100644
--- a/frontend/tailwind.js
+++ b/frontend/tailwind.js
@@ -519,6 +519,7 @@ module.exports = {
"80": "20rem",
"88": "22rem",
"96": "24rem",
+ "108": "27rem",
"120": "30rem",
"128": "32rem",
"140": "35rem",
@@ -646,6 +647,7 @@ module.exports = {
"4": "1rem",
"5": "1.25rem",
"6": "1.5rem",
+ "7": "1.75rem",
"8": "2rem",
"10": "2.5rem",
"12": "3rem",
@@ -710,6 +712,7 @@ module.exports = {
"28": "7rem",
"32": "8rem",
"36": "9rem",
+ "38": "9.5rem",
"40": "10rem",
"44": "11rem",
"48": "12rem",
@@ -719,6 +722,8 @@ module.exports = {
"68": "17rem",
"72": "18rem",
"76": "19rem",
+ "80": "20rem",
+ "84": "21rem",
"92": "23rem",
"96": "24rem",
"98": "24.5rem",
@@ -766,6 +771,8 @@ module.exports = {
"28": "7rem",
"32": "8rem",
"36": "9rem",
+ "38": "9.5rem",
+ "39": "9.75rem",
"40": "10rem",
"44": "11rem",
"48": "12rem",
@@ -775,7 +782,8 @@ module.exports = {
"64": "16rem",
"68": "17rem",
"80": "20rem",
- "81": "21rem",
+ "82": "20.5rem",
+ "84": "21rem",
"92": "23rem",
"100": "25rem",
"5/10": "50%",
@@ -809,6 +817,7 @@ module.exports = {
sister: "0px 6px 30px rgba(0, 0, 0, 0.07)",
feed: "0px 6px 30px rgba(0, 0, 0, 0.07)",
image: "0px 6px 15px rgba(0, 0, 0, 0.1)",
+ user: "4px 4px 20px rgba(0, 0, 0, 0.1)",
none: "none"
},
diff --git a/settings/dev/settings.py b/settings/dev/settings.py
index 617d37c..63335e0 100644
--- a/settings/dev/settings.py
+++ b/settings/dev/settings.py
@@ -9,9 +9,9 @@
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'portfolio',
- 'USER': 'portfolio',
- 'PASSWORD': 'portfolio',
- 'HOST': 'db',
+ 'USER': 'ishu',
+ 'PASSWORD': 'Ishan_002',
+ 'HOST': 'localhost',
'PORT': '5432',
}
}