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.

Sign up for GitHub

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

Jump to bottom

Roxanne UI #57

Merged
merged 3 commits into from
Jun 21, 2023
Merged

Roxanne UI #57

merged 3 commits into from
Jun 21, 2023

Conversation

ROXBOZ
Copy link

@ROXBOZ ROXBOZ commented Jun 21, 2023

config

@vercel
Copy link

vercel bot commented Jun 21, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
codac-community ❌ Failed (Inspect) Jun 21, 2023 11:20am
codac-lms ❌ Failed (Inspect) Jun 21, 2023 11:20am
codac-ui ❌ Failed (Inspect) Jun 21, 2023 11:20am

@Loukass23 Loukass23 self-requested a review June 21, 2023 11:23
@Loukass23 Loukass23 merged commit 3052281 into cobalt-kangaroos-integration Jun 21, 2023
Loukass23 added a commit that referenced this pull request Dec 12, 2023
@Loukass23
Squashed commit of the following:
ccbed9a 
commit bcfb4f1
Author: Lucas Dupias <[email protected]>
Date:   Tue Dec 12 15:10:29 2023 +0100

    rm theme switch

commit 065f0c1
Author: Lucas Dupias <[email protected]>
Date:   Tue Dec 12 14:30:01 2023 +0100

    fix storybook build

commit 877389a
Author: Lucas Dupias <[email protected]>
Date:   Tue Dec 12 12:25:43 2023 +0100

    fix build

commit 7c6c40b
Author: Lucas Dupias <[email protected]>
Date:   Fri Jul 14 14:36:36 2023 +0200

    refresh lockfile

commit 54a0505
Author: Lucas Dupias <[email protected]>
Date:   Fri Jul 14 13:57:31 2023 +0200

    fixed build/ ignire ts build

commit 01271fd
Merge: 45c51f8 f7bfa85
Author: Madame-Aehm <[email protected]>
Date:   Fri Jul 14 12:26:42 2023 +0200

    Merge branch 'last-branch' into cobalt-kangaroos-integration

commit f7bfa85
Author: ROXBOZ <[email protected]>
Date:   Thu Jul 13 16:53:03 2023 +0200

    last last last commit

commit 8145892
Author: ROXBOZ <[email protected]>
Date:   Thu Jul 13 16:40:36 2023 +0200

    merging thursday night

commit 45c51f8
Merge: fc27654 29dd5ad
Author: Lucas Dupias <[email protected]>
Date:   Thu Jul 13 16:33:16 2023 +0200

    Merge pull request #73 from CodeAcademyBerlin/ari-test

    Ari test

commit 29dd5ad
Merge: 614a697 fc27654
Author: Lucas Dupias <[email protected]>
Date:   Thu Jul 13 16:32:28 2023 +0200

    Merge branch 'cobalt-kangaroos-integration' into ari-test

commit 614a697
Author: Lucas Dupias <[email protected]>
Date:   Thu Jul 13 16:16:26 2023 +0200

    card props

commit 0f492ad
Author: Lucas Dupias <[email protected]>
Date:   Thu Jul 13 15:31:51 2023 +0200

    fix build

commit fc27654
Author: Christian Vargas <[email protected]>
Date:   Thu Jul 13 13:33:08 2023 +0200

    solving rendering issues

commit 6075296
Author: arianecrestani <[email protected]>
Date:   Thu Jul 13 12:51:52 2023 +0200

    fix

commit 3ef7ee3
Author: arianecrestani <[email protected]>
Date:   Thu Jul 13 12:32:55 2023 +0200

    fix typescript

commit b379dec
Author: Christian Vargas <[email protected]>
Date:   Thu Jul 13 12:09:30 2023 +0200

    queries update and delete messages updated

commit fe30174
Merge: 8f62679 2cb45a1
Author: arianecrestani <[email protected]>
Date:   Thu Jul 13 11:53:16 2023 +0200

    Merge branch 'cobalt-kangaroos-integration' into ari-test

commit 8f62679
Author: arianecrestani <[email protected]>
Date:   Thu Jul 13 11:45:45 2023 +0200

    fix

commit c04f15c
Author: arianecrestani <[email protected]>
Date:   Thu Jul 13 11:42:06 2023 +0200

    fix

commit 2498c32
Author: arianecrestani <[email protected]>
Date:   Thu Jul 13 11:18:52 2023 +0200

    fix

commit 2cb45a1
Author: Christian Vargas <[email protected]>
Date:   Wed Jul 12 16:46:00 2023 +0200

    socket working.

commit e5e914b
Author: arianecrestani <[email protected]>
Date:   Tue Jul 11 19:29:47 2023 +0200

    fix

commit d58d7c1
Author: Christian Vargas <[email protected]>
Date:   Tue Jul 11 16:43:29 2023 +0200

    delete empty  conversation function done

commit c902f0e
Author: arianecrestani <[email protected]>
Date:   Tue Jul 11 14:26:57 2023 +0200

    fix style

commit 9be71c6
Author: Christian Vargas <[email protected]>
Date:   Tue Jul 11 13:07:25 2023 +0200

    create Conversation done!

commit ab5ed5c
Author: Christian Vargas <[email protected]>
Date:   Tue Jul 11 11:36:44 2023 +0200

    update navigation dashboard

commit 282f3b9
Merge: 011644b 161e17c
Author: Christian Vargas <[email protected]>
Date:   Tue Jul 11 11:23:55 2023 +0200

    Merge branch 'cobalt-kangaroos-integration'

commit 25475ac
Author: arianecrestani <[email protected]>
Date:   Mon Jul 10 18:33:24 2023 +0200

    fix

commit f044677
Author: arianecrestani <[email protected]>
Date:   Mon Jul 10 18:32:57 2023 +0200

    fix

commit 161e17c
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 10 15:40:11 2023 +0200

    last changes

commit f718237
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 10 14:58:16 2023 +0200

    changes styling 10-07

commit 32b8217
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 10 13:18:55 2023 +0200

    fixed much shit

commit b66eaac
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 10 12:55:03 2023 +0200

    styling pranab/pablo branhch

commit e65fd8e
Author: arianecrestani <[email protected]>
Date:   Mon Jul 10 12:49:19 2023 +0200

    fix

commit 75fceae
Author: arianecrestani <[email protected]>
Date:   Mon Jul 10 12:48:37 2023 +0200

    fix

commit 042191f
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 10 12:24:00 2023 +0200

    styling pranab/pablo changes

commit c947910
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 10 10:53:09 2023 +0200

    scroll 2

commit 90e3c85
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 10 10:52:49 2023 +0200

    scroll

commit 011644b
Merge: 78fbce9 5f6c4a5
Author: Christian Vargas <[email protected]>
Date:   Fri Jul 7 11:19:54 2023 +0200

    Merge branch 'cobalt-kangaroos-integration'

commit 5f6c4a5
Author: Madame-Aehm <[email protected]>
Date:   Thu Jul 6 16:21:08 2023 +0200

    refactoring

commit d282d94
Author: Madame-Aehm <[email protected]>
Date:   Thu Jul 6 16:02:01 2023 +0200

    comment out old delete mutation

commit 960797f
Author: Madame-Aehm <[email protected]>
Date:   Thu Jul 6 15:58:53 2023 +0200

    message import updated

commit 24f1f99
Merge: 6d1d9e3 11dab82
Author: Madame-Aehm <[email protected]>
Date:   Thu Jul 6 15:57:21 2023 +0200

    Merge branch 'christan-/-roxanne' into cobalt-kangaroos-integration

commit a4395b5
Author: arianecrestani <[email protected]>
Date:   Thu Jul 6 15:10:50 2023 +0200

    fix

commit 6d1d9e3
Author: pranabcode2023 <[email protected]>
Date:   Thu Jul 6 14:40:09 2023 +0200

    Pinned conversations done

commit abe51ca
Author: arianecrestani <[email protected]>
Date:   Wed Jul 5 22:02:15 2023 +0200

    fix

commit 48e550c
Author: arianecrestani <[email protected]>
Date:   Wed Jul 5 21:09:09 2023 +0200

    fix style

commit b597302
Merge: e0eb09e da5fb50
Author: arianecrestani <[email protected]>
Date:   Wed Jul 5 14:42:32 2023 +0200

    Merge branch 'cobalt-kangaroos-integration' into ari-test

commit e0eb09e
Author: arianecrestani <[email protected]>
Date:   Wed Jul 5 14:25:35 2023 +0200

    update

commit b6e5700
Author: arianecrestani <[email protected]>
Date:   Tue Jul 4 13:06:47 2023 +0200

    fix

commit 11dab82
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 3 17:00:43 2023 +0200

    styled editor

commit 7e03184
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 3 16:55:33 2023 +0200

    tooltips on convos

commit 8278f38
Merge: 7dc4f61 5f6b972
Author: Christian Vargas <[email protected]>
Date:   Mon Jul 3 16:18:02 2023 +0200

    Merge branch 'christan-/-roxanne' of https://github.com/CodeAcademyBerlin/CODAC into christan-/-roxanne

commit 7dc4f61
Author: Christian Vargas <[email protected]>
Date:   Mon Jul 3 16:16:00 2023 +0200

    debuging the merge---

commit eb1bd78
Author: Christian Vargas <[email protected]>
Date:   Mon Jul 3 15:34:39 2023 +0200

    debuging changes

commit bc08e45
Merge: 32f6d2b e931dc9
Author: Christian Vargas <[email protected]>
Date:   Mon Jul 3 15:21:14 2023 +0200

    Merge  'merging-christian/roxann

commit 5f6b972
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 3 14:38:08 2023 +0200

    styling on delete function

commit 32f6d2b
Author: Christian Vargas <[email protected]>
Date:   Mon Jul 3 14:32:33 2023 +0200

    dhg

commit e931dc9
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 3 14:27:44 2023 +0200

    fixed conflicts

commit 981b9a7
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 3 14:15:30 2023 +0200

    fixed conflicts

commit 650ad16
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 3 14:15:07 2023 +0200

    fixed conflicts

commit 573cf84
Author: Christian Vargas <[email protected]>
Date:   Mon Jul 3 13:31:58 2023 +0200

    cleaning code

commit e9fd838
Author: Christian Vargas <[email protected]>
Date:   Mon Jul 3 13:18:14 2023 +0200

    deleting console logs

commit 2b84c3b
Author: Christian Vargas <[email protected]>
Date:   Mon Jul 3 13:07:46 2023 +0200

    main chat link added to the dashboard

commit 5bc9299
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 3 12:51:16 2023 +0200

    first commit

commit 3e76853
Author: ROXBOZ <[email protected]>
Date:   Mon Jul 3 12:50:58 2023 +0200

    merging christian + roxanne code

commit 2027194
Author: arianecrestani <[email protected]>
Date:   Mon Jul 3 12:11:31 2023 +0200

    add default image

commit 85dda76
Author: arianecrestani <[email protected]>
Date:   Mon Jul 3 12:08:40 2023 +0200

    add default image

commit 5d4aa5a
Author: arianecrestani <[email protected]>
Date:   Mon Jul 3 11:35:07 2023 +0200

    add linkdin, github and more style

commit df933e0
Author: Christian Vargas <[email protected]>
Date:   Mon Jul 3 11:26:10 2023 +0200

    changes to the scroll behaivor and useRef to hidde the delete div clicking outside the div

commit 2947898
Author: arianecrestani <[email protected]>
Date:   Sat Jul 1 11:02:46 2023 +0200

    fix

commit e37236d
Author: Christian Vargas <[email protected]>
Date:   Fri Jun 30 16:00:30 2023 +0200

    scrolldown function done.

commit 0318505
Author: CosmosMil <[email protected]>
Date:   Fri Jun 30 15:22:20 2023 +0200

    delete msg function passed, which re-fetches the conversation

commit 65f514b
Author: arianecrestani <[email protected]>
Date:   Fri Jun 30 15:12:50 2023 +0200

    add style to the cards

commit 9d54486
Author: CosmosMil <[email protected]>
Date:   Fri Jun 30 14:22:58 2023 +0200

    new useState var for message send

commit 3811e18
Author: arianecrestani <[email protected]>
Date:   Fri Jun 30 14:20:05 2023 +0200

    add style to the cards

commit 23a8a3d
Author: PabloXberg <[email protected]>
Date:   Thu Jun 29 11:12:27 2023 +0200

    pinned conversation done

commit b517a68
Author: CosmosMil <[email protected]>
Date:   Fri Jun 30 12:36:59 2023 +0200

    message body updated after edit

commit 0cd88e7
Author: CosmosMil <[email protected]>
Date:   Fri Jun 30 12:01:31 2023 +0200

    textarea shows old msg to be edited and edited msg displays correctly

commit e090a43
Author: Doron-Breska <[email protected]>
Date:   Thu Jun 29 17:38:08 2023 +0200

    testing functions for the Message component

commit bfa9d5a
Author: Doron-Breska <[email protected]>
Date:   Thu Jun 29 15:10:42 2023 +0200

    first commit

commit 78fbce9
Author: Christian Vargas <[email protected]>
Date:   Thu Jun 29 14:42:12 2023 +0200

    change

commit da5fb50
Author: PabloXberg <[email protected]>
Date:   Thu Jun 29 11:12:27 2023 +0200

    pinned conversation done

commit 6743126
Author: CosmosMil <[email protected]>
Date:   Wed Jun 28 15:28:05 2023 +0200

    independent message component

commit be88349
Merge: 2d8e34c b916e95
Author: Madame-Aehm <[email protected]>
Date:   Wed Jun 28 11:30:09 2023 +0200

    Merge branch 'christian-branch' into cobalt-kangaroos-integration

commit b916e95
Author: Christian Vargas <[email protected]>
Date:   Wed Jun 28 10:34:05 2023 +0200

    distribution of the divs

commit b69c8ff
Author: Christian Vargas <[email protected]>
Date:   Tue Jun 27 17:31:49 2023 +0200

    div for conversations and pinned conversations

commit 2d8e34c
Author: Madame-Aehm <[email protected]>
Date:   Tue Jun 27 14:20:09 2023 +0200

    update .gitignore

commit 1cbf4b4
Merge: 016a2e9 a9a1e89
Author: Madame-Aehm <[email protected]>
Date:   Tue Jun 27 14:19:53 2023 +0200

    Merge branch 'cobalt-kangaroos-integration' of https://github.com/CodeAcademyBerlin/CODAC into cobalt-kangaroos-integration

commit a9a1e89
Merge: 57293f7 281f642
Author: Lucas Dupias <[email protected]>
Date:   Tue Jun 27 13:11:13 2023 +0200

    Merge pull request #60 from CodeAcademyBerlin/christians-branch

    Christians branch

commit 281f642
Merge: fdf6657 57293f7
Author: Lucas Dupias <[email protected]>
Date:   Tue Jun 27 13:09:36 2023 +0200

    Merge branch 'cobalt-kangaroos-integration' into christians-branch

commit fdf6657
Author: Christian Vargas <[email protected]>
Date:   Tue Jun 27 12:54:13 2023 +0200

    folder renamed

commit 57293f7
Merge: e08166c 1760e9e
Author: Lucas Dupias <[email protected]>
Date:   Tue Jun 27 12:42:51 2023 +0200

    Merge pull request #58 from ROXBOZ/Roxanne---UI

    Roxanne   UI

commit 3c94ee1
Author: arianecrestani <[email protected]>
Date:   Tue Jun 27 12:38:49 2023 +0200

    fix router

commit e08166c
Merge: 3052281 97ed47e
Author: Lucas Dupias <[email protected]>
Date:   Tue Jun 27 12:34:24 2023 +0200

    Merge branch 'main' into cobalt-kangaroos-integration

commit 016a2e9
Merge: 3052281 97ed47e
Author: Madame-Aehm <[email protected]>
Date:   Tue Jun 27 12:07:12 2023 +0200

    Merge 'main' into cobalt-kangaroos-integration

commit b20f0f4
Author: Christian Vargas <[email protected]>
Date:   Tue Jun 27 12:03:50 2023 +0200

    changes added

commit 86bc881
Author: arianecrestani <[email protected]>
Date:   Mon Jun 26 22:06:15 2023 +0200

    style

commit 2dacb56
Author: CosmosMil <[email protected]>
Date:   Mon Jun 26 16:12:56 2023 +0200

    added fetch for all pinned msgs

commit 6ee2e27
Author: CosmosMil <[email protected]>
Date:   Mon Jun 26 15:34:30 2023 +0200

    added query to get all pinned msgs

commit 621e9c5
Author: Christian Vargas <[email protected]>
Date:   Mon Jun 26 15:55:03 2023 +0200

    debugin after error after pull... now is working

commit 23b7fb7
Author: arianecrestani <[email protected]>
Date:   Mon Jun 26 15:51:23 2023 +0200

    remove some duplicate files from the merge

commit e35da28
Merge: b0da2f6 b13373e
Author: Christian Vargas <[email protected]>
Date:   Mon Jun 26 15:24:35 2023 +0200

    Merge branch 'christians-branch' of https://github.com/CodeAcademyBerlin/CODAC into christians-branch

commit b0da2f6
Author: Christian Vargas <[email protected]>
Date:   Mon Jun 26 15:22:09 2023 +0200

    my changes

commit 1760e9e
Author: ROXBOZ <[email protected]>
Date:   Mon Jun 26 15:13:29 2023 +0200

    changed color for clarity

commit a9d29be
Author: ROXBOZ <[email protected]>
Date:   Mon Jun 26 15:09:53 2023 +0200

    implemented the bubble inside the chat

commit b13373e
Author: Doron-Breska <[email protected]>
Date:   Mon Jun 26 14:24:13 2023 +0200

    update query in [chatId].tsx

commit 00f5b81
Author: Doron-Breska <[email protected]>
Date:   Mon Jun 26 12:31:34 2023 +0200

    updated types for authContext

commit 72e950b
Author: Doron-Breska <[email protected]>
Date:   Mon Jun 26 12:26:03 2023 +0200

    new chatrooms variable in authContext

commit 5103116
Author: Doron-Breska <[email protected]>
Date:   Mon Jun 26 12:05:51 2023 +0200

    chatroom query added to usercontext +  commented out "Pages" in courses.graphql + projects.graphql

commit e47ce16
Merge: 9d3249f 97ed47e
Author: arianecrestani <[email protected]>
Date:   Mon Jun 26 09:57:11 2023 +0200

    Merge remote-tracking branch 'origin/main' into ari-test

commit 9d3249f
Author: arianecrestani <[email protected]>
Date:   Mon Jun 26 09:31:17 2023 +0200

    Changing css for cards

commit 98be104
Author: arianecrestani <[email protected]>
Date:   Wed Jun 21 17:19:28 2023 +0200

    created queries

commit 37e8454
Author: arianecrestani <[email protected]>
Date:   Sat Jun 17 15:15:02 2023 +0200

    exctract student component

commit be65cae
Author: arianecrestani <[email protected]>
Date:   Wed Jun 14 08:45:40 2023 +0200

    1-create a path for each cohort, 2-each cohort will has a list of students with name and avatar

commit 230fec2
Author: Lucas Dupias <[email protected]>
Date:   Mon Jun 26 09:21:22 2023 +0200

    build ok (#59)

commit d43cd1b
Author: arianecrestani <[email protected]>
Date:   Sun Jun 25 17:14:54 2023 +0200

    create student component

commit 9992c96
Author: Christian Vargas <[email protected]>
Date:   Sun Jun 25 14:24:04 2023 +0200

    chat demo

commit 0674076
Author: Christian Vargas <[email protected]>
Date:   Sun Jun 25 14:22:11 2023 +0200

    chat demo

commit 3317709
Author: arianecrestani <[email protected]>
Date:   Sat Jun 24 11:35:08 2023 +0200

    fix params

commit e18c7fa
Author: arianecrestani <[email protected]>
Date:   Sat Jun 24 10:08:01 2023 +0200

    add component Cohort

commit 075bf6a
Author: Christian Vargas <[email protected]>
Date:   Fri Jun 23 15:27:41 2023 +0200

    delete function working...

commit ac6b4c3
Author: arianecrestani <[email protected]>
Date:   Fri Jun 23 11:31:19 2023 +0200

    fix

commit bc76c30
Author: Christian Vargas <[email protected]>
Date:   Fri Jun 23 02:25:10 2023 +0200

    create function working in the chat...

commit ce541c8
Author: Christian Vargas <[email protected]>
Date:   Fri Jun 23 02:12:13 2023 +0200

    creating new chat from scratch...

commit 9a6f1fe
Author: arianecrestani <[email protected]>
Date:   Thu Jun 22 21:24:46 2023 +0200

    created page router id for Mentor and shape mentor id on GRQL

commit d4ceefa
Author: ROXBOZ <[email protected]>
Date:   Thu Jun 22 16:32:45 2023 +0200

    created storybook bubble

commit b921163
Author: Christian Vargas <[email protected]>
Date:   Thu Jun 22 14:07:29 2023 +0200

    changes and answers...

commit 5c52197
Merge: 19c753a 3052281
Author: Christian Vargas <[email protected]>
Date:   Thu Jun 22 14:07:02 2023 +0200

    changes done...

commit 107cedf
Author: arianecrestani <[email protected]>
Date:   Thu Jun 22 14:03:42 2023 +0200

    add some attributes

commit 19c753a
Author: Christian Vargas <[email protected]>
Date:   Thu Jun 22 10:19:21 2023 +0200

    problem with .map key.id solved in chat and function delete created

commit d7ffdc4
Author: arianecrestani <[email protected]>
Date:   Wed Jun 21 17:19:28 2023 +0200

    created queries

commit 3052281
Merge: a1f2086 fdcfc40
Author: Lucas Dupias <[email protected]>
Date:   Wed Jun 21 13:25:21 2023 +0200

    Merge pull request #57 from CodeAcademyBerlin/Roxanne---UI

    Roxanne   UI

commit fdcfc40
Author: ROXBOZ <[email protected]>
Date:   Wed Jun 21 13:11:05 2023 +0200

    config MONOREPO

commit fa05937
Author: ROXBOZ <[email protected]>
Date:   Wed Jun 21 11:08:44 2023 +0200

    codac-Clean_UI brought to mono repo

commit 8fb94fa
Author: arianecrestani <[email protected]>
Date:   Sat Jun 17 15:15:02 2023 +0200

    exctract student component

commit 0079312
Author: ROXBOZ <[email protected]>
Date:   Fri Jun 16 15:45:04 2023 +0200

    first changes on UI-branch

commit 15995fe
Author: arianecrestani <[email protected]>
Date:   Fri Jun 16 14:39:11 2023 +0200

    add a filter in graphql

commit 3002967
Merge: 5a12789 a1f2086
Author: arianecrestani <[email protected]>
Date:   Thu Jun 15 14:26:59 2023 +0200

    Merge branch 'main' into ari-test

commit 5a12789
Author: arianecrestani <[email protected]>
Date:   Wed Jun 14 08:45:40 2023 +0200

    1-create a path for each cohort, 2-each cohort will has a list of students with name and avatar
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Loukass23 Loukass23 Loukass23 approved these changes

Assignees

@Loukass23 Loukass23

@ROXBOZ ROXBOZ

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ROXBOZ @Loukass23