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

modified seo tags #110

Merged
merged 34 commits into from
Feb 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ed10b9d
Added model for SIGs
imApoorva36 Dec 18, 2023
ef6e3df
Merge branch 'IEEE-NITK:main' into main
imApoorva36 Dec 20, 2023
44c7fef
Merge branch 'IEEE-NITK:main' into main
yukitya-1811 Jan 21, 2024
be175aa
Merge branch 'IEEE-NITK:main' into main
imApoorva36 Jan 21, 2024
0f0ea9d
modified seo tags on base.html
imApoorva36 Jan 23, 2024
09a95b5
configured robotrix setup
imApoorva36 Jan 24, 2024
3905588
home page changes
imApoorva36 Jan 26, 2024
a2e96fc
Merge branch 'main' into seo-tags
imApoorva36 Jan 26, 2024
566bc31
improvised content and minor issue fix in footer
imApoorva36 Jan 26, 2024
3056434
Added all images anf favicon too
imApoorva36 Jan 26, 2024
1219de7
Added IEEE NITK Logo to website
imApoorva36 Jan 29, 2024
e6536d7
Merge branch 'main' of https://github.com/imApoorva36/corpus into rob…
imApoorva36 Feb 2, 2024
03b0cb7
data added on robotrix home page
imApoorva36 Feb 2, 2024
2733bea
Merge branch 'main' into robotrix
imApoorva36 Feb 2, 2024
867017c
Home page styling and data additions
imApoorva36 Feb 3, 2024
03f7c1c
FAQs styled and finalised
imApoorva36 Feb 3, 2024
3714f18
added phone number feature and updated latest event data
imApoorva36 Feb 18, 2024
8602fac
fixed registration display issues on home page
imApoorva36 Feb 18, 2024
a9edc20
home page logo changes
imApoorva36 Feb 18, 2024
0d2a66d
Merge branch 'main' of https://github.com/IEEE-NITK/corpus into robotrix
imApoorva36 Feb 18, 2024
56c1e9f
minor typo and other fixes
imApoorva36 Feb 18, 2024
a581c49
Merge branch 'main' of https://github.com/IEEE-NITK/corpus into seo-tags
imApoorva36 Feb 18, 2024
84733e0
Merge branch 'robotrix' of https://github.com/IEEE-NITK/corpus into s…
imApoorva36 Feb 18, 2024
4abe79f
Merge branch 'main' into seo-tags
imApoorva36 Feb 18, 2024
65c9ba5
Merge branch 'main' into seo-tags
imApoorva36 Feb 19, 2024
1d6fc42
Merge branch 'main' into seo-tags
imApoorva36 Feb 24, 2024
f830a97
Merge branch 'seo-tags' of https://github.com/imApoorva36/corpus into…
imApoorva36 Feb 24, 2024
c0b5052
minor ui fixes on logo
imApoorva36 Feb 24, 2024
494940d
fixed navbar logo issue
imApoorva36 Feb 24, 2024
9819fcf
Merge branch 'main' into seo-tags
imApoorva36 Feb 24, 2024
a299856
Merge branch 'seo-tags' of https://github.com/imApoorva36/corpus into…
imApoorva36 Feb 24, 2024
4b0d3a0
minor ui fixes
imApoorva36 Feb 24, 2024
2ca669f
minor ui fixes on navbar
imApoorva36 Feb 25, 2024
8a259e6
Merge branch 'main' into seo-tags
imApoorva36 Feb 25, 2024
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
22 changes: 16 additions & 6 deletions corpus/robotrix/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,14 +487,19 @@ def mark_payment_complete(request, pk):
team = Team.objects.get(pk=pk)
team.payment_status = "P"
team.save()
payment_status="Complete"
final_message="Thanks for registering for Robotrix."
payment_status = "Complete"
final_message = "Thanks for registering for Robotrix."
for member in RobotrixUser.objects.filter(team=team):
if member.user.email is not None:
send_email(
"Payment Complete | Robotrix",
"emails/robotrix/payment_complete.html",
{"team": team, "user": member.user, "payment_status": payment_status, "final_message": final_message},
{
"team": team,
"user": member.user,
"payment_status": payment_status,
"final_message": final_message,
},
bcc=[member.user.email],
)
messages.success(
Expand All @@ -509,14 +514,19 @@ def mark_payment_incomplete(request, pk):
team = Team.objects.get(pk=pk)
team.payment_status = "U"
team.save()
payment_status="Incomplete"
final_message="Please contact us if you have any questions."
payment_status = "Incomplete"
final_message = "Please contact us if you have any questions."
for member in RobotrixUser.objects.filter(team=team):
if member.user.email is not None:
send_email(
"Payment Incomplete | Robotrix",
"emails/robotrix/payment_incomplete.html",
{"team": team, "user": member.user, "payment_status": payment_status, "final_message": final_message},
{
"team": team,
"user": member.user,
"payment_status": payment_status,
"final_message": final_message,
},
bcc=[member.user.email],
)
messages.success(request, "Successfully marked payment as incomplete!")
Expand Down
72 changes: 71 additions & 1 deletion corpus/templates/base.html
imApoorva36 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,89 @@
<html lang="en">

<head>

<!-- Meta tags-->
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Give a small description in 3-4 sentences about the website -->
<meta name="description"
content="IEEE NITK is a student chapter of the IEEE Organisation belonging in the Bangalore R10 Section. IEEE NITK undertakes a lot of projects by its various SIGs which are formed and projects undertaken by students are futher applied to help solve daily world problems.">
<!-- A small abstract idea about the website -->
<meta name="abstract" content="This Website is about IEEE NITK Student Chapter">
<!-- Important Keywords to be noted in the website -->
<meta name="keywords" content="IEEE, IEEE NITK, NITK Surathkal, NITK, Clubs in NITK, Technical Clubs in NITK, NITK Club Projects, Student Chapter Bangalore R10 Section">
<!-- Tell the spider to index the first page and other pages as well-->
<meta name="robots" content="index, follow">
<!-- How often should spiders come back to your page -->
<meta name="revisit-after" content="3 days">

<!-- Copyright regarding the website -->
<meta name="copyright" content="IEEE NITK">
<!-- Language for the website -->
<meta name="language" content="English">

<!-- Web Author for the image -->
<meta name="web_author" content="IEEE NITK">
<meta name="author" content="IEEE NITK">
<!-- Email ID -->
<meta name="contact" content="[email protected]" />
<!-- Email ID to reply to -->
<meta name="reply-to" content="[email protected]">

<!-- Refers to distribution of the page -->
<meta name="distribution" content="global">
<!-- Disallow spammers for the webpage -->
<meta name="no-email-collection" content="http://www.metatags.info/nospamharvesting">
<!-- Rating for the page -->
<meta name="rating" content="general">
<!-- Content Type for the page -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<!-- Fixing viewport on mobile views -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">

<!-- Google Authorship Markup -->
<!-- Social: Facebook / Open Graph and Google+ / Schema.org -->
<meta property="fb:app_id" content="0011038251882641" />
<meta property="og:url" content="https://ieee.nitk.ac.in" />
<meta property="og:title" itemprop="name" content="IEEE NITK | Corpus">
<meta property="og:image" itemprop="image" content="{% static 'img/ieee-nitk.png' %}">
<meta property="og:description" itemprop="description"
content="IEEE NITK is a student branch of IEEE located at NITK Surathkal dedicated to innovative projects and solutions. This is the official website of IEEE NITK">
<meta property="og:site_name" content="IEEE NITK | Corpus">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="{% static 'img/icons/ms-icon-144x144.png' %}">
<meta name="theme-color" content="#ffffff">

<!-- Windows Tile Icons -->
<meta name="msapplication-TileColor" content="#0562DC">
<meta name="msapplication-square70x70logo" content="{% static 'img/icons/ms-icon-70x70.png' %}" />
<meta name="msapplication-square150x150logo" content="{% static 'img/icons/ms-icon-150x150.png' %}" />
<meta name="msapplication-wide310x150logo" content="{% static 'img/icons/ms-icon-310x150.png' %}" />
<meta name="msapplication-square310x310logo" content="{% static 'img/icons/ms-icon-310x310.png' %}" />

<!-- Android Theme Color -->
<meta name="theme-color" content="#0562DC">

<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Website Title -->
<title>
{% block title %} {% endblock %} | Corpus
</title>
<link rel="icon" href="{% static 'img/icons/favicon.png' %}" type="image/x-icon">

<!-- Linked Sheets needed -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Ubuntu&display=swap" rel="stylesheet">
<link rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0"/>

<!-- Linked Scripts needed -->
<script src="https://code.jquery.com/jquery-3.7.0.min.js"
integrity="sha256-2Pmvv0kuTBOenSvLm6bvfBSSHrUJ+3A7x6P5Ebd07/g=" crossorigin="anonymous"></script>
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/full.min.css" rel="stylesheet" type="text/css"/>

{% block style %}
{% endblock %}
{% if USE_TAILWIND_CDN_LINK %}
Expand Down
1 change: 0 additions & 1 deletion corpus/templates/components/general_footer.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- TODO: Add Footer Links -->
<footer class="footer p-10 bg-neutral text-neutral-content">
<nav>
<header class="footer-title">Information</header>
Expand Down
6 changes: 5 additions & 1 deletion corpus/templates/components/navbar_large.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{% load static %}
<div class="navbar bg-primary text-primary-content sticky top-0 z-10">
<div class="navbar-start">
<a href="{% url 'index' %}" class="btn btn-ghost normal-case text-xl">Corpus</a>
<a href="{% url 'index' %}" class="btn btn-ghost normal-case text-xl">
<img src="{% static 'img/ieee-nitk.png' %}" alt="IEEE NITK Logo" class="dark-logo h-10">
<img src="{% static 'img/ieee-nitk-white.png' %}" alt="IEEE NITK Logo" class="light-logo h-10">
</a>
</div>
<div class="navbar-center">
<a href="{% url 'index' %}" class="btn btn-ghost normal-case text-lg">Home</a>
Expand Down
6 changes: 5 additions & 1 deletion corpus/templates/components/navbar_small.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% load static %}
<div class="navbar bg-primary text-primary-content sticky top-0 z-10">
<div class="navbar-start">
<div class="dropdown">
Expand All @@ -11,7 +12,10 @@
</div>
</div>
<div class="navbar-center">
<a href="{% url 'index' %}" class="btn btn-ghost normal-case text-xl">Corpus</a>
<a href="{% url 'index' %}" class="btn btn-ghost normal-case text-xl">
<img src="{% static 'img/ieee-nitk.png' %}" alt="IEEE NITK Logo" class="dark-logo h-10">
<img src="{% static 'img/ieee-nitk-white.png' %}" alt="IEEE NITK Logo" class="light-logo h-10">
</a>
</div>
<div class="navbar-end">
{% include "components/navbar_right.html" %}
Expand Down
2 changes: 1 addition & 1 deletion corpus/templates/robotrix/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ <h4> Join the Whatsapp Group</h4>
<span>
Please pay the fee of <strong>Rs. 150</strong> <a href="https://in.explara.com/e/ieee-nitk-robotrix-2024">here </a>. If you have already paid the fee, it might take some time for it to be updated here. Please only contact us if it has not been updated for more than a week.
</span>
</div>
</div>
{% endif %}
<div class="rounded-lg p-3 flex flex-col gap-2">
<div class="flex justify-between items-center">
Expand Down
Binary file added corpus/templates/static/img/icons/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading