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

Prueba pull #9

Open
wants to merge 70 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
3476c91
Creating files
RossTrillo Nov 16, 2023
bae0598
Router done and first view in process(template strings)
Isis98 Nov 23, 2023
0c8791e
some few changes in html
Isis98 Nov 23, 2023
d4fc007
console.log with router
Isis98 Nov 23, 2023
fecd4a0
Merge branch 'main' of https://github.com/Isis98/DEV012-dataverse-chat
RossTrillo Nov 23, 2023
2b74604
Working in the home view
RossTrillo Nov 24, 2023
f536f03
Testing pull request
RossTrillo Nov 24, 2023
0d668c7
Merge pull request #1 from RossTrillo/main
Isis98 Nov 24, 2023
47154e2
TEST DONE
Isis98 Nov 24, 2023
8db3897
homeView file created with its css and js files
Isis98 Nov 28, 2023
8159f4b
Merge branch 'main' of github.com:Isis98/DEV012-dataverse-chat
Isis98 Nov 28, 2023
447e757
Merge pull request #5 from Isis98/main
RossTrillo Nov 29, 2023
42536e4
ErrorView, ApiView and HomeView
RossTrillo Dec 6, 2023
0be9091
Merge pull request #2 from RossTrillo/main
Isis98 Dec 6, 2023
d52cc13
test pull request 1
Isis98 Dec 6, 2023
7addb46
Creating remaining views
RossTrillo Dec 11, 2023
85ed349
Merge pull request #3 from RossTrillo/main
Isis98 Dec 11, 2023
124f5cc
stashing image
Isis98 Dec 11, 2023
f5d5057
Merge branch 'main' of github.com:Isis98/DEV012-dataverse-chat
Isis98 Dec 11, 2023
a1cc0b4
Creating SingleChat
RossTrillo Dec 12, 2023
fed3b5b
Merge pull request #4 from RossTrillo/main
Isis98 Dec 12, 2023
b134c57
My changes
Isis98 Dec 12, 2023
9ce27b5
Merge branch 'main' of github.com:Isis98/DEV012-dataverse-chat
Isis98 Dec 12, 2023
c5377bf
Creating Group Chat
RossTrillo Dec 13, 2023
96c570b
Merge pull request #5 from RossTrillo/main
Isis98 Dec 13, 2023
2fbc734
my changes
Isis98 Dec 13, 2023
364f530
Changes in CSSand View cardInfo
Isis98 Dec 18, 2023
2788bf3
My changes
RossTrillo Dec 20, 2023
79dff7e
Testing my teammate pull
Isis98 Dec 20, 2023
1fb2c14
Merge pull request #6 from Isis98/main
Isis98 Dec 20, 2023
d4c3a97
Merge branch 'main' of https://github.com/RossTrillo/DEV012-dataverse…
RossTrillo Dec 20, 2023
855ae0a
Changes in Index.html
RossTrillo Dec 20, 2023
402a595
Merge pull request #6 from RossTrillo/main
Isis98 Dec 20, 2023
f4a06c6
working in group chat
RossTrillo Jan 4, 2024
3941c9c
Merge branch 'RossTrillo:main' into main
Isis98 Jan 4, 2024
4551c9a
Changes in Home styles
RossTrillo Jan 5, 2024
d19cf32
Merge branch 'RossTrillo:main' into main
Isis98 Jan 5, 2024
04cc04e
Working responsive design
RossTrillo Jan 11, 2024
c546dda
Working in apiView styles
Isis98 Jan 11, 2024
99d4864
Merge branch 'RossTrillo:main' into main
Isis98 Jan 11, 2024
67684bd
Merge branch 'main' of github.com:Isis98/DEV012-dataverse-chat
Isis98 Jan 11, 2024
05c9ecf
CSS Changes
Isis98 Jan 12, 2024
eb841c8
Merge pull request #7 from Isis98/main
Isis98 Jan 12, 2024
5c69086
Css stash
RossTrillo Jan 12, 2024
4ba7067
Merge branch 'main' of https://github.com/RossTrillo/DEV012-dataverse…
RossTrillo Jan 12, 2024
1076b56
Working in unit test
RossTrillo Jan 15, 2024
76144c4
Working in footer and render test
RossTrillo Jan 15, 2024
dd6c3f3
Stash of unit test
Isis98 Jan 15, 2024
1072d14
ReadMe in progress
Isis98 Jan 16, 2024
56976e0
Merge pull request #8 from Isis98/main
Isis98 Jan 16, 2024
8b944f3
Unit test done
Isis98 Jan 17, 2024
fb4f2d7
Merge pull request #9 from Isis98/main
Isis98 Jan 17, 2024
927126a
Working in apiTest
RossTrillo Jan 17, 2024
e1d78c8
Merge branch 'main' of https://github.com/RossTrillo/DEV012-dataverse…
RossTrillo Jan 17, 2024
6498705
Despliegue
RossTrillo Jan 18, 2024
869f52a
Working on deployment
RossTrillo Jan 18, 2024
d1def34
Changes in mainApi.js
RossTrillo Jan 18, 2024
6da9c5e
Working in mainApi.js
RossTrillo Jan 18, 2024
0858ea5
fix navigation
Isis98 Jan 18, 2024
2a183c8
fix navigation other files
Isis98 Jan 18, 2024
1d50bae
fix navigation other files again
Isis98 Jan 18, 2024
cbadd33
fix style.css tag
Isis98 Jan 18, 2024
7e0235d
fix api script
Isis98 Jan 18, 2024
c90649b
Merge branch 'main' of github.com:Isis98/DEV012-dataverse-chat
Isis98 Jan 18, 2024
254b170
create 404 page
Isis98 Jan 18, 2024
744e9f3
fix 404 page styles
Isis98 Jan 18, 2024
c307b58
change 404 page
Isis98 Jan 19, 2024
29b574d
fix 404 page
Isis98 Jan 19, 2024
e5172b5
fix script loads
Isis98 Jan 22, 2024
8842aba
Changes css header
Isis98 Jan 22, 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
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"env": {
"browser": true,
"es6": true,
"jest": true
"jest": true,
"node": true
},
"parserOptions": {
"ecmaVersion": 2020,
Expand Down
795 changes: 81 additions & 714 deletions README.md

Large diffs are not rendered by default.

Binary file added desktopView.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading