Skip to content

Commit

Permalink
fixed routing
Browse files Browse the repository at this point in the history
  • Loading branch information
@sandygudie
sandygudie committed Dec 10, 2023
1 parent 47ad0f4 commit d1b74be
Show file tree
Hide file tree
Showing 12 changed files with 40 additions and 43 deletions.
1 change: 0 additions & 1 deletion client/public/assets/logo-devlinks-large.svg
View file

This file was deleted.

0 client/src/components/icons/EmailIcon.svg → client/src/assets/icons/EmailIcon.svg
View file
File renamed without changes
0 client/src/components/icons/FacebookIcon.svg → client/src/assets/icons/FacebookIcon.svg
View file
File renamed without changes
0 client/src/components/icons/TwitterIcon.svg → client/src/assets/icons/TwitterIcon.svg
View file
File renamed without changes
0 client/src/components/icons/WhatsappIcon.svg → client/src/assets/icons/WhatsappIcon.svg
View file
File renamed without changes
1 change: 0 additions & 1 deletion client/src/assets/icons/logo-devlinks-large.svg
View file

This file was deleted.

1 change: 0 additions & 1 deletion client/src/assets/icons/logo-devlinks-small.svg
View file

This file was deleted.

22 changes: 6 additions & 16 deletions client/src/components/Header.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
import LinkIcon from './icons/IconLink.vue'
import ProfileIcon from './icons/IconProfile.vue'
import IconPreview from './icons/IconPreview.vue'
import LogoBigIcon from '@/components/icons/LogoFull.vue'
import LogoSmallIcon from '@/components/icons/LogoSmall.vue'
defineProps<{
isActive: string
Expand All @@ -13,23 +15,11 @@ defineProps<{
</script>
<template>
<header className="rounded-lg p-3 bg-white flex text-gray-200 h-16 justify-between items-center">
<div class="h-25 md:hidden">
<img
src="@/assets/icons/logo-devlinks-small.svg"
alt="devlink logo"
width="25"
height="25"
loading="eager"
/>
<div class=" md:hidden">
<LogoSmallIcon class="text-purple-300" />
</div>
<div class="hidden md:inline h-25">
<img
src="../../public/assets/logo-devlinks-large.svg"
alt="devlink logo"
width="125"
height="125"
loading="eager"
/>
<div class="hidden md:inline ">
<LogoBigIcon class="text-purple-300" />
</div>
<div className="flex gap-2">
<button
Expand Down
8 changes: 4 additions & 4 deletions client/src/components/Preview.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
import { ref } from 'vue'
import CopyIcon from './icons/CopyIcon.vue'
import ArrowIcon from './icons/ArrowIcon.vue'
import EmailIcon from './icons/EmailIcon.svg'
import FacebookIcon from './icons/FacebookIcon.svg'
import TwitterIcon from './icons/TwitterIcon.svg'
import WhatsappIcon from './icons/WhatsappIcon.svg'
import EmailIcon from '@/assets/icons/EmailIcon.svg'
import FacebookIcon from '@/assets/icons/FacebookIcon.svg'
import TwitterIcon from '@/assets/icons/TwitterIcon.svg'
import WhatsappIcon from '@/assets/icons/WhatsappIcon.svg'
import { XCircleIcon } from '@heroicons/vue/20/solid'
const props = defineProps<{
Expand Down
20 changes: 20 additions & 0 deletions client/src/components/icons/LogoFull.vue
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<template>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 150 40"
width="180"
height="30"
fill="currentColor"
xmlns:v="https://vecta.io/nano"
>
<path
fill="currentColor"
fill-rule="evenodd"
d="M5.774 34.225c2.443 2.442 6.37 2.442 14.226 2.442s11.785 0 14.225-2.442S36.667 27.857 36.667 20s0-11.785-2.442-14.226S27.857 3.334 20 3.334s-11.785 0-14.226 2.44-2.44 6.37-2.44 14.226 0 11.785 2.44 14.225zm10.06-19.642A5.416 5.416 0 1 0 21.25 20a1.25 1.25 0 1 1 2.5 0 7.917 7.917 0 1 1-7.916-7.916 1.25 1.25 0 0 1 0 2.5zM29.584 20a5.417 5.417 0 0 1-5.417 5.417 1.25 1.25 0 0 0 0 2.5A7.917 7.917 0 1 0 16.25 20a1.25 1.25 0 0 0 2.5 0 5.416 5.416 0 1 1 10.834 0z"
/>
<path
d="M61.247 32.15v-3.955l.346.07c-.23 1.283-.923 2.31-2.077 3.08-1.131.77-2.493 1.155-4.086 1.155-1.616 0-3.024-.373-4.225-1.12-1.177-.77-2.089-1.843-2.735-3.22s-.97-2.998-.97-4.865c0-1.89.335-3.535 1.004-4.935s1.605-2.485 2.805-3.255c1.224-.77 2.643-1.155 4.26-1.155 1.684 0 3.046.397 4.085 1.19 1.062.793 1.685 1.878 1.87 3.255l-.38.035V6.95h5.194v25.2h-5.09zm-4.155-3.85c1.223 0 2.216-.432 2.978-1.295.762-.887 1.143-2.147 1.143-3.78s-.393-2.882-1.178-3.745c-.762-.887-1.766-1.33-3.012-1.33a3.8 3.8 0 0 0-2.978 1.33c-.762.887-1.143 2.147-1.143 3.78s.38 2.882 1.143 3.745c.785.863 1.8 1.295 3.047 1.295zm21.709 4.2c-1.962 0-3.67-.385-5.125-1.155-1.454-.793-2.585-1.89-3.393-3.29-.785-1.4-1.178-3.01-1.178-4.83 0-1.843.393-3.453 1.178-4.83a8.395 8.395 0 0 1 3.358-3.255c1.432-.793 3.094-1.19 4.987-1.19 1.824 0 3.405.373 4.744 1.12a7.89 7.89 0 0 1 3.116 3.115c.739 1.33 1.108 2.893 1.108 4.69l-.034 1.05-.104.875H72.153v-3.465h11.115l-.9.63c0-1.447-.347-2.508-1.04-3.185-.669-.7-1.592-1.05-2.77-1.05-1.361 0-2.423.467-3.185 1.4-.739.933-1.108 2.333-1.108 4.2 0 1.82.37 3.173 1.108 4.06.762.887 1.893 1.33 3.393 1.33.831 0 1.547-.14 2.147-.42s1.05-.735 1.35-1.365h4.883c-.577 1.727-1.57 3.092-2.978 4.095-1.385.98-3.174 1.47-5.367 1.47zm15.879-.35L87.72 14.3h5.575l5.437 16.66h-2.91l5.403-16.66h5.436l-6.96 17.85h-5.02zm13.989 0V6.95h5.194v25.2h-5.194zm9.333 0V14.3h5.194v17.85h-5.194zm-.173-20.23V6.25h5.54v5.67h-5.54zm9.506 20.23V14.3h5.09v4.2h.104v13.65h-5.194zm12.293 0V21.09c0-.98-.254-1.715-.762-2.205-.485-.49-1.2-.735-2.147-.735-.808 0-1.535.187-2.181.56a4.118 4.118 0 0 0-1.489 1.54c-.347.653-.52 1.423-.52 2.31l-.45-4.305c.577-1.307 1.42-2.345 2.528-3.115 1.131-.793 2.516-1.19 4.155-1.19 1.963 0 3.463.56 4.502 1.68 1.039 1.097 1.558 2.578 1.558 4.445V32.15h-5.194zm9.147 0V6.95h5.194v25.2h-5.194zm11.323 0l-7.341-9.275 7.168-8.575h5.99l-8.414 9.38.242-1.645 8.519 10.115h-6.164zm14.645.35c-2.585 0-4.64-.525-6.163-1.575s-2.355-2.497-2.494-4.34h4.641c.115.793.507 1.4 1.177 1.82.692.397 1.639.595 2.839.595 1.085 0 1.87-.152 2.355-.455.508-.327.762-.782.762-1.365 0-.443-.15-.782-.45-1.015-.277-.257-.797-.467-1.558-.63l-2.84-.595c-2.101-.443-3.647-1.108-4.64-1.995-.993-.91-1.489-2.077-1.489-3.5 0-1.727.658-3.068 1.974-4.025 1.316-.98 3.151-1.47 5.506-1.47 2.331 0 4.189.478 5.575 1.435 1.385.933 2.146 2.24 2.285 3.92h-4.64c-.092-.607-.416-1.062-.97-1.365-.554-.327-1.339-.49-2.354-.49-.924 0-1.616.14-2.078.42-.439.257-.658.63-.658 1.12 0 .42.185.758.554 1.015.369.233.981.443 1.835.63l3.186.665c1.778.373 3.117 1.073 4.017 2.1.923 1.003 1.385 2.193 1.385 3.57 0 1.75-.681 3.115-2.043 4.095-1.339.957-3.243 1.435-5.714 1.435z"
fill="#333"
/>
</svg>
</template>
2 changes: 2 additions & 0 deletions client/src/components/icons/LogoSmall.vue
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<template><svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="none" viewBox="0 0 32 32"><path fill="currentCOlor" fill-rule="evenodd" d="M4.619 27.38c1.954 1.953 5.095 1.953 11.38 1.953 6.286 0 9.429 0 11.38-1.953 1.954-1.95 1.954-5.095 1.954-11.38 0-6.286 0-9.428-1.953-11.381C25.43 2.667 22.285 2.667 16 2.667c-6.286 0-9.428 0-11.381 1.952-1.952 1.954-1.952 5.095-1.952 11.38 0 6.286 0 9.429 1.952 11.38Zm8.047-15.713A4.333 4.333 0 1 0 17 16a1 1 0 0 1 2 0 6.333 6.333 0 1 1-6.334-6.334 1 1 0 1 1 0 2Zm11 4.333a4.333 4.333 0 0 1-4.333 4.333 1 1 0 1 0 0 2A6.333 6.333 0 1 0 13 16a1 1 0 1 0 2 0 4.334 4.334 0 0 1 8.666 0Z" clip-rule="evenodd"/></svg>
</template>
28 changes: 8 additions & 20 deletions client/src/views/LoginView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import { toast } from 'vue3-toastify'
import 'vue3-toastify/dist/index.css'
import { setToken, setUserID } from '@/utilis'
import { TOKEN_KEY, USERID } from '@/utilis/constants'
import router from '@/router'
import LogoBigIcon from '@/components/icons/LogoFull.vue'
import LogoSmallIcon from '@/components/icons/LogoSmall.vue'
const isLoading = ref<boolean>(false)
onMounted(async () => {
Expand All @@ -24,8 +25,6 @@ const login = () => {
setToken(result.accessToken)
setUserID(result.userID)
return window.location.replace('/')
// router.push('/')
}
} catch (err: any) {
toast.error(err.toString(), {
Expand All @@ -47,14 +46,7 @@ const login = () => {
class="text-center h-screen flex items-center md:justify-center flex-col relative text-white text-center px-5 pt-4 lg:p-10 bg-[#2839a3] lg:w-[75%]"
>
<div class="w-10 block absolute top-5 left-5 lg:hidden h-10">
<img
className="w-full h-10"
src="@/assets/icons/logo-devlinks-small.svg"
alt="devlink logo"
width="100"
height="100"
loading="eager"
/>
<LogoSmallIcon class="text-white" />
</div>

<div class="flex flex-col mt-16 items-center lg:justify-center lg:h-full">
Expand All @@ -63,7 +55,7 @@ const login = () => {
<div class="h-60 md:w-[30rem] mt-6 mx-auto md:h-96">
<img
className="w-full h-60 md:h-96"
src="../../public/assets/social-media-collection.svg"
src="/assets/social-media-collection.svg"
alt="devlink logo"
loading="eager"
/>
Expand All @@ -90,13 +82,9 @@ const login = () => {
</div>
</div>
<div class="w-1/2 mx-auto hidden lg:block h-screen">
<div class="w-36 h-8 absolute top-8 right-10">
<img
className="w-full h-8"
src="../../public/assets/logo-devlinks-large.svg"
alt="devlink logo"
loading="eager"
/>
<div class="w-36 h-7 absolute top-8 right-10">
<LogoBigIcon class="text-purple-300 "/>

</div>
<div class="flex relative flex-col items-center h-full justify-center">
<p class="text-xl mb-6">Log in to your account.</p>
Expand All @@ -113,7 +101,7 @@ const login = () => {
height="40"
/>
</div>
Sign in with Google
<p class="text-sm">Sign in with Google</p>
</button>
</div>
</div>
Expand Down

0 comments on commit d1b74be

Please sign in to comment.