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

fix #68 implemented better error handling for logout function #69

Merged
merged 97 commits into from
Aug 1, 2023
Merged
Changes from 1 commit
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
d1de4ba
Add Home, Room Check-in
shaunBoahCodes Jul 1, 2023
b6d80b2
fixed codacy
cweitat Jul 3, 2023
69dca29
clear netlify build
cweitat Jul 3, 2023
94b72a8
Merge branch 'fossasia:develop' into develop
shaunBoahCodes Jul 4, 2023
c6874da
Merge branch 'fossasia:develop' into develop
shaunBoahCodes Jul 8, 2023
16b1909
Update SearchAttendee.vue
shaunBoahCodes Jul 8, 2023
9d93e1a
Update ScanSearch
shaunBoahCodes Jul 8, 2023
78f01e2
Merge branch 'develop' into shaun
cweitat Jul 8, 2023
de529cd
Merge branch 'fossasia:develop' into develop
shaunBoahCodes Jul 8, 2023
9dedd98
Merge branch 'fossasia:develop' into develop
shaunBoahCodes Jul 8, 2023
dd435ca
Merge branch 'develop' into shaun
shaunBoahCodes Jul 8, 2023
ad0a23b
Merge pull request #1 from shaunBoahCodes/shaun
shaunBoahCodes Jul 8, 2023
b141486
Fixed navabr
shaunBoahCodes Jul 9, 2023
68eb898
Update BaseTemplate.vue
shaunBoahCodes Jul 9, 2023
3c68fef
Removed bottom navbar and updated dropdown menu
shaunBoahCodes Jul 11, 2023
2d8d442
Minor fixes
shaunBoahCodes Jul 11, 2023
b68633f
Merge branch 'develop' into shaun
shaunBoahCodes Jul 11, 2023
0f8fb60
Merge branch 'fossasia:develop' into develop
shaunBoahCodes Jul 12, 2023
59f3470
Added checklist to printModal and simplified router
shaunBoahCodes Jul 12, 2023
c032bc4
Name changes
shaunBoahCodes Jul 12, 2023
1410865
Fixed passwordModal and removed password requirement for stats
shaunBoahCodes Jul 13, 2023
6d3666a
Switched to template refs
shaunBoahCodes Jul 13, 2023
582c827
minor fixes
shaunBoahCodes Jul 13, 2023
641d221
Rearranged and renamed
shaunBoahCodes Jul 13, 2023
a2a48c0
Fix codacy issues
shaunBoahCodes Jul 13, 2023
4302fc5
Merge branch 'shaun' into develop
DonChiaQE Jul 13, 2023
29efe01
Changed casing
shaunBoahCodes Jul 14, 2023
bcbbe7d
Merge branch 'fossasia:develop' into develop
shaunBoahCodes Jul 14, 2023
683516d
Fix #31 Added dropdown list that allows user to choose which details …
shaunBoahCodes Jul 14, 2023
9d39a0c
Fixed format
shaunBoahCodes Jul 14, 2023
c548de0
Fix codacy
shaunBoahCodes Jul 14, 2023
6f11135
Merge branch 'develop' into develop
cweitat Jul 15, 2023
7c232a7
Merge branch 'develop' into develop
cweitat Jul 15, 2023
1cbe6f2
Minor fixes and renaming
shaunBoahCodes Jul 15, 2023
e26ff62
Minor fixes and moved some code to inline
shaunBoahCodes Jul 15, 2023
15bd10f
Fix #41 and codacy
shaunBoahCodes Jul 15, 2023
b4b0af5
fix codacy
shaunBoahCodes Jul 16, 2023
12e7f66
Simplified code
shaunBoahCodes Jul 16, 2023
8cadc94
Merge branch 'fossasia:develop' into develop
shaunBoahCodes Jul 16, 2023
0bb6f72
fix #48 created standard button component and replaced some buttons
shaunBoahCodes Jul 18, 2023
345930c
fix format
shaunBoahCodes Jul 18, 2023
33fa89d
Converted all buttons to standard component
shaunBoahCodes Jul 18, 2023
6a496fd
fixed format
shaunBoahCodes Jul 18, 2023
d9f1665
fix codacy
shaunBoahCodes Jul 18, 2023
c56b497
Fix #40 standardised all p-6 except pages with scanners, optimised se…
shaunBoahCodes Jul 18, 2023
b934d97
changed prop name
shaunBoahCodes Jul 19, 2023
d0c0395
removed activated classes
shaunBoahCodes Jul 19, 2023
7e99459
Merge branch 'Standard-margin' into develop
shaunBoahCodes Jul 21, 2023
67845c0
Merge branch 'develop' into Print-modal
shaunBoahCodes Jul 21, 2023
f15367c
Minor UI fixes
shaunBoahCodes Jul 21, 2023
36b6be9
Merge branch 'develop' into Print-modal
shaunBoahCodes Jul 21, 2023
2b776e2
fix #52 clicking print on search attendee now opens the print modal a…
shaunBoahCodes Jul 21, 2023
84b849c
Merge branch 'develop' into develop
shaunBoahCodes Jul 21, 2023
178c13a
fix #51 new layout for print modal
shaunBoahCodes Jul 21, 2023
ad0d1c9
changed to margin
shaunBoahCodes Jul 21, 2023
88a8143
removed grow flex
shaunBoahCodes Jul 22, 2023
f467656
Merge branch 'fossasia:develop' into develop
shaunBoahCodes Jul 22, 2023
8049bea
Merge branch 'Print-modal' into develop
shaunBoahCodes Jul 22, 2023
ab3a374
minor fixes
shaunBoahCodes Jul 22, 2023
9bf7a52
fix #50 created success notification that shows on print
shaunBoahCodes Jul 22, 2023
c9dc721
removed redundant code
shaunBoahCodes Jul 23, 2023
2f964ec
fix margin of print modal
shaunBoahCodes Jul 23, 2023
49e1f9f
changed naming
shaunBoahCodes Jul 23, 2023
7c9e632
switched to camel case, moved some functions to inline
shaunBoahCodes Jul 24, 2023
bb8e85e
minor changes
shaunBoahCodes Jul 24, 2023
c7ff778
changed some refs to computed
shaunBoahCodes Jul 24, 2023
f49e08f
fix #49 #46 ported everything to stores
shaunBoahCodes Jul 26, 2023
a17dd17
Merge branch 'develop' into develop
shaunBoahCodes Jul 26, 2023
1aaa0bc
fix codacy
shaunBoahCodes Jul 26, 2023
13c74b8
fix #59 #53 search and logout attached to respective APIs
shaunBoahCodes Jul 28, 2023
b0d3d4c
Merge branch 'develop' into develop
shaunBoahCodes Jul 28, 2023
b340858
fix netlify
shaunBoahCodes Jul 28, 2023
9adf1b5
Merge branch 'develop' of https://github.com/shaunBoahCodes/open-even…
shaunBoahCodes Jul 28, 2023
7d6ba98
fix netlify
shaunBoahCodes Jul 28, 2023
ea32719
fix netlify
shaunBoahCodes Jul 28, 2023
46cfff6
fix codacy
shaunBoahCodes Jul 28, 2023
c2e4e3a
fix codacy
shaunBoahCodes Jul 28, 2023
8621af8
Merge branch 'develop' into develop
cweitat Jul 29, 2023
06f9e5a
Merge branch 'develop' into develop
cweitat Jul 29, 2023
2462cd7
fix codacy
shaunBoahCodes Jul 29, 2023
31af38d
Merge branch 'develop' into develop
shaunBoahCodes Jul 29, 2023
a09ca65
fix build
shaunBoahCodes Jul 29, 2023
a5ab1f7
fix codacy
shaunBoahCodes Jul 29, 2023
aa3f077
fix codacy
shaunBoahCodes Jul 29, 2023
60b6565
fix #61 implemented API for checking in attendees in registration via…
shaunBoahCodes Jul 30, 2023
9689fdc
Merge branch 'develop' into develop
shaunBoahCodes Jul 30, 2023
f9f847b
fixed error
shaunBoahCodes Jul 30, 2023
88c7f3f
added dayjs
shaunBoahCodes Jul 30, 2023
c787977
remove moment
shaunBoahCodes Jul 30, 2023
0ac2591
Merge branch 'fossasia:develop' into develop
shaunBoahCodes Jul 31, 2023
93e4f97
fix comments
shaunBoahCodes Jul 31, 2023
586578c
fix comments
shaunBoahCodes Jul 31, 2023
8126499
fix comment
shaunBoahCodes Jul 31, 2023
8c3fba1
Merge branch 'fossasia:develop' into develop
shaunBoahCodes Aug 1, 2023
f8e57a1
fix #68 implemented better error handling for logout function
shaunBoahCodes Aug 1, 2023
f3d2a52
Update auth.js
shaunBoahCodes Aug 1, 2023
305152f
Update auth.js
shaunBoahCodes Aug 1, 2023
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
Prev Previous commit
Next Next commit
Update SearchAttendee.vue
  • Loading branch information
shaunBoahCodes committed Jul 8, 2023
commit 16b1909fd4930da1ab9e49eb57707dcc96f39921
100 changes: 98 additions & 2 deletions src/components/Registration/Manual/SearchAttendee.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,105 @@
<script setup>
import { ref, watch } from 'vue'
import { XCircleIcon, MagnifyingGlassIcon, PrinterIcon } from '@heroicons/vue/20/solid'

const query = ref('')
const typing = ref(false)
const searchbar = ref(null)

const erase = () => {
query.value = ''
}

watch(query, () => {
if (query.value !== '') typing.value = true
else typing.value = false
})

const checkIn = (item) => {
item.checkedIn.value = true
}

const items = [
{
id: 1,
name: 'Wei Tat Chung',
position: 'Chairperson',
role: 'Organiser',
email: '[email protected]',
organisation: 'SUSS AI-IG',
checkedIn: ref(false),
},
{
id: 2,
name: 'Shaun Laclemence',
position: 'Chairperson',
role: 'Organiser',
email: '[email protected]',
organisation: 'SUSS AI-IG',
checkedIn: ref(false),
},
{
id: 3,
name: 'Don Chia',
position: 'Chairperson',
role: 'Organiser',
email: '[email protected]',
organisation: 'SUSS AI-IG',
checkedIn: ref(false),
},
]
</script>

<template>
<div>

<div class="mx-auto max-w-2xl sm:px-6 lg:px-8">
<label for="search" class="block flex items-center justify-center text-lg font-medium leading-10 text-gray-900">
<MagnifyingGlassIcon class="h-6 mr-2" aria-hidden="true" />
<span>Enter my information</span>
</label>
<div class="relative mt-2 rounded-xl shadow-sm">
<input v-model="query" type="text" name="search" id="search" class="block w-full rounded-xl border-0 py-1.5 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6" placeholder="" />
<button type="button" @click="erase" v-if="typing" class="group absolute inset-y-0 right-0 flex items-center pr-3">
<XCircleIcon class="h-6 text-gray-400 group-hover:text-gray-400/70" aria-hidden="true" />
</button>
</div>
</div>

<div class="mx-auto max-w-2xl sm:px-6 lg:px-8">
<ul role="list" class="space-y-3 mt-6">
<li v-for="item in items" :key="item.id" class="overflow-hidden rounded-2xl bg-white px-6 py-4 shadow border border-gray-300 space-y-2">

<div class="flex items-center justify-between gap-2">

<div class="flex flex-col gap-2">
<div class="flex flex-col sm:flex-row sm:items-baseline gap-2">
<span class="text-gray-900 font-bold">{{ item.name }}</span>
<span class="text-gray-400 font-bold text-sm">{{ item.email }}</span>
</div>
<div class="flex flex-wrap text-normal gap-1">
<span class="text-center rounded-md px-2 py-1 text-xs text-gray-600 ring-1 ring-inset ring-gray-500/10">{{ item.position }}</span>
<span class="text-center rounded-md px-2 bg-yellow-50 py-1 text-xs font-medium text-yellow-800 ring-1 ring-inset ring-yellow-600/20">{{ item.role }}</span>
<span class="text-center rounded-md px-2 bg-gray-50 py-1 text-xs font-bold text-gray-600 ring-1 ring-inset ring-gray-500/10">{{ item.organisation }}</span>
</div>
</div>

<div class="flex items-center gap-2">
<button
type="button"
@click="checkIn(item)"
:class="['rounded-full px-2.5 py-1.5 text-sm font-medium shadow-sm transition border flex-none',
item.checkedIn.value ? 'bg-blue-100 border-blue-700/40 text-blue-700' : 'bg-blue-600 text-white hover:bg-blue-500 border-blue-600']">
<span v-if="!item.checkedIn.value" class="transition-all">Check In</span>
<span v-else class="transition-all">Checked-in</span>
</button>
<button type="button" class="inline-flex items-center rounded-full bg-yellow-300 px-2.5 py-1.5 text-sm font-medium text-gray-900 hover:bg-yellow-200 border border-yellow-300">
<PrinterIcon class="w-5 mr-1" />
<span>Print</span>
</button>
</div>

</div>

</li>
</ul>
</div>
</template>