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

⬆️ upgrade: upgrade dependencies #1

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
08c88b5
⬆️ upgrade: upgrade dependencies
CarlosZoft Feb 3, 2024
9a0490c
Merge pull request #5 from Hemocione/feat/new-button
PedroSiqueira1 Mar 19, 2024
36247c1
Merge branch 'main' into develop
guim4dev Mar 20, 2024
f485896
feat: add specific competition view
CarlosZoft Apr 3, 2024
3e9a2df
✨ feat: add missing js
CarlosZoft Apr 3, 2024
4762904
⬆️ update: nuxt
CarlosZoft Apr 3, 2024
06b5d59
Apply suggestions from code review
CarlosZoft Apr 3, 2024
23d94ca
Merge branch 'main' into feat/update-dependencies
CarlosZoft Apr 3, 2024
3451e34
fix: remove invalidate_user
PedroSiqueira1 Apr 3, 2024
6dd9379
Remove invalidate
PedroSiqueira1 Apr 3, 2024
e2c3237
Merge branch 'develop' into feat/new-button
CarlosZoft Apr 3, 2024
bce6ec8
Merge pull request #8 from Hemocione/feat/new-button
CarlosZoft Apr 3, 2024
97dda5d
fix: button
PedroSiqueira1 Apr 4, 2024
f557b3d
✨ feat: added competition list
CarlosZoft Apr 4, 2024
d8c4d81
Merge pull request #10 from Hemocione/feat/new-button
CarlosZoft Apr 4, 2024
7ae8219
Fix: Column height and some typos
PedroSiqueira1 Apr 7, 2024
7b63518
🐛 fix: many many many bugs
CarlosZoft Apr 11, 2024
392a7f1
Merge pull request #11 from Hemocione/feat/competition-list
PedroSiqueira1 Apr 11, 2024
9a635ba
Merge branch 'develop' of github.com:Hemocione/hemocione-competitions…
CarlosZoft Apr 13, 2024
d1dabd5
feat: add missing flow
CarlosZoft Apr 13, 2024
7f46597
fix: apply dinamic givenName
CarlosZoft Apr 13, 2024
5643501
Merge pull request #12 from Hemocione/fix/user-name-logou
CarlosZoft Apr 13, 2024
eaa7392
Merge branch 'develop' of github.com:Hemocione/hemocione-competitions…
CarlosZoft Apr 13, 2024
f81fa0b
fix: last adjusts
CarlosZoft Apr 13, 2024
3f95c36
Merge pull request #7 from Hemocione/feat/specific-competition
CarlosZoft Apr 13, 2024
6f96fcf
Merge branch 'develop' of github.com:Hemocione/hemocione-competitions…
CarlosZoft Apr 13, 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
28 changes: 6 additions & 22 deletions assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
--hemo-color-text-secondary: #25282b;
--hemo-color-text-secondary-opaque: rgba(37, 40, 43, 0.2);
--hemo-color-text-primary: #f2f2f2;
--black-100: #25282B;
--black-100: #25282b;
--el-color-primary: var(--hemo-color-primary) !important;
--el-color-primary-light-3: var(--hemo-color-primary) !important;
--el-color-primary-light-5: var(--hemo-color-primary-dark) !important;
Expand All @@ -36,16 +36,8 @@
}

@font-face {
font-family:
"Roboto",
monospace,
-apple-system,
BlinkMacSystemFont,
"Segoe UI",
"Helvetica Neue",
Arial,
"Noto Sans",
sans-serif;
font-family: "Lato", "Roboto", monospace, -apple-system, BlinkMacSystemFont,
"Segoe UI", "Helvetica Neue", Arial, "Noto Sans", sans-serif;
src: url("https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400;500;700;900&display=swap");
font-display: swap;
font-style: normal;
Expand All @@ -64,16 +56,8 @@ body {
padding: 0;
overflow-x: -moz-hidden-unscrollable;
overflow-x: clip;
font-family:
"Roboto",
monospace,
-apple-system,
BlinkMacSystemFont,
"Segoe UI",
"Helvetica Neue",
Arial,
"Noto Sans",
sans-serif;
font-family: "Lato", "Roboto", monospace, -apple-system, BlinkMacSystemFont,
"Segoe UI", "Helvetica Neue", Arial, "Noto Sans", sans-serif;
}

#__nuxt {
Expand Down Expand Up @@ -111,4 +95,4 @@ a:visited {

* {
-webkit-tap-highlight-color: transparent;
}
}
83 changes: 56 additions & 27 deletions components/CompetitionSummary.vue
Original file line number Diff line number Diff line change
@@ -1,42 +1,71 @@
<template>
<NuxtLink class="summaryBox" to="/competitionRank">
<NuxtLink class="summaryBox" :to="`/competition/${slug}`">
<div :style="{ flex: 9 }">
<h3 :style="{ margin: '0 0 10px 0' }">
<h4 class="card-title">
{{ title }}
</h3>
<span> INICIO: {{ start }} </span>
<br>
<br>
<span> TÉRMINO: {{ end }} </span>
</h4>

<h5 class="card-letter">INÍCIO: {{ formatDate(start) }}</h5>
<h5 class="card-letter">TÉRMINO: {{ formatDate(end) }}</h5>
</div>
<div class="arrow">
<img :style="{ height: '50px' }" src="/images/bodylessArrow.svg">
<img class="arrow-img" src="/images/bodylessArrow.svg" />
</div>
</NuxtLink>
</template>

<script setup>
<script lang="ts" setup>
import dayjs from "dayjs";

defineProps({
title: String,
start: Date,
end: Date
})
slug: {
type: String,
required: true,
},
title: {
type: String,
required: true,
},
start: {
type: Date,
required: true,
},
end: {
type: Date,
required: true,
},
});

const formatDate = (date: any) => {
return dayjs(date).format("DD/MM/YYYY [ÀS] HH:mm[H]");
};
</script>

<style>
.summaryBox {
display: flex;
border: solid #dbdde0 2px;
margin-bottom: 20px;
border-radius: 15px;
padding: 15px;
cursor: pointer;
}
.summaryBox {
display: flex;
border: solid #dbdde0 2px;
border-radius: 15px;
padding: 15px;
cursor: pointer;
}

.card-title {
font-size: 18px;
}
.card-letter {
color: #52575c;
letter-spacing: 0.5px;
font-weight: 500;
}

.arrow {
flex: 1;
display: flex;
justify-content: center;
align-items: center;
}
.arrow {
flex: 1;
display: flex;
justify-content: center;
align-items: center;
}
.arrow-img {
height: 50px;
}
</style>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"@types/jsonwebtoken": "^9.0.5",
"dayjs": "^1.11.10",
"element-plus": "^2.4.3",
"nuxt": "^3.11.1",
"eslint": "^8.56.0",
"jsonwebtoken": "^9.0.2",
"lodash": "^4.17.21",
"nuxt": "^3.8.0",
"nuxt-bugsnag": "^7.2.3",
"nuxt-vercel-analytics": "^1.0.0",
"slugify": "^1.6.6",
Expand Down
Loading