Skip to content
Snippets Groups Projects
Commit 989f748c authored by Oliwer Mattsson's avatar Oliwer Mattsson :headphones:
Browse files

Revert "fixa errors förhoppningsviss" 

This reverts commit 3528273b
parent 3528273b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
MyPortfolio/__pycache__/data.cpython-312.pyc deleted 100644 → 0
+ 0
− 0
View file @ 3528273b
File deleted
MyPortfolio/data.py
+ 92
− 44
View file @ 989f748c
......@@ -4,6 +4,8 @@
# Gör project_id dynamisk så att den uppdateras efter borttagning/addering av projekt.
# ---- IMPORTS ---- #
import os
import json
......@@ -14,7 +16,9 @@ from operator import itemgetter
# ---- IMPORTS ---- #
def load(filename):
try:
with open(filename, 'r', encoding='utf-8') as file:
data = json.load(file)
......@@ -25,14 +29,18 @@ def load(filename):
return None
def save(data):
with open('data.json', 'w', encoding='utf-8') as file:
json.dump(data, file, ensure_ascii=False, indent=4)
file.close()
# Reload data
load()
# Get project count
......@@ -40,15 +48,19 @@ def get_project_count(data):
return len(data)
# Get project by ID
def get_project(data, id):
for n in range(0, get_project_count(data)):
if data[n]['project_id'] == id:
return data[n]
# Get all unique techniques from project
def get_techniques(data):
techniques = []
for project in data:
for tech in project['techniques_used']:
......@@ -56,12 +68,14 @@ def get_techniques(data):
techniques.append(tech)
techniques.sort()
return techniques
# Gets all unique techniques from all projects ! COULD USE SOME FILTERING !
def get_technique_stats(data):
technique_list = get_techniques(data)
technique_stats = {}
current_techniques = []
......@@ -69,17 +83,21 @@ def get_technique_stats(data):
for technique in technique_list:
for project in data:
if technique in project['techniques_used']:
current_techniques.append({'id': project['project_id'], 'name': project['project_name']})
current_techniques.append({'id' : project['project_id'], 'name' : project['project_name']})
technique_stats.update({technique: current_techniques.copy()})
technique_stats.update({technique : current_techniques.copy()})
current_techniques.clear()
return technique_stats
# Fetches and sorts projects matching criteria from the specified list.
def search(data, sort_by='start_date', sort_order='desc', techniques=None, search=None, search_fields=None):
if isinstance(search, str):
if type(search) == str:
search = search.lower()
results = []
......@@ -89,91 +107,103 @@ def search(data, sort_by='start_date', sort_order='desc', techniques=None, searc
# sort it
results = sorted(results, key=itemgetter(sort_by))
# order it
if sort_order == 'desc':
results.reverse()
if sort_order == 'desc': results.reverse()
# filter it (by techniques)
if techniques is not None:
if techniques != None:
for technique in get_techniques(data):
for project in results:
if all(n in project['techniques_used'] for n in techniques):
pass
else:
results.pop(results.index(project))
# search for it
if search is not None:
if search != None:
search_results = []
for project in results:
if search_fields is not None and search_fields != "" and search != "":
if search_fields != None and search_fields != "" and search != "":
for field in search_fields:
substring = project[field]
# Check type before calling lower()
if isinstance(substring, str):
if type(substring) == str:
substring = substring.lower()
if substring.find(search) != -1:
search_results.append(project)
break
elif isinstance(substring, int):
if type(substring) == int:
if str(substring).find(search) != -1:
search_results.append(project)
break
elif isinstance(substring, list):
if type(substring) == list:
for subsubstring in substring:
if isinstance(subsubstring, str):
if subsubstring.lower().find(search) != -1:
if type(subsubstring) == str:
if subsubstring.find(search) != -1:
search_results.append(project)
break
elif isinstance(subsubstring, int):
if type(subsubstring) == int:
if str(subsubstring).find(search) != -1:
search_results.append(project)
break
elif search_fields == "":
results.clear()
break
else:
for substring in list(project.values()):
# Check type before calling lower()
if isinstance(substring, str):
if substring.lower().find(search) != -1:
substring = substring.lower()
print(type(substring))
if type(substring) == str:
if substring.find(search) != -1:
search_results.append(project)
break
elif isinstance(substring, int):
if type(substring) == int:
if str(substring).find(search) != -1:
search_results.append(project)
break
elif isinstance(substring, list):
if type(substring) == list:
for subsubstring in substring:
if isinstance(subsubstring, str):
if subsubstring.lower().find(search) != -1:
if type(subsubstring) == str:
if subsubstring.find(search) != -1:
search_results.append(project)
break
elif isinstance(subsubstring, int):
if type(subsubstring) == int:
if str(subsubstring).find(search) != -1:
search_results.append(project)
break
results = search_results
#pprint.pp(results)
return results
def cls():
os.system('cls' if os.name == 'nt' else 'clear')
pass
def new_project(data):
cls()
# ---- COLLECT INFO ----
project_title = input("Project title: ")
project_id = get_project_count(data) + 1
project_id = get_project_count(data)+1
techniques = input("\nWhat techniques does your project use? Write them out in the following format: python, java, html, css\n\nTechniques: ").replace(" ", "").lower().split(",")
description = input("Provide a description of your project: ")
url = input("Provide a link to the source code/demo of your project: ")
......@@ -182,29 +212,32 @@ def new_project(data):
# lexicographical order sort aka alphabetical
techniques.sort()
new_project = {
"project_name": project_title,
"project_id": project_id,
"used_techniques": techniques,
"long_description": description,
"img_url": img_url,
"url": url
"project_name": project_title,
"project_id": project_id,
"used_techniques": techniques,
"long_description": description,
"img_url": img_url,
"url": url
}
cls()
print("\n\nProject preview:\n")
pprint.pp(new_project)
option = int(input("\n1: Create\n2: Cancel\n> "))
if option == 1:
data.append(new_project)
save(data)
pass
def list_projects(data):
cls()
......@@ -213,37 +246,46 @@ def list_projects(data):
print("\n")
def edit_project(data, id):
while True:
if id > get_project_count(data) or id < 0:
print("Project ID doesn't exist.\n")
id = int(input("Project_ID to edit: "))
else:
cls()
project = get_project(data, id)
project.pop('project_id') # Project ID shouldn't be changed
project.pop('project_id') # Project ID shouldn't be changed
print(f"Editing project: {project['title']}\n")
pprint.pp(project)
print("")
for field in enumerate(project):
print(f"{field[0]}: {field[1]}")
input("\nField to edit: ")
def delete_project(data):
pass
def menu(data):
menu_items = ["Add new project", "List projects", "Edit existing project", "Delete project", "Quit"]
menu_index = 0
while True:
cls()
titular = r"""
____ _ __ _ _
| _ \ ___ _ __ | |_ / _| ___ | | (_) ___
......@@ -255,7 +297,7 @@ def menu(data):
print(titular)
for i in menu_items:
print(f"{menu_items.index(i) + 1}: {i}")
print(f"{menu_items.index(i)+1}: {i}")
try:
option = int(input(f"> "))
......@@ -275,11 +317,17 @@ def menu(data):
break
except:
print("")
def main():
data = load('MyPortfolio/data.json')
if __name__ == "__main__":
main()
MyPortfolio/myFlaskProject.py
+ 5
− 20
View file @ 989f748c
from flask import Flask, render_template, request
from flask import Flask, render_template
from data import *
app = Flask(__name__, template_folder='./templates')
app = Flask(__name__,template_folder='./templates')
data = load('data.json')
......@@ -9,22 +9,7 @@ data = load('data.json')
def index():
return render_template('index.html')
@app.route("/list.html", methods=['GET', 'POST'])
@app.route("/list.html")
def list():
search_query = request.form.get('search', '')
sort_by = request.form.get('sort_by', 'start_date')
sort_order = request.form.get('sort_order', 'desc')
filtered_projects = search(data, sort_by=sort_by, sort_order=sort_order, search=search_query)
return render_template('list.html', projects=filtered_projects, search_query=search_query, sort_by=sort_by, sort_order=sort_order)
@app.route("/project/<int:project_id>")
def project_details(project_id):
project = get_project(data, project_id)
if project:
return render_template('project_details.html', project=project)
else:
return "Project not found", 404
if __name__ == "__main__":
app.run(debug=True)
return render_template('list.html',
projects = data)
\ No newline at end of file
MyPortfolio/templates/list.html
+ 25
− 25
View file @ 989f748c
......@@ -2,46 +2,46 @@
<html>
<head>
<link rel="stylesheet" href="../static/style/main.css">
<title>Projects</title>
<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=Afacad+Flux:wght@100..1000&display=swap" rel="stylesheet">
</head>
<body>
<header>
<ul>
<li><a href="/">Home</a></li>
<li><a href="techniques.html">Techniques</a></li>
<li><pre class="logo">
██████╗ ██╗ ██████╗
██╔══██╗██║██╔═══██╗
██████╔╝██║██║ ██║
██╔═══╝ ██║██║ ██║
██║██╗ ██║╚██████╔╝
╚═╝╚═╝ ╚═╝ ╚═════╝</pre></li>
<li><a href="list.html">Projects</a></li>
<li><a href="https://github.com/olma957">GitHub</a></li>
</ul>
</ul>
</header>
<div class="content-container">
<!-- Search and Sort Form -->
<form method="POST" action="/list.html">
<input type="text" name="search" placeholder="Search projects" value="{{ search_query }}">
<select name="sort_by">
<option value="start_date" {% if sort_by == 'start_date' %}selected{% endif %}>Start Date</option>
<option value="project_name" {% if sort_by == 'project_name' %}selected{% endif %}>Project Name</option>
<option value="group_size" {% if sort_by == 'group_size' %}selected{% endif %}>Group Size</option>
<option value="lulz_had" {% if sort_by == 'lulz_had' %}selected{% endif %}>Lulz Had</option>
</select>
<select name="sort_order">
<option value="desc" {% if sort_order == 'desc' %}selected{% endif %}>Descending</option>
<option value="asc" {% if sort_order == 'asc' %}selected{% endif %}>Ascending</option>
</select>
<button type="submit">Search</button>
</form>
<!-- Project List -->
<div class="project-table">
{% for p in projects %}
<div class="project">
<a href="/project/{{ p['project_id'] }}">
<img class="project-img" src="{{ p['small_image'] }}">
<p class="project-title"> >{{ p['project_name'] }} </p>
<p class="project-desc"> {{ p['short_description'] }}</p>
</a>
<img class="project-img" src={{ p['small_image'] }}>
<p class="project-title"> >{{ p['project_name'] }} </p>
<p class="project-desc"> {{ p['short_description'] }}</p>
</div>
{% endfor %}
</div>
</div>
......@@ -61,4 +61,4 @@
</p>
</footer>
</body>
</html>
</html>
\ No newline at end of file
MyPortfolio/templates/project_details.html deleted 100644 → 0
+ 0
− 52
View file @ 3528273b
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" href="../static/style/main.css">
<title>{{ project['project_name'] }}</title>
</head>
<body>
<header>
<ul>
<li><a href="/">Home</a></li>
<li><a href="techniques.html">Techniques</a></li>
<li><a href="list.html">Projects</a></li>
<li><a href="https://github.com/olma957">GitHub</a></li>
</ul>
</header>
<div class="content-container">
<h1>{{ project['project_name'] }}</h1>
<img src="{{ project['big_image'] }}" alt="Project Image">
<ul>
<li><strong>Course Name:</strong> {{ project['course_name'] }}</li>
<li><strong>Group Size:</strong> {{ project['group_size'] }}</li>
<li><strong>Start Date:</strong> {{ project['start_date'] }}</li>
<li><strong>End Date:</strong> {{ project['end_date'] }}</li>
<li><strong>Techniques Used:</strong> {{ project['techniques_used'] | join(', ') }}</li>
<li><strong>Description:</strong> {{ project['long_description'] }}</li>
<li><strong>Academic Credits:</strong> {{ project['academic_credits'] }}</li>
<li><strong>Lulz Had:</strong> {{ project['lulz_had'] }}</li>
<li><strong>External Link:</strong> <a href="{{ project['external_link'] }}" target="_blank">{{ project['external_link'] }}</a></li>
</ul>
<a href="/list.html">Back to Projects</a>
</div>
<footer>
<p>Authors:<br>
<a href="mailto:olima957@student.liu.se">Oliwer Mattsson: olima957@student.liu.se</a><br>
<a href="mailto:taiku983@student.liu.se">Taif Kurji: taiku983@student.liu.se</a>
</p>
<p>License:<br>
<a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3 License</a>
</p>
<p>Links:<br>
<a href="/">Home</a><br>
<a href="techniques.html">Techniques</a><br>
<a href="list.html">Projects</a><br>
<a href="https://github.com/olma957">GitHub</a>
</p>
</footer>
</body>
</html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment