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

fixed top bar #36

Open
wants to merge 74 commits into
base: deploy
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
f6a5fbb
fixed search bars v1
D4MPPT Jan 23, 2024
bc8b7d5
added log
D4MPPT Jan 24, 2024
c4b9277
removed console.log
D4MPPT Jan 24, 2024
f6375bc
Fixed top bar
D4MPPT Jan 24, 2024
9bb5303
Update README.md
jomivaan Jan 24, 2024
267dd86
added topbar imports
D4MPPT Jan 24, 2024
f4fdcd0
Merge branch 'main' of https://github.com/NEECIST/jeec-admin into main
D4MPPT Jan 24, 2024
dc77a1b
fixed imports of topbar
D4MPPT Jan 24, 2024
d94e0a3
more fixes topbar
D4MPPT Jan 24, 2024
7c78bea
Added Ticket Levels
jomivaan Jan 24, 2024
ed533c0
added new topbar to check rewards
D4MPPT Jan 24, 2024
ebcce85
Merge branch 'main' of https://github.com/NEECIST/jeec-admin into main
D4MPPT Jan 24, 2024
5424e7c
added top bar to ticket levels
D4MPPT Jan 24, 2024
5ff6067
fixed router
D4MPPT Jan 24, 2024
005475f
tried to fix student order
D4MPPT Jan 24, 2024
f53c72d
tried to fix student order 2
D4MPPT Jan 24, 2024
917b6fe
Alemão First Commit
jomivaan Jan 24, 2024
3f72a26
Update index.js for german
jomivaan Jan 24, 2024
d640fe1
Create cvs_dashboard.vue
jomivaan Jan 24, 2024
3c48c0e
Update index.js
jomivaan Jan 24, 2024
7d410a6
Update cvs_dashboard.vue
AfonsoAlemao Jan 24, 2024
7340990
Update Addspeaker.vue to change limit
jomivaan Jan 24, 2024
7129d51
Update UpdateSpeaker.vue
jomivaan Jan 24, 2024
d1d3c4b
fixed qr v2
D4MPPT Jan 24, 2024
be5f3d4
Merge branch 'main' of https://github.com/NEECIST/jeec-admin into main
D4MPPT Jan 24, 2024
26fd4b3
first try at new qr reader
D4MPPT Jan 29, 2024
13762e5
no qr reader works :(
D4MPPT Jan 29, 2024
96638b2
added individual rewards
jomivaan Jan 30, 2024
18bc659
corrected index.js
jomivaan Jan 30, 2024
37acdae
corrected individual reward dashboard
jomivaan Jan 30, 2024
4d25f58
corrected same file
jomivaan Jan 30, 2024
7731557
corrected same file
jomivaan Jan 30, 2024
3bf3cfe
corrected same file
jomivaan Jan 30, 2024
5296009
daily rewards working
jomivaan Jan 30, 2024
31b1f6c
cvs working!!!
AfonsoAlemao Feb 3, 2024
617c1a0
Merge pull request #37 from NEECIST/alemao
AfonsoAlemao Feb 5, 2024
38f773d
changed rewards
dark66jedi Feb 6, 2024
68af227
changed admin jeecpot rewards
dark66jedi Feb 8, 2024
04d24dc
removed useless activity parameters
D4MPPT Feb 13, 2024
60d26ae
Merge branch 'main' of https://github.com/NEECIST/jeec-admin into main
D4MPPT Feb 13, 2024
7120ec0
Added Prize Distribution for Individual and half squads
jomivaan Feb 13, 2024
25494f1
select approved/not yet reviewed/all button
AfonsoAlemao Feb 14, 2024
4980bae
removed tags in activity forms
D4MPPT Feb 14, 2024
0df9fe1
Merge branch 'main' of https://github.com/NEECIST/jeec-admin into main
D4MPPT Feb 14, 2024
e94bdc7
better company selection in meals
D4MPPT Feb 14, 2024
fd5f191
hopefully the companies appear now
D4MPPT Feb 14, 2024
e538d07
added imports (:
D4MPPT Feb 14, 2024
989b07a
prettire
D4MPPT Feb 14, 2024
cb0e0aa
omg pls work
D4MPPT Feb 14, 2024
faf4f46
cvs
AfonsoAlemao Feb 14, 2024
2be712e
finished attribute individual and squad rewards
dark66jedi Feb 14, 2024
5f3831e
Merge branch 'main' of https://github.com/NEECIST/jeec-admin
dark66jedi Feb 14, 2024
b4991b6
added reset daily points
D4MPPT Feb 14, 2024
5a51e92
Merge branch 'main' of https://github.com/NEECIST/jeec-admin into main
D4MPPT Feb 14, 2024
5d4e0d0
adicionei o estúpido botão para que a mentira que disseram à ordem do…
dark66jedi Feb 14, 2024
5fd61a3
we can add points now at will
dark66jedi Feb 14, 2024
5c3edfb
alterei a ordem das colunas nas activities e removi outras
dark66jedi Feb 15, 2024
7338496
fixed logout
dark66jedi Feb 16, 2024
04ed119
merda
dark66jedi Feb 16, 2024
1766ea3
fuck edurelha
dark66jedi Feb 16, 2024
7fcdbb5
tickets form finally functional
D4MPPT Feb 16, 2024
48f45cf
separated job fairs from the rest of activities
dark66jedi Feb 18, 2024
ca42b42
adicionei um botão para apagar squads sem as banir + adicionei a colu…
dark66jedi Feb 19, 2024
ec29648
changed the users pages
dark66jedi Feb 21, 2024
1831323
adjusted last commit
dark66jedi Feb 22, 2024
0266634
trying to fix buttons
dark66jedi Feb 22, 2024
cac3a93
another try
dark66jedi Feb 22, 2024
33c27a2
fixed it :)
dark66jedi Feb 22, 2024
8ec6251
fixing sponsors indicator
dark66jedi Feb 22, 2024
64a2a5b
idk i'm shy
dark66jedi Feb 22, 2024
c41e2a8
i'm done
dark66jedi Feb 22, 2024
0fa815d
added check jeecpot participants
jomivaan Feb 23, 2024
9993e6e
Update README.md
Midas-sudo Jul 18, 2024
bb12b76
added delete events button
dark66jedi Feb 23, 2025
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
11 changes: 2 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
# jeec-admin
Site for admin interaction with Brain.
Site for admin interaction with Brain. Must ask the devs for the .env.

To run you must use the commands:

`npm install`

`npm install vue-select`

`npm install axios`

Before instaling bcrypt, make sure you pass the requirements in https://www.npmjs.com/package/bcrypt

`npm install bcrypt`
Then, to run:

`npm run serve`
# jeec-admin