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

Feature/navdash #546

Open
wants to merge 96 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
7efa2a2
Message what was updated
gmihov001 Nov 26, 2024
2931640
Merge pull request #1 from 4GeeksAcademy/feature/login-front
gmihov001 Nov 26, 2024
8c023b0
Undid test change in index.js
gmihov001 Nov 26, 2024
13d4044
updated imports in single.js
danielta18 Nov 26, 2024
8d89494
conected the back-end
9308RD00 Nov 26, 2024
7db1e01
added CSS groupings
danielta18 Nov 26, 2024
6e02fa6
footer 1
9308RD00 Nov 26, 2024
5176865
initial update
Chuck-Bob Nov 26, 2024
68b2d1c
footer 2
9308RD00 Nov 26, 2024
cafa9e1
Navbar with working logo, non-working listing page and search bar
Chuck-Bob Nov 26, 2024
db1474d
Navbar with drop down settings menu
Chuck-Bob Nov 26, 2024
2c04675
Starting the login button
Chuck-Bob Nov 26, 2024
c5dd668
built landing page
danielta18 Nov 26, 2024
f7162ac
Merge pull request #2 from 4GeeksAcademy/landing-page
danielta18 Nov 26, 2024
524e6fc
footer3
9308RD00 Nov 26, 2024
922968d
footer4
9308RD00 Nov 26, 2024
1dee60c
Merge pull request #3 from 4GeeksAcademy/feature/navbar
danielta18 Nov 26, 2024
b2982f1
listing page update
nateh1304 Nov 26, 2024
d1080e2
modal integration for login and signup
Chuck-Bob Nov 26, 2024
0901e12
listing page update
nateh1304 Nov 26, 2024
fa6b846
added buttons
danielta18 Nov 26, 2024
352f376
Merge pull request #4 from 4GeeksAcademy/feature/map-list
nateh1304 Nov 26, 2024
0c5959b
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
danielta18 Nov 26, 2024
8349d03
modal, login, signup
Chuck-Bob Nov 26, 2024
0552343
Merge pull request #5 from 4GeeksAcademy/landing-page
danielta18 Nov 26, 2024
65a9f2c
modal, login, signup
Chuck-Bob Nov 26, 2024
d8b971a
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
Chuck-Bob Nov 26, 2024
82b4681
footer5
9308RD00 Nov 26, 2024
171513a
layout to listingpage
Chuck-Bob Nov 26, 2024
8b2c4d6
Merge pull request #6 from 4GeeksAcademy/feature/navbar
danielta18 Nov 26, 2024
7b726a1
minor fix
danielta18 Nov 26, 2024
62f2569
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
danielta18 Nov 26, 2024
49dbd53
footer6
9308RD00 Nov 26, 2024
8332bf2
footer7
9308RD00 Nov 26, 2024
a5d56e0
Merge pull request #7 from 4GeeksAcademy/landing-page
danielta18 Nov 26, 2024
ef16968
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
9308RD00 Nov 26, 2024
49aeea4
listing page update2
nateh1304 Nov 26, 2024
1eb4239
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
nateh1304 Nov 26, 2024
e1aa2d1
fixed bug
danielta18 Nov 26, 2024
902e1e7
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
danielta18 Nov 26, 2024
466655d
Merge pull request #8 from 4GeeksAcademy/landing-page
danielta18 Nov 26, 2024
f6dd318
listing button, logo size, gear size
Chuck-Bob Nov 26, 2024
c26ef78
logo size, listing button, gear size
Chuck-Bob Nov 26, 2024
f80feee
Merge pull request #9 from 4GeeksAcademy/feature/navbar
danielta18 Nov 26, 2024
2b90ac4
footer8
9308RD00 Nov 26, 2024
754d3c9
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
9308RD00 Nov 26, 2024
011f848
Merge pull request #10 from 4GeeksAcademy/feature/footer
9308RD00 Nov 26, 2024
8006b42
listing page layout
nateh1304 Nov 26, 2024
655e9b4
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
nateh1304 Nov 26, 2024
3bf3f71
Merge pull request #11 from 4GeeksAcademy/feature/map-list
danielta18 Nov 26, 2024
8cdef4c
footer9
9308RD00 Nov 26, 2024
857fd88
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
9308RD00 Nov 26, 2024
e5b6b29
built user dashboard interface
danielta18 Nov 27, 2024
dc97fdf
Merge pull request #12 from 4GeeksAcademy/landing-page
danielta18 Nov 27, 2024
c86326b
footerdone
9308RD00 Nov 27, 2024
51f1d9d
footerfinal
9308RD00 Nov 27, 2024
a535562
Merge pull request #13 from 4GeeksAcademy/feature/footer
danielta18 Nov 27, 2024
e33b4d6
building favorites
danielta18 Nov 27, 2024
aba1a6b
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
danielta18 Nov 27, 2024
84aa423
built favorites store
danielta18 Nov 27, 2024
b525ea6
Merge pull request #14 from 4GeeksAcademy/landing-page
danielta18 Nov 27, 2024
cd08c4f
need to fix the chart
nateh1304 Nov 27, 2024
569ce8c
need to fix the chart
nateh1304 Nov 27, 2024
f2b0636
Merge pull request #15 from 4GeeksAcademy/feature/map-list
danielta18 Nov 27, 2024
1b88303
fdffs
9308RD00 Nov 27, 2024
023054e
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
9308RD00 Nov 27, 2024
67432f5
fjfk
9308RD00 Nov 27, 2024
1bcce04
need to fix the chart
nateh1304 Nov 27, 2024
b2e48e7
adding fav cards
danielta18 Nov 27, 2024
19b979b
Merge pull request #16 from 4GeeksAcademy/landing-page
danielta18 Nov 27, 2024
82666ac
finsihed chart
nateh1304 Nov 27, 2024
448c9b9
finsihed chart
nateh1304 Nov 27, 2024
b384aaa
Merge pull request #17 from 4GeeksAcademy/feature/map-list
danielta18 Nov 27, 2024
db6ae43
bug fix
danielta18 Nov 27, 2024
41b6d10
Merge pull request #18 from 4GeeksAcademy/landing-page
danielta18 Nov 27, 2024
826ba3c
ffs
9308RD00 Nov 27, 2024
94cbbd6
njknkd
9308RD00 Nov 27, 2024
f20a1a3
fixed fav graphs
danielta18 Nov 27, 2024
e112026
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
danielta18 Nov 27, 2024
06f2a1b
Merge pull request #19 from 4GeeksAcademy/landing-page
danielta18 Nov 27, 2024
d5bbd82
dashboard on navbar
Chuck-Bob Dec 1, 2024
63f92e3
modal
Chuck-Bob Dec 1, 2024
dfcf9e0
njknkd
9308RD00 Dec 2, 2024
0ef27a3
Merge pull request #20 from 4GeeksAcademy/feature/navdash
danielta18 Dec 2, 2024
2b40eac
footer changes
9308RD00 Dec 2, 2024
9f1249a
Merge pull request #21 from 4GeeksAcademy/feature/footer
danielta18 Dec 2, 2024
6bf928d
contact us sizing
9308RD00 Dec 2, 2024
ca692ef
Merge branch 'main' of https://github.com/4GeeksAcademy/CryptoScope-C…
9308RD00 Dec 2, 2024
2a65653
Merge pull request #22 from 4GeeksAcademy/feature/footer
danielta18 Dec 2, 2024
e5a76bd
favorites navbar working
Chuck-Bob Dec 2, 2024
40c7cc9
git pulMerge branch 'main' of https://github.com/4GeeksAcademy/Crypto…
Chuck-Bob Dec 2, 2024
d66a8d2
Merge pull request #23 from 4GeeksAcademy/feature/navdash
danielta18 Dec 2, 2024
6bf20a4
favorite screen fixing
danielta18 Dec 2, 2024
1d98bb7
favorite screen fixing
danielta18 Dec 2, 2024
5a2bf60
Merge pull request #24 from 4GeeksAcademy/landing-page
danielta18 Dec 2, 2024
b16b454
navbar dashboard to holdings
Chuck-Bob Dec 2, 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: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
}
646 changes: 352 additions & 294 deletions Pipfile.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions migrations/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Single-database configuration for Flask.
50 changes: 50 additions & 0 deletions migrations/alembic.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# A generic, single database configuration.

[alembic]
# template used to generate migration files
# file_template = %%(rev)s_%%(slug)s

# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false


# Logging configuration
[loggers]
keys = root,sqlalchemy,alembic,flask_migrate

[handlers]
keys = console

[formatters]
keys = generic

[logger_root]
level = WARN
handlers = console
qualname =

[logger_sqlalchemy]
level = WARN
handlers =
qualname = sqlalchemy.engine

[logger_alembic]
level = INFO
handlers =
qualname = alembic

[logger_flask_migrate]
level = INFO
handlers =
qualname = flask_migrate

[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic

[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %H:%M:%S
113 changes: 113 additions & 0 deletions migrations/env.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
import logging
from logging.config import fileConfig

from flask import current_app

from alembic import context

# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config

# Interpret the config file for Python logging.
# This line sets up loggers basically.
fileConfig(config.config_file_name)
logger = logging.getLogger('alembic.env')


def get_engine():
try:
# this works with Flask-SQLAlchemy<3 and Alchemical
return current_app.extensions['migrate'].db.get_engine()
except (TypeError, AttributeError):
# this works with Flask-SQLAlchemy>=3
return current_app.extensions['migrate'].db.engine


def get_engine_url():
try:
return get_engine().url.render_as_string(hide_password=False).replace(
'%', '%%')
except AttributeError:
return str(get_engine().url).replace('%', '%%')


# add your model's MetaData object here
# for 'autogenerate' support
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
config.set_main_option('sqlalchemy.url', get_engine_url())
target_db = current_app.extensions['migrate'].db

# other values from the config, defined by the needs of env.py,
# can be acquired:
# my_important_option = config.get_main_option("my_important_option")
# ... etc.


def get_metadata():
if hasattr(target_db, 'metadatas'):
return target_db.metadatas[None]
return target_db.metadata


def run_migrations_offline():
"""Run migrations in 'offline' mode.
This configures the context with just a URL
and not an Engine, though an Engine is acceptable
here as well. By skipping the Engine creation
we don't even need a DBAPI to be available.
Calls to context.execute() here emit the given string to the
script output.
"""
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url, target_metadata=get_metadata(), literal_binds=True
)

with context.begin_transaction():
context.run_migrations()


def run_migrations_online():
"""Run migrations in 'online' mode.
In this scenario we need to create an Engine
and associate a connection with the context.
"""

# this callback is used to prevent an auto-migration from being generated
# when there are no changes to the schema
# reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
def process_revision_directives(context, revision, directives):
if getattr(config.cmd_opts, 'autogenerate', False):
script = directives[0]
if script.upgrade_ops.is_empty():
directives[:] = []
logger.info('No changes in schema detected.')

conf_args = current_app.extensions['migrate'].configure_args
if conf_args.get("process_revision_directives") is None:
conf_args["process_revision_directives"] = process_revision_directives

connectable = get_engine()

with connectable.connect() as connection:
context.configure(
connection=connection,
target_metadata=get_metadata(),
**conf_args
)

with context.begin_transaction():
context.run_migrations()


if context.is_offline_mode():
run_migrations_offline()
else:
run_migrations_online()
24 changes: 24 additions & 0 deletions migrations/script.py.mako
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
"""${message}

Revision ID: ${up_revision}
Revises: ${down_revision | comma,n}
Create Date: ${create_date}

"""
from alembic import op
import sqlalchemy as sa
${imports if imports else ""}

# revision identifiers, used by Alembic.
revision = ${repr(up_revision)}
down_revision = ${repr(down_revision)}
branch_labels = ${repr(branch_labels)}
depends_on = ${repr(depends_on)}


def upgrade():
${upgrades if upgrades else "pass"}


def downgrade():
${downgrades if downgrades else "pass"}
35 changes: 35 additions & 0 deletions migrations/versions/42b2fea03dc4_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"""empty message

Revision ID: 42b2fea03dc4
Revises:
Create Date: 2024-11-26 15:32:10.950024

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '42b2fea03dc4'
down_revision = None
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('user',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('email', sa.String(length=120), nullable=False),
sa.Column('password', sa.String(length=80), nullable=False),
sa.Column('is_active', sa.Boolean(), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('email')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('user')
# ### end Alembic commands ###
Loading