diff --git a/eaii_startup/settings.py b/eaii_startup/settings.py
index aa43099b91bee15071693d005a8c31bb7b3eed75..bd7fc4a4c2963a3a7f61132029ce6c1bdc3e81f9 100644
--- a/eaii_startup/settings.py
+++ b/eaii_startup/settings.py
@@ -88,47 +88,47 @@ ASGI_APPLICATION = "eaii_startup.asgi.application"
-# DATABASES = {
-# 'default': {
-# 'ENGINE': 'django.db.backends.postgresql_psycopg2',
-# 'NAME': 'startup',
-# 'USER': 'postgres',
-# 'PASSWORD': 'admin',
-# 'HOST': '192.168.1.200',
-# 'PORT': '5432',
-# }
-# }
-
-
-# CHANNEL_LAYERS = {
-# "default": {
-# "BACKEND": "channels_redis.core.RedisChannelLayer",
-# "CONFIG": {
-# "hosts": [("192.168.1.200", 6379)],
-# },
-# },
-# }
-
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'startup',
'USER': 'postgres',
- 'PASSWORD': 'postgres',
- 'HOST': 'localhost',
+ 'PASSWORD': 'admin',
+ 'HOST': '192.168.1.200',
'PORT': '5432',
}
}
+
CHANNEL_LAYERS = {
"default": {
"BACKEND": "channels_redis.core.RedisChannelLayer",
"CONFIG": {
- "hosts": [("localhost", 6379)],
+ "hosts": [("192.168.1.200", 6379)],
},
},
}
+# DATABASES = {
+# 'default': {
+# 'ENGINE': 'django.db.backends.postgresql_psycopg2',
+# 'NAME': 'startup',
+# 'USER': 'postgres',
+# 'PASSWORD': 'postgres',
+# 'HOST': 'localhost',
+# 'PORT': '5432',
+# }
+# }
+
+# CHANNEL_LAYERS = {
+# "default": {
+# "BACKEND": "channels_redis.core.RedisChannelLayer",
+# "CONFIG": {
+# "hosts": [("localhost", 6379)],
+# },
+# },
+# }
+
# Password validation
# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators
diff --git a/main/forms.py b/main/forms.py
index 850555c78db14862299a83e643081cdc4a3c6b8d..ca2a02ccb5ee6f0052a9825c509b970881be8c83 100644
--- a/main/forms.py
+++ b/main/forms.py
@@ -187,7 +187,7 @@ class ProfileEditForm(ModelForm):
Regions = [
('' ,'Please Select Region'),
- (adissAbeba, 'Addis Abeba'),
+ (adissAbeba, 'Addis Ababa'),
(afar, 'Afar'),
(amhara, 'Amhara'),
(benishangulgumuz, 'Benishangul-Gumuz'),
diff --git a/main/views.py b/main/views.py
index ea7558541e806674743591effb5b635270ab0833..ed3ce867557b463e3cbabcf092608cd7bb26da36 100644
--- a/main/views.py
+++ b/main/views.py
@@ -799,17 +799,17 @@ def homePage(request):
context['login_form'] = CustomLoginForm()
context['startup'] = Startup.objects.filter(profile__user__is_active=True)
context['mentor'] = Mentor.objects.filter(profile__user__is_active=True)
- context['incubator'] = IncubatorsAccelatorsHub.objects.filter(
- profile__user__is_active=True)
- context['investor'] = DonorFunder.objects.filter(
- profile__user__is_active=True)
- context['government'] = Government.objects.filter(
- profile__user__is_active=True)
- merged_objects = list(context['startup']) + list(context['mentor']) + list(
- context['incubator']) + list(context['investor']) + list(context['government'])
+ context['incubator'] = IncubatorsAccelatorsHub.objects.filter(profile__user__is_active=True)
+ context['investor'] = DonorFunder.objects.filter(profile__user__is_active=True)
+ context['government'] = Government.objects.filter(profile__user__is_active=True)
+ merged_objects = list(context['startup']) + list(context['mentor']) + list(context['incubator']) + list(context['investor']) + list(context['government'])
data = serializers.serialize('json', merged_objects)
context['merged_objects'] = merged_objects
context['carousel'] = Carousel.objects.all().order_by('-id')
+ context['startup_count'] = Startup.objects.filter(profile__user__is_active=True).count()
+ context['mentor_count'] = Mentor.objects.filter(profile__user__is_active=True).count()
+ context['incubator_count'] = IncubatorsAccelatorsHub.objects.filter(profile__user__is_active=True).count()
+ context['investor_count'] = DonorFunder.objects.filter(profile__user__is_active=True).count()
return render(request, 'main/index.html', context)
diff --git a/static/assets/img/passwordReset.png b/static/assets/img/passwordReset.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a9027790e82e3f3974a2de891ecc6e33de018c4
Binary files /dev/null and b/static/assets/img/passwordReset.png differ
diff --git a/templates/logged_user/password_change.html b/templates/logged_user/password_change.html
index 1131e2f053356d602336ac901c00d66ee89d1b28..880fabc604ff42a78ae7e7a52ec8c103edca913a 100644
--- a/templates/logged_user/password_change.html
+++ b/templates/logged_user/password_change.html
@@ -1,5 +1,4 @@
{% extends '../main/base.html'%} {% block content %} {% include '../main/header.html' %}
-
{% load static %}
{% load crispy_forms_tags %}
<script src="https://code.jquery.com/jquery-3.6.0.js"></script>
@@ -10,38 +9,66 @@
{% load my_filters%}
{%load static %}
<style>
- form {
- /* Center the form horizontally */
- margin: 0 auto;
+ html, body {
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ overflow: hidden; /* Disable scrolling */
+ }
+
+ .blog {
+ background-color: #f8f9fa; /* Replace with your desired background color */
+ min-height: 100vh; /* Ensures the section takes at least the full viewport height */
+ width: 100%;
+ padding: 20px;
+ box-sizing: border-box;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ .form-container {
width: min(400px, 80%);
padding: 20px;
border: 1px solid #ccc;
border-radius: 5px;
+ background-color: white;
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
}
label {
display: block;
- margin-bottom: 5px;
+ margin-bottom: 10px;
font-weight: bold;
+ font-size: 14px;
+ color: #333;
}
input[type="password"],
input[type="submit"] {
- width: 100%; /* Make inputs full width */
- padding: 10px;
+ width: 100%;
+ padding: 12px;
border: 1px solid #ccc;
border-radius: 3px;
font-size: 16px;
+ margin-bottom: 20px;
+ }
+
+ input[type="password"]:focus {
+ border-color: #f7941d;
+ outline: none;
+ box-shadow: 0 0 5px rgba(76, 175, 80, 0.5);
}
input[type="submit"] {
- background-color: #4CAF50; /* Green button color */
+ background-color: #161a61; /* Green button color */
color: white;
cursor: pointer;
+ font-weight: bold;
+ transition: background-color 0.3s ease;
}
input[type="submit"]:hover {
- background-color: #45A049; /* Green hover color */
+ background-color: #f7941d; /* Green hover color */
}
.error-message {
@@ -49,48 +76,53 @@
font-weight: bold;
margin-bottom: 10px;
}
+ .image-container {
+ width: 100%;
+ text-align: center;
+ }
+
+ .image-container img {
+ max-width: 70%; /* Adjust this value to decrease the image size */
+ height: auto;
+ }
+
</style>
-<!-- ======= Breadcrumbs ======= -->
-<div class="breadcrumbs">
- <div class="container"></div>
-</div>
<!-- End Breadcrumbs -->
<!-- ======= Blog Section ======= -->
<section id="blog" class="blog">
<div class="container" data-aos="fade-up">
- <div class="row g-5">
- <div class="col-lg-3">
- <!-- End Blog Sidebar -->
+ <div class="row">
+ <div class="col-md-6 d-flex justify-content-center">
+ <div class="image-container">
+ <img src="{% static 'assets/img/passwordReset.png' %}" alt="Password Reset">
+ </div>
</div>
- <div class="col-lg-9">
- <h1>Change Password</h1>
-
-
- <form action="" method="post">
- {% csrf_token %}
-
- {% if error_messages %}
- <div class="error-message">
- {% for message in error_messages %}
- <p>{{ message }}</p>
- {% endfor %}
- </div>
- {% endif %}
-
- <label for="old_password">Old Password:</label>
- <input type="password" name="old_password" id="old_password" required><br>
-
- <label for="new_password">New Password:</label>
- <input type="password" name="new_password" id="new_password" required><br>
-
- <label for="confirm_password">Confirm New Password:</label>
- <input type="password" name="confirm_password" id="confirm_password" required><br>
-
- <input type="submit" value="Change Password">
- </form>
-
+ <div class="col-md-6 d-flex justify-content-center align-items-center">
+ <div class="form-container">
+ <form action="" method="post">
+ {% csrf_token %}
+ {% if error_messages %}
+ <div class="error-message">
+ {% for message in error_messages %}
+ <p>{{ message }}</p>
+ {% endfor %}
+ </div>
+ {% endif %}
+
+ <label for="old_password">Old Password:</label>
+ <input type="password" name="old_password" id="old_password" required>
+
+ <label for="new_password">New Password:</label>
+ <input type="password" name="new_password" id="new_password" required>
+
+ <label for="confirm_password">Confirm New Password:</label>
+ <input type="password" name="confirm_password" id="confirm_password" required>
+
+ <input type="submit" value="Change Password">
+ </form>
+ </div>
</div>
</div>
</div>
diff --git a/templates/main/base.html b/templates/main/base.html
index d78fd4c8f485e856695d2eeed4314582810a52dd..08269d0079ac8ea7f8ba8e2d522410bd83bf969a 100644
--- a/templates/main/base.html
+++ b/templates/main/base.html
@@ -50,17 +50,19 @@
flex-direction: column;
justify-content: center;
gap: 0.4rem;
- width: 450px;
+ width: 70%;
padding: 1.3rem;
height: auto;
- /* position: absolute; */
+ max-height: 80vh; /* Set a maximum height */
+ overflow-y: auto; /* Enable vertical scrolling */
z-index: 2;
- left: 35%;
+ left: 20%;
top: 20%;
background-color: white;
border: 1px solid #ddd;
- border-radius: 15px;
- }
+ border-radius: 5px;
+}
+
.modal .flex {
display: flex;
@@ -117,6 +119,10 @@
margin-left: 40%;
margin-bottom: 20px;
}
+ article .content {
+ text-align: justify;
+ }
+
</style>
</head>
diff --git a/templates/main/gov_filter.html b/templates/main/gov_filter.html
old mode 100755
new mode 100644
diff --git a/templates/main/government.html b/templates/main/government.html
index 11840f2ebedcdfb54a8e09e7d2757d2551250aee..0df1be81259af1a7068d11cea6200d949542a85a 100644
--- a/templates/main/government.html
+++ b/templates/main/government.html
@@ -379,17 +379,15 @@
{% for i in investor %}
<div class="col-lg-4">
<article class="d-flex flex-column">
- <h2 class="title">
- <img
- src="{{i.profile.profile_pic.url}}"
- alt=""
- style="max-width: 50px"
- />
- <a href="blog-details.html">{{i.description.name}}</a>
+ <div class="rounded-circle border border-primary overflow-hidden d-flex justify-content-center align-items-center" style="width: 60px; height: 60px;">
+ <img src="{{mentor.profile.profile_pic.url}}" alt="" class="w-100 h-100 object-fit-cover mx-auto">
+ </div>
+ <h2 class="title mt-3">
+ <a>{{i.description.name}}</a>
</h2>
<div class="content">
- <p>{{i.description.description}}</p>
+ <p>{{i.description.description|slice:":100"}}...</p>
</div>
<div
@@ -399,14 +397,14 @@
<button
class="btn btn-open"
data-name="{{i.description.name}}"
- data-government_type="{{i.government_type}}"
+ data-government_type="{{i.government}}"
data-level="{{i.level}}"
data-description="{{i.description.description}}"
data-sector="{% if i.description.sector == 'Other' %}{{ i.description.other_sector }}{% else %}{{ i.description.sector }}{% endif %}"
data-profile="{{i.profile.profile_pic.url}}"
data-country="{{i.address.country}}"
data-region="{{i.address.location.region.region_name}}"
- data-wereda="{{i.address.location.wereda_name}}"
+ data-wereda="{{i.address.location.zone_name}}"
data-phonenumber="{{i.address.phone_number}}"
data-website="{{i.address.website}}"
data-email="{{i.profile.user.email}}"
@@ -458,21 +456,6 @@
.accordion-button {
border-radius: 4px !important;
}
-
- .modal {
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- background-color: white;
- padding: 20px;
- border-radius: 8px;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- max-width: 90%;
- width: 500px;
- max-height: 80%; /* Set maximum height */
- overflow-y: auto; /* Enable vertical scrolling */
- }
.btn-close {
transform: translate(0px, -20px);
padding: 0.5rem;
@@ -480,26 +463,6 @@
border-radius: 50%;
color: #d00000;
}
-
- .modal .flex {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
- .modal input {
- padding: 0.7rem 1rem;
- border: 1px solid #ddd;
- border-radius: 5px;
- font-size: 0.9em;
- }
-
- .modal p {
- font-size: 0.9rem;
- color: #777;
- margin: 0.4rem 0 0.2rem;
- }
-
button {
cursor: pointer;
border: none;
@@ -584,6 +547,7 @@
<td><strong>Website:</strong></td>
<td><span id="address_website"></span></td>
</tr>
+
</tbody>
</table>
</div>
@@ -616,14 +580,14 @@
$("#description").text(e.target.dataset.description);
$("#sector").text(e.target.dataset.sector);
$("#profile").attr('src',e.target.dataset.profile);
- $("#country").text(e.target.dataset.country);
+ $("#address_country").text(e.target.dataset.country);
$("#region").text(e.target.dataset.region);
- $("#wereda").text(e.target.dataset.wereda);
+ $("#address_wereda").text(e.target.dataset.wereda);
- $("#phonenumber").text(e.target.dataset.phonenumber);
- $("#website").text(e.target.dataset.website);
+ $("#address_phone_number").text(e.target.dataset.phonenumber);
+ $("#address_website").text(e.target.dataset.website);
$("#email").text(e.target.dataset.email);
diff --git a/templates/main/header.html b/templates/main/header.html
index 9b4edd2d6e24e99752787883f75ef1e61f43ba87..d026efc3f5ec53e736488d6ae11a3848cdbaed91 100644
--- a/templates/main/header.html
+++ b/templates/main/header.html
@@ -39,7 +39,7 @@
<li class="dropdown">
<a href="#"><span><img src="{% static 'assets/img/avatar.png' %}" alt="" class="mr-5" style="max-height: 40px;"></span></a>
<ul>
- <li><a href="{% if request.user.is_superuser%} #{%else%}{% url 'main:pasword_change' request.user.id %}{%endif%}">change password</a></li>
+ <li><a href="{% if request.user.is_superuser%} #{%else%}{% url 'main:pasword_change' request.user.id %}{%endif%}">Change Password</a></li>
<li><a href="{% if request.user.is_superuser%} #{%else%}{% url 'main:profile' request.user.id %}?return_to={{ request.user.id|get_related_entity }}{%endif%}">{{ request.user.username }}</a></li>
<li><a href="{% url 'main:logout'%}">Sign out</a></li>
</ul>
diff --git a/templates/main/iah.html b/templates/main/iah.html
index 4682a7a4bb6d4c1e1107b19fd0d0f8750a994a4a..a564fd1d4566dbb47040fe0dffb195be70b2685f 100644
--- a/templates/main/iah.html
+++ b/templates/main/iah.html
@@ -639,17 +639,15 @@
{% for iah_ in iah %}
<div class="col-lg-4">
<article class="d-flex flex-column">
- <h2 class="title">
- <img
- src="{{iah_.profile.profile_pic.url}}"
- alt=""
- style="max-width: 50px"
- />
- <a href="blog-details.html">{{iah_.description.name}}</a>
+ <div class="rounded-circle border border-primary overflow-hidden d-flex justify-content-center align-items-center" style="width: 60px; height: 60px;">
+ <img src="{{iah_.profile.profile_pic.url}}" alt="" class="w-100 h-100 object-fit-cover mx-auto">
+ </div>
+ <h2 class="title mt-3">
+ <a>{{iah_.description.name}}</a>
</h2>
<div class="content">
- <p>{{iah_.description.description}}</p>
+ <p>{{iah_.description.description|slice:":100"}}...</p>
</div>
<div
@@ -665,13 +663,13 @@
data-service="{{ iah_.service }}"
data-ownership="{{ iah_.ownership }}"
data-ownership-other="{{ iah_.ownership_other }}"
- data-focus-industry="{{ iah_.focusIndustry }}"
- data-funded-by="{{ iah_.funded_by }}"
- data-program-duration="{{ iah_.program_duration }}"
+ data-focus="{{ iah_.focusIndustry }}"
+ data-funded="{{ iah_.funded_by }}"
+ data-program="{{ iah_.program_duration }}"
data-country="{{iah_.address.country}}"
data-region="{{iah_.address.location.region.region_name}}"
- data-wereda="{{iah_.address.location.wereda_name}}"
+ data-wereda="{{iah_.address.location.zone_name}}"
data-phonenumber="{{iah_.address.phone_number}}"
data-website="{{iah_.address.website}}"
data-email="{{iah_.profile.user.email}}"
@@ -722,40 +720,6 @@
border-radius: 4px !important;
}
- .modal {
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- background-color: white;
- padding: 20px;
- border-radius: 8px;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- max-width: 90%;
- width: 500px;
- max-height: 80%; /* Set maximum height */
- overflow-y: auto; /* Enable vertical scrolling */
- }
-
- .modal .flex {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
- .modal input {
- padding: 0.7rem 1rem;
- border: 1px solid #ddd;
- border-radius: 5px;
- font-size: 0.9em;
- }
-
- .modal p {
- font-size: 0.9rem;
- color: #777;
- margin: 0.4rem 0 0.2rem;
- }
-
button {
cursor: pointer;
border: none;
@@ -877,7 +841,6 @@
}
});
const openModal = function (e) {
-
$("#name").text(e.target.dataset.name);
$("#description").text(e.target.dataset.description);
$("#service").text(e.target.dataset.service);
diff --git a/templates/main/index.html b/templates/main/index.html
index 178272f03fe932476c76ce671bb5f774566e4d78..5d72f266793f972a5566d3b3f664de86c3fa53e7 100644
--- a/templates/main/index.html
+++ b/templates/main/index.html
@@ -106,7 +106,7 @@
<div class="col-lg-3 col-6 text-center">
<span
data-purecounter-start="0"
- data-purecounter-end="75"
+ data-purecounter-end="{{startup_count}}"
data-purecounter-duration="1"
class="purecounter"
></span>
@@ -116,7 +116,7 @@
<div class="col-lg-3 col-6 text-center">
<span
data-purecounter-start="0"
- data-purecounter-end="9"
+ data-purecounter-end="{{mentor_count}}"
data-purecounter-duration="1"
class="purecounter"
></span>
@@ -126,7 +126,7 @@
<div class="col-lg-3 col-6 text-center">
<span
data-purecounter-start="0"
- data-purecounter-end="2343"
+ data-purecounter-end="{{incubator_count}}"
data-purecounter-duration="1"
class="purecounter"
></span>
@@ -136,7 +136,7 @@
<div class="col-lg-3 col-6 text-center">
<span
data-purecounter-start="0"
- data-purecounter-end="65"
+ data-purecounter-end="{{investor_count}}"
data-purecounter-duration="1"
class="purecounter"
></span>
diff --git a/templates/main/investor.html b/templates/main/investor.html
index 40a96f44e95e90766be527f26ba55b693ec9e222..c9d2d16399de22e013ab133de54fb42474f61b2e 100644
--- a/templates/main/investor.html
+++ b/templates/main/investor.html
@@ -528,17 +528,15 @@
{% for i in investor %}
<div class="col-lg-4">
<article class="d-flex flex-column">
- <h2 class="title">
- <img
- src="{{i.profile.profile_pic.url}}"
- alt=""
- style="max-width: 50px"
- />
- <a href="blog-details.html">{{i.description.name}}</a>
+ <div class="rounded-circle border border-primary overflow-hidden d-flex justify-content-center align-items-center" style="width: 60px; height: 60px;">
+ <img src="{{i.profile.profile_pic.url}}" alt="" class="w-100 h-100 object-fit-cover mx-auto">
+ </div>
+ <h2 class="title mt-3">
+ <a >{{i.description.name}}</a>
</h2>
<div class="content">
- <p>{{i.description.description}}</p>
+ <p>{{i.description.description|slice:":100"}}...</p>
</div>
<div
@@ -556,7 +554,7 @@
data-profile="{{i.profile.profile_pic.url}}"
data-country="{{i.address.country}}"
data-region="{{i.address.location.region.region_name}}"
- data-wereda="{{i.address.location.wereda_name}}"
+ data-wereda="{{i.address.location.zone_name}}"
data-phonenumber="{{i.address.phone_number}}"
data-website="{{i.address.website}}"
data-firstname="{{i.profile.user.first_name}}"
@@ -612,40 +610,6 @@
border-radius: 4px !important;
}
- .modal {
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- background-color: white;
- padding: 20px;
- border-radius: 8px;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- max-width: 90%;
- width: 500px;
- max-height: 80%; /* Set maximum height */
- overflow-y: auto; /* Enable vertical scrolling */
- }
-
- .modal .flex {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
- .modal input {
- padding: 0.7rem 1rem;
- border: 1px solid #ddd;
- border-radius: 5px;
- font-size: 0.9em;
- }
-
- .modal p {
- font-size: 0.9rem;
- color: #777;
- margin: 0.4rem 0 0.2rem;
- }
-
button {
cursor: pointer;
border: none;
@@ -790,14 +754,14 @@
$("#level").text(e.target.dataset.level);
$("#investment_type").text(e.target.dataset.investment_type);
$("#email").text(e.target.dataset.email);
- $("#address_country").text(e.target.dataset.address_country);
+ $("#address_country").text(e.target.dataset.country);
$("#region").text(e.target.dataset.region);
- $("#address_wereda").text(e.target.dataset.address_wereda);
- $("#address_phone_number").text(e.target.dataset.address_phone_number);
- $("#address_website").text(e.target.dataset.address_website);
+ $("#address_wereda").text(e.target.dataset.wereda);
+ $("#address_phone_number").text(e.target.dataset.phonenumber);
+ $("#address_website").text(e.target.dataset.website);
$("#profile").attr('src',e.target.dataset.profile);
-
+
modal.classList.remove("hidden");
overlay.classList.remove("hidden");
};
diff --git a/templates/main/mentor.html b/templates/main/mentor.html
index 5f823e2c82884d90da33ce15355e67f4e76f9498..c77c6f98da2c153ae718cd4fed06ac49e9999411 100644
--- a/templates/main/mentor.html
+++ b/templates/main/mentor.html
@@ -666,18 +666,15 @@
{% for mentor in mentors %}
<div class="col-lg-4">
<article class="d-flex flex-column">
- <h2 class="title">
- <img
- src="{{mentor.profile.profile_pic.url}}"
- alt=""
- style="max-width: 50px"
- />
- <a href="blog-details.html">{{mentor.description.name}}</a>
+ <div class="rounded-circle border border-primary overflow-hidden d-flex justify-content-center align-items-center" style="width: 60px; height: 60px;">
+ <img src="{{mentor.profile.profile_pic.url}}" alt="" class="w-100 h-100 object-fit-cover mx-auto">
+ </div>
+ <h2 class="title mt-3">
+ <a>{{mentor.description.name}}</a>
</h2>
<div class="content">
-
- <p>{{mentor.description.description|slice:":200"}}</p>
+ <p>{{mentor.description.description|slice:":100"}}...</p>
</div>
<div
@@ -695,7 +692,7 @@
data-airelated ="{{mentor.airelated_expriance}}"
data-country="{{mentor.address.country}}"
data-region="{{mentor.address.location.region.region_name}}"
- data-wereda="{{mentor.address.location.wereda_name}}"
+ data-wereda="{{mentor.address.location.zone_name}}"
data-phonenumber="{{mentor.address.phone_number}}"
data-website="{{mentor.address.website}}"
data-firstname="{{mentor.profile.user.first_name}}"
@@ -775,20 +772,6 @@
<style>
- .modal {
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- background-color: white;
- padding: 20px;
- border-radius: 8px;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- max-width: 90%;
- width: 500px;
- max-height: 80%; /* Set maximum height */
- overflow-y: auto; /* Enable vertical scrolling */
- }
#btn-close {
transform: translate(0px, -20px);
padding: 0.5rem;
@@ -823,7 +806,7 @@
</tr>
<tr>
<td><strong>Region Name:</strong></td>
- <td><span id="region-name"></span></td>
+ <td><span id="mentor-region"></span></td>
</tr>
<tr>
<td><strong>Wereda Name:</strong></td>
@@ -892,7 +875,7 @@ $("#establishment-year").text(e.target.dataset.establishment_year);
$("#stage").text(e.target.dataset.stage);
$("#market-scope").text(e.target.dataset.market_scope);
$("#country").text(e.target.dataset.country);
-$("#mentor-region-name").text(e.target.dataset.region);
+$("#mentor-region").text(e.target.dataset.region);
$("#wereda-name").text(e.target.dataset.wereda);
$("#phone-number").text(e.target.dataset.phonenumber);
$("#city-name").text(e.target.dataset.city_name);
diff --git a/templates/main/startup.html b/templates/main/startup.html
index 8a7d5ba7c03a17b75eab61a28c08c921de835202..cb266107864b65fc61689de71e1bdc00501c2b25 100644
--- a/templates/main/startup.html
+++ b/templates/main/startup.html
@@ -447,21 +447,20 @@
{% for startup in startups %}
<div class="col-lg-4">
<article class="d-flex flex-column">
- <h2 class="title">
- <img
- src="{{startup.profile.profile_pic.url}}"
- alt=""
- style="max-width: 50px"
- />
- <a href="blog-details.html">{{startup.description.name}}</a>
+ <div class="rounded-circle border border-primary overflow-hidden d-flex justify-content-center align-items-center" style="width: 60px; height: 60px;">
+ <img src="{{startup.profile.profile_pic.url}}" alt="" class="w-100 h-100 object-fit-cover mx-auto">
+ </div>
+ <h2 class="title mt-3">
+ <a>{{startup.description.name}}</a>
</h2>
<div class="content">
- <p>{{startup.description.description|slice:":200"}}</p>
+ <p>{{startup.description.description|slice:":100"}}...</p>
</div>
<div
class="read-more mt-auto align-self-end"
style="display: flex"
>
+
<button
class="btn btn-open"
data-name="{{startup.description.name}}"
@@ -472,7 +471,7 @@
data-stage="{{startup.stage}}"
data-country="{{startup.address.country}}"
data-region_name="{{startup.address.location.region.region_name}}"
- data-wereda_name="{{startup.address.location.wereda_name}}"
+ data-wereda_name="{{startup.address.location.zone_name}}"
data-phone_number="{{startup.address.phone_number}}"
data-city_name="{{startup.address.city_name}}"
data-website="{{startup.address.website}}"
@@ -524,21 +523,7 @@
</section>
<!-- End Blog Section -->
<style>
- .modal {
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- background-color: white;
- padding: 20px;
- border-radius: 8px;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- max-width: 90%;
- width: 500px;
- max-height: 80%; /* Set maximum height */
- overflow-y: auto; /* Enable vertical scrolling */
- }
- .btn-close {
+ .btn-close {
transform: translate(0px, -20px);
padding: 0.5rem;
border: 1px solid #d00000;
@@ -628,7 +613,6 @@
}
});
const openModal = function (e) {
-
$("#sect").text(e.target.dataset.sector);
$("#logo").attr("src", e.target.dataset.logo);
diff --git a/wer.csv b/wer.csv
index 4d1c4afa7526e79ec19c2f8cae02a7cadc492038..38fbf71828b5890d94e67239c8e87d5e811596a9 100644
--- a/wer.csv
+++ b/wer.csv
@@ -87,12 +87,12 @@ Oromia,West Wellega
Tigray,Western Tigray
SNNP,Wolayita
SNNP,Yem Special
-Addis Abeba,Akaki Kaliti
-Addis Abeba,Nefas Silk Lafto
-Addis Abeba, Kolfe Keraniyo
-Addis Abeba,Gulele
-Addis Abeba,Lideta
-Addis Abeba,Kirkos
-Addis Abeba,Arada
-Addis Abeba,Addis Ketema
-Addis Abeba,Yeka
\ No newline at end of file
+Addis Ababa,Akaki Kaliti
+Addis Ababa,Nefas Silk Lafto
+Addis Ababa, Kolfe Keraniyo
+Addis Ababa,Gulele
+Addis Ababa,Lideta
+Addis Ababa,Kirkos
+Addis Ababa,Arada
+Addis Ababa,Addis Ketema
+Addis Ababa,Yeka
\ No newline at end of file