Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
b496366
Revert "Merge branch 'develop' into mongo"
thekidisalright May 7, 2024
da91aa8
pomodoro
thekidisalright May 7, 2024
e6c8805
markdown
thekidisalright May 7, 2024
ca24126
chore: Update color variables in index.css file
thekidisalright May 20, 2024
065b2b6
chore: Update copyright year in Footer component
thekidisalright May 20, 2024
8f2e4de
chore: Update padding and font styles in Footer component
thekidisalright May 20, 2024
8d5b808
Update padding and font sizes in Header component
thekidisalright May 20, 2024
df8a3d2
feat: Add monthly and annual subscription options to LandingPage
thekidisalright May 20, 2024
72f434b
feat: Add monthly and annual subscription options to LandingPage
thekidisalright May 20, 2024
5a2e8cd
tabs funcionais
thekidisalright May 21, 2024
984c97f
add idx config file
thekidisalright May 22, 2024
47bee7b
add package gh
thekidisalright May 22, 2024
3222b98
add react packages
thekidisalright May 22, 2024
38e6dcd
add logo-cinza to public
thekidisalright May 22, 2024
c490b4f
add login page to route
thekidisalright May 22, 2024
b85796f
new login page component
thekidisalright May 22, 2024
11d4a4f
inicialized styling of the new login page
thekidisalright May 22, 2024
69058d7
login fetch
thekidisalright May 22, 2024
6607e1f
new styles
thekidisalright May 22, 2024
3dd1bb8
alert criado
thekidisalright May 22, 2024
cd58565
extensoes
thekidisalright May 22, 2024
49435ea
import nos components login e cadastro
thekidisalright May 23, 2024
035c7d8
novo componente cadastro e estilos
thekidisalright May 23, 2024
0c80b16
trocar lingua
thekidisalright May 23, 2024
debc650
novas cores
thekidisalright May 23, 2024
8fa62bd
alteracoes no funcionamento do cadastro
thekidisalright May 23, 2024
972faee
mudança de cor no footer
thekidisalright May 23, 2024
ca90191
diminuicao do tempo pro alert sumir pós click
thekidisalright May 23, 2024
ac51483
refactor: Improve alert component functionality and styling
thekidisalright May 24, 2024
c4f6e68
Adicionando o modal de config incompleto
yHeyDark May 25, 2024
2faafd4
Update the initialization of state variables in the Cadastro componen…
thekidisalright May 29, 2024
a70f826
refactor: Improve alert component functionality and styling
thekidisalright May 30, 2024
59416b2
refactor: Improve Cadastro component functionality and error handling
thekidisalright May 31, 2024
4cd0cc9
refactor: Add useNavigate hook to Login component for navigation
thekidisalright May 31, 2024
baf335d
refactor: Remove backdrop-filter from Login module CSS
thekidisalright May 31, 2024
9a9cbf6
refactor: Update font sizes in responsive CSS
thekidisalright May 31, 2024
41a6d52
refactor: Update sidebar icons size and padding
thekidisalright May 31, 2024
fa6ffd9
a
giostos13 Jun 3, 2024
fd2bea4
atualização flashcards
giostos13 Jun 3, 2024
1913572
flashcards att
giostos13 Jun 3, 2024
3bc836a
atualização flashcards
giostos13 Jun 3, 2024
2c0eaab
flashcards att
giostos13 Jun 3, 2024
d9b1a72
refactor: Update sidebar icons size and padding
thekidisalright Jun 4, 2024
326cecc
refactor: Update sidebar icons size and padding
thekidisalright Jun 4, 2024
5148399
refactor: Update sidebar icons size and padding
thekidisalright Jun 4, 2024
5d52f4d
refactor: Update ModalNewTask component UI and functionality
thekidisalright Jun 4, 2024
4b92cf9
refactor: Update ModalNewTask component UI and functionality
thekidisalright Jun 4, 2024
b80ce00
mudança no gap entre o icone e o nome da lista
thekidisalright Jun 4, 2024
78769d2
refactor: Update border radius and button size in ModalNewTask component
thekidisalright Jun 4, 2024
a9f93a3
refactor: Update sidebar icons size and padding
thekidisalright Jun 5, 2024
74bdd07
refactor: Update sidebar icons size and padding
thekidisalright Jun 5, 2024
973f61f
refactor: Update sidebar icons size and padding
thekidisalright Jun 5, 2024
989fe96
refactor: Update ModalNewTask component UI and functionality
thekidisalright Jun 5, 2024
69c0a73
refactor: Update sidebar icons size and padding
thekidisalright Jun 5, 2024
2222385
refactor: Update ModalNewList component UI and styles
thekidisalright Jun 5, 2024
fe35a12
Merge branch 'responsividade' into flashCards
thekidisalright Jun 5, 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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ pnpm-debug.log*
lerna-debug.log*

node_modules
package.json
package-lock.json
app/node_modules
backend/node_modules
backend/.env
dist
dist-ssr
*.local
Expand Down
59 changes: 59 additions & 0 deletions .idx/dev.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# To learn more about how to use Nix to configure your environment
# see: https://developers.google.com/idx/guides/customize-idx-env
{ pkgs, ... }: {
# Which nixpkgs channel to use.
channel = "stable-23.11"; # or "unstable"

# Use https://search.nixos.org/packages to find packages
packages = [
# pkgs.go
# pkgs.python311
# pkgs.python311Packages.pip
# pkgs.nodejs_20
# pkgs.nodePackages.nodemon
pkgs.gh
];

# Sets environment variables in the workspace
env = {};
idx = {
# Search for the extensions you want on https://open-vsx.org/ and use "publisher.id"
extensions = [
# "vscodevim.vim"
"naumovs.color-highlight"
"dsznajder.es7-react-js-snippets"
"esbenp.prettier-vscode"
];

# Enable previews
previews = {
enable = true;
previews = {
# web = {
# # Example: run "npm run dev" with PORT set to IDX's defined port for previews,
# # and show it in IDX's web preview panel
# command = ["npm" "run" "dev"];
# manager = "web";
# env = {
# # Environment variables to set for your server
# PORT = "$PORT";
# };
# };
};
};

# Workspace lifecycle hooks
workspace = {
# Runs when a workspace is first created
onCreate = {
# Example: install JS dependencies from NPM
# npm-install = "npm install";
};
# Runs when the workspace is (re)started
onStart = {
# Example: start a background task to watch and re-build backend code
# watch-backend = "npm run watch-backend";
};
};
};
}
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html lang="en">
<html lang="pt-br">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/logo-icon.png" />
Expand Down
64 changes: 62 additions & 2 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added app/public/logo-cinza.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/public/main.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/src/components/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,16 @@ function App() {
}, [listaDispatch, userDispatch]);

return (
<div className="App">


<div className={style.app}>
<Sidebar />
<Outlet />
</div>

</div>

);
}

Expand Down
Loading