michel/ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: michel:624fb47e04376369739ea88f1eb9c01e69f89913
Branches Tags
michel:main
michel:server
michel:Chatte
michel:jspong
michel:feat/matchmaking
michel:docker
michel:cli
michel:python
..
compare: michel:c178556a2ed3a981b47a0b2423908d564d6bfea1
Branches Tags
michel:server
michel:Chatte
michel:jspong
michel:feat/matchmaking
michel:main
michel:docker
michel:cli
michel:python

No commits in common. "624fb47e04376369739ea88f1eb9c01e69f89913" and "c178556a2ed3a981b47a0b2423908d564d6bfea1" have entirely different histories.
624fb47e04 ... c178556a2e

3 changed files with 10 additions and 34 deletions
Show Stats Expand all files Collapse all files

19
frontend/static/css/me.css
View File

@ -1,19 +0,0 @@
#app .account
{
background-color: red;
}
#app .account, #app .profile
{
width: 60%;
display: flex;
margin-left: auto;
margin-right: auto;
flex-direction: column;
flex-wrap: wrap;
}
#app .profile
{
background-color: green;
}

21
frontend/static/js/views/MeView.js
View File

@ -12,8 +12,8 @@ export default class extends AbstractAuthentificateView
{
if (this.fill() === null)
return;
document.getElementById("save-account-button").onclick = this.acccount_save;
document.getElementById("delete-account-button").onclick = this.account_delete_accounts;
document.getElementById("save-button").onclick = this.save;
document.getElementById("delete-button").onclick = this.delete_accounts;
}
async fill()
@ -104,27 +104,22 @@ export default class extends AbstractAuthentificateView
async getHtml()
{
return `
<link rel="stylesheet" href="static/css/me.css">
<h1>ME</h1>
<div class="account">
<h3>Account</h3>
<div class="accounts">
<input type="text" placeholder="username" id="username">
<span id="error_username"></span>
<input type=password placeholder="new password" id="new_password">
<span id="error_new_password"></span>
<input type=password placeholder="current password" id="current_password">
<span id="error_current_password"></span>
<input type="button" value="Save Credentials" id="save-account-button">
<span id="error_save"></span>
<input type="button" value="Delete Account" id="delete-account-button">
<span id="error_delete"></span>
</div>
<div class="profile">
<h3>Profile</h3>
<input type="file" id="avatar" accept="image/png, image/jpeg">
<input type="button" value="Save profile" id="save-profile-button">
<span id="error_save"></span>
<input type="file" placeholder="username" id="avatar" accept="image/png, image/jpeg">
</div>
<input type="button" value="Save" id="save-button">
<span id="error_save"></span>
<input type="button" value="Delete" id="delete-button">
<span id="error_delete"></span>
<a href="/logout" class="nav__link" data-link>Logout</a>
`;
}

4
profiles/viewsets.py
View File

@ -11,7 +11,7 @@ from .serializers import ProfileSerializer
from .models import ProfileModel
class ProfileViewSet(viewsets.ModelViewSet):
queryset = ProfileModel.objects.all
queryset = ProfileModel.objects.all()
serializer_class = ProfileSerializer
parser_classes = (MultiPartParser, FormParser)
permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
@ -23,7 +23,7 @@ class ProfileViewSet(viewsets.ModelViewSet):
status=status.HTTP_200_OK)
def list(self, request: HttpRequest):
serializer = ProfileSerializer(self.queryset(), many=True)
serializer = ProfileSerializer(self.queryset, many=True)
for profile in serializer.data:
profile["avatar_url"] = profile["avatar_url"][profile["avatar_url"].find("static") - 1:]
return Response(serializer.data)