Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
GregC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AdvWeb
GregC
Commits
7d884a0e
Commit
7d884a0e
authored
5 months ago
by
hwilks
Browse files
Options
Downloads
Patches
Plain Diff
account events page works
parent
46c12822
No related branches found
No related tags found
Tags containing commit
3 merge requests
!74
v.1.0
,
!64
Issue/password val
,
!48
Feature/add events to account
Pipeline
#101720
failed
5 months ago
Stage: build
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
account_database/schema.sql
+2
-2
2 additions, 2 deletions
account_database/schema.sql
frontend_microservice/frontend.py
+2
-1
2 additions, 1 deletion
frontend_microservice/frontend.py
with
4 additions
and
3 deletions
account_database/schema.sql
+
2
−
2
View file @
7d884a0e
...
@@ -5,9 +5,9 @@ CREATE TABLE IF NOT EXISTS users (
...
@@ -5,9 +5,9 @@ CREATE TABLE IF NOT EXISTS users (
created_at
TIMESTAMP
DEFAULT
CURRENT_TIMESTAMP
created_at
TIMESTAMP
DEFAULT
CURRENT_TIMESTAMP
);
);
CREATE
TABLE
IF
NOT
EXISTS
account_events
{
CREATE
TABLE
IF
NOT
EXISTS
account_events
(
user_id
INT
NOT
NULL
,
user_id
INT
NOT
NULL
,
event_id
INT
,
event_id
INT
,
PRIMARY
KEY
(
user_id
,
event_id
),
PRIMARY
KEY
(
user_id
,
event_id
),
FOREIGN
KEY
(
user_id
)
REFERENCES
users
(
user_id
)
FOREIGN
KEY
(
user_id
)
REFERENCES
users
(
user_id
)
};
);
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
frontend_microservice/frontend.py
+
2
−
1
View file @
7d884a0e
...
@@ -152,11 +152,12 @@ def get_events(account_id):
...
@@ -152,11 +152,12 @@ def get_events(account_id):
event
[
'
name
'
]
=
data_output
[
'
name
'
]
event
[
'
name
'
]
=
data_output
[
'
name
'
]
event
[
'
url
'
]
=
url_for
(
'
eventSummary
'
,
event_id
=
event_id
)
event
[
'
url
'
]
=
url_for
(
'
eventSummary
'
,
event_id
=
event_id
)
events
.
append
(
event
)
events
.
append
(
event
)
'''
#Test data
#Test data
event1= {
'
name
'
:
'
An event
'
,
'
url
'
:url_for(
'
eventSummary
'
, event_id=1)}
event1= {
'
name
'
:
'
An event
'
,
'
url
'
:url_for(
'
eventSummary
'
, event_id=1)}
event2= {
'
name
'
:
'
An event 2
'
,
'
url
'
:
'
a url
'
}
event2= {
'
name
'
:
'
An event 2
'
,
'
url
'
:
'
a url
'
}
events = [event1, event2]
events = [event1, event2]
'''
return
render_template
(
'
accountEvents.html
'
,
event
=
events
)
return
render_template
(
'
accountEvents.html
'
,
event
=
events
)
return
render_template
(
'
accountEvents.html
'
)
return
render_template
(
'
accountEvents.html
'
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment